<!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>[160928] 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/160928">160928</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2013-12-20 14:34:31 -0800 (Fri, 20 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move scheduleSetNeedsStyleRecalc to HTMLFrameOwnerElement
https://bugs.webkit.org/show_bug.cgi?id=126083
Reviewed by Antti Koivisto.
scheduleSetNeedsStyleRecalc is only ever called on HTMLFrameOwnerElement, so
move it there, remove the Node implementation and make it non-virtual.
* dom/ContainerNode.cpp:
* dom/ContainerNode.h:
* dom/Node.h:
* html/HTMLFrameOwnerElement.cpp:
(WebCore::needsStyleRecalcCallback):
(WebCore::HTMLFrameOwnerElement::scheduleSetNeedsStyleRecalc):
* html/HTMLFrameOwnerElement.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomContainerNodecpp">trunk/Source/WebCore/dom/ContainerNode.cpp</a></li>
<li><a href="#trunkSourceWebCoredomContainerNodeh">trunk/Source/WebCore/dom/ContainerNode.h</a></li>
<li><a href="#trunkSourceWebCoredomNodeh">trunk/Source/WebCore/dom/Node.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFrameOwnerElementcpp">trunk/Source/WebCore/html/HTMLFrameOwnerElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFrameOwnerElementh">trunk/Source/WebCore/html/HTMLFrameOwnerElement.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160927 => 160928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-20 22:19:28 UTC (rev 160927)
+++ trunk/Source/WebCore/ChangeLog 2013-12-20 22:34:31 UTC (rev 160928)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2013-12-20 Anders Carlsson <andersca@apple.com>
+
+ Move scheduleSetNeedsStyleRecalc to HTMLFrameOwnerElement
+ https://bugs.webkit.org/show_bug.cgi?id=126083
+
+ Reviewed by Antti Koivisto.
+
+ scheduleSetNeedsStyleRecalc is only ever called on HTMLFrameOwnerElement, so
+ move it there, remove the Node implementation and make it non-virtual.
+
+ * dom/ContainerNode.cpp:
+ * dom/ContainerNode.h:
+ * dom/Node.h:
+ * html/HTMLFrameOwnerElement.cpp:
+ (WebCore::needsStyleRecalcCallback):
+ (WebCore::HTMLFrameOwnerElement::scheduleSetNeedsStyleRecalc):
+ * html/HTMLFrameOwnerElement.h:
+
</ins><span class="cx"> 2013-12-20 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove an unneeded include of WebCoreSystemInterface.h.
</span></span></pre></div>
<a id="trunkSourceWebCoredomContainerNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ContainerNode.cpp (160927 => 160928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ContainerNode.cpp 2013-12-20 22:19:28 UTC (rev 160927)
+++ trunk/Source/WebCore/dom/ContainerNode.cpp 2013-12-20 22:34:31 UTC (rev 160928)
</span><span class="lines">@@ -824,19 +824,6 @@
</span><span class="cx"> s_postAttachCallbackQueue->clear();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void needsStyleRecalcCallback(Node& node, unsigned data)
-{
- node.setNeedsStyleRecalc(static_cast<StyleChangeType>(data));
-}
-
-void ContainerNode::scheduleSetNeedsStyleRecalc(StyleChangeType changeType)
-{
- if (postAttachCallbacksAreSuspended())
- queuePostAttachCallback(needsStyleRecalcCallback, *this, static_cast<unsigned>(changeType));
- else
- setNeedsStyleRecalc(changeType);
-}
-
</del><span class="cx"> void ContainerNode::childrenChanged(const ChildChange& change)
</span><span class="cx"> {
</span><span class="cx"> document().incDOMTreeVersion();
</span></span></pre></div>
<a id="trunkSourceWebCoredomContainerNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ContainerNode.h (160927 => 160928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ContainerNode.h 2013-12-20 22:19:28 UTC (rev 160927)
+++ trunk/Source/WebCore/dom/ContainerNode.h 2013-12-20 22:34:31 UTC (rev 160928)
</span><span class="lines">@@ -108,7 +108,6 @@
</span><span class="cx"> void cloneChildNodes(ContainerNode* clone);
</span><span class="cx">
</span><span class="cx"> virtual LayoutRect boundingBox() const OVERRIDE;
</span><del>- virtual void scheduleSetNeedsStyleRecalc(StyleChangeType = FullStyleChange) OVERRIDE FINAL;
</del><span class="cx">
</span><span class="cx"> enum ChildChangeType { ElementInserted, ElementRemoved, TextInserted, TextRemoved, TextChanged, AllChildrenRemoved, NonContentsChildChanged };
</span><span class="cx"> enum ChildChangeSource { ChildChangeSourceParser, ChildChangeSourceAPI };
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.h (160927 => 160928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.h 2013-12-20 22:19:28 UTC (rev 160927)
+++ trunk/Source/WebCore/dom/Node.h 2013-12-20 22:34:31 UTC (rev 160928)
</span><span class="lines">@@ -321,7 +321,6 @@
</span><span class="cx">
</span><span class="cx"> void setNeedsStyleRecalc(StyleChangeType changeType = FullStyleChange);
</span><span class="cx"> void clearNeedsStyleRecalc() { m_nodeFlags &= ~StyleChangeMask; }
</span><del>- virtual void scheduleSetNeedsStyleRecalc(StyleChangeType changeType = FullStyleChange) { setNeedsStyleRecalc(changeType); }
</del><span class="cx">
</span><span class="cx"> void setIsLink(bool f) { setFlag(f, IsLinkFlag); }
</span><span class="cx"> void setIsLink() { setFlag(IsLinkFlag); }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFrameOwnerElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFrameOwnerElement.cpp (160927 => 160928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFrameOwnerElement.cpp 2013-12-20 22:19:28 UTC (rev 160927)
+++ trunk/Source/WebCore/html/HTMLFrameOwnerElement.cpp 2013-12-20 22:34:31 UTC (rev 160928)
</span><span class="lines">@@ -126,6 +126,19 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+static void needsStyleRecalcCallback(Node& node, unsigned data)
+{
+ node.setNeedsStyleRecalc(static_cast<StyleChangeType>(data));
+}
+
+void HTMLFrameOwnerElement::scheduleSetNeedsStyleRecalc(StyleChangeType changeType)
+{
+ if (postAttachCallbacksAreSuspended())
+ queuePostAttachCallback(needsStyleRecalcCallback, *this, static_cast<unsigned>(changeType));
+ else
+ setNeedsStyleRecalc(changeType);
+}
+
</ins><span class="cx"> bool SubframeLoadingDisabler::canLoadFrame(HTMLFrameOwnerElement& owner)
</span><span class="cx"> {
</span><span class="cx"> for (ContainerNode* node = &owner; node; node = node->parentOrShadowHostNode()) {
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFrameOwnerElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFrameOwnerElement.h (160927 => 160928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFrameOwnerElement.h 2013-12-20 22:19:28 UTC (rev 160927)
+++ trunk/Source/WebCore/html/HTMLFrameOwnerElement.h 2013-12-20 22:34:31 UTC (rev 160928)
</span><span class="lines">@@ -56,6 +56,8 @@
</span><span class="cx">
</span><span class="cx"> SandboxFlags sandboxFlags() const { return m_sandboxFlags; }
</span><span class="cx">
</span><ins>+ void scheduleSetNeedsStyleRecalc(StyleChangeType = FullStyleChange);
+
</ins><span class="cx"> protected:
</span><span class="cx"> HTMLFrameOwnerElement(const QualifiedName& tagName, Document&);
</span><span class="cx"> void setSandboxFlags(SandboxFlags);
</span></span></pre>
</div>
</div>
</body>
</html>