Upstream version 9.38.198.0

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

diff --git a/src/third_party/WebKit/Source/core/inspector/InjectedScriptHost.h b/src/third_party/WebKit/Source/core/inspector/InjectedScriptHost.h
index bde9ece..452268d 100644 (file)
--- a/src/third_party/WebKit/Source/core/inspector/InjectedScriptHost.h
+++ b/src/third_party/WebKit/Source/core/inspector/InjectedScriptHost.h
@@ -30,14 +30,14 @@
 #ifndef InjectedScriptHost_h
 #define InjectedScriptHost_h
 
-#include "bindings/v8/ScriptState.h"
-#include "bindings/v8/ScriptWrappable.h"
+#include "bindings/core/v8/ScriptState.h"
+#include "bindings/core/v8/ScriptWrappable.h"
 #include "wtf/PassOwnPtr.h"
 #include "wtf/RefCounted.h"
 #include "wtf/Vector.h"
 #include "wtf/text/WTFString.h"
 
-namespace WebCore {
+namespace blink {
 
 class Database;
 class EventTarget;
@@ -56,10 +56,11 @@ struct EventListenerInfo;
 // InjectedScriptHost must never implemment methods that have more power over the page than the
 // page already has itself (e.g. origin restriction bypasses).
 
-class InjectedScriptHost : public RefCounted<InjectedScriptHost>, public ScriptWrappable {
+class InjectedScriptHost : public RefCountedWillBeGarbageCollectedFinalized<InjectedScriptHost>, public ScriptWrappable {
 public:
-    static PassRefPtr<InjectedScriptHost> create();
+    static PassRefPtrWillBeRawPtr<InjectedScriptHost> create();
     ~InjectedScriptHost();
+    void trace(Visitor*);
 
     void init(InstrumentingAgents* instrumentingAgents, ScriptDebugServer* scriptDebugServer)
     {
@@ -96,12 +97,12 @@ public:
 private:
     InjectedScriptHost();
 
-    InstrumentingAgents* m_instrumentingAgents;
+    RawPtrWillBeMember<InstrumentingAgents> m_instrumentingAgents;
     ScriptDebugServer* m_scriptDebugServer;
     Vector<OwnPtr<InspectableObject> > m_inspectedObjects;
     OwnPtr<InspectableObject> m_defaultInspectableObject;
 };
 
-} // namespace WebCore
+} // namespace blink
 
 #endif // !defined(InjectedScriptHost_h)