X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fthird_party%2FWebKit%2FSource%2Fcore%2Finspector%2FInjectedScriptHost.h;h=452268d126607cc722c44e5812eaa2cad9ce17cd;hb=4a1a0bdd01eef90b0826a0e761d3379d3715c10f;hp=bde9ece0f1a3bd2db446b701db9946a4f880d782;hpb=b1be5ca53587d23e7aeb77b26861fdc0a181ffd8;p=platform%2Fframework%2Fweb%2Fcrosswalk.git 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 --- 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, public ScriptWrappable { +class InjectedScriptHost : public RefCountedWillBeGarbageCollectedFinalized, public ScriptWrappable { public: - static PassRefPtr create(); + static PassRefPtrWillBeRawPtr create(); ~InjectedScriptHost(); + void trace(Visitor*); void init(InstrumentingAgents* instrumentingAgents, ScriptDebugServer* scriptDebugServer) { @@ -96,12 +97,12 @@ public: private: InjectedScriptHost(); - InstrumentingAgents* m_instrumentingAgents; + RawPtrWillBeMember m_instrumentingAgents; ScriptDebugServer* m_scriptDebugServer; Vector > m_inspectedObjects; OwnPtr m_defaultInspectableObject; }; -} // namespace WebCore +} // namespace blink #endif // !defined(InjectedScriptHost_h)