Index: Source/core/rendering/RenderObject.cpp |
diff --git a/Source/core/rendering/RenderObject.cpp b/Source/core/rendering/RenderObject.cpp |
index 08b70dbe070f06f15d77a1cd068d9e6208867696..9f336da9304e1f3bc6ec90b879a1a5ba9b4404ca 100644 |
--- a/Source/core/rendering/RenderObject.cpp |
+++ b/Source/core/rendering/RenderObject.cpp |
@@ -1590,8 +1590,8 @@ const char* RenderObject::invalidationReasonToString(InvalidationReason reason) |
switch (reason) { |
case InvalidationIncremental: |
return "incremental"; |
- case InvalidationSelfLayout: |
- return "self layout"; |
+ case InvalidationFull: |
+ return "full"; |
case InvalidationBorderFitLines: |
return "border fit lines"; |
case InvalidationBorderRadius: |
@@ -1641,7 +1641,7 @@ static PassRefPtr<JSONValue> jsonObjectForOldAndNewRects(const LayoutRect& oldRe |
return object.release(); |
} |
-bool RenderObject::invalidatePaintAfterLayoutIfNeeded(const RenderLayerModelObject* paintInvalidationContainer, bool wasSelfLayout, |
+bool RenderObject::invalidatePaintAfterLayoutIfNeeded(const RenderLayerModelObject* paintInvalidationContainer, InvalidationReason invalidationReason, |
const LayoutRect& oldBounds, const LayoutPoint& oldLocation, const LayoutRect* newBoundsPtr, const LayoutPoint* newLocationPtr) |
{ |
RenderView* v = view(); |
@@ -1658,8 +1658,6 @@ bool RenderObject::invalidatePaintAfterLayoutIfNeeded(const RenderLayerModelObje |
"object", this->debugName().ascii(), |
"info", TracedValue::fromJSONValue(jsonObjectForOldAndNewRects(oldBounds, newBounds))); |
- InvalidationReason invalidationReason = wasSelfLayout ? InvalidationSelfLayout : InvalidationIncremental; |
- |
// Presumably a background or a border exists if border-fit:lines was specified. |
if (invalidationReason == InvalidationIncremental && style()->borderFit() == BorderFitLines) |
invalidationReason = InvalidationBorderFitLines; |