Modified: trunk/Source/WebCore/ChangeLog (160182 => 160183)
--- trunk/Source/WebCore/ChangeLog 2013-12-05 19:45:29 UTC (rev 160182)
+++ trunk/Source/WebCore/ChangeLog 2013-12-05 19:48:33 UTC (rev 160183)
@@ -1,3 +1,14 @@
+2013-12-05 Joseph Pecoraro <[email protected]>
+
+ Remove stale ScriptGlobalObject methods
+ https://bugs.webkit.org/show_bug.cgi?id=125276
+
+ Reviewed by Sam Weinig.
+
+ * bindings/js/ScriptObject.cpp:
+ (WebCore::ScriptGlobalObject::set):
+ * bindings/js/ScriptObject.h:
+
2013-12-04 Ryosuke Niwa <[email protected]>
Change how the form element pointer affects parsing template elements, to reduce weirdness in templates
Modified: trunk/Source/WebCore/bindings/js/ScriptObject.cpp (160182 => 160183)
--- trunk/Source/WebCore/bindings/js/ScriptObject.cpp 2013-12-05 19:45:29 UTC (rev 160182)
+++ trunk/Source/WebCore/bindings/js/ScriptObject.cpp 2013-12-05 19:48:33 UTC (rev 160183)
@@ -36,14 +36,9 @@
#include <runtime/JSLock.h>
#if ENABLE(INSPECTOR)
-#include "JSInjectedScriptHost.h"
#include "JSInspectorFrontendHost.h"
#endif
-#if ENABLE(MEDIA_CONTROLS_SCRIPT)
-#include "JSMediaControlsHost.h"
-#endif
-
using namespace JSC;
namespace WebCore {
@@ -84,26 +79,8 @@
globalObject->putDirect(scriptState->vm(), Identifier(scriptState, name), toJS(scriptState, globalObject, value));
return handleException(scriptState);
}
-
-bool ScriptGlobalObject::set(JSC::ExecState* scriptState, const char* name, InjectedScriptHost* value)
-{
- JSLockHolder lock(scriptState);
- JSDOMGlobalObject* globalObject = jsCast<JSDOMGlobalObject*>(scriptState->lexicalGlobalObject());
- globalObject->putDirect(scriptState->vm(), Identifier(scriptState, name), toJS(scriptState, globalObject, value));
- return handleException(scriptState);
-}
#endif // ENABLE(INSPECTOR)
-#if ENABLE(MEDIA_CONTROLS_SCRIPT)
-bool ScriptGlobalObject::set(JSC::ExecState* scriptState, const char* name, MediaControlsHost* value)
-{
- JSLockHolder lock(scriptState);
- JSDOMGlobalObject* globalObject = jsCast<JSDOMGlobalObject*>(scriptState->lexicalGlobalObject());
- globalObject->putDirect(scriptState->vm(), Identifier(scriptState, name), toJS(scriptState, globalObject, value));
- return handleException(scriptState);
-}
-#endif
-
bool ScriptGlobalObject::get(JSC::ExecState* scriptState, const char* name, ScriptObject& value)
{
JSLockHolder lock(scriptState);
Modified: trunk/Source/WebCore/bindings/js/ScriptObject.h (160182 => 160183)
--- trunk/Source/WebCore/bindings/js/ScriptObject.h 2013-12-05 19:45:29 UTC (rev 160182)
+++ trunk/Source/WebCore/bindings/js/ScriptObject.h 2013-12-05 19:48:33 UTC (rev 160183)
@@ -38,9 +38,8 @@
#include <runtime/JSObject.h>
namespace WebCore {
- class InjectedScriptHost;
+
class InspectorFrontendHost;
- class MediaControlsHost;
class ScriptObject : public ScriptValue {
public:
@@ -59,12 +58,7 @@
static bool set(JSC::ExecState*, const char* name, const ScriptObject&);
#if ENABLE(INSPECTOR)
static bool set(JSC::ExecState*, const char* name, InspectorFrontendHost*);
- static bool set(JSC::ExecState*, const char* name, InjectedScriptHost*);
#endif
-#if ENABLE(MEDIA_CONTROLS_SCRIPT)
- static bool set(JSC::ExecState*, const char* name, MediaControlsHost*);
-#endif
-
static bool get(JSC::ExecState*, const char* name, ScriptObject&);
static bool remove(JSC::ExecState*, const char* name);
private: