| Index: content/browser/devtools/renderer_overrides_handler.h
|
| diff --git a/content/browser/devtools/renderer_overrides_handler.h b/content/browser/devtools/renderer_overrides_handler.h
|
| index 4f5076ec46746d758aab97cb9e7a87f519240214..2630ee2444c863850b66445938d226aed9518984 100644
|
| --- a/content/browser/devtools/renderer_overrides_handler.h
|
| +++ b/content/browser/devtools/renderer_overrides_handler.h
|
| @@ -14,6 +14,8 @@
|
| #include "cc/output/compositor_frame_metadata.h"
|
| #include "content/browser/devtools/devtools_protocol.h"
|
| #include "content/common/content_export.h"
|
| +#include "content/public/browser/render_widget_host.h"
|
| +#include "third_party/skia/include/core/SkBitmap.h"
|
|
|
| class SkBitmap;
|
|
|
| @@ -21,9 +23,12 @@ namespace IPC {
|
| class Message;
|
| }
|
|
|
| +namespace blink {
|
| +class WebMouseEvent;
|
| +}
|
| +
|
| namespace content {
|
|
|
| -class DevToolsAgentHost;
|
| class DevToolsTracingHandler;
|
| class RenderViewHostImpl;
|
|
|
| @@ -33,13 +38,14 @@ class RenderViewHostImpl;
|
| class CONTENT_EXPORT RendererOverridesHandler
|
| : public DevToolsProtocol::Handler {
|
| public:
|
| - explicit RendererOverridesHandler(DevToolsAgentHost* agent);
|
| + RendererOverridesHandler();
|
| virtual ~RendererOverridesHandler();
|
|
|
| void OnClientDetached();
|
| void OnSwapCompositorFrame(const cc::CompositorFrameMetadata& frame_metadata);
|
| void OnVisibilityChanged(bool visible);
|
| - void OnRenderViewHostChanged();
|
| + void SetRenderViewHost(RenderViewHostImpl* host);
|
| + void ClearRenderViewHost();
|
| bool OnSetTouchEventEmulationEnabled();
|
|
|
| private:
|
| @@ -79,6 +85,8 @@ class CONTENT_EXPORT RendererOverridesHandler
|
| scoped_refptr<DevToolsProtocol::Command> command);
|
| scoped_refptr<DevToolsProtocol::Response> PageQueryUsageAndQuota(
|
| scoped_refptr<DevToolsProtocol::Command>);
|
| + scoped_refptr<DevToolsProtocol::Response> PageSetColorPickerEnabled(
|
| + scoped_refptr<DevToolsProtocol::Command>);
|
|
|
| void ScreenshotCaptured(
|
| scoped_refptr<DevToolsProtocol::Command> command,
|
| @@ -97,19 +105,26 @@ class CONTENT_EXPORT RendererOverridesHandler
|
| scoped_ptr<base::DictionaryValue> response_data);
|
|
|
| void NotifyScreencastVisibility(bool visible);
|
| + void SetColorPickerEnabled(bool enabled);
|
| + void UpdateColorPickerFrame();
|
| + void ColorPickerFrameUpdated(bool succeeded, const SkBitmap& bitmap);
|
| + bool HandleMouseEvent(const blink::WebMouseEvent& event);
|
| + void UpdateColorPickerCursor(int x, int y);
|
| + void UpdateColorPickerCursorSmall(int x, int y);
|
|
|
| // Input domain.
|
| scoped_refptr<DevToolsProtocol::Response> InputEmulateTouchFromMouseEvent(
|
| scoped_refptr<DevToolsProtocol::Command> command);
|
|
|
| - RenderViewHostImpl* GetRenderViewHostImpl();
|
| -
|
| - DevToolsAgentHost* agent_;
|
| + RenderViewHostImpl* host_;
|
| scoped_refptr<DevToolsProtocol::Command> screencast_command_;
|
| bool has_last_compositor_frame_metadata_;
|
| cc::CompositorFrameMetadata last_compositor_frame_metadata_;
|
| base::TimeTicks last_frame_time_;
|
| int capture_retry_count_;
|
| + bool color_picker_enabled_;
|
| + SkBitmap color_picker_frame_;
|
| + RenderWidgetHost::MouseEventCallback mouse_event_callback_;
|
| base::WeakPtrFactory<RendererOverridesHandler> weak_factory_;
|
| DISALLOW_COPY_AND_ASSIGN(RendererOverridesHandler);
|
| };
|
|
|