diff options
Diffstat (limited to 'Source/JavaScriptCore/inspector/InjectedScriptHost.h')
| -rw-r--r-- | Source/JavaScriptCore/inspector/InjectedScriptHost.h | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/Source/JavaScriptCore/inspector/InjectedScriptHost.h b/Source/JavaScriptCore/inspector/InjectedScriptHost.h index db93f8631..27de1425a 100644 --- a/Source/JavaScriptCore/inspector/InjectedScriptHost.h +++ b/Source/JavaScriptCore/inspector/InjectedScriptHost.h @@ -26,11 +26,8 @@ #ifndef InjectedScriptHost_h #define InjectedScriptHost_h -#if ENABLE(INSPECTOR) - #include "JSCJSValueInlines.h" -#include "Strong.h" -#include "StrongInlines.h" +#include "inspector/PerGlobalObjectWrapperWorld.h" #include <wtf/HashMap.h> #include <wtf/RefCounted.h> @@ -38,22 +35,19 @@ namespace Inspector { class JS_EXPORT_PRIVATE InjectedScriptHost : public RefCounted<InjectedScriptHost> { public: - static PassRefPtr<InjectedScriptHost> create() { return adoptRef(new InjectedScriptHost); } + static Ref<InjectedScriptHost> create() { return adoptRef(*new InjectedScriptHost); } virtual ~InjectedScriptHost(); - virtual JSC::JSValue type(JSC::ExecState*, JSC::JSValue) { return JSC::jsUndefined(); } + virtual JSC::JSValue subtype(JSC::ExecState*, JSC::JSValue) { return JSC::jsUndefined(); } virtual bool isHTMLAllCollection(JSC::JSValue) { return false; } - JSC::JSValue jsWrapper(JSC::ExecState*, JSC::JSGlobalObject*); - void clearWrapper(JSC::ExecState*, JSC::JSGlobalObject*); + JSC::JSValue wrapper(JSC::ExecState*, JSC::JSGlobalObject*); void clearAllWrappers(); private: - HashMap<std::pair<JSC::ExecState*, JSC::JSGlobalObject*>, JSC::Strong<JSC::JSObject>> m_wrappers; + PerGlobalObjectWrapperWorld m_wrappers; }; } // namespace Inspector -#endif // ENABLE(INSPECTOR) - #endif // !defined(InjectedScriptHost_h) |