Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(889)

Unified Diff: Source/core/layout/LayerScrollableArea.cpp

Issue 899163003: Move rendering/RenderObject to layout/LayoutObject. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/layout/LayerPaintingInfo.h ('k') | Source/core/layout/LayerStackingNode.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayerScrollableArea.cpp
diff --git a/Source/core/layout/LayerScrollableArea.cpp b/Source/core/layout/LayerScrollableArea.cpp
index d9ce23eb7957a859bac1399023234137652a6083..37d9d687064546115b53517b4f11b8445e382c5b 100644
--- a/Source/core/layout/LayerScrollableArea.cpp
+++ b/Source/core/layout/LayerScrollableArea.cpp
@@ -891,7 +891,7 @@ IntSize LayerScrollableArea::scrollbarOffset(const Scrollbar* scrollbar) const
return IntSize();
}
-static inline RenderObject* rendererForScrollbar(RenderObject& renderer)
+static inline LayoutObject* rendererForScrollbar(LayoutObject& renderer)
{
if (Node* node = renderer.node()) {
if (ShadowRoot* shadowRoot = node->containingShadowRoot()) {
@@ -906,7 +906,7 @@ static inline RenderObject* rendererForScrollbar(RenderObject& renderer)
PassRefPtrWillBeRawPtr<Scrollbar> LayerScrollableArea::createScrollbar(ScrollbarOrientation orientation)
{
RefPtrWillBeRawPtr<Scrollbar> widget = nullptr;
- RenderObject* actualRenderer = rendererForScrollbar(box());
+ LayoutObject* actualRenderer = rendererForScrollbar(box());
bool hasCustomScrollbarStyle = actualRenderer->isBox() && actualRenderer->style()->hasPseudoStyle(SCROLLBAR);
if (hasCustomScrollbarStyle) {
widget = RenderScrollbar::createCustomScrollbar(this, orientation, actualRenderer->node());
@@ -1048,7 +1048,7 @@ void LayerScrollableArea::updateScrollCornerStyle()
if (!m_scrollCorner && hasOverlayScrollbars())
return;
- RenderObject* actualRenderer = rendererForScrollbar(box());
+ LayoutObject* actualRenderer = rendererForScrollbar(box());
RefPtr<RenderStyle> corner = box().hasOverflowClip() ? actualRenderer->getUncachedPseudoStyle(PseudoStyleRequest(SCROLLBAR_CORNER), actualRenderer->style()) : PassRefPtr<RenderStyle>(nullptr);
if (corner) {
if (!m_scrollCorner) {
@@ -1176,7 +1176,7 @@ void LayerScrollableArea::updateResizerStyle()
if (!m_resizer && !box().canResize())
return;
- RenderObject* actualRenderer = rendererForScrollbar(box());
+ LayoutObject* actualRenderer = rendererForScrollbar(box());
RefPtr<RenderStyle> resizer = box().hasOverflowClip() ? actualRenderer->getUncachedPseudoStyle(PseudoStyleRequest(RESIZER), actualRenderer->style()) : PassRefPtr<RenderStyle>(nullptr);
if (resizer) {
if (!m_resizer) {
« no previous file with comments | « Source/core/layout/LayerPaintingInfo.h ('k') | Source/core/layout/LayerStackingNode.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698