Title: [241570] trunk
- Revision
- 241570
- Author
- timothy_hor...@apple.com
- Date
- 2019-02-14 16:01:53 -0800 (Thu, 14 Feb 2019)
Log Message
Fix the build.
* UIProcess/ios/WKDrawingView.mm:
(-[WKDrawingView renderedDrawing]):
* WebKitTestRunner/ios/UIScriptControllerIOS.mm:
(WTR::UIScriptController::drawSquareInEditableImage):
* TestWebKitAPI/Tests/WebKitCocoa/WKAttachmentTests.mm:
(TestWebKitAPI::drawSquareInEditableImage):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (241569 => 241570)
--- trunk/Source/WebKit/ChangeLog 2019-02-14 23:52:42 UTC (rev 241569)
+++ trunk/Source/WebKit/ChangeLog 2019-02-15 00:01:53 UTC (rev 241570)
@@ -1,3 +1,10 @@
+2019-02-14 Tim Horton <timothy_hor...@apple.com>
+
+ Fix the build.
+
+ * UIProcess/ios/WKDrawingView.mm:
+ (-[WKDrawingView renderedDrawing]):
+
2019-02-14 Youenn Fablet <you...@apple.com>
ASSERTION FAILED: m_caches.isEmpty() || !m_pendingInitializationCallbacks.isEmpty() in WebKit::CacheStorage::Caches::clearMemoryRepresentation()
Modified: trunk/Source/WebKit/UIProcess/ios/WKDrawingView.mm (241569 => 241570)
--- trunk/Source/WebKit/UIProcess/ios/WKDrawingView.mm 2019-02-14 23:52:42 UTC (rev 241569)
+++ trunk/Source/WebKit/UIProcess/ios/WKDrawingView.mm 2019-02-15 00:01:53 UTC (rev 241570)
@@ -116,9 +116,11 @@
__block RetainPtr<UIImage> resultImage;
+ALLOW_DEPRECATED_DECLARATIONS_BEGIN
[_renderer renderDrawing:[_pencilView drawing] 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
Modified: trunk/Tools/ChangeLog (241569 => 241570)
--- trunk/Tools/ChangeLog 2019-02-14 23:52:42 UTC (rev 241569)
+++ trunk/Tools/ChangeLog 2019-02-15 00:01:53 UTC (rev 241570)
@@ -1,3 +1,12 @@
+2019-02-14 Tim Horton <timothy_hor...@apple.com>
+
+ Fix the build.
+
+ * WebKitTestRunner/ios/UIScriptControllerIOS.mm:
+ (WTR::UIScriptController::drawSquareInEditableImage):
+ * TestWebKitAPI/Tests/WebKitCocoa/WKAttachmentTests.mm:
+ (TestWebKitAPI::drawSquareInEditableImage):
+
2019-02-14 Brian Burg <bb...@apple.com>
[Mac] WebInspectorUI.framework does not need to be soft-linked anymore
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKAttachmentTests.mm (241569 => 241570)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKAttachmentTests.mm 2019-02-14 23:52:42 UTC (rev 241569)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKAttachmentTests.mm 2019-02-15 00:01:53 UTC (rev 241570)
@@ -1920,7 +1920,7 @@
PKCanvasView *canvasView = findEditableImageCanvas(webView);
RetainPtr<PKDrawing> drawing = canvasView.drawing ?: adoptNS([[pkDrawingClass alloc] init]);
RetainPtr<CGPathRef> path = adoptCF(CGPathCreateWithRect(CGRectMake(0, 0, 50, 50), NULL));
- RetainPtr<PKInk> ink = [pkInkClass inkWithType:0 color:UIColor.greenColor weight:100.0];
+ RetainPtr<PKInk> ink = [pkInkClass inkWithType:@"com.apple.ink.pen" color:UIColor.greenColor weight:100.0];
RetainPtr<PKStroke> stroke = adoptNS([[pkStrokeClass alloc] _initWithPath:path.get() ink:ink.get() inputScale:1]);
[drawing _addStroke:stroke.get()];
Modified: trunk/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm (241569 => 241570)
--- trunk/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm 2019-02-14 23:52:42 UTC (rev 241569)
+++ trunk/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm 2019-02-15 00:01:53 UTC (rev 241570)
@@ -1007,7 +1007,7 @@
PKCanvasView *canvasView = findEditableImageCanvas();
RetainPtr<PKDrawing> drawing = canvasView.drawing ?: adoptNS([[pkDrawingClass alloc] init]);
RetainPtr<CGPathRef> path = adoptCF(CGPathCreateWithRect(CGRectMake(0, 0, 50, 50), NULL));
- RetainPtr<PKInk> ink = [pkInkClass inkWithType:0 color:UIColor.greenColor weight:100.0];
+ RetainPtr<PKInk> ink = [pkInkClass inkWithType:@"com.apple.ink.pen" color:UIColor.greenColor weight:100.0];
RetainPtr<PKStroke> stroke = adoptNS([[pkStrokeClass alloc] _initWithPath:path.get() ink:ink.get() inputScale:1]);
[drawing _addStroke:stroke.get()];
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
