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

Unified Diff: third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp

Issue 2505943003: Rename positionNewFloats() to placeNewFloats(). (Closed)
Patch Set: Created 4 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
Index: third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp b/third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp
index d0eb69cc11e4d3ec7faf76bbadeb589d74b514fb..774c0aa4693a3ed422adf6b6b101feb88ea47ada 100644
--- a/third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp
@@ -1364,7 +1364,7 @@ void LayoutBlockFlow::linkToEndLineIfNeeded(LineLayoutState& layoutState) {
floatingObject->setOriginatingLine(line);
LayoutUnit logicalTop =
logicalTopForChild(*box) - marginBeforeForChild(*box) + delta;
- positionNewFloats(logicalTop);
+ placeNewFloats(logicalTop);
}
}
}
@@ -1379,7 +1379,7 @@ void LayoutBlockFlow::linkToEndLineIfNeeded(LineLayoutState& layoutState) {
// now. This has to be done before adding in the bottom border/padding, or the
// float will
// include the padding incorrectly. -dwh
- if (positionNewFloats(logicalHeight()) && lastRootBox())
+ if (placeNewFloats(logicalHeight()) && lastRootBox())
appendFloatsToLastLine(layoutState, InlineIterator(), InlineBidiResolver(),
BidiStatus());
}
@@ -1398,7 +1398,7 @@ void LayoutBlockFlow::markDirtyFloatsForPaintInvalidation(
}
insertFloatingObject(*f);
}
- positionNewFloats(logicalHeight());
+ placeNewFloats(logicalHeight());
}
// InlineMinMaxIterator is a class that will iterate over all layout objects
@@ -2088,7 +2088,7 @@ RootInlineBox* LayoutBlockFlow::determineStartPosition(
floatingObject->setOriginatingLine(line);
LayoutUnit logicalTop =
logicalTopForChild(*box) - marginBeforeForChild(*box);
- positionNewFloats(logicalTop);
+ placeNewFloats(logicalTop);
ASSERT(layoutState.floats()[numCleanFloats].object == box);
numCleanFloats++;
}

Powered by Google App Engine
This is Rietveld 408576698