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

Side by Side Diff: Source/core/dom/TreeScope.cpp

Issue 267303004: Oilpan: cleanup based on review comments after removal of TreeShared. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix typo and merge Created 6 years, 7 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/dom/TreeScope.h ('k') | Source/core/dom/shadow/ElementShadow.h » ('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) 2011 Google Inc. All Rights Reserved. 2 * Copyright (C) 2011 Google Inc. All Rights Reserved.
3 * Copyright (C) 2012 Apple Inc. All rights reserved. 3 * Copyright (C) 2012 Apple Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 return true; 115 return true;
116 } 116 }
117 return false; 117 return false;
118 } 118 }
119 119
120 bool TreeScope::rootNodeHasTreeSharedParent() const 120 bool TreeScope::rootNodeHasTreeSharedParent() const
121 { 121 {
122 return rootNode().hasTreeSharedParent(); 122 return rootNode().hasTreeSharedParent();
123 } 123 }
124 124
125 #if !ENABLE(OILPAN)
125 void TreeScope::destroyTreeScopeData() 126 void TreeScope::destroyTreeScopeData()
126 { 127 {
127 m_elementsById.clear(); 128 m_elementsById.clear();
128 m_imageMapsByName.clear(); 129 m_imageMapsByName.clear();
129 m_labelsByForAttribute.clear(); 130 m_labelsByForAttribute.clear();
130 } 131 }
132 #endif
131 133
132 void TreeScope::setParentTreeScope(TreeScope& newParentScope) 134 void TreeScope::setParentTreeScope(TreeScope& newParentScope)
133 { 135 {
134 // A document node cannot be re-parented. 136 // A document node cannot be re-parented.
135 ASSERT(!rootNode().isDocumentNode()); 137 ASSERT(!rootNode().isDocumentNode());
136 138
137 #if !ENABLE(OILPAN) 139 #if !ENABLE(OILPAN)
138 newParentScope.guardRef(); 140 newParentScope.guardRef();
139 if (m_parentTreeScope) 141 if (m_parentTreeScope)
140 m_parentTreeScope->guardDeref(); 142 m_parentTreeScope->guardDeref();
(...skipping 396 matching lines...) Expand 10 before | Expand all | Expand 10 after
537 539
538 void TreeScope::trace(Visitor* visitor) 540 void TreeScope::trace(Visitor* visitor)
539 { 541 {
540 visitor->trace(m_rootNode); 542 visitor->trace(m_rootNode);
541 visitor->trace(m_document); 543 visitor->trace(m_document);
542 visitor->trace(m_parentTreeScope); 544 visitor->trace(m_parentTreeScope);
543 visitor->trace(m_selection); 545 visitor->trace(m_selection);
544 } 546 }
545 547
546 } // namespace WebCore 548 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/dom/TreeScope.h ('k') | Source/core/dom/shadow/ElementShadow.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698