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 a81c4447504eac6862e5716524517fc60d42c3dc..b18d8775da1e5a6dc2459865cc3df4d55a7ab60f 100644 |
--- a/third_party/WebKit/Source/core/frame/FrameView.cpp |
+++ b/third_party/WebKit/Source/core/frame/FrameView.cpp |
@@ -1628,20 +1628,20 @@ void FrameView::viewportSizeChanged(bool widthChanged, bool heightChanged) { |
DCHECK(widthChanged || heightChanged); |
DCHECK(m_frame->page()); |
+ bool rootLayerScrollingEnabled = |
+ RuntimeEnabledFeatures::rootLayerScrollingEnabled(); |
+ |
if (LayoutViewItem layoutView = this->layoutViewItem()) { |
- if (layoutView.usesCompositing()) |
- layoutView.compositor()->frameViewDidChangeSize(); |
+ if (layoutView.usesCompositing()) { |
+ if (rootLayerScrollingEnabled) |
+ layoutView.layer()->setNeedsCompositingInputsUpdate(); |
chrishtr
2017/03/16 18:46:57
This is new since last time you landed - a new dep
bokan
2017/03/16 18:59:48
So I'm hitting a DCHECK in RLS tests without this:
Xianzhu
2017/03/16 19:16:54
I'm trying to understand the error, and have some
bokan
2017/03/16 20:11:09
It shouldn't affect a regular LayoutBlockFlow at a
Xianzhu
2017/03/21 16:59:56
Did these tests all fail with error messages simil
Xianzhu
2017/03/21 17:26:41
I just tried the patch and found that all the fail
bokan
2017/03/23 15:09:57
Yeah, sorry, I think I may have pasted that DCHECK
Xianzhu
2017/03/23 15:39:16
It's better to be guarded to be consistent with ot
bokan
2017/03/23 16:01:03
Done.
|
+ else |
+ layoutView.compositor()->frameViewDidChangeSize(); |
+ } |
} |
- // Ensure the root scroller compositing layers update geometry in response to |
- // the URL bar resizing. |
- if (m_frame->isMainFrame()) |
- m_frame->page()->globalRootScrollerController().mainFrameViewResized(); |
- |
showOverlayScrollbars(); |
- bool rootLayerScrollingEnabled = |
- RuntimeEnabledFeatures::rootLayerScrollingEnabled(); |
if (rootLayerScrollingEnabled) { |
// The background must be repainted when the FrameView is resized, even if |
// the initial containing block does not change (so we can't rely on layout |