webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 5 insertions, 15 deletions

diff --git a/Source/WebCore/bindings/js/ScriptGlobalObject.h b/Source/WebCore/bindings/js/ScriptGlobalObject.h
index 8aa055bd6..f879a025d 100644
--- a/Source/WebCore/bindings/js/ScriptGlobalObject.h
+++ b/Source/WebCore/bindings/js/ScriptGlobalObject.h
@@ -28,15 +28,11 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef ScriptGlobalObject_h
-#define ScriptGlobalObject_h
-
-namespace Deprecated {
-class ScriptObject;
-}
+#pragma once
 
 namespace JSC {
 class ExecState;
+class JSObject;
 }
 
 namespace WebCore {
@@ -45,17 +41,11 @@ class InspectorFrontendHost;
 
 class ScriptGlobalObject {
 public:
-    static bool set(JSC::ExecState*, const char* name, const Deprecated::ScriptObject&);
-#if ENABLE(INSPECTOR)
-    static bool set(JSC::ExecState*, const char* name, InspectorFrontendHost*);
-#endif
+    WEBCORE_EXPORT static bool set(JSC::ExecState&, const char* name, InspectorFrontendHost&);
+    static bool get(JSC::ExecState&, const char* name, JSC::JSObject*&);
 
-    static bool get(JSC::ExecState*, const char* name, Deprecated::ScriptObject&);
-    static bool remove(JSC::ExecState*, const char* name);
 private:
-    ScriptGlobalObject() { }
+    ScriptGlobalObject() = delete;
 };
 
 } // namespace WebCore
-
-#endif // ScriptGlobalObject_h