#include "base/time/time.h"
#include "base/timer/timer.h"
#include "build/build_config.h"
+#include "cc/base/rolling_time_delta_history.h"
#include "cc/resources/shared_bitmap.h"
#include "content/browser/renderer_host/event_with_latency_info.h"
#include "content/browser/renderer_host/input/input_ack_handler.h"
RenderProcessHost* process,
int routing_id,
bool hidden);
- virtual ~RenderWidgetHostImpl();
+ ~RenderWidgetHostImpl() override;
// Similar to RenderWidgetHost::FromID, but returning the Impl object.
static RenderWidgetHostImpl* FromID(int32 process_id, int32 routing_id);
}
// RenderWidgetHost implementation.
- virtual void UpdateTextDirection(blink::WebTextDirection direction) OVERRIDE;
- virtual void NotifyTextDirection() OVERRIDE;
- virtual void Focus() OVERRIDE;
- virtual void Blur() OVERRIDE;
- virtual void SetActive(bool active) OVERRIDE;
- virtual void CopyFromBackingStore(
+ void UpdateTextDirection(blink::WebTextDirection direction) override;
+ void NotifyTextDirection() override;
+ void Focus() override;
+ void Blur() override;
+ void SetActive(bool active) override;
+ void CopyFromBackingStore(
const gfx::Rect& src_rect,
const gfx::Size& accelerated_dst_size,
const base::Callback<void(bool, const SkBitmap&)>& callback,
- const SkColorType color_type) OVERRIDE;
- virtual bool CanCopyFromBackingStore() OVERRIDE;
+ const SkColorType color_type) override;
+ bool CanCopyFromBackingStore() override;
#if defined(OS_ANDROID)
- virtual void LockBackingStore() OVERRIDE;
- virtual void UnlockBackingStore() OVERRIDE;
+ virtual void LockBackingStore() override;
+ virtual void UnlockBackingStore() override;
#endif
- virtual void ForwardMouseEvent(
- const blink::WebMouseEvent& mouse_event) OVERRIDE;
- virtual void ForwardWheelEvent(
- const blink::WebMouseWheelEvent& wheel_event) OVERRIDE;
- virtual void ForwardKeyboardEvent(
- const NativeWebKeyboardEvent& key_event) OVERRIDE;
- virtual RenderProcessHost* GetProcess() const OVERRIDE;
- virtual int GetRoutingID() const OVERRIDE;
- virtual RenderWidgetHostView* GetView() const OVERRIDE;
- virtual bool IsLoading() const OVERRIDE;
- virtual bool IsRenderView() const OVERRIDE;
- virtual void ResizeRectChanged(const gfx::Rect& new_rect) OVERRIDE;
- virtual void RestartHangMonitorTimeout() OVERRIDE;
- virtual void SetIgnoreInputEvents(bool ignore_input_events) OVERRIDE;
- virtual void WasResized() OVERRIDE;
- virtual void AddKeyPressEventCallback(
- const KeyPressEventCallback& callback) OVERRIDE;
- virtual void RemoveKeyPressEventCallback(
- const KeyPressEventCallback& callback) OVERRIDE;
- virtual void AddMouseEventCallback(
- const MouseEventCallback& callback) OVERRIDE;
- virtual void RemoveMouseEventCallback(
- const MouseEventCallback& callback) OVERRIDE;
- virtual void GetWebScreenInfo(blink::WebScreenInfo* result) OVERRIDE;
-
- virtual SkColorType PreferredReadbackFormat() OVERRIDE;
+ void ForwardMouseEvent(const blink::WebMouseEvent& mouse_event) override;
+ void ForwardWheelEvent(const blink::WebMouseWheelEvent& wheel_event) override;
+ void ForwardKeyboardEvent(const NativeWebKeyboardEvent& key_event) override;
+ RenderProcessHost* GetProcess() const override;
+ int GetRoutingID() const override;
+ RenderWidgetHostView* GetView() const override;
+ bool IsLoading() const override;
+ bool IsRenderView() const override;
+ void ResizeRectChanged(const gfx::Rect& new_rect) override;
+ void RestartHangMonitorTimeout() override;
+ void SetIgnoreInputEvents(bool ignore_input_events) override;
+ void WasResized() override;
+ void AddKeyPressEventCallback(const KeyPressEventCallback& callback) override;
+ void RemoveKeyPressEventCallback(
+ const KeyPressEventCallback& callback) override;
+ void AddMouseEventCallback(const MouseEventCallback& callback) override;
+ void RemoveMouseEventCallback(const MouseEventCallback& callback) override;
+ void GetWebScreenInfo(blink::WebScreenInfo* result) override;
+
+ SkColorType PreferredReadbackFormat() override;
// Forces redraw in the renderer and when the update reaches the browser
// grabs snapshot from the compositor. Returns PNG-encoded snapshot.
virtual void Shutdown();
// IPC::Listener
- virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
+ bool OnMessageReceived(const IPC::Message& msg) override;
// Sends a message to the corresponding object in the renderer.
- virtual bool Send(IPC::Message* msg) OVERRIDE;
+ bool Send(IPC::Message* msg) override;
// Indicates if the page has finished loading.
virtual void SetIsLoading(bool is_loading);
void SetTouchEventEmulationEnabled(bool enabled);
// TouchEmulatorClient implementation.
- virtual void ForwardGestureEvent(
- const blink::WebGestureEvent& gesture_event) OVERRIDE;
- virtual void ForwardEmulatedTouchEvent(
- const blink::WebTouchEvent& touch_event) OVERRIDE;
- virtual void SetCursor(const WebCursor& cursor) OVERRIDE;
- virtual void ShowContextMenuAtPoint(const gfx::Point& point) OVERRIDE;
+ void ForwardGestureEvent(
+ const blink::WebGestureEvent& gesture_event) override;
+ void ForwardEmulatedTouchEvent(
+ const blink::WebTouchEvent& touch_event) override;
+ void SetCursor(const WebCursor& cursor) override;
+ void ShowContextMenuAtPoint(const gfx::Point& point) override;
// Queues a synthetic gesture for testing purposes. Invokes the on_complete
// callback when the gesture is finished running.
virtual void UpdateVSyncParameters(base::TimeTicks timebase,
base::TimeDelta interval);
- // Called by the view in response to AcceleratedSurfaceBuffersSwapped or
- // AcceleratedSurfacePostSubBuffer.
- static void AcknowledgeBufferPresent(
- int32 route_id,
- int gpu_host_id,
- const AcceleratedSurfaceMsg_BufferPresented_Params& params);
-
// Called by the view in response to OnSwapCompositorFrame.
static void SendSwapCompositorFrameAck(
int32 route_id,
void FlushInput();
// InputRouterClient
- virtual void SetNeedsFlush() OVERRIDE;
+ void SetNeedsFlush() override;
// Indicates whether the renderer drives the RenderWidgetHosts's size or the
// other way around.
bool should_auto_resize() { return should_auto_resize_; }
- void ComputeTouchLatency(const ui::LatencyInfo& latency_info);
void FrameSwapped(const ui::LatencyInfo& latency_info);
void DidReceiveRendererFrame();
// Returns the ID that uniquely describes this component to the latency
// subsystem.
- int64 GetLatencyComponentId();
+ int64 GetLatencyComponentId() const;
static void CompositorFrameDrawn(
const std::vector<ui::LatencyInfo>& latency_info);
// or create it if it doesn't already exist.
BrowserAccessibilityManager* GetOrCreateRootBrowserAccessibilityManager();
+ base::TimeDelta GetEstimatedBrowserCompositeTime();
+
#if defined(OS_WIN)
gfx::NativeViewAccessible GetParentNativeViewAccessible();
#endif
protected:
- virtual RenderWidgetHostImpl* AsRenderWidgetHostImpl() OVERRIDE;
+ RenderWidgetHostImpl* AsRenderWidgetHostImpl() override;
// Create a LatencyInfo struct with INPUT_EVENT_LATENCY_RWH_COMPONENT
// component if it is not already in |original|. And if |original| is
// not NULL, it is also merged into the resulting LatencyInfo.
- ui::LatencyInfo CreateRWHLatencyInfoIfNotExist(
+ ui::LatencyInfo CreateInputEventLatencyInfoIfNotExist(
const ui::LatencyInfo* original,
blink::WebInputEvent::Type type,
const ui::LatencyInfo::InputCoordinate* logical_coordinates,
size_t logical_coordinates_size);
+ // Add UMA histograms for the latency to the renderer and roundtrip latency
+ // for a given event type.
+ void ComputeInputLatencyHistograms(
+ blink::WebInputEvent::Type type,
+ const ui::LatencyInfo& latency_info) const;
// Called when we receive a notification indicating that the renderer
// process has gone. This will reset our state so that our state will be
bool renderer_initialized_;
// This value indicates how long to wait before we consider a renderer hung.
- int hung_renderer_delay_ms_;
+ int64 hung_renderer_delay_ms_;
private:
friend class MockRenderWidgetHost;
void OnSetCursor(const WebCursor& cursor);
void OnTextInputTypeChanged(ui::TextInputType type,
ui::TextInputMode input_mode,
- bool can_compose_inline);
+ bool can_compose_inline,
+ int flags);
-#if defined(OS_MACOSX) || defined(USE_AURA)
+#if defined(OS_MACOSX) || defined(USE_AURA) || defined(OS_ANDROID)
void OnImeCompositionRangeChanged(
const gfx::Range& range,
const std::vector<gfx::Rect>& character_bounds);
bool KeyPressListenersHandleEvent(const NativeWebKeyboardEvent& event);
// InputRouterClient
- virtual InputEventAckState FilterInputEvent(
+ InputEventAckState FilterInputEvent(
const blink::WebInputEvent& event,
- const ui::LatencyInfo& latency_info) OVERRIDE;
- virtual void IncrementInFlightEventCount() OVERRIDE;
- virtual void DecrementInFlightEventCount() OVERRIDE;
- virtual void OnHasTouchEventHandlers(bool has_handlers) OVERRIDE;
- virtual void DidFlush() OVERRIDE;
- virtual void DidOverscroll(const DidOverscrollParams& params) OVERRIDE;
+ const ui::LatencyInfo& latency_info) override;
+ void IncrementInFlightEventCount() override;
+ void DecrementInFlightEventCount() override;
+ void OnHasTouchEventHandlers(bool has_handlers) override;
+ void DidFlush() override;
+ void DidOverscroll(const DidOverscrollParams& params) override;
// InputAckHandler
- virtual void OnKeyboardEventAck(const NativeWebKeyboardEvent& event,
- InputEventAckState ack_result) OVERRIDE;
- virtual void OnWheelEventAck(const MouseWheelEventWithLatencyInfo& event,
- InputEventAckState ack_result) OVERRIDE;
- virtual void OnTouchEventAck(const TouchEventWithLatencyInfo& event,
- InputEventAckState ack_result) OVERRIDE;
- virtual void OnGestureEventAck(const GestureEventWithLatencyInfo& event,
- InputEventAckState ack_result) OVERRIDE;
- virtual void OnUnexpectedEventAck(UnexpectedEventAckType type) OVERRIDE;
+ void OnKeyboardEventAck(const NativeWebKeyboardEvent& event,
+ InputEventAckState ack_result) override;
+ void OnWheelEventAck(const MouseWheelEventWithLatencyInfo& event,
+ InputEventAckState ack_result) override;
+ void OnTouchEventAck(const TouchEventWithLatencyInfo& event,
+ InputEventAckState ack_result) override;
+ void OnGestureEventAck(const GestureEventWithLatencyInfo& event,
+ InputEventAckState ack_result) override;
+ void OnUnexpectedEventAck(UnexpectedEventAckType type) override;
void OnSyntheticGestureCompleted(SyntheticGesture::Result result);
base::Callback<void(const unsigned char*, size_t)> > PendingSnapshotMap;
PendingSnapshotMap pending_browser_snapshots_;
+ cc::RollingTimeDeltaHistory browser_composite_latency_history_;
+
base::WeakPtrFactory<RenderWidgetHostImpl> weak_factory_;
DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostImpl);
projects / platform / framework / web / crosswalk.git / blobdiff