Index: Source/core/rendering/RenderObject.h |
diff --git a/Source/core/rendering/RenderObject.h b/Source/core/rendering/RenderObject.h |
index 5de8bc22009cf03aa06277ea7ebfb4486b318304..e2e6c9b9e1e1f7c1968ac195dfde10d23ed95802 100644 |
--- a/Source/core/rendering/RenderObject.h |
+++ b/Source/core/rendering/RenderObject.h |
@@ -969,19 +969,21 @@ public: |
const LayoutRect& oldRepaintRect() const { return m_oldRepaintRect; } |
void setOldRepaintRect(const LayoutRect& rect) { m_oldRepaintRect = rect; } |
+ const LayoutRect newOutlineRect(); |
+ void setNewOutlineRect(const LayoutRect&); |
+ |
+ const LayoutRect oldOutlineRect(); |
+ void setOldOutlineRect(const LayoutRect&); |
+ |
bool shouldDoFullRepaintAfterLayout() const { return m_bitfields.shouldDoFullRepaintAfterLayout(); } |
void setShouldDoFullRepaintAfterLayout(bool b) { m_bitfields.setShouldDoFullRepaintAfterLayout(b); } |
- bool shouldRepaintOverflowIfNeeded() const { return m_bitfields.shouldRepaintOverflowIfNeeded(); } |
- void clearRepaintRects() |
- { |
- setNewRepaintRect(LayoutRect()); |
- setOldRepaintRect(LayoutRect()); |
+ bool shouldDoFullRepaintIfSelfPaintingLayer() const { return m_bitfields.shouldDoFullRepaintIfSelfPaintingLayer(); } |
+ void setShouldDoFullRepaintIfSelfPaintingLayer(bool b) { m_bitfields.setShouldDoFullRepaintIfSelfPaintingLayer(b); } |
- setShouldDoFullRepaintAfterLayout(false); |
- setShouldRepaintOverflowIfNeeded(false); |
- setLayoutDidGetCalled(false); |
- } |
+ bool shouldRepaintOverflowIfNeeded() const { return m_bitfields.shouldRepaintOverflowIfNeeded(); } |
+ |
+ void clearRepaintState(); |
// layoutDidGetCalled indicates whether this render object was re-laid-out |
// since the last call to setLayoutDidGetCalled(false) on this object. |
@@ -1099,6 +1101,7 @@ private: |
// Holding the layout bits until after repaint would remove the need |
// for this flag. |
, m_shouldDoFullRepaintAfterLayout(false) |
+ , m_shouldDoFullRepaintIfSelfPaintingLayer(false) |
Julien - ping for review
2014/03/04 18:22:10
Why do we care about self-painting layer in the RA
dsinclair
2014/03/04 19:21:52
Inside RenderBox::updateFromStyle() we had to disa
|
, m_shouldRepaintOverflowIfNeeded(false) |
, m_needsPositionedMovementLayout(false) |
, m_normalChildNeedsLayout(false) |
@@ -1131,9 +1134,10 @@ private: |
{ |
} |
- // 32 bits have been used in the first word, and 3 in the second. |
+ // 32 bits have been used in the first word, and 4 in the second. |
ADD_BOOLEAN_BITFIELD(selfNeedsLayout, SelfNeedsLayout); |
ADD_BOOLEAN_BITFIELD(shouldDoFullRepaintAfterLayout, ShouldDoFullRepaintAfterLayout); |
+ ADD_BOOLEAN_BITFIELD(shouldDoFullRepaintIfSelfPaintingLayer, ShouldDoFullRepaintIfSelfPaintingLayer); |
ADD_BOOLEAN_BITFIELD(shouldRepaintOverflowIfNeeded, ShouldRepaintOverflowIfNeeded); |
ADD_BOOLEAN_BITFIELD(needsPositionedMovementLayout, NeedsPositionedMovementLayout); |
ADD_BOOLEAN_BITFIELD(normalChildNeedsLayout, NormalChildNeedsLayout); |