Changeset 141428 in webkit

Timestamp:

Jan 31, 2013 9:44:08 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[chromium] Remove dead transitional code from WebViewImpl
​https://bugs.webkit.org/show_bug.cgi?id=107889

Patch by James Robinson <​jamesr@chromium.org> on 2013-01-31
Reviewed by Adam Barth.

Source/WebKit/chromium:

The chromium side of this landed at r178256 and seems stable.

• public/WebWidget.h:

(WebKit::WebWidget::setCompositorSurfaceReady):

• src/WebViewImpl.cpp:

(WebKit::WebViewImpl::WebViewImpl):
(WebKit::WebViewImpl::~WebViewImpl):
(WebKit):
(WebKit::WebViewImpl::setIsTransparent):
(WebKit::WebViewImpl::setIsAcceleratedCompositingActive):

• src/WebViewImpl.h:
• tests/ScrollingCoordinatorChromiumTest.cpp:

(WebKit::FakeWebViewClient::initializeLayerTreeView):
(FakeWebViewClient):
(WebKit::FakeWebViewClient::layerTreeView):
(WebKit::ScrollingCoordinatorChromiumTest::ScrollingCoordinatorChromiumTest):
(ScrollingCoordinatorChromiumTest):

Tools:

ScrollingCoordinatorChromiumTests need to initialize compositing, so its implementation of
WebWidgetClient has to support the new compositor initialization path.

• DumpRenderTree/chromium/WebViewHost.cpp:

(WebViewHost::initializeLayerTreeView):
(WebViewHost::setWebWidget):

Location:

trunk

Files:

• Source/WebKit/chromium/ChangeLog (modified) (1 diff)
• Source/WebKit/chromium/public/WebWidget.h (modified) (3 diffs)
• Source/WebKit/chromium/src/WebViewImpl.cpp (modified) (9 diffs)
• Source/WebKit/chromium/src/WebViewImpl.h (modified) (5 diffs)
• Source/WebKit/chromium/tests/ScrollingCoordinatorChromiumTest.cpp (modified) (4 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/chromium/WebViewHost.cpp (modified) (2 diffs)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2013-01-31  James Robinson  <jamesr@chromium.org>
+
+        [chromium] Remove dead transitional code from WebViewImpl
+        https://bugs.webkit.org/show_bug.cgi?id=107889
+
+        Reviewed by Adam Barth.
+
+        The chromium side of this landed at r178256 and seems stable.
+
+        * public/WebWidget.h:
+        (WebKit::WebWidget::setCompositorSurfaceReady):
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::WebViewImpl):
+        (WebKit::WebViewImpl::~WebViewImpl):
+        (WebKit):
+        (WebKit::WebViewImpl::setIsTransparent):
+        (WebKit::WebViewImpl::setIsAcceleratedCompositingActive):
+        * src/WebViewImpl.h:
+        * tests/ScrollingCoordinatorChromiumTest.cpp:
+        (WebKit::FakeWebViewClient::initializeLayerTreeView):
+        (FakeWebViewClient):
+        (WebKit::FakeWebViewClient::layerTreeView):
+        (WebKit::ScrollingCoordinatorChromiumTest::ScrollingCoordinatorChromiumTest):
+        (ScrollingCoordinatorChromiumTest):
+
 2013-01-31  Kentaro Hara  <haraken@chromium.org>
 

trunk/Source/WebKit/chromium/public/WebWidget.h

@@ -130 +130 @@
     // Indicates that the compositing surface associated with this WebWidget is
     // ready to use.
-    virtual void setCompositorSurfaceReady() = 0;
+    virtual void setCompositorSurfaceReady() { }
 
     // Temporary method for the embedder to notify the WebWidget that the widget
@@ -136 +136 @@
     // removed when the WebWidget inversion patch lands --- http://crbug.com/112837
     virtual void setNeedsRedraw() { }
-
-    // Temporary method for the embedder to check for throttled input. When this
-    // is true, the WebWidget is indicating that it would prefer to not receive
-    // additional input events until
-    // WebWidgetClient::didBecomeReadyForAdditionalInput is called.
-    //
-    // This method will be removed when the WebWidget inversion patch lands ---
-    // http://crbug.com/112837
-    virtual bool isInputThrottled() const { return false; }
 
     // Called to inform the WebWidget of a change in theme.
@@ -248 +239 @@
     virtual void instrumentCancelFrame() { }
 
-    // Fills in a WebRenderingStats struct containing information about rendering, e.g. count of frames rendered, time spent painting.
-    // This call is relatively expensive in threaded compositing mode, as it blocks on the compositor thread.
-    // It is safe to call in software mode, but will only give stats for rendering done in compositing mode.
-    virtual void renderingStats(WebRenderingStats&) const { }
-
     // The page background color. Can be used for filling in areas without
     // content.

trunk/Source/WebKit/chromium/src/WebViewImpl.cpp

@@ -419 +419 @@
 #if USE(ACCELERATED_COMPOSITING)
     , m_layerTreeView(0)
-    , m_ownsLayerTreeView(false)
     , m_rootLayer(0)
     , m_rootGraphicsLayer(0)
@@ -426 +425 @@
     , m_compositorCreationFailed(false)
     , m_recreatingGraphicsContext(false)
-    , m_compositorSurfaceReady(false)
     , m_inputHandlerIdentifier(-1)
 #endif
@@ -512 +510 @@
 WebViewImpl::~WebViewImpl()
 {
-    if (m_ownsLayerTreeView)
-        delete m_layerTreeView;
     ASSERT(!m_page);
 }
@@ -839 +835 @@
     m_gestureAnimation = WebActiveGestureAnimation::createWithTimeOffset(curve.release(), this, parameters.startTime);
     scheduleAnimation();
-}
-
-void WebViewImpl::renderingStats(WebRenderingStats& stats) const
-{
-    if (m_layerTreeView)
-        m_layerTreeView->renderingStats(stats);
 }
 
@@ -1792 +1782 @@
 #endif
 
-void WebViewImpl::setCompositorSurfaceReady()
-{
-    m_compositorSurfaceReady = true;
-    if (m_layerTreeView)
-        m_layerTreeView->setSurfaceReady();
-}
-
 void WebViewImpl::animate(double)
 {
@@ -1976 +1959 @@
         m_layerTreeView->setNeedsRedraw();
 #endif
-}
-
-bool WebViewImpl::isInputThrottled() const
-{
-#if USE(ACCELERATED_COMPOSITING)
-    if (m_layerTreeView && isAcceleratedCompositingActive())
-        return m_layerTreeView->commitRequested();
-#endif
-    return false;
 }
 
@@ -3646 +3620 @@
     if (m_nonCompositedContentHost)
         m_nonCompositedContentHost->setOpaque(!isTransparent);
-
-    if (m_layerTreeView)
-        m_layerTreeView->setHasTransparentBackground(isTransparent);
 }
 
@@ -4128 +4099 @@
         m_client->initializeLayerTreeView(this, *m_rootLayer, layerTreeViewSettings);
         m_layerTreeView = m_client->layerTreeView();
-        if (!m_layerTreeView) {
-            m_layerTreeView = Platform::current()->compositorSupport()->createLayerTreeView(this, *m_rootLayer, layerTreeViewSettings);
-            m_ownsLayerTreeView = true;
-        }
         if (m_layerTreeView) {
             if (m_webSettings->applyDeviceScaleFactorInCompositor() && page()->deviceScaleFactor() != 1)
@@ -4139 +4106 @@
             m_layerTreeView->setVisible(visible);
             m_layerTreeView->setPageScaleFactorAndLimits(pageScaleFactor(), m_minimumPageScaleFactor, m_maximumPageScaleFactor);
-            if (m_compositorSurfaceReady)
-                m_layerTreeView->setSurfaceReady();
             m_layerTreeView->setHasTransparentBackground(isTransparent());
             updateLayerTreeViewport();

trunk/Source/WebKit/chromium/src/WebViewImpl.h

@@ -144 +144 @@
     virtual void willExitFullScreen();
     virtual void didExitFullScreen();
-    virtual void setCompositorSurfaceReady();
     virtual void animate(double);
     virtual void layout(); // Also implements WebLayerTreeViewClient::layout()
@@ -153 +152 @@
     virtual void composite(bool finish);
     virtual void setNeedsRedraw();
-    virtual bool isInputThrottled() const;
     virtual bool handleInputEvent(const WebInputEvent&);
     virtual bool hasTouchEventHandlersAt(const WebPoint&);
@@ -185 +183 @@
     virtual void instrumentBeginFrame();
     virtual void instrumentCancelFrame();
-    virtual void renderingStats(WebRenderingStats&) const;
 
     // WebView methods:
@@ -851 +848 @@
     OwnPtr<NonCompositedContentHost> m_nonCompositedContentHost;
     WebLayerTreeView* m_layerTreeView;
-    bool m_ownsLayerTreeView;
     WebLayer* m_rootLayer;
     WebCore::GraphicsLayer* m_rootGraphicsLayer;
@@ -859 +855 @@
     // If true, the graphics context is being restored.
     bool m_recreatingGraphicsContext;
-    bool m_compositorSurfaceReady;
     int m_inputHandlerIdentifier;
 #endif

trunk/Source/WebKit/chromium/tests/ScrollingCoordinatorChromiumTest.cpp

@@ -53 +53 @@
 namespace {
 
-class MockWebViewClient : public WebViewClient {
+class FakeWebViewClient : public WebViewClient {
 public:
     virtual WebCompositorOutputSurface* createOutputSurface() OVERRIDE
@@ -59 +59 @@
         return Platform::current()->compositorSupport()->createOutputSurfaceFor3D(CompositorFakeWebGraphicsContext3D::create(WebGraphicsContext3D::Attributes()).leakPtr());
     }
+
+    virtual void initializeLayerTreeView(WebLayerTreeViewClient* client, const WebLayer& rootLayer, const WebLayerTreeView::Settings& settings)
+    {
+        m_layerTreeView = adoptPtr(Platform::current()->compositorSupport()->createLayerTreeView(client, rootLayer, settings));
+        ASSERT(m_layerTreeView);
+    }
+
+    virtual WebLayerTreeView* layerTreeView()
+    {
+        return m_layerTreeView.get();
+    }
+
+private:
+    OwnPtr<WebLayerTreeView> m_layerTreeView;
 };
 
@@ -68 +82 @@
     ScrollingCoordinatorChromiumTest()
         : m_baseURL("http://www.test.com/")
-        , m_webCompositorInitializer(0)
     {
         Platform::current()->compositorSupport()->initialize(0);
@@ -116 +129 @@
     std::string m_baseURL;
     MockWebFrameClient m_mockWebFrameClient;
-    MockWebViewClient m_mockWebViewClient;
-    WebKitTests::WebCompositorInitializer m_webCompositorInitializer;
+    FakeWebViewClient m_mockWebViewClient;
     WebViewImpl* m_webViewImpl;
 };

trunk/Tools/ChangeLog

@@ +1 @@
+2013-01-31  James Robinson  <jamesr@chromium.org>
+
+        [chromium] Remove dead transitional code from WebViewImpl
+        https://bugs.webkit.org/show_bug.cgi?id=107889
+
+        Reviewed by Adam Barth.
+
+        ScrollingCoordinatorChromiumTests need to initialize compositing, so its implementation of
+        WebWidgetClient has to support the new compositor initialization path.
+
+        * DumpRenderTree/chromium/WebViewHost.cpp:
+        (WebViewHost::initializeLayerTreeView):
+        (WebViewHost::setWebWidget):
+
 2013-01-31  Gustavo Noronha Silva  <gns@gnome.org>
 

trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp

@@ -350 +350 @@
 {
     m_layerTreeView = adoptPtr(Platform::current()->compositorSupport()->createLayerTreeView(client, rootLayer, settings));
+    if (m_layerTreeView)
+        m_layerTreeView->setSurfaceReady();
 }
 
@@ -1013 +1015 @@
     webView()->setSpellCheckClient(proxy()->spellCheckClient());
     webView()->setPrerendererClient(this);
-    webView()->setCompositorSurfaceReady();
 }