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

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

Issue 1246363002: Avoid updating compositor animations in hitTest path (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 5 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: Source/core/frame/FrameView.cpp
diff --git a/Source/core/frame/FrameView.cpp b/Source/core/frame/FrameView.cpp
index d636f5a92193628c3566f76d3d61a829585ff524..94e94ab8376654b5902882265bb4bf5a5b58eaf4 100644
--- a/Source/core/frame/FrameView.cpp
+++ b/Source/core/frame/FrameView.cpp
@@ -2458,7 +2458,7 @@ void FrameView::updateLifecycleToCompositingCleanPlusScrolling()
{
frame().localFrameRoot()->view()->updateStyleAndLayoutIfNeededRecursive();
LayoutView* view = layoutView();
- if (view)
+ if (view && !view->compositor()->inCompositingMode())
view->compositor()->updateIfNeededRecursive();
chrishtr 2015/07/22 14:14:20 updateIfNeededRecursive() should be a no-op if cal
scrollContentsIfNeededRecursive();
« 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