Title: [116919] trunk/Source/WebCore
- Revision
- 116919
- Author
- [email protected]
- Date
- 2012-05-13 22:34:41 -0700 (Sun, 13 May 2012)
Log Message
[CG] Unneeded CFRetain/Release of CGImageRef in BitmapImage::draw
https://bugs.webkit.org/show_bug.cgi?id=86332
Reviewed by Dan Bernstein.
* platform/graphics/cg/ImageCG.cpp:
(WebCore::BitmapImage::draw): Don't use RetainPtr since the result of
the function is used before anything could call CFRelease on it.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (116918 => 116919)
--- trunk/Source/WebCore/ChangeLog 2012-05-14 05:32:58 UTC (rev 116918)
+++ trunk/Source/WebCore/ChangeLog 2012-05-14 05:34:41 UTC (rev 116919)
@@ -1,5 +1,16 @@
2012-05-13 Darin Adler <[email protected]>
+ [CG] Unneeded CFRetain/Release of CGImageRef in BitmapImage::draw
+ https://bugs.webkit.org/show_bug.cgi?id=86332
+
+ Reviewed by Dan Bernstein.
+
+ * platform/graphics/cg/ImageCG.cpp:
+ (WebCore::BitmapImage::draw): Don't use RetainPtr since the result of
+ the function is used before anything could call CFRelease on it.
+
+2012-05-13 Darin Adler <[email protected]>
+
Listeners map uses raw pointers, but should use OwnPtr
https://bugs.webkit.org/show_bug.cgi?id=86298
Modified: trunk/Source/WebCore/platform/graphics/cg/ImageCG.cpp (116918 => 116919)
--- trunk/Source/WebCore/platform/graphics/cg/ImageCG.cpp 2012-05-14 05:32:58 UTC (rev 116918)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageCG.cpp 2012-05-14 05:34:41 UTC (rev 116919)
@@ -192,7 +192,7 @@
{
startAnimation();
- RetainPtr<CGImageRef> image = frameAtIndex(m_currentFrame);
+ CGImageRef image = frameAtIndex(m_currentFrame);
if (!image) // If it's too early we won't have an image yet.
return;
@@ -207,7 +207,7 @@
if (shouldRespectImageOrientation == RespectImageOrientation)
orientation = frameOrientationAtIndex(m_currentFrame);
- ctxt->drawNativeImage(image.get(), selfSize, styleColorSpace, destRect, srcRect, compositeOp, orientation);
+ ctxt->drawNativeImage(image, selfSize, styleColorSpace, destRect, srcRect, compositeOp, orientation);
if (imageObserver())
imageObserver()->didDraw(this);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
