<!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>[200741] 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/200741">200741</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-05-11 21:35:15 -0700 (Wed, 11 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Kill Node::ancestorElement()
https://bugs.webkit.org/show_bug.cgi?id=157599
Reviewed by Darin Adler.
Kill Node::ancestorElement() and use Node::parentElement() instead. If
our parent is not an Element then none of our ancestors will be.
* dom/Node.cpp:
(WebCore::Node::isDefaultNamespace):
(WebCore::Node::lookupPrefix):
(WebCore::Node::lookupNamespaceURI):
(WebCore::Node::lookupNamespacePrefix):
(WebCore::Node::convertToPage):
(WebCore::Node::convertFromPage):
(WebCore::Node::ancestorElement): Deleted.
* dom/Node.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomNodecpp">trunk/Source/WebCore/dom/Node.cpp</a></li>
<li><a href="#trunkSourceWebCoredomNodeh">trunk/Source/WebCore/dom/Node.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200740 => 200741)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-12 04:32:54 UTC (rev 200740)
+++ trunk/Source/WebCore/ChangeLog 2016-05-12 04:35:15 UTC (rev 200741)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-05-11 Chris Dumez <cdumez@apple.com>
+
+ Kill Node::ancestorElement()
+ https://bugs.webkit.org/show_bug.cgi?id=157599
+
+ Reviewed by Darin Adler.
+
+ Kill Node::ancestorElement() and use Node::parentElement() instead. If
+ our parent is not an Element then none of our ancestors will be.
+
+ * dom/Node.cpp:
+ (WebCore::Node::isDefaultNamespace):
+ (WebCore::Node::lookupPrefix):
+ (WebCore::Node::lookupNamespaceURI):
+ (WebCore::Node::lookupNamespacePrefix):
+ (WebCore::Node::convertToPage):
+ (WebCore::Node::convertFromPage):
+ (WebCore::Node::ancestorElement): Deleted.
+ * dom/Node.h:
+
</ins><span class="cx"> 2016-05-11 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Absolute positioned element is not placed properly when parent becomes the containing block.
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.cpp (200740 => 200741)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.cpp 2016-05-12 04:32:54 UTC (rev 200740)
+++ trunk/Source/WebCore/dom/Node.cpp 2016-05-12 04:35:15 UTC (rev 200741)
</span><span class="lines">@@ -1320,8 +1320,8 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (Element* ancestor = ancestorElement())
- return ancestor->isDefaultNamespace(namespaceURI);
</del><ins>+ if (auto* parent = parentElement())
+ return parent->isDefaultNamespace(namespaceURI);
</ins><span class="cx">
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="lines">@@ -1339,8 +1339,8 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> default:
</span><del>- if (Element* ancestor = ancestorElement())
- return ancestor->isDefaultNamespace(namespaceURI);
</del><ins>+ if (auto* parent = parentElement())
+ return parent->isDefaultNamespace(namespaceURI);
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1370,8 +1370,8 @@
</span><span class="cx"> return String();
</span><span class="cx"> }
</span><span class="cx"> default:
</span><del>- if (Element* ancestor = ancestorElement())
- return ancestor->lookupPrefix(namespaceURI);
</del><ins>+ if (auto* parent = parentElement())
+ return parent->lookupPrefix(namespaceURI);
</ins><span class="cx"> return String();
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1408,8 +1408,8 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- if (Element* ancestor = ancestorElement())
- return ancestor->lookupNamespaceURI(prefix);
</del><ins>+ if (auto* parent = parentElement())
+ return parent->lookupNamespaceURI(prefix);
</ins><span class="cx"> return String();
</span><span class="cx"> }
</span><span class="cx"> case DOCUMENT_NODE:
</span><span class="lines">@@ -1428,8 +1428,8 @@
</span><span class="cx"> return String();
</span><span class="cx"> }
</span><span class="cx"> default:
</span><del>- if (Element* ancestor = ancestorElement())
- return ancestor->lookupNamespaceURI(prefix);
</del><ins>+ if (auto* parent = parentElement())
+ return parent->lookupNamespaceURI(prefix);
</ins><span class="cx"> return String();
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1452,8 +1452,8 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (Element* ancestor = ancestorElement())
- return ancestor->lookupNamespacePrefix(_namespaceURI, originalElement);
</del><ins>+ if (auto* parent = parentElement())
+ return parent->lookupNamespacePrefix(_namespaceURI, originalElement);
</ins><span class="cx"> return String();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1530,15 +1530,6 @@
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Element* Node::ancestorElement() const
-{
- for (ContainerNode* ancestor = parentNode(); ancestor; ancestor = ancestor->parentNode()) {
- if (is<Element>(*ancestor))
- return downcast<Element>(ancestor);
- }
- return nullptr;
-}
-
</del><span class="cx"> bool Node::offsetInCharacters() const
</span><span class="cx"> {
</span><span class="cx"> return false;
</span><span class="lines">@@ -1675,8 +1666,7 @@
</span><span class="cx"> return renderer()->localToAbsolute(p, UseTransforms);
</span><span class="cx">
</span><span class="cx"> // Otherwise go up the tree looking for a renderer
</span><del>- Element *parent = ancestorElement();
- if (parent)
</del><ins>+ if (auto* parent = parentElement())
</ins><span class="cx"> return parent->convertToPage(p);
</span><span class="cx">
</span><span class="cx"> // No parent - no conversion needed
</span><span class="lines">@@ -1690,8 +1680,7 @@
</span><span class="cx"> return renderer()->absoluteToLocal(p, UseTransforms);
</span><span class="cx">
</span><span class="cx"> // Otherwise go up the tree looking for a renderer
</span><del>- Element *parent = ancestorElement();
- if (parent)
</del><ins>+ if (auto* parent = parentElement())
</ins><span class="cx"> return parent->convertFromPage(p);
</span><span class="cx">
</span><span class="cx"> // No parent - no conversion needed
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.h (200740 => 200741)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.h 2016-05-12 04:32:54 UTC (rev 200740)
+++ trunk/Source/WebCore/dom/Node.h 2016-05-12 04:35:15 UTC (rev 200741)
</span><span class="lines">@@ -675,8 +675,6 @@
</span><span class="cx"> void refEventTarget() override;
</span><span class="cx"> void derefEventTarget() override;
</span><span class="cx">
</span><del>- Element* ancestorElement() const;
-
</del><span class="cx"> void trackForDebugging();
</span><span class="cx"> void materializeRareData();
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>