| Index: third_party/WebKit/Source/core/frame/FrameView.cpp
|
| diff --git a/third_party/WebKit/Source/core/frame/FrameView.cpp b/third_party/WebKit/Source/core/frame/FrameView.cpp
|
| index 8e3966173f04510d92f6e7aa796d111483da55b4..b4642f00293f08870427bb130d1dae3ccaf496b2 100644
|
| --- a/third_party/WebKit/Source/core/frame/FrameView.cpp
|
| +++ b/third_party/WebKit/Source/core/frame/FrameView.cpp
|
| @@ -2556,16 +2556,15 @@ void FrameView::updateStyleAndLayoutIfNeededRecursive()
|
| // To avoid pushing an invalid tree for display, we have to check for this case and do another
|
| // style recalc. The extra style recalc needs to happen after our child <iframes> were updated.
|
| // FIXME: We shouldn't be triggering an extra style recalc in the first place.
|
| - if (m_frame->document()->hasSVGFilterElementsRequiringLayerUpdate()) {
|
| - m_frame->document()->updateLayoutTreeIfNeeded();
|
| + // if (m_frame->document()->hasSVGFilterElementsRequiringLayerUpdate()) {
|
| + // m_frame->document()->updateLayoutTreeIfNeeded();
|
|
|
| - if (needsLayout())
|
| - layout();
|
| - }
|
| + // if (needsLayout())
|
| + // layout();
|
| + // }
|
|
|
| // These asserts ensure that parent frames are clean, when child frames finished updating layout and style.
|
| ASSERT(!needsLayout());
|
| - ASSERT(!m_frame->document()->hasSVGFilterElementsRequiringLayerUpdate());
|
| #if ENABLE(ASSERT)
|
| m_frame->document()->layoutView()->assertLaidOut();
|
| #endif
|
|
|