<!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>[168142] trunk/Source/WebKit2</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/168142">168142</a></dd>
<dt>Author</dt> <dd>enrica@apple.com</dd>
<dt>Date</dt> <dd>2014-05-01 18:40:13 -0700 (Thu, 01 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (WebKit2) Need to support Learn button.
https://bugs.webkit.org/show_bug.cgi?id=132454
<rdar://problem/16778889>
Reviewed by Benjamin Poulain.
For traditional Chinese we support the ability to add shortcuts
for typing. This is done by pressing the Learn button on the system
menu. This patch adds the necessary code to canPerformAction to enable
the button when appropriate as well as the implementation of the action
itself.
It also adds a check for the Replace button not to be shown when the
selection only contains CJ characters.
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView _addShortcut:]):
(-[WKContentView canPerformAction:withSender:]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm">trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (168141 => 168142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-05-02 01:28:50 UTC (rev 168141)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-02 01:40:13 UTC (rev 168142)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-05-01 Enrica Casucci <enrica@apple.com>
+
+ REGRESSION (WebKit2) Need to support Learn button.
+ https://bugs.webkit.org/show_bug.cgi?id=132454
+ <rdar://problem/16778889>
+
+ Reviewed by Benjamin Poulain.
+
+ For traditional Chinese we support the ability to add shortcuts
+ for typing. This is done by pressing the Learn button on the system
+ menu. This patch adds the necessary code to canPerformAction to enable
+ the button when appropriate as well as the implementation of the action
+ itself.
+ It also adds a check for the Replace button not to be shown when the
+ selection only contains CJ characters.
+
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView _addShortcut:]):
+ (-[WKContentView canPerformAction:withSender:]):
+
</ins><span class="cx"> 2014-05-01 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS][WK2] Tweak the extended background exclusion for MobileSafari
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (168141 => 168142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-05-02 01:28:50 UTC (rev 168141)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-05-02 01:40:13 UTC (rev 168142)
</span><span class="lines">@@ -43,11 +43,13 @@
</span><span class="cx"> #import "_WKFormDelegate.h"
</span><span class="cx"> #import "_WKFormInputSession.h"
</span><span class="cx"> #import <DataDetectorsUI/DDDetectionController.h>
</span><ins>+#import <TextInput/TI_NSStringExtras.h>
</ins><span class="cx"> #import <UIKit/_UIHighlightView.h>
</span><span class="cx"> #import <UIKit/_UIWebHighlightLongPressGestureRecognizer.h>
</span><span class="cx"> #import <UIKit/UIFont_Private.h>
</span><span class="cx"> #import <UIKit/UIGestureRecognizer_Private.h>
</span><span class="cx"> #import <UIKit/UIKeyboardImpl.h>
</span><ins>+#import <UIKit/UIKeyboardIntl.h>
</ins><span class="cx"> #import <UIKit/UILongPressGestureRecognizer_Private.h>
</span><span class="cx"> #import <UIKit/UITapGestureRecognizer_Private.h>
</span><span class="cx"> #import <UIKit/UITextInteractionAssistant_Private.h>
</span><span class="lines">@@ -124,6 +126,7 @@
</span><span class="cx">
</span><span class="cx"> @interface UITextInteractionAssistant (StagingToRemove)
</span><span class="cx"> - (void)scheduleReplacementsForText:(NSString *)text;
</span><ins>+- (void)showTextServiceFor:(NSString *)selectedTerm fromRect:(CGRect)presentationRect;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @interface WKFormInputSession : NSObject <_WKFormInputSession>
</span><span class="lines">@@ -848,7 +851,8 @@
</span><span class="cx">
</span><span class="cx"> - (void)_addShortcut:(id)sender
</span><span class="cx"> {
</span><del>- // FIXME: To be implemented.
</del><ins>+ if (_textSelectionAssistant && [_textSelectionAssistant respondsToSelector:@selector(showTextServiceFor:fromRect:)])
+ [_textSelectionAssistant showTextServiceFor:[self selectedText] fromRect:_page->editorState().selectionRects[0].rect()];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSString *)selectedText
</span><span class="lines">@@ -923,12 +927,25 @@
</span><span class="cx"> if (action == @selector(_addShortcut:)) {
</span><span class="cx"> if (_page->editorState().isInPasswordField || !(hasWebSelection || _page->editorState().selectionIsRange))
</span><span class="cx"> return NO;
</span><del>- // FIXME: need to implement, returning NO always for now.
- return NO;
</del><ins>+
+ NSString *selectedText = [self selectedText];
+ if (![selectedText length])
+ return NO;
+
+ if (!UIKeyboardEnabledInputModesAllowOneToManyShortcuts())
+ return NO;
+ if (![selectedText _containsCJScripts])
+ return NO;
+ return YES;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (action == @selector(_promptForReplace:))
- return _page->editorState().selectionIsRange && _page->editorState().isReplaceAllowed && [[UIKeyboardImpl activeInstance] autocorrectSpellingEnabled];
</del><ins>+ if (action == @selector(_promptForReplace:)) {
+ if (!_page->editorState().selectionIsRange || !_page->editorState().isReplaceAllowed || ![[UIKeyboardImpl activeInstance] autocorrectSpellingEnabled])
+ return NO;
+ if ([[self selectedText] _containsCJScriptsOnly])
+ return NO;
+ return YES;
+ }
</ins><span class="cx">
</span><span class="cx"> if (action == @selector(select:)) {
</span><span class="cx"> // Disable select in password fields so that you can't see word boundaries.
</span></span></pre>
</div>
</div>
</body>
</html>