Index: third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp |
diff --git a/third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp b/third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp |
index 5bc764405211b05a2e686e5006311afe10ca48c3..e95f037153fe4d5ab961f7e2ea9809ce9bbf8c1b 100644 |
--- a/third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp |
+++ b/third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp |
@@ -30,6 +30,7 @@ |
#include "core/layout/LayoutBlockFlow.h" |
+#include <memory> |
#include "core/editing/Editor.h" |
#include "core/frame/FrameView.h" |
#include "core/frame/LocalFrame.h" |
@@ -38,6 +39,7 @@ |
#include "core/layout/LayoutAnalyzer.h" |
#include "core/layout/LayoutFlowThread.h" |
#include "core/layout/LayoutInline.h" |
+#include "core/layout/LayoutListItem.h" |
#include "core/layout/LayoutMultiColumnFlowThread.h" |
#include "core/layout/LayoutMultiColumnSpannerPlaceholder.h" |
#include "core/layout/LayoutPagedFlowThread.h" |
@@ -52,7 +54,6 @@ |
#include "core/paint/PaintLayer.h" |
#include "platform/RuntimeEnabledFeatures.h" |
#include "wtf/PtrUtil.h" |
-#include <memory> |
namespace blink { |
@@ -885,7 +886,10 @@ void LayoutBlockFlow::layoutBlockChild(LayoutBox& child, |
// Update our height now that the child has been placed in the correct |
// position. |
- setLogicalHeight(logicalHeight() + logicalHeightForChild(child)); |
+ if (isListItem()) |
+ toLayoutListItem(this)->addLogicalHeightFromChild(child); |
mstensho (USE GERRIT)
2017/03/20 10:19:01
Without this special-code, the list item marker wo
cathiechentx
2017/03/20 12:56:44
Yeah, that make sense. But I'm concerned about the
mstensho (USE GERRIT)
2017/03/20 13:51:20
Looks like Firefox doesn't really put the marker n
cathiechentx
2017/03/21 14:07:08
Thanks very much for the patient explanation! This
mstensho (USE GERRIT)
2017/03/22 22:28:55
Yes, I think you should omit the addLogicalHeightF
cathiechentx
2017/03/23 10:13:27
OK, that will be done.
|
+ else |
+ setLogicalHeight(logicalHeight() + logicalHeightForChild(child)); |
if (mustSeparateMarginAfterForChild(child)) { |
setLogicalHeight(logicalHeight() + marginAfterForChild(child)); |
marginInfo.clearMargin(); |