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

Side by Side Diff: Source/core/dom/TreeScopeAdopter.h

Issue 49613005: Have TreeScrope::adoptIfNeeded() take a reference instead of a pointer (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 1 month 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 unified diff | Download patch
« no previous file with comments | « Source/core/dom/TreeScope.cpp ('k') | Source/core/dom/TreeScopeAdopter.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. 5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
6 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 6 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
8 * Copyright (C) 2011 Google Inc. All rights reserved. 8 * Copyright (C) 2011 Google Inc. All rights reserved.
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 15 matching lines...) Expand all
26 #define TreeScopeAdopter_h 26 #define TreeScopeAdopter_h
27 27
28 #include "core/dom/Node.h" 28 #include "core/dom/Node.h"
29 29
30 namespace WebCore { 30 namespace WebCore {
31 31
32 class TreeScope; 32 class TreeScope;
33 33
34 class TreeScopeAdopter { 34 class TreeScopeAdopter {
35 public: 35 public:
36 explicit TreeScopeAdopter(Node* toAdopt, TreeScope* newScope); 36 TreeScopeAdopter(Node& toAdopt, TreeScope& newScope);
37 37
38 void execute() const { moveTreeToNewScope(m_toAdopt); } 38 void execute() const { moveTreeToNewScope(m_toAdopt); }
39 bool needsScopeChange() const { return m_oldScope != m_newScope; } 39 bool needsScopeChange() const { return m_oldScope != m_newScope; }
40 40
41 #ifdef NDEBUG 41 #ifdef NDEBUG
42 static void ensureDidMoveToNewDocumentWasCalled(Document&) { } 42 static void ensureDidMoveToNewDocumentWasCalled(Document&) { }
43 #else 43 #else
44 static void ensureDidMoveToNewDocumentWasCalled(Document&); 44 static void ensureDidMoveToNewDocumentWasCalled(Document&);
45 #endif 45 #endif
46 46
47 private: 47 private:
48 void updateTreeScope(Node*) const; 48 void updateTreeScope(Node&) const;
49 void moveTreeToNewScope(Node*) const; 49 void moveTreeToNewScope(Node&) const;
50 void moveTreeToNewDocument(Node*, Document* oldDocument, Document* newDocume nt) const; 50 void moveTreeToNewDocument(Node&, Document& oldDocument, Document* newDocume nt) const;
51 void moveNodeToNewDocument(Node*, Document* oldDocument, Document* newDocume nt) const; 51 void moveNodeToNewDocument(Node&, Document& oldDocument, Document* newDocume nt) const;
52 52
53 Node* m_toAdopt; 53 Node& m_toAdopt;
54 TreeScope* m_newScope; 54 TreeScope& m_newScope;
55 TreeScope* m_oldScope; 55 TreeScope& m_oldScope;
56 }; 56 };
57 57
58 // FIXME: Should take |TreeScope&| instead of |TreeScope*|. 58 inline TreeScopeAdopter::TreeScopeAdopter(Node& toAdopt, TreeScope& newScope)
59 inline TreeScopeAdopter::TreeScopeAdopter(Node* toAdopt, TreeScope* newScope)
60 : m_toAdopt(toAdopt) 59 : m_toAdopt(toAdopt)
61 , m_newScope(newScope) 60 , m_newScope(newScope)
62 , m_oldScope(&toAdopt->treeScope()) 61 , m_oldScope(toAdopt.treeScope())
63 { 62 {
64 ASSERT(newScope);
65 } 63 }
66 64
67 } 65 }
68 66
69 #endif 67 #endif
OLDNEW
« no previous file with comments | « Source/core/dom/TreeScope.cpp ('k') | Source/core/dom/TreeScopeAdopter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698