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

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

Issue 926193003: Move rendering/RenderBox to layout/LayoutBox. (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/LayerScrollableArea.h ('k') | Source/core/layout/LayerStackingNode.h » ('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 72f0625a323e2926388d40c822c6a4407e29f484..6d879b9e0a6e03a4509f01d9ecc24aafe10aae06 100644
--- a/Source/core/layout/LayerScrollableArea.cpp
+++ b/Source/core/layout/LayerScrollableArea.cpp
@@ -557,9 +557,9 @@ int LayerScrollableArea::pageStep(ScrollbarOrientation orientation) const
return max(pageStep, 1);
}
-RenderBox& LayerScrollableArea::box() const
+LayoutBox& LayerScrollableArea::box() const
{
- return *m_layer.renderBox();
+ return *m_layer.layoutBox();
}
Layer* LayerScrollableArea::layer() const
@@ -758,7 +758,7 @@ static bool overflowDefinesAutomaticScrollbar(EOverflow overflow)
// FIXME: we should use the same scrolling machinery for both the viewport and
// overflow. Currently, we need to avoid producing scrollbars here if they'll be
// handled externally in the RLC.
-static bool canHaveOverflowScrollbars(const RenderBox& box)
+static bool canHaveOverflowScrollbars(const LayoutBox& box)
{
bool rootLayerScrolls = box.document().settings() && box.document().settings()->rootLayerScrolls();
return (rootLayerScrolls || !box.isRenderView()) && box.document().viewportDefiningElement() != box.node();
« no previous file with comments | « Source/core/layout/LayerScrollableArea.h ('k') | Source/core/layout/LayerStackingNode.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698