<!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>[180045] branches/safari-600.1.4.15-branch/Source</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/180045">180045</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-02-13 08:43:33 -0800 (Fri, 13 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/179580">r179580</a>. rdar://problem/19709200</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001415branchSourceWebKitiosChangeLog">branches/safari-600.1.4.15-branch/Source/WebKit/ios/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchSourceWebKitiosDefaultDelegatesWebDefaultUIKitDelegatem">branches/safari-600.1.4.15-branch/Source/WebKit/ios/DefaultDelegates/WebDefaultUIKitDelegate.m</a></li>
<li><a href="#branchessafari6001415branchSourceWebKitiosWebViewWebUIKitDelegateh">branches/safari-600.1.4.15-branch/Source/WebKit/ios/WebView/WebUIKitDelegate.h</a></li>
<li><a href="#branchessafari6001415branchSourceWebKitmacChangeLog">branches/safari-600.1.4.15-branch/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchSourceWebKitmacWebViewWebHTMLViewmm">branches/safari-600.1.4.15-branch/Source/WebKit/mac/WebView/WebHTMLView.mm</a></li>
<li><a href="#branchessafari6001415branchSourceWebKit2ChangeLog">branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchSourceWebKit2UIProcessiosWKContentViewInteractionmm">branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001415branchSourceWebKitiosChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebKit/ios/ChangeLog (180044 => 180045)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebKit/ios/ChangeLog 2015-02-13 16:15:35 UTC (rev 180044)
+++ branches/safari-600.1.4.15-branch/Source/WebKit/ios/ChangeLog 2015-02-13 16:43:33 UTC (rev 180045)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2015-02-13 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r179580. rdar://problem/19709200
+
+ 2015-02-03 Enrica Casucci <enrica@apple.com>
+
+ [iOS] Add support for deleteFromInputWithFlags.
+ https://bugs.webkit.org/show_bug.cgi?id=141216
+ rdar://problem/19130081
+
+ Reviewed by Benjamin Poulain.
+
+ Adopts the new method as soon as it is available.
+ The patch also removes some obsolete code used for staging.
+
+ * DefaultDelegates/WebDefaultUIKitDelegate.m:
+ (-[WebDefaultUIKitDelegate addInputString:withFlags:]):
+ (-[WebDefaultUIKitDelegate deleteFromInput]):
+ (-[WebDefaultUIKitDelegate deleteFromInputwithFlags:]):
+ (-[WebDefaultUIKitDelegate addInputString:fromVariantKey:]): Deleted.
+ * WebView/WebUIKitDelegate.h:
+
+2015-02-13 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r174284. rdar://problem/19812620
</span><span class="cx">
</span><span class="cx"> 2014-10-03 Tim Horton <timothy_horton@apple.com>
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebKitiosDefaultDelegatesWebDefaultUIKitDelegatem"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebKit/ios/DefaultDelegates/WebDefaultUIKitDelegate.m (180044 => 180045)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebKit/ios/DefaultDelegates/WebDefaultUIKitDelegate.m 2015-02-13 16:15:35 UTC (rev 180044)
+++ branches/safari-600.1.4.15-branch/Source/WebKit/ios/DefaultDelegates/WebDefaultUIKitDelegate.m 2015-02-13 16:43:33 UTC (rev 180045)
</span><span class="lines">@@ -161,16 +161,16 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// FIXME: to be removed when UIKit implements the new one below.
-- (void)addInputString:(NSString *)str fromVariantKey:(BOOL)isPopupVariant
</del><ins>+- (void)addInputString:(NSString *)str withFlags:(NSUInteger)flags
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)addInputString:(NSString *)str withFlags:(NSUInteger)flags
</del><ins>+// FIXME: to be removed when UIKit implements the new one below.
+- (void)deleteFromInput
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)deleteFromInput
</del><ins>+- (void)deleteFromInputwithFlags:(NSUInteger)flags
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebKitiosWebViewWebUIKitDelegateh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebKit/ios/WebView/WebUIKitDelegate.h (180044 => 180045)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebKit/ios/WebView/WebUIKitDelegate.h 2015-02-13 16:15:35 UTC (rev 180044)
+++ branches/safari-600.1.4.15-branch/Source/WebKit/ios/WebView/WebUIKitDelegate.h 2015-02-13 16:43:33 UTC (rev 180045)
</span><span class="lines">@@ -77,10 +77,10 @@
</span><span class="cx"> - (void)webView:(WebView *)webView willShowFullScreenForPlugInView:(id)plugInView;
</span><span class="cx"> - (void)webView:(WebView *)webView didHideFullScreenForPlugInView:(id)plugInView;
</span><span class="cx"> - (void)webView:(WebView *)aWebView didReceiveMessage:(NSDictionary *)aMessage;
</span><del>-// FIXME: to be removed when UIKit implements the new one.
-- (void)addInputString:(NSString *)str fromVariantKey:(BOOL)isPopupVariant;
</del><span class="cx"> - (void)addInputString:(NSString *)str withFlags:(NSUInteger)flags;
</span><ins>+// FIXME: remove deleteFromInput when UIKit implements deleteFromInputWithFlags.
</ins><span class="cx"> - (void)deleteFromInput;
</span><ins>+- (void)deleteFromInputWithFlags:(NSUInteger)flags;
</ins><span class="cx">
</span><span class="cx"> // Accelerated compositing
</span><span class="cx"> - (void)_webthread_webView:(WebView*)webView attachRootLayer:(id)rootLayer;
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebKit/mac/ChangeLog (180044 => 180045)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebKit/mac/ChangeLog 2015-02-13 16:15:35 UTC (rev 180044)
+++ branches/safari-600.1.4.15-branch/Source/WebKit/mac/ChangeLog 2015-02-13 16:43:33 UTC (rev 180045)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-02-13 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r179580. rdar://problem/19709200
+
+ 2015-02-03 Enrica Casucci <enrica@apple.com>
+
+ [iOS] Add support for deleteFromInputWithFlags.
+ https://bugs.webkit.org/show_bug.cgi?id=141216
+ rdar://problem/19130081
+
+ Reviewed by Benjamin Poulain.
+
+ Adopts the new method as soon as it is available.
+ The patch also removes some obsolete code used for staging.
+
+ * WebView/WebHTMLView.mm:
+ (-[WebHTMLView _handleEditingKeyEvent:]):
+
</ins><span class="cx"> 2015-01-26 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r172854.
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebKitmacWebViewWebHTMLViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebKit/mac/WebView/WebHTMLView.mm (180044 => 180045)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebKit/mac/WebView/WebHTMLView.mm 2015-02-13 16:15:35 UTC (rev 180044)
+++ branches/safari-600.1.4.15-branch/Source/WebKit/mac/WebView/WebHTMLView.mm 2015-02-13 16:43:33 UTC (rev 180045)
</span><span class="lines">@@ -5867,18 +5867,21 @@
</span><span class="cx"> NSString *s = [event characters];
</span><span class="cx"> if ([s length] == 0)
</span><span class="cx"> break;
</span><ins>+ WebView* webView = [self _webView];
</ins><span class="cx"> switch ([s characterAtIndex:0]) {
</span><span class="cx"> case kWebBackspaceKey:
</span><span class="cx"> case kWebDeleteKey:
</span><del>- [[[self _webView] _UIKitDelegateForwarder] deleteFromInput];
</del><ins>+ // FIXME: remove the call to deleteFromInput when UIKit implements deleteFromInputWithFlags.
+ if ([webView respondsToSelector:@selector(deleteFromInputWithFlags:)])
+ [[webView _UIKitDelegateForwarder] deleteFromInputWithFlags:event.keyboardFlags];
+ else
+ [[webView _UIKitDelegateForwarder] deleteFromInput];
</ins><span class="cx"> return YES;
</span><del>- case kWebEnterKey:
</del><ins>+ case kWebEnterKey:
</ins><span class="cx"> case kWebReturnKey:
</span><span class="cx"> if (platformEvent->type() == PlatformKeyboardEvent::Char) {
</span><span class="cx"> // Map \r from HW keyboard to \n to match the behavior of the soft keyboard.
</span><del>- // FIXME: remove the first call when UIKit implements the new method.
- [[[self _webView] _UIKitDelegateForwarder] addInputString:@"\n" fromVariantKey:NO];
- [[[self _webView] _UIKitDelegateForwarder] addInputString:@"\n" withFlags:0];
</del><ins>+ [[webView _UIKitDelegateForwarder] addInputString:@"\n" withFlags:0];
</ins><span class="cx"> return YES;
</span><span class="cx"> }
</span><span class="cx"> return NO;
</span><span class="lines">@@ -5887,10 +5890,7 @@
</span><span class="cx"> return YES;
</span><span class="cx"> default: {
</span><span class="cx"> if (platformEvent->type() == PlatformKeyboardEvent::Char) {
</span><del>- //NSString *string = event.characters;
- // FIXME: remove the first call when UIKit implements the new method.
- [[[self _webView] _UIKitDelegateForwarder] addInputString:event.characters fromVariantKey:event.popupVariant];
- [[[self _webView] _UIKitDelegateForwarder] addInputString:event.characters withFlags:event.keyboardFlags];
</del><ins>+ [[webView _UIKitDelegateForwarder] addInputString:event.characters withFlags:event.keyboardFlags];
</ins><span class="cx"> return YES;
</span><span class="cx"> }
</span><span class="cx"> return NO;
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog (180044 => 180045)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog 2015-02-13 16:15:35 UTC (rev 180044)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog 2015-02-13 16:43:33 UTC (rev 180045)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2015-02-13 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r179580. rdar://problem/19709200
+
+ 2015-02-03 Enrica Casucci <enrica@apple.com>
+
+ [iOS] Add support for deleteFromInputWithFlags.
+ https://bugs.webkit.org/show_bug.cgi?id=141216
+ rdar://problem/19130081
+
+ Reviewed by Benjamin Poulain.
+
+ Adopts the new method as soon as it is available.
+ The patch also removes some obsolete code used for staging.
+
+ * Platform/spi/ios/UIKitSPI.h:
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView _interpretKeyEvent:isCharEvent:]):
+
+2015-02-13 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r180031. rdar://problem/19432928
</span><span class="cx">
</span><span class="cx"> 2015-02-12 Tim Horton <timothy_horton@apple.com>
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebKit2UIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (180044 => 180045)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-02-13 16:15:35 UTC (rev 180044)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-02-13 16:43:33 UTC (rev 180045)
</span><span class="lines">@@ -204,6 +204,7 @@
</span><span class="cx">
</span><span class="cx"> @interface UIKeyboardImpl (StagingToRemove)
</span><span class="cx"> - (void)didHandleWebKeyEvent;
</span><ins>+- (void)deleteFromInputWithFlags:(NSUInteger)flags;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @interface UIView (UIViewInternalHack)
</span><span class="lines">@@ -2368,17 +2369,22 @@
</span><span class="cx"> NSString *characters = [event characters];
</span><span class="cx"> if ([characters length] == 0)
</span><span class="cx"> break;
</span><ins>+ UIKeyboardImpl *keyboard = [UIKeyboardImpl sharedInstance];
</ins><span class="cx"> switch ([characters characterAtIndex:0]) {
</span><span class="cx"> case kWebBackspaceKey:
</span><span class="cx"> case kWebDeleteKey:
</span><del>- [[UIKeyboardImpl sharedInstance] deleteFromInput];
</del><ins>+ // FIXME: remove deleteFromInput once UIKit adopts deleteFromInputWithFlags
+ if ([keyboard respondsToSelector:@selector(deleteFromInputWithFlags:)])
+ [keyboard deleteFromInputWithFlags:event.keyboardFlags];
+ else
+ [keyboard deleteFromInput];
</ins><span class="cx"> return YES;
</span><span class="cx">
</span><span class="cx"> case kWebEnterKey:
</span><span class="cx"> case kWebReturnKey:
</span><span class="cx"> if (isCharEvent) {
</span><span class="cx"> // Map \r from HW keyboard to \n to match the behavior of the soft keyboard.
</span><del>- [[UIKeyboardImpl sharedInstance] addInputString:@"\n" withFlags:0];
</del><ins>+ [keyboard addInputString:@"\n" withFlags:0];
</ins><span class="cx"> return YES;
</span><span class="cx"> }
</span><span class="cx"> return NO;
</span><span class="lines">@@ -2389,7 +2395,7 @@
</span><span class="cx">
</span><span class="cx"> default: {
</span><span class="cx"> if (isCharEvent) {
</span><del>- [[UIKeyboardImpl sharedInstance] addInputString:event.characters withFlags:event.keyboardFlags];
</del><ins>+ [keyboard addInputString:event.characters withFlags:event.keyboardFlags];
</ins><span class="cx"> return YES;
</span><span class="cx"> }
</span><span class="cx"> return NO;
</span></span></pre>
</div>
</div>
</body>
</html>