зеркало из https://github.com/mozilla/pjs.git
Bug 287338. Free up unused frame state bit NS_SYNC_FRAME_AND_VIEW. r+sr=bzbarsky
This commit is contained in:
Родитель
7f986a7ba4
Коммит
6fad3a4fec
|
@ -2328,9 +2328,7 @@ nsListControlFrame::DidReflow(nsPresContext* aPresContext,
|
|||
if (IsInDropDownMode())
|
||||
{
|
||||
//SyncViewWithFrame();
|
||||
mState &= ~NS_FRAME_SYNC_FRAME_AND_VIEW;
|
||||
rv = nsHTMLScrollFrame::DidReflow(aPresContext, aReflowState, aStatus);
|
||||
mState |= NS_FRAME_SYNC_FRAME_AND_VIEW;
|
||||
SyncViewWithFrame();
|
||||
} else {
|
||||
rv = nsHTMLScrollFrame::DidReflow(aPresContext, aReflowState, aStatus);
|
||||
|
|
|
@ -484,8 +484,7 @@ nsFrame::nsFrame()
|
|||
{
|
||||
MOZ_COUNT_CTOR(nsFrame);
|
||||
|
||||
mState = NS_FRAME_FIRST_REFLOW | NS_FRAME_SYNC_FRAME_AND_VIEW |
|
||||
NS_FRAME_IS_DIRTY;
|
||||
mState = NS_FRAME_FIRST_REFLOW | NS_FRAME_IS_DIRTY;
|
||||
}
|
||||
|
||||
nsFrame::~nsFrame()
|
||||
|
@ -556,9 +555,6 @@ nsFrame::Init(nsPresContext* aPresContext,
|
|||
// Make sure the general flags bits are the same
|
||||
nsFrameState state = aPrevInFlow->GetStateBits();
|
||||
|
||||
// Make bits that are currently on (see constructor) the same:
|
||||
mState &= state | ~(NS_FRAME_SYNC_FRAME_AND_VIEW);
|
||||
|
||||
// Make bits that are currently off (see constructor) the same:
|
||||
mState |= state & (NS_FRAME_REPLACED_ELEMENT |
|
||||
NS_FRAME_SELECTED_CONTENT |
|
||||
|
|
|
@ -138,12 +138,6 @@ typedef PRUint32 nsFrameState;
|
|||
// cleared.
|
||||
#define NS_FRAME_FIRST_REFLOW 0x00000002
|
||||
|
||||
// If this bit is is set, then the view position and size should be
|
||||
// kept in sync with the frame position and size. If the bit is not
|
||||
// set then it's the responsibility of the frame itself (or whoever
|
||||
// created the view) to position and size its associated view
|
||||
#define NS_FRAME_SYNC_FRAME_AND_VIEW 0x00000004
|
||||
|
||||
// If this bit is set, then there is a child frame in the frame that
|
||||
// extends outside this frame's bounding box. The implication is that
|
||||
// the frame's rect does not completely cover its children and
|
||||
|
|
|
@ -156,9 +156,6 @@ nsMenuPopupFrame::nsMenuPopupFrame(nsIPresShell* aShell)
|
|||
mMenuCanOverlapOSBar(PR_FALSE), mShouldAutoPosition(PR_TRUE), mShouldRollup(PR_TRUE)
|
||||
{
|
||||
SetIsContextMenu(PR_FALSE); // we're not a context menu by default
|
||||
// Don't allow container frames to automatically position
|
||||
// the popup because they will put it in the wrong position.
|
||||
RemoveStateBits(NS_FRAME_SYNC_FRAME_AND_VIEW);
|
||||
} // ctor
|
||||
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче