<!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>[160926] 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/160926">160926</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2013-12-20 14:15:13 -0800 (Fri, 20 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Node post attach callbacks should use references
https://bugs.webkit.org/show_bug.cgi?id=126081
Reviewed by Antti Koivisto.
* dom/ContainerNode.cpp:
(WebCore::ContainerNode::queuePostAttachCallback):
(WebCore::ContainerNode::dispatchPostAttachCallbacks):
(WebCore::needsStyleRecalcCallback):
(WebCore::ContainerNode::scheduleSetNeedsStyleRecalc):
* dom/ContainerNode.h:
* html/HTMLFormControlElement.cpp:
(WebCore::focusPostAttach):
(WebCore::HTMLFormControlElement::didAttachRenderers):
(WebCore::updateFromElementCallback):
(WebCore::HTMLFormControlElement::didRecalcStyle):
* html/HTMLPlugInImageElement.cpp:
(WebCore::HTMLPlugInImageElement::didAttachRenderers):
(WebCore::HTMLPlugInImageElement::updateWidgetCallback):
(WebCore::HTMLPlugInImageElement::startLoadingImageCallback):
* html/HTMLPlugInImageElement.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="#trunkSourceWebCorehtmlHTMLFormControlElementcpp">trunk/Source/WebCore/html/HTMLFormControlElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLPlugInImageElementcpp">trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLPlugInImageElementh">trunk/Source/WebCore/html/HTMLPlugInImageElement.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160925 => 160926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-20 22:04:31 UTC (rev 160925)
+++ trunk/Source/WebCore/ChangeLog 2013-12-20 22:15:13 UTC (rev 160926)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2013-12-20 Anders Carlsson <andersca@apple.com>
+
+ Node post attach callbacks should use references
+ https://bugs.webkit.org/show_bug.cgi?id=126081
+
+ Reviewed by Antti Koivisto.
+
+ * dom/ContainerNode.cpp:
+ (WebCore::ContainerNode::queuePostAttachCallback):
+ (WebCore::ContainerNode::dispatchPostAttachCallbacks):
+ (WebCore::needsStyleRecalcCallback):
+ (WebCore::ContainerNode::scheduleSetNeedsStyleRecalc):
+ * dom/ContainerNode.h:
+ * html/HTMLFormControlElement.cpp:
+ (WebCore::focusPostAttach):
+ (WebCore::HTMLFormControlElement::didAttachRenderers):
+ (WebCore::updateFromElementCallback):
+ (WebCore::HTMLFormControlElement::didRecalcStyle):
+ * html/HTMLPlugInImageElement.cpp:
+ (WebCore::HTMLPlugInImageElement::didAttachRenderers):
+ (WebCore::HTMLPlugInImageElement::updateWidgetCallback):
+ (WebCore::HTMLPlugInImageElement::startLoadingImageCallback):
+ * html/HTMLPlugInImageElement.h:
+
</ins><span class="cx"> 2013-12-20 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Extract CommandLineAPI into its own InjectedScriptModule
</span></span></pre></div>
<a id="trunkSourceWebCoredomContainerNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ContainerNode.cpp (160925 => 160926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ContainerNode.cpp 2013-12-20 22:04:31 UTC (rev 160925)
+++ trunk/Source/WebCore/dom/ContainerNode.cpp 2013-12-20 22:15:13 UTC (rev 160926)
</span><span class="lines">@@ -797,12 +797,12 @@
</span><span class="cx"> --s_attachDepth;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ContainerNode::queuePostAttachCallback(NodeCallback callback, Node* node, unsigned callbackData)
</del><ins>+void ContainerNode::queuePostAttachCallback(NodeCallback callback, Node& node, unsigned callbackData)
</ins><span class="cx"> {
</span><span class="cx"> if (!s_postAttachCallbackQueue)
</span><span class="cx"> s_postAttachCallbackQueue = new NodeCallbackQueue;
</span><span class="cx">
</span><del>- s_postAttachCallbackQueue->append(CallbackInfo(callback, CallbackParameters(node, callbackData)));
</del><ins>+ s_postAttachCallbackQueue->append(CallbackInfo(callback, CallbackParameters(&node, callbackData)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool ContainerNode::postAttachCallbacksAreSuspended()
</span><span class="lines">@@ -819,20 +819,20 @@
</span><span class="cx"> NodeCallback callback = info.first;
</span><span class="cx"> CallbackParameters params = info.second;
</span><span class="cx">
</span><del>- callback(params.first.get(), params.second);
</del><ins>+ callback(*params.first, params.second);
</ins><span class="cx"> }
</span><span class="cx"> s_postAttachCallbackQueue->clear();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void needsStyleRecalcCallback(Node* node, unsigned data)
</del><ins>+static void needsStyleRecalcCallback(Node& node, unsigned data)
</ins><span class="cx"> {
</span><del>- node->setNeedsStyleRecalc(static_cast<StyleChangeType>(data));
</del><ins>+ node.setNeedsStyleRecalc(static_cast<StyleChangeType>(data));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ContainerNode::scheduleSetNeedsStyleRecalc(StyleChangeType changeType)
</span><span class="cx"> {
</span><span class="cx"> if (postAttachCallbacksAreSuspended())
</span><del>- queuePostAttachCallback(needsStyleRecalcCallback, this, static_cast<unsigned>(changeType));
</del><ins>+ queuePostAttachCallback(needsStyleRecalcCallback, *this, static_cast<unsigned>(changeType));
</ins><span class="cx"> else
</span><span class="cx"> setNeedsStyleRecalc(changeType);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomContainerNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ContainerNode.h (160925 => 160926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ContainerNode.h 2013-12-20 22:04:31 UTC (rev 160925)
+++ trunk/Source/WebCore/dom/ContainerNode.h 2013-12-20 22:15:13 UTC (rev 160926)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> class FloatPoint;
</span><span class="cx"> class RenderElement;
</span><span class="cx">
</span><del>-typedef void (*NodeCallback)(Node*, unsigned);
</del><ins>+typedef void (*NodeCallback)(Node&, unsigned);
</ins><span class="cx">
</span><span class="cx"> namespace Private {
</span><span class="cx"> template<class GenericNode, class GenericNodeContainer>
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx"> protected:
</span><span class="cx"> explicit ContainerNode(Document*, ConstructionType = CreateContainer);
</span><span class="cx">
</span><del>- static void queuePostAttachCallback(NodeCallback, Node*, unsigned = 0);
</del><ins>+ static void queuePostAttachCallback(NodeCallback, Node&, unsigned = 0);
</ins><span class="cx"> static bool postAttachCallbacksAreSuspended();
</span><span class="cx">
</span><span class="cx"> template<class GenericNode, class GenericNodeContainer>
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFormControlElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFormControlElement.cpp (160925 => 160926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFormControlElement.cpp 2013-12-20 22:04:31 UTC (rev 160925)
+++ trunk/Source/WebCore/html/HTMLFormControlElement.cpp 2013-12-20 22:15:13 UTC (rev 160926)
</span><span class="lines">@@ -202,10 +202,10 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void focusPostAttach(Node* element, unsigned)
</del><ins>+static void focusPostAttach(Node& element, unsigned)
</ins><span class="cx"> {
</span><del>- toElement(element)->focus();
- element->deref();
</del><ins>+ toElement(element).focus();
+ element.deref();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLFormControlElement::didAttachRenderers()
</span><span class="lines">@@ -219,7 +219,7 @@
</span><span class="cx"> if (shouldAutofocus(this)) {
</span><span class="cx"> setAutofocused();
</span><span class="cx"> ref();
</span><del>- queuePostAttachCallback(focusPostAttach, this);
</del><ins>+ queuePostAttachCallback(focusPostAttach, *this);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -287,9 +287,9 @@
</span><span class="cx"> return m_isRequired;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void updateFromElementCallback(Node* node, unsigned)
</del><ins>+static void updateFromElementCallback(Node& node, unsigned)
</ins><span class="cx"> {
</span><del>- if (auto renderer = toHTMLFormControlElement(node)->renderer())
</del><ins>+ if (auto renderer = toHTMLFormControlElement(node).renderer())
</ins><span class="cx"> renderer->updateFromElement();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -298,7 +298,7 @@
</span><span class="cx"> // updateFromElement() can cause the selection to change, and in turn
</span><span class="cx"> // trigger synchronous layout, so it must not be called during style recalc.
</span><span class="cx"> if (renderer())
</span><del>- queuePostAttachCallback(updateFromElementCallback, this);
</del><ins>+ queuePostAttachCallback(updateFromElementCallback, *this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool HTMLFormControlElement::supportsFocus() const
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLPlugInImageElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp (160925 => 160926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp 2013-12-20 22:04:31 UTC (rev 160925)
+++ trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp 2013-12-20 22:15:13 UTC (rev 160926)
</span><span class="lines">@@ -247,14 +247,14 @@
</span><span class="cx"> void HTMLPlugInImageElement::didAttachRenderers()
</span><span class="cx"> {
</span><span class="cx"> if (!isImageType()) {
</span><del>- queuePostAttachCallback(&HTMLPlugInImageElement::updateWidgetCallback, this);
</del><ins>+ queuePostAttachCallback(&HTMLPlugInImageElement::updateWidgetCallback, *this);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> if (!renderer() || useFallbackContent())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // Image load might complete synchronously and cause us to re-enter attach.
</span><del>- queuePostAttachCallback(&HTMLPlugInImageElement::startLoadingImageCallback, this);
</del><ins>+ queuePostAttachCallback(&HTMLPlugInImageElement::startLoadingImageCallback, *this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLPlugInImageElement::willDetachRenderers()
</span><span class="lines">@@ -334,9 +334,9 @@
</span><span class="cx"> return m_customStyleForPageCache;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLPlugInImageElement::updateWidgetCallback(Node* node, unsigned)
</del><ins>+void HTMLPlugInImageElement::updateWidgetCallback(Node& node, unsigned)
</ins><span class="cx"> {
</span><del>- toHTMLPlugInImageElement(node)->updateWidgetIfNecessary();
</del><ins>+ toHTMLPlugInImageElement(node).updateWidgetIfNecessary();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLPlugInImageElement::startLoadingImage()
</span><span class="lines">@@ -346,9 +346,9 @@
</span><span class="cx"> m_imageLoader->updateFromElement();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLPlugInImageElement::startLoadingImageCallback(Node* node, unsigned)
</del><ins>+void HTMLPlugInImageElement::startLoadingImageCallback(Node& node, unsigned)
</ins><span class="cx"> {
</span><del>- toHTMLPlugInImageElement(node)->startLoadingImage();
</del><ins>+ toHTMLPlugInImageElement(node).startLoadingImage();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLPlugInImageElement::updateSnapshot(PassRefPtr<Image> image)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLPlugInImageElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLPlugInImageElement.h (160925 => 160926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLPlugInImageElement.h 2013-12-20 22:04:31 UTC (rev 160925)
+++ trunk/Source/WebCore/html/HTMLPlugInImageElement.h 2013-12-20 22:15:13 UTC (rev 160926)
</span><span class="lines">@@ -113,8 +113,8 @@
</span><span class="cx"> String m_url;
</span><span class="cx"> URL m_loadedUrl;
</span><span class="cx">
</span><del>- static void updateWidgetCallback(Node*, unsigned);
- static void startLoadingImageCallback(Node*, unsigned);
</del><ins>+ static void updateWidgetCallback(Node&, unsigned);
+ static void startLoadingImageCallback(Node&, unsigned);
</ins><span class="cx">
</span><span class="cx"> virtual void didAttachRenderers() OVERRIDE;
</span><span class="cx"> virtual void willDetachRenderers() OVERRIDE;
</span></span></pre>
</div>
</div>
</body>
</html>