<!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>[173608] 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/173608">173608</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2014-09-14 18:51:56 -0700 (Sun, 14 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Attempt to fix the iOS build after <http://trac.webkit.org/changeset/173606>
(https://bugs.webkit.org/show_bug.cgi?id=136789)
Substitute Node::countChildNodes() for Node::childNodeCount() in more places.
Source/WebCore:
Although I updated a comment in WebCore::lastOffsetForEditing() (defined in file
editing/htmlediting.cpp) to refer to Node::countChildNodes(), I'm unclear what the
comment is trying to explain that isn't otherwise explained by the code or the
comments that precede this function. Specifically, I don't understand the use of
the word "preempt" in the comment. We should look to improve the readability of
this comment.
* editing/htmlediting.cpp:
(WebCore::lastOffsetForEditing):
* page/ios/FrameIOS.mm:
(WebCore::Frame::interpretationsForCurrentRoot):
Source/WebKit/mac:
* WebView/WebFrame.mm:
(-[WebFrame focusedNodeHasContent]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditinghtmleditingcpp">trunk/Source/WebCore/editing/htmlediting.cpp</a></li>
<li><a href="#trunkSourceWebCorepageiosFrameIOSmm">trunk/Source/WebCore/page/ios/FrameIOS.mm</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebFramemm">trunk/Source/WebKit/mac/WebView/WebFrame.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173607 => 173608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-09-14 22:19:19 UTC (rev 173607)
+++ trunk/Source/WebCore/ChangeLog 2014-09-15 01:51:56 UTC (rev 173608)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-09-14 Daniel Bates <dabates@apple.com>
+
+ [iOS] Attempt to fix the iOS build after <http://trac.webkit.org/changeset/173606>
+ (https://bugs.webkit.org/show_bug.cgi?id=136789)
+
+ Substitute Node::countChildNodes() for Node::childNodeCount() in more places.
+
+ Although I updated a comment in WebCore::lastOffsetForEditing() (defined in file
+ editing/htmlediting.cpp) to refer to Node::countChildNodes(), I'm unclear what the
+ comment is trying to explain that isn't otherwise explained by the code or the
+ comments that precede this function. Specifically, I don't understand the use of
+ the word "preempt" in the comment. We should look to improve the readability of
+ this comment.
+
+ * editing/htmlediting.cpp:
+ (WebCore::lastOffsetForEditing):
+ * page/ios/FrameIOS.mm:
+ (WebCore::Frame::interpretationsForCurrentRoot):
+
</ins><span class="cx"> 2014-09-14 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Drop NodeTraversal::nextSkippingChildren() overload taking a ContainerNode
</span></span></pre></div>
<a id="trunkSourceWebCoreeditinghtmleditingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/htmlediting.cpp (173607 => 173608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/htmlediting.cpp 2014-09-14 22:19:19 UTC (rev 173607)
+++ trunk/Source/WebCore/editing/htmlediting.cpp 2014-09-15 01:51:56 UTC (rev 173608)
</span><span class="lines">@@ -345,7 +345,7 @@
</span><span class="cx"> if (node->hasChildNodes())
</span><span class="cx"> return node->countChildNodes();
</span><span class="cx">
</span><del>- // NOTE: This should preempt the childNodeCount for, e.g., select nodes
</del><ins>+ // NOTE: This should preempt the countChildNodes() for, e.g., select nodes (what does this mean)?
</ins><span class="cx"> if (editingIgnoresContent(node))
</span><span class="cx"> return 1;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageiosFrameIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ios/FrameIOS.mm (173607 => 173608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ios/FrameIOS.mm 2014-09-14 22:19:19 UTC (rev 173607)
+++ trunk/Source/WebCore/page/ios/FrameIOS.mm 2014-09-15 01:51:56 UTC (rev 173608)
</span><span class="lines">@@ -745,7 +745,7 @@
</span><span class="cx"> return nil;
</span><span class="cx">
</span><span class="cx"> Element* root = selection().selection().selectionType() == VisibleSelection::NoSelection ? document()->body() : selection().selection().rootEditableElement();
</span><del>- unsigned rootChildCount = root->childNodeCount();
</del><ins>+ unsigned rootChildCount = root->countChildNodes();
</ins><span class="cx"> RefPtr<Range> rangeOfRootContents = Range::create(*document(), createLegacyEditingPosition(root, 0), createLegacyEditingPosition(root, rootChildCount));
</span><span class="cx">
</span><span class="cx"> Vector<DocumentMarker*> markersInRoot = document()->markers().markersInRange(rangeOfRootContents.get(), DocumentMarker::DictationPhraseWithAlternatives);
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (173607 => 173608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-09-14 22:19:19 UTC (rev 173607)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-09-15 01:51:56 UTC (rev 173608)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-09-14 Daniel Bates <dabates@apple.com>
+
+ [iOS] Attempt to fix the iOS build after <http://trac.webkit.org/changeset/173606>
+ (https://bugs.webkit.org/show_bug.cgi?id=136789)
+
+ Substitute Node::countChildNodes() for Node::childNodeCount() in more places.
+
+ * WebView/WebFrame.mm:
+ (-[WebFrame focusedNodeHasContent]):
+
</ins><span class="cx"> 2014-09-14 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Rename Node::childNodeCount() to countChildNodes() and avoid inefficient uses
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebFramemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebFrame.mm (173607 => 173608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebFrame.mm 2014-09-14 22:19:19 UTC (rev 173607)
+++ trunk/Source/WebKit/mac/WebView/WebFrame.mm 2014-09-15 01:51:56 UTC (rev 173608)
</span><span class="lines">@@ -2346,7 +2346,7 @@
</span><span class="cx"> return NO;
</span><span class="cx">
</span><span class="cx"> VisiblePosition first(createLegacyEditingPosition(root, 0));
</span><del>- VisiblePosition last(createLegacyEditingPosition(root, root->childNodeCount()));
</del><ins>+ VisiblePosition last(createLegacyEditingPosition(root, root->countChildNodes()));
</ins><span class="cx"> return first != last;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>