Index: Source/core/rendering/RenderObject.cpp |
diff --git a/Source/core/rendering/RenderObject.cpp b/Source/core/rendering/RenderObject.cpp |
index aaa9368fc974acd7ea827335978a7220988005a4..c8405195924e131547f1dca9e0c3459187d4f22a 100644 |
--- a/Source/core/rendering/RenderObject.cpp |
+++ b/Source/core/rendering/RenderObject.cpp |
@@ -1262,9 +1262,6 @@ void RenderObject::invalidateSelectionIfNeeded(const RenderLayerModelObject& pai |
LayoutRect oldSelectionRect = previousSelectionRectForPaintInvalidation(); |
LayoutRect previousSelectionRectForPaintInvalidation = selectionRectForPaintInvalidation(&paintInvalidationContainer); |
- // FIXME: groupedMapping() leaks the squashing abstraction. |
- if (paintInvalidationContainer.layer()->groupedMapping()) |
- RenderLayer::mapRectToPaintBackingCoordinates(&paintInvalidationContainer, previousSelectionRectForPaintInvalidation); |
setPreviousSelectionRectForPaintInvalidation(previousSelectionRectForPaintInvalidation); |
if (view()->doingFullPaintInvalidation() || isFullPaintInvalidationReason(invalidationReason)) |
@@ -3006,12 +3003,12 @@ CursorDirective RenderObject::getCursor(const LayoutPoint&, Cursor&) const |
return SetCursorBasedOnStyle; |
} |
-bool RenderObject::canUpdateSelectionOnRootLineBoxes() |
+bool RenderObject::canUpdateSelectionOnRootLineBoxes() const |
{ |
if (needsLayout()) |
return false; |
- RenderBlock* containingBlock = this->containingBlock(); |
+ const RenderBlock* containingBlock = this->containingBlock(); |
leviw_travelin_and_unemployed
2014/11/12 23:41:42
Nit: Is this-> needed?
Julien - ping for review
2014/11/13 01:09:32
It should be: the variable has the same name as th
kouhei (in TOK)
2014/11/13 01:33:37
I think this code is a bit tricky.
Would you renam
Julien - ping for review
2014/11/13 17:03:42
I don't agree. The code is super straight-forward.
kouhei (in TOK)
2014/11/14 03:11:57
Got it. lgtm
|
return containingBlock ? !containingBlock->needsLayout() : false; |
} |