| Index: Source/web/WebDevToolsAgentImpl.h
|
| diff --git a/Source/web/WebDevToolsAgentImpl.h b/Source/web/WebDevToolsAgentImpl.h
|
| index a515f26552038c4a8127e81e5c1e270a3722e125..02f0abb23638486234571ea18352ee2e508d5034 100644
|
| --- a/Source/web/WebDevToolsAgentImpl.h
|
| +++ b/Source/web/WebDevToolsAgentImpl.h
|
| @@ -42,7 +42,7 @@
|
| #include "wtf/OwnPtr.h"
|
| #include "wtf/Vector.h"
|
|
|
| -namespace WebCore {
|
| +namespace blink {
|
| class Document;
|
| class LocalFrame;
|
| class FrameView;
|
| @@ -69,8 +69,8 @@ struct WebDevToolsMessageData;
|
|
|
| class WebDevToolsAgentImpl FINAL :
|
| public WebDevToolsAgentPrivate,
|
| - public WebCore::InspectorClient,
|
| - public WebCore::InspectorFrontendChannel,
|
| + public blink::InspectorClient,
|
| + public blink::InspectorFrontendChannel,
|
| public WebPageOverlay,
|
| private WebThread::TaskObserver {
|
| public:
|
| @@ -81,7 +81,7 @@ public:
|
|
|
| // WebDevToolsAgentPrivate implementation.
|
| virtual void didCreateScriptContext(WebLocalFrameImpl*, int worldId) OVERRIDE;
|
| - virtual bool handleInputEvent(WebCore::Page*, const WebInputEvent&) OVERRIDE;
|
| + virtual bool handleInputEvent(blink::Page*, const WebInputEvent&) OVERRIDE;
|
| virtual void didLayout() OVERRIDE;
|
|
|
| // WebDevToolsAgent implementation.
|
| @@ -103,7 +103,7 @@ public:
|
| virtual void highlight() OVERRIDE;
|
| virtual void hideHighlight() OVERRIDE;
|
| virtual void updateInspectorStateCookie(const WTF::String&) OVERRIDE;
|
| - virtual void sendMessageToFrontend(PassRefPtr<WebCore::JSONObject> message) OVERRIDE;
|
| + virtual void sendMessageToFrontend(PassRefPtr<blink::JSONObject> message) OVERRIDE;
|
| virtual void flush() OVERRIDE;
|
|
|
| virtual void setDeviceMetricsOverride(int width, int height, float deviceScaleFactor, bool mobile, bool fitWindow, float scale, float offsetX, float offsetY) OVERRIDE;
|
| @@ -120,8 +120,8 @@ public:
|
| virtual void startGPUEventsRecording() OVERRIDE;
|
| virtual void stopGPUEventsRecording() OVERRIDE;
|
|
|
| - virtual void dispatchKeyEvent(const WebCore::PlatformKeyboardEvent&) OVERRIDE;
|
| - virtual void dispatchMouseEvent(const WebCore::PlatformMouseEvent&) OVERRIDE;
|
| + virtual void dispatchKeyEvent(const blink::PlatformKeyboardEvent&) OVERRIDE;
|
| + virtual void dispatchMouseEvent(const blink::PlatformMouseEvent&) OVERRIDE;
|
|
|
| // WebPageOverlay
|
| virtual void paintPageOverlay(WebCanvas*) OVERRIDE;
|
| @@ -137,8 +137,8 @@ private:
|
| void disableMobileEmulation();
|
| void updatePageScaleFactorLimits();
|
|
|
| - WebCore::InspectorController* inspectorController();
|
| - WebCore::LocalFrame* mainFrame();
|
| + blink::InspectorController* inspectorController();
|
| + blink::LocalFrame* mainFrame();
|
|
|
| int m_debuggerId;
|
| int m_layerTreeId;
|
| @@ -159,10 +159,10 @@ private:
|
| bool m_pageScaleLimitsOverriden;
|
|
|
| bool m_touchEventEmulationEnabled;
|
| - OwnPtr<WebCore::IntPoint> m_lastPinchAnchorCss;
|
| - OwnPtr<WebCore::IntPoint> m_lastPinchAnchorDip;
|
| + OwnPtr<blink::IntPoint> m_lastPinchAnchorCss;
|
| + OwnPtr<blink::IntPoint> m_lastPinchAnchorDip;
|
|
|
| - typedef Vector<RefPtr<WebCore::JSONObject> > FrontendMessageQueue;
|
| + typedef Vector<RefPtr<blink::JSONObject> > FrontendMessageQueue;
|
| FrontendMessageQueue m_frontendMessageQueue;
|
| };
|
|
|
|
|