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

Unified Diff: third_party/WebKit/Source/core/inspector/InspectorDOMAgent.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/inspector/InspectorDOMAgent.h
diff --git a/third_party/WebKit/Source/core/inspector/InspectorDOMAgent.h b/third_party/WebKit/Source/core/inspector/InspectorDOMAgent.h
index a63a2b1a8d8bd5aae79549d95ab4129ccf433717..7bcebe66b9c278f31d3406ce3aff33b71d436923 100644
--- a/third_party/WebKit/Source/core/inspector/InspectorDOMAgent.h
+++ b/third_party/WebKit/Source/core/inspector/InspectorDOMAgent.h
@@ -77,7 +77,7 @@ typedef String ErrorString;
class CORE_EXPORT InspectorDOMAgent final : public InspectorBaseAgent<InspectorDOMAgent, InspectorFrontend::DOM>, public InspectorBackendDispatcher::DOMCommandHandler {
WTF_MAKE_NONCOPYABLE(InspectorDOMAgent);
public:
- struct CORE_EXPORT DOMListener : public WillBeGarbageCollectedMixin {
+ struct CORE_EXPORT DOMListener : public GarbageCollectedMixin {
virtual ~DOMListener()
{
}
@@ -98,9 +98,9 @@ public:
virtual void setInspectedNode(Node*) { }
};
- static PassOwnPtrWillBeRawPtr<InspectorDOMAgent> create(InspectedFrames* inspectedFrames, InjectedScriptManager* injectedScriptManager, Client* client)
+ static RawPtr<InspectorDOMAgent> create(InspectedFrames* inspectedFrames, InjectedScriptManager* injectedScriptManager, Client* client)
{
- return adoptPtrWillBeNoop(new InspectorDOMAgent(inspectedFrames, injectedScriptManager, client));
+ return (new InspectorDOMAgent(inspectedFrames, injectedScriptManager, client));
}
static String toErrorString(ExceptionState&);
@@ -113,7 +113,7 @@ public:
void disable(ErrorString*) override;
void restore() override;
- WillBeHeapVector<RawPtrWillBeMember<Document> > documents();
+ HeapVector<Member<Document> > documents();
void reset();
// Methods called from the frontend for DOM nodes inspection.
@@ -169,7 +169,7 @@ public:
void willModifyDOMAttr(Element*, const AtomicString& oldValue, const AtomicString& newValue);
void didModifyDOMAttr(Element*, const QualifiedName&, const AtomicString& value);
void didRemoveDOMAttr(Element*, const QualifiedName&);
- void styleAttributeInvalidated(const WillBeHeapVector<RawPtrWillBeMember<Element> >& elements);
+ void styleAttributeInvalidated(const HeapVector<Member<Element> >& elements);
void characterDataModified(CharacterData*);
void didInvalidateStyleAttr(Node*);
void didPushShadowRoot(Element* host, ShadowRoot*);
@@ -214,7 +214,7 @@ private:
PassOwnPtr<InspectorHighlightConfig> highlightConfigFromInspectorObject(ErrorString*, JSONObject* highlightInspectorObject);
// Node-related methods.
- typedef WillBeHeapHashMap<RefPtrWillBeMember<Node>, int> NodeToIdMap;
+ typedef HeapHashMap<Member<Node>, int> NodeToIdMap;
int bind(Node*, NodeToIdMap*);
void unbind(Node*, NodeToIdMap*);
@@ -243,27 +243,27 @@ private:
bool pushDocumentUponHandlelessOperation(ErrorString*);
- RawPtrWillBeMember<InspectorRevalidateDOMTask> revalidateTask();
+ Member<InspectorRevalidateDOMTask> revalidateTask();
- RawPtrWillBeMember<InspectedFrames> m_inspectedFrames;
+ Member<InspectedFrames> m_inspectedFrames;
InjectedScriptManager* m_injectedScriptManager;
Client* m_client;
- RawPtrWillBeMember<DOMListener> m_domListener;
- OwnPtrWillBeMember<NodeToIdMap> m_documentNodeToIdMap;
+ Member<DOMListener> m_domListener;
+ Member<NodeToIdMap> m_documentNodeToIdMap;
// Owns node mappings for dangling nodes.
- WillBeHeapVector<OwnPtrWillBeMember<NodeToIdMap> > m_danglingNodeToIdMaps;
- WillBeHeapHashMap<int, RawPtrWillBeMember<Node> > m_idToNode;
- WillBeHeapHashMap<int, RawPtrWillBeMember<NodeToIdMap> > m_idToNodesMap;
+ HeapVector<Member<NodeToIdMap> > m_danglingNodeToIdMaps;
+ HeapHashMap<int, Member<Node> > m_idToNode;
+ HeapHashMap<int, Member<NodeToIdMap> > m_idToNodesMap;
HashSet<int> m_childrenRequested;
HashSet<int> m_distributedNodesRequested;
HashMap<int, int> m_cachedChildCount;
int m_lastNodeId;
- RefPtrWillBeMember<Document> m_document;
- typedef WillBeHeapHashMap<String, WillBeHeapVector<RefPtrWillBeMember<Node> > > SearchResults;
+ Member<Document> m_document;
+ typedef HeapHashMap<String, HeapVector<Member<Node> > > SearchResults;
SearchResults m_searchResults;
- OwnPtrWillBeMember<InspectorRevalidateDOMTask> m_revalidateTask;
- OwnPtrWillBeMember<InspectorHistory> m_history;
- OwnPtrWillBeMember<DOMEditor> m_domEditor;
+ Member<InspectorRevalidateDOMTask> m_revalidateTask;
+ Member<InspectorHistory> m_history;
+ Member<DOMEditor> m_domEditor;
bool m_suppressAttributeModifiedEvent;
int m_backendNodeIdToInspect;
};

Powered by Google App Engine
This is Rietveld 408576698