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

Unified Diff: Source/core/paint/ViewPainter.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/paint/ViewPainter.h ('k') | Source/core/plugins/PluginOcclusionSupport.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/paint/ViewPainter.cpp
diff --git a/Source/core/paint/ViewPainter.cpp b/Source/core/paint/ViewPainter.cpp
index 312cff7cf185ebf2801bd7b7e8f0891e0399afb3..78647994aa32c5b6980f023e524415bf5d3da6a6 100644
--- a/Source/core/paint/ViewPainter.cpp
+++ b/Source/core/paint/ViewPainter.cpp
@@ -6,11 +6,11 @@
#include "core/paint/ViewPainter.h"
#include "core/frame/FrameView.h"
+#include "core/layout/LayoutBox.h"
#include "core/layout/PaintInfo.h"
#include "core/paint/BlockPainter.h"
#include "core/paint/GraphicsContextAnnotator.h"
#include "core/paint/RenderDrawingRecorder.h"
-#include "core/rendering/RenderBox.h"
#include "core/rendering/RenderView.h"
namespace blink {
@@ -39,7 +39,7 @@ void ViewPainter::paint(const PaintInfo& paintInfo, const LayoutPoint& paintOffs
BlockPainter(m_renderView).paintOverflowControlsIfNeeded(paintInfo, paintOffset);
}
-static inline bool rendererObscuresBackground(RenderBox* rootBox)
+static inline bool rendererObscuresBackground(LayoutBox* rootBox)
{
ASSERT(rootBox);
const LayoutStyle& style = rootBox->styleRef();
@@ -69,7 +69,7 @@ void ViewPainter::paintBoxDecorationBackground(const PaintInfo& paintInfo)
bool shouldPaintBackground = true;
Node* documentElement = m_renderView.document().documentElement();
- if (RenderBox* rootBox = documentElement ? toRenderBox(documentElement->renderer()) : 0)
+ if (LayoutBox* rootBox = documentElement ? toLayoutBox(documentElement->renderer()) : 0)
shouldPaintBackground = !rootFillsViewportBackground(rootBox) || !rendererObscuresBackground(rootBox);
// If painting will entirely fill the view, no need to fill the background.
@@ -100,7 +100,7 @@ void ViewPainter::paintBoxDecorationBackground(const PaintInfo& paintInfo)
}
}
-bool ViewPainter::rootFillsViewportBackground(RenderBox* rootBox) const
+bool ViewPainter::rootFillsViewportBackground(LayoutBox* rootBox) const
{
ASSERT(rootBox);
// CSS Boxes always fill the viewport background (see paintRootBoxFillLayers)
« no previous file with comments | « Source/core/paint/ViewPainter.h ('k') | Source/core/plugins/PluginOcclusionSupport.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698