Title: [241498] trunk/Source/WebKit
- Revision
- 241498
- Author
- timo...@apple.com
- Date
- 2019-02-13 21:33:04 -0800 (Wed, 13 Feb 2019)
Log Message
Allow some deprecations in WKDrawingView.
https://bugs.webkit.org/show_bug.cgi?id=194636
Reviewed by Wenson Hsieh.
* UIProcess/ios/WKDrawingView.mm:
(-[WKDrawingView PNGRepresentation]):
(-[WKDrawingView loadDrawingFromPNGRepresentation:]):
(-[WKDrawingView _canvasViewWillBeginDrawing:]):
(-[WKDrawingView didChangeInk:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (241497 => 241498)
--- trunk/Source/WebKit/ChangeLog 2019-02-14 05:32:37 UTC (rev 241497)
+++ trunk/Source/WebKit/ChangeLog 2019-02-14 05:33:04 UTC (rev 241498)
@@ -1,3 +1,16 @@
+2019-02-13 Timothy Hatcher <timo...@apple.com>
+
+ Allow some deprecations in WKDrawingView.
+ https://bugs.webkit.org/show_bug.cgi?id=194636
+
+ Reviewed by Wenson Hsieh.
+
+ * UIProcess/ios/WKDrawingView.mm:
+ (-[WKDrawingView PNGRepresentation]):
+ (-[WKDrawingView loadDrawingFromPNGRepresentation:]):
+ (-[WKDrawingView _canvasViewWillBeginDrawing:]):
+ (-[WKDrawingView didChangeInk:]):
+
2019-02-13 Jer Noble <jer.no...@apple.com>
[Cocoa] Media elements will restart network buffering just before suspending
Modified: trunk/Source/WebKit/UIProcess/ios/WKDrawingView.mm (241497 => 241498)
--- trunk/Source/WebKit/UIProcess/ios/WKDrawingView.mm 2019-02-14 05:32:37 UTC (rev 241497)
+++ trunk/Source/WebKit/UIProcess/ios/WKDrawingView.mm 2019-02-14 05:33:04 UTC (rev 241498)
@@ -134,7 +134,9 @@
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
NSDictionary *properties = nil;
if (base64Drawing) {
// FIXME: We should put this somewhere less user-facing than the EXIF User Comment field.
@@ -162,7 +164,9 @@
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
}
- (void)canvasViewDrawingDidChange:(PKCanvasView *)canvasView
@@ -172,7 +176,9 @@
- (void)_canvasViewWillBeginDrawing:(PKCanvasView *)canvasView
{
+ALLOW_DEPRECATED_DECLARATIONS_BEGIN
[_pencilView setInk:_contentView._drawingCoordinator.inkPicker.ink];
+ALLOW_DEPRECATED_DECLARATIONS_END
}
- (void)invalidateAttachment
@@ -191,7 +197,9 @@
- (void)didChangeInk:(PKInk *)ink
{
+ALLOW_DEPRECATED_DECLARATIONS_BEGIN
[_pencilView setInk:ink];
+ALLOW_DEPRECATED_DECLARATIONS_END
}
@end
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
