Merge WebWidgetClient into WebViewClient.

sky/engine/public/web/WebViewClient.h

 /*
  * Copyright (C) 2009 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 15 matching lines @@
  * 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 SKY_ENGINE_PUBLIC_WEB_WEBVIEWCLIENT_H_
 #define SKY_ENGINE_PUBLIC_WEB_WEBVIEWCLIENT_H_
 
 #include "../platform/WebGraphicsContext3D.h"
 #include "../platform/WebString.h"
+#include "sky/engine/public/platform/WebCommon.h"
+#include "sky/engine/public/platform/WebRect.h"
+#include "sky/engine/public/platform/WebScreenInfo.h"
 #include "sky/engine/public/web/WebFrame.h"
 #include "sky/engine/public/web/WebNavigatorContentUtilsClient.h"
 #include "sky/engine/public/web/WebPageVisibilityState.h"
 #include "sky/engine/public/web/WebTextAffinity.h"
 #include "sky/engine/public/web/WebTextDirection.h"
-#include "sky/engine/public/web/WebWidgetClient.h"
 
 namespace blink {
 
 class ServiceProvider;
 class WebElement;
 class WebHitTestResult;
 class WebImage;
 class WebKeyboardEvent;
 class WebNode;
 class WebRange;
 class WebURL;
 class WebURLRequest;
 class WebView;
 class WebWidget;
 struct WebConsoleMessage;
 struct WebPoint;
 struct WebRect;
 struct WebSize;
 
-// Since a WebView is a WebWidget, a WebViewClient is a WebWidgetClient.
-// Virtual inheritance allows an implementation of WebWidgetClient to be
-// easily reused as part of an implementation of WebViewClient.
-class WebViewClient : virtual public WebWidgetClient {
+class WebViewClient {
 public:
     virtual ServiceProvider& services() = 0;
 
+    // Initialize compositing for this widget.
+    virtual void initializeLayerTreeView() { BLINK_ASSERT_NOT_REACHED(); };
+
+    // Called when the page should pump a frame.
+    virtual void scheduleAnimation() { }
+
+    // TODO(esprehn): Sky needs to implement these to control the mojo::View.
+
+    // Called to get/set the position of the widget in screen coordinates.
+    virtual WebRect windowRect() { return WebRect(); }
+    virtual void setWindowRect(const WebRect&) { }
+
+    // Called to get the position of the root window containing the widget
+    // in screen coordinates.
+    virtual WebRect rootWindowRect() { return WebRect(); }
+
+    // Called to query information about the screen where this widget is
+    // displayed.
+    virtual WebScreenInfo screenInfo() { return WebScreenInfo(); }
+
+    // Called to get the scale factor of the display.
+    virtual float deviceScaleFactor() { return 1; }
+
     // Editing -------------------------------------------------------------
 
     // This method is called in response to WebView's handleInputEvent()
     // when the default action for the current keyboard event is not
     // suppressed by the page, to give the embedder a chance to handle
     // the keyboard event specially.
     //
     // Returns true if the keyboard event was handled by the embedder,
     // indicating that the default action should be suppressed.
     virtual bool handleCurrentKeyboardEvent() { return false; }
@@ skipping 62 matching lines @@
         return WebPageVisibilityStateVisible;
     }
 
 protected:
     ~WebViewClient() { }
 };
 
 } // namespace blink
 
 #endif  // SKY_ENGINE_PUBLIC_WEB_WEBVIEWCLIENT_H_