Changeset 195975 in webkit

Timestamp:

Feb 1, 2016 12:47:10 PM (8 years ago)

Author:

timothy_horton@apple.com

Message:

Snapshot surfaces are forever wired after being compressed
​https://bugs.webkit.org/show_bug.cgi?id=153751
<rdar://problem/24354546>

Reviewed by Darin Adler.

• platform/graphics/cocoa/IOSurface.mm:

(IOSurface::convertToFormat):
Allow IOSurfaceAccelerator to unwire surfaces after they're transformed.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/cocoa/IOSurface.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-02-01  Tim Horton  <timothy_horton@apple.com>
+
+        Snapshot surfaces are forever wired after being compressed
+        https://bugs.webkit.org/show_bug.cgi?id=153751
+        <rdar://problem/24354546>
+
+        Reviewed by Darin Adler.
+
+        * platform/graphics/cocoa/IOSurface.mm:
+        (IOSurface::convertToFormat):
+        Allow IOSurfaceAccelerator to unwire surfaces after they're transformed.
+
 2016-02-01  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm

@@ -42 +42 @@
 CGImageRef CGIOSurfaceContextCreateImageReference(CGContextRef);
 }
+
+#if PLATFORM(IOS)
+// Move this into the SPI header once it's possible to put inside the APPLE_INTERNAL_SDK block.
+NSString * const WebIOSurfaceAcceleratorUnwireSurfaceKey = @"UnwireSurface";
+#endif
 
 using namespace WebCore;
@@ -411 +416 @@
     };
 
-    IOReturn ret = IOSurfaceAcceleratorTransformSurface(accelerator, inSurface->surface(), destinationIOSurfaceRef, nullptr, nullptr, &completion, nullptr, nullptr);
+    NSDictionary *options = @{ WebIOSurfaceAcceleratorUnwireSurfaceKey : @YES };
+
+    IOReturn ret = IOSurfaceAcceleratorTransformSurface(accelerator, inSurface->surface(), destinationIOSurfaceRef, (CFDictionaryRef)options, nullptr, &completion, nullptr, nullptr);
     ASSERT_UNUSED(ret, ret == kIOReturnSuccess);
 }