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