| Index: Source/bindings/scripts/code_generator_v8.pm
|
| diff --git a/Source/bindings/scripts/code_generator_v8.pm b/Source/bindings/scripts/code_generator_v8.pm
|
| index 9185d92b90bad683c4c95297deab675db1f0b256..e040ed2f5eb73838c7a1847f2a7e7ebf1bff39ce 100644
|
| --- a/Source/bindings/scripts/code_generator_v8.pm
|
| +++ b/Source/bindings/scripts/code_generator_v8.pm
|
| @@ -1546,9 +1546,9 @@ END
|
| my $v8ReturnType = "V8" . $returnType;
|
| $code .= " $nativeReturnType result = ${getterString};\n";
|
| if ($forMainWorldSuffix) {
|
| - $code .= " if (result.get() && DOMDataStore::setReturnValueFromWrapper${forMainWorldSuffix}<${v8ReturnType}>(info.GetReturnValue(), result.get()))\n";
|
| + $code .= " if (result && DOMDataStore::setReturnValueFromWrapper${forMainWorldSuffix}<${v8ReturnType}>(info.GetReturnValue(), result.get()))\n";
|
| } else {
|
| - $code .= " if (result.get() && DOMDataStore::setReturnValueFromWrapper<${v8ReturnType}>(info.GetReturnValue(), result.get()))\n";
|
| + $code .= " if (result && DOMDataStore::setReturnValueFromWrapper<${v8ReturnType}>(info.GetReturnValue(), result.get()))\n";
|
| }
|
| $code .= " return;\n";
|
| $code .= " v8::Handle<v8::Value> wrapper = toV8(result.get(), info.Holder(), info.GetIsolate());\n";
|
| @@ -4872,7 +4872,7 @@ sub GenerateToV8Converters
|
| $code .= <<END;
|
| v8::Handle<v8::Object> ${v8ClassName}::createWrapper(${createWrapperArgumentType} impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
|
| {
|
| - ASSERT(impl.get());
|
| + ASSERT(impl);
|
| ASSERT(!DOMDataStore::containsWrapper<${v8ClassName}>(impl.get(), isolate));
|
| if (ScriptWrappable::wrapperCanBeStoredInObject(impl.get())) {
|
| const WrapperTypeInfo* actualInfo = ScriptWrappable::getTypeInfoFromObject(impl.get());
|
|
|