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

Unified Diff: third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp

Issue 2015783002: Invalidate touchEventTargetRects in ScrollingCoordinator when toggling touch emulation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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
Index: third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp
diff --git a/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp b/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp
index 24e4dc1b671fffe8f58b00f686509bf9be4d7d7c..9bafe0a16940bdda149c78b5c1942491385a2556 100644
--- a/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp
+++ b/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp
@@ -550,9 +550,6 @@ void ScrollingCoordinator::updateTouchEventTargetRectsIfNeeded()
{
TRACE_EVENT0("input", "ScrollingCoordinator::updateTouchEventTargetRectsIfNeeded");
- if (!RuntimeEnabledFeatures::touchEnabled())
- return;
-
LayerHitTestRects touchEventTargetRects;
computeTouchEventTargetRects(touchEventTargetRects);
setTouchEventTargetRects(touchEventTargetRects);
@@ -860,7 +857,8 @@ static void accumulateDocumentTouchEventTargetRects(LayerHitTestRects& rects, co
void ScrollingCoordinator::computeTouchEventTargetRects(LayerHitTestRects& rects)
{
TRACE_EVENT0("input", "ScrollingCoordinator::computeTouchEventTargetRects");
- ASSERT(RuntimeEnabledFeatures::touchEnabled());
+ if (!RuntimeEnabledFeatures::touchEnabled())
+ return;
Document* document = m_page->deprecatedLocalMainFrame()->document();
if (!document || !document->view())

Powered by Google App Engine
This is Rietveld 408576698