<!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>[230854] 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/230854">230854</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2018-04-20 14:01:40 -0700 (Fri, 20 Apr 2018)</dd>
</dl>

<h3>Log Message</h3>
<pre>Include missing files in WKContentViewInteraction.{mm,h}

https://bugs.webkit.org/show_bug.cgi?id=184832
rdar://problem/35377120

Reviewed by Wenson Hsieh.

Some WebDriver files were missing and should be included.

* UIProcess/ios/WKContentViewInteraction.h:
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView setupInteraction]):
(-[WKContentView cleanupInteraction]):
(-[WKContentView _removeDefaultGestureRecognizers]):
(-[WKContentView _addDefaultGestureRecognizers]):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitUIProcessiosWKContentViewInteractionh">trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessiosWKContentViewInteractionmm">trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (230853 => 230854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2018-04-20 21:01:25 UTC (rev 230853)
+++ trunk/Source/WebKit/ChangeLog       2018-04-20 21:01:40 UTC (rev 230854)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2018-04-20  Timothy Hatcher  <timothy@apple.com>
+
+        Include missing files in WKContentViewInteraction.{mm,h}
+
+        https://bugs.webkit.org/show_bug.cgi?id=184832
+        rdar://problem/35377120
+
+        Reviewed by Wenson Hsieh.
+
+        Some WebDriver files were missing and should be included.
+
+        * UIProcess/ios/WKContentViewInteraction.h:
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView setupInteraction]):
+        (-[WKContentView cleanupInteraction]):
+        (-[WKContentView _removeDefaultGestureRecognizers]):
+        (-[WKContentView _addDefaultGestureRecognizers]):
+
</ins><span class="cx"> 2018-04-20  Youenn Fablet  <youenn@apple.com>
</span><span class="cx"> 
</span><span class="cx">         WebPage sometimes incorrectly rules out PDF as a mime type that can be showed
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessiosWKContentViewInteractionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h (230853 => 230854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h     2018-04-20 21:01:25 UTC (rev 230853)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h        2018-04-20 21:01:40 UTC (rev 230854)
</span><span class="lines">@@ -83,6 +83,10 @@
</span><span class="cx"> @class _UIHighlightView;
</span><span class="cx"> @class _UIWebHighlightLongPressGestureRecognizer;
</span><span class="cx"> 
</span><ins>+#if USE(APPLE_INTERNAL_SDK)
+#import <WebKitAdditions/WKContentViewInteractionAdditionsBefore.h>
+#endif
+
</ins><span class="cx"> #if ENABLE(EXTRA_ZOOM_MODE)
</span><span class="cx"> @class WKFocusedFormControlView;
</span><span class="cx"> #endif
</span><span class="lines">@@ -147,6 +151,10 @@
</span><span class="cx"> 
</span><span class="cx">     BOOL _canSendTouchEventsAsynchronously;
</span><span class="cx"> 
</span><ins>+#if USE(APPLE_INTERNAL_SDK)
+#import <WebKitAdditions/WKContentViewInteractionAdditionsAfter.h>
+#endif
+
</ins><span class="cx">     RetainPtr<WKSyntheticClickTapGestureRecognizer> _singleTapGestureRecognizer;
</span><span class="cx">     RetainPtr<_UIWebHighlightLongPressGestureRecognizer> _highlightLongPressGestureRecognizer;
</span><span class="cx">     RetainPtr<UILongPressGestureRecognizer> _longPressGestureRecognizer;
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (230853 => 230854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm    2018-04-20 21:01:25 UTC (rev 230853)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm       2018-04-20 21:01:40 UTC (rev 230854)
</span><span class="lines">@@ -105,6 +105,10 @@
</span><span class="cx"> #import <WebCore/WebItemProviderPasteboard.h>
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+#if USE(APPLE_INTERNAL_SDK)
+#import <WebKitAdditions/WKContentViewInteractionAdditionsBefore.mm>
+#endif
+
</ins><span class="cx"> @interface UIEvent(UIEventInternal)
</span><span class="cx"> @property (nonatomic, assign) UIKeyboardInputFlags _inputFlags;
</span><span class="cx"> @end
</span><span class="lines">@@ -614,6 +618,10 @@
</span><span class="cx">     [_touchEventGestureRecognizer setDelegate:self];
</span><span class="cx">     [self addGestureRecognizer:_touchEventGestureRecognizer.get()];
</span><span class="cx"> 
</span><ins>+#if USE(APPLE_INTERNAL_SDK)
+    [self _internalSetupInteraction];
+#endif
+
</ins><span class="cx">     _singleTapGestureRecognizer = adoptNS([[WKSyntheticClickTapGestureRecognizer alloc] initWithTarget:self action:@selector(_singleTapCommited:)]);
</span><span class="cx">     [_singleTapGestureRecognizer setDelegate:self];
</span><span class="cx">     [_singleTapGestureRecognizer setGestureRecognizedTarget:self action:@selector(_singleTapRecognized:)];
</span><span class="lines">@@ -704,6 +712,10 @@
</span><span class="cx">     [_touchEventGestureRecognizer setDelegate:nil];
</span><span class="cx">     [self removeGestureRecognizer:_touchEventGestureRecognizer.get()];
</span><span class="cx"> 
</span><ins>+#if USE(APPLE_INTERNAL_SDK)
+    [self _internalCleanupInteraction];
+#endif
+
</ins><span class="cx">     [_singleTapGestureRecognizer setDelegate:nil];
</span><span class="cx">     [_singleTapGestureRecognizer setGestureRecognizedTarget:nil action:nil];
</span><span class="cx">     [_singleTapGestureRecognizer setResetTarget:nil action:nil];
</span><span class="lines">@@ -764,6 +776,10 @@
</span><span class="cx">     [self removeGestureRecognizer:_nonBlockingDoubleTapGestureRecognizer.get()];
</span><span class="cx">     [self removeGestureRecognizer:_twoFingerDoubleTapGestureRecognizer.get()];
</span><span class="cx">     [self removeGestureRecognizer:_twoFingerSingleTapGestureRecognizer.get()];
</span><ins>+
+#if USE(APPLE_INTERNAL_SDK)
+    [self _internalRemoveDefaultGestureRecognizers];
+#endif
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (void)_addDefaultGestureRecognizers
</span><span class="lines">@@ -775,6 +791,10 @@
</span><span class="cx">     [self addGestureRecognizer:_nonBlockingDoubleTapGestureRecognizer.get()];
</span><span class="cx">     [self addGestureRecognizer:_twoFingerDoubleTapGestureRecognizer.get()];
</span><span class="cx">     [self addGestureRecognizer:_twoFingerSingleTapGestureRecognizer.get()];
</span><ins>+
+#if USE(APPLE_INTERNAL_SDK)
+    [self _internalAddDefaultGestureRecognizers];
+#endif
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (UIView*)unscaledView
</span><span class="lines">@@ -5433,6 +5453,7 @@
</span><span class="cx"> 
</span><span class="cx"> #if USE(APPLE_INTERNAL_SDK)
</span><span class="cx"> #import <WebKitAdditions/WKContentViewInteractionAdditions.mm>
</span><ins>+#import <WebKitAdditions/WKContentViewInteractionAdditionsAfter.mm>
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> @end
</span></span></pre>
</div>
</div>

</body>
</html>