Remove PageWidgetDelegate

sky/engine/web/WebViewImpl.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 26 matching lines @@
 #include "sky/engine/public/platform/WebInputEvent.h"
 #include "sky/engine/public/platform/WebLayer.h"
 #include "sky/engine/public/platform/WebPoint.h"
 #include "sky/engine/public/platform/WebRect.h"
 #include "sky/engine/public/platform/WebSize.h"
 #include "sky/engine/public/platform/WebString.h"
 #include "sky/engine/public/web/WebNavigationPolicy.h"
 #include "sky/engine/public/web/WebView.h"
 #include "sky/engine/web/ChromeClientImpl.h"
 #include "sky/engine/web/EditorClientImpl.h"
-#include "sky/engine/web/PageWidgetDelegate.h"
 #include "sky/engine/web/SpellCheckerClientImpl.h"
 #include "sky/engine/wtf/OwnPtr.h"
 #include "sky/engine/wtf/RefCounted.h"
 #include "sky/engine/wtf/Vector.h"
 
 namespace blink {
 
 class Frame;
 class UserGestureToken;
 class WebLocalFrameImpl;
 class WebImage;
 class WebSettingsImpl;
 
-class WebViewImpl final : public WebView
-    , public RefCounted<WebViewImpl>
-    , public PageWidgetEventHandler {
+class WebViewImpl final : public WebView, public RefCounted<WebViewImpl> {
 public:
     static WebViewImpl* create(WebViewClient*);
 
     // WebWidget methods:
     virtual void close() override;
     virtual WebSize size() override;
 
     virtual void resize(const WebSize&) override;
 
     virtual void beginFrame(const WebBeginFrameArgs&) override;
@@ skipping 77 matching lines @@
     // the page is shutting down, but will be valid at all other times.
     Page* page() const
     {
         return m_page.get();
     }
 
     // Returns the main frame associated with this view. This may be null when
     // the page is shutting down, but will be valid at all other times.
     WebLocalFrameImpl* mainFrameImpl();
 
-    // FIXME: Temporary method to accommodate out-of-process frame ancestors;
-    // will be removed when there can be multiple WebWidgets for a single page.
-    WebLocalFrameImpl* localFrameRootTemporary() const;
-
     // Event related methods:
     void mouseDoubleClick(const WebMouseEvent&);
 
     // Notifies the WebView that a load has been committed. isNewNavigation
     // will be true if a new session history item should be created for that
     // load. isNavigationWithinPage will be true if the navigation does
     // not take the user away from the current page.
     void didCommitLoad(bool isNewNavigation, bool isNavigationWithinPage);
 
     // Indicates two things:
@@ skipping 66 matching lines @@
     // Returns true if the view was scrolled.
     bool scrollViewWithKeyboard(int keyCode, int modifiers);
 
     // Converts |pos| from window coordinates to contents coordinates and gets
     // the HitTestResult for it.
     HitTestResult hitTestResultForWindowPos(const IntPoint&);
 
     void doComposite();
     void reallocateRenderer();
 
-    // PageWidgetEventHandler functions
-    virtual void handleMouseLeave(LocalFrame&, const WebMouseEvent&) override;
-    virtual void handleMouseDown(LocalFrame&, const WebMouseEvent&) override;
-    virtual void handleMouseUp(LocalFrame&, const WebMouseEvent&) override;
-    virtual bool handleMouseWheel(LocalFrame&, const WebMouseWheelEvent&) override;
-    virtual bool handleGestureEvent(const WebGestureEvent&) override;
-    virtual bool handleKeyEvent(const WebKeyboardEvent&) override;
-    virtual bool handleCharEvent(const WebKeyboardEvent&) override;
+    bool handleCharEvent(const WebKeyboardEvent&);
+    bool handleGestureEvent(const WebGestureEvent&);
+    bool handleKeyEvent(const WebKeyboardEvent&);
+    bool handleMouseWheel(LocalFrame&, const WebMouseWheelEvent&);
+    bool handleTouchEvent(LocalFrame& mainFrame, const WebTouchEvent& event);
+    void handleMouseDown(LocalFrame&, const WebMouseEvent&);
+    void handleMouseLeave(LocalFrame&, const WebMouseEvent&);
+    void handleMouseMove(LocalFrame& mainFrame, const WebMouseEvent& event);
+    void handleMouseUp(LocalFrame&, const WebMouseEvent&);
 
     InputMethodContext* inputMethodContext();
 
     WebViewClient* m_client; // Can be 0 (e.g. unittests, shared workers, etc.)
     WebSpellCheckClient* m_spellCheckClient;
 
     ChromeClientImpl m_chromeClientImpl;
     EditorClientImpl m_editorClientImpl;
     SpellCheckerClientImpl m_spellCheckerClientImpl;
 
@@ skipping 47 matching lines @@
     bool m_userGestureObserved;
 };
 
 // We have no ways to check if the specified WebView is an instance of
 // WebViewImpl because WebViewImpl is the only implementation of WebView.
 DEFINE_TYPE_CASTS(WebViewImpl, WebView, webView, true, true);
 
 } // namespace blink
 
 #endif  // SKY_ENGINE_WEB_WEBVIEWIMPL_H_