Changeset 140808 in webkit

Timestamp:

Jan 25, 2013 3:03:30 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r140774.
​http://trac.webkit.org/changeset/140774
​https://bugs.webkit.org/show_bug.cgi?id=107932

Tests ScrollingCoordinatorChromiumTest.fastScrollingByDefault

and fastScrollingForFixedPosition are failing (Requested by
keishi on #webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2013-01-25

Source/WebKit/chromium:

• public/WebWidget.h:

(WebWidget):
(WebKit::WebWidget::isInputThrottled):
(WebKit::WebWidget::renderingStats):

• src/WebViewImpl.cpp:

(WebKit::WebViewImpl::WebViewImpl):
(WebKit::WebViewImpl::~WebViewImpl):
(WebKit::WebViewImpl::renderingStats):
(WebKit):
(WebKit::WebViewImpl::setCompositorSurfaceReady):
(WebKit::WebViewImpl::isInputThrottled):
(WebKit::WebViewImpl::setIsTransparent):
(WebKit::WebViewImpl::setIsAcceleratedCompositingActive):

• src/WebViewImpl.h:

Tools:

• 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)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/chromium/WebViewHost.cpp (modified) (2 diffs)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2013-01-25  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r140774.
+        http://trac.webkit.org/changeset/140774
+        https://bugs.webkit.org/show_bug.cgi?id=107932
+
+         Tests ScrollingCoordinatorChromiumTest.fastScrollingByDefault
+        and fastScrollingForFixedPosition are failing (Requested by
+        keishi on #webkit).
+
+        * public/WebWidget.h:
+        (WebWidget):
+        (WebKit::WebWidget::isInputThrottled):
+        (WebKit::WebWidget::renderingStats):
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::WebViewImpl):
+        (WebKit::WebViewImpl::~WebViewImpl):
+        (WebKit::WebViewImpl::renderingStats):
+        (WebKit):
+        (WebKit::WebViewImpl::setCompositorSurfaceReady):
+        (WebKit::WebViewImpl::isInputThrottled):
+        (WebKit::WebViewImpl::setIsTransparent):
+        (WebKit::WebViewImpl::setIsAcceleratedCompositingActive):
+        * src/WebViewImpl.h:
+
 2013-01-25  Eberhard Graether  <egraether@google.com>
 

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() { }
+    virtual void setCompositorSurfaceReady() = 0;
 
     // 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.
@@ -239 +248 @@
     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)
@@ -425 +426 @@
     , m_compositorCreationFailed(false)
     , m_recreatingGraphicsContext(false)
+    , m_compositorSurfaceReady(false)
     , m_inputHandlerIdentifier(-1)
 #endif
@@ -510 +512 @@
 WebViewImpl::~WebViewImpl()
 {
+    if (m_ownsLayerTreeView)
+        delete m_layerTreeView;
     ASSERT(!m_page);
 }
@@ -833 +837 @@
     m_gestureAnimation = WebActiveGestureAnimation::createWithTimeOffset(curve.release(), this, parameters.startTime);
     scheduleAnimation();
+}
+
+void WebViewImpl::renderingStats(WebRenderingStats& stats) const
+{
+    if (m_layerTreeView)
+        m_layerTreeView->renderingStats(stats);
 }
 
@@ -1765 +1775 @@
 #endif
 
+void WebViewImpl::setCompositorSurfaceReady()
+{
+    m_compositorSurfaceReady = true;
+    if (m_layerTreeView)
+        m_layerTreeView->setSurfaceReady();
+}
+
 void WebViewImpl::animate(double)
 {
@@ -1942 +1959 @@
         m_layerTreeView->setNeedsRedraw();
 #endif
+}
+
+bool WebViewImpl::isInputThrottled() const
+{
+#if USE(ACCELERATED_COMPOSITING)
+    if (m_layerTreeView && isAcceleratedCompositingActive())
+        return m_layerTreeView->commitRequested();
+#endif
+    return false;
 }
 
@@ -3580 +3606 @@
     if (m_nonCompositedContentHost)
         m_nonCompositedContentHost->setOpaque(!isTransparent);
+
+    if (m_layerTreeView)
+        m_layerTreeView->setHasTransparentBackground(isTransparent);
 }
 
@@ -4063 +4092 @@
         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)
@@ -4070 +4103 @@
             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()
@@ -152 +153 @@
     virtual void composite(bool finish);
     virtual void setNeedsRedraw();
+    virtual bool isInputThrottled() const;
     virtual bool handleInputEvent(const WebInputEvent&);
     virtual bool hasTouchEventHandlersAt(const WebPoint&);
@@ -183 +185 @@
     virtual void instrumentBeginFrame();
     virtual void instrumentCancelFrame();
+    virtual void renderingStats(WebRenderingStats&) const;
 
     // WebView methods:
@@ -841 +844 @@
     OwnPtr<NonCompositedContentHost> m_nonCompositedContentHost;
     WebLayerTreeView* m_layerTreeView;
+    bool m_ownsLayerTreeView;
     WebLayer* m_rootLayer;
     WebCore::GraphicsLayer* m_rootGraphicsLayer;
@@ -848 +852 @@
     // If true, the graphics context is being restored.
     bool m_recreatingGraphicsContext;
+    bool m_compositorSurfaceReady;
     int m_inputHandlerIdentifier;
 #endif

trunk/Tools/ChangeLog

@@ +1 @@
+2013-01-25  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r140774.
+        http://trac.webkit.org/changeset/140774
+        https://bugs.webkit.org/show_bug.cgi?id=107932
+
+         Tests ScrollingCoordinatorChromiumTest.fastScrollingByDefault
+        and fastScrollingForFixedPosition are failing (Requested by
+        keishi on #webkit).
+
+        * DumpRenderTree/chromium/WebViewHost.cpp:
+        (WebViewHost::initializeLayerTreeView):
+        (WebViewHost::setWebWidget):
+
 2013-01-25  Alan Cutter  <alancutter@chromium.org>
 

trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp

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