Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / inspector / InspectorInspectorAgent.h

diff --git a/src/third_party/WebKit/Source/core/inspector/InspectorInspectorAgent.h b/src/third_party/WebKit/Source/core/inspector/InspectorInspectorAgent.h
index b2e6517..29f089b 100644 (file)
--- a/src/third_party/WebKit/Source/core/inspector/InspectorInspectorAgent.h
+++ b/src/third_party/WebKit/Source/core/inspector/InspectorInspectorAgent.h
@@ -30,46 +30,43 @@
 #ifndef InspectorInspectorAgent_h
 #define InspectorInspectorAgent_h
 
+#include "core/InspectorFrontend.h"
 #include "core/inspector/InspectorBaseAgent.h"
 #include "wtf/HashMap.h"
 #include "wtf/PassOwnPtr.h"
 #include "wtf/Vector.h"
 
-namespace WebCore {
+namespace blink {
 
-class DOMWrapperWorld;
-class DocumentLoader;
 class LocalFrame;
 class InjectedScriptManager;
-class InspectorFrontend;
-class InstrumentingAgents;
 class JSONObject;
 class Page;
 
 typedef String ErrorString;
 
-class InspectorInspectorAgent FINAL : public InspectorBaseAgent<InspectorInspectorAgent>, public InspectorBackendDispatcher::InspectorCommandHandler {
+class InspectorInspectorAgent final : public InspectorBaseAgent<InspectorInspectorAgent>, public InspectorBackendDispatcher::InspectorCommandHandler {
     WTF_MAKE_NONCOPYABLE(InspectorInspectorAgent);
 public:
-    static PassOwnPtr<InspectorInspectorAgent> create(Page* page, InjectedScriptManager* injectedScriptManager)
+    static PassOwnPtrWillBeRawPtr<InspectorInspectorAgent> create(Page* page, InjectedScriptManager* injectedScriptManager)
     {
-        return adoptPtr(new InspectorInspectorAgent(page, injectedScriptManager));
+        return adoptPtrWillBeNoop(new InspectorInspectorAgent(page, injectedScriptManager));
     }
 
     virtual ~InspectorInspectorAgent();
+    virtual void trace(Visitor*) override;
 
     // Inspector front-end API.
-    virtual void enable(ErrorString*) OVERRIDE;
-    virtual void disable(ErrorString*) OVERRIDE;
-    virtual void reset(ErrorString*) OVERRIDE;
+    virtual void enable(ErrorString*) override;
+    virtual void disable(ErrorString*) override;
+    virtual void reset(ErrorString*) override;
 
-    virtual void init() OVERRIDE;
-    virtual void setFrontend(InspectorFrontend*) OVERRIDE;
-    virtual void clearFrontend() OVERRIDE;
+    virtual void init() override;
+    virtual void setFrontend(InspectorFrontend*) override;
+    virtual void clearFrontend() override;
 
-    void didClearWindowObjectInMainWorld(LocalFrame*);
+    void didClearDocumentOfWindowObject(LocalFrame*);
 
-    void didCommitLoad(LocalFrame*, DocumentLoader*);
     void domContentLoadedEventFired(LocalFrame*);
 
     bool hasFrontend() const { return m_frontend; }
@@ -84,9 +81,9 @@ public:
 private:
     InspectorInspectorAgent(Page*, InjectedScriptManager*);
 
-    Page* m_inspectedPage;
-    InspectorFrontend* m_frontend;
-    InjectedScriptManager* m_injectedScriptManager;
+    RawPtrWillBeMember<Page> m_inspectedPage;
+    InspectorFrontend::Inspector* m_frontend;
+    RawPtrWillBeMember<InjectedScriptManager> m_injectedScriptManager;
 
     Vector<pair<long, String> > m_pendingEvaluateTestCommands;
     pair<RefPtr<TypeBuilder::Runtime::RemoteObject>, RefPtr<JSONObject> > m_pendingInspectData;
@@ -94,6 +91,6 @@ private:
     InjectedScriptForOriginMap m_injectedScriptForOrigin;
 };
 
-} // namespace WebCore
+} // namespace blink
 
 #endif // !defined(InspectorInspectorAgent_h)