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

Unified Diff: third_party/WebKit/Source/core/dom/Element.cpp

Issue 2120373002: Disable compositing asserts when gesture scrolling on main thread (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 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 | third_party/WebKit/Source/core/input/ScrollManager.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/dom/Element.cpp
diff --git a/third_party/WebKit/Source/core/dom/Element.cpp b/third_party/WebKit/Source/core/dom/Element.cpp
index c629e44e6990fabdeb60bb1f746c2c3e3b8dcffc..64078d5d5cb7ffb077873b5de04c49eb60fe3a91 100644
--- a/third_party/WebKit/Source/core/dom/Element.cpp
+++ b/third_party/WebKit/Source/core/dom/Element.cpp
@@ -598,6 +598,10 @@ void Element::nativeApplyScroll(ScrollState& scrollState)
void Element::callApplyScroll(ScrollState& scrollState)
{
+ // Hits ASSERTs when trying to determine whether we need to scroll on main
+ // or CC. http://crbug.com/625676.
+ DisableCompositingQueryAsserts disabler;
+
ScrollStateCallback* callback = scrollCustomizationCallbacks().getApplyScroll(this);
// TODO(bokan): Need to add tests before we allow calling custom callbacks
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/input/ScrollManager.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698