Changeset 184306 in webkit

Timestamp:

May 13, 2015, 2:18:57 PM (11 years ago)

Author:

eric.carlson@apple.com

Message:

Work around HTMLMediaElement::documentDidResumeFromPageCache being called twice
​https://bugs.webkit.org/show_bug.cgi?id=144969

Reviewed by Alexey Proskuryakov.

• dom/Document.cpp:

(WebCore::Document::addPlaybackTargetPickerClient): Replace ASSERT with early
return to work around ​https://webkit.org/b/144970.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-05-13  Eric Carlson  <eric.carlson@apple.com>
+
+        Work around HTMLMediaElement::documentDidResumeFromPageCache being called twice
+        https://bugs.webkit.org/show_bug.cgi?id=144969
+
+        Reviewed by Alexey Proskuryakov.
+
+        * dom/Document.cpp:
+        (WebCore::Document::addPlaybackTargetPickerClient): Replace ASSERT with early 
+        return to work around https://webkit.org/b/144970.
+
 2015-05-13  Timothy Horton  <timothy_horton@apple.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -6553 +6553 @@
         return;
 
-    ASSERT(!m_clientToIDMap.contains(&client));
+    // FIXME: change this back to an ASSERT once https://webkit.org/b/144970 is fixed.
+    if (m_clientToIDMap.contains(&client))
+        return;
 
     uint64_t contextId = nextPlaybackTargetClientContextId();