| Index: Source/core/html/HTMLMediaElement.cpp
|
| diff --git a/Source/core/html/HTMLMediaElement.cpp b/Source/core/html/HTMLMediaElement.cpp
|
| index cfe442397c75afbbe97d8d06a79fd678961a8dea..32d0ad26885f47e8816ab7fac4d6e5fd8617cac9 100644
|
| --- a/Source/core/html/HTMLMediaElement.cpp
|
| +++ b/Source/core/html/HTMLMediaElement.cpp
|
| @@ -283,7 +283,6 @@ HTMLMediaElement::HTMLMediaElement(const QualifiedName& tagName, Document& docum
|
| , m_pausedInternal(false)
|
| , m_sendProgressEvents(true)
|
| , m_closedCaptionsVisible(false)
|
| - , m_dispatchingCanPlayEvent(false)
|
| , m_loadInitiatedByUserGesture(false)
|
| , m_completelyLoaded(false)
|
| , m_havePreparedToPlay(false)
|
| @@ -2156,16 +2155,6 @@ void HTMLMediaElement::play()
|
| if (UserGestureIndicator::processingUserGesture())
|
| removeBehaviorsRestrictionsAfterFirstUserGesture();
|
|
|
| - Settings* settings = document().settings();
|
| - if (settings && settings->needsSiteSpecificQuirks() && m_dispatchingCanPlayEvent && !m_loadInitiatedByUserGesture) {
|
| - // It should be impossible to be processing the canplay event while handling a user gesture
|
| - // since it is dispatched asynchronously.
|
| - ASSERT(!UserGestureIndicator::processingUserGesture());
|
| - String host = document().baseURL().host();
|
| - if (host.endsWith(".npr.org", false) || equalIgnoringCase(host, "npr.org"))
|
| - return;
|
| - }
|
| -
|
| playInternal();
|
| }
|
|
|
| @@ -3902,24 +3891,6 @@ void HTMLMediaElement::updateMediaController()
|
| m_mediaController->reportControllerState();
|
| }
|
|
|
| -bool HTMLMediaElement::dispatchEvent(PassRefPtr<Event> event)
|
| -{
|
| - bool dispatchResult;
|
| - bool isCanPlayEvent;
|
| -
|
| - isCanPlayEvent = (event->type() == eventNames().canplayEvent);
|
| -
|
| - if (isCanPlayEvent)
|
| - m_dispatchingCanPlayEvent = true;
|
| -
|
| - dispatchResult = HTMLElement::dispatchEvent(event);
|
| -
|
| - if (isCanPlayEvent)
|
| - m_dispatchingCanPlayEvent = false;
|
| -
|
| - return dispatchResult;
|
| -}
|
| -
|
| bool HTMLMediaElement::isBlocked() const
|
| {
|
| // A media element is a blocked media element if its readyState attribute is in the
|
|
|