Changeset 291771 in webkit

Timestamp:

Mar 23, 2022, 3:50:35 PM (5 years ago)

Author:

Said Abou-Hallawa

Message:

[GPU Process] Ensure DisplayList::Recorder and its base class are initialized with the same GraphicsContextState
​https://bugs.webkit.org/show_bug.cgi?id=238278
rdar://84602660

Reviewed by Simon Fraser.

DisplayList::RecorderImpl passes the initial GraphicsContextState to its
base class DisplayList::Recorder which pushes it on its stack. But
DisplayList::Recorder does not pass this initial GraphicsContextState to
its base class which is GraphicsContext. So DisplayList::Recorder ends up
having the initial state but the GraphicsContext ends up having the default
state.

DisplayList::Recorder::drawGlyphs() calls DrawGlyphsRecorder::drawGlyphs()
which stores the original fillBrush, strokeBrush and dropShadow. It uses
these original values to restore the owner GraphicsContext when it finishes.
The problem is DrawGlyphsRecorder::drawGlyphs() stores the values in the
state of the GraphicsContext which are the default. So in some cases we
may restore the default state to the drawing GraphicsContext.

• platform/graphics/GraphicsContext.cpp:

(WebCore::GraphicsContext::GraphicsContext):

• platform/graphics/GraphicsContext.h:
• platform/graphics/displaylists/DisplayListRecorder.cpp:

(WebCore::DisplayList::Recorder::Recorder):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/GraphicsContext.cpp (modified) (1 diff)
• platform/graphics/GraphicsContext.h (modified) (1 diff)
• platform/graphics/displaylists/DisplayListRecorder.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-03-23  Said Abou-Hallawa  <said@apple.com>
+
+        [GPU Process] Ensure DisplayList::Recorder and its base class are initialized with the same GraphicsContextState
+        https://bugs.webkit.org/show_bug.cgi?id=238278
+        rdar://84602660
+
+        Reviewed by Simon Fraser.
+
+        DisplayList::RecorderImpl passes the initial GraphicsContextState to its
+        base class DisplayList::Recorder which pushes it on its stack. But 
+        DisplayList::Recorder does not pass this initial GraphicsContextState to
+        its base class which is GraphicsContext. So DisplayList::Recorder ends up
+        having the initial state but the GraphicsContext ends up having the default
+        state.
+
+        DisplayList::Recorder::drawGlyphs() calls DrawGlyphsRecorder::drawGlyphs()
+        which stores the original fillBrush, strokeBrush and dropShadow. It uses
+        these original values to restore the owner GraphicsContext when it finishes.
+        The problem is DrawGlyphsRecorder::drawGlyphs() stores the values in the
+        state of the GraphicsContext which are the default. So in some cases we
+        may restore the default state to the drawing GraphicsContext.
+
+        * platform/graphics/GraphicsContext.cpp:
+        (WebCore::GraphicsContext::GraphicsContext):
+        * platform/graphics/GraphicsContext.h:
+        * platform/graphics/displaylists/DisplayListRecorder.cpp:
+        (WebCore::DisplayList::Recorder::Recorder):
+
 2022-03-23  Andres Gonzalez  <andresg_22@apple.com>
 

trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp

@@ -49 +49 @@
 }
 
+GraphicsContext::GraphicsContext(const GraphicsContextState& state)
+    : m_state(state)
+{
+}
+
 GraphicsContext::~GraphicsContext()
 {

trunk/Source/WebCore/platform/graphics/GraphicsContext.h

@@ -67 +67 @@
 public:
     WEBCORE_EXPORT GraphicsContext(const GraphicsContextState::ChangeFlags& = { }, InterpolationQuality = InterpolationQuality::Default);
+    WEBCORE_EXPORT GraphicsContext(const GraphicsContextState&);
     WEBCORE_EXPORT virtual ~GraphicsContext();
 

trunk/Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.cpp

@@ -44 +44 @@
 
 Recorder::Recorder(const GraphicsContextState& state, const FloatRect& initialClip, const AffineTransform& initialCTM, DrawGlyphsRecorder::DeconstructDrawGlyphs deconstructDrawGlyphs)
-    : m_drawGlyphsRecorder(*this, deconstructDrawGlyphs)
+    : GraphicsContext(state)
+    , m_drawGlyphsRecorder(*this, deconstructDrawGlyphs)
 {
     m_stateStack.append({ state, initialCTM, initialCTM.mapRect(initialClip) });