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

Side by Side Diff: Source/core/rendering/RenderLayerScrollableArea.cpp

Issue 732483003: Remove GestureScrollUpdateWithoutPropagation event (blink) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebase Created 6 years 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 unified diff | Download patch
« no previous file with comments | « Source/core/page/EventHandler.cpp ('k') | Source/platform/PlatformEvent.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
3 * 3 *
4 * Portions are Copyright (C) 1998 Netscape Communications Corporation. 4 * Portions are Copyright (C) 1998 Netscape Communications Corporation.
5 * 5 *
6 * Other contributors: 6 * Other contributors:
7 * Robert O'Callahan <roc+@cs.cmu.edu> 7 * Robert O'Callahan <roc+@cs.cmu.edu>
8 * David Baron <dbaron@fas.harvard.edu> 8 * David Baron <dbaron@fas.harvard.edu>
9 * Christian Biesinger <cbiesinger@web.de> 9 * Christian Biesinger <cbiesinger@web.de>
10 * Randall Jesup <rjesup@wgate.com> 10 * Randall Jesup <rjesup@wgate.com>
(...skipping 1320 matching lines...) Expand 10 before | Expand all | Expand 10 after
1331 IntPoint pos; 1331 IntPoint pos;
1332 const PlatformGestureEvent* gevt = 0; 1332 const PlatformGestureEvent* gevt = 0;
1333 1333
1334 switch (evt.type()) { 1334 switch (evt.type()) {
1335 case PlatformEvent::MouseMoved: 1335 case PlatformEvent::MouseMoved:
1336 if (!document.frame()->eventHandler().mousePressed()) 1336 if (!document.frame()->eventHandler().mousePressed())
1337 return; 1337 return;
1338 pos = static_cast<const PlatformMouseEvent*>(&evt)->position(); 1338 pos = static_cast<const PlatformMouseEvent*>(&evt)->position();
1339 break; 1339 break;
1340 case PlatformEvent::GestureScrollUpdate: 1340 case PlatformEvent::GestureScrollUpdate:
1341 case PlatformEvent::GestureScrollUpdateWithoutPropagation:
1342 pos = static_cast<const PlatformGestureEvent*>(&evt)->position(); 1341 pos = static_cast<const PlatformGestureEvent*>(&evt)->position();
1343 gevt = static_cast<const PlatformGestureEvent*>(&evt); 1342 gevt = static_cast<const PlatformGestureEvent*>(&evt);
1344 pos = gevt->position(); 1343 pos = gevt->position();
1345 pos.move(gevt->deltaX(), gevt->deltaY()); 1344 pos.move(gevt->deltaX(), gevt->deltaY());
1346 break; 1345 break;
1347 default: 1346 default:
1348 ASSERT_NOT_REACHED(); 1347 ASSERT_NOT_REACHED();
1349 } 1348 }
1350 1349
1351 float zoomFactor = box().style()->effectiveZoom(); 1350 float zoomFactor = box().style()->effectiveZoom();
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
1488 void RenderLayerScrollableArea::setTopmostScrollChild(RenderLayer* scrollChild) 1487 void RenderLayerScrollableArea::setTopmostScrollChild(RenderLayer* scrollChild)
1489 { 1488 {
1490 // We only want to track the topmost scroll child for scrollable areas with 1489 // We only want to track the topmost scroll child for scrollable areas with
1491 // overlay scrollbars. 1490 // overlay scrollbars.
1492 if (!hasOverlayScrollbars()) 1491 if (!hasOverlayScrollbars())
1493 return; 1492 return;
1494 m_nextTopmostScrollChild = scrollChild; 1493 m_nextTopmostScrollChild = scrollChild;
1495 } 1494 }
1496 1495
1497 } // namespace blink 1496 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/page/EventHandler.cpp ('k') | Source/platform/PlatformEvent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698