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

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: Address Review Comments Created 5 years, 9 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/BlockFlowPainter.cpp
diff --git a/Source/core/paint/BlockFlowPainter.cpp b/Source/core/paint/BlockFlowPainter.cpp
index 4c561efffda055a5c0521d53cf712c48e5246f11..7999439e20404567bb8cbb779cd9f58a5bb5dbd5 100644
--- a/Source/core/paint/BlockFlowPainter.cpp
+++ b/Source/core/paint/BlockFlowPainter.cpp
@@ -29,9 +29,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_layoutBlockFlow.flipFloatForWritingModeForChild(
- floatingObject, LayoutPoint(paintOffset.x()
- + m_layoutBlockFlow.xPositionForFloatIncludingMargin(floatingObject) - floatingObject->layoutObject()->location().x(), paintOffset.y()
- + m_layoutBlockFlow.yPositionForFloatIncludingMargin(floatingObject) - floatingObject->layoutObject()->location().y()));
+ *floatingObject, LayoutPoint(paintOffset.x()
+ + m_layoutBlockFlow.xPositionForFloatIncludingMargin(*floatingObject) - floatingObject->layoutObject()->location().x(), paintOffset.y()
+ + m_layoutBlockFlow.yPositionForFloatIncludingMargin(*floatingObject) - floatingObject->layoutObject()->location().y()));
floatingObject->layoutObject()->paint(currentPaintInfo, childPoint);
if (!preservePhase) {
currentPaintInfo.phase = PaintPhaseChildBlockBackgrounds;

Powered by Google App Engine
This is Rietveld 408576698