[DevTools] Merge InspectorFrontendClientImpl into WebDevToolsFrontendImpl and remove unused code.

Source/web/WebDevToolsFrontendImpl.h

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #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;
+
+    virtual void sendMessageToBackend(const WTF::String&) OVERRIDE;
+
+    virtual void sendMessageToEmbedder(const WTF::String&) OVERRIDE;
+
+    virtual bool isUnderTest() OVERRIDE;
+
+    virtual void dispose() OVERRIDE;
 
 private:
-    class InspectorFrontendResumeObserver;
-    void resume();
-    void maybeDispatch(Timer<WebDevToolsFrontendImpl>*);
-    void doDispatchOnInspectorFrontend(const WebString& message);
-
     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 enabled; a slight pity.

[dgozman, 2014/08/18 15:03:40]

I thought that Persistent is a supposed ownership model between public/web
interfaces and core/ objects. If there is a better way, I'll happily change
this.

[haraken, 2014/08/18 15:06:04]

Can we use WebPrivatePtr<InspectorFrontendHost> here?

See WebMediaStream.h and other web/XXX.h that uses WebPrivatePtr<XXX>.

 };
 
 } // namespace blink
 
 #endif