REGRESSION(311425@main) [GLIB] Flaky view-transition test crashes

https://bugs.webkit.org/show_bug.cgi?id=312629

Reviewed by Nikolas Zimmermann.

The problem is that in ThreadedCompositor renderLayerTree can be called
after invalidate. Before 311425@main we returned early because m_context
is also set to nullptr in invalidate, but now the context is always
nullptr when using skia compositor and we are assuming that a null
texture mapper means we are using skia. This patch adds an Invalidated state
to ThreadedCompositor to make sure we always return early from
renderLayerTree after invalidate, and it always uses m_useSkia to check
if we are using the skia compositor.

Fixes: imported/w3c/web-platform-tests/css/css-view-transitions/navigation/pageswap-push-with-redirect.html
       imported/w3c/web-platform-tests/css/css-view-transitions/navigation/pageswap-skip-transition.html
       imported/w3c/web-platform-tests/css/css-view-transitions/navigation/pageswap-replace-navigation.html
       imported/w3c/web-platform-tests/css/css-view-transitions/navigation/pagereveal-with-view-transition.html

* LayoutTests/platform/glib/TestExpectations:
* Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/ThreadedCompositor.cpp:
(WebKit::ThreadedCompositor::invalidate):
(WebKit::ThreadedCompositor::isActive const):
(WebKit::ThreadedCompositor::paintToCurrentGLContext):
(WebKit::ThreadedCompositor::renderLayerTree):
(WebKit::ThreadedCompositor::stateToString):
(WebKit::ThreadedCompositor::scheduleUpdateLocked):
(WebKit::ThreadedCompositor::frameComplete):
* Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/ThreadedCompositor.h:

Canonical link: https://commits.webkit.org/311654@main

Author: carlosgcampos

LayoutTests/platform/glib/TestExpectations

@@ -4683,11 +4683,6 @@ imported/w3c/web-platform-tests/css/css-view-transitions/navigation/custom-scrol
 imported/w3c/web-platform-tests/css/css-view-transitions/navigation/auto-name-from-id.html [ ImageOnlyFailure ]
 imported/w3c/web-platform-tests/css/css-view-transitions/start-skip-start.html [ Pass Failure ]
 
-webkit.org/b/312629 imported/w3c/web-platform-tests/css/css-view-transitions/navigation/pageswap-push-with-redirect.html [ Crash Pass ]
-webkit.org/b/312629 imported/w3c/web-platform-tests/css/css-view-transitions/navigation/pageswap-skip-transition.html [ Crash Pass ]
-webkit.org/b/312629 imported/w3c/web-platform-tests/css/css-view-transitions/navigation/pageswap-replace-navigation.html [ Crash Pass ]
-webkit.org/b/312629 imported/w3c/web-platform-tests/css/css-view-transitions/navigation/pagereveal-with-view-transition.html [ Crash Pass ]
-
 imported/w3c/web-platform-tests/svg/text/reftests/transform-dynamic-change.html [ ImageOnlyFailure ]
 
 # Kerning for SVG not working as expected.

Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/ThreadedCompositor.cpp

@@ -136,12 +136,12 @@ void ThreadedCompositor::invalidate()
         Locker locker { m_state.lock };
         stopRenderTimer();
         m_state.didCompositeRenderingUpdateFunction = nullptr;
-        m_state.state = State::Idle;
+        m_state.state = State::Invalidated;
     }
 
     m_didCompositeRunLoopObserver->invalidate();
     m_workQueue->dispatchSync([this] {
-        if (m_textureMapper && (!m_context || !m_context->makeContextCurrent()))
+        if (!m_useSkia && (!m_context || !m_context->makeContextCurrent()))
             return;
 
         // Update the scene at this point ensures the layers state are correctly propagated.
@@ -208,7 +208,7 @@ void ThreadedCompositor::resume()
 bool ThreadedCompositor::isActive() const
 {
     Locker locker { m_state.lock };
-    return m_state.state != State::Idle;
+    return m_state.state != State::Idle && m_state.state != State::Invalidated;
 }
 
 void ThreadedCompositor::backgroundColorDidChange()
@@ -281,10 +281,10 @@ void ThreadedCompositor::flushCompositingState(const OptionSet<CompositionReason
 
 void ThreadedCompositor::paintToCurrentGLContext(const TransformationMatrix& matrix, const IntSize& size, const OptionSet<CompositionReason>& reasons)
 {
-    if (m_textureMapper)
-        paintToTextureMapper(matrix, size, reasons);
-    else
+    if (m_useSkia)
         paintToSkiaCanvas(matrix, size, reasons);
+    else
+        paintToTextureMapper(matrix, size, reasons);
 }
 
 void ThreadedCompositor::paintToTextureMapper(const TransformationMatrix& matrix, const IntSize& size, const OptionSet<CompositionReason>& reasons)
@@ -431,6 +431,9 @@ void ThreadedCompositor::renderLayerTree()
     {
         Locker locker { m_state.lock };
 
+        if (m_state.state == State::Invalidated)
+            return;
+
         // The timer has been stopped.
         if (!m_state.isRenderTimerActive)
             return;
@@ -449,7 +452,7 @@ void ThreadedCompositor::renderLayerTree()
         m_state.state = State::InProgress;
     }
 
-    if (m_textureMapper && (!m_context || !m_context->makeContextCurrent()))
+    if (!m_useSkia && (!m_context || !m_context->makeContextCurrent()))
         return;
 
     // Retrieve the scene attributes in a thread-safe manner.
@@ -531,6 +534,8 @@ ASCIILiteral ThreadedCompositor::stateToString(ThreadedCompositor::State state)
         return "InProgress"_s;
     case State::ScheduledWhileInProgress:
         return "ScheduledWhileInProgress"_s;
+    case State::Invalidated:
+        return "Invalidated"_s;
     }
     RELEASE_ASSERT_NOT_REACHED();
 }
@@ -554,6 +559,7 @@ void ThreadedCompositor::scheduleUpdateLocked()
         m_state.state = State::ScheduledWhileInProgress;
         break;
     case State::ScheduledWhileInProgress:
+    case State::Invalidated:
         break;
     }
 }
@@ -568,6 +574,7 @@ void ThreadedCompositor::frameComplete()
     switch (m_state.state) {
     case State::Idle:
     case State::Scheduled:
+    case State::Invalidated:
         break;
     case State::InProgress:
         if (m_state.reasons.contains(CompositionReason::RenderingUpdate) && m_state.isWaitingForTiles)

Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/ThreadedCompositor.h

@@ -133,7 +133,8 @@ class ThreadedCompositor : public ThreadSafeRefCountedAndCanMakeThreadSafeWeakPt
         Idle,
         Scheduled,
         InProgress,
-        ScheduledWhileInProgress
+        ScheduledWhileInProgress,
+        Invalidated
     };
     static ASCIILiteral stateToString(State);