<!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>[164248] 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/164248">164248</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2014-02-17 14:12:30 -0800 (Mon, 17 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Node constructor should take Document reference
https://bugs.webkit.org/show_bug.cgi?id=128931
Reviewed by Geoff Garen.
* dom/Attr.cpp:
(WebCore::Attr::Attr):
* dom/CharacterData.h:
(WebCore::CharacterData::CharacterData):
* dom/ContainerNode.cpp:
(WebCore::ContainerNode::~ContainerNode):
* dom/ContainerNode.h:
(WebCore::ContainerNode::ContainerNode):
* dom/Document.cpp:
(WebCore::Document::Document):
* dom/Document.h:
(WebCore::Node::Node):
* dom/DocumentFragment.cpp:
(WebCore::DocumentFragment::DocumentFragment):
(WebCore::DocumentFragment::create):
* dom/DocumentFragment.h:
* dom/DocumentType.cpp:
(WebCore::DocumentType::DocumentType):
* dom/Element.h:
(WebCore::Element::Element):
* dom/Entity.h:
(WebCore::Entity::Entity):
* dom/EntityReference.cpp:
(WebCore::EntityReference::EntityReference):
* dom/Node.cpp:
(WebCore::Node::~Node):
(WebCore::Node::willBeDeletedFrom):
* dom/Node.h:
* dom/Notation.cpp:
* dom/Notation.h:
(WebCore::Notation::publicId):
(WebCore::Notation::systemId):
(WebCore::Notation::Notation):
Remove cruft from this non-instantiated class.
* dom/ShadowRoot.cpp:
(WebCore::ShadowRoot::ShadowRoot):
(WebCore::ShadowRoot::~ShadowRoot):
* dom/TemplateContentDocumentFragment.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomAttrcpp">trunk/Source/WebCore/dom/Attr.cpp</a></li>
<li><a href="#trunkSourceWebCoredomCharacterDatah">trunk/Source/WebCore/dom/CharacterData.h</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="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumenth">trunk/Source/WebCore/dom/Document.h</a></li>
<li><a href="#trunkSourceWebCoredomDocumentFragmentcpp">trunk/Source/WebCore/dom/DocumentFragment.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumentFragmenth">trunk/Source/WebCore/dom/DocumentFragment.h</a></li>
<li><a href="#trunkSourceWebCoredomDocumentTypecpp">trunk/Source/WebCore/dom/DocumentType.cpp</a></li>
<li><a href="#trunkSourceWebCoredomElementh">trunk/Source/WebCore/dom/Element.h</a></li>
<li><a href="#trunkSourceWebCoredomEntityh">trunk/Source/WebCore/dom/Entity.h</a></li>
<li><a href="#trunkSourceWebCoredomEntityReferencecpp">trunk/Source/WebCore/dom/EntityReference.cpp</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="#trunkSourceWebCoredomNotationcpp">trunk/Source/WebCore/dom/Notation.cpp</a></li>
<li><a href="#trunkSourceWebCoredomNotationh">trunk/Source/WebCore/dom/Notation.h</a></li>
<li><a href="#trunkSourceWebCoredomShadowRootcpp">trunk/Source/WebCore/dom/ShadowRoot.cpp</a></li>
<li><a href="#trunkSourceWebCoredomTemplateContentDocumentFragmenth">trunk/Source/WebCore/dom/TemplateContentDocumentFragment.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164247 => 164248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-17 21:40:09 UTC (rev 164247)
+++ trunk/Source/WebCore/ChangeLog 2014-02-17 22:12:30 UTC (rev 164248)
</span><span class="lines">@@ -1,3 +1,51 @@
</span><ins>+2014-02-17 Antti Koivisto <antti@apple.com>
+
+ Node constructor should take Document reference
+ https://bugs.webkit.org/show_bug.cgi?id=128931
+
+ Reviewed by Geoff Garen.
+
+ * dom/Attr.cpp:
+ (WebCore::Attr::Attr):
+ * dom/CharacterData.h:
+ (WebCore::CharacterData::CharacterData):
+ * dom/ContainerNode.cpp:
+ (WebCore::ContainerNode::~ContainerNode):
+ * dom/ContainerNode.h:
+ (WebCore::ContainerNode::ContainerNode):
+ * dom/Document.cpp:
+ (WebCore::Document::Document):
+ * dom/Document.h:
+ (WebCore::Node::Node):
+ * dom/DocumentFragment.cpp:
+ (WebCore::DocumentFragment::DocumentFragment):
+ (WebCore::DocumentFragment::create):
+ * dom/DocumentFragment.h:
+ * dom/DocumentType.cpp:
+ (WebCore::DocumentType::DocumentType):
+ * dom/Element.h:
+ (WebCore::Element::Element):
+ * dom/Entity.h:
+ (WebCore::Entity::Entity):
+ * dom/EntityReference.cpp:
+ (WebCore::EntityReference::EntityReference):
+ * dom/Node.cpp:
+ (WebCore::Node::~Node):
+ (WebCore::Node::willBeDeletedFrom):
+ * dom/Node.h:
+ * dom/Notation.cpp:
+ * dom/Notation.h:
+ (WebCore::Notation::publicId):
+ (WebCore::Notation::systemId):
+ (WebCore::Notation::Notation):
+
+ Remove cruft from this non-instantiated class.
+
+ * dom/ShadowRoot.cpp:
+ (WebCore::ShadowRoot::ShadowRoot):
+ (WebCore::ShadowRoot::~ShadowRoot):
+ * dom/TemplateContentDocumentFragment.h:
+
</ins><span class="cx"> 2014-02-17 Sergio Correia <sergio.correia@openbossa.org>
</span><span class="cx">
</span><span class="cx"> Replace uses of PassOwnPtr/OwnPtr with std::unique_ptr in WebCore/inspector
</span></span></pre></div>
<a id="trunkSourceWebCoredomAttrcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Attr.cpp (164247 => 164248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Attr.cpp 2014-02-17 21:40:09 UTC (rev 164247)
+++ trunk/Source/WebCore/dom/Attr.cpp 2014-02-17 22:12:30 UTC (rev 164248)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> using namespace HTMLNames;
</span><span class="cx">
</span><span class="cx"> Attr::Attr(Element* element, const QualifiedName& name)
</span><del>- : ContainerNode(&element->document())
</del><ins>+ : ContainerNode(element->document())
</ins><span class="cx"> , m_element(element)
</span><span class="cx"> , m_name(name)
</span><span class="cx"> , m_ignoreChildrenChanged(0)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Attr::Attr(Document& document, const QualifiedName& name, const AtomicString& standaloneValue)
</span><del>- : ContainerNode(&document)
</del><ins>+ : ContainerNode(document)
</ins><span class="cx"> , m_element(0)
</span><span class="cx"> , m_name(name)
</span><span class="cx"> , m_standaloneValue(standaloneValue)
</span></span></pre></div>
<a id="trunkSourceWebCoredomCharacterDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/CharacterData.h (164247 => 164248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/CharacterData.h 2014-02-17 21:40:09 UTC (rev 164247)
+++ trunk/Source/WebCore/dom/CharacterData.h 2014-02-17 22:12:30 UTC (rev 164248)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> CharacterData(Document& document, const String& text, ConstructionType type)
</span><del>- : Node(&document, type)
</del><ins>+ : Node(document, type)
</ins><span class="cx"> , m_data(!text.isNull() ? text : emptyString())
</span><span class="cx"> {
</span><span class="cx"> ASSERT(type == CreateOther || type == CreateText || type == CreateEditingText);
</span></span></pre></div>
<a id="trunkSourceWebCoredomContainerNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ContainerNode.cpp (164247 => 164248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ContainerNode.cpp 2014-02-17 21:40:09 UTC (rev 164247)
+++ trunk/Source/WebCore/dom/ContainerNode.cpp 2014-02-17 22:12:30 UTC (rev 164248)
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx">
</span><span class="cx"> ContainerNode::~ContainerNode()
</span><span class="cx"> {
</span><del>- willBeDeletedFrom(&document());
</del><ins>+ willBeDeletedFrom(document());
</ins><span class="cx"> removeDetachedChildren();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomContainerNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ContainerNode.h (164247 => 164248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ContainerNode.h 2014-02-17 21:40:09 UTC (rev 164247)
+++ trunk/Source/WebCore/dom/ContainerNode.h 2014-02-17 22:12:30 UTC (rev 164248)
</span><span class="lines">@@ -138,7 +138,7 @@
</span><span class="cx"> PassRefPtr<RadioNodeList> radioNodeList(const AtomicString&);
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- explicit ContainerNode(Document*, ConstructionType = CreateContainer);
</del><ins>+ explicit ContainerNode(Document&, ConstructionType = CreateContainer);
</ins><span class="cx">
</span><span class="cx"> static void queuePostAttachCallback(NodeCallback, Node&, unsigned = 0);
</span><span class="cx"> static bool postAttachCallbacksAreSuspended();
</span><span class="lines">@@ -182,7 +182,7 @@
</span><span class="cx">
</span><span class="cx"> NODE_TYPE_CASTS(ContainerNode)
</span><span class="cx">
</span><del>-inline ContainerNode::ContainerNode(Document* document, ConstructionType type)
</del><ins>+inline ContainerNode::ContainerNode(Document& document, ConstructionType type)
</ins><span class="cx"> : Node(document, type)
</span><span class="cx"> , m_firstChild(0)
</span><span class="cx"> , m_lastChild(0)
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (164247 => 164248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2014-02-17 21:40:09 UTC (rev 164247)
+++ trunk/Source/WebCore/dom/Document.cpp 2014-02-17 22:12:30 UTC (rev 164248)
</span><span class="lines">@@ -393,7 +393,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> Document::Document(Frame* frame, const URL& url, unsigned documentClasses, unsigned constructionFlags)
</span><del>- : ContainerNode(this, CreateDocument)
</del><ins>+ : ContainerNode(*this, CreateDocument)
</ins><span class="cx"> , TreeScope(*this)
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS) && PLATFORM(IOS)
</span><span class="cx"> , m_handlingTouchEvent(false)
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (164247 => 164248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h 2014-02-17 21:40:09 UTC (rev 164247)
+++ trunk/Source/WebCore/dom/Document.h 2014-02-17 22:12:30 UTC (rev 164248)
</span><span class="lines">@@ -1708,14 +1708,14 @@
</span><span class="cx"> return this == &document();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline Node::Node(Document* document, ConstructionType type)
</del><ins>+inline Node::Node(Document& document, ConstructionType type)
</ins><span class="cx"> : m_nodeFlags(type)
</span><span class="cx"> , m_parentNode(0)
</span><del>- , m_treeScope(document)
</del><ins>+ , m_treeScope(&document)
</ins><span class="cx"> , m_previous(0)
</span><span class="cx"> , m_next(0)
</span><span class="cx"> {
</span><del>- document->incrementReferencingNodeCount();
</del><ins>+ document.incrementReferencingNodeCount();
</ins><span class="cx">
</span><span class="cx"> #if !defined(NDEBUG) || (defined(DUMP_NODE_STATISTICS) && DUMP_NODE_STATISTICS)
</span><span class="cx"> trackForDebugging();
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentFragmentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DocumentFragment.cpp (164247 => 164248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DocumentFragment.cpp 2014-02-17 21:40:09 UTC (rev 164247)
+++ trunk/Source/WebCore/dom/DocumentFragment.cpp 2014-02-17 22:12:30 UTC (rev 164248)
</span><span class="lines">@@ -31,19 +31,19 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-DocumentFragment::DocumentFragment(Document* document, ConstructionType constructionType)
</del><ins>+DocumentFragment::DocumentFragment(Document& document, ConstructionType constructionType)
</ins><span class="cx"> : ContainerNode(document, constructionType)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<DocumentFragment> DocumentFragment::create(Document& document)
</span><span class="cx"> {
</span><del>- return adoptRef(new DocumentFragment(&document, Node::CreateDocumentFragment));
</del><ins>+ return adoptRef(new DocumentFragment(document, Node::CreateDocumentFragment));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<DocumentFragment> DocumentFragment::create(ScriptExecutionContext& context)
</span><span class="cx"> {
</span><del>- return adoptRef(new DocumentFragment(&toDocument(context), Node::CreateDocumentFragment));
</del><ins>+ return adoptRef(new DocumentFragment(toDocument(context), Node::CreateDocumentFragment));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String DocumentFragment::nodeName() const
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentFragmenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DocumentFragment.h (164247 => 164248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DocumentFragment.h 2014-02-17 21:40:09 UTC (rev 164247)
+++ trunk/Source/WebCore/dom/DocumentFragment.h 2014-02-17 22:12:30 UTC (rev 164248)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> virtual bool isTemplateContent() const { return false; }
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- DocumentFragment(Document*, ConstructionType = CreateContainer);
</del><ins>+ DocumentFragment(Document&, ConstructionType = CreateContainer);
</ins><span class="cx"> virtual String nodeName() const override;
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentTypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DocumentType.cpp (164247 => 164248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DocumentType.cpp 2014-02-17 21:40:09 UTC (rev 164247)
+++ trunk/Source/WebCore/dom/DocumentType.cpp 2014-02-17 22:12:30 UTC (rev 164248)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> DocumentType::DocumentType(Document& document, const String& name, const String& publicId, const String& systemId)
</span><del>- : Node(&document, CreateOther)
</del><ins>+ : Node(document, CreateOther)
</ins><span class="cx"> , m_name(name)
</span><span class="cx"> , m_publicId(publicId)
</span><span class="cx"> , m_systemId(systemId)
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.h (164247 => 164248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.h 2014-02-17 21:40:09 UTC (rev 164247)
+++ trunk/Source/WebCore/dom/Element.h 2014-02-17 22:12:30 UTC (rev 164248)
</span><span class="lines">@@ -569,7 +569,7 @@
</span><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> Element(const QualifiedName& tagName, Document& document, ConstructionType type)
</span><del>- : ContainerNode(&document, type)
</del><ins>+ : ContainerNode(document, type)
</ins><span class="cx"> , m_tagName(tagName)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomEntityh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Entity.h (164247 => 164248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Entity.h 2014-02-17 21:40:09 UTC (rev 164247)
+++ trunk/Source/WebCore/dom/Entity.h 2014-02-17 22:12:30 UTC (rev 164248)
</span><span class="lines">@@ -35,7 +35,9 @@
</span><span class="cx"> String notationName() const { ASSERT_NOT_REACHED(); return String(); }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- Entity() : ContainerNode(0) {}
</del><ins>+ Entity(Document& document)
+ : ContainerNode(document)
+ { }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } //namespace
</span></span></pre></div>
<a id="trunkSourceWebCoredomEntityReferencecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/EntityReference.cpp (164247 => 164248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/EntityReference.cpp 2014-02-17 21:40:09 UTC (rev 164247)
+++ trunk/Source/WebCore/dom/EntityReference.cpp 2014-02-17 22:12:30 UTC (rev 164248)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> inline EntityReference::EntityReference(Document& document, const String& entityName)
</span><del>- : ContainerNode(&document)
</del><ins>+ : ContainerNode(document)
</ins><span class="cx"> , m_entityName(entityName)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.cpp (164247 => 164248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.cpp 2014-02-17 21:40:09 UTC (rev 164247)
+++ trunk/Source/WebCore/dom/Node.cpp 2014-02-17 22:12:30 UTC (rev 164248)
</span><span class="lines">@@ -306,27 +306,24 @@
</span><span class="cx"> clearRareData();
</span><span class="cx">
</span><span class="cx"> if (!isContainerNode())
</span><del>- willBeDeletedFrom(&document());
</del><ins>+ willBeDeletedFrom(document());
</ins><span class="cx">
</span><span class="cx"> document().decrementReferencingNodeCount();
</span><span class="cx">
</span><span class="cx"> InspectorCounters::decrementCounter(InspectorCounters::NodeCounter);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Node::willBeDeletedFrom(Document* document)
</del><ins>+void Node::willBeDeletedFrom(Document& document)
</ins><span class="cx"> {
</span><span class="cx"> if (hasEventTargetData()) {
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS) && PLATFORM(IOS)
</span><del>- if (document)
- document->removeTouchEventListener(this, true);
</del><ins>+ document.removeTouchEventListener(this, true);
</ins><span class="cx"> #endif
</span><span class="cx"> clearEventTargetData();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (document) {
- if (AXObjectCache* cache = document->existingAXObjectCache())
- cache->remove(this);
- }
</del><ins>+ if (AXObjectCache* cache = document.existingAXObjectCache())
+ cache->remove(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> NodeRareData* Node::rareData() const
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.h (164247 => 164248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.h 2014-02-17 21:40:09 UTC (rev 164247)
+++ trunk/Source/WebCore/dom/Node.h 2014-02-17 22:12:30 UTC (rev 164248)
</span><span class="lines">@@ -153,7 +153,7 @@
</span><span class="cx"> static void dumpStatistics();
</span><span class="cx">
</span><span class="cx"> virtual ~Node();
</span><del>- void willBeDeletedFrom(Document*);
</del><ins>+ void willBeDeletedFrom(Document&);
</ins><span class="cx">
</span><span class="cx"> // DOM methods & attributes for Node
</span><span class="cx">
</span><span class="lines">@@ -624,7 +624,7 @@
</span><span class="cx"> CreateEditingText = CreateText | IsEditingTextFlag,
</span><span class="cx"> CreateMathMLElement = CreateStyledElement | IsMathMLFlag,
</span><span class="cx"> };
</span><del>- Node(Document*, ConstructionType);
</del><ins>+ Node(Document&, ConstructionType);
</ins><span class="cx">
</span><span class="cx"> virtual void didMoveToNewDocument(Document* oldDocument);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomNotationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Notation.cpp (164247 => 164248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Notation.cpp 2014-02-17 21:40:09 UTC (rev 164247)
+++ trunk/Source/WebCore/dom/Notation.cpp 2014-02-17 22:12:30 UTC (rev 164248)
</span><span class="lines">@@ -1,57 +1 @@
</span><del>-/*
- * Copyright (C) 2000 Peter Kelly (pmk@post.com)
- * Copyright (C) 2006, 2009 Apple Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "config.h"
-#include "Notation.h"
-
-#include "Document.h"
-
-namespace WebCore {
-
-Notation::Notation(Document& document, const String& name, const String& publicId, const String& systemId)
- : ContainerNode(&document)
- , m_name(name)
- , m_publicId(publicId)
- , m_systemId(systemId)
-{
-}
-
-String Notation::nodeName() const
-{
- return m_name;
-}
-
-Node::NodeType Notation::nodeType() const
-{
- return NOTATION_NODE;
-}
-
-PassRefPtr<Node> Notation::cloneNode(bool /*deep*/)
-{
- // Spec says cloning Notation nodes is "implementation dependent". We do not support it.
- return 0;
-}
-
-bool Notation::childTypeAllowed(NodeType) const
-{
- return false;
-}
-
-} // namespace
</del><ins>+// FIXME: remove me
</ins></span></pre></div>
<a id="trunkSourceWebCoredomNotationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Notation.h (164247 => 164248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Notation.h 2014-02-17 21:40:09 UTC (rev 164247)
+++ trunk/Source/WebCore/dom/Notation.h 2014-02-17 22:12:30 UTC (rev 164248)
</span><span class="lines">@@ -28,22 +28,15 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: This class is never instantiated. Maybe it should be removed.
</span><span class="cx">
</span><del>-class Notation final : public ContainerNode {
</del><ins>+class Notation : public ContainerNode {
</ins><span class="cx"> public:
</span><del>- const String& publicId() const { return m_publicId; }
- const String& systemId() const { return m_systemId; }
</del><ins>+ String publicId() const { ASSERT_NOT_REACHED(); return String(); }
+ String systemId() const { ASSERT_NOT_REACHED(); return String(); }
</ins><span class="cx">
</span><span class="cx"> private:
</span><del>- Notation(Document&, const String& name, const String& publicId, const String& systemId);
-
- virtual String nodeName() const override;
- virtual NodeType nodeType() const override;
- virtual PassRefPtr<Node> cloneNode(bool deep) override;
- virtual bool childTypeAllowed(NodeType) const override;
-
- String m_name;
- String m_publicId;
- String m_systemId;
</del><ins>+ Notation(Document& document)
+ : ContainerNode(document)
+ { }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } //namespace
</span></span></pre></div>
<a id="trunkSourceWebCoredomShadowRootcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ShadowRoot.cpp (164247 => 164248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ShadowRoot.cpp 2014-02-17 21:40:09 UTC (rev 164247)
+++ trunk/Source/WebCore/dom/ShadowRoot.cpp 2014-02-17 22:12:30 UTC (rev 164248)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> ShadowRoot::ShadowRoot(Document& document, ShadowRootType type)
</span><del>- : DocumentFragment(&document, CreateShadowRoot)
</del><ins>+ : DocumentFragment(document, CreateShadowRoot)
</ins><span class="cx"> , TreeScope(*this, document)
</span><span class="cx"> , m_resetStyleInheritance(false)
</span><span class="cx"> , m_type(type)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> // for this ShadowRoot instance because TreeScope destructor
</span><span class="cx"> // clears Node::m_treeScope thus ContainerNode is no longer able
</span><span class="cx"> // to access it Document reference after that.
</span><del>- willBeDeletedFrom(&document());
</del><ins>+ willBeDeletedFrom(document());
</ins><span class="cx">
</span><span class="cx"> // We must remove all of our children first before the TreeScope destructor
</span><span class="cx"> // runs so we don't go through TreeScopeAdopter for each child with a
</span></span></pre></div>
<a id="trunkSourceWebCoredomTemplateContentDocumentFragmenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/TemplateContentDocumentFragment.h (164247 => 164248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/TemplateContentDocumentFragment.h 2014-02-17 21:40:09 UTC (rev 164247)
+++ trunk/Source/WebCore/dom/TemplateContentDocumentFragment.h 2014-02-17 22:12:30 UTC (rev 164248)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> TemplateContentDocumentFragment(Document& document, const Element* host)
</span><del>- : DocumentFragment(&document, CreateDocumentFragment)
</del><ins>+ : DocumentFragment(document, CreateDocumentFragment)
</ins><span class="cx"> , m_host(host)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>