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

Unified Diff: Source/core/rendering/RenderBox.cpp

Issue 559733005: Move painting code from RenderBoxModelObject into BoxPainter. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 3 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
Index: Source/core/rendering/RenderBox.cpp
diff --git a/Source/core/rendering/RenderBox.cpp b/Source/core/rendering/RenderBox.cpp
index 7fafa29ea302ac3326f9d2db3e4c2a0254b92f57..2784d0c6ffd087548239f5b488c3a1be15417008 100644
--- a/Source/core/rendering/RenderBox.cpp
+++ b/Source/core/rendering/RenderBox.cpp
@@ -40,6 +40,7 @@
#include "core/page/AutoscrollController.h"
#include "core/page/EventHandler.h"
#include "core/page/Page.h"
+#include "core/paint/BackgroundImageGeometry.h"
#include "core/paint/BoxPainter.h"
#include "core/rendering/HitTestResult.h"
#include "core/rendering/PaintInfo.h"
@@ -1087,7 +1088,7 @@ void RenderBox::paintBoxDecorationBackground(PaintInfo& paintInfo, const LayoutP
}
-bool RenderBox::getBackgroundPaintedExtent(LayoutRect& paintedExtent) const
+bool RenderBox::getBackgroundPaintedExtent(LayoutRect& paintedExtent)
{
ASSERT(hasBackground());
LayoutRect backgroundRect = pixelSnappedIntRect(borderBoxRect());
@@ -1104,7 +1105,7 @@ bool RenderBox::getBackgroundPaintedExtent(LayoutRect& paintedExtent) const
}
BackgroundImageGeometry geometry;
- calculateBackgroundImageGeometry(0, style()->backgroundLayers(), backgroundRect, geometry);
+ BoxPainter(*this).calculateBackgroundImageGeometry(0, style()->backgroundLayers(), backgroundRect, geometry);
pdr. 2014/09/11 05:59:13 I only saw that this changed after BoxPainter land
chrishtr 2014/09/11 17:45:53 Ack.
if (geometry.hasNonLocalGeometry())
return false;
paintedExtent = geometry.destRect();

Powered by Google App Engine
This is Rietveld 408576698