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

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

Issue 134683004: Disabled pinch zooming in non-browser Aura windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 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 | Annotate | Revision Log
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_impl.h" 5 #include "content/browser/renderer_host/render_widget_host_impl.h"
6 6
7 #include <math.h> 7 #include <math.h>
8 #include <set> 8 #include <set>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 984 matching lines...) Expand 10 before | Expand all | Expand 10 after
995 } 995 }
996 996
997 void RenderWidgetHostImpl::ForwardGestureEventWithLatencyInfo( 997 void RenderWidgetHostImpl::ForwardGestureEventWithLatencyInfo(
998 const blink::WebGestureEvent& gesture_event, 998 const blink::WebGestureEvent& gesture_event,
999 const ui::LatencyInfo& ui_latency) { 999 const ui::LatencyInfo& ui_latency) {
1000 TRACE_EVENT0("input", "RenderWidgetHostImpl::ForwardGestureEvent"); 1000 TRACE_EVENT0("input", "RenderWidgetHostImpl::ForwardGestureEvent");
1001 // Early out if necessary, prior to performing latency logic. 1001 // Early out if necessary, prior to performing latency logic.
1002 if (IgnoreInputEvents()) 1002 if (IgnoreInputEvents())
1003 return; 1003 return;
1004 1004
1005 if (delegate_->PreHandleGestureEvent(gesture_event))
1006 return;
1007
1005 ui::LatencyInfo latency_info = 1008 ui::LatencyInfo latency_info =
1006 CreateRWHLatencyInfoIfNotExist(&ui_latency, gesture_event.type); 1009 CreateRWHLatencyInfoIfNotExist(&ui_latency, gesture_event.type);
1007 1010
1008 if (gesture_event.type == blink::WebInputEvent::GestureScrollUpdate) { 1011 if (gesture_event.type == blink::WebInputEvent::GestureScrollUpdate) {
1009 latency_info.AddLatencyNumber( 1012 latency_info.AddLatencyNumber(
1010 ui::INPUT_EVENT_LATENCY_SCROLL_UPDATE_RWH_COMPONENT, 1013 ui::INPUT_EVENT_LATENCY_SCROLL_UPDATE_RWH_COMPONENT,
1011 GetLatencyComponentId(), 1014 GetLatencyComponentId(),
1012 ++last_input_number_); 1015 ++last_input_number_);
1013 1016
1014 // Make a copy of the INPUT_EVENT_LATENCY_ORIGINAL_COMPONENT with a 1017 // Make a copy of the INPUT_EVENT_LATENCY_ORIGINAL_COMPONENT with a
(...skipping 1554 matching lines...) Expand 10 before | Expand all | Expand 10 after
2569 } 2572 }
2570 } 2573 }
2571 2574
2572 // Add newly generated components into the latency info 2575 // Add newly generated components into the latency info
2573 for (lc = new_components.begin(); lc != new_components.end(); ++lc) { 2576 for (lc = new_components.begin(); lc != new_components.end(); ++lc) {
2574 latency_info->latency_components[lc->first] = lc->second; 2577 latency_info->latency_components[lc->first] = lc->second;
2575 } 2578 }
2576 } 2579 }
2577 2580
2578 } // namespace content 2581 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_widget_host_delegate.cc ('k') | content/browser/web_contents/web_contents_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698