Changeset 185120 in webkit

Timestamp:

Jun 2, 2015, 2:04:55 PM (11 years ago)

Author:

eric.carlson@apple.com

Message:

[Mac] occasional crash in Document::playbackTargetAvailabilityDidChange
​https://bugs.webkit.org/show_bug.cgi?id=145559

Reviewed by Darin Adler.

No new tests, covered by existing tests.

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::registerWithDocument): Pass document to m_mediaSession->registerWithDocument.
(WebCore::HTMLMediaElement::unregisterWithDocument): Pass document to m_mediaSession->unRegisterWithDocument.
(WebCore::HTMLMediaElement::documentWillSuspendForPageCache): Ditto.
(WebCore::HTMLMediaElement::documentDidResumeFromPageCache): Ditto.

• html/MediaElementSession.cpp:

(WebCore::MediaElementSession::registerWithDocument): Take a document.
(WebCore::MediaElementSession::unregisterWithDocument): Ditto.

• html/MediaElementSession.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLMediaElement.cpp (modified) (4 diffs)
• html/MediaElementSession.cpp (modified) (1 diff)
• html/MediaElementSession.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-06-02  Eric Carlson  <eric.carlson@apple.com>
+
+        [Mac] occasional crash in Document::playbackTargetAvailabilityDidChange
+        https://bugs.webkit.org/show_bug.cgi?id=145559
+
+        Reviewed by Darin Adler.
+
+        No new tests, covered by existing tests.
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::registerWithDocument): Pass document to m_mediaSession->registerWithDocument.
+        (WebCore::HTMLMediaElement::unregisterWithDocument): Pass document to m_mediaSession->unRegisterWithDocument.
+        (WebCore::HTMLMediaElement::documentWillSuspendForPageCache): Ditto.
+        (WebCore::HTMLMediaElement::documentDidResumeFromPageCache): Ditto.
+
+        * html/MediaElementSession.cpp:
+        (WebCore::MediaElementSession::registerWithDocument): Take a document.
+        (WebCore::MediaElementSession::unregisterWithDocument): Ditto.
+        * html/MediaElementSession.h:
+
 2015-06-02  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -461 +461 @@
 void HTMLMediaElement::registerWithDocument(Document& document)
 {
-    m_mediaSession->registerWithDocument(*this);
+    m_mediaSession->registerWithDocument(document);
 
     if (m_isWaitingUntilMediaCanStart)
@@ -493 +493 @@
 void HTMLMediaElement::unregisterWithDocument(Document& document)
 {
-    m_mediaSession->unregisterWithDocument(*this);
+    m_mediaSession->unregisterWithDocument(document);
 
     if (m_isWaitingUntilMediaCanStart)
@@ -531 +531 @@
     }
 
-    if (oldDocument) {
+    if (oldDocument)
         unregisterWithDocument(*oldDocument);
-    }
 
     registerWithDocument(document());
@@ -543 +542 @@
 void HTMLMediaElement::documentWillSuspendForPageCache()
 {
-    m_mediaSession->unregisterWithDocument(*this);
+    m_mediaSession->unregisterWithDocument(document());
 }
 
 void HTMLMediaElement::documentDidResumeFromPageCache()
 {
-    m_mediaSession->registerWithDocument(*this);
+    m_mediaSession->registerWithDocument(document());
 }
 #endif

trunk/Source/WebCore/html/MediaElementSession.cpp

@@ -88 +88 @@
 }
 
-void MediaElementSession::registerWithDocument(const HTMLMediaElement& element)
-{
-#if ENABLE(WIRELESS_PLAYBACK_TARGET)
-    element.document().addPlaybackTargetPickerClient(*this);
+void MediaElementSession::registerWithDocument(Document& document)
+{
+#if ENABLE(WIRELESS_PLAYBACK_TARGET)
+    document.addPlaybackTargetPickerClient(*this);
 #else
-    UNUSED_PARAM(element);
-#endif
-}
-
-void MediaElementSession::unregisterWithDocument(const HTMLMediaElement& element)
-{
-#if ENABLE(WIRELESS_PLAYBACK_TARGET)
-    element.document().removePlaybackTargetPickerClient(*this);
+    UNUSED_PARAM(document);
+#endif
+}
+
+void MediaElementSession::unregisterWithDocument(Document& document)
+{
+#if ENABLE(WIRELESS_PLAYBACK_TARGET)
+    document.removePlaybackTargetPickerClient(*this);
 #else
-    UNUSED_PARAM(element);
+    UNUSED_PARAM(document);
 #endif
 }

trunk/Source/WebCore/html/MediaElementSession.h

@@ -45 +45 @@
     virtual ~MediaElementSession() { }
 
-    void registerWithDocument(const HTMLMediaElement&);
-    void unregisterWithDocument(const HTMLMediaElement&);
+    void registerWithDocument(Document&);
+    void unregisterWithDocument(Document&);
 
     bool playbackPermitted(const HTMLMediaElement&) const;