Title: [243985] releases/WebKitGTK/webkit-2.24/Source/WebKit
- Revision
- 243985
- Author
- [email protected]
- Date
- 2019-04-08 03:15:18 -0700 (Mon, 08 Apr 2019)
Log Message
Merge r242771 - [CoordinatedGraphics] ASSERTION FAILED: !m_state.isSuspended
https://bugs.webkit.org/show_bug.cgi?id=195550
Reviewed by Carlos Garcia Campos.
CompositingRunLoop::suspend() locks a mutex and stops the update
timer. But, the timer can be fired after the lock was acquired and
before the timer is stopped.
* Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp:
(WebKit::CompositingRunLoop::updateTimerFired): Removed the
assertion. Return early if m_state.isSuspended.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog (243984 => 243985)
--- releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog 2019-04-08 10:15:14 UTC (rev 243984)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog 2019-04-08 10:15:18 UTC (rev 243985)
@@ -1,3 +1,18 @@
+2019-03-11 Fujii Hironori <[email protected]>
+
+ [CoordinatedGraphics] ASSERTION FAILED: !m_state.isSuspended
+ https://bugs.webkit.org/show_bug.cgi?id=195550
+
+ Reviewed by Carlos Garcia Campos.
+
+ CompositingRunLoop::suspend() locks a mutex and stops the update
+ timer. But, the timer can be fired after the lock was acquired and
+ before the timer is stopped.
+
+ * Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp:
+ (WebKit::CompositingRunLoop::updateTimerFired): Removed the
+ assertion. Return early if m_state.isSuspended.
+
2019-03-07 Carlos Garcia Campos <[email protected]>
REGRESSION(r242364): [WPE] Do not stop the compositing run loop update timer on suspend
Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp (243984 => 243985)
--- releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp 2019-04-08 10:15:14 UTC (rev 243984)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp 2019-04-08 10:15:18 UTC (rev 243985)
@@ -222,7 +222,8 @@
{
// Both composition and scene update are now in progress.
LockHolder locker(m_state.lock);
- ASSERT(!m_state.isSuspended);
+ if (m_state.isSuspended)
+ return;
m_state.composition = CompositionState::InProgress;
m_state.update = UpdateState::InProgress;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
