Changeset 191117 in webkit

Timestamp:

Oct 15, 2015, 10:20:10 AM (10 years ago)

Author:

Simon Fraser

Message:

Move ImageBuffer:clip() into GraphicsContextCG
​https://bugs.webkit.org/show_bug.cgi?id=150140

Reviewed by Zalan Bujtas.

Move the guts of CG's ImageBuffer:clip() into GraphicsContextCG.

• platform/graphics/GraphicsContext.h:
• platform/graphics/cg/GraphicsContextCG.cpp:

(WebCore::GraphicsContext::clipToNativeImage):

• platform/graphics/cg/ImageBufferCG.cpp:

(WebCore::ImageBuffer::clip):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/GraphicsContext.h (modified) (1 diff)
• platform/graphics/cg/GraphicsContextCG.cpp (modified) (1 diff)
• platform/graphics/cg/ImageBufferCG.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-10-14  Simon Fraser  <simon.fraser@apple.com>
+
+        Move ImageBuffer:clip() into GraphicsContextCG
+        https://bugs.webkit.org/show_bug.cgi?id=150140
+
+        Reviewed by Zalan Bujtas.
+
+        Move the guts of CG's ImageBuffer:clip() into GraphicsContextCG.
+
+        * platform/graphics/GraphicsContext.h:
+        * platform/graphics/cg/GraphicsContextCG.cpp:
+        (WebCore::GraphicsContext::clipToNativeImage):
+        * platform/graphics/cg/ImageBufferCG.cpp:
+        (WebCore::ImageBuffer::clip):
+
 2015-10-14  Brady Eidson  <beidson@apple.com>
 

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

@@ -263 +263 @@
         WEBCORE_EXPORT void drawNativeImage(PassNativeImagePtr, const FloatSize& selfSize, ColorSpace styleColorSpace, const FloatRect& destRect, const FloatRect& srcRect, CompositeOperator = CompositeSourceOver, BlendMode = BlendModeNormal, ImageOrientation = DefaultImageOrientation);
 
+        void clipToNativeImage(PassNativeImagePtr, const FloatRect& destRect, const FloatSize& bufferSize);
+
         // Allow font smoothing (LCD antialiasing). Not part of the graphics state.
         void setAllowsFontSmoothing(bool);

trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp

@@ -346 +346 @@
 }
 
+void GraphicsContext::clipToNativeImage(PassNativeImagePtr image, const FloatRect& destRect, const FloatSize& bufferSize)
+{
+    CGContextRef context = platformContext();
+    // FIXME: This image needs to be grayscale to be used as an alpha mask here.
+    CGContextTranslateCTM(context, destRect.x(), destRect.y() + bufferSize.height());
+    CGContextScaleCTM(context, 1, -1);
+    CGContextClipToRect(context, FloatRect(FloatPoint(0, bufferSize.height() - destRect.height()), destRect.size()));
+    CGContextClipToMask(context, FloatRect(FloatPoint(), bufferSize), image);
+    CGContextScaleCTM(context, 1, -1);
+    CGContextTranslateCTM(context, -destRect.x(), -destRect.y() - destRect.height());
+}
+
 // Draws a filled rectangle with a stroked border.
 void GraphicsContext::drawRect(const FloatRect& rect, float borderThickness)

trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp

@@ -267 +267 @@
 {
     FloatSize backingStoreSizeInUserSpace = scaleSizeToUserSpace(rect.size(), m_data.backingStoreSize, internalSize());
-
-    CGContextRef platformContextToClip = contextToClip.platformContext();
-    // FIXME: This image needs to be grayscale to be used as an alpha mask here.
     RetainPtr<CGImageRef> image = copyNativeImage(DontCopyBackingStore);
-    CGContextTranslateCTM(platformContextToClip, rect.x(), rect.y() + backingStoreSizeInUserSpace.height());
-    CGContextScaleCTM(platformContextToClip, 1, -1);
-    CGContextClipToRect(platformContextToClip, FloatRect(FloatPoint(0, backingStoreSizeInUserSpace.height() - rect.height()), rect.size()));
-    CGContextClipToMask(platformContextToClip, FloatRect(FloatPoint(), backingStoreSizeInUserSpace), image.get());
-    CGContextScaleCTM(platformContextToClip, 1, -1);
-    CGContextTranslateCTM(platformContextToClip, -rect.x(), -rect.y() - rect.height());
+    contextToClip.clipToNativeImage(image.get(), rect, backingStoreSizeInUserSpace);
 }