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

Side by Side Diff: third_party/WebKit/Source/web/WebViewImpl.cpp

Issue 1403893003: Plumb gesture source value through Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add missing sourceDevice initialization in EventSender. Created 5 years, 2 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 1856 matching lines...) Expand 10 before | Expand all | Expand 10 after
1867 1867
1868 // Create synthetic wheel events as necessary for fling. 1868 // Create synthetic wheel events as necessary for fling.
1869 if (m_gestureAnimation) { 1869 if (m_gestureAnimation) {
1870 if (m_gestureAnimation->animate(frameTime.lastFrameTimeMonotonic)) 1870 if (m_gestureAnimation->animate(frameTime.lastFrameTimeMonotonic))
1871 scheduleAnimation(); 1871 scheduleAnimation();
1872 else { 1872 else {
1873 endActiveFlingAnimation(); 1873 endActiveFlingAnimation();
1874 1874
1875 PlatformGestureEvent endScrollEvent(PlatformEvent::GestureScrollEnd, 1875 PlatformGestureEvent endScrollEvent(PlatformEvent::GestureScrollEnd,
1876 m_positionOnFlingStart, m_globalPositionOnFlingStart, 1876 m_positionOnFlingStart, m_globalPositionOnFlingStart,
1877 IntSize(), 0, PlatformEvent::NoModifiers); 1877 IntSize(), 0, PlatformEvent::NoModifiers, PlatformGestureSourceU ninitialized);
tdresser 2015/10/14 15:14:20 Uninitialized doesn't feel quite right here. It mi
wjmaclean 2015/10/14 15:55:09 Done. Turns out WebViewImpl already had a var for
1878 endScrollEvent.setScrollGestureData(0, 0, 0, 0, true, false, -1 /* n ull plugin id */); 1878 endScrollEvent.setScrollGestureData(0, 0, 0, 0, true, false, -1 /* n ull plugin id */);
1879 1879
1880 mainFrameImpl()->frame()->eventHandler().handleGestureScrollEnd(endS crollEvent); 1880 mainFrameImpl()->frame()->eventHandler().handleGestureScrollEnd(endS crollEvent);
1881 } 1881 }
1882 } 1882 }
1883 1883
1884 if (!m_page) 1884 if (!m_page)
1885 return; 1885 return;
1886 1886
1887 PageWidgetDelegate::animate(*m_page, frameTime.lastFrameTimeMonotonic); 1887 PageWidgetDelegate::animate(*m_page, frameTime.lastFrameTimeMonotonic);
(...skipping 2562 matching lines...) Expand 10 before | Expand all | Expand 10 after
4450 if (m_pageColorOverlay) 4450 if (m_pageColorOverlay)
4451 m_pageColorOverlay->update(); 4451 m_pageColorOverlay->update();
4452 if (InspectorOverlay* overlay = inspectorOverlay()) { 4452 if (InspectorOverlay* overlay = inspectorOverlay()) {
4453 PageOverlay* inspectorPageOverlay = overlay->pageOverlay(); 4453 PageOverlay* inspectorPageOverlay = overlay->pageOverlay();
4454 if (inspectorPageOverlay) 4454 if (inspectorPageOverlay)
4455 inspectorPageOverlay->update(); 4455 inspectorPageOverlay->update();
4456 } 4456 }
4457 } 4457 }
4458 4458
4459 } // namespace blink 4459 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698