<!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>[173885] 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/173885">173885</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-09-23 12:53:08 -0700 (Tue, 23 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Have DOMImplementation::document() and Element::attributes() return references
https://bugs.webkit.org/show_bug.cgi?id=137035
Reviewed by Andreas Kling.
Have DOMImplementation::document() and Element::attributes() return
references instead of pointers as they can never return null.
No new tests, no behavior change.
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateImplementation):
Update the JS Bindings code generator to use WTF::getPtr() in a couple
more places so that the implementation can return references instead
of pointers even when [GenerateIsReachable=xxx] IDL extended attribute
is used.
* dom/DOMImplementation.h:
(WebCore::DOMImplementation::document):
* dom/Element.cpp:
(WebCore::Element::attributes):
* dom/Element.h:
(WebCore::Node::attributes):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
<li><a href="#trunkSourceWebCoredomDOMImplementationh">trunk/Source/WebCore/dom/DOMImplementation.h</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173884 => 173885)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-09-23 19:30:18 UTC (rev 173884)
+++ trunk/Source/WebCore/ChangeLog 2014-09-23 19:53:08 UTC (rev 173885)
</span><span class="lines">@@ -1,5 +1,31 @@
</span><span class="cx"> 2014-09-23 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Have DOMImplementation::document() and Element::attributes() return references
+ https://bugs.webkit.org/show_bug.cgi?id=137035
+
+ Reviewed by Andreas Kling.
+
+ Have DOMImplementation::document() and Element::attributes() return
+ references instead of pointers as they can never return null.
+
+ No new tests, no behavior change.
+
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateImplementation):
+ Update the JS Bindings code generator to use WTF::getPtr() in a couple
+ more places so that the implementation can return references instead
+ of pointers even when [GenerateIsReachable=xxx] IDL extended attribute
+ is used.
+
+ * dom/DOMImplementation.h:
+ (WebCore::DOMImplementation::document):
+ * dom/Element.cpp:
+ (WebCore::Element::attributes):
+ * dom/Element.h:
+ (WebCore::Node::attributes):
+
+2014-09-23 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Have Document::ensureTemplateDocument() return a reference
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=137033
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (173884 => 173885)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2014-09-23 19:30:18 UTC (rev 173884)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2014-09-23 19:53:08 UTC (rev 173885)
</span><span class="lines">@@ -2986,19 +2986,19 @@
</span><span class="cx"> if (GetGenerateIsReachable($interface) eq "Impl") {
</span><span class="cx"> $rootString = " ${implType}* root = &js${interfaceName}->impl();\n";
</span><span class="cx"> } elsif (GetGenerateIsReachable($interface) eq "ImplWebGLRenderingContext") {
</span><del>- $rootString = " WebGLRenderingContext* root = js${interfaceName}->impl().context();\n";
</del><ins>+ $rootString = " WebGLRenderingContext* root = WTF::getPtr(js${interfaceName}->impl().context());\n";
</ins><span class="cx"> } elsif (GetGenerateIsReachable($interface) eq "ImplFrame") {
</span><del>- $rootString = " Frame* root = js${interfaceName}->impl().frame();\n";
</del><ins>+ $rootString = " Frame* root = WTF::getPtr(js${interfaceName}->impl().frame());\n";
</ins><span class="cx"> $rootString .= " if (!root)\n";
</span><span class="cx"> $rootString .= " return false;\n";
</span><span class="cx"> } elsif (GetGenerateIsReachable($interface) eq "ImplDocument") {
</span><del>- $rootString = " Document* root = js${interfaceName}->impl().document();\n";
</del><ins>+ $rootString = " Document* root = WTF::getPtr(js${interfaceName}->impl().document());\n";
</ins><span class="cx"> $rootString .= " if (!root)\n";
</span><span class="cx"> $rootString .= " return false;\n";
</span><span class="cx"> } elsif (GetGenerateIsReachable($interface) eq "ImplElementRoot") {
</span><span class="cx"> $implIncludes{"Element.h"} = 1;
</span><span class="cx"> $implIncludes{"JSNodeCustom.h"} = 1;
</span><del>- $rootString = " Element* element = js${interfaceName}->impl().element();\n";
</del><ins>+ $rootString = " Element* element = WTF::getPtr(js${interfaceName}->impl().element());\n";
</ins><span class="cx"> $rootString .= " if (!element)\n";
</span><span class="cx"> $rootString .= " return false;\n";
</span><span class="cx"> $rootString .= " void* root = WebCore::root(element);\n";
</span></span></pre></div>
<a id="trunkSourceWebCoredomDOMImplementationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DOMImplementation.h (173884 => 173885)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DOMImplementation.h 2014-09-23 19:30:18 UTC (rev 173884)
+++ trunk/Source/WebCore/dom/DOMImplementation.h 2014-09-23 19:53:08 UTC (rev 173885)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx">
</span><span class="cx"> void ref() { m_document.ref(); }
</span><span class="cx"> void deref() { m_document.deref(); }
</span><del>- Document* document() { return &m_document; }
</del><ins>+ Document& document() { return m_document; }
</ins><span class="cx">
</span><span class="cx"> // DOM methods & attributes for DOMImplementation
</span><span class="cx"> static bool hasFeature(const String& feature, const String& version);
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (173884 => 173885)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.cpp 2014-09-23 19:30:18 UTC (rev 173884)
+++ trunk/Source/WebCore/dom/Element.cpp 2014-09-23 19:53:08 UTC (rev 173885)
</span><span class="lines">@@ -352,14 +352,14 @@
</span><span class="cx"> removeAttribute(name);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-NamedNodeMap* Element::attributes() const
</del><ins>+NamedNodeMap& Element::attributes() const
</ins><span class="cx"> {
</span><span class="cx"> ElementRareData& rareData = const_cast<Element*>(this)->ensureElementRareData();
</span><span class="cx"> if (NamedNodeMap* attributeMap = rareData.attributeMap())
</span><del>- return attributeMap;
</del><ins>+ return *attributeMap;
</ins><span class="cx">
</span><span class="cx"> rareData.setAttributeMap(NamedNodeMap::create(const_cast<Element&>(*this)));
</span><del>- return rareData.attributeMap();
</del><ins>+ return *rareData.attributeMap();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Node::NodeType Element::nodeType() const
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.h (173884 => 173885)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.h 2014-09-23 19:30:18 UTC (rev 173884)
+++ trunk/Source/WebCore/dom/Element.h 2014-09-23 19:53:08 UTC (rev 173885)
</span><span class="lines">@@ -285,7 +285,7 @@
</span><span class="cx"> void setBooleanAttribute(const QualifiedName& name, bool);
</span><span class="cx">
</span><span class="cx"> // For exposing to DOM only.
</span><del>- NamedNodeMap* attributes() const;
</del><ins>+ NamedNodeMap& attributes() const;
</ins><span class="cx">
</span><span class="cx"> enum AttributeModificationReason {
</span><span class="cx"> ModifiedDirectly,
</span><span class="lines">@@ -711,7 +711,7 @@
</span><span class="cx">
</span><span class="cx"> inline NamedNodeMap* Node::attributes() const
</span><span class="cx"> {
</span><del>- return isElementNode() ? toElement(this)->attributes() : nullptr;
</del><ins>+ return isElementNode() ? &toElement(this)->attributes() : nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline Element* Node::parentElement() const
</span></span></pre>
</div>
</div>
</body>
</html>