From f58dc37a07792b886a8fb3823d0ae55a62588a60 Mon Sep 17 00:00:00 2001 From: "rods%netscape.com" Date: Thu, 15 Jun 2000 13:02:10 +0000 Subject: [PATCH] removed the incremental reflow targeted at the display text instead we just reflow the text and the button each time. b=40644 r=kmcclusk git-svn-id: svn://10.0.0.236/trunk@72307 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/forms/nsComboboxControlFrame.cpp | 16 +--------------- .../html/forms/src/nsComboboxControlFrame.cpp | 16 +--------------- 2 files changed, 2 insertions(+), 30 deletions(-) diff --git a/mozilla/layout/forms/nsComboboxControlFrame.cpp b/mozilla/layout/forms/nsComboboxControlFrame.cpp index 8cf14395dac..e43cdc3f5ba 100644 --- a/mozilla/layout/forms/nsComboboxControlFrame.cpp +++ b/mozilla/layout/forms/nsComboboxControlFrame.cpp @@ -1303,22 +1303,8 @@ nsComboboxControlFrame::Reflow(nsIPresContext* aPresContext, //mListControlFrame->SetOverrideReflowOptimization(PR_TRUE); } else if (targetFrame == mDisplayFrame || targetFrame == buttonFrame) { - if (targetFrame == mDisplayFrame) { - nsresult rv = ReflowComboChildFrame(mDisplayFrame, aPresContext, aDesiredSize, - aReflowState, aStatus, - mCacheSize.width, - aReflowState.availableHeight); - NS_ASSERTION(aDesiredSize.width != kSizeNotSet, "aDesiredSize.width != kSizeNotSet"); - NS_ASSERTION(aDesiredSize.height != kSizeNotSet, "aDesiredSize.height != kSizeNotSet"); - aDesiredSize.mOverflowArea.x = 0; - aDesiredSize.mOverflowArea.y = 0; - aDesiredSize.mOverflowArea.width = aDesiredSize.width; - aDesiredSize.mOverflowArea.height = aDesiredSize.height; - return rv; - } - - // The incremental reflow is targeted at either the block or the button REFLOW_DEBUG_MSG2("-----------------Target is %s------------\n", (targetFrame == mDisplayFrame?"DisplayItem Frame":"DropDown Btn Frame")); + // The incremental reflow is targeted at either the block or the button REFLOW_DEBUG_MSG("---- Doing AreaFrame Reflow and then bailing out\n"); // Do simple reflow and bail out ReflowCombobox(aPresContext, firstPassState, aDesiredSize, aStatus, diff --git a/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp b/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp index 8cf14395dac..e43cdc3f5ba 100644 --- a/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp @@ -1303,22 +1303,8 @@ nsComboboxControlFrame::Reflow(nsIPresContext* aPresContext, //mListControlFrame->SetOverrideReflowOptimization(PR_TRUE); } else if (targetFrame == mDisplayFrame || targetFrame == buttonFrame) { - if (targetFrame == mDisplayFrame) { - nsresult rv = ReflowComboChildFrame(mDisplayFrame, aPresContext, aDesiredSize, - aReflowState, aStatus, - mCacheSize.width, - aReflowState.availableHeight); - NS_ASSERTION(aDesiredSize.width != kSizeNotSet, "aDesiredSize.width != kSizeNotSet"); - NS_ASSERTION(aDesiredSize.height != kSizeNotSet, "aDesiredSize.height != kSizeNotSet"); - aDesiredSize.mOverflowArea.x = 0; - aDesiredSize.mOverflowArea.y = 0; - aDesiredSize.mOverflowArea.width = aDesiredSize.width; - aDesiredSize.mOverflowArea.height = aDesiredSize.height; - return rv; - } - - // The incremental reflow is targeted at either the block or the button REFLOW_DEBUG_MSG2("-----------------Target is %s------------\n", (targetFrame == mDisplayFrame?"DisplayItem Frame":"DropDown Btn Frame")); + // The incremental reflow is targeted at either the block or the button REFLOW_DEBUG_MSG("---- Doing AreaFrame Reflow and then bailing out\n"); // Do simple reflow and bail out ReflowCombobox(aPresContext, firstPassState, aDesiredSize, aStatus,