Index: Source/core/layout/LayerScrollableArea.cpp |
diff --git a/Source/core/layout/LayerScrollableArea.cpp b/Source/core/layout/LayerScrollableArea.cpp |
index ca81a656c3976c0156e07a8e9e1b4b0478d825f7..1a39776d3502a30c9560e6c8f924b9c6d002cb53 100644 |
--- a/Source/core/layout/LayerScrollableArea.cpp |
+++ b/Source/core/layout/LayerScrollableArea.cpp |
@@ -393,7 +393,7 @@ void LayerScrollableArea::setScrollOffset(const DoublePoint& newScrollOffset) |
// The caret rect needs to be invalidated after scrolling |
frame->selection().setCaretRectNeedsUpdate(); |
- FloatQuad quadForFakeMouseMoveEvent = FloatQuad(layer()->renderer()->previousPaintInvalidationRect()); |
+ FloatQuad quadForFakeMouseMoveEvent = FloatQuad(layer()->layoutObject()->previousPaintInvalidationRect()); |
quadForFakeMouseMoveEvent = paintInvalidationContainer->localToAbsoluteQuad(quadForFakeMouseMoveEvent); |
frame->eventHandler().dispatchFakeMouseMoveEventSoonInQuad(quadForFakeMouseMoveEvent); |
@@ -899,7 +899,7 @@ static inline LayoutObject* rendererForScrollbar(LayoutObject& renderer) |
if (Node* node = renderer.node()) { |
if (ShadowRoot* shadowRoot = node->containingShadowRoot()) { |
if (shadowRoot->type() == ShadowRoot::ClosedShadowRoot) |
- return shadowRoot->host()->renderer(); |
+ return shadowRoot->host()->layoutObject(); |
} |
} |
@@ -1309,7 +1309,7 @@ void LayerScrollableArea::updateScrollableAreaSet(bool hasOverflow) |
// FIXME: Does this need to be fixed later for OOPI? |
bool isVisibleToHitTest = box().visibleToHitTesting(); |
if (HTMLFrameOwnerElement* owner = frame->deprecatedLocalOwner()) |
- isVisibleToHitTest &= owner->renderer() && owner->renderer()->visibleToHitTesting(); |
+ isVisibleToHitTest &= owner->layoutObject() && owner->layoutObject()->visibleToHitTesting(); |
bool didScrollOverflow = m_scrollsOverflow; |
@@ -1359,7 +1359,7 @@ static bool layerNeedsCompositedScrolling(LayerScrollableArea::LCDTextMode mode, |
return layer->scrollsOverflow() |
&& !layer->hasDescendantWithClipPath() |
&& !layer->hasAncestorWithClipPath() |
- && !layer->renderer()->style()->hasBorderRadius(); |
+ && !layer->layoutObject()->style()->hasBorderRadius(); |
} |
void LayerScrollableArea::updateNeedsCompositedScrolling(LCDTextMode mode) |