Changeset 116909 in webkit

Timestamp:

May 13, 2012 4:48:25 PM (12 years ago)

Author:

Darin Adler

Message:

Roll out local changes accidentally landed in r116905.

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

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-13  Darin Adler  <darin@apple.com>
+
+        Roll out local changes accidentally landed in r116905.
+
+        * platform/graphics/GraphicsContext.h:
+        * platform/graphics/cg/GraphicsContextCG.cpp:
+        * platform/graphics/cg/ImageCG.cpp:
+
 2012-05-13  Rob Buis  <rbuis@rim.com>
 

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

@@ -263 +263 @@
         void drawPath(const Path&);
 
-        void drawNativeImage(CGImageRef, const FloatSize& selfSize, ColorSpace styleColorSpace, const FloatRect& destRect, const FloatRect& srcRect, CompositeOperator = CompositeSourceOver, ImageOrientation = DefaultImageOrientation);
+        void drawNativeImage(NativeImagePtr, const FloatSize& selfSize, ColorSpace styleColorSpace, const FloatRect& destRect, const FloatRect& srcRect, CompositeOperator = CompositeSourceOver, ImageOrientation = DefaultImageOrientation);
 
         // Allow font smoothing (LCD antialiasing). Not part of the graphics state.

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

@@ -75 +75 @@
 
 namespace WebCore {
-
-static RetainPtr<CGImageRef> subimage(CGImageRef image, const FloatRect& rect)
-{
-    return adoptCF(CGImageCreateWithImageInRect(image, rect));
-}
     
 static CGColorSpaceRef createLinearSRGBColorSpace()
@@ -218 +213 @@
             adjustedDestRect.setHeight(subimageRect.height() / yScale);
 
-            image = subimage(image.get(), subimageRect);
+            image.adoptCF(CGImageCreateWithImageInRect(image.get(), subimageRect));
             if (currHeight < srcRect.maxY()) {
                 ASSERT(CGImageGetHeight(image.get()) == currHeight - CGRectIntegral(srcRect).origin.y);

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

@@ -193 +193 @@
     startAnimation();
 
-    CGImageRef image = frameAtIndex(m_currentFrame);
+    RetainPtr<CGImageRef> image = frameAtIndex(m_currentFrame);
     if (!image) // If it's too early we won't have an image yet.
         return;
@@ -208 +208 @@
         orientation = frameOrientationAtIndex(m_currentFrame);
 
-    ctxt->drawNativeImage(image, selfSize, styleColorSpace, destRect, srcRect, compositeOp, orientation);
+    ctxt->drawNativeImage(image.get(), selfSize, styleColorSpace, destRect, srcRect, compositeOp, orientation);
 
     if (imageObserver())