Title: [141954] trunk/Source/WebKit/chromium
- Revision
- 141954
- Author
- [email protected]
- Date
- 2013-02-05 17:42:08 -0800 (Tue, 05 Feb 2013)
Log Message
[chromium] Explicitly destroy the WebMediaPlayer in WebMediaPlayerClientImpl's destructor
https://bugs.webkit.org/show_bug.cgi?id=108989
Patch by David Dorwin <[email protected]> on 2013-02-05
Reviewed by Kent Tamura.
* src/WebMediaPlayerClientImpl.cpp:
(WebKit::WebMediaPlayerClientImpl::~WebMediaPlayerClientImpl):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (141953 => 141954)
--- trunk/Source/WebKit/chromium/ChangeLog 2013-02-06 01:36:36 UTC (rev 141953)
+++ trunk/Source/WebKit/chromium/ChangeLog 2013-02-06 01:42:08 UTC (rev 141954)
@@ -1,3 +1,13 @@
+2013-02-05 David Dorwin <[email protected]>
+
+ [chromium] Explicitly destroy the WebMediaPlayer in WebMediaPlayerClientImpl's destructor
+ https://bugs.webkit.org/show_bug.cgi?id=108989
+
+ Reviewed by Kent Tamura.
+
+ * src/WebMediaPlayerClientImpl.cpp:
+ (WebKit::WebMediaPlayerClientImpl::~WebMediaPlayerClientImpl):
+
2013-02-04 Kentaro Hara <[email protected]>
[V8] Reduce usage of deprecatedString() and deprecatedInteger()
Modified: trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp (141953 => 141954)
--- trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp 2013-02-06 01:36:36 UTC (rev 141953)
+++ trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp 2013-02-06 01:42:08 UTC (rev 141954)
@@ -100,12 +100,21 @@
if (m_webMediaPlayer)
m_webMediaPlayer->setStreamTextureClient(0);
#endif
- if (m_helperPlugin)
- closeHelperPlugin();
+
#if USE(ACCELERATED_COMPOSITING)
if (m_videoLayer)
GraphicsLayerChromium::unregisterContentsLayer(m_videoLayer->layer());
#endif
+
+ // Explicitly destroy the WebMediaPlayer to allow verification of tear down.
+ m_webMediaPlayer.clear();
+
+ // FIXME(ddorwin): Uncomment the ASSERT and remove the closeHelperPlugin()
+ // call after fixing http://crbug.com/173755.
+ // Ensure the m_webMediaPlayer destroyed any WebHelperPlugin used.
+ // ASSERT(!m_helperPlugin);
+ if (m_helperPlugin)
+ closeHelperPlugin();
}
void WebMediaPlayerClientImpl::networkStateChanged()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
