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

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

Issue 763173003: Convert RenderBlockFlow code to use FloatingObject references (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 1 month 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 | « no previous file | Source/core/rendering/FloatingObjects.cpp » ('j') | Source/core/rendering/FloatingObjects.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/paint/BlockFlowPainter.cpp
diff --git a/Source/core/paint/BlockFlowPainter.cpp b/Source/core/paint/BlockFlowPainter.cpp
index b6190e4ea9d5373c92daf33433067d8f01268436..c0ba126c52df82a769e8e399cef3a5a1ffcd1b1c 100644
--- a/Source/core/paint/BlockFlowPainter.cpp
+++ b/Source/core/paint/BlockFlowPainter.cpp
@@ -27,9 +27,9 @@ void BlockFlowPainter::paintFloats(const PaintInfo& paintInfo, const LayoutPoint
currentPaintInfo.phase = preservePhase ? paintInfo.phase : PaintPhaseBlockBackground;
// FIXME: LayoutPoint version of xPositionForFloatIncludingMargin would make this much cleaner.
LayoutPoint childPoint = m_renderBlockFlow.flipFloatForWritingModeForChild(
- floatingObject, LayoutPoint(paintOffset.x()
- + m_renderBlockFlow.xPositionForFloatIncludingMargin(floatingObject) - floatingObject->renderer()->x(), paintOffset.y()
- + m_renderBlockFlow.yPositionForFloatIncludingMargin(floatingObject) - floatingObject->renderer()->y()));
+ *floatingObject, LayoutPoint(paintOffset.x()
+ + m_renderBlockFlow.xPositionForFloatIncludingMargin(*floatingObject) - floatingObject->renderer()->x(), paintOffset.y()
+ + m_renderBlockFlow.yPositionForFloatIncludingMargin(*floatingObject) - floatingObject->renderer()->y()));
floatingObject->renderer()->paint(currentPaintInfo, childPoint);
if (!preservePhase) {
currentPaintInfo.phase = PaintPhaseChildBlockBackgrounds;
« no previous file with comments | « no previous file | Source/core/rendering/FloatingObjects.cpp » ('j') | Source/core/rendering/FloatingObjects.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698