diff options
author | Ben Murdoch <benm@google.com> | 2010-08-13 05:20:16 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-13 05:20:16 -0700 |
commit | f4958a7d95cd5fbc1c74905e229b02c95cd5ee78 (patch) | |
tree | 14a0f1b07a19948c2ed93d0d8547caa7fe10aa0e /WebCore/bindings/v8/ScriptObject.cpp | |
parent | d074a7997da8ce379434eb6e208b97cde8a0841c (diff) | |
parent | f964bc1fd59a545a80a0cc2529ad8830be514871 (diff) | |
download | external_webkit-f4958a7d95cd5fbc1c74905e229b02c95cd5ee78.zip external_webkit-f4958a7d95cd5fbc1c74905e229b02c95cd5ee78.tar.gz external_webkit-f4958a7d95cd5fbc1c74905e229b02c95cd5ee78.tar.bz2 |
Merge changes I60a96064,I6929172f,Idefd9bec,I8cf448f2,I8791737a,I992c56b0,Ibb4b089d,I779a8ec0,Ife412e30,I2da1ae98,Ibcf41849
* changes:
Merge WebKit at r65072 : Update WebKit revision number.
Merge WebKit at r65072 : Update test_expectations.
Merge WebKit at r65072 : Complete cherry-pick of WebKit change 43848 to add EmptyDeviceMotionClient
Merge WebKit at r65072 : Implement DeviceMotionClientAndroid
Merge WebKit at r65072: JSC build fix in InspectorController.h
Merge WebKit at r65072: Fix V8 code generator.
Merge WebKit at r65072 : Build fix for JSC, update ambiguous usage of JSLock.
Merge WebKit at r65072: String class has moved to the WTF namespace.
Merge Webkit at r65072 : Fix conflicts.
Merge Webkit at r65072 : Fix Makefiles.
Merge WebKit at r65072 : Initial merge by git.
Diffstat (limited to 'WebCore/bindings/v8/ScriptObject.cpp')
-rw-r--r-- | WebCore/bindings/v8/ScriptObject.cpp | 80 |
1 files changed, 0 insertions, 80 deletions
diff --git a/WebCore/bindings/v8/ScriptObject.cpp b/WebCore/bindings/v8/ScriptObject.cpp index 8f81537..3d38a9e 100644 --- a/WebCore/bindings/v8/ScriptObject.cpp +++ b/WebCore/bindings/v8/ScriptObject.cpp @@ -57,86 +57,6 @@ v8::Local<v8::Object> ScriptObject::v8Object() const return v8::Local<v8::Object>(v8::Object::Cast(*v8Value())); } -bool ScriptObject::set(const String& name, const String& value) -{ - ScriptScope scope(m_scriptState); - v8Object()->Set(v8String(name), v8String(value)); - return scope.success(); -} - -bool ScriptObject::set(const char* name, const ScriptObject& value) -{ - if (value.scriptState() != m_scriptState) { - ASSERT_NOT_REACHED(); - return false; - } - ScriptScope scope(m_scriptState); - v8Object()->Set(v8::String::New(name), value.v8Value()); - return scope.success(); -} - -bool ScriptObject::set(const char* name, const String& value) -{ - ScriptScope scope(m_scriptState); - v8Object()->Set(v8::String::New(name), v8String(value)); - return scope.success(); -} - -bool ScriptObject::set(const char* name, double value) -{ - ScriptScope scope(m_scriptState); - v8Object()->Set(v8::String::New(name), v8::Number::New(value)); - return scope.success(); -} - -bool ScriptObject::set(const char* name, long value) -{ - ScriptScope scope(m_scriptState); - v8Object()->Set(v8::String::New(name), v8::Number::New(value)); - return scope.success(); -} - -bool ScriptObject::set(const char* name, long long value) -{ - ScriptScope scope(m_scriptState); - v8Object()->Set(v8::String::New(name), v8::Number::New(value)); - return scope.success(); -} - -bool ScriptObject::set(const char* name, int value) -{ - ScriptScope scope(m_scriptState); - v8Object()->Set(v8::String::New(name), v8::Number::New(value)); - return scope.success(); -} - -bool ScriptObject::set(const char* name, unsigned value) -{ - ScriptScope scope(m_scriptState); - v8Object()->Set(v8::String::New(name), v8::Number::New(value)); - return scope.success(); -} - -bool ScriptObject::set(const char* name, unsigned long value) -{ - ScriptScope scope(m_scriptState); - v8Object()->Set(v8::String::New(name), v8::Number::New(value)); - return scope.success(); -} - -bool ScriptObject::set(const char* name, bool value) -{ - ScriptScope scope(m_scriptState); - v8Object()->Set(v8::String::New(name), v8Boolean(value)); - return scope.success(); -} - -ScriptObject ScriptObject::createNew(ScriptState* scriptState) -{ - ScriptScope scope(scriptState); - return ScriptObject(scriptState, v8::Object::New()); -} - bool ScriptGlobalObject::set(ScriptState* scriptState, const char* name, const ScriptObject& value) { ScriptScope scope(scriptState); |