Title: [160046] trunk/Source/WebCore
- Revision
- 160046
- Author
- eric.carl...@apple.com
- Date
- 2013-12-03 15:03:09 -0800 (Tue, 03 Dec 2013)
Log Message
Fix regression caused by r158599
https://bugs.webkit.org/show_bug.cgi?id=125188
Reviewed by Jer Noble.
* html/HTMLMediaElement.cpp:
(HTMLMediaElement::clearMediaPlayer): Do not clear m_player when PLUGIN_PROXY_FOR_VIDEO
is enabled.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (160045 => 160046)
--- trunk/Source/WebCore/ChangeLog 2013-12-03 22:50:20 UTC (rev 160045)
+++ trunk/Source/WebCore/ChangeLog 2013-12-03 23:03:09 UTC (rev 160046)
@@ -1,3 +1,14 @@
+2013-12-03 Eric Carlson <eric.carl...@apple.com>
+
+ Fix regression caused by r158599
+ https://bugs.webkit.org/show_bug.cgi?id=125188
+
+ Reviewed by Jer Noble.
+
+ * html/HTMLMediaElement.cpp:
+ (HTMLMediaElement::clearMediaPlayer): Do not clear m_player when PLUGIN_PROXY_FOR_VIDEO
+ is enabled.
+
2013-12-03 Thiago de Barros Lacerda <thiago.lace...@openbossa.org>
Nix Upstream: Updating WebCore files
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (160045 => 160046)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2013-12-03 22:50:20 UTC (rev 160045)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2013-12-03 23:03:09 UTC (rev 160046)
@@ -4212,7 +4212,11 @@
closeMediaSource();
#endif
+#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
+ if (!shouldUseVideoPluginProxy())
+#endif
m_player.clear();
+
stopPeriodicTimers();
m_loadTimer.stop();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
