Title: [242926] trunk/Source/WebKit
- Revision
- 242926
- Author
- [email protected]
- Date
- 2019-03-13 17:50:35 -0700 (Wed, 13 Mar 2019)
Log Message
Stop using some deprecated SPI in WKDrawingView
https://bugs.webkit.org/show_bug.cgi?id=195706
<rdar://problem/48062599>
Reviewed by Wenson Hsieh.
* UIProcess/ios/WKDrawingView.mm:
(-[WKDrawingView renderedDrawing]):
(-[WKDrawingView PNGRepresentation]):
(-[WKDrawingView loadDrawingFromPNGRepresentation:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (242925 => 242926)
--- trunk/Source/WebKit/ChangeLog 2019-03-14 00:38:15 UTC (rev 242925)
+++ trunk/Source/WebKit/ChangeLog 2019-03-14 00:50:35 UTC (rev 242926)
@@ -1,3 +1,16 @@
+2019-03-13 Tim Horton <[email protected]>
+
+ Stop using some deprecated SPI in WKDrawingView
+ https://bugs.webkit.org/show_bug.cgi?id=195706
+ <rdar://problem/48062599>
+
+ Reviewed by Wenson Hsieh.
+
+ * UIProcess/ios/WKDrawingView.mm:
+ (-[WKDrawingView renderedDrawing]):
+ (-[WKDrawingView PNGRepresentation]):
+ (-[WKDrawingView loadDrawingFromPNGRepresentation:]):
+
2019-03-13 Timothy Hatcher <[email protected]>
Unreviewed speculative build fix for watchOS after r242908.
Modified: trunk/Source/WebKit/UIProcess/ios/WKDrawingView.mm (242925 => 242926)
--- trunk/Source/WebKit/UIProcess/ios/WKDrawingView.mm 2019-03-14 00:38:15 UTC (rev 242925)
+++ trunk/Source/WebKit/UIProcess/ios/WKDrawingView.mm 2019-03-14 00:50:35 UTC (rev 242926)
@@ -116,11 +116,9 @@
__block RetainPtr<UIImage> resultImage;
-ALLOW_DEPRECATED_DECLARATIONS_BEGIN
- [_renderer renderDrawing:[_pencilView drawing] completion:^(UIImage *image) {
+ [_renderer renderDrawing:[_pencilView nonNullDrawing] completion:^(UIImage *image) {
resultImage = image;
}];
-ALLOW_DEPRECATED_DECLARATIONS_END
// FIXME: Ideally we would not synchronously wait for this rendering,
// but NSFileWrapper requires data synchronously, and our clients expect
@@ -136,9 +134,7 @@
RetainPtr<UIImage> image = [self renderedDrawing];
RetainPtr<NSMutableData> PNGData = adoptNS([[NSMutableData alloc] init]);
RetainPtr<CGImageDestinationRef> imageDestination = adoptCF(CGImageDestinationCreateWithData((__bridge CFMutableDataRef)PNGData.get(), kUTTypePNG, 1, nil));
-ALLOW_DEPRECATED_DECLARATIONS_BEGIN
- NSString *base64Drawing = [[[_pencilView drawing] serialize] base64EncodedStringWithOptions:0];
-ALLOW_DEPRECATED_DECLARATIONS_END
+ NSString *base64Drawing = [[[_pencilView nonNullDrawing] serialize] base64EncodedStringWithOptions:0];
NSDictionary *properties = nil;
if (base64Drawing) {
// FIXME: We should put this somewhere less user-facing than the EXIF User Comment field.
@@ -166,9 +162,7 @@
return;
RetainPtr<NSData> drawingData = adoptNS([[NSData alloc] initWithBase64EncodedString:base64Drawing options:0]);
RetainPtr<PKDrawing> drawing = adoptNS([WebKit::allocPKDrawingInstance() initWithData:drawingData.get() error:nil]);
-ALLOW_DEPRECATED_DECLARATIONS_BEGIN
- [_pencilView setDrawing:drawing.get()];
-ALLOW_DEPRECATED_DECLARATIONS_END
+ [_pencilView setNonNullDrawing:drawing.get()];
}
- (void)canvasViewDrawingDidChange:(PKCanvasView *)canvasView
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
