Title: [184306] trunk/Source/WebCore
- Revision
- 184306
- Author
- [email protected]
- Date
- 2015-05-13 14:18:57 -0700 (Wed, 13 May 2015)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (184305 => 184306)
--- trunk/Source/WebCore/ChangeLog 2015-05-13 21:05:03 UTC (rev 184305)
+++ trunk/Source/WebCore/ChangeLog 2015-05-13 21:18:57 UTC (rev 184306)
@@ -1,3 +1,14 @@
+2015-05-13 Eric Carlson <[email protected]>
+
+ 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 <[email protected]>
Going back after resizing causes scroll knob to appear in the middle of the page
Modified: trunk/Source/WebCore/dom/Document.cpp (184305 => 184306)
--- trunk/Source/WebCore/dom/Document.cpp 2015-05-13 21:05:03 UTC (rev 184305)
+++ trunk/Source/WebCore/dom/Document.cpp 2015-05-13 21:18:57 UTC (rev 184306)
@@ -6552,7 +6552,9 @@
if (!page)
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();
m_clientToIDMap.add(&client, contextId);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
