diff options
| author | Steve Block <steveblock@google.com> | 2009-10-08 17:19:54 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-10-20 00:41:58 +0100 |
| commit | 231d4e3152a9c27a73b6ac7badbe6be673aa3ddf (patch) | |
| tree | a6c7e2d6cd7bfa7011cc39abbb436142d7a4a7c8 /WebCore/bindings/js/ScriptObject.cpp | |
| parent | e196732677050bd463301566a68a643b6d14b907 (diff) | |
| download | external_webkit-231d4e3152a9c27a73b6ac7badbe6be673aa3ddf.zip external_webkit-231d4e3152a9c27a73b6ac7badbe6be673aa3ddf.tar.gz external_webkit-231d4e3152a9c27a73b6ac7badbe6be673aa3ddf.tar.bz2 | |
Merge webkit.org at R49305 : Automatic merge by git.
Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
Diffstat (limited to 'WebCore/bindings/js/ScriptObject.cpp')
| -rw-r--r-- | WebCore/bindings/js/ScriptObject.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/WebCore/bindings/js/ScriptObject.cpp b/WebCore/bindings/js/ScriptObject.cpp index beadc4a..aaf4163 100644 --- a/WebCore/bindings/js/ScriptObject.cpp +++ b/WebCore/bindings/js/ScriptObject.cpp @@ -106,6 +106,14 @@ bool ScriptObject::set(const char* name, int value) return handleException(m_scriptState); } +bool ScriptObject::set(const char* name, unsigned value) +{ + JSLock lock(SilenceAssertionsOnly); + PutPropertySlot slot; + jsObject()->put(m_scriptState, Identifier(m_scriptState, name), jsNumber(m_scriptState, value), slot); + return handleException(m_scriptState); +} + bool ScriptObject::set(const char* name, bool value) { JSLock lock(SilenceAssertionsOnly); @@ -127,7 +135,11 @@ bool ScriptGlobalObject::set(ScriptState* scriptState, const char* name, const S return handleException(scriptState); } +<<<<<<< HEAD:WebCore/bindings/js/ScriptObject.cpp #if ENABLE(JAVASCRIPT_DEBUGGER) +======= +#if ENABLE(INSPECTOR) +>>>>>>> webkit.org at 49305:WebCore/bindings/js/ScriptObject.cpp bool ScriptGlobalObject::set(ScriptState* scriptState, const char* name, InspectorBackend* value) { JSLock lock(SilenceAssertionsOnly); @@ -135,7 +147,11 @@ bool ScriptGlobalObject::set(ScriptState* scriptState, const char* name, Inspect globalObject->putDirect(Identifier(scriptState, name), toJS(scriptState, globalObject, value)); return handleException(scriptState); } +<<<<<<< HEAD:WebCore/bindings/js/ScriptObject.cpp #endif +======= +#endif // ENABLE(INSPECTOR) +>>>>>>> webkit.org at 49305:WebCore/bindings/js/ScriptObject.cpp bool ScriptGlobalObject::get(ScriptState* scriptState, const char* name, ScriptObject& value) { |