Title: [158874] trunk/Source/WebCore
- Revision
- 158874
- Author
- [email protected]
- Date
- 2013-11-07 14:08:21 -0800 (Thu, 07 Nov 2013)
Log Message
Remove npr.org specific hack in HTMLMediaElement
https://bugs.webkit.org/show_bug.cgi?id=123859
Reviewed by Jer Noble.
Remove the site specific hack added in r57820, it is no longer necessary.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::HTMLMediaElement): Remove m_dispatchingCanPlayEvent.
(HTMLMediaElement::play): Don't special case npr.org.
* html/HTMLMediaElement.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (158873 => 158874)
--- trunk/Source/WebCore/ChangeLog 2013-11-07 21:56:17 UTC (rev 158873)
+++ trunk/Source/WebCore/ChangeLog 2013-11-07 22:08:21 UTC (rev 158874)
@@ -1,3 +1,17 @@
+2013-11-07 Eric Carlson <[email protected]>
+
+ Remove npr.org specific hack in HTMLMediaElement
+ https://bugs.webkit.org/show_bug.cgi?id=123859
+
+ Reviewed by Jer Noble.
+
+ Remove the site specific hack added in r57820, it is no longer necessary.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::HTMLMediaElement): Remove m_dispatchingCanPlayEvent.
+ (HTMLMediaElement::play): Don't special case npr.org.
+ * html/HTMLMediaElement.h:
+
2013-11-07 Simon Fraser <[email protected]>
Attempt to fix the 32-bit build. Virtual thunks seem to have different
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (158873 => 158874)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2013-11-07 21:56:17 UTC (rev 158873)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2013-11-07 22:08:21 UTC (rev 158874)
@@ -295,7 +295,6 @@
#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
, m_needWidgetUpdate(false)
#endif
- , m_dispatchingCanPlayEvent(false)
, m_loadInitiatedByUserGesture(false)
, m_completelyLoaded(false)
, m_havePreparedToPlay(false)
@@ -2490,16 +2489,6 @@
if (ScriptController::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(!ScriptController::processingUserGesture());
- String host = document().baseURL().host();
- if (host.endsWith(".npr.org", false) || equalIgnoringCase(host, "npr.org"))
- return;
- }
-
playInternal();
}
@@ -4959,24 +4948,6 @@
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
Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (158873 => 158874)
--- trunk/Source/WebCore/html/HTMLMediaElement.h 2013-11-07 21:56:17 UTC (rev 158873)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2013-11-07 22:08:21 UTC (rev 158874)
@@ -377,8 +377,6 @@
MediaController* controller() const;
void setController(PassRefPtr<MediaController>);
- virtual bool dispatchEvent(PassRefPtr<Event>) OVERRIDE;
-
virtual bool willRespondToMouseClickEvents() OVERRIDE;
void enteredOrExitedFullscreen() { configureMediaControls(); }
@@ -732,7 +730,6 @@
bool m_needWidgetUpdate : 1;
#endif
- bool m_dispatchingCanPlayEvent : 1;
bool m_loadInitiatedByUserGesture : 1;
bool m_completelyLoaded : 1;
bool m_havePreparedToPlay : 1;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
