| Index: third_party/WebKit/Source/core/layout/LayoutView.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutView.cpp b/third_party/WebKit/Source/core/layout/LayoutView.cpp
|
| index ec371a82dda91a49f58758a507a62571efa5b3a1..c63dac00fe9d70a856f0ae3fa63b7986ab62ec10 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutView.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutView.cpp
|
| @@ -41,6 +41,7 @@
|
| #include "core/paint/ViewPainter.h"
|
| #include "core/svg/SVGDocumentExtensions.h"
|
| #include "platform/Histogram.h"
|
| +#include "platform/RuntimeEnabledFeatures.h"
|
| #include "platform/geometry/FloatQuad.h"
|
| #include "platform/geometry/TransformState.h"
|
| #include "platform/graphics/paint/PaintController.h"
|
| @@ -187,6 +188,15 @@ bool LayoutView::isChildAllowed(LayoutObject* child,
|
| return child->isBox();
|
| }
|
|
|
| +bool LayoutView::canHaveChildren() const {
|
| + FrameOwner* owner = frame()->owner();
|
| + if (!owner)
|
| + return true;
|
| + if (!RuntimeEnabledFeatures::displayNoneIFrameCreatesNoLayoutObjectEnabled())
|
| + return true;
|
| + return !owner->isDisplayNone();
|
| +}
|
| +
|
| void LayoutView::layoutContent() {
|
| ASSERT(needsLayout());
|
|
|
|
|