Changeset 143803 in webkit

Timestamp:

Feb 22, 2013, 2:42:58 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[chromium] Register newly-created layers for animation
​https://bugs.webkit.org/show_bug.cgi?id=106594

Patch by Ali Juma <​ajuma@chromium.org> on 2013-02-22
Reviewed by James Robinson.

Source/Platform:

• chromium/public/WebLayerTreeView.h:

(WebLayerTreeView):
(WebKit::WebLayerTreeView::registerForAnimations):

Source/WebKit/chromium:

• WebKit.gyp:
• src/ChromeClientImpl.cpp:

(WebKit::ChromeClientImpl::ChromeClientImpl):
(WebKit::ChromeClientImpl::graphicsLayerFactory):

• src/ChromeClientImpl.h:

(ChromeClientImpl):

• src/GraphicsLayerFactoryChromium.cpp: Added.

(WebKit):
(WebKit::GraphicsLayerFactoryChromium::GraphicsLayerFactoryChromium):
(WebKit::GraphicsLayerFactoryChromium::~GraphicsLayerFactoryChromium):
(WebKit::GraphicsLayerFactoryChromium::createGraphicsLayer):

• src/GraphicsLayerFactoryChromium.h: Added.

(WebKit):
(GraphicsLayerFactoryChromium):

• src/WebViewImpl.cpp:

(WebKit::WebViewImpl::WebViewImpl):
(WebKit::WebViewImpl::graphicsLayerFactory):
(WebKit):
(WebKit::WebViewImpl::registerForAnimations):

• src/WebViewImpl.h:

(WebViewImpl):

Location:

trunk/Source

Files:

• Platform/ChangeLog (modified) (1 diff)
• Platform/chromium/public/WebLayerTreeView.h (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/WebKit.gyp (modified) (1 diff)
• WebKit/chromium/src/ChromeClientImpl.cpp (modified) (4 diffs)
• WebKit/chromium/src/ChromeClientImpl.h (modified) (2 diffs)
• WebKit/chromium/src/GraphicsLayerFactoryChromium.cpp (added)
• WebKit/chromium/src/GraphicsLayerFactoryChromium.h (added)
• WebKit/chromium/src/WebViewImpl.cpp (modified) (3 diffs)
• WebKit/chromium/src/WebViewImpl.h (modified) (2 diffs)

trunk/Source/Platform/ChangeLog

@@ +1 @@
+2013-02-22  Ali Juma  <ajuma@chromium.org>
+
+        [chromium] Register newly-created layers for animation
+        https://bugs.webkit.org/show_bug.cgi?id=106594
+
+        Reviewed by James Robinson.
+
+        * chromium/public/WebLayerTreeView.h:
+        (WebLayerTreeView):
+        (WebKit::WebLayerTreeView::registerForAnimations):
+
 2013-02-22  Chris Rogers  <crogers@google.com>
 

trunk/Source/Platform/chromium/public/WebLayerTreeView.h

@@ -173 +173 @@
     virtual void setDeferCommits(bool deferCommits) { }
 
+    // Take responsiblity for this layer's animations, even if this layer hasn't yet
+    // been added to the tree.
+    virtual void registerForAnimations(WebLayer* layer) { }
+
     // Debugging / dangerous ---------------------------------------------
 

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2013-02-22  Ali Juma  <ajuma@chromium.org>
+
+        [chromium] Register newly-created layers for animation
+        https://bugs.webkit.org/show_bug.cgi?id=106594
+
+        Reviewed by James Robinson.
+
+        * WebKit.gyp:
+        * src/ChromeClientImpl.cpp:
+        (WebKit::ChromeClientImpl::ChromeClientImpl):
+        (WebKit::ChromeClientImpl::graphicsLayerFactory):
+        * src/ChromeClientImpl.h:
+        (ChromeClientImpl):
+        * src/GraphicsLayerFactoryChromium.cpp: Added.
+        (WebKit):
+        (WebKit::GraphicsLayerFactoryChromium::GraphicsLayerFactoryChromium):
+        (WebKit::GraphicsLayerFactoryChromium::~GraphicsLayerFactoryChromium):
+        (WebKit::GraphicsLayerFactoryChromium::createGraphicsLayer):
+        * src/GraphicsLayerFactoryChromium.h: Added.
+        (WebKit):
+        (GraphicsLayerFactoryChromium):
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::WebViewImpl):
+        (WebKit::WebViewImpl::graphicsLayerFactory):
+        (WebKit):
+        (WebKit::WebViewImpl::registerForAnimations):
+        * src/WebViewImpl.h:
+        (WebViewImpl):
+
 2013-02-22  Fady Samuel  <fsamuel@chromium.org>
 

trunk/Source/WebKit/chromium/WebKit.gyp

@@ -351 +351 @@
                 'src/GeolocationClientProxy.cpp',
                 'src/GeolocationClientProxy.h',
+                'src/GraphicsLayerFactoryChromium.cpp',
+                'src/GraphicsLayerFactoryChromium.h',
                 'src/gtk/WebInputEventFactory.cpp',
                 'src/WebHelperPluginImpl.cpp',

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

@@ -59 +59 @@
 #include "Geolocation.h"
 #include "GraphicsLayerChromium.h"
-#include "GraphicsLayerFactory.h"
 #include "HTMLInputElement.h"
 #include "HTMLNames.h"
@@ -114 +113 @@
 using namespace WebCore;
 
-namespace {
-
-class GraphicsLayerFactoryChromium : public GraphicsLayerFactory {
-public:
-    virtual ~GraphicsLayerFactoryChromium() { }
-
-    virtual PassOwnPtr<GraphicsLayer> createGraphicsLayer(GraphicsLayerClient* client) OVERRIDE
-    {
-        return adoptPtr(new GraphicsLayerChromium(client));
-    }
-};
-
-} // namespace
-
 namespace WebKit {
 
@@ -161 +146 @@
 #if ENABLE(PAGE_POPUP)
     , m_pagePopupDriver(webView)
-#endif
-#if USE(ACCELERATED_COMPOSITING)
-    , m_graphicsLayerFactory(adoptPtr(new GraphicsLayerFactoryChromium))
 #endif
 {
@@ -936 +918 @@
 GraphicsLayerFactory* ChromeClientImpl::graphicsLayerFactory() const
 {
-    return m_graphicsLayerFactory.get();
+    return m_webView->graphicsLayerFactory();
 }
 

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

@@ -39 +39 @@
 #include "WebNavigationPolicy.h"
 #include <public/WebColor.h>
-#include <wtf/OwnPtr.h>
 #include <wtf/PassOwnPtr.h>
 
@@ -253 +252 @@
     WebCore::PagePopupDriver* m_pagePopupDriver;
 #endif
-
-#if USE(ACCELERATED_COMPOSITING)
-    OwnPtr<WebCore::GraphicsLayerFactory> m_graphicsLayerFactory;
-#endif
 };
 

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

@@ -69 +69 @@
 #include "GraphicsContext3D.h"
 #include "GraphicsContext3DPrivate.h"
+#include "GraphicsLayerFactoryChromium.h"
 #include "HTMLInputElement.h"
 #include "HTMLMediaElement.h"
@@ -425 +426 @@
     , m_rootLayer(0)
     , m_rootGraphicsLayer(0)
+    , m_graphicsLayerFactory(adoptPtr(new GraphicsLayerFactoryChromium(this)))
     , m_isAcceleratedCompositingActive(false)
     , m_layerTreeViewCommitsDeferred(false)
@@ -4088 +4090 @@
 WebCore::GraphicsLayerFactory* WebViewImpl::graphicsLayerFactory() const
 {
-    return m_chromeClientImpl.graphicsLayerFactory();
+    return m_graphicsLayerFactory.get();
+}
+
+void WebViewImpl::registerForAnimations(WebLayer* layer)
+{
+    if (m_layerTreeView)
+        m_layerTreeView->registerForAnimations(layer);
 }
 

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

@@ -549 +549 @@
     void setBackgroundColor(const WebCore::Color&);
     WebCore::GraphicsLayerFactory* graphicsLayerFactory() const;
+    void registerForAnimations(WebLayer*);
 #endif
 #if ENABLE(REQUEST_ANIMATION_FRAME)
@@ -864 +865 @@
     WebLayer* m_rootLayer;
     WebCore::GraphicsLayer* m_rootGraphicsLayer;
+    OwnPtr<WebCore::GraphicsLayerFactory> m_graphicsLayerFactory;
     bool m_isAcceleratedCompositingActive;
     bool m_layerTreeViewCommitsDeferred;