Changeset 76256 in webkit

Timestamp:

Jan 20, 2011 9:11:55 AM (13 years ago)

Author:

Adam Roben

Message:

Make WKCACFLayerRenderer ref-counted

This will be needed to handle cases where the client might release its reference to us while
we're calling out to it.

WKCACFLayerRenderer now has a setClient function, which is used rather than passing the
client to create(). This allows clients to null out the client pointer when they're done
with the renderer.

Fixes <​http://webkit.org/b/52749> WKCACFLayerRenderer should be
ref-counted

Reviewed by Simon Fraser.

Source/WebCore:

• platform/graphics/win/MediaPlayerPrivateFullscreenWindow.cpp:

(WebCore::MediaPlayerPrivateFullscreenWindow::MediaPlayerPrivateFullscreenWindow):

• platform/graphics/win/MediaPlayerPrivateFullscreenWindow.h:

Updated for WKCACFLayerRenderer changes.

• platform/graphics/win/WKCACFLayerRenderer.cpp:

(WebCore::WKCACFLayerRenderer::acceleratedCompositingAvailable): Updated for changes to
create().
(WebCore::WKCACFLayerRenderer::create): No longer takes a WKCACFLayerRendererClient. Now
returns a PassOwnPtr.
(WebCore::WKCACFLayerRenderer::WKCACFLayerRenderer): No longer takes a
WKCACFLayerRendererClient.

• platform/graphics/win/WKCACFLayerRenderer.h: Made WKCACFLayerRenderer inherit from

RefCounted.
(WebCore::WKCACFLayerRenderer::setClient): Added this simple setter.

Source/WebKit/win:

Update for WKCACFLayerRenderer changes

• WebView.cpp:

(WebView::~WebView): Added some assertions to make sure we've gotten rid of our
compositing-related members. My biggest concern was making sure that m_layerRenderer was
gone, which would also mean we had nulled out its client pointer.
(WebView::setAcceleratedCompositing): Changed to call WKCACFLayerRenderer::setClient instead
of passing the client into create(), and to clear out the client before nulling out
m_layerRenderer.

• WebView.h: Changed m_layerRenderer from an OwnPtr to a RefPtr.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/win/MediaPlayerPrivateFullscreenWindow.cpp (modified) (1 diff)
• WebCore/platform/graphics/win/MediaPlayerPrivateFullscreenWindow.h (modified) (2 diffs)
• WebCore/platform/graphics/win/WKCACFLayerRenderer.cpp (modified) (2 diffs)
• WebCore/platform/graphics/win/WKCACFLayerRenderer.h (modified) (3 diffs)
• WebKit/win/ChangeLog (modified) (1 diff)
• WebKit/win/WebView.cpp (modified) (3 diffs)
• WebKit/win/WebView.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-01-19  Adam Roben  <aroben@apple.com>
+
+        Make WKCACFLayerRenderer ref-counted
+
+        This will be needed to handle cases where the client might release its reference to us while
+        we're calling out to it.
+
+        WKCACFLayerRenderer now has a setClient function, which is used rather than passing the
+        client to create(). This allows clients to null out the client pointer when they're done
+        with the renderer.
+
+        Fixes <http://webkit.org/b/52749> WKCACFLayerRenderer should be
+        ref-counted
+
+        Reviewed by Simon Fraser.
+
+        * platform/graphics/win/MediaPlayerPrivateFullscreenWindow.cpp:
+        (WebCore::MediaPlayerPrivateFullscreenWindow::MediaPlayerPrivateFullscreenWindow):
+        * platform/graphics/win/MediaPlayerPrivateFullscreenWindow.h:
+        Updated for WKCACFLayerRenderer changes.
+
+        * platform/graphics/win/WKCACFLayerRenderer.cpp:
+        (WebCore::WKCACFLayerRenderer::acceleratedCompositingAvailable): Updated for changes to
+        create().
+        (WebCore::WKCACFLayerRenderer::create): No longer takes a WKCACFLayerRendererClient. Now
+        returns a PassOwnPtr.
+        (WebCore::WKCACFLayerRenderer::WKCACFLayerRenderer): No longer takes a
+        WKCACFLayerRendererClient.
+
+        * platform/graphics/win/WKCACFLayerRenderer.h: Made WKCACFLayerRenderer inherit from
+        RefCounted.
+        (WebCore::WKCACFLayerRenderer::setClient): Added this simple setter.
+
 2011-01-20  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateFullscreenWindow.cpp

@@ -41 +41 @@
     , m_hwnd(0)
 #if USE(ACCELERATED_COMPOSITING)
-    , m_layerRenderer(WKCACFLayerRenderer::create(0))
+    , m_layerRenderer(WKCACFLayerRenderer::create())
 #endif
 {

trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateFullscreenWindow.h

@@ -31 +31 @@
 #include "WKCACFLayerRenderer.h"
 #endif
-#include <wtf/OwnPtr.h>
 
 typedef unsigned WPARAM;
@@ -72 +71 @@
     MediaPlayerPrivateFullscreenClient* m_client;
 #if USE(ACCELERATED_COMPOSITING)
-    OwnPtr<WKCACFLayerRenderer> m_layerRenderer;
+    RefPtr<WKCACFLayerRenderer> m_layerRenderer;
     RefPtr<PlatformCALayer> m_rootChild;
 #endif

trunk/Source/WebCore/platform/graphics/win/WKCACFLayerRenderer.cpp

@@ -166 +166 @@
     }
 
-    OwnPtr<WKCACFLayerRenderer> testLayerRenderer = WKCACFLayerRenderer::create(0);
+    RefPtr<WKCACFLayerRenderer> testLayerRenderer = WKCACFLayerRenderer::create();
     testLayerRenderer->setHostWindow(testWindow);
     available = testLayerRenderer->createRenderer();
@@ -174 +174 @@
 }
 
-PassOwnPtr<WKCACFLayerRenderer> WKCACFLayerRenderer::create(WKCACFLayerRendererClient* client)
+PassRefPtr<WKCACFLayerRenderer> WKCACFLayerRenderer::create()
 {
     if (!acceleratedCompositingAvailable())
         return 0;
-    return new WKCACFLayerRenderer(client);
-}
-
-WKCACFLayerRenderer::WKCACFLayerRenderer(WKCACFLayerRendererClient* client)
-    : m_client(client)
+    return adoptRef(new WKCACFLayerRenderer());
+}
+
+WKCACFLayerRenderer::WKCACFLayerRenderer()
+    : m_client(0)
     , m_mightBeAbleToCreateDeviceLater(true)
     , m_rootLayer(PlatformCALayer::create(PlatformCALayer::LayerTypeRootLayer, 0))

trunk/Source/WebCore/platform/graphics/win/WKCACFLayerRenderer.h

@@ -33 +33 @@
 
 #include <wtf/HashSet.h>
-#include <wtf/Noncopyable.h>
-#include <wtf/PassOwnPtr.h>
 #include <wtf/PassRefPtr.h>
+#include <wtf/RefCounted.h>
 #include <wtf/RefPtr.h>
 #include <wtf/RetainPtr.h>
@@ -61 +60 @@
 // has its own CARenderOGLContext and Direct3DDevice9, which is inefficient.
 // (https://bugs.webkit.org/show_bug.cgi?id=31855)
-class WKCACFLayerRenderer {
-    WTF_MAKE_NONCOPYABLE(WKCACFLayerRenderer);
+class WKCACFLayerRenderer : public RefCounted<WKCACFLayerRenderer> {
     friend PlatformCALayer;
 
 public:
-    static PassOwnPtr<WKCACFLayerRenderer> create(WKCACFLayerRendererClient*);
+    static PassRefPtr<WKCACFLayerRenderer> create();
     ~WKCACFLayerRenderer();
 
     static bool acceleratedCompositingAvailable();
+
+    void setClient(WKCACFLayerRendererClient* client) { m_client = client; }
 
     void setRootChildLayer(PlatformCALayer*);
@@ -83 +83 @@
 
 private:
-    WKCACFLayerRenderer(WKCACFLayerRendererClient*);
+    WKCACFLayerRenderer();
 
     bool createRenderer();

trunk/Source/WebKit/win/ChangeLog

@@ +1 @@
+2011-01-19  Adam Roben  <aroben@apple.com>
+
+        Update for WKCACFLayerRenderer changes
+
+        Fixes <http://webkit.org/b/52749> WKCACFLayerRenderer should be
+        ref-counted
+
+        Reviewed by Simon Fraser.
+
+        * WebView.cpp:
+        (WebView::~WebView): Added some assertions to make sure we've gotten rid of our
+        compositing-related members. My biggest concern was making sure that m_layerRenderer was
+        gone, which would also mean we had nulled out its client pointer.
+        (WebView::setAcceleratedCompositing): Changed to call WKCACFLayerRenderer::setClient instead
+        of passing the client into create(), and to clear out the client before nulling out
+        m_layerRenderer.
+
+        * WebView.h: Changed m_layerRenderer from an OwnPtr to a RefPtr.
+
 2011-01-19  Adam Roben  <aroben@apple.com>
 

trunk/Source/WebKit/win/WebView.cpp

@@ -387 +387 @@
     ASSERT(!m_preferences);
     ASSERT(!m_viewWindow);
+
+#if USE(ACCELERATED_COMPOSITING)
+    ASSERT(!m_layerRenderer);
+    ASSERT(!m_backingLayer);
+#endif
 
     WebViewCount--;
@@ -6281 +6286 @@
 
     if (accelerated) {
-        m_layerRenderer = WKCACFLayerRenderer::create(this);
+        m_layerRenderer = WKCACFLayerRenderer::create();
         if (m_layerRenderer) {
             m_isAcceleratedCompositing = true;
 
-            // Create the root layer
+            m_layerRenderer->setClient(this);
             ASSERT(m_viewWindow);
             m_layerRenderer->setHostWindow(m_viewWindow);
@@ -6308 +6313 @@
         }
     } else {
+        ASSERT(m_layerRenderer);
+        m_layerRenderer->setClient(0);
         m_layerRenderer = 0;
         m_backingLayer = 0;

trunk/Source/WebKit/win/WebView.h

@@ -1057 +1057 @@
     void setAcceleratedCompositing(bool);
 
-    OwnPtr<WebCore::WKCACFLayerRenderer> m_layerRenderer;
+    RefPtr<WebCore::WKCACFLayerRenderer> m_layerRenderer;
     OwnPtr<WebCore::GraphicsLayer> m_backingLayer;
     bool m_isAcceleratedCompositing;