Changeset 179858 in webkit

Timestamp:

Feb 9, 2015, 4:43:57 PM (12 years ago)

Author:

bshafiei@apple.com

Message:

Merged r179839. rdar://problem/19520735

Location:

tags/Safari-601.1.17.1/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/cg/ImageSourceCG.cpp (modified) (2 diffs)

tags/Safari-601.1.17.1/Source/WebCore/ChangeLog

@@ +1 @@
+2015-02-09  Babak Shafiei  <bshafiei@apple.com>
+
+        Merge r179839.
+
+    2015-02-09  Commit Queue  <commit-queue@webkit.org>
+
+            Unreviewed, rolling out r179494.
+            https://bugs.webkit.org/show_bug.cgi?id=141395
+
+            Caused slowdown in a WebKit client test scenario (Requested by
+            kling on #webkit).
+
+            Reverted changeset:
+
+            "[Cocoa] Make decoded image data purgeable ASAP."
+            https://bugs.webkit.org/show_bug.cgi?id=140298
+            http://trac.webkit.org/changeset/179494
+
 2015-02-04  Eric Carlson  <eric.carlson@apple.com>
 

tags/Safari-601.1.17.1/Source/WebCore/platform/graphics/cg/ImageSourceCG.cpp

@@ -348 +348 @@
     RetainPtr<CGImageRef> image = adoptCF(CGImageSourceCreateImageAtIndex(m_decoder, index, imageSourceOptions(subsamplingLevel).get()));
 
-    CGImageSetCachingFlags(image.get(), kCGImageCachingTransient);
+#if PLATFORM(IOS)
+    // <rdar://problem/7371198> - CoreGraphics changed the default caching behaviour in iOS 4.0 to kCGImageCachingTransient
+    // which caused a performance regression for us since the images had to be resampled/recreated every time we called
+    // CGContextDrawImage. We now tell CG to cache the drawn images. See also <rdar://problem/14366755> -
+    // CoreGraphics needs to un-deprecate kCGImageCachingTemporary since it's still not the default.
+#if COMPILER(CLANG)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#endif
+    CGImageSetCachingFlags(image.get(), kCGImageCachingTemporary);
+#if COMPILER(CLANG)
+#pragma clang diagnostic pop
+#endif
+#endif // PLATFORM(IOS)
 
     CFStringRef imageUTI = CGImageSourceGetType(m_decoder);
@@ -355 +368 @@
     if (!imageUTI)
         return image.leakRef();
+
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
+    if (CFEqual(imageUTI, kUTTypeGIF)) {
+        CGImageSetCachingFlags(image.get(), kCGImageCachingTransient);
+        return image.leakRef();
+    }
+#endif
 
     if (!CFEqual(imageUTI, xbmUTI))