<!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>[166431] 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/166431">166431</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2014-03-28 15:07:36 -0700 (Fri, 28 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move sync CancelComposition message under an ifdef
https://bugs.webkit.org/show_bug.cgi?id=130908
Reviewed by Enrica Casucci.
* UIProcess/WebPageProxy.h:
* UIProcess/ios/WebPageProxyIOS.mm:
(WebKit::WebPageProxy::cancelComposition): Deleted.
* UIProcess/mac/WebPageProxyMac.mm:
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/WebPage.messages.in:
* WebProcess/WebPage/mac/WebPageMac.mm:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWebPageProxyIOSmm">trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebPageProxyMacmm">trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagemessagesin">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacWebPageMacmm">trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (166430 => 166431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-03-28 22:06:08 UTC (rev 166430)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-28 22:07:36 UTC (rev 166431)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2014-03-28 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><ins>+ Move sync CancelComposition message under an ifdef
+ https://bugs.webkit.org/show_bug.cgi?id=130908
+
+ Reviewed by Enrica Casucci.
+
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/ios/WebPageProxyIOS.mm:
+ (WebKit::WebPageProxy::cancelComposition): Deleted.
+ * UIProcess/mac/WebPageProxyMac.mm:
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in:
+ * WebProcess/WebPage/mac/WebPageMac.mm:
+
+2014-03-28 Alexey Proskuryakov <ap@apple.com>
+
</ins><span class="cx"> [iOS] Don't cancel composition on selection change
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=130909
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (166430 => 166431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-03-28 22:06:08 UTC (rev 166430)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-03-28 22:07:36 UTC (rev 166431)
</span><span class="lines">@@ -650,8 +650,6 @@
</span><span class="cx"> void setCompositionAsync(const String& text, Vector<WebCore::CompositionUnderline> underlines, const EditingRange& selectionRange, const EditingRange& replacementRange);
</span><span class="cx"> void confirmCompositionAsync();
</span><span class="cx">
</span><del>- void cancelComposition();
-
</del><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> void insertDictatedTextAsync(const String& text, const EditingRange& replacementRange, const Vector<WebCore::TextAlternativeWithRange>& dictationAlternatives);
</span><span class="cx"> void attributedSubstringForCharacterRangeAsync(const EditingRange&, PassRefPtr<AttributedStringForCharacterRangeCallback>);
</span><span class="lines">@@ -667,6 +665,7 @@
</span><span class="cx"> uint64_t characterIndexForPoint(const WebCore::IntPoint);
</span><span class="cx"> WebCore::IntRect firstRectForCharacterRange(const EditingRange&);
</span><span class="cx"> bool executeKeypressCommands(const Vector<WebCore::KeypressCommand>&);
</span><ins>+ void cancelComposition();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> WKView* wkView() const;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWebPageProxyIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm (166430 => 166431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm 2014-03-28 22:06:08 UTC (rev 166430)
+++ trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm 2014-03-28 22:07:36 UTC (rev 166431)
</span><span class="lines">@@ -99,11 +99,6 @@
</span><span class="cx"> notImplemented();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::cancelComposition()
-{
- notImplemented();
-}
-
</del><span class="cx"> String WebPageProxy::stringSelectionForPasteboard()
</span><span class="cx"> {
</span><span class="cx"> notImplemented();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebPageProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm (166430 => 166431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm 2014-03-28 22:06:08 UTC (rev 166430)
+++ trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm 2014-03-28 22:07:36 UTC (rev 166431)
</span><span class="lines">@@ -278,8 +278,6 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // !USE(ASYNC_NSTEXTINPUTCLIENT)
-
</del><span class="cx"> void WebPageProxy::cancelComposition()
</span><span class="cx"> {
</span><span class="cx"> if (!isValid())
</span><span class="lines">@@ -288,6 +286,8 @@
</span><span class="cx"> process().sendSync(Messages::WebPage::CancelComposition(), Messages::WebPage::CancelComposition::Reply(m_editorState), m_pageID);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#endif // !USE(ASYNC_NSTEXTINPUTCLIENT)
+
</ins><span class="cx"> void WebPageProxy::insertDictatedTextAsync(const String& text, const EditingRange& replacementRange, const Vector<TextAlternativeWithRange>& dictationAlternativesWithRange)
</span><span class="cx"> {
</span><span class="cx"> #if USE(DICTATION_ALTERNATIVES)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (166430 => 166431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-03-28 22:06:08 UTC (rev 166430)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-03-28 22:07:36 UTC (rev 166431)
</span><span class="lines">@@ -552,7 +552,6 @@
</span><span class="cx"> void confirmCompositionAsync();
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>- void cancelComposition(EditorState& newState);
</del><span class="cx"> void insertDictatedTextAsync(const String& text, const EditingRange& replacementRange, const Vector<WebCore::DictationAlternative>& dictationAlternativeLocations);
</span><span class="cx"> void attributedSubstringForCharacterRangeAsync(const EditingRange&, uint64_t callbackID);
</span><span class="cx"> #if !USE(ASYNC_NSTEXTINPUTCLIENT)
</span><span class="lines">@@ -566,6 +565,7 @@
</span><span class="cx"> void characterIndexForPoint(const WebCore::IntPoint point, uint64_t& result);
</span><span class="cx"> void firstRectForCharacterRange(const EditingRange&, WebCore::IntRect& resultRect);
</span><span class="cx"> void executeKeypressCommands(const Vector<WebCore::KeypressCommand>&, bool& handled, EditorState& newState);
</span><ins>+ void cancelComposition(EditorState& newState);
</ins><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagemessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (166430 => 166431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2014-03-28 22:06:08 UTC (rev 166430)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2014-03-28 22:07:36 UTC (rev 166431)
</span><span class="lines">@@ -307,7 +307,6 @@
</span><span class="cx"> ConfirmCompositionAsync()
</span><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>- CancelComposition() -> (WebKit::EditorState newState)
</del><span class="cx"> InsertDictatedTextAsync(String text, WebKit::EditingRange replacementRange, Vector<WebCore::DictationAlternative> dictationAlternatives)
</span><span class="cx"> AttributedSubstringForCharacterRangeAsync(WebKit::EditingRange range, uint64_t callbackID);
</span><span class="cx"> #endif
</span><span class="lines">@@ -322,6 +321,7 @@
</span><span class="cx"> CharacterIndexForPoint(WebCore::IntPoint point) -> (uint64_t result)
</span><span class="cx"> FirstRectForCharacterRange(WebKit::EditingRange range) -> (WebCore::IntRect resultRect)
</span><span class="cx"> ExecuteKeypressCommands(Vector<WebCore::KeypressCommand> savedCommands) -> (bool handled, WebKit::EditorState newState)
</span><ins>+ CancelComposition() -> (WebKit::EditorState newState)
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> SetMinimumLayoutSize(WebCore::IntSize minimumLayoutSize)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacWebPageMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm (166430 => 166431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2014-03-28 22:06:08 UTC (rev 166430)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2014-03-28 22:07:36 UTC (rev 166431)
</span><span class="lines">@@ -400,8 +400,6 @@
</span><span class="cx"> newState = editorState();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // !USE(ASYNC_NSTEXTINPUTCLIENT)
-
</del><span class="cx"> void WebPage::cancelComposition(EditorState& newState)
</span><span class="cx"> {
</span><span class="cx"> Frame& frame = m_page->focusController().focusedOrMainFrame();
</span><span class="lines">@@ -409,6 +407,8 @@
</span><span class="cx"> newState = editorState();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#endif // !USE(ASYNC_NSTEXTINPUTCLIENT)
+
</ins><span class="cx"> void WebPage::insertDictatedTextAsync(const String& text, const EditingRange& replacementEditingRange, const Vector<WebCore::DictationAlternative>& dictationAlternativeLocations)
</span><span class="cx"> {
</span><span class="cx"> Frame& frame = m_page->focusController().focusedOrMainFrame();
</span></span></pre>
</div>
</div>
</body>
</html>