Upstream version 9.38.198.0

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

diff --git a/src/third_party/WebKit/Source/core/inspector/InspectorProfilerAgent.h b/src/third_party/WebKit/Source/core/inspector/InspectorProfilerAgent.h
index 9e59cbd..adba7bd 100644 (file)
--- a/src/third_party/WebKit/Source/core/inspector/InspectorProfilerAgent.h
+++ b/src/third_party/WebKit/Source/core/inspector/InspectorProfilerAgent.h
@@ -30,7 +30,7 @@
 #ifndef InspectorProfilerAgent_h
 #define InspectorProfilerAgent_h
 
-#include "InspectorFrontend.h"
+#include "core/InspectorFrontend.h"
 #include "core/inspector/InspectorBaseAgent.h"
 #include "wtf/Forward.h"
 #include "wtf/HashMap.h"
@@ -38,8 +38,9 @@
 #include "wtf/PassOwnPtr.h"
 #include "wtf/text/WTFString.h"
 
-namespace WebCore {
+namespace blink {
 
+class ExecutionContext;
 class InjectedScriptManager;
 class InspectorFrontend;
 class InspectorOverlay;
@@ -52,12 +53,14 @@ class ScriptProfile;
 typedef String ErrorString;
 
 class InspectorProfilerAgent FINAL : public InspectorBaseAgent<InspectorProfilerAgent>, public InspectorBackendDispatcher::ProfilerCommandHandler {
-    WTF_MAKE_NONCOPYABLE(InspectorProfilerAgent); WTF_MAKE_FAST_ALLOCATED;
+    WTF_MAKE_NONCOPYABLE(InspectorProfilerAgent);
+    WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
 public:
-    static PassOwnPtr<InspectorProfilerAgent> create(InjectedScriptManager*, InspectorOverlay*);
+    static PassOwnPtrWillBeRawPtr<InspectorProfilerAgent> create(InjectedScriptManager*, InspectorOverlay*);
     virtual ~InspectorProfilerAgent();
+    virtual void trace(Visitor*) OVERRIDE;
 
-    void consoleProfile(const String& title, ScriptState*);
+    void consoleProfile(ExecutionContext*, const String& title);
     void consoleProfileEnd(const String& title);
 
     virtual void enable(ErrorString*) OVERRIDE;
@@ -82,7 +85,7 @@ private:
     void stop(ErrorString*, RefPtr<TypeBuilder::Profiler::CPUProfile>*);
     String nextProfileId();
 
-    InjectedScriptManager* m_injectedScriptManager;
+    RawPtrWillBeMember<InjectedScriptManager> m_injectedScriptManager;
     InspectorFrontend::Profiler* m_frontend;
     bool m_recordingCPUProfile;
     class ProfileDescriptor;
@@ -98,7 +101,7 @@ private:
     void idleFinished();
 };
 
-} // namespace WebCore
+} // namespace blink
 
 
 #endif // !defined(InspectorProfilerAgent_h)