wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backout changeset 071d6332729b (bug 770058 part 1) because DLBI is being backed out

Browse Source
This commit is contained in:
Ehsan Akhgari 2012-07-03 19:38:00 -04:00
parent cf1ff79712
commit 91446bec6e
11 changed files with 34 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
layout/generic/nsFrame.cpp
View File

@ -4603,9 +4603,9 @@ nsIFrame::GetTransformMatrix(nsIFrame* aStopAtAncestor,
}
void
nsIFrame::InvalidateFrameSubtree()
nsIFrame::InvalidateFrameSubtree(PRUint32 aFlags)
{
InvalidateFrame();
InvalidateFrame(aFlags);
if (HasAnyStateBits(NS_FRAME_ALL_DESCENDANTS_NEED_PAINT)) {
return;
@ -4620,7 +4620,8 @@ nsIFrame::InvalidateFrameSubtree()
for (; !lists.IsDone(); lists.Next()) {
nsFrameList::Enumerator childFrames(lists.CurrentList());
for (; !childFrames.AtEnd(); childFrames.Next()) {
childFrames.get()->InvalidateFrameSubtree();
childFrames.get()->
InvalidateFrameSubtree(aFlags | INVALIDATE_DONT_SCHEDULE_PAINT);
}
}
}
@ -4647,7 +4648,7 @@ nsIFrame::ClearInvalidationStateBits()
}
void
nsIFrame::InvalidateFrame()
nsIFrame::InvalidateFrame(PRUint32 aFlags)
{
AddStateBits(NS_FRAME_NEEDS_PAINT);
nsIFrame *parent = nsLayoutUtils::GetCrossDocParentFrame(this);
@ -4655,7 +4656,7 @@ nsIFrame::InvalidateFrame()
parent->AddStateBits(NS_FRAME_DESCENDANT_NEEDS_PAINT);
parent = nsLayoutUtils::GetCrossDocParentFrame(parent);
}
if (!parent) {
if (!(aFlags & INVALIDATE_DONT_SCHEDULE_PAINT)) {
SchedulePaint();
}
}
@ -7809,7 +7810,7 @@ nsFrame::SetParent(nsIFrame* aParent)
// ourselves too. This is probably faster than clearing the flag all
// the way up the frame tree.
if (aParent->HasAnyStateBits(NS_FRAME_ALL_DESCENDANTS_NEED_PAINT)) {
InvalidateFrame();
InvalidateFrame(INVALIDATE_DONT_SCHEDULE_PAINT);
}
}

11
layout/generic/nsIFrame.h
View File

@ -2126,12 +2126,17 @@ public:
/**
* Marks all display items created by this frame as needing a repaint,
* and calls SchedulePaint() if requested and one is not already pending.
* and calls SchedulePaint() if requested.
*
* This includes all display items created by this frame, including
* container types.
* @param aFlags INVALIDATE_DONT_SCHEDULE_PAINT: Don't call SchedulePaint()
* when invalidating.
*/
virtual void InvalidateFrame();
enum {
INVALIDATE_DONT_SCHEDULE_PAINT
};
virtual void InvalidateFrame(PRUint32 aFlags = 0);
/**
* Calls InvalidateFrame() on all frames descendant frames (including
@ -2140,7 +2145,7 @@ public:
* This function doesn't walk through placeholder frames to invalidate
* the out-of-flow frames.
*/
void InvalidateFrameSubtree();
void InvalidateFrameSubtree(PRUint32 aFlags = 0);
/**
* Checks if a frame has had InvalidateFrame() called on it since the

6
layout/tables/nsTableCellFrame.h
View File

@ -210,11 +210,11 @@ public:
virtual bool UpdateOverflow();
virtual void InvalidateFrame()
virtual void InvalidateFrame(PRUint32 aFlags = 0)
{
nsIFrame::InvalidateFrame();
nsIFrame::InvalidateFrame(aFlags);
nsTableFrame *tableFrame = nsTableFrame::GetTableFrame(this);
tableFrame->InvalidateFrame();
tableFrame->InvalidateFrame(aFlags | INVALIDATE_DONT_SCHEDULE_PAINT);
}
protected:

6
layout/tables/nsTableColFrame.cpp
View File

@ -189,10 +189,10 @@ nsTableColFrame::GetSplittableType() const
}
void
nsTableColFrame::InvalidateFrame()
nsTableColFrame::InvalidateFrame(PRUint32 aFlags)
{
nsIFrame::InvalidateFrame();
nsIFrame::InvalidateFrame(aFlags);
nsTableFrame *tableFrame = nsTableFrame::GetTableFrame(this);
tableFrame->InvalidateFrame();
tableFrame->InvalidateFrame(aFlags | INVALIDATE_DONT_SCHEDULE_PAINT);
}

2
layout/tables/nsTableColFrame.h
View File

@ -263,7 +263,7 @@ public:
return mFinalWidth;
}
virtual void InvalidateFrame();
virtual void InvalidateFrame(PRUint32 aFlags = 0);
protected:

6
layout/tables/nsTableColGroupFrame.cpp
View File

@ -463,11 +463,11 @@ nsTableColGroupFrame::GetType() const
}
void
nsTableColGroupFrame::InvalidateFrame()
nsTableColGroupFrame::InvalidateFrame(PRUint32 aFlags)
{
nsIFrame::InvalidateFrame();
nsIFrame::InvalidateFrame(aFlags);
nsTableFrame *tableFrame = nsTableFrame::GetTableFrame(this);
tableFrame->InvalidateFrame();
tableFrame->InvalidateFrame(aFlags | INVALIDATE_DONT_SCHEDULE_PAINT);
}
#ifdef DEBUG

2
layout/tables/nsTableColGroupFrame.h
View File

@ -196,7 +196,7 @@ public:
void SetContinuousBCBorderWidth(PRUint8 aForSide,
BCPixelSize aPixelValue);
virtual void InvalidateFrame();
virtual void InvalidateFrame(PRUint32 aFlags = 0);
protected:
nsTableColGroupFrame(nsStyleContext* aContext);

6
layout/tables/nsTableRowFrame.cpp
View File

@ -1350,11 +1350,11 @@ void nsTableRowFrame::InitHasCellWithStyleHeight(nsTableFrame* aTableFrame)
}
void
nsTableRowFrame::InvalidateFrame()
nsTableRowFrame::InvalidateFrame(PRUint32 aFlags)
{
nsIFrame::InvalidateFrame();
nsIFrame::InvalidateFrame(aFlags);
nsTableFrame *tableFrame = nsTableFrame::GetTableFrame(this);
tableFrame->InvalidateFrame();
tableFrame->InvalidateFrame(aFlags | INVALIDATE_DONT_SCHEDULE_PAINT);
}
/* ----- global methods ----- */

2
layout/tables/nsTableRowFrame.h
View File

@ -223,7 +223,7 @@ public:
void SetContinuousBCBorderWidth(PRUint8 aForSide,
BCPixelSize aPixelValue);
virtual void InvalidateFrame();
virtual void InvalidateFrame(PRUint32 aFlags = 0);
#ifdef ACCESSIBILITY
virtual already_AddRefed<Accessible> CreateAccessible();

6
layout/tables/nsTableRowGroupFrame.cpp
View File

@ -1841,9 +1841,9 @@ nsTableRowGroupFrame::FrameCursorData::AppendFrame(nsIFrame* aFrame)
}
void
nsTableRowGroupFrame::InvalidateFrame()
nsTableRowGroupFrame::InvalidateFrame(PRUint32 aFlags)
{
nsIFrame::InvalidateFrame();
nsIFrame::InvalidateFrame(aFlags);
nsTableFrame *tableFrame = nsTableFrame::GetTableFrame(this);
tableFrame->InvalidateFrame();
tableFrame->InvalidateFrame(aFlags | INVALIDATE_DONT_SCHEDULE_PAINT);
}

2
layout/tables/nsTableRowGroupFrame.h
View File

@ -324,7 +324,7 @@ public:
virtual nsILineIterator* GetLineIterator() { return this; }
virtual void InvalidateFrame();
virtual void InvalidateFrame(PRUint32 aFlags = 0);
protected:
nsTableRowGroupFrame(nsStyleContext* aContext);