Title: [187082] branches/safari-601.1-branch/Source/WebCore
- Revision
- 187082
- Author
- matthew_han...@apple.com
- Date
- 2015-07-20 21:38:05 -0700 (Mon, 20 Jul 2015)
Log Message
Merge r187035. rdar://problem/21712311
Modified Paths
Diff
Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (187081 => 187082)
--- branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-21 04:38:02 UTC (rev 187081)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-21 04:38:05 UTC (rev 187082)
@@ -1,5 +1,19 @@
2015-07-20 Matthew Hanson <matthew_han...@apple.com>
+ Merge r187035. rdar://problem/21712311
+
+ 2015-07-20 Andreas Kling <akl...@apple.com>
+
+ Unreviewed assertion fix following r187031.
+
+ Just have GenericEventQueue::resume() return early if the queue isn't suspended.
+ Suspend/Resume calls are not always symmetrical in HTMLMediaElement.
+
+ * dom/GenericEventQueue.cpp:
+ (WebCore::GenericEventQueue::resume):
+
+2015-07-20 Matthew Hanson <matthew_han...@apple.com>
+
Merge r187031. rdar://problem/21712311
2015-07-20 Andreas Kling <akl...@apple.com>
Modified: branches/safari-601.1-branch/Source/WebCore/dom/GenericEventQueue.cpp (187081 => 187082)
--- branches/safari-601.1-branch/Source/WebCore/dom/GenericEventQueue.cpp 2015-07-21 04:38:02 UTC (rev 187081)
+++ branches/safari-601.1-branch/Source/WebCore/dom/GenericEventQueue.cpp 2015-07-21 04:38:05 UTC (rev 187082)
@@ -131,7 +131,9 @@
void GenericEventQueue::resume()
{
- ASSERT(m_isSuspended);
+ if (!m_isSuspended)
+ return;
+
m_isSuspended = false;
if (m_pendingEvents.isEmpty())
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
