Changeset 184001 in webkit

Timestamp:

May 8, 2015, 11:45:40 AM (11 years ago)

Author:

eric.carlson@apple.com

Message:

[Mac] Playback target clients do not unregister on page reload
​https://bugs.webkit.org/show_bug.cgi?id=144761

Reviewed by Brady Eidson.

• dom/Document.cpp:

(WebCore::Document::prepareForDestruction): Unregister all target picker clients.

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::registerWithDocument): Register for page cache callback.
(WebCore::HTMLMediaElement::unregisterWithDocument): Unregister for page cache callback.
(WebCore::HTMLMediaElement::documentWillSuspendForPageCache): New.
(WebCore::HTMLMediaElement::documentDidResumeFromPageCache): New.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (1 diff)
• html/HTMLMediaElement.cpp (modified) (3 diffs)
• html/HTMLMediaElement.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-05-08  Eric Carlson  <eric.carlson@apple.com>
+
+        [Mac] Playback target clients do not unregister on page reload
+        https://bugs.webkit.org/show_bug.cgi?id=144761
+
+        Reviewed by Brady Eidson.
+
+        * dom/Document.cpp:
+        (WebCore::Document::prepareForDestruction): Unregister all target picker clients.
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::registerWithDocument): Register for page cache callback.
+        (WebCore::HTMLMediaElement::unregisterWithDocument): Unregister for page cache callback.
+        (WebCore::HTMLMediaElement::documentWillSuspendForPageCache): New.
+        (WebCore::HTMLMediaElement::documentDidResumeFromPageCache): New.
+
 2015-05-08  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -2253 +2253 @@
         m_mediaQueryMatcher->documentDestroyed();
 
+#if ENABLE(WIRELESS_PLAYBACK_TARGET)
+    if (!m_clientToIDMap.isEmpty() && page()) {
+        Vector<WebCore::MediaPlaybackTargetClient*> clients;
+        copyKeysToVector(m_clientToIDMap, clients);
+        for (auto client : clients)
+            removePlaybackTargetPickerClient(*client);
+    }
+#endif
+
     disconnectFromFrame();
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -461 +461 @@
 #endif
 
+#if ENABLE(WIRELESS_PLAYBACK_TARGET)
+    document.registerForPageCacheSuspensionCallbacks(this);
+#endif
+
     document.addAudioProducer(this);
     addElementToDocumentMap(*this, document);
@@ -487 +491 @@
     if (m_mediaControlsDependOnPageScaleFactor)
         document.unregisterForPageScaleFactorChangedCallbacks(this);
+#endif
+
+#if ENABLE(WIRELESS_PLAYBACK_TARGET)
+    document.unregisterForPageCacheSuspensionCallbacks(this);
 #endif
 
@@ -509 +517 @@
     HTMLElement::didMoveToNewDocument(oldDocument);
 }
+
+#if ENABLE(WIRELESS_PLAYBACK_TARGET)
+void HTMLMediaElement::documentWillSuspendForPageCache()
+{
+    m_mediaSession->unregisterWithDocument(*this);
+}
+
+void HTMLMediaElement::documentDidResumeFromPageCache()
+{
+    m_mediaSession->registerWithDocument(*this);
+}
+#endif
 
 bool HTMLMediaElement::hasCustomFocusLogic() const

trunk/Source/WebCore/html/HTMLMediaElement.h

@@ -738 +738 @@
     void updateCaptionContainer();
 
+#if ENABLE(WIRELESS_PLAYBACK_TARGET)
+    virtual void documentWillSuspendForPageCache() override final;
+    virtual void documentDidResumeFromPageCache() override final;
+#endif
+
     Timer m_pendingActionTimer;
     Timer m_progressEventTimer;