Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(521)

Unified Diff: Source/core/dom/Node.cpp

Issue 23549008: Have Node::diff() take a Document reference in argument (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/dom/Node.h ('k') | Source/core/rendering/RenderBlock.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/Node.cpp
diff --git a/Source/core/dom/Node.cpp b/Source/core/dom/Node.cpp
index 7cf67788ec5d74f369bb0315871cb385fa3f5967..020c40f7cc9f7c45a39eb9a341de1f8f0b2b898b 100644
--- a/Source/core/dom/Node.cpp
+++ b/Source/core/dom/Node.cpp
@@ -264,7 +264,7 @@ void Node::dumpStatistics()
DEFINE_DEBUG_ONLY_GLOBAL(WTF::RefCountedLeakCounter, nodeCounter, ("WebCoreNode"));
-Node::StyleChange Node::diff(const RenderStyle* s1, const RenderStyle* s2, Document* doc)
+Node::StyleChange Node::diff(const RenderStyle* s1, const RenderStyle* s2, const Document& doc)
{
StyleChange ch = NoInherit;
EDisplay display1 = s1 ? s1->display() : NONE;
@@ -281,7 +281,7 @@ Node::StyleChange Node::diff(const RenderStyle* s1, const RenderStyle* s2, Docum
bool specifiesColumns2 = s2 && (!s2->hasAutoColumnCount() || !s2->hasAutoColumnWidth());
if (display1 != display2 || fl1 != fl2 || colSpan1 != colSpan2
- || (specifiesColumns1 != specifiesColumns2 && doc->settings()->regionBasedColumnsEnabled())
+ || (specifiesColumns1 != specifiesColumns2 && doc.settings()->regionBasedColumnsEnabled())
|| (s1 && s2 && !s1->contentDataEquivalent(s2)))
ch = Reattach;
else if (!s1 || !s2)
« no previous file with comments | « Source/core/dom/Node.h ('k') | Source/core/rendering/RenderBlock.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698