Title: [260864] trunk/Source/WebKit
- Revision
- 260864
- Author
- [email protected]
- Date
- 2020-04-28 21:26:12 -0700 (Tue, 28 Apr 2020)
Log Message
REGRESSION (r260407): Over-release of NSGraphicsContext in WebKit::convertPlatformImageToBitmap()
<https://webkit.org/b/211160>
Reviewed by Darin Adler.
* UIProcess/Cocoa/WebPageProxyCocoa.mm:
(WebKit::convertPlatformImageToBitmap): Use retainPtr() instead
of adoptNS() to fix the over-release.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (260863 => 260864)
--- trunk/Source/WebKit/ChangeLog 2020-04-29 03:54:56 UTC (rev 260863)
+++ trunk/Source/WebKit/ChangeLog 2020-04-29 04:26:12 UTC (rev 260864)
@@ -1,5 +1,16 @@
2020-04-28 David Kilzer <[email protected]>
+ REGRESSION (r260407): Over-release of NSGraphicsContext in WebKit::convertPlatformImageToBitmap()
+ <https://webkit.org/b/211160>
+
+ Reviewed by Darin Adler.
+
+ * UIProcess/Cocoa/WebPageProxyCocoa.mm:
+ (WebKit::convertPlatformImageToBitmap): Use retainPtr() instead
+ of adoptNS() to fix the over-release.
+
+2020-04-28 David Kilzer <[email protected]>
+
IPC::Decoder::isValid() should just be a nullptr check
<https://webkit.org/b/211152>
<rdar://problem/62552699>
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm (260863 => 260864)
--- trunk/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm 2020-04-29 03:54:56 UTC (rev 260863)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm 2020-04-29 04:26:12 UTC (rev 260864)
@@ -405,7 +405,7 @@
[image drawInRect:CGRectMake(0, 0, bitmap->size().width(), bitmap->size().height())];
UIGraphicsPopContext();
#elif PLATFORM(MAC)
- auto savedContext = adoptNS([NSGraphicsContext currentContext]);
+ auto savedContext = retainPtr([NSGraphicsContext currentContext]);
[NSGraphicsContext setCurrentContext:[NSGraphicsContext graphicsContextWithCGContext:graphicsContext->platformContext() flipped:YES]];
[image drawInRect:NSMakeRect(0, 0, bitmap->size().width(), bitmap->size().height()) fromRect:NSZeroRect operation:NSCompositingOperationSourceOver fraction:1 respectFlipped:YES hints:nil];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
