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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_aura.cc

Issue 1218663006: Use new WebTouchPoint field names. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/renderer_host/render_widget_host_view_aura.h" 5 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "base/auto_reset.h" 9 #include "base/auto_reset.h"
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 } 278 }
279 279
280 // Reset unchanged touch point to StateStationary for touchmove and 280 // Reset unchanged touch point to StateStationary for touchmove and
281 // touchcancel. 281 // touchcancel.
282 void MarkUnchangedTouchPointsAsStationary( 282 void MarkUnchangedTouchPointsAsStationary(
283 blink::WebTouchEvent* event, 283 blink::WebTouchEvent* event,
284 int changed_touch_id) { 284 int changed_touch_id) {
285 if (event->type == blink::WebInputEvent::TouchMove || 285 if (event->type == blink::WebInputEvent::TouchMove ||
286 event->type == blink::WebInputEvent::TouchCancel) { 286 event->type == blink::WebInputEvent::TouchCancel) {
287 for (size_t i = 0; i < event->touchesLength; ++i) { 287 for (size_t i = 0; i < event->touchesLength; ++i) {
288 if (event->touches[i].id != changed_touch_id) 288 if (event->touches[i].pointerId != changed_touch_id)
289 event->touches[i].state = blink::WebTouchPoint::StateStationary; 289 event->touches[i].state = blink::WebTouchPoint::StateStationary;
290 } 290 }
291 } 291 }
292 } 292 }
293 293
294 } // namespace 294 } // namespace
295 295
296 // We need to watch for mouse events outside a Web Popup or its parent 296 // We need to watch for mouse events outside a Web Popup or its parent
297 // and dismiss the popup for certain events. 297 // and dismiss the popup for certain events.
298 class RenderWidgetHostViewAura::EventFilterForPopupExit 298 class RenderWidgetHostViewAura::EventFilterForPopupExit
(...skipping 2493 matching lines...) Expand 10 before | Expand all | Expand 10 after
2792 2792
2793 //////////////////////////////////////////////////////////////////////////////// 2793 ////////////////////////////////////////////////////////////////////////////////
2794 // RenderWidgetHostViewBase, public: 2794 // RenderWidgetHostViewBase, public:
2795 2795
2796 // static 2796 // static
2797 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { 2797 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) {
2798 GetScreenInfoForWindow(results, NULL); 2798 GetScreenInfoForWindow(results, NULL);
2799 } 2799 }
2800 2800
2801 } // namespace content 2801 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698