<!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>[196489] trunk/Source/WebKit/mac</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/196489">196489</a></dd>
<dt>Author</dt> <dd>bdakin@apple.com</dd>
<dt>Date</dt> <dd>2016-02-12 11:43:10 -0800 (Fri, 12 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>NSRangeIsRelativeTo should not have NS prefix
https://bugs.webkit.org/show_bug.cgi?id=154174
Reviewed by Tim Horton.
NSRangeIsRelativeTo -> WebRangeIsRelativeTo
* WebView/WebFrame.mm:
(-[WebFrame _convertToDOMRange:]):
(-[WebFrame _convertToDOMRange:rangeIsRelativeTo:]):
* WebView/WebFrameInternal.h:
* WebView/WebHTMLView.mm:
(-[WebHTMLView insertText:]):</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (196488 => 196489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-02-12 19:28:29 UTC (rev 196488)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-02-12 19:43:10 UTC (rev 196489)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-02-12 Beth Dakin <bdakin@apple.com>
+
+ NSRangeIsRelativeTo should not have NS prefix
+ https://bugs.webkit.org/show_bug.cgi?id=154174
+
+ Reviewed by Tim Horton.
+
+ NSRangeIsRelativeTo -> WebRangeIsRelativeTo
+ * WebView/WebFrame.mm:
+ (-[WebFrame _convertToDOMRange:]):
+ (-[WebFrame _convertToDOMRange:rangeIsRelativeTo:]):
+ * WebView/WebFrameInternal.h:
+ * WebView/WebHTMLView.mm:
+ (-[WebHTMLView insertText:]):
+
</ins><span class="cx"> 2016-02-11 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> EditingRangeIsRelativeTo::Document and NSRangeIsRelativeTo::Document should
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebFramemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebFrame.mm (196488 => 196489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebFrame.mm 2016-02-12 19:28:29 UTC (rev 196488)
+++ trunk/Source/WebKit/mac/WebView/WebFrame.mm 2016-02-12 19:43:10 UTC (rev 196489)
</span><span class="lines">@@ -793,17 +793,17 @@
</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::EditableRoot];
</del><ins>+ return [self _convertToDOMRange:nsrange rangeIsRelativeTo:WebRangeIsRelativeTo::EditableRoot];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (PassRefPtr<Range>)_convertToDOMRange:(NSRange)nsrange rangeIsRelativeTo:(NSRangeIsRelativeTo)rangeIsRelativeTo
</del><ins>+- (PassRefPtr<Range>)_convertToDOMRange:(NSRange)nsrange rangeIsRelativeTo:(WebRangeIsRelativeTo)rangeIsRelativeTo
</ins><span class="cx"> {
</span><span class="cx"> if (nsrange.location > INT_MAX)
</span><span class="cx"> return 0;
</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::EditableRoot) {
</del><ins>+ if (rangeIsRelativeTo == WebRangeIsRelativeTo::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 class="lines">@@ -816,7 +816,7 @@
</span><span class="cx"> return TextIterator::rangeFromLocationAndLength(element, nsrange.location, nsrange.length);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ASSERT(rangeIsRelativeTo == NSRangeIsRelativeTo::Paragraph);
</del><ins>+ ASSERT(rangeIsRelativeTo == WebRangeIsRelativeTo::Paragraph);
</ins><span class="cx">
</span><span class="cx"> const VisibleSelection& selection = _private->coreFrame->selection().selection();
</span><span class="cx"> RefPtr<Range> selectedRange = selection.toNormalizedRange();
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebFrameInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebFrameInternal.h (196488 => 196489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebFrameInternal.h 2016-02-12 19:28:29 UTC (rev 196488)
+++ trunk/Source/WebKit/mac/WebView/WebFrameInternal.h 2016-02-12 19:43:10 UTC (rev 196489)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx">
</span><span class="cx"> typedef WebCore::HistoryItem WebCoreHistoryItem;
</span><span class="cx">
</span><del>-enum class NSRangeIsRelativeTo : uint8_t {
</del><ins>+enum class WebRangeIsRelativeTo : uint8_t {
</ins><span class="cx"> EditableRoot,
</span><span class="cx"> Paragraph,
</span><span class="cx"> };
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> - (NSRange)_convertToNSRange:(WebCore::Range*)range;
</span><span class="cx"> - (PassRefPtr<WebCore::Range>)_convertToDOMRange:(NSRange)nsrange;
</span><del>-- (PassRefPtr<WebCore::Range>)_convertToDOMRange:(NSRange)nsrange rangeIsRelativeTo:(NSRangeIsRelativeTo)rangeIsRelativeTo;
</del><ins>+- (PassRefPtr<WebCore::Range>)_convertToDOMRange:(NSRange)nsrange rangeIsRelativeTo:(WebRangeIsRelativeTo)rangeIsRelativeTo;
</ins><span class="cx">
</span><span class="cx"> - (DOMDocumentFragment *)_documentFragmentWithMarkupString:(NSString *)markupString baseURLString:(NSString *)baseURLString;
</span><span class="cx"> - (DOMDocumentFragment *)_documentFragmentWithNodesAsParagraphs:(NSArray *)nodes;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebHTMLViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (196488 => 196489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2016-02-12 19:28:29 UTC (rev 196488)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2016-02-12 19:43:10 UTC (rev 196489)
</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::EditableRoot;
</del><ins>+ WebRangeIsRelativeTo rangeIsRelativeTo = needToRemoveSoftSpace ? WebRangeIsRelativeTo::Paragraph : WebRangeIsRelativeTo::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>
</div>
</body>
</html>