Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(906)

Unified Diff: third_party/WebKit/Source/core/frame/FrameView.cpp

Issue 2662153004: Don't update main thread scroll reasons on a throttled frame. (Closed)
Patch Set: Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 9c2a250fdc0917d248438f7d1e7bfd841be0f1ef..26314318f1e8ebc1f868159cd7d8ba08b14ac9e7 100644
--- a/third_party/WebKit/Source/core/frame/FrameView.cpp
+++ b/third_party/WebKit/Source/core/frame/FrameView.cpp
@@ -4888,10 +4888,13 @@ void FrameView::updateSubFrameScrollOnMainReason(
if (!frame.isLocalFrame())
return;
- if (!toLocalFrame(frame).view()->layerForScrolling())
+ FrameView& frameView = *toLocalFrame(frame).view();
+ if (frameView.shouldThrottleRendering())
+ return;
+ if (!frameView.layerForScrolling())
return;
- reasons |= toLocalFrame(frame).view()->mainThreadScrollingReasonsPerFrame();
+ reasons |= frameView.mainThreadScrollingReasonsPerFrame();
if (GraphicsLayer* layerForScrolling = toLocalFrame(frame)
.view()
->layoutViewportScrollableArea()
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698