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

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

Issue 585743003: Move paint code from RenderInline into InlinePainter. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Merged. 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
« no previous file with comments | « Source/core/core.gypi ('k') | Source/core/paint/InlinePainter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/paint/BlockPainter.cpp
diff --git a/Source/core/paint/BlockPainter.cpp b/Source/core/paint/BlockPainter.cpp
index 6b37767fd6dc1ebc0e70a9962952633adab6f5c8..a30889f0e291941424b5c8f6826ea20d86183cc5 100644
--- a/Source/core/paint/BlockPainter.cpp
+++ b/Source/core/paint/BlockPainter.cpp
@@ -11,6 +11,7 @@
#include "core/frame/Settings.h"
#include "core/page/Page.h"
#include "core/paint/BoxPainter.h"
+#include "core/paint/InlinePainter.h"
#include "core/rendering/GraphicsContextAnnotator.h"
#include "core/rendering/PaintInfo.h"
#include "core/rendering/RenderBlock.h"
@@ -447,7 +448,7 @@ void BlockPainter::paintContinuationOutlines(PaintInfo& info, const LayoutPoint&
if (!inlineEnclosedInSelfPaintingLayer && !m_renderBlock.hasLayer())
cb->addContinuationWithOutline(inlineRenderer);
else if (!inlineRenderer->firstLineBox() || (!inlineEnclosedInSelfPaintingLayer && m_renderBlock.hasLayer()))
- inlineRenderer->paintOutline(info, paintOffset - m_renderBlock.locationOffset() + inlineRenderer->containingBlock()->location());
+ InlinePainter(*inlineRenderer).paintOutline(info, paintOffset - m_renderBlock.locationOffset() + inlineRenderer->containingBlock()->location());
}
ContinuationOutlineTableMap* table = continuationOutlineTable();
@@ -468,7 +469,7 @@ void BlockPainter::paintContinuationOutlines(PaintInfo& info, const LayoutPoint&
for ( ; block && block != &m_renderBlock; block = block->containingBlock())
accumulatedPaintOffset.moveBy(block->location());
ASSERT(block);
- flow->paintOutline(info, accumulatedPaintOffset);
+ InlinePainter(*flow).paintOutline(info, accumulatedPaintOffset);
}
}
« no previous file with comments | « Source/core/core.gypi ('k') | Source/core/paint/InlinePainter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698