| 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 6497348f8c2d332f631f63f046a2c90ca19a66c8..b5ef7bf42f6c4bd5d149069cb65a78f8fa7e64f4 100644
|
| --- a/Source/bindings/scripts/code_generator_v8.pm
|
| +++ b/Source/bindings/scripts/code_generator_v8.pm
|
| @@ -1068,7 +1068,7 @@ sub GetInternalFields
|
| my @customInternalFields = ();
|
| # If we have persistentHandleIndex, it should be at the first index of the custom
|
| # internal fileds.
|
| - if (IsGarbageCollectedType($interface->name)) {
|
| + if (IsWillBeGarbageCollectedType($interface->name)) {
|
| push(@customInternalFields, "persistentHandleIndex");
|
| }
|
| # Event listeners on DOM nodes are explicitly supported in the GC controller.
|
| @@ -2930,7 +2930,7 @@ END
|
| }
|
|
|
| my $argumentString = join(", ", @beforeArgumentList, @argumentList, @afterArgumentList);
|
| - my $refPtrType = IsGarbageCollectedType($interfaceName) ? "RefPtrWillBeRawPtr<$implClassName>" : "RefPtr<$implClassName>";
|
| + my $refPtrType = IsWillBeGarbageCollectedType($interfaceName) ? "RefPtrWillBeRawPtr<$implClassName>" : "RefPtr<$implClassName>";
|
| $code .= " $refPtrType impl = ${implClassName}::create(${argumentString});\n";
|
| $code .= " v8::Handle<v8::Object> wrapper = info.Holder();\n";
|
|
|
| @@ -4369,7 +4369,7 @@ END
|
|
|
| my $code = "const WrapperTypeInfo ${v8ClassName}::wrapperTypeInfo = { gin::kEmbedderBlink, ${v8ClassName}::domTemplate, $derefObject, $toActiveDOMObject, $toEventTarget, ";
|
| $code .= "$visitDOMWrapper, ${v8ClassName}::installPerContextEnabledMethods, $parentClassInfo, $WrapperTypePrototype, ";
|
| - $code .= IsGarbageCollectedType($interfaceName) ? "true" : "false";
|
| + $code .= IsWillBeGarbageCollectedType($interfaceName) ? "true" : "false";
|
| $code .= " };\n";
|
| $implementation{nameSpaceWebCore}->addHeader($code);
|
|
|
| @@ -5480,7 +5480,7 @@ sub GetNativeType
|
| my $implClassName = GetImplName($interface);
|
| if ($isParameter) {
|
| return "$implClassName*";
|
| - } elsif (IsGarbageCollectedType($interface->name)) {
|
| + } elsif (IsWillBeGarbageCollectedType($interface->name)) {
|
| return "RefPtrWillBeRawPtr<$implClassName>";
|
| } else {
|
| return "RefPtr<$implClassName>";
|
| @@ -5923,7 +5923,7 @@ sub GetPassRefPtrType
|
| my $interface = shift;
|
| my $nativeType = GetNativeTypeForConversions($interface);
|
|
|
| - my $willBe = IsGarbageCollectedType($interface->name) ? "WillBeRawPtr" : "";
|
| + my $willBe = IsWillBeGarbageCollectedType($interface->name) ? "WillBeRawPtr" : "";
|
| my $extraSpace = $nativeType =~ />$/ ? " " : "";
|
| return "PassRefPtr${willBe}<${nativeType}${extraSpace}>";
|
| }
|
| @@ -6031,12 +6031,12 @@ sub IsTypedArrayType
|
| return 0;
|
| }
|
|
|
| -sub IsGarbageCollectedType
|
| +sub IsWillBeGarbageCollectedType
|
| {
|
| my $interfaceName = shift;
|
| return 0 unless IsWrapperType($interfaceName);
|
| my $interface = ParseInterface($interfaceName);
|
| - return $interface->extendedAttributes->{"GarbageCollected"};
|
| + return $interface->extendedAttributes->{"WillBeGarbageCollected"};
|
| }
|
|
|
| sub IsRefPtrType
|
|
|