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

Unified Diff: Source/core/paint/BlockPainter.cpp

Issue 892293002: First version of new merge algorithm (not enabled yet) (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Traverse indices vector 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
Index: Source/core/paint/BlockPainter.cpp
diff --git a/Source/core/paint/BlockPainter.cpp b/Source/core/paint/BlockPainter.cpp
index 078b8c3a2186ef124343eceabd885e04625cbded..0974c808bacabbae9ee12e2e413f06ec1ccf1dd1 100644
--- a/Source/core/paint/BlockPainter.cpp
+++ b/Source/core/paint/BlockPainter.cpp
@@ -19,6 +19,7 @@
#include "core/paint/RenderDrawingRecorder.h"
#include "core/paint/ScrollRecorder.h"
#include "core/paint/ScrollableAreaPainter.h"
+#include "core/paint/SubtreeInfoRecorder.h"
#include "core/rendering/PaintInfo.h"
#include "core/rendering/RenderBlock.h"
#include "core/rendering/RenderFlexibleBox.h"
@@ -32,6 +33,7 @@ namespace blink {
void BlockPainter::paint(const PaintInfo& paintInfo, const LayoutPoint& paintOffset)
{
+ SubtreeInfoRecorder subtreeInfoRecorder(paintInfo.context, m_renderBlock, paintInfo.phase);
PaintInfo localPaintInfo(paintInfo);
ANNOTATE_GRAPHICS_CONTEXT(localPaintInfo, &m_renderBlock);
@@ -51,6 +53,8 @@ void BlockPainter::paint(const PaintInfo& paintInfo, const LayoutPoint& paintOff
return;
}
+ subtreeInfoRecorder.begin();
+
// There are some cases where not all clipped visual overflow is accounted for.
// FIXME: reduce the number of such cases.
ContentsClipBehavior contentsClipBehavior = ForceContentsClip;

Powered by Google App Engine
This is Rietveld 408576698