<!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>[177502] 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/177502">177502</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2014-12-18 10:23:18 -0800 (Thu, 18 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Attempt to fix the iOS build after <http://trac.webkit.org/changeset/177486>
(https://bugs.webkit.org/show_bug.cgi?id=139755)
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::selectWithGesture): Wrap return value of Range::create() in RefPtr<Range>()
to make the the compiler happy since it wants clauses of the ternary operator to have the same data type
and Ref<Range> object does not support nullptr.
(WebKit::WebPage::selectWordBackward): Substitute Ref::ptr() for PassRefPtr::get().
(WebKit::WebPage::moveSelectionByOffset): Ditto.
(WebKit::WebPage::selectPositionAtPoint): Ditto.
(WebKit::WebPage::selectPositionAtBoundaryWithDirection): Ditto.
(WebKit::WebPage::requestDictationContext): Ditto.
(WebKit::computeAutocorrectionContext): Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm">trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (177501 => 177502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-12-18 17:44:18 UTC (rev 177501)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-18 18:23:18 UTC (rev 177502)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-12-18 Daniel Bates <dabates@apple.com>
+
+ Attempt to fix the iOS build after <http://trac.webkit.org/changeset/177486>
+ (https://bugs.webkit.org/show_bug.cgi?id=139755)
+
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::selectWithGesture): Wrap return value of Range::create() in RefPtr<Range>()
+ to make the the compiler happy since it wants clauses of the ternary operator to have the same data type
+ and Ref<Range> object does not support nullptr.
+ (WebKit::WebPage::selectWordBackward): Substitute Ref::ptr() for PassRefPtr::get().
+ (WebKit::WebPage::moveSelectionByOffset): Ditto.
+ (WebKit::WebPage::selectPositionAtPoint): Ditto.
+ (WebKit::WebPage::selectPositionAtBoundaryWithDirection): Ditto.
+ (WebKit::WebPage::requestDictationContext): Ditto.
+ (WebKit::computeAutocorrectionContext): Ditto.
+
</ins><span class="cx"> 2014-12-18 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove alwaysUseBaselineOfPrimaryFont setting
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (177501 => 177502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-12-18 17:44:18 UTC (rev 177501)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-12-18 18:23:18 UTC (rev 177502)
</span><span class="lines">@@ -889,7 +889,7 @@
</span><span class="cx"> switch (wkGestureState) {
</span><span class="cx"> case GestureRecognizerState::Began:
</span><span class="cx"> range = wordRangeFromPosition(position);
</span><del>- m_currentWordRange = range ? Range::create(*frame.document(), range->startPosition(), range->endPosition()) : nullptr;
</del><ins>+ m_currentWordRange = range ? RefPtr<Range>(Range::create(*frame.document(), range->startPosition(), range->endPosition())) : nullptr;
</ins><span class="cx"> break;
</span><span class="cx"> case GestureRecognizerState::Changed:
</span><span class="cx"> if (!m_currentWordRange)
</span><span class="lines">@@ -1533,7 +1533,7 @@
</span><span class="cx"> VisiblePosition position = frame.selection().selection().start();
</span><span class="cx"> VisiblePosition startPosition = positionOfNextBoundaryOfGranularity(position, WordGranularity, DirectionBackward);
</span><span class="cx"> if (startPosition.isNotNull() && startPosition != position)
</span><del>- frame.selection().setSelectedRange(Range::create(*frame.document(), startPosition, position).get(), position.affinity(), true);
</del><ins>+ frame.selection().setSelectedRange(Range::create(*frame.document(), startPosition, position).ptr(), position.affinity(), true);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPage::moveSelectionByOffset(int32_t offset, uint64_t callbackID)
</span><span class="lines">@@ -1551,7 +1551,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> if (position.isNotNull() && startPosition != position)
</span><del>- frame.selection().setSelectedRange(Range::create(*frame.document(), position, position).get(), position.affinity(), true);
</del><ins>+ frame.selection().setSelectedRange(Range::create(*frame.document(), position, position).ptr(), position.affinity(), true);
</ins><span class="cx"> send(Messages::WebPageProxy::VoidCallback(callbackID));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1568,7 +1568,7 @@
</span><span class="cx"> VisiblePosition position = visiblePositionInFocusedNodeForPoint(frame, point);
</span><span class="cx">
</span><span class="cx"> if (position.isNotNull())
</span><del>- frame.selection().setSelectedRange(Range::create(*frame.document(), position, position).get(), position.affinity(), true);
</del><ins>+ frame.selection().setSelectedRange(Range::create(*frame.document(), position, position).ptr(), position.affinity(), true);
</ins><span class="cx"> send(Messages::WebPageProxy::VoidCallback(callbackID));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1580,7 +1580,7 @@
</span><span class="cx"> if (position.isNotNull()) {
</span><span class="cx"> position = positionOfNextBoundaryOfGranularity(position, static_cast<WebCore::TextGranularity>(granularity), static_cast<SelectionDirection>(direction));
</span><span class="cx"> if (position.isNotNull())
</span><del>- frame.selection().setSelectedRange(Range::create(*frame.document(), position, position).get(), UPSTREAM, true);
</del><ins>+ frame.selection().setSelectedRange(Range::create(*frame.document(), position, position).ptr(), UPSTREAM, true);
</ins><span class="cx"> }
</span><span class="cx"> send(Messages::WebPageProxy::VoidCallback(callbackID));
</span><span class="cx"> }
</span><span class="lines">@@ -1691,7 +1691,7 @@
</span><span class="cx"> lastPosition = currentPosition;
</span><span class="cx"> }
</span><span class="cx"> if (lastPosition.isNotNull() && lastPosition != startPosition)
</span><del>- contextBefore = plainTextReplacingNoBreakSpace(Range::create(*frame.document(), lastPosition, startPosition).get());
</del><ins>+ contextBefore = plainTextReplacingNoBreakSpace(Range::create(*frame.document(), lastPosition, startPosition).ptr());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String contextAfter;
</span><span class="lines">@@ -1705,7 +1705,7 @@
</span><span class="cx"> lastPosition = currentPosition;
</span><span class="cx"> }
</span><span class="cx"> if (lastPosition.isNotNull() && lastPosition != endPosition)
</span><del>- contextAfter = plainTextReplacingNoBreakSpace(Range::create(*frame.document(), endPosition, lastPosition).get());
</del><ins>+ contextAfter = plainTextReplacingNoBreakSpace(Range::create(*frame.document(), endPosition, lastPosition).ptr());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> send(Messages::WebPageProxy::DictationContextCallback(selectedText, contextBefore, contextAfter, callbackID));
</span><span class="lines">@@ -1905,14 +1905,14 @@
</span><span class="cx"> previousPosition = startOfWord(positionOfNextBoundaryOfGranularity(currentPosition, WordGranularity, DirectionBackward));
</span><span class="cx"> if (previousPosition.isNull())
</span><span class="cx"> break;
</span><del>- String currentWord = plainTextReplacingNoBreakSpace(Range::create(*frame.document(), previousPosition, currentPosition).get());
</del><ins>+ String currentWord = plainTextReplacingNoBreakSpace(Range::create(*frame.document(), previousPosition, currentPosition).ptr());
</ins><span class="cx"> totalContextLength += currentWord.length();
</span><span class="cx"> if (totalContextLength >= maxContextLength)
</span><span class="cx"> break;
</span><span class="cx"> currentPosition = previousPosition;
</span><span class="cx"> }
</span><span class="cx"> if (currentPosition.isNotNull() && currentPosition != startPosition) {
</span><del>- contextBefore = plainTextReplacingNoBreakSpace(Range::create(*frame.document(), currentPosition, startPosition).get());
</del><ins>+ contextBefore = plainTextReplacingNoBreakSpace(Range::create(*frame.document(), currentPosition, startPosition).ptr());
</ins><span class="cx"> if (atBoundaryOfGranularity(currentPosition, ParagraphGranularity, DirectionBackward))
</span><span class="cx"> contextBefore = ASCIILiteral("\n ") + contextBefore;
</span><span class="cx"> }
</span><span class="lines">@@ -1923,7 +1923,7 @@
</span><span class="cx"> if (!atBoundaryOfGranularity(endPosition, WordGranularity, DirectionForward) && withinTextUnitOfGranularity(endPosition, WordGranularity, DirectionForward))
</span><span class="cx"> nextPosition = positionOfNextBoundaryOfGranularity(endPosition, WordGranularity, DirectionForward);
</span><span class="cx"> if (nextPosition.isNotNull())
</span><del>- contextAfter = plainTextReplacingNoBreakSpace(Range::create(*frame.document(), endPosition, nextPosition).get());
</del><ins>+ contextAfter = plainTextReplacingNoBreakSpace(Range::create(*frame.document(), endPosition, nextPosition).ptr());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>