Chromium Code Reviews| Index: Source/web/WebDevToolsFrontendImpl.h |
| diff --git a/Source/web/WebDevToolsFrontendImpl.h b/Source/web/WebDevToolsFrontendImpl.h |
| index 71c34e491fa3f03fe8211abc443719cccc7845a6..a8cdc5a9501b47ef4270e4f6e1818cba2f8fd791 100644 |
| --- a/Source/web/WebDevToolsFrontendImpl.h |
| +++ b/Source/web/WebDevToolsFrontendImpl.h |
| @@ -31,43 +31,38 @@ |
| #ifndef WebDevToolsFrontendImpl_h |
| #define WebDevToolsFrontendImpl_h |
| -#include "platform/Timer.h" |
| +#include "core/inspector/InspectorFrontendClient.h" |
| +#include "platform/heap/Handle.h" |
| #include "public/web/WebDevToolsFrontend.h" |
| -#include "wtf/Deque.h" |
| -#include "wtf/Forward.h" |
| #include "wtf/Noncopyable.h" |
| #include "wtf/text/WTFString.h" |
| namespace blink { |
| -class WebDevToolsClientDelegate; |
| +class InspectorFrontendHost; |
| class WebViewImpl; |
| -struct WebDevToolsMessageData; |
| -class WebDevToolsFrontendImpl FINAL : public WebDevToolsFrontend { |
| +class WebDevToolsFrontendImpl FINAL : public WebDevToolsFrontend, public InspectorFrontendClient { |
| WTF_MAKE_NONCOPYABLE(WebDevToolsFrontendImpl); |
| public: |
| - WebDevToolsFrontendImpl( |
| - WebViewImpl*, |
| - WebDevToolsFrontendClient*, |
| - const String& applicationLocale); |
| + WebDevToolsFrontendImpl(WebViewImpl*, WebDevToolsFrontendClient*); |
| virtual ~WebDevToolsFrontendImpl(); |
| - // WebDevToolsFrontend implementation. |
| - virtual void dispatchOnInspectorFrontend(const WebString& message) OVERRIDE; |
| + // InspectorFrontendClient implementation. |
| + virtual void windowObjectCleared() OVERRIDE; |
| -private: |
| - class InspectorFrontendResumeObserver; |
| - void resume(); |
| - void maybeDispatch(Timer<WebDevToolsFrontendImpl>*); |
| - void doDispatchOnInspectorFrontend(const WebString& message); |
| + virtual void sendMessageToBackend(const WTF::String&) OVERRIDE; |
| + |
| + virtual void sendMessageToEmbedder(const WTF::String&) OVERRIDE; |
| + |
| + virtual bool isUnderTest() OVERRIDE; |
| + virtual void dispose() OVERRIDE; |
| + |
| +private: |
| WebViewImpl* m_webViewImpl; |
| WebDevToolsFrontendClient* m_client; |
| - String m_applicationLocale; |
| - OwnPtr<InspectorFrontendResumeObserver> m_inspectorFrontendResumeObserver; |
| - Deque<WebString> m_messages; |
| - Timer<WebDevToolsFrontendImpl> m_inspectorFrontendDispatchTimer; |
| + RefPtrWillBePersistent<InspectorFrontendHost> m_frontendHost; |
|
sof
2014/08/18 14:13:49
I see why you need a Persistent<> here with Oilpan
dgozman
2014/08/18 15:03:40
I thought that Persistent is a supposed ownership
haraken
2014/08/18 15:06:04
Can we use WebPrivatePtr<InspectorFrontendHost> he
|
| }; |
| } // namespace blink |