<!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>[160536] 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/160536">160536</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2013-12-13 01:14:30 -0800 (Fri, 13 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Eliminate awkward virtualComputedStyle construction
https://bugs.webkit.org/show_bug.cgi?id=125681
Reviewed by Andreas Kling.
* dom/Element.cpp:
(WebCore::Element::computedStyle): Tweak coding style a bit.
* dom/Element.h: Marked computedStyle virtual and got rid of virtualComputedStyle.
This fixes a bug that we would not call SVGElement::computedStyle if we called
it through an Element pointer or reference. Not sure how to get test coverage for this.
* dom/Node.cpp:
(WebCore::Node::computedStyle): Use a loop instead of recursive virtual calls.
* dom/Node.h: Made computedStyle virtual and got rid of virtualComputedStyle.
* svg/SVGElement.cpp:
(WebCore::SVGElement::computedStyle): Tweak coding style a bit.
* svg/SVGElement.h: Made computedStyle virtual (and FINAL) and got rid fo
virtualComputedStyle.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomElementcpp">trunk/Source/WebCore/dom/Element.cpp</a></li>
<li><a href="#trunkSourceWebCoredomElementh">trunk/Source/WebCore/dom/Element.h</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>
<li><a href="#trunkSourceWebCoresvgSVGElementcpp">trunk/Source/WebCore/svg/SVGElement.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGElementh">trunk/Source/WebCore/svg/SVGElement.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160535 => 160536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2013-12-13 09:10:20 UTC (rev 160535)
+++ trunk/Source/WebCore/ChangeLog        2013-12-13 09:14:30 UTC (rev 160536)
</span><span class="lines">@@ -1,5 +1,30 @@
</span><span class="cx"> 2013-12-13 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><ins>+ Eliminate awkward virtualComputedStyle construction
+ https://bugs.webkit.org/show_bug.cgi?id=125681
+
+ Reviewed by Andreas Kling.
+
+ * dom/Element.cpp:
+ (WebCore::Element::computedStyle): Tweak coding style a bit.
+
+ * dom/Element.h: Marked computedStyle virtual and got rid of virtualComputedStyle.
+ This fixes a bug that we would not call SVGElement::computedStyle if we called
+ it through an Element pointer or reference. Not sure how to get test coverage for this.
+
+ * dom/Node.cpp:
+ (WebCore::Node::computedStyle): Use a loop instead of recursive virtual calls.
+
+ * dom/Node.h: Made computedStyle virtual and got rid of virtualComputedStyle.
+
+ * svg/SVGElement.cpp:
+ (WebCore::SVGElement::computedStyle): Tweak coding style a bit.
+
+ * svg/SVGElement.h: Made computedStyle virtual (and FINAL) and got rid fo
+ virtualComputedStyle.
+
+2013-12-13 Darin Adler <darin@apple.com>
+
</ins><span class="cx"> Fix a couple stray uses of RefPtr that should release
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=125679
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (160535 => 160536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.cpp        2013-12-13 09:10:20 UTC (rev 160535)
+++ trunk/Source/WebCore/dom/Element.cpp        2013-12-13 09:14:30 UTC (rev 160536)
</span><span class="lines">@@ -2154,14 +2154,15 @@
</span><span class="cx"> if (pseudoElementSpecifier) {
</span><span class="cx"> RenderStyle* cachedPseudoStyle = usedStyle->getCachedPseudoStyle(pseudoElementSpecifier);
</span><span class="cx"> return cachedPseudoStyle ? cachedPseudoStyle : usedStyle;
</span><del>- } else
- return usedStyle;
</del><ins>+ }
+ return usedStyle;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (!attached())
</del><ins>+ if (!attached()) {
</ins><span class="cx"> // FIXME: Try to do better than this. Ensure that styleForElement() works for elements that are not in the
</span><span class="cx"> // document tree and figure out when to destroy the computed style for such elements.
</span><del>- return 0;
</del><ins>+ return nullptr;
+ }
</ins><span class="cx">
</span><span class="cx"> ElementRareData& data = ensureElementRareData();
</span><span class="cx"> if (!data.computedStyle())
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.h (160535 => 160536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.h        2013-12-13 09:10:20 UTC (rev 160535)
+++ trunk/Source/WebCore/dom/Element.h        2013-12-13 09:14:30 UTC (rev 160536)
</span><span class="lines">@@ -340,7 +340,7 @@
</span><span class="cx"> virtual short tabIndex() const;
</span><span class="cx"> virtual Element* focusDelegate();
</span><span class="cx">
</span><del>- RenderStyle* computedStyle(PseudoId = NOPSEUDO);
</del><ins>+ virtual RenderStyle* computedStyle(PseudoId = NOPSEUDO) OVERRIDE;
</ins><span class="cx">
</span><span class="cx"> // Methods for indicating the style is affected by dynamic updates (e.g., children changing, our position changing in our sibling list, etc.)
</span><span class="cx"> bool styleAffectedByEmpty() const { return hasRareData() && rareDataStyleAffectedByEmpty(); }
</span><span class="lines">@@ -636,8 +636,6 @@
</span><span class="cx">
</span><span class="cx"> void cancelFocusAppearanceUpdate();
</span><span class="cx">
</span><del>- virtual RenderStyle* virtualComputedStyle(PseudoId pseudoElementSpecifier = NOPSEUDO) OVERRIDE { return computedStyle(pseudoElementSpecifier); }
-
</del><span class="cx"> // cloneNode is private so that non-virtual cloneElementWithChildren and cloneElementWithoutChildren
</span><span class="cx"> // are used instead.
</span><span class="cx"> virtual PassRefPtr<Node> cloneNode(bool deep) OVERRIDE;
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.cpp (160535 => 160536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.cpp        2013-12-13 09:10:20 UTC (rev 160535)
+++ trunk/Source/WebCore/dom/Node.cpp        2013-12-13 09:14:30 UTC (rev 160536)
</span><span class="lines">@@ -884,9 +884,13 @@
</span><span class="cx"> return lastChild();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderStyle* Node::virtualComputedStyle(PseudoId pseudoElementSpecifier)
</del><ins>+RenderStyle* Node::computedStyle(PseudoId pseudoElementSpecifier)
</ins><span class="cx"> {
</span><del>- return parentOrShadowHostNode() ? parentOrShadowHostNode()->computedStyle(pseudoElementSpecifier) : 0;
</del><ins>+ for (Node* node = this; node; node = node->parentOrShadowHostNode()) {
+ if (node->isElementNode())
+ return toElement(node)->computedStyle(pseudoElementSpecifier);
+ }
+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int Node::maxCharacterOffset() const
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.h (160535 => 160536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.h        2013-12-13 09:10:20 UTC (rev 160535)
+++ trunk/Source/WebCore/dom/Node.h        2013-12-13 09:14:30 UTC (rev 160536)
</span><span class="lines">@@ -452,7 +452,7 @@
</span><span class="cx"> // Wrapper for nodes that don't have a renderer, but still cache the style (like HTMLOptionElement).
</span><span class="cx"> RenderStyle* renderStyle() const;
</span><span class="cx">
</span><del>- RenderStyle* computedStyle(PseudoId pseudoElementSpecifier = NOPSEUDO) { return virtualComputedStyle(pseudoElementSpecifier); }
</del><ins>+ virtual RenderStyle* computedStyle(PseudoId pseudoElementSpecifier = NOPSEUDO);
</ins><span class="cx">
</span><span class="cx"> // -----------------------------------------------------------------------------
</span><span class="cx"> // Notification of document structure changes (see ContainerNode.h for more notification methods)
</span><span class="lines">@@ -664,7 +664,6 @@
</span><span class="cx"> virtual void derefEventTarget() OVERRIDE;
</span><span class="cx">
</span><span class="cx"> virtual RenderStyle* nonRendererStyle() const { return 0; }
</span><del>- virtual RenderStyle* virtualComputedStyle(PseudoId = NOPSEUDO);
</del><span class="cx">
</span><span class="cx"> Element* ancestorElement() const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGElement.cpp (160535 => 160536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGElement.cpp        2013-12-13 09:10:20 UTC (rev 160535)
+++ trunk/Source/WebCore/svg/SVGElement.cpp        2013-12-13 09:14:30 UTC (rev 160536)
</span><span class="lines">@@ -782,7 +782,7 @@
</span><span class="cx"> if (!m_svgRareData || !m_svgRareData->useOverrideComputedStyle())
</span><span class="cx"> return Element::computedStyle(pseudoElementSpecifier);
</span><span class="cx">
</span><del>- RenderStyle* parentStyle = 0;
</del><ins>+ RenderStyle* parentStyle = nullptr;
</ins><span class="cx"> if (Element* parent = parentOrShadowHostElement()) {
</span><span class="cx"> if (auto renderer = parent->renderer())
</span><span class="cx"> parentStyle = &renderer->style();
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGElement.h (160535 => 160536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGElement.h        2013-12-13 09:10:20 UTC (rev 160535)
+++ trunk/Source/WebCore/svg/SVGElement.h        2013-12-13 09:14:30 UTC (rev 160536)
</span><span class="lines">@@ -171,8 +171,7 @@
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=77938
</span><span class="cx"> virtual bool areAuthorShadowsAllowed() const OVERRIDE { return false; }
</span><span class="cx">
</span><del>- RenderStyle* computedStyle(PseudoId = NOPSEUDO);
- virtual RenderStyle* virtualComputedStyle(PseudoId pseudoElementSpecifier = NOPSEUDO) OVERRIDE { return computedStyle(pseudoElementSpecifier); }
</del><ins>+ virtual RenderStyle* computedStyle(PseudoId = NOPSEUDO) OVERRIDE FINAL;
</ins><span class="cx"> virtual bool willRecalcStyle(Style::Change) OVERRIDE;
</span><span class="cx">
</span><span class="cx"> virtual bool isSupported(StringImpl* feature, StringImpl* version) const;
</span></span></pre>
</div>
</div>
</body>
</html>