[webkit-changes] [221259] branches/safari-604.1.38.0-branch/Tools

[ryanhaddad]

Title: [221259] branches/safari-604.1.38.0-branch/Tools

Revision

221259

Author

ryanhad...@apple.com

Date

2017-08-28 08:54:35 -0700 (Mon, 28 Aug 2017)

Log Message

Cherry-pick r221117.

Modified Paths

branches/safari-604.1.38.0-branch/Tools/ChangeLog
branches/safari-604.1.38.0-branch/Tools/WebKitTestRunner/ios/PlatformWebViewIOS.mm

Diff

Modified: branches/safari-604.1.38.0-branch/Tools/ChangeLog (221258 => 221259)

--- branches/safari-604.1.38.0-branch/Tools/ChangeLog	2017-08-28 15:50:10 UTC (rev 221258)
+++ branches/safari-604.1.38.0-branch/Tools/ChangeLog	2017-08-28 15:54:35 UTC (rev 221259)
@@ -1,3 +1,18 @@
+2017-08-28  Ryan Haddad  <ryanhad...@apple.com>
+
+        Cherry-pick r221117.
+
+    2017-08-23  Jonathan Bedard  <jbed...@apple.com>
+
+            Leaking CARenderServerBuffer in PlatformWebView::windowSnapshotImage()
+            https://bugs.webkit.org/show_bug.cgi?id=175905
+
+            Reviewed by Tim Horton.
+
+            * WebKitTestRunner/ios/PlatformWebViewIOS.mm:
+            (WTR::PlatformWebView::windowSnapshotImage): Pass CARenderServerBuffer to CGDataProviderCreateWithData
+            so that the buffer can be destroyed.
+
 2017-08-24  Matt Lewis  <jlew...@apple.com>
 
         Unreviewed test gardening. rdar://problem/33903582

Modified: branches/safari-604.1.38.0-branch/Tools/WebKitTestRunner/ios/PlatformWebViewIOS.mm (221258 => 221259)

--- branches/safari-604.1.38.0-branch/Tools/WebKitTestRunner/ios/PlatformWebViewIOS.mm	2017-08-28 15:50:10 UTC (rev 221258)
+++ branches/safari-604.1.38.0-branch/Tools/WebKitTestRunner/ios/PlatformWebViewIOS.mm	2017-08-28 15:54:35 UTC (rev 221259)
@@ -345,7 +345,7 @@
     size_t rowBytes = CARenderServerGetBufferRowBytes(buffer);
 
     static CGColorSpaceRef sRGBSpace = CGColorSpaceCreateWithName(kCGColorSpaceSRGB);
-    RetainPtr<CGDataProviderRef> provider = adoptCF(CGDataProviderCreateWithData(0, data, CARenderServerGetBufferDataSize(buffer), releaseDataProviderData));
+    RetainPtr<CGDataProviderRef> provider = adoptCF(CGDataProviderCreateWithData(buffer, data, CARenderServerGetBufferDataSize(buffer), releaseDataProviderData));
     
     RetainPtr<CGImageRef> cgImage = adoptCF(CGImageCreate(bufferWidth, bufferHeight, 8, 32, rowBytes, sRGBSpace, kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host, provider.get(), 0, false, kCGRenderingIntentDefault));
 

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes