Attachment 361987 Details for Bug 194636 – Patch

[patch] Patch

bug-194636-20190213200545.patch (text/plain), 2.84 KB, created by Timothy Hatcher on 2019-02-13 20:05:46 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Timothy Hatcher

Created: 2019-02-13 20:05:46 PST

Size: 2.84 KB

patch

obsolete

>Subversion Revision: 241496
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index eb656a3f2af0b7ec8d25e6752a99b2e35e87b1b7..543706a651be3078890c3be29b6128c5ac2781d8 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,16 @@
>+2019-02-13  Timothy Hatcher  <timothy@apple.com>
>+
>+        Allow some deprecations in WKDrawingView.
>+        https://bugs.webkit.org/show_bug.cgi?id=194636
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * UIProcess/ios/WKDrawingView.mm:
>+        (-[WKDrawingView PNGRepresentation]):
>+        (-[WKDrawingView loadDrawingFromPNGRepresentation:]):
>+        (-[WKDrawingView _canvasViewWillBeginDrawing:]):
>+        (-[WKDrawingView didChangeInk:]):
>+
> 2019-02-13  Jer Noble  <jer.noble@apple.com>
> 
>         [Cocoa] Media elements will restart network buffering just before suspending
>diff --git a/Source/WebKit/UIProcess/ios/WKDrawingView.mm b/Source/WebKit/UIProcess/ios/WKDrawingView.mm
>index 2b25c6049e42e28ae510c60dd3d2ad1698590723..692699c62587b30d5d716c12db85e46d2b21051e 100644
>--- a/Source/WebKit/UIProcess/ios/WKDrawingView.mm
>+++ b/Source/WebKit/UIProcess/ios/WKDrawingView.mm
>@@ -134,7 +134,9 @@ - (NSData *)PNGRepresentation
>     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 @@ - (void)loadDrawingFromPNGRepresentation:(NSData *)PNGData
>         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)canvasViewDrawingDidChange:(PKCanvasView *)canvasView
> 
> - (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)didChangeRulerState:(BOOL)rulerEnabled
> 
> - (void)didChangeInk:(PKInk *)ink
> {
>+ALLOW_DEPRECATED_DECLARATIONS_BEGIN
>     [_pencilView setInk:ink];
>+ALLOW_DEPRECATED_DECLARATIONS_END
> }
> 
> @end

Actions: View | Formatted Diff | Diff

Attachments on bug 194636: 361987