<!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>[196456] trunk/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/196456">196456</a></dd>
<dt>Author</dt> <dd>bdakin@apple.com</dd>
<dt>Date</dt> <dd>2016-02-11 16:31:53 -0800 (Thu, 11 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>EditingRangeIsRelativeTo::Document and NSRangeIsRelativeTo::Document should
be called EditableRoot instead
https://bugs.webkit.org/show_bug.cgi?id=154138
Reviewed by Alexey Proskuryakov.
EditableRoot is much more accurate than Document.
Source/WebKit/mac:
* WebView/WebFrame.mm:
(-[WebFrame _convertToDOMRange:]):
(-[WebFrame _convertToDOMRange:rangeIsRelativeTo:]):
* WebView/WebFrameInternal.h:
* WebView/WebHTMLView.mm:
(-[WebHTMLView insertText:]):
Source/WebKit2:
* Shared/EditingRange.h:
* UIProcess/Cocoa/WebViewImpl.mm:
(WebKit::WebViewImpl::insertText):
(WebKit::WebViewImpl::selectedRangeWithCompletionHandler):
* UIProcess/WebPageProxy.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::rangeFromEditingRange):
* WebProcess/WebPage/WebPage.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebFramemm">trunk/Source/WebKit/mac/WebView/WebFrame.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebFrameInternalh">trunk/Source/WebKit/mac/WebView/WebFrameInternal.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebHTMLViewmm">trunk/Source/WebKit/mac/WebView/WebHTMLView.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedEditingRangeh">trunk/Source/WebKit2/Shared/EditingRange.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebViewImplmm">trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (196455 => 196456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-02-12 00:17:18 UTC (rev 196455)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-02-12 00:31:53 UTC (rev 196456)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2016-02-11 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><ins>+ EditingRangeIsRelativeTo::Document and NSRangeIsRelativeTo::Document should
+ be called EditableRoot instead
+ https://bugs.webkit.org/show_bug.cgi?id=154138
+
+ Reviewed by Alexey Proskuryakov.
+
+ EditableRoot is much more accurate than Document.
+ * WebView/WebFrame.mm:
+ (-[WebFrame _convertToDOMRange:]):
+ (-[WebFrame _convertToDOMRange:rangeIsRelativeTo:]):
+ * WebView/WebFrameInternal.h:
+ * WebView/WebHTMLView.mm:
+ (-[WebHTMLView insertText:]):
+
+2016-02-11 Beth Dakin <bdakin@apple.com>
+
</ins><span class="cx"> Soft spaces are often tracked in the wrong spot
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=154127
</span><span class="cx"> -and corresponding-
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebFramemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebFrame.mm (196455 => 196456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebFrame.mm 2016-02-12 00:17:18 UTC (rev 196455)
+++ trunk/Source/WebKit/mac/WebView/WebFrame.mm 2016-02-12 00:31:53 UTC (rev 196456)
</span><span class="lines">@@ -793,7 +793,7 @@
</span><span class="cx">
</span><span class="cx"> - (PassRefPtr<Range>)_convertToDOMRange:(NSRange)nsrange
</span><span class="cx"> {
</span><del>- return [self _convertToDOMRange:nsrange rangeIsRelativeTo:NSRangeIsRelativeTo::Document];
</del><ins>+ return [self _convertToDOMRange:nsrange rangeIsRelativeTo:NSRangeIsRelativeTo::EditableRoot];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (PassRefPtr<Range>)_convertToDOMRange:(NSRange)nsrange rangeIsRelativeTo:(NSRangeIsRelativeTo)rangeIsRelativeTo
</span><span class="lines">@@ -803,7 +803,7 @@
</span><span class="cx"> if (nsrange.length > INT_MAX || nsrange.location + nsrange.length > INT_MAX)
</span><span class="cx"> nsrange.length = INT_MAX - nsrange.location;
</span><span class="cx">
</span><del>- if (rangeIsRelativeTo == NSRangeIsRelativeTo::Document) {
</del><ins>+ if (rangeIsRelativeTo == NSRangeIsRelativeTo::EditableRoot) {
</ins><span class="cx"> // Our critical assumption is that this code path is only called by input methods that
</span><span class="cx"> // concentrate on a given area containing the selection
</span><span class="cx"> // We have to do this because of text fields and textareas. The DOM for those is not
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebFrameInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebFrameInternal.h (196455 => 196456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebFrameInternal.h 2016-02-12 00:17:18 UTC (rev 196455)
+++ trunk/Source/WebKit/mac/WebView/WebFrameInternal.h 2016-02-12 00:31:53 UTC (rev 196456)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> typedef WebCore::HistoryItem WebCoreHistoryItem;
</span><span class="cx">
</span><span class="cx"> enum class NSRangeIsRelativeTo : uint8_t {
</span><del>- Document,
</del><ins>+ EditableRoot,
</ins><span class="cx"> Paragraph,
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebHTMLViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (196455 => 196456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2016-02-12 00:17:18 UTC (rev 196455)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2016-02-12 00:31:53 UTC (rev 196456)
</span><span class="lines">@@ -7114,7 +7114,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (replacementRange.location != NSNotFound) {
</span><del>- NSRangeIsRelativeTo rangeIsRelativeTo = needToRemoveSoftSpace ? NSRangeIsRelativeTo::Paragraph : NSRangeIsRelativeTo::Document;
</del><ins>+ NSRangeIsRelativeTo rangeIsRelativeTo = needToRemoveSoftSpace ? NSRangeIsRelativeTo::Paragraph : NSRangeIsRelativeTo::EditableRoot;
</ins><span class="cx"> RefPtr<Range> domRange = [[self _frame] _convertToDOMRange:replacementRange rangeIsRelativeTo:rangeIsRelativeTo];
</span><span class="cx"> if (domRange)
</span><span class="cx"> coreFrame->selection().setSelection(VisibleSelection(*domRange, SEL_DEFAULT_AFFINITY));
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (196455 => 196456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-02-12 00:17:18 UTC (rev 196455)
+++ trunk/Source/WebKit2/ChangeLog 2016-02-12 00:31:53 UTC (rev 196456)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-02-11 Beth Dakin <bdakin@apple.com>
+
+ EditingRangeIsRelativeTo::Document and NSRangeIsRelativeTo::Document should
+ be called EditableRoot instead
+ https://bugs.webkit.org/show_bug.cgi?id=154138
+
+ Reviewed by Alexey Proskuryakov.
+
+ EditableRoot is much more accurate than Document.
+ * Shared/EditingRange.h:
+ * UIProcess/Cocoa/WebViewImpl.mm:
+ (WebKit::WebViewImpl::insertText):
+ (WebKit::WebViewImpl::selectedRangeWithCompletionHandler):
+ * UIProcess/WebPageProxy.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::rangeFromEditingRange):
+ * WebProcess/WebPage/WebPage.h:
+
</ins><span class="cx"> 2016-02-11 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Move Download authentication code to AuthenticationManager
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedEditingRangeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/EditingRange.h (196455 => 196456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/EditingRange.h 2016-02-12 00:17:18 UTC (rev 196455)
+++ trunk/Source/WebKit2/Shared/EditingRange.h 2016-02-12 00:31:53 UTC (rev 196456)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> enum class EditingRangeIsRelativeTo : uint8_t {
</span><del>- Document,
</del><ins>+ EditableRoot,
</ins><span class="cx"> Paragraph,
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebViewImplmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm (196455 => 196456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2016-02-12 00:17:18 UTC (rev 196455)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2016-02-12 00:31:53 UTC (rev 196456)
</span><span class="lines">@@ -3556,7 +3556,7 @@
</span><span class="cx"> if (!dictationAlternatives.isEmpty())
</span><span class="cx"> m_page->insertDictatedTextAsync(eventText, replacementRange, dictationAlternatives, registerUndoGroup);
</span><span class="cx"> else
</span><del>- m_page->insertTextAsync(eventText, replacementRange, registerUndoGroup, needToRemoveSoftSpace ? EditingRangeIsRelativeTo::Paragraph : EditingRangeIsRelativeTo::Document);
</del><ins>+ m_page->insertTextAsync(eventText, replacementRange, registerUndoGroup, needToRemoveSoftSpace ? EditingRangeIsRelativeTo::Paragraph : EditingRangeIsRelativeTo::EditableRoot);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebViewImpl::selectedRangeWithCompletionHandler(void(^completionHandlerPtr)(NSRange selectedRange))
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (196455 => 196456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2016-02-12 00:17:18 UTC (rev 196455)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2016-02-12 00:31:53 UTC (rev 196456)
</span><span class="lines">@@ -561,7 +561,7 @@
</span><span class="cx"> void setAcceleratedCompositingRootLayer(LayerOrView*);
</span><span class="cx"> LayerOrView* acceleratedCompositingRootLayer() const;
</span><span class="cx">
</span><del>- void insertTextAsync(const String& text, const EditingRange& replacementRange, bool registerUndoGroup = false, EditingRangeIsRelativeTo = EditingRangeIsRelativeTo::Document);
</del><ins>+ void insertTextAsync(const String& text, const EditingRange& replacementRange, bool registerUndoGroup = false, EditingRangeIsRelativeTo = EditingRangeIsRelativeTo::EditableRoot);
</ins><span class="cx"> void getMarkedRangeAsync(std::function<void (EditingRange, CallbackBase::Error)>);
</span><span class="cx"> void getSelectedRangeAsync(std::function<void (EditingRange, CallbackBase::Error)>);
</span><span class="cx"> void characterIndexForPointAsync(const WebCore::IntPoint&, std::function<void (uint64_t, CallbackBase::Error)>);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (196455 => 196456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-02-12 00:17:18 UTC (rev 196455)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-02-12 00:31:53 UTC (rev 196456)
</span><span class="lines">@@ -5038,7 +5038,7 @@
</span><span class="cx"> else
</span><span class="cx"> length = INT_MAX - range.location;
</span><span class="cx">
</span><del>- if (editingRangeIsRelativeTo == EditingRangeIsRelativeTo::Document) {
</del><ins>+ if (editingRangeIsRelativeTo == EditingRangeIsRelativeTo::EditableRoot) {
</ins><span class="cx"> // Our critical assumption is that this code path is called by input methods that
</span><span class="cx"> // concentrate on a given area containing the selection.
</span><span class="cx"> // We have to do this because of text fields and textareas. The DOM for those is not
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (196455 => 196456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2016-02-12 00:17:18 UTC (rev 196455)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2016-02-12 00:31:53 UTC (rev 196456)
</span><span class="lines">@@ -647,7 +647,7 @@
</span><span class="cx">
</span><span class="cx"> void sendComplexTextInputToPlugin(uint64_t pluginComplexTextInputIdentifier, const String& textInput);
</span><span class="cx">
</span><del>- void insertTextAsync(const String& text, const EditingRange& replacementRange, bool registerUndoGroup = false, uint32_t editingRangeIsRelativeTo = (uint32_t)EditingRangeIsRelativeTo::Document);
</del><ins>+ void insertTextAsync(const String& text, const EditingRange& replacementRange, bool registerUndoGroup = false, uint32_t editingRangeIsRelativeTo = (uint32_t)EditingRangeIsRelativeTo::EditableRoot);
</ins><span class="cx"> void getMarkedRangeAsync(uint64_t callbackID);
</span><span class="cx"> void getSelectedRangeAsync(uint64_t callbackID);
</span><span class="cx"> void characterIndexForPointAsync(const WebCore::IntPoint&, uint64_t callbackID);
</span><span class="lines">@@ -1136,7 +1136,7 @@
</span><span class="cx"> static PluginView* focusedPluginViewForFrame(WebCore::Frame&);
</span><span class="cx"> static PluginView* pluginViewForFrame(WebCore::Frame*);
</span><span class="cx">
</span><del>- static PassRefPtr<WebCore::Range> rangeFromEditingRange(WebCore::Frame&, const EditingRange&, EditingRangeIsRelativeTo = EditingRangeIsRelativeTo::Document);
</del><ins>+ static PassRefPtr<WebCore::Range> rangeFromEditingRange(WebCore::Frame&, const EditingRange&, EditingRangeIsRelativeTo = EditingRangeIsRelativeTo::EditableRoot);
</ins><span class="cx">
</span><span class="cx"> void reportUsedFeatures();
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>