Chromium Code Reviews| Index: content/browser/renderer_host/render_widget_host_impl.h |
| diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h |
| index f0b8914f196aea8a221e17e20e61de20ce482db8..fa511050318baee14403da9f89a34e4d41e9f6e4 100644 |
| --- a/content/browser/renderer_host/render_widget_host_impl.h |
| +++ b/content/browser/renderer_host/render_widget_host_impl.h |
| @@ -295,19 +295,17 @@ class CONTENT_EXPORT RenderWidgetHostImpl : public RenderWidgetHost, |
| void ForwardGestureEventWithLatencyInfo( |
| const blink::WebGestureEvent& gesture_event, |
| const ui::LatencyInfo& ui_latency) override; |
| - void ForwardTouchEventWithLatencyInfo( |
| - const blink::WebTouchEvent& touch_event, |
| - const ui::LatencyInfo& ui_latency); |
| - void ForwardMouseEventWithLatencyInfo( |
| - const blink::WebMouseEvent& mouse_event, |
| - const ui::LatencyInfo& ui_latency); |
| + void ForwardTouchEventWithLatencyInfo(const blink::WebTouchEvent& touch_event, |
|
Bryan McQuade
2016/05/25 21:32:30
can you run git cl format in your client just to
|
| + const ui::LatencyInfo& ui_latency); |
| + void ForwardMouseEventWithLatencyInfo(const blink::WebMouseEvent& mouse_event, |
| + const ui::LatencyInfo& ui_latency); |
| virtual void ForwardWheelEventWithLatencyInfo( |
| const blink::WebMouseWheelEvent& wheel_event, |
| - const ui::LatencyInfo& ui_latency); // Virtual for testing. |
| + const ui::LatencyInfo& ui_latency); // Virtual for testing. |
| // Enables/disables touch emulation using mouse event. See TouchEmulator. |
| - void SetTouchEventEmulationEnabled( |
| - bool enabled, ui::GestureProviderConfigType config_type); |
| + void SetTouchEventEmulationEnabled(bool enabled, |
| + ui::GestureProviderConfigType config_type); |
| // TouchEmulatorClient implementation. |
| void ForwardEmulatedGestureEvent( |
| @@ -360,9 +358,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl : public RenderWidgetHost, |
| // Cancels an ongoing composition. |
| void ImeCancelComposition(); |
| - bool ignore_input_events() const { |
| - return ignore_input_events_; |
| - } |
| + bool ignore_input_events() const { return ignore_input_events_; } |
| // Whether forwarded WebInputEvents should be dropped. |
| bool ShouldDropInputEvents() const; |
| @@ -374,12 +370,10 @@ class CONTENT_EXPORT RenderWidgetHostImpl : public RenderWidgetHost, |
| // Notifies the renderer that the next key event is bound to one or more |
| // pre-defined edit commands |
| - void SetEditCommandsForNextKeyEvent( |
| - const std::vector<EditCommand>& commands); |
| + void SetEditCommandsForNextKeyEvent(const std::vector<EditCommand>& commands); |
| // Executes the edit command. |
| - void ExecuteEditCommand(const std::string& command, |
| - const std::string& value); |
| + void ExecuteEditCommand(const std::string& command, const std::string& value); |
| // Tells the renderer to scroll the currently focused node into rect only if |
| // the currently focused node is a Text node (textfield, text area or content |
| @@ -399,11 +393,10 @@ class CONTENT_EXPORT RenderWidgetHostImpl : public RenderWidgetHost, |
| base::TimeDelta interval); |
| // Called by the view in response to OnSwapCompositorFrame. |
| - static void SendSwapCompositorFrameAck( |
| - int32_t route_id, |
| - uint32_t output_surface_id, |
| - int renderer_host_id, |
| - const cc::CompositorFrameAck& ack); |
| + static void SendSwapCompositorFrameAck(int32_t route_id, |
| + uint32_t output_surface_id, |
| + int renderer_host_id, |
| + const cc::CompositorFrameAck& ack); |
| // Called by the view to return resources to the compositor. |
| static void SendReclaimCompositorResources(int32_t route_id, |
| @@ -466,6 +459,10 @@ class CONTENT_EXPORT RenderWidgetHostImpl : public RenderWidgetHost, |
| InputRouter* input_router() { return input_router_.get(); } |
| + RenderWidgetHostLatencyTracker* latency_tracker() { |
| + return latency_tracker_.get(); |
| + } |
| + |
| // Get the BrowserAccessibilityManager for the root of the frame tree, |
| BrowserAccessibilityManager* GetRootBrowserAccessibilityManager(); |
| @@ -785,7 +782,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl : public RenderWidgetHost, |
| // being sent, in which case the timer should fire). |
| bool received_paint_after_load_; |
| - RenderWidgetHostLatencyTracker latency_tracker_; |
| + std::unique_ptr<RenderWidgetHostLatencyTracker> latency_tracker_; |
|
tdresser
2016/05/24 14:28:38
Why change this to unique_ptr?
|
| int next_browser_snapshot_id_; |
| using PendingSnapshotMap = std::map<int, GetSnapshotFromBrowserCallback>; |