Index: third_party/WebKit/Source/core/layout/LayoutObject.cpp |
diff --git a/third_party/WebKit/Source/core/layout/LayoutObject.cpp b/third_party/WebKit/Source/core/layout/LayoutObject.cpp |
index f1a02b92ae994f4d8b3b39d222de81e8fa5572c3..8d986a9b64cd425cce07d16f9d2c172754b02433 100644 |
--- a/third_party/WebKit/Source/core/layout/LayoutObject.cpp |
+++ b/third_party/WebKit/Source/core/layout/LayoutObject.cpp |
@@ -687,12 +687,15 @@ LayoutFlowThread* LayoutObject::locateFlowThreadContainingBlock() const { |
// See if we have the thread cached because we're in the middle of layout. |
if (LayoutState* layoutState = view()->layoutState()) { |
+ // TODO(mstensho): We should really just return whatever |
+ // layoutState->flowThread() returns here, also if the value is nullptr. |
if (LayoutFlowThread* flowThread = layoutState->flowThread()) |
return flowThread; |
} |
// Not in the middle of layout so have to find the thread the slow way. |
- return LayoutFlowThread::locateFlowThreadContainingBlockOf(*this); |
+ return LayoutFlowThread::locateFlowThreadContainingBlockOf( |
+ *this, LayoutFlowThread::AnyAncestor); |
} |
static inline bool objectIsRelayoutBoundary(const LayoutObject* object) { |