Changeset 243985 in webkit

Timestamp:

Apr 8, 2019, 3:15:18 AM (7 years ago)

Author:

Carlos Garcia Campos

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.

Location:

releases/WebKitGTK/webkit-2.24/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp (modified) (1 diff)

releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog

@@ +1 @@
+2019-03-11  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [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  <cgarcia@igalia.com>
 

releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp

@@ -223 +223 @@
         // 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;