Changeset 238767 in webkit

Timestamp:

Nov 30, 2018 5:11:12 PM (5 years ago)

Author:

timothy_horton@apple.com

Message:

Editable images should always return some data, even if the canvas doesn't have a size yet
​https://bugs.webkit.org/show_bug.cgi?id=192265
<rdar://problem/46385911>

Reviewed by Wenson Hsieh.

• UIProcess/ios/WKDrawingView.mm:

(-[WKDrawingView layoutSubviews]):
(emptyImage):
(-[WKDrawingView renderedDrawing]):
(-[WKDrawingView PNGRepresentation]):
Some clients strongly depend on there being some data in an image, even if
it's not of a usable size yet. We'll invalidate the attachment when the
canvas size changes, so it will eventually settle at a usable size (after
the first layer tree commit that includes the editable image).

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ios/WKDrawingView.mm (modified) (6 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-11-30  Tim Horton  <timothy_horton@apple.com>
+
+        Editable images should always return some data, even if the canvas doesn't have a size yet
+        https://bugs.webkit.org/show_bug.cgi?id=192265
+        <rdar://problem/46385911>
+
+        Reviewed by Wenson Hsieh.
+
+        * UIProcess/ios/WKDrawingView.mm:
+        (-[WKDrawingView layoutSubviews]):
+        (emptyImage):
+        (-[WKDrawingView renderedDrawing]):
+        (-[WKDrawingView PNGRepresentation]):
+        Some clients strongly depend on there being some data in an image, even if
+        it's not of a usable size yet. We'll invalidate the attachment when the
+        canvas size changes, so it will eventually settle at a usable size (after
+        the first layer tree commit that includes the editable image).
+
 2018-11-30  Don Olmstead  <don.olmstead@sony.com>
 

trunk/Source/WebKit/UIProcess/ios/WKDrawingView.mm

@@ -40 +40 @@
     RetainPtr<PKCanvasView> _pencilView;
 
+#if !PLATFORM(IOS_FAMILY_SIMULATOR)
     OSObjectPtr<dispatch_queue_t> _renderQueue;
     RetainPtr<PKImageRenderer> _renderer;
+#endif
 
     WeakPtr<WebKit::WebPageProxy> _webPageProxy;
@@ -71 +73 @@
         [_pencilView setFrame:self.bounds];
 
+#if !PLATFORM(IOS_FAMILY_SIMULATOR)
         // The renderer is instantiated for a particular size output; if
         // the size changes, we need to re-create the renderer.
         _renderer = nil;
+#endif
 
         [self invalidateAttachment];
@@ -79 +83 @@
 }
 
-- (NSData *)PNGRepresentation
+static UIImage *emptyImage()
 {
+    UIGraphicsBeginImageContext(CGSizeMake(1, 1));
+    CGContextClearRect(UIGraphicsGetCurrentContext(), CGRectMake(0, 0, 1, 1));
+    UIImage *resultImage = UIGraphicsGetImageFromCurrentImageContext();
+    UIGraphicsEndImageContext();
+
+    return resultImage;
+}
+
+- (UIImage *)renderedDrawing
+{
+#if PLATFORM(IOS_FAMILY_SIMULATOR)
+    // PKImageRenderer currently doesn't work in the simulator. In order to
+    // allow strokes to persist regardless (mostly for testing), we'll
+    // synthesize an empty 1x1 image.
+    return emptyImage();
+#else
     if (!self.bounds.size.width || !self.bounds.size.height || !self.window.screen.scale)
-        return nil;
+        return emptyImage();
 
     if (!_renderQueue)
@@ -90 +110 @@
         _renderer = adoptNS([WebKit::allocPKImageRendererInstance() initWithSize:self.bounds.size scale:self.window.screen.scale renderQueue:_renderQueue.get()]);
 
-    auto* drawing = [_pencilView drawing];
+    __block RetainPtr<UIImage> resultImage;
 
-    __block RetainPtr<UIImage> resultImage;
-#if PLATFORM(IOS_FAMILY_SIMULATOR)
-    // PKImageRenderer currently doesn't work in the simulator. In order to
-    // allow strokes to persist regardless (mostly for testing), we'll
-    // synthesize an empty 1x1 image.
-    UIGraphicsBeginImageContext(CGSizeMake(1, 1));
-    CGContextClearRect(UIGraphicsGetCurrentContext(), CGRectMake(0, 0, 1, 1));
-    resultImage = UIGraphicsGetImageFromCurrentImageContext();
-    UIGraphicsEndImageContext();
-#else
-    [_renderer renderDrawing:drawing completion:^(UIImage *image) {
+    [_renderer renderDrawing:[_pencilView drawing] completion:^(UIImage *image) {
         resultImage = image;
     }];
-#endif
 
     // FIXME: Ideally we would not synchronously wait for this rendering,
@@ -112 +121 @@
     dispatch_sync(_renderQueue.get(), ^{ });
 
+    return resultImage.get();
+#endif
+}
+
+- (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));
-    NSString *base64Drawing = [[drawing serialize] base64EncodedStringWithOptions:0];
+    NSString *base64Drawing = [[[_pencilView drawing] serialize] base64EncodedStringWithOptions:0];
     NSDictionary *properties = nil;
     if (base64Drawing) {
@@ -125 +141 @@
     }
     CGImageDestinationSetProperties(imageDestination.get(), (__bridge CFDictionaryRef)properties);
-    CGImageDestinationAddImage(imageDestination.get(), [resultImage CGImage], (__bridge CFDictionaryRef)properties);
+    CGImageDestinationAddImage(imageDestination.get(), [image CGImage], (__bridge CFDictionaryRef)properties);
     CGImageDestinationFinalize(imageDestination.get());