Changeset 160046 in webkit


Ignore:
Timestamp:
Dec 3, 2013 3:03:09 PM (10 years ago)
Author:
eric.carlson@apple.com
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.

Location:
trunk/Source/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r160045 r160046  
     12013-12-03  Eric Carlson  <eric.carlson@apple.com>
     2
     3        Fix regression caused by r158599
     4        https://bugs.webkit.org/show_bug.cgi?id=125188
     5
     6        Reviewed by Jer Noble.
     7
     8        * html/HTMLMediaElement.cpp:
     9        (HTMLMediaElement::clearMediaPlayer): Do not clear m_player when PLUGIN_PROXY_FOR_VIDEO
     10            is enabled.
     11
    1122013-12-03  Thiago de Barros Lacerda  <thiago.lacerda@openbossa.org>
    213
  • trunk/Source/WebCore/html/HTMLMediaElement.cpp

    r159827 r160046  
    42134213#endif
    42144214
     4215#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
     4216    if (!shouldUseVideoPluginProxy())
     4217#endif
    42154218    m_player.clear();
     4219
    42164220    stopPeriodicTimers();
    42174221    m_loadTimer.stop();
Note: See TracChangeset for help on using the changeset viewer.