Index: Source/core/rendering/RenderObject.h |
diff --git a/Source/core/rendering/RenderObject.h b/Source/core/rendering/RenderObject.h |
index 615432111823054f598e7f2684635d703c08b0fd..1a549f5233c57265e5b226e00c3489ec21adb61c 100644 |
--- a/Source/core/rendering/RenderObject.h |
+++ b/Source/core/rendering/RenderObject.h |
@@ -431,6 +431,7 @@ public: |
bool hasCounterNodeMap() const { return m_bitfields.hasCounterNodeMap(); } |
void setHasCounterNodeMap(bool hasCounterNodeMap) { m_bitfields.setHasCounterNodeMap(hasCounterNodeMap); } |
bool everHadLayout() const { return m_bitfields.everHadLayout(); } |
+ bool hadPaintInvalidation() const { return m_bitfields.hadPaintInvalidation(); } |
bool childrenInline() const { return m_bitfields.childrenInline(); } |
void setChildrenInline(bool b) { m_bitfields.setChildrenInline(b); } |
@@ -872,10 +873,10 @@ public: |
// as the local coordinate space of |paintInvalidationContainer| in the presence of layer squashing. |
// If |paintInvalidationContainer| is 0, invalidate paints via the view. |
// FIXME: |paintInvalidationContainer| should never be 0. See crbug.com/363699. |
- void invalidatePaintUsingContainer(const RenderLayerModelObject* paintInvalidationContainer, const LayoutRect&, InvalidationReason) const; |
+ void invalidatePaintUsingContainer(const RenderLayerModelObject* paintInvalidationContainer, const LayoutRect&, InvalidationReason); |
// Invalidate the paint of a specific subrectangle within a given object. The rect |r| is in the object's coordinate space. |
- void invalidatePaintRectangle(const LayoutRect&) const; |
+ void invalidatePaintRectangle(const LayoutRect&); |
InvalidationReason invalidatePaintIfNeeded(const RenderLayerModelObject& paintInvalidationContainer, |
const LayoutRect& oldBounds, const LayoutPoint& oldPositionFromPaintInvalidationContainer, const PaintInvalidationState&); |
@@ -1157,7 +1158,7 @@ protected: |
private: |
// Invalidate the paint of the entire object. This is only used when a renderer is to be removed. |
// For other cases, the caller should call setShouldDoFullPaintInvalidation() instead. |
- void invalidatePaintForWholeRenderer() const; |
+ void invalidatePaintForWholeRenderer(); |
const RenderLayerModelObject* enclosingCompositedContainer() const; |
@@ -1251,6 +1252,7 @@ private: |
, m_hasReflection(false) |
, m_hasCounterNodeMap(false) |
, m_everHadLayout(false) |
+ , m_hadPaintInvalidation(false) |
, m_ancestorLineBoxDirty(false) |
, m_layoutDidGetCalled(false) |
, m_hasPendingResourceUpdate(false) |
@@ -1296,6 +1298,7 @@ private: |
ADD_BOOLEAN_BITFIELD(hasCounterNodeMap, HasCounterNodeMap); |
ADD_BOOLEAN_BITFIELD(everHadLayout, EverHadLayout); |
+ ADD_BOOLEAN_BITFIELD(hadPaintInvalidation, HadPaintInvalidation); |
ADD_BOOLEAN_BITFIELD(ancestorLineBoxDirty, AncestorLineBoxDirty); |
ADD_BOOLEAN_BITFIELD(layoutDidGetCalled, LayoutDidGetCalled); |
@@ -1348,6 +1351,7 @@ private: |
void setNeedsSimplifiedNormalFlowLayout(bool b) { m_bitfields.setNeedsSimplifiedNormalFlowLayout(b); } |
void setIsDragging(bool b) { m_bitfields.setIsDragging(b); } |
void setEverHadLayout(bool b) { m_bitfields.setEverHadLayout(b); } |
+ void setHadPaintInvalidation(bool b) { m_bitfields.setHadPaintInvalidation(b); } |
chrishtr
2014/08/25 16:55:05
Remove arg, only true is pased.
kouhei (in TOK)
2014/08/26 14:18:18
Done.
|
void setShouldInvalidateOverflowForPaint(bool b) { m_bitfields.setShouldInvalidateOverflowForPaint(b); } |
void setSelfNeedsOverflowRecalcAfterStyleChange(bool b) { m_bitfields.setSelfNeedsOverflowRecalcAfterStyleChange(b); } |
void setChildNeedsOverflowRecalcAfterStyleChange(bool b) { m_bitfields.setChildNeedsOverflowRecalcAfterStyleChange(b); } |