Title: [279413] trunk/Source/WebCore
Revision
279413
Author
[email protected]
Date
2021-06-30 09:28:43 -0700 (Wed, 30 Jun 2021)

Log Message

REGRESSION(r278884): [Nicosia] Fix empty stack check in CairoOperationRecorder::restore()
https://bugs.webkit.org/show_bug.cgi?id=227525

Patch by Carlos Garcia Campos <[email protected]> on 2021-06-30
Reviewed by Myles C. Maxfield.

We keep our own state stack, with a state added at construction, so we should check our stack instead.

* platform/graphics/nicosia/cairo/NicosiaCairoOperationRecorder.cpp:
(Nicosia::CairoOperationRecorder::restore):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (279412 => 279413)


--- trunk/Source/WebCore/ChangeLog	2021-06-30 15:37:59 UTC (rev 279412)
+++ trunk/Source/WebCore/ChangeLog	2021-06-30 16:28:43 UTC (rev 279413)
@@ -1,3 +1,15 @@
+2021-06-30  Carlos Garcia Campos  <[email protected]>
+
+        REGRESSION(r278884): [Nicosia] Fix empty stack check in CairoOperationRecorder::restore()
+        https://bugs.webkit.org/show_bug.cgi?id=227525
+
+        Reviewed by Myles C. Maxfield.
+
+        We keep our own state stack, with a state added at construction, so we should check our stack instead.
+
+        * platform/graphics/nicosia/cairo/NicosiaCairoOperationRecorder.cpp:
+        (Nicosia::CairoOperationRecorder::restore):
+
 2021-06-30  Tim Nguyen  <[email protected]>
 
         Support -internal- prefix for pseudo classes and rename :-webkit-direct-focus to :-internal-direct-focus

Modified: trunk/Source/WebCore/platform/graphics/nicosia/cairo/NicosiaCairoOperationRecorder.cpp (279412 => 279413)


--- trunk/Source/WebCore/platform/graphics/nicosia/cairo/NicosiaCairoOperationRecorder.cpp	2021-06-30 15:37:59 UTC (rev 279412)
+++ trunk/Source/WebCore/platform/graphics/nicosia/cairo/NicosiaCairoOperationRecorder.cpp	2021-06-30 16:28:43 UTC (rev 279413)
@@ -734,7 +734,7 @@
 
 void CairoOperationRecorder::restore()
 {
-    if (!stackSize())
+    if (m_stateStack.isEmpty())
         return;
 
     struct Restore final : PaintingOperation, OperationData<> {
@@ -753,7 +753,6 @@
 
     append(createCommand<Restore>());
 
-    ASSERT(!m_stateStack.isEmpty());
     m_stateStack.removeLast();
     if (m_stateStack.isEmpty())
         m_stateStack.clear();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to