Changeset 262194 in webkit

Timestamp:

May 27, 2020, 6:25:45 AM (6 years ago)

Author:

magomez@igalia.com

Message:

[WPE] REGRESSION(r253675) Crash when using threaded rendering
​https://bugs.webkit.org/show_bug.cgi?id=212404

Reviewed by Carlos Garcia Campos.

Check whether the GraphicsContext has a PlatformGraphicsContext before trying to paint with
it. If there's no PlatformGraphicsContext, paint using the GraphicsContext methods instead.

• platform/graphics/cairo/ImageBufferCairoBackend.cpp:

(WebCore::ImageBufferCairoBackend::draw):
(WebCore::ImageBufferCairoBackend::drawPattern):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/cairo/ImageBufferCairoBackend.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-05-27  Miguel Gomez  <magomez@igalia.com>
+
+        [WPE] REGRESSION(r253675) Crash when using threaded rendering
+        https://bugs.webkit.org/show_bug.cgi?id=212404
+
+        Reviewed by Carlos Garcia Campos.
+
+        Check whether the GraphicsContext has a PlatformGraphicsContext before trying to paint with
+        it. If there's no PlatformGraphicsContext, paint using the GraphicsContext methods instead.
+
+        * platform/graphics/cairo/ImageBufferCairoBackend.cpp:
+        (WebCore::ImageBufferCairoBackend::draw):
+        (WebCore::ImageBufferCairoBackend::drawPattern):
+
 2020-05-27  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairoBackend.cpp

@@ -55 +55 @@
 void ImageBufferCairoBackend::draw(GraphicsContext& destContext, const FloatRect& destRect, const FloatRect& srcRect, const ImagePaintingOptions& options)
 {
+    if (!destContext.hasPlatformContext()) {
+        // If there's no platformContext, we're using threaded rendering, and all the operations must be done
+        // through the GraphicsContext.
+        auto image = copyImage(&destContext == &context() ? CopyBackingStore : DontCopyBackingStore);
+        destContext.drawImage(*image, destRect, srcRect, options);
+        return;
+    }
+
     InterpolationQualityMaintainer interpolationQualityForThisScope(destContext, options.interpolationQuality());
     const auto& destinationContextState = destContext.state();
@@ -62 +70 @@
 }
 
-void ImageBufferCairoBackend::drawPattern(GraphicsContext& destContext, const FloatRect& destRect, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, const FloatSize&, const ImagePaintingOptions& options)
+void ImageBufferCairoBackend::drawPattern(GraphicsContext& destContext, const FloatRect& destRect, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, const FloatSize& spacing, const ImagePaintingOptions& options)
 {
+    if (!destContext.hasPlatformContext()) {
+        // If there's no platformContext, we're using threaded rendering, and all the operations must be done
+        // through the GraphicsContext.
+        auto image = copyImage(DontCopyBackingStore);
+        image->drawPattern(destContext, destRect, srcRect, patternTransform, phase, spacing, options);
+        return;
+    }
+
     if (auto image = copyNativeImage(&destContext == &context() ? CopyBackingStore : DontCopyBackingStore))
         Cairo::drawPattern(*destContext.platformContext(), image.get(), m_logicalSize, destRect, srcRect, patternTransform, phase, options);