Changeset 225775 in webkit

Timestamp:

Dec 11, 2017, 11:06:16 PM (8 years ago)

Author:

zandobersek@gmail.com

Message:

[Cairo] Cairo::clipToImageBuffer() should operate on a cairo_surface_t
​https://bugs.webkit.org/show_bug.cgi?id=180665

Reviewed by Michael Catanzaro.

Have the Cairo::clipToImageBuffer() function in the CairoUtilities code
operate on a cairo_surface_t object, instead of an Image object.

Call site in GraphicsContext::clipToImageBuffer() is adjusted to first
ensure a non-null Image object, and then retrieve a cairo_surface_t
object from that, passing it on to Cairo::clipToImageBuffer().

No new tests -- no change in functionality.

• platform/graphics/cairo/CairoOperations.cpp:

(WebCore::Cairo::clipToImageBuffer):

• platform/graphics/cairo/CairoOperations.h:
• platform/graphics/cairo/GraphicsContextCairo.cpp:

(WebCore::GraphicsContext::clipToImageBuffer):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/cairo/CairoOperations.cpp (modified) (1 diff)
• platform/graphics/cairo/CairoOperations.h (modified) (2 diffs)
• platform/graphics/cairo/GraphicsContextCairo.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-12-11  Zan Dobersek  <zdobersek@igalia.com>
+
+        [Cairo] Cairo::clipToImageBuffer() should operate on a cairo_surface_t
+        https://bugs.webkit.org/show_bug.cgi?id=180665
+
+        Reviewed by Michael Catanzaro.
+
+        Have the Cairo::clipToImageBuffer() function in the CairoUtilities code
+        operate on a cairo_surface_t object, instead of an Image object.
+
+        Call site in GraphicsContext::clipToImageBuffer() is adjusted to first
+        ensure a non-null Image object, and then retrieve a cairo_surface_t
+        object from that, passing it on to Cairo::clipToImageBuffer().
+
+        No new tests -- no change in functionality.
+
+        * platform/graphics/cairo/CairoOperations.cpp:
+        (WebCore::Cairo::clipToImageBuffer):
+        * platform/graphics/cairo/CairoOperations.h:
+        * platform/graphics/cairo/GraphicsContextCairo.cpp:
+        (WebCore::GraphicsContext::clipToImageBuffer):
+
 2017-12-11  Zan Dobersek  <zdobersek@igalia.com>
 

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

@@ -1005 +1005 @@
 }
 
-void clipToImageBuffer(PlatformContextCairo& platformContext, Image& image, const FloatRect& destRect)
-{
-    RefPtr<cairo_surface_t> surface = image.nativeImageForCurrentFrame();
-    if (surface)
-        platformContext.pushImageMask(surface.get(), destRect);
+void clipToImageBuffer(PlatformContextCairo& platformContext, cairo_surface_t* image, const FloatRect& destRect)
+{
+    platformContext.pushImageMask(image, destRect);
 }
 

trunk/Source/WebCore/platform/graphics/cairo/CairoOperations.h

@@ -48 +48 @@
 class FloatSize;
 class GraphicsContext;
-class Image;
 class Path;
 class PlatformContextCairo;
@@ -124 +123 @@
 void clipPath(PlatformContextCairo&, const Path&, WindRule);
 
-void clipToImageBuffer(PlatformContextCairo&, Image&, const FloatRect&);
+void clipToImageBuffer(PlatformContextCairo&, cairo_surface_t*, const FloatRect&);
 
 } // namespace Cairo

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

@@ -268 +268 @@
 
     RefPtr<Image> image = buffer.copyImage(DontCopyBackingStore);
-
-    ASSERT(hasPlatformContext());
-    Cairo::clipToImageBuffer(*platformContext(), *image, destRect);
+    if (!image)
+        return;
+
+    ASSERT(hasPlatformContext());
+    if (auto surface = image->nativeImageForCurrentFrame())
+        Cairo::clipToImageBuffer(*platformContext(), surface.get(), destRect);
 }