<!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>[190195] trunk/Source/WebCore</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/190195">190195</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-09-23 21:23:03 -0700 (Wed, 23 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simplify / Optimize Range::selectNode()
https://bugs.webkit.org/show_bug.cgi?id=149515
Reviewed by Ryosuke Niwa.
Simplify / Optimize Range::selectNode():
1. Do a null-check on refNode->parentNode() instead of checking the
nodeType(), which is virtual. Attr, DocumentFragment and Document
Nodes do not have a parent and thus are covered by this check.
Also, setStartBefore() / setEndAfter() were already doing a null
check on the parent.
2. Call lower-level setStart() / setEnd() directly, instead of using
setStartBefore() / setEndAfter() as intermediary. As a result:
2.a. We avoid doing a redundant null checks on refNode and its parent
(inside those intermediate functions)
2.b. We only call refNode->computeNodeIndex() once instead of twice
(in each of those intermediate functions). computeNodeIndex()
is not a trivial getter as its needs to traverse all the
previous siblings.
The implementation now matches exactly the text of the DOM specification
as well:
https://dom.spec.whatwg.org/#concept-range-select
No new layout tests, no web-exposed behavior intended.
* dom/Range.cpp:
(WebCore::Range::selectNode):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomRangecpp">trunk/Source/WebCore/dom/Range.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (190194 => 190195)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-09-24 01:52:08 UTC (rev 190194)
+++ trunk/Source/WebCore/ChangeLog 2015-09-24 04:23:03 UTC (rev 190195)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2015-09-23 Chris Dumez <cdumez@apple.com>
+
+ Simplify / Optimize Range::selectNode()
+ https://bugs.webkit.org/show_bug.cgi?id=149515
+
+ Reviewed by Ryosuke Niwa.
+
+ Simplify / Optimize Range::selectNode():
+ 1. Do a null-check on refNode->parentNode() instead of checking the
+ nodeType(), which is virtual. Attr, DocumentFragment and Document
+ Nodes do not have a parent and thus are covered by this check.
+ Also, setStartBefore() / setEndAfter() were already doing a null
+ check on the parent.
+ 2. Call lower-level setStart() / setEnd() directly, instead of using
+ setStartBefore() / setEndAfter() as intermediary. As a result:
+ 2.a. We avoid doing a redundant null checks on refNode and its parent
+ (inside those intermediate functions)
+ 2.b. We only call refNode->computeNodeIndex() once instead of twice
+ (in each of those intermediate functions). computeNodeIndex()
+ is not a trivial getter as its needs to traverse all the
+ previous siblings.
+
+ The implementation now matches exactly the text of the DOM specification
+ as well:
+ https://dom.spec.whatwg.org/#concept-range-select
+
+ No new layout tests, no web-exposed behavior intended.
+
+ * dom/Range.cpp:
+ (WebCore::Range::selectNode):
+
</ins><span class="cx"> 2015-09-23 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> [Cocoa] [Font Features] Implement font-variant-*
</span></span></pre></div>
<a id="trunkSourceWebCoredomRangecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Range.cpp (190194 => 190195)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Range.cpp 2015-09-24 01:52:08 UTC (rev 190194)
+++ trunk/Source/WebCore/dom/Range.cpp 2015-09-24 04:23:03 UTC (rev 190195)
</span><span class="lines">@@ -1075,31 +1075,20 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // INVALID_NODE_TYPE_ERR: Raised if refNode is a Document, DocumentFragment or Attr node.
- switch (refNode->nodeType()) {
- case Node::CDATA_SECTION_NODE:
- case Node::COMMENT_NODE:
- case Node::DOCUMENT_TYPE_NODE:
- case Node::ELEMENT_NODE:
- case Node::PROCESSING_INSTRUCTION_NODE:
- case Node::TEXT_NODE:
- case Node::XPATH_NAMESPACE_NODE:
- break;
- case Node::ATTRIBUTE_NODE:
- case Node::DOCUMENT_FRAGMENT_NODE:
- case Node::DOCUMENT_NODE:
- ec = INVALID_NODE_TYPE_ERR;
- return;
</del><ins>+ if (!refNode->parentNode()) {
+ ec = INVALID_NODE_TYPE_ERR;
+ return;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (&ownerDocument() != &refNode->document())
</span><span class="cx"> setDocument(refNode->document());
</span><span class="cx">
</span><ins>+ unsigned index = refNode->computeNodeIndex();
</ins><span class="cx"> ec = 0;
</span><del>- setStartBefore(refNode, ec);
</del><ins>+ setStart(refNode->parentNode(), index, ec);
</ins><span class="cx"> if (ec)
</span><span class="cx"> return;
</span><del>- setEndAfter(refNode, ec);
</del><ins>+ setEnd(refNode->parentNode(), index + 1, ec);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Range::selectNodeContents(Node* refNode, ExceptionCode& ec)
</span></span></pre>
</div>
</div>
</body>
</html>