| 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
|
|
|