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

Unified Diff: third_party/WebKit/Source/core/dom/TreeScope.h

Issue 1686483002: Oilpan: Remove most WillBe types from the code base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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
Index: third_party/WebKit/Source/core/dom/TreeScope.h
diff --git a/third_party/WebKit/Source/core/dom/TreeScope.h b/third_party/WebKit/Source/core/dom/TreeScope.h
index 88a3a756d4e0c3af496985634ed2a8155604c520..44ded0660cfd73290a3de6779b665b45990cb5ae 100644
--- a/third_party/WebKit/Source/core/dom/TreeScope.h
+++ b/third_party/WebKit/Source/core/dom/TreeScope.h
@@ -49,7 +49,7 @@ class Node;
// A class which inherits both Node and TreeScope must call clearRareData() in its destructor
// so that the Node destructor no longer does problematic NodeList cache manipulation in
// the destructor.
-class CORE_EXPORT TreeScope : public WillBeGarbageCollectedMixin {
+class CORE_EXPORT TreeScope : public GarbageCollectedMixin {
public:
TreeScope* parentTreeScope() const { return m_parentTreeScope; }
@@ -58,7 +58,7 @@ public:
Element* adjustedFocusedElement() const;
Element* getElementById(const AtomicString&) const;
- const WillBeHeapVector<RawPtrWillBeMember<Element>>& getAllElementsById(const AtomicString&) const;
+ const HeapVector<Member<Element>>& getAllElementsById(const AtomicString&) const;
bool hasElementWithId(const AtomicString& id) const;
bool containsMultipleElementsWithId(const AtomicString& id) const;
void addElementById(const AtomicString& elementId, Element*);
@@ -78,8 +78,8 @@ public:
Element* elementFromPoint(int x, int y) const;
Element* hitTestPoint(int x, int y, const HitTestRequest&) const;
- WillBeHeapVector<RawPtrWillBeMember<Element>> elementsFromPoint(int x, int y) const;
- WillBeHeapVector<RawPtrWillBeMember<Element>> elementsFromHitTestResult(HitTestResult&) const;
+ HeapVector<Member<Element>> elementsFromPoint(int x, int y) const;
+ HeapVector<Member<Element>> elementsFromHitTestResult(HitTestResult&) const;
// For accessibility.
bool shouldCacheLabelsByForAttribute() const { return m_labelsByForAttribute; }
@@ -178,23 +178,23 @@ private:
bool rootNodeHasTreeSharedParent() const;
- RawPtrWillBeMember<ContainerNode> m_rootNode;
- RawPtrWillBeMember<Document> m_document;
- RawPtrWillBeMember<TreeScope> m_parentTreeScope;
+ Member<ContainerNode> m_rootNode;
+ Member<Document> m_document;
+ Member<TreeScope> m_parentTreeScope;
#if !ENABLE(OILPAN)
int m_guardRefCount;
#endif
- OwnPtrWillBeMember<DocumentOrderedMap> m_elementsById;
- OwnPtrWillBeMember<DocumentOrderedMap> m_imageMapsByName;
- OwnPtrWillBeMember<DocumentOrderedMap> m_labelsByForAttribute;
+ Member<DocumentOrderedMap> m_elementsById;
+ Member<DocumentOrderedMap> m_imageMapsByName;
+ Member<DocumentOrderedMap> m_labelsByForAttribute;
- OwnPtrWillBeMember<IdTargetObserverRegistry> m_idTargetObserverRegistry;
+ Member<IdTargetObserverRegistry> m_idTargetObserverRegistry;
- OwnPtrWillBeMember<ScopedStyleResolver> m_scopedStyleResolver;
+ Member<ScopedStyleResolver> m_scopedStyleResolver;
- mutable RefPtrWillBeMember<DOMSelection> m_selection;
+ mutable Member<DOMSelection> m_selection;
};
inline bool TreeScope::hasElementWithId(const AtomicString& id) const

Powered by Google App Engine
This is Rietveld 408576698