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.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@160046 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent df7b8c69
2013-12-03 Eric Carlson <eric.carlson@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.lacerda@openbossa.org>
Nix Upstream: Updating WebCore files
......@@ -4212,7 +4212,11 @@ void HTMLMediaElement::clearMediaPlayer(int flags)
closeMediaSource();
#endif
#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
if (!shouldUseVideoPluginProxy())
#endif
m_player.clear();
stopPeriodicTimers();
m_loadTimer.stop();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment