Changeset 115529 in webkit

Timestamp:

Apr 27, 2012 7:55:49 PM (12 years ago)

Author:

enne@google.com

Message:

[chromium] Allow WebMediaPlayerClientImpl to switch clients
​https://bugs.webkit.org/show_bug.cgi?id=85093

Reviewed by James Robinson.

WebVideoFrameProviderClient has a 1:1 relationship with a
WebVideoFrameProvider. The client here is CCVideoLayerImpl and the
provider is WebMediaPlayerClientImpl. If the provider gets a new
client, then the old client needs to be informed to stop using the
provider.

If this doesn't happen, then the old client will have an unsafe
pointer to the provider, will not get informed if the provider gets
deleted, and the client will crash when it dereferences the provider
pointer trying to tell the provider that its client is going away.

Test: WebMediaPlayerClientImplTest.InitialNullVideoClient

WebMediaPlayerClientImplTest.SetAndUnsetVideoClient
WebMediaPlayerClientImplTest.DestroyProvider
WebMediaPlayerClientImplTest.SetMultipleVideoClients

• WebKit.gypi:
• src/WebMediaPlayerClientImpl.cpp:

(WebKit::WebMediaPlayerClientImpl::setVideoFrameProviderClient):

• src/WebMediaPlayerClientImpl.h:

(WebMediaPlayerClientImpl):

• tests/WebMediaPlayerClientImplTest.cpp: Added.

(WebKit):
(FakeWebMediaPlayerClientImpl):
(WebKit::FakeWebMediaPlayerClientImpl::create):
(WebKit::FakeWebMediaPlayerClientImpl::FakeWebMediaPlayerClientImpl):
(FakeVideoFrameProviderClient):
(WebKit::FakeVideoFrameProviderClient::create):
(WebKit::FakeVideoFrameProviderClient::~FakeVideoFrameProviderClient):
(WebKit::FakeVideoFrameProviderClient::didReceiveFrame):
(WebKit::FakeVideoFrameProviderClient::didUpdateMatrix):
(WebKit::FakeVideoFrameProviderClient::stopUsingProvider):
(WebKit::FakeVideoFrameProviderClient::provider):
(WebKit::FakeVideoFrameProviderClient::FakeVideoFrameProviderClient):
(WebKit::TEST):

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• WebKit.gypi (modified) (1 diff)
• src/WebMediaPlayerClientImpl.cpp (modified) (1 diff)
• src/WebMediaPlayerClientImpl.h (modified) (1 diff)
• tests/WebMediaPlayerClientImplTest.cpp (added)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-04-27  Adrienne Walker  <enne@google.com>
+
+        [chromium] Allow WebMediaPlayerClientImpl to switch clients
+        https://bugs.webkit.org/show_bug.cgi?id=85093
+
+        Reviewed by James Robinson.
+
+        WebVideoFrameProviderClient has a 1:1 relationship with a
+        WebVideoFrameProvider. The client here is CCVideoLayerImpl and the
+        provider is WebMediaPlayerClientImpl.  If the provider gets a new
+        client, then the old client needs to be informed to stop using the
+        provider.
+
+        If this doesn't happen, then the old client will have an unsafe
+        pointer to the provider, will not get informed if the provider gets
+        deleted, and the client will crash when it dereferences the provider
+        pointer trying to tell the provider that its client is going away.
+
+        Test: WebMediaPlayerClientImplTest.InitialNullVideoClient
+              WebMediaPlayerClientImplTest.SetAndUnsetVideoClient
+              WebMediaPlayerClientImplTest.DestroyProvider
+              WebMediaPlayerClientImplTest.SetMultipleVideoClients
+
+        * WebKit.gypi:
+        * src/WebMediaPlayerClientImpl.cpp:
+        (WebKit::WebMediaPlayerClientImpl::setVideoFrameProviderClient):
+        * src/WebMediaPlayerClientImpl.h:
+        (WebMediaPlayerClientImpl):
+        * tests/WebMediaPlayerClientImplTest.cpp: Added.
+        (WebKit):
+        (FakeWebMediaPlayerClientImpl):
+        (WebKit::FakeWebMediaPlayerClientImpl::create):
+        (WebKit::FakeWebMediaPlayerClientImpl::FakeWebMediaPlayerClientImpl):
+        (FakeVideoFrameProviderClient):
+        (WebKit::FakeVideoFrameProviderClient::create):
+        (WebKit::FakeVideoFrameProviderClient::~FakeVideoFrameProviderClient):
+        (WebKit::FakeVideoFrameProviderClient::didReceiveFrame):
+        (WebKit::FakeVideoFrameProviderClient::didUpdateMatrix):
+        (WebKit::FakeVideoFrameProviderClient::stopUsingProvider):
+        (WebKit::FakeVideoFrameProviderClient::provider):
+        (WebKit::FakeVideoFrameProviderClient::FakeVideoFrameProviderClient):
+        (WebKit::TEST):
+
 2012-04-27  Tony Chang  <tony@chromium.org>
 

trunk/Source/WebKit/chromium/WebKit.gypi

@@ -135 +135 @@
             'tests/WebFrameTest.cpp',
             'tests/WebLayerTest.cpp',
+            'tests/WebMediaPlayerClientImplTest.cpp',
             'tests/WebPageNewSerializerTest.cpp',
             'tests/WebPageSerializerTest.cpp',

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

@@ -673 +673 @@
 {
     MutexLocker locker(m_compositingMutex);
+    if (m_videoFrameProviderClient)
+        m_videoFrameProviderClient->stopUsingProvider();
     m_videoFrameProviderClient = client;
     if (m_webMediaPlayer)

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

@@ -166 +166 @@
     virtual void didUpdateMatrix(const float*);
 
+protected:
+    WebMediaPlayerClientImpl();
 private:
-    WebMediaPlayerClientImpl();
     void startDelayedLoad();
     void loadInternal();