<!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>[170738] 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/170738">170738</a></dd>
<dt>Author</dt> <dd>enrica@apple.com</dd>
<dt>Date</dt> <dd>2014-07-02 17:59:30 -0700 (Wed, 02 Jul 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>REGRESSION(WK2): Undo does not work in text fields in Safari.
https://bugs.webkit.org/show_bug.cgi?id=134572
&lt;rdar://problem/17542238&gt;

Reviewed by Benjamin Poulain.
        
This patch adds for iOS the same implementation we have already for OS X.

* UIProcess/ios/PageClientImplIOS.h:
* UIProcess/ios/PageClientImplIOS.mm:
(-[WKEditCommandObjC initWithWebEditCommandProxy:]):
(-[WKEditCommandObjC command]):
(-[WKEditorUndoTargetObjC undoEditing:]):
(-[WKEditorUndoTargetObjC redoEditing:]):
(WebKit::PageClientImpl::PageClientImpl):
(WebKit::PageClientImpl::registerEditCommand):
(WebKit::PageClientImpl::clearAllEditCommands):
(WebKit::PageClientImpl::canUndoRedo):
(WebKit::PageClientImpl::executeUndoRedo):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosPageClientImplIOSh">trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosPageClientImplIOSmm">trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (170737 => 170738)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2014-07-03 00:55:37 UTC (rev 170737)
+++ trunk/Source/WebKit2/ChangeLog        2014-07-03 00:59:30 UTC (rev 170738)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-07-02  Enrica Casucci  &lt;enrica@apple.com&gt;
+
+        REGRESSION(WK2): Undo does not work in text fields in Safari.
+        https://bugs.webkit.org/show_bug.cgi?id=134572
+        &lt;rdar://problem/17542238&gt;
+
+        Reviewed by Benjamin Poulain.
+        
+        This patch adds for iOS the same implementation we have already for OS X.
+
+        * UIProcess/ios/PageClientImplIOS.h:
+        * UIProcess/ios/PageClientImplIOS.mm:
+        (-[WKEditCommandObjC initWithWebEditCommandProxy:]):
+        (-[WKEditCommandObjC command]):
+        (-[WKEditorUndoTargetObjC undoEditing:]):
+        (-[WKEditorUndoTargetObjC redoEditing:]):
+        (WebKit::PageClientImpl::PageClientImpl):
+        (WebKit::PageClientImpl::registerEditCommand):
+        (WebKit::PageClientImpl::clearAllEditCommands):
+        (WebKit::PageClientImpl::canUndoRedo):
+        (WebKit::PageClientImpl::executeUndoRedo):
+
</ins><span class="cx"> 2014-07-02  Gavin Barraclough  &lt;baraclough@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         ProcessAssertion should also prevent UIApp suspension
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosPageClientImplIOSh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h (170737 => 170738)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h        2014-07-03 00:55:37 UTC (rev 170737)
+++ trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h        2014-07-03 00:59:30 UTC (rev 170738)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> 
</span><span class="cx"> OBJC_CLASS WKContentView;
</span><span class="cx"> OBJC_CLASS WKWebView;
</span><ins>+OBJC_CLASS WKEditorUndoTargetObjC;
</ins><span class="cx"> 
</span><span class="cx"> namespace WebKit {
</span><span class="cx">     
</span><span class="lines">@@ -168,6 +169,7 @@
</span><span class="cx"> 
</span><span class="cx">     WKContentView *m_contentView;
</span><span class="cx">     WKWebView *m_webView;
</span><ins>+    RetainPtr&lt;WKEditorUndoTargetObjC&gt; m_undoTarget;
</ins><span class="cx"> };
</span><span class="cx"> } // namespace WebKit
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosPageClientImplIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm (170737 => 170738)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm        2014-07-03 00:55:37 UTC (rev 170737)
+++ trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm        2014-07-03 00:59:30 UTC (rev 170738)
</span><span class="lines">@@ -59,12 +59,62 @@
</span><span class="cx"> @end
</span><span class="cx"> 
</span><span class="cx"> using namespace WebCore;
</span><ins>+using namespace WebKit;
</ins><span class="cx"> 
</span><ins>+@interface WKEditCommandObjC : NSObject
+{
+    RefPtr&lt;WebEditCommandProxy&gt; m_command;
+}
+- (id)initWithWebEditCommandProxy:(PassRefPtr&lt;WebEditCommandProxy&gt;)command;
+- (WebEditCommandProxy*)command;
+@end
+
+@interface WKEditorUndoTargetObjC : NSObject
+- (void)undoEditing:(id)sender;
+- (void)redoEditing:(id)sender;
+@end
+
+@implementation WKEditCommandObjC
+
+- (id)initWithWebEditCommandProxy:(PassRefPtr&lt;WebEditCommandProxy&gt;)command
+{
+    self = [super init];
+    if (!self)
+        return nil;
+    
+    m_command = command;
+    return self;
+}
+
+- (WebEditCommandProxy *)command
+{
+    return m_command.get();
+}
+
+@end
+
+@implementation WKEditorUndoTargetObjC
+
+- (void)undoEditing:(id)sender
+{
+    ASSERT([sender isKindOfClass:[WKEditCommandObjC class]]);
+    [sender command]-&gt;unapply();
+}
+
+- (void)redoEditing:(id)sender
+{
+    ASSERT([sender isKindOfClass:[WKEditCommandObjC class]]);
+    [sender command]-&gt;reapply();
+}
+
+@end
+
</ins><span class="cx"> namespace WebKit {
</span><span class="cx"> 
</span><span class="cx"> PageClientImpl::PageClientImpl(WKContentView *contentView, WKWebView *webView)
</span><span class="cx">     : m_contentView(contentView)
</span><span class="cx">     , m_webView(webView)
</span><ins>+    , m_undoTarget(adoptNS([[WKEditorUndoTargetObjC alloc] init]))
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -232,9 +282,17 @@
</span><span class="cx">     notImplemented();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void PageClientImpl::registerEditCommand(PassRefPtr&lt;WebEditCommandProxy&gt;, WebPageProxy::UndoOrRedo)
</del><ins>+void PageClientImpl::registerEditCommand(PassRefPtr&lt;WebEditCommandProxy&gt; prpCommand, WebPageProxy::UndoOrRedo undoOrRedo)
</ins><span class="cx"> {
</span><del>-    notImplemented();
</del><ins>+    RefPtr&lt;WebEditCommandProxy&gt; command = prpCommand;
+    
+    RetainPtr&lt;WKEditCommandObjC&gt; commandObjC = adoptNS([[WKEditCommandObjC alloc] initWithWebEditCommandProxy:command]);
+    String actionName = WebEditCommandProxy::nameForEditAction(command-&gt;editAction());
+    
+    NSUndoManager *undoManager = [m_contentView undoManager];
+    [undoManager registerUndoWithTarget:m_undoTarget.get() selector:((undoOrRedo == WebPageProxy::Undo) ? @selector(undoEditing:) : @selector(redoEditing:)) object:commandObjC.get()];
+    if (!actionName.isEmpty())
+        [undoManager setActionName:(NSString *)actionName];
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> #if USE(INSERTION_UNDO_GROUPING)
</span><span class="lines">@@ -246,18 +304,17 @@
</span><span class="cx"> 
</span><span class="cx"> void PageClientImpl::clearAllEditCommands()
</span><span class="cx"> {
</span><del>-    notImplemented();
</del><ins>+    [[m_contentView undoManager] removeAllActionsWithTarget:m_undoTarget.get()];
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool PageClientImpl::canUndoRedo(WebPageProxy::UndoOrRedo)
</del><ins>+bool PageClientImpl::canUndoRedo(WebPageProxy::UndoOrRedo undoOrRedo)
</ins><span class="cx"> {
</span><del>-    notImplemented();
-    return false;
</del><ins>+    return (undoOrRedo == WebPageProxy::Undo) ? [[m_contentView undoManager] canUndo] : [[m_contentView undoManager] canRedo];
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-void PageClientImpl::executeUndoRedo(WebPageProxy::UndoOrRedo)
</del><ins>+void PageClientImpl::executeUndoRedo(WebPageProxy::UndoOrRedo undoOrRedo)
</ins><span class="cx"> {
</span><del>-    notImplemented();
</del><ins>+    return (undoOrRedo == WebPageProxy::Undo) ? [[m_contentView undoManager] undo] : [[m_contentView undoManager] redo];
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void PageClientImpl::accessibilityWebProcessTokenReceived(const IPC::DataReference&amp; data)
</span></span></pre>
</div>
</div>

</body>
</html>