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

Unified Diff: Source/core/rendering/RenderListItem.cpp

Issue 166033009: *** FOR PROTOTYPE PURPOSES ONLY! NOT INTENDED FOR COMMIT! *** (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 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/rendering/RenderListItem.cpp
diff --git a/Source/core/rendering/RenderListItem.cpp b/Source/core/rendering/RenderListItem.cpp
index 3b6b21cb02b08fd33e2504c331faf990cd082dff..2367f0a93058ddede84c670fc34aadfcf1f05fac 100644
--- a/Source/core/rendering/RenderListItem.cpp
+++ b/Source/core/rendering/RenderListItem.cpp
@@ -315,6 +315,16 @@ void RenderListItem::updateMarkerLocation()
void RenderListItem::layout()
{
+ internalLayout(true);
+}
+
+void RenderListItem::preLayout()
+{
+ internalLayout(false);
+}
+
+void RenderListItem::internalLayout(bool fullLayout)
+{
ASSERT(needsLayout());
// The marker must be autosized before calling updateMarkerLocation.
@@ -325,7 +335,15 @@ void RenderListItem::layout()
LayoutRectRecorder recorder(*this);
updateMarkerLocation();
- RenderBlockFlow::layout();
+ if (fullLayout)
+ RenderBlockFlow::layout(); // this will traverse children...
+ else
+ RenderBlockFlow::preLayout();
+}
+
+void RenderListItem::postLayout()
+{
+ RenderBlockFlow::postLayout();
}
void RenderListItem::addOverflowFromChildren()

Powered by Google App Engine
This is Rietveld 408576698