<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[243553] trunk/Source/WebKit</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/243553">243553</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2019-03-27 11:22:59 -0700 (Wed, 27 Mar 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Fix some more deprecation warnings in WKDrawingView
https://bugs.webkit.org/show_bug.cgi?id=196282
<rdar://problem/47637608>

Reviewed by Wenson Hsieh.

* Platform/spi/ios/PencilKitSPI.h:
* SourcesCocoa.txt:
* UIProcess/ios/PencilKitSoftLink.h:
* UIProcess/ios/PencilKitSoftLink.mm:
* UIProcess/ios/WKContentViewInteraction.mm:
* UIProcess/ios/WKDrawingCoordinator.h:
* UIProcess/ios/WKDrawingCoordinator.mm:
(-[WKDrawingCoordinator initWithContentView:]):
(-[WKDrawingCoordinator currentInk]):
(-[WKDrawingCoordinator undoManagerForInkPicker:]):
(-[WKDrawingCoordinator containingViewForInkPicker:]):
(-[WKDrawingCoordinator inkPickerDidToggleRuler:]):
(-[WKDrawingCoordinator inkPickerDidChangeInk:]):
(-[WKDrawingCoordinator installInkPickerForDrawing:]):
(-[WKDrawingCoordinator uninstallInkPicker]):
(-[WKDrawingCoordinator inkPicker]): Deleted.
(-[WKDrawingCoordinator didChangeRulerState:]): Deleted.
(-[WKDrawingCoordinator didChangeInk:]): Deleted.
* UIProcess/ios/WKDrawingView.mm:
(-[WKDrawingView _canvasViewWillBeginDrawing:]):
* UIProcess/ios/WKInkPickerView.h: Removed.
* UIProcess/ios/WKInkPickerView.mm: Removed.
* WebKit.xcodeproj/project.pbxproj:
Adopt the new names.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitPlatformspiiosPencilKitSPIh">trunk/Source/WebKit/Platform/spi/ios/PencilKitSPI.h</a></li>
<li><a href="#trunkSourceWebKitSourcesCocoatxt">trunk/Source/WebKit/SourcesCocoa.txt</a></li>
<li><a href="#trunkSourceWebKitUIProcessiosPencilKitSoftLinkh">trunk/Source/WebKit/UIProcess/ios/PencilKitSoftLink.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessiosPencilKitSoftLinkmm">trunk/Source/WebKit/UIProcess/ios/PencilKitSoftLink.mm</a></li>
<li><a href="#trunkSourceWebKitUIProcessiosWKContentViewInteractionmm">trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm</a></li>
<li><a href="#trunkSourceWebKitUIProcessiosWKDrawingCoordinatorh">trunk/Source/WebKit/UIProcess/ios/WKDrawingCoordinator.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessiosWKDrawingCoordinatormm">trunk/Source/WebKit/UIProcess/ios/WKDrawingCoordinator.mm</a></li>
<li><a href="#trunkSourceWebKitUIProcessiosWKDrawingViewmm">trunk/Source/WebKit/UIProcess/ios/WKDrawingView.mm</a></li>
<li><a href="#trunkSourceWebKitWebKitxcodeprojprojectpbxproj">trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitUIProcessiosWKInkPickerViewh">trunk/Source/WebKit/UIProcess/ios/WKInkPickerView.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessiosWKInkPickerViewmm">trunk/Source/WebKit/UIProcess/ios/WKInkPickerView.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (243552 => 243553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2019-03-27 18:22:24 UTC (rev 243552)
+++ trunk/Source/WebKit/ChangeLog       2019-03-27 18:22:59 UTC (rev 243553)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2019-03-27  Tim Horton  <timothy_horton@apple.com>
+
+        Fix some more deprecation warnings in WKDrawingView
+        https://bugs.webkit.org/show_bug.cgi?id=196282
+        <rdar://problem/47637608>
+
+        Reviewed by Wenson Hsieh.
+
+        * Platform/spi/ios/PencilKitSPI.h:
+        * SourcesCocoa.txt:
+        * UIProcess/ios/PencilKitSoftLink.h:
+        * UIProcess/ios/PencilKitSoftLink.mm:
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        * UIProcess/ios/WKDrawingCoordinator.h:
+        * UIProcess/ios/WKDrawingCoordinator.mm:
+        (-[WKDrawingCoordinator initWithContentView:]):
+        (-[WKDrawingCoordinator currentInk]):
+        (-[WKDrawingCoordinator undoManagerForInkPicker:]):
+        (-[WKDrawingCoordinator containingViewForInkPicker:]):
+        (-[WKDrawingCoordinator inkPickerDidToggleRuler:]):
+        (-[WKDrawingCoordinator inkPickerDidChangeInk:]):
+        (-[WKDrawingCoordinator installInkPickerForDrawing:]):
+        (-[WKDrawingCoordinator uninstallInkPicker]):
+        (-[WKDrawingCoordinator inkPicker]): Deleted.
+        (-[WKDrawingCoordinator didChangeRulerState:]): Deleted.
+        (-[WKDrawingCoordinator didChangeInk:]): Deleted.
+        * UIProcess/ios/WKDrawingView.mm:
+        (-[WKDrawingView _canvasViewWillBeginDrawing:]):
+        * UIProcess/ios/WKInkPickerView.h: Removed.
+        * UIProcess/ios/WKInkPickerView.mm: Removed.
+        * WebKit.xcodeproj/project.pbxproj:
+        Adopt the new names.
+
</ins><span class="cx"> 2019-03-27  Carlos Garcia Campos  <cgarcia@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         Geolocation request not complete when watch request was started in a different web process
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformspiiosPencilKitSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Platform/spi/ios/PencilKitSPI.h (243552 => 243553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Platform/spi/ios/PencilKitSPI.h      2019-03-27 18:22:24 UTC (rev 243552)
+++ trunk/Source/WebKit/Platform/spi/ios/PencilKitSPI.h 2019-03-27 18:22:59 UTC (rev 243553)
</span><span class="lines">@@ -31,8 +31,6 @@
</span><span class="cx"> #import <PencilKit/PKCanvasView_Private.h>
</span><span class="cx"> #import <PencilKit/PKDrawing_Private.h>
</span><span class="cx"> #import <PencilKit/PKImageRenderer.h>
</span><del>-#import <PencilKit/PKInlineInkPicker.h>
-#import <PencilKit/PKInlineInkPicker_Private.h>
</del><span class="cx"> #import <PencilKit/PKStroke.h>
</span><span class="cx"> 
</span><span class="cx"> #else
</span></span></pre></div>
<a id="trunkSourceWebKitSourcesCocoatxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/SourcesCocoa.txt (243552 => 243553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/SourcesCocoa.txt     2019-03-27 18:22:24 UTC (rev 243552)
+++ trunk/Source/WebKit/SourcesCocoa.txt        2019-03-27 18:22:59 UTC (rev 243553)
</span><span class="lines">@@ -404,7 +404,6 @@
</span><span class="cx"> UIProcess/ios/WKDrawingView.mm
</span><span class="cx"> UIProcess/ios/WKGeolocationProviderIOS.mm
</span><span class="cx"> UIProcess/ios/WKGeolocationProviderIOSObjCSecurityOrigin.mm
</span><del>-UIProcess/ios/WKInkPickerView.mm
</del><span class="cx"> UIProcess/ios/WKInspectorNodeSearchGestureRecognizer.mm
</span><span class="cx"> UIProcess/ios/WKKeyboardScrollingAnimator.mm
</span><span class="cx"> UIProcess/ios/WKPasswordView.mm
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessiosPencilKitSoftLinkh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/ios/PencilKitSoftLink.h (243552 => 243553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/ios/PencilKitSoftLink.h    2019-03-27 18:22:24 UTC (rev 243552)
+++ trunk/Source/WebKit/UIProcess/ios/PencilKitSoftLink.h       2019-03-27 18:22:59 UTC (rev 243553)
</span><span class="lines">@@ -34,6 +34,5 @@
</span><span class="cx"> SOFT_LINK_CLASS_FOR_HEADER(WebKit, PKCanvasView);
</span><span class="cx"> SOFT_LINK_CLASS_FOR_HEADER(WebKit, PKDrawing);
</span><span class="cx"> SOFT_LINK_CLASS_FOR_HEADER(WebKit, PKImageRenderer);
</span><del>-SOFT_LINK_CLASS_FOR_HEADER(WebKit, PKInlineInkPicker);
</del><span class="cx"> 
</span><span class="cx"> #endif // HAVE(PENCILKIT)
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessiosPencilKitSoftLinkmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/ios/PencilKitSoftLink.mm (243552 => 243553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/ios/PencilKitSoftLink.mm   2019-03-27 18:22:24 UTC (rev 243552)
+++ trunk/Source/WebKit/UIProcess/ios/PencilKitSoftLink.mm      2019-03-27 18:22:59 UTC (rev 243553)
</span><span class="lines">@@ -34,6 +34,5 @@
</span><span class="cx"> SOFT_LINK_CLASS_FOR_SOURCE(WebKit, PencilKit, PKCanvasView);
</span><span class="cx"> SOFT_LINK_CLASS_FOR_SOURCE(WebKit, PencilKit, PKDrawing);
</span><span class="cx"> SOFT_LINK_CLASS_FOR_SOURCE(WebKit, PencilKit, PKImageRenderer);
</span><del>-SOFT_LINK_CLASS_FOR_SOURCE(WebKit, PencilKit, PKInlineInkPicker);
</del><span class="cx"> 
</span><span class="cx"> #endif // HAVE(PENCILKIT)
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (243552 => 243553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm    2019-03-27 18:22:24 UTC (rev 243552)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm       2019-03-27 18:22:59 UTC (rev 243553)
</span><span class="lines">@@ -48,7 +48,6 @@
</span><span class="cx"> #import "WKFormInputControl.h"
</span><span class="cx"> #import "WKFormSelectControl.h"
</span><span class="cx"> #import "WKImagePreviewViewController.h"
</span><del>-#import "WKInkPickerView.h"
</del><span class="cx"> #import "WKInspectorNodeSearchGestureRecognizer.h"
</span><span class="cx"> #import "WKNSURLExtras.h"
</span><span class="cx"> #import "WKPreviewActionItemIdentifiers.h"
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessiosWKDrawingCoordinatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/ios/WKDrawingCoordinator.h (243552 => 243553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/ios/WKDrawingCoordinator.h 2019-03-27 18:22:24 UTC (rev 243552)
+++ trunk/Source/WebKit/UIProcess/ios/WKDrawingCoordinator.h    2019-03-27 18:22:59 UTC (rev 243553)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx"> 
</span><span class="cx"> OBJC_CLASS PKInk;
</span><span class="cx"> OBJC_CLASS WKContentView;
</span><del>-OBJC_CLASS WKInkPickerView;
</del><span class="cx"> 
</span><span class="cx"> @interface WKDrawingCoordinator : NSObject <PKRulerHostingDelegate>
</span><span class="cx"> 
</span><span class="lines">@@ -40,11 +39,9 @@
</span><span class="cx"> - (void)installInkPickerForDrawing:(WebCore::GraphicsLayer::EmbeddedViewID)embeddedViewID;
</span><span class="cx"> - (void)uninstallInkPicker;
</span><span class="cx"> 
</span><del>-- (void)didChangeRulerState:(BOOL)rulerEnabled;
-- (void)didChangeInk:(PKInk *)ink;
</del><ins>+@property (nonatomic) BOOL rulerEnabled;
+@property (nonatomic, readonly, retain) PKInk *currentInk;
</ins><span class="cx"> 
</span><del>-@property (nonatomic, readonly, retain) WKInkPickerView *inkPicker;
-
</del><span class="cx"> @end
</span><span class="cx"> 
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessiosWKDrawingCoordinatormm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/ios/WKDrawingCoordinator.mm (243552 => 243553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/ios/WKDrawingCoordinator.mm        2019-03-27 18:22:24 UTC (rev 243552)
+++ trunk/Source/WebKit/UIProcess/ios/WKDrawingCoordinator.mm   2019-03-27 18:22:59 UTC (rev 243553)
</span><span class="lines">@@ -30,16 +30,20 @@
</span><span class="cx"> 
</span><span class="cx"> #import "EditableImageController.h"
</span><span class="cx"> #import "WKContentViewInteraction.h"
</span><del>-#import "WKInkPickerView.h"
</del><ins>+#import "WKDrawingView.h"
</ins><span class="cx"> #import "WKWebView.h"
</span><ins>+#import <WebKitAdditions/WKDrawingCoordinatorAdditions.mm>
</ins><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx"> 
</span><span class="cx"> #import "PencilKitSoftLink.h"
</span><span class="cx"> 
</span><ins>+@interface WKDrawingCoordinator () <WKInkPickerDelegate>
+@end
+
</ins><span class="cx"> @implementation WKDrawingCoordinator {
</span><span class="cx">     __weak WKContentView *_contentView;
</span><span class="cx"> 
</span><del>-    RetainPtr<WKInkPickerView> _inkPicker;
</del><ins>+    RetainPtr<WKInkPicker> _inkPicker;
</ins><span class="cx"> 
</span><span class="cx">     WebCore::GraphicsLayer::EmbeddedViewID _focusedEmbeddedViewID;
</span><span class="cx"> }
</span><span class="lines">@@ -51,14 +55,13 @@
</span><span class="cx">         return nil;
</span><span class="cx"> 
</span><span class="cx">     _contentView = contentView;
</span><del>-    _inkPicker = adoptNS([[WKInkPickerView alloc] initWithContentView:_contentView]);
</del><span class="cx"> 
</span><span class="cx">     return self;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-- (WKInkPickerView *)inkPicker
</del><ins>+- (PKInk *)currentInk
</ins><span class="cx"> {
</span><del>-    return _inkPicker.get();
</del><ins>+    return [_inkPicker currentInk];
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (UIView *)rulerHostingView
</span><span class="lines">@@ -79,41 +82,44 @@
</span><span class="cx">     return focusedEditableImage->drawingView.get();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-- (void)didChangeRulerState:(BOOL)rulerEnabled
</del><ins>+- (NSUndoManager *)undoManagerForInkPicker:(WKInkPicker *)inkPicker
</ins><span class="cx"> {
</span><del>-    [self._focusedDrawingView didChangeRulerState:rulerEnabled];
</del><ins>+    return [_contentView undoManager];
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-- (void)didChangeInk:(PKInk *)ink
</del><ins>+- (UIView *)containingViewForInkPicker:(WKInkPicker *)inkPicker
</ins><span class="cx"> {
</span><del>-    [self._focusedDrawingView didChangeInk:ink];
</del><ins>+    return _contentView;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><ins>+- (void)inkPickerDidToggleRuler:(WKInkPicker *)inkPicker
+{
+    _rulerEnabled = !_rulerEnabled;
+    [self._focusedDrawingView didChangeRulerState:_rulerEnabled];
+}
+
+- (void)inkPickerDidChangeInk:(WKInkPicker *)inkPicker
+{
+    [self._focusedDrawingView didChangeInk:self.currentInk];
+}
+
</ins><span class="cx"> - (void)installInkPickerForDrawing:(WebCore::GraphicsLayer::EmbeddedViewID)embeddedViewID
</span><span class="cx"> {
</span><span class="cx">     _focusedEmbeddedViewID = embeddedViewID;
</span><span class="cx"> 
</span><del>-    WKWebView *webView = _contentView->_webView;
</del><ins>+    if (!_inkPicker)
+        _inkPicker = adoptNS([[WKInkPicker alloc] initWithDelegate:self]);
+    [_inkPicker show];
</ins><span class="cx"> 
</span><del>-    [_inkPicker sizeToFit];
-    [_inkPicker setTranslatesAutoresizingMaskIntoConstraints:NO];
-    [webView addSubview:_inkPicker.get()];
-
-    [NSLayoutConstraint activateConstraints:@[
-        [[_inkPicker heightAnchor] constraintEqualToConstant:[_inkPicker frame].size.height],
-        [[_inkPicker bottomAnchor] constraintEqualToAnchor:webView.safeAreaLayoutGuide.bottomAnchor],
-        [[_inkPicker leftAnchor] constraintEqualToAnchor:webView.safeAreaLayoutGuide.leftAnchor],
-        [[_inkPicker rightAnchor] constraintEqualToAnchor:webView.safeAreaLayoutGuide.rightAnchor],
-    ]];
-
</del><span class="cx">     // When focused, push the ruler state down to the canvas so that it doesn't get out of sync
</span><span class="cx">     // and early-return from later changes.
</span><del>-    [self._focusedDrawingView didChangeRulerState:[_inkPicker rulerEnabled]];
</del><ins>+    [self._focusedDrawingView didChangeRulerState:_rulerEnabled];
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (void)uninstallInkPicker
</span><span class="cx"> {
</span><del>-    [_inkPicker removeFromSuperview];
</del><ins>+    [_inkPicker hide];
+    [self._focusedDrawingView didChangeRulerState:NO];
</ins><span class="cx">     _focusedEmbeddedViewID = 0;
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessiosWKDrawingViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/ios/WKDrawingView.mm (243552 => 243553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/ios/WKDrawingView.mm       2019-03-27 18:22:24 UTC (rev 243552)
+++ trunk/Source/WebKit/UIProcess/ios/WKDrawingView.mm  2019-03-27 18:22:59 UTC (rev 243553)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx"> #import "EditableImageController.h"
</span><span class="cx"> #import "WKContentViewInteraction.h"
</span><span class="cx"> #import "WKDrawingCoordinator.h"
</span><del>-#import "WKInkPickerView.h"
</del><span class="cx"> #import <wtf/OSObjectPtr.h>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx"> 
</span><span class="lines">@@ -173,7 +172,7 @@
</span><span class="cx"> - (void)_canvasViewWillBeginDrawing:(PKCanvasView *)canvasView
</span><span class="cx"> {
</span><span class="cx"> ALLOW_DEPRECATED_DECLARATIONS_BEGIN
</span><del>-    [_pencilView setInk:_contentView._drawingCoordinator.inkPicker.ink];
</del><ins>+    [_pencilView setInk:_contentView._drawingCoordinator.currentInk];
</ins><span class="cx"> ALLOW_DEPRECATED_DECLARATIONS_END
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessiosWKInkPickerViewh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit/UIProcess/ios/WKInkPickerView.h (243552 => 243553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/ios/WKInkPickerView.h      2019-03-27 18:22:24 UTC (rev 243552)
+++ trunk/Source/WebKit/UIProcess/ios/WKInkPickerView.h 2019-03-27 18:22:59 UTC (rev 243553)
</span><span class="lines">@@ -1,46 +0,0 @@
</span><del>-/*
- * Copyright (C) 2018 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#if HAVE(PENCILKIT)
-
-#import <UIKit/UIKit.h>
-
-OBJC_CLASS PKInk;
-OBJC_CLASS WKContentView;
-
-@interface WKInkPickerView : UIView
-
-- (instancetype)init NS_UNAVAILABLE;
-- (instancetype)initWithFrame:(CGRect)frame NS_UNAVAILABLE;
-- (instancetype)initWithCoder:(NSCoder *)coder NS_UNAVAILABLE;
-
-- (instancetype)initWithContentView:(WKContentView *)contentView NS_DESIGNATED_INITIALIZER;
-
-@property (nonatomic) BOOL rulerEnabled;
-@property (nonatomic, retain) PKInk *ink;
-
-@end
-
-#endif // HAVE(PENCILKIT)
</del></span></pre></div>
<a id="trunkSourceWebKitUIProcessiosWKInkPickerViewmm"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit/UIProcess/ios/WKInkPickerView.mm (243552 => 243553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/ios/WKInkPickerView.mm     2019-03-27 18:22:24 UTC (rev 243552)
+++ trunk/Source/WebKit/UIProcess/ios/WKInkPickerView.mm        2019-03-27 18:22:59 UTC (rev 243553)
</span><span class="lines">@@ -1,115 +0,0 @@
</span><del>-/*
- * Copyright (C) 2018 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "config.h"
-#import "WKInkPickerView.h"
-
-#if HAVE(PENCILKIT)
-
-#import "WKContentViewInteraction.h"
-#import "WKDrawingCoordinator.h"
-
-#import "PencilKitSoftLink.h"
-
-@interface WKInkPickerView () <PKInlineInkPickerDelegate>
-@end
-
-@implementation WKInkPickerView {
-    RetainPtr<PKInlineInkPicker> _inlinePicker;
-    __weak WKContentView *_contentView;
-}
-
-- (instancetype)initWithContentView:(WKContentView *)contentView
-{
-    self = [super initWithFrame:CGRectZero];
-    if (!self)
-        return nil;
-
-    _inlinePicker = adoptNS([WebKit::allocPKInlineInkPickerInstance() init]);
-    [_inlinePicker setDelegate:self];
-
-    _contentView = contentView;
-    [self addSubview:_inlinePicker.get()];
-
-    return self;
-}
-
-- (void)didPickInk
-{
-    [_contentView._drawingCoordinator didChangeInk:[_inlinePicker selectedInk]];
-}
-
-- (void)inlineInkPickerDidToggleRuler:(PKInlineInkPicker *)inlineInkPicker
-{
-    _rulerEnabled = !_rulerEnabled;
-    [_contentView._drawingCoordinator didChangeRulerState:_rulerEnabled];
-}
-
-- (void)inlineInkPicker:(PKInlineInkPicker *)inlineInkPicker didSelectTool:(PKInkIdentifier)identifer
-{
-    [self didPickInk];
-}
-
-- (void)inlineInkPicker:(PKInlineInkPicker *)inlineInkPicker didSelectColor:(UIColor *)color
-{
-    [self didPickInk];
-}
-
-- (CGSize)inkPickerSize
-{
-    CGSize keyboardSize = [UIKeyboard defaultSizeForInterfaceOrientation:[UIApp interfaceOrientation]];
-    return [_inlinePicker sizeThatFits:keyboardSize];
-}
-
-- (void)layoutSubviews
-{
-    CGSize pickerSize = self.inkPickerSize;
-    [_inlinePicker setFrame:CGRectMake(CGRectGetMidX(self.bounds) - (pickerSize.width / 2), 0, pickerSize.width, pickerSize.height)];
-}
-
-- (CGSize)sizeThatFits:(CGSize)size
-{
-    CGSize keyboardSize = [UIKeyboard defaultSizeForInterfaceOrientation:[UIApp interfaceOrientation]];
-    return CGSizeMake(keyboardSize.width, self.inkPickerSize.height);
-}
-
-- (UIViewController *)viewControllerForPopoverPresentationFromInlineInkPicker:(PKInlineInkPicker *)inlineInkPicker
-{
-    return [UIViewController _viewControllerForFullScreenPresentationFromView:_contentView];
-}
-
-- (void)setInk:(PKInk *)ink
-{
-    [_inlinePicker setSelectedInk:ink];
-}
-
-- (PKInk *)ink
-{
-    return [_inlinePicker selectedInk];
-}
-
-@end
-
-#endif // HAVE(PENCILKIT)
</del></span></pre></div>
<a id="trunkSourceWebKitWebKitxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (243552 => 243553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj     2019-03-27 18:22:24 UTC (rev 243552)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj        2019-03-27 18:22:59 UTC (rev 243553)
</span><span class="lines">@@ -2810,8 +2810,6 @@
</span><span class="cx">          2DE9B1382231F61C005287B7 /* _WKTextInputContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKTextInputContext.h; sourceTree = "<group>"; };
</span><span class="cx">          2DE9B13B2231F77C005287B7 /* _WKTextInputContextInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKTextInputContextInternal.h; sourceTree = "<group>"; };
</span><span class="cx">          2DEAC5CE1AC368BB00A195D8 /* _WKFindOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKFindOptions.h; sourceTree = "<group>"; };
</span><del>-               2DF3962A21C8DC50008835E3 /* WKInkPickerView.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = WKInkPickerView.mm; path = ios/WKInkPickerView.mm; sourceTree = "<group>"; };
-               2DF3962B21C8DC50008835E3 /* WKInkPickerView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = WKInkPickerView.h; path = ios/WKInkPickerView.h; sourceTree = "<group>"; };
</del><span class="cx">           2DF9593418A42412009785A1 /* ViewGestureControllerIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = ViewGestureControllerIOS.mm; path = ios/ViewGestureControllerIOS.mm; sourceTree = "<group>"; };
</span><span class="cx">          2DF9EEE31A781FB400B6CFBE /* APIFrameInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = APIFrameInfo.cpp; sourceTree = "<group>"; };
</span><span class="cx">          2DF9EEE41A781FB400B6CFBE /* APIFrameInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIFrameInfo.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -5923,8 +5921,6 @@
</span><span class="cx">                          0FCB4E4118BBE044000FCFC9 /* WKGeolocationProviderIOSObjCSecurityOrigin.mm */,
</span><span class="cx">                          933DF82D1B3BC09000AEA9E3 /* WKImagePreviewViewController.h */,
</span><span class="cx">                          933DF82F1B3BC0B400AEA9E3 /* WKImagePreviewViewController.mm */,
</span><del>-                               2DF3962B21C8DC50008835E3 /* WKInkPickerView.h */,
-                               2DF3962A21C8DC50008835E3 /* WKInkPickerView.mm */,
</del><span class="cx">                           0F3C7259196F5F6800AEDD0C /* WKInspectorHighlightView.h */,
</span><span class="cx">                          0F3C7257196F5F5000AEDD0C /* WKInspectorHighlightView.mm */,
</span><span class="cx">                          A54293A2195A43C6002782C7 /* WKInspectorNodeSearchGestureRecognizer.h */,
</span></span></pre>
</div>
</div>

</body>
</html>