diff options
author | Ben Murdoch <benm@google.com> | 2010-06-15 11:15:29 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2010-06-15 11:22:44 +0100 |
commit | 7f4d5bd8c03935e2c0cd412e561b8fc5a6a880ae (patch) | |
tree | 59a0ccf5c23a6f5890b81f4a6aa99b568c8115f2 /src/api.cc | |
parent | f7060e27768c550ace7ec48ad8c093466db52dfa (diff) | |
download | android_external_v8-7f4d5bd8c03935e2c0cd412e561b8fc5a6a880ae.tar.gz android_external_v8-7f4d5bd8c03935e2c0cd412e561b8fc5a6a880ae.tar.bz2 android_external_v8-7f4d5bd8c03935e2c0cd412e561b8fc5a6a880ae.zip |
Update V8 to r4851 as required by WebKit r61121
Change-Id: Ib01b7c8e38d5b82b254192fc06365aa5b85780c5
Diffstat (limited to 'src/api.cc')
-rw-r--r-- | src/api.cc | 35 |
1 files changed, 21 insertions, 14 deletions
@@ -853,10 +853,10 @@ void FunctionTemplate::SetHiddenPrototype(bool value) { } -void FunctionTemplate::SetNamedInstancePropertyHandler( +void FunctionTemplate::SetNamedInstancePropertyHandlerImpl( NamedPropertyGetter getter, NamedPropertySetter setter, - NamedPropertyQuery query, + NamedPropertyQueryImpl query, NamedPropertyDeleter remover, NamedPropertyEnumerator enumerator, Handle<Value> data) { @@ -987,12 +987,13 @@ void ObjectTemplate::SetAccessor(v8::Handle<String> name, } -void ObjectTemplate::SetNamedPropertyHandler(NamedPropertyGetter getter, - NamedPropertySetter setter, - NamedPropertyQuery query, - NamedPropertyDeleter remover, - NamedPropertyEnumerator enumerator, - Handle<Value> data) { +void ObjectTemplate::SetNamedPropertyHandlerImpl(NamedPropertyGetter getter, + NamedPropertySetter setter, + NamedPropertyQueryImpl query, + NamedPropertyDeleter remover, + NamedPropertyEnumerator + enumerator, + Handle<Value> data) { if (IsDeadCheck("v8::ObjectTemplate::SetNamedPropertyHandler()")) return; ENTER_V8; HandleScope scope; @@ -1000,12 +1001,12 @@ void ObjectTemplate::SetNamedPropertyHandler(NamedPropertyGetter getter, i::FunctionTemplateInfo* constructor = i::FunctionTemplateInfo::cast(Utils::OpenHandle(this)->constructor()); i::Handle<i::FunctionTemplateInfo> cons(constructor); - Utils::ToLocal(cons)->SetNamedInstancePropertyHandler(getter, - setter, - query, - remover, - enumerator, - data); + Utils::ToLocal(cons)->SetNamedInstancePropertyHandlerImpl(getter, + setter, + query, + remover, + enumerator, + data); } @@ -1119,6 +1120,12 @@ ScriptData* ScriptData::PreCompile(const char* input, int length) { } +ScriptData* ScriptData::PreCompile(v8::Handle<String> source) { + i::Handle<i::String> str = Utils::OpenHandle(*source); + return i::PreParse(str, NULL, NULL); +} + + ScriptData* ScriptData::New(const char* data, int length) { // Return an empty ScriptData if the length is obviously invalid. if (length % sizeof(unsigned) != 0) { |