Changeset 145575 in webkit


Ignore:
Timestamp:
Mar 12, 2013 1:11:58 PM (11 years ago)
Author:
commit-queue@webkit.org
Message:

Unreviewed, rolling out r145554.
http://trac.webkit.org/changeset/145554
https://bugs.webkit.org/show_bug.cgi?id=112182

Breaks several extension browser tests (see bug for details)
(Requested by jamesr on #webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2013-03-12

  • bindings/scripts/CodeGeneratorV8.pm:

(GenerateHeader):
(GenerateDomainSafeFunctionGetter):
(GenerateImplementation):
(CreateCustomSignature):

  • bindings/scripts/test/V8/V8Float64Array.cpp:

(WebCore::ConfigureV8Float64ArrayTemplate):
(WebCore::V8Float64Array::GetTemplate):
(WebCore::V8Float64Array::HasInstance):

  • bindings/scripts/test/V8/V8Float64Array.h:

(V8Float64Array):

  • bindings/scripts/test/V8/V8TestActiveDOMObject.cpp:

(WebCore::TestActiveDOMObjectV8Internal::postMessageAttrGetter):
(WebCore::ConfigureV8TestActiveDOMObjectTemplate):
(WebCore::V8TestActiveDOMObject::GetTemplate):
(WebCore::V8TestActiveDOMObject::HasInstance):

  • bindings/scripts/test/V8/V8TestActiveDOMObject.h:

(V8TestActiveDOMObject):

  • bindings/scripts/test/V8/V8TestCustomNamedGetter.cpp:

(WebCore::V8TestCustomNamedGetter::GetTemplate):
(WebCore::V8TestCustomNamedGetter::HasInstance):

  • bindings/scripts/test/V8/V8TestCustomNamedGetter.h:

(V8TestCustomNamedGetter):

  • bindings/scripts/test/V8/V8TestEventConstructor.cpp:

(WebCore::V8TestEventConstructor::GetTemplate):
(WebCore::V8TestEventConstructor::HasInstance):

  • bindings/scripts/test/V8/V8TestEventConstructor.h:

(V8TestEventConstructor):

  • bindings/scripts/test/V8/V8TestEventTarget.cpp:

(WebCore::ConfigureV8TestEventTargetTemplate):
(WebCore::V8TestEventTarget::GetTemplate):
(WebCore::V8TestEventTarget::HasInstance):

  • bindings/scripts/test/V8/V8TestEventTarget.h:

(V8TestEventTarget):

  • bindings/scripts/test/V8/V8TestException.cpp:

(WebCore::V8TestException::GetTemplate):
(WebCore::V8TestException::HasInstance):

  • bindings/scripts/test/V8/V8TestException.h:

(V8TestException):

  • bindings/scripts/test/V8/V8TestInterface.cpp:

(WebCore::ConfigureV8TestInterfaceTemplate):
(WebCore::V8TestInterface::GetTemplate):
(WebCore::V8TestInterface::HasInstance):

  • bindings/scripts/test/V8/V8TestInterface.h:

(V8TestInterface):

  • bindings/scripts/test/V8/V8TestMediaQueryListListener.cpp:

(WebCore::V8TestMediaQueryListListener::GetTemplate):
(WebCore::V8TestMediaQueryListListener::HasInstance):

  • bindings/scripts/test/V8/V8TestMediaQueryListListener.h:

(V8TestMediaQueryListListener):

  • bindings/scripts/test/V8/V8TestNamedConstructor.cpp:

(WebCore::V8TestNamedConstructor::GetTemplate):
(WebCore::V8TestNamedConstructor::HasInstance):

  • bindings/scripts/test/V8/V8TestNamedConstructor.h:

(V8TestNamedConstructor):

  • bindings/scripts/test/V8/V8TestNode.cpp:

(WebCore::V8TestNode::GetTemplate):
(WebCore::V8TestNode::HasInstance):

  • bindings/scripts/test/V8/V8TestNode.h:

(V8TestNode):

  • bindings/scripts/test/V8/V8TestObj.cpp:

(WebCore::ConfigureV8TestObjTemplate):
(WebCore::V8TestObj::GetTemplate):
(WebCore::V8TestObj::HasInstance):

  • bindings/scripts/test/V8/V8TestObj.h:

(V8TestObj):

  • bindings/scripts/test/V8/V8TestOverloadedConstructors.cpp:

(WebCore::V8TestOverloadedConstructors::GetTemplate):
(WebCore::V8TestOverloadedConstructors::HasInstance):

  • bindings/scripts/test/V8/V8TestOverloadedConstructors.h:

(V8TestOverloadedConstructors):

  • bindings/scripts/test/V8/V8TestSerializedScriptValueInterface.cpp:

(WebCore::V8TestSerializedScriptValueInterface::GetTemplate):
(WebCore::V8TestSerializedScriptValueInterface::HasInstance):

  • bindings/scripts/test/V8/V8TestSerializedScriptValueInterface.h:

(V8TestSerializedScriptValueInterface):

  • bindings/scripts/test/V8/V8TestTypedefs.cpp:

(WebCore::ConfigureV8TestTypedefsTemplate):
(WebCore::V8TestTypedefs::GetTemplate):
(WebCore::V8TestTypedefs::HasInstance):

  • bindings/scripts/test/V8/V8TestTypedefs.h:

(V8TestTypedefs):

  • bindings/v8/V8AdaptorFunction.cpp:

(WebCore::V8AdaptorFunction::getTemplate):

  • bindings/v8/V8GCController.cpp:
  • bindings/v8/V8PerIsolateData.cpp:

(WebCore::V8PerIsolateData::reportMemoryUsage):
(WebCore::V8PerIsolateData::privateTemplate):
(WebCore::V8PerIsolateData::rawTemplate):
(WebCore::V8PerIsolateData::hasInstance):

  • bindings/v8/V8PerIsolateData.h:

(WebCore::V8PerIsolateData::rawTemplateMap):
(WebCore::V8PerIsolateData::templateMap):
(V8PerIsolateData):

  • bindings/v8/WrapperTypeInfo.h:
  • bindings/v8/custom/V8LocationCustom.cpp:

(WebCore::V8Location::reloadAttrGetterCustom):
(WebCore::V8Location::replaceAttrGetterCustom):
(WebCore::V8Location::assignAttrGetterCustom):

  • bindings/v8/custom/V8NodeListCustom.cpp:

(WebCore::V8NodeList::opaqueRootForGC):

Location:
trunk/Source/WebCore
Files:
37 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r145574 r145575  
     12013-03-12  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r145554.
     4        http://trac.webkit.org/changeset/145554
     5        https://bugs.webkit.org/show_bug.cgi?id=112182
     6
     7        Breaks several extension browser tests (see bug for details)
     8        (Requested by jamesr on #webkit).
     9
     10        * bindings/scripts/CodeGeneratorV8.pm:
     11        (GenerateHeader):
     12        (GenerateDomainSafeFunctionGetter):
     13        (GenerateImplementation):
     14        (CreateCustomSignature):
     15        * bindings/scripts/test/V8/V8Float64Array.cpp:
     16        (WebCore::ConfigureV8Float64ArrayTemplate):
     17        (WebCore::V8Float64Array::GetTemplate):
     18        (WebCore::V8Float64Array::HasInstance):
     19        * bindings/scripts/test/V8/V8Float64Array.h:
     20        (V8Float64Array):
     21        * bindings/scripts/test/V8/V8TestActiveDOMObject.cpp:
     22        (WebCore::TestActiveDOMObjectV8Internal::postMessageAttrGetter):
     23        (WebCore::ConfigureV8TestActiveDOMObjectTemplate):
     24        (WebCore::V8TestActiveDOMObject::GetTemplate):
     25        (WebCore::V8TestActiveDOMObject::HasInstance):
     26        * bindings/scripts/test/V8/V8TestActiveDOMObject.h:
     27        (V8TestActiveDOMObject):
     28        * bindings/scripts/test/V8/V8TestCustomNamedGetter.cpp:
     29        (WebCore::V8TestCustomNamedGetter::GetTemplate):
     30        (WebCore::V8TestCustomNamedGetter::HasInstance):
     31        * bindings/scripts/test/V8/V8TestCustomNamedGetter.h:
     32        (V8TestCustomNamedGetter):
     33        * bindings/scripts/test/V8/V8TestEventConstructor.cpp:
     34        (WebCore::V8TestEventConstructor::GetTemplate):
     35        (WebCore::V8TestEventConstructor::HasInstance):
     36        * bindings/scripts/test/V8/V8TestEventConstructor.h:
     37        (V8TestEventConstructor):
     38        * bindings/scripts/test/V8/V8TestEventTarget.cpp:
     39        (WebCore::ConfigureV8TestEventTargetTemplate):
     40        (WebCore::V8TestEventTarget::GetTemplate):
     41        (WebCore::V8TestEventTarget::HasInstance):
     42        * bindings/scripts/test/V8/V8TestEventTarget.h:
     43        (V8TestEventTarget):
     44        * bindings/scripts/test/V8/V8TestException.cpp:
     45        (WebCore::V8TestException::GetTemplate):
     46        (WebCore::V8TestException::HasInstance):
     47        * bindings/scripts/test/V8/V8TestException.h:
     48        (V8TestException):
     49        * bindings/scripts/test/V8/V8TestInterface.cpp:
     50        (WebCore::ConfigureV8TestInterfaceTemplate):
     51        (WebCore::V8TestInterface::GetTemplate):
     52        (WebCore::V8TestInterface::HasInstance):
     53        * bindings/scripts/test/V8/V8TestInterface.h:
     54        (V8TestInterface):
     55        * bindings/scripts/test/V8/V8TestMediaQueryListListener.cpp:
     56        (WebCore::V8TestMediaQueryListListener::GetTemplate):
     57        (WebCore::V8TestMediaQueryListListener::HasInstance):
     58        * bindings/scripts/test/V8/V8TestMediaQueryListListener.h:
     59        (V8TestMediaQueryListListener):
     60        * bindings/scripts/test/V8/V8TestNamedConstructor.cpp:
     61        (WebCore::V8TestNamedConstructor::GetTemplate):
     62        (WebCore::V8TestNamedConstructor::HasInstance):
     63        * bindings/scripts/test/V8/V8TestNamedConstructor.h:
     64        (V8TestNamedConstructor):
     65        * bindings/scripts/test/V8/V8TestNode.cpp:
     66        (WebCore::V8TestNode::GetTemplate):
     67        (WebCore::V8TestNode::HasInstance):
     68        * bindings/scripts/test/V8/V8TestNode.h:
     69        (V8TestNode):
     70        * bindings/scripts/test/V8/V8TestObj.cpp:
     71        (WebCore::ConfigureV8TestObjTemplate):
     72        (WebCore::V8TestObj::GetTemplate):
     73        (WebCore::V8TestObj::HasInstance):
     74        * bindings/scripts/test/V8/V8TestObj.h:
     75        (V8TestObj):
     76        * bindings/scripts/test/V8/V8TestOverloadedConstructors.cpp:
     77        (WebCore::V8TestOverloadedConstructors::GetTemplate):
     78        (WebCore::V8TestOverloadedConstructors::HasInstance):
     79        * bindings/scripts/test/V8/V8TestOverloadedConstructors.h:
     80        (V8TestOverloadedConstructors):
     81        * bindings/scripts/test/V8/V8TestSerializedScriptValueInterface.cpp:
     82        (WebCore::V8TestSerializedScriptValueInterface::GetTemplate):
     83        (WebCore::V8TestSerializedScriptValueInterface::HasInstance):
     84        * bindings/scripts/test/V8/V8TestSerializedScriptValueInterface.h:
     85        (V8TestSerializedScriptValueInterface):
     86        * bindings/scripts/test/V8/V8TestTypedefs.cpp:
     87        (WebCore::ConfigureV8TestTypedefsTemplate):
     88        (WebCore::V8TestTypedefs::GetTemplate):
     89        (WebCore::V8TestTypedefs::HasInstance):
     90        * bindings/scripts/test/V8/V8TestTypedefs.h:
     91        (V8TestTypedefs):
     92        * bindings/v8/V8AdaptorFunction.cpp:
     93        (WebCore::V8AdaptorFunction::getTemplate):
     94        * bindings/v8/V8GCController.cpp:
     95        * bindings/v8/V8PerIsolateData.cpp:
     96        (WebCore::V8PerIsolateData::reportMemoryUsage):
     97        (WebCore::V8PerIsolateData::privateTemplate):
     98        (WebCore::V8PerIsolateData::rawTemplate):
     99        (WebCore::V8PerIsolateData::hasInstance):
     100        * bindings/v8/V8PerIsolateData.h:
     101        (WebCore::V8PerIsolateData::rawTemplateMap):
     102        (WebCore::V8PerIsolateData::templateMap):
     103        (V8PerIsolateData):
     104        * bindings/v8/WrapperTypeInfo.h:
     105        * bindings/v8/custom/V8LocationCustom.cpp:
     106        (WebCore::V8Location::reloadAttrGetterCustom):
     107        (WebCore::V8Location::replaceAttrGetterCustom):
     108        (WebCore::V8Location::assignAttrGetterCustom):
     109        * bindings/v8/custom/V8NodeListCustom.cpp:
     110        (WebCore::V8NodeList::opaqueRootForGC):
     111
    11122013-03-12  Gavin Peters  <gavinp@chromium.org>
    2113
  • trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm

    r145554 r145575  
    361361
    362362    push(@headerContent, <<END);
    363     static bool HasInstance(v8::Handle<v8::Value>, v8::Isolate*, WrapperWorldType = GetFromContext);
     363    static bool HasInstance(v8::Handle<v8::Value>, v8::Isolate*);
    364364    static v8::Persistent<v8::FunctionTemplate> GetTemplate(v8::Isolate*, WrapperWorldType);
    365365    static ${nativeType}* toNative(v8::Handle<v8::Object> object)
     
    781781    my $funcName = $function->signature->name;
    782782
    783     my $signature = "v8::Signature::New(V8PerIsolateData::from(info.GetIsolate())->rawTemplate(&" . $v8InterfaceName . "::info, currentWorldType))";
     783    my $signature = "v8::Signature::New(V8PerIsolateData::from(info.GetIsolate())->rawTemplate(&" . $v8InterfaceName . "::info))";
    784784    if ($function->signature->extendedAttributes->{"V8DoNotCheckSignature"}) {
    785785        $signature = "v8::Local<v8::Signature>()";
     
    31563156{
    31573157    V8PerIsolateData* data = V8PerIsolateData::from(isolate);
    3158     V8PerIsolateData::TemplateMap::iterator result = data->templateMap(worldType).find(&info);
    3159     if (result != data->templateMap(worldType).end())
     3158    V8PerIsolateData::TemplateMap::iterator result = data->templateMap().find(&info);
     3159    if (result != data->templateMap().end())
    31603160        return result->value;
    31613161
    31623162    v8::HandleScope handleScope;
    31633163    v8::Persistent<v8::FunctionTemplate> templ =
    3164         Configure${v8InterfaceName}Template(data->rawTemplate(&info, worldType), isolate, worldType);
    3165     data->templateMap(worldType).add(&info, templ);
     3164        Configure${v8InterfaceName}Template(data->rawTemplate(&info), isolate, worldType);
     3165    data->templateMap().add(&info, templ);
    31663166    return templ;
    31673167}
    31683168
    3169 bool ${v8InterfaceName}::HasInstance(v8::Handle<v8::Value> value, v8::Isolate* isolate, WrapperWorldType worldType)
    3170 {
    3171     return V8PerIsolateData::from(isolate)->hasInstance(&info, value, worldType);
     3169bool ${v8InterfaceName}::HasInstance(v8::Handle<v8::Value> value, v8::Isolate* isolate)
     3170{
     3171    return V8PerIsolateData::from(isolate)->hasInstance(&info, value);
    31723172}
    31733173
     
    40904090                    AddToImplIncludes(GetV8HeaderName($type));
    40914091                }
    4092                 $result .= "V8PerIsolateData::from(isolate)->rawTemplate(&V8${type}::info, worldType)";
     4092                $result .= "V8PerIsolateData::from(isolate)->rawTemplate(&V8${type}::info)";
    40934093            }
    40944094        } else {
  • trunk/Source/WebCore/bindings/scripts/test/V8/V8Float64Array.cpp

    r145554 r145575  
    154154    // Custom Signature 'foo'
    155155    const int fooArgc = 1;
    156     v8::Handle<v8::FunctionTemplate> fooArgv[fooArgc] = { V8PerIsolateData::from(isolate)->rawTemplate(&V8Float32Array::info, worldType) };
     156    v8::Handle<v8::FunctionTemplate> fooArgv[fooArgc] = { V8PerIsolateData::from(isolate)->rawTemplate(&V8Float32Array::info) };
    157157    v8::Handle<v8::Signature> fooSignature = v8::Signature::New(desc, fooArgc, fooArgv);
    158158    proto->Set(v8::String::NewSymbol("foo"), v8::FunctionTemplate::New(Float64ArrayV8Internal::fooMethodCallback, v8Undefined(), fooSignature));
     
    166166{
    167167    V8PerIsolateData* data = V8PerIsolateData::from(isolate);
    168     V8PerIsolateData::TemplateMap::iterator result = data->templateMap(worldType).find(&info);
    169     if (result != data->templateMap(worldType).end())
     168    V8PerIsolateData::TemplateMap::iterator result = data->templateMap().find(&info);
     169    if (result != data->templateMap().end())
    170170        return result->value;
    171171
    172172    v8::HandleScope handleScope;
    173173    v8::Persistent<v8::FunctionTemplate> templ =
    174         ConfigureV8Float64ArrayTemplate(data->rawTemplate(&info, worldType), isolate, worldType);
    175     data->templateMap(worldType).add(&info, templ);
     174        ConfigureV8Float64ArrayTemplate(data->rawTemplate(&info), isolate, worldType);
     175    data->templateMap().add(&info, templ);
    176176    return templ;
    177177}
    178178
    179 bool V8Float64Array::HasInstance(v8::Handle<v8::Value> value, v8::Isolate* isolate, WrapperWorldType worldType)
    180 {
    181     return V8PerIsolateData::from(isolate)->hasInstance(&info, value, worldType);
     179bool V8Float64Array::HasInstance(v8::Handle<v8::Value> value, v8::Isolate* isolate)
     180{
     181    return V8PerIsolateData::from(isolate)->hasInstance(&info, value);
    182182}
    183183
  • trunk/Source/WebCore/bindings/scripts/test/V8/V8Float64Array.h

    r145554 r145575  
    3636public:
    3737    static const bool hasDependentLifetime = V8ArrayBufferView::hasDependentLifetime;
    38     static bool HasInstance(v8::Handle<v8::Value>, v8::Isolate*, WrapperWorldType = GetFromContext);
     38    static bool HasInstance(v8::Handle<v8::Value>, v8::Isolate*);
    3939    static v8::Persistent<v8::FunctionTemplate> GetTemplate(v8::Isolate*, WrapperWorldType);
    4040    static Float64Array* toNative(v8::Handle<v8::Object> object)
  • trunk/Source/WebCore/bindings/scripts/test/V8/V8TestActiveDOMObject.cpp

    r145554 r145575  
    133133    WrapperWorldType currentWorldType = worldType(info.GetIsolate());
    134134    V8PerIsolateData* data = V8PerIsolateData::from(info.GetIsolate());
    135     v8::Persistent<v8::FunctionTemplate> privateTemplate = data->privateTemplate(currentWorldType, &privateTemplateUniqueKey, TestActiveDOMObjectV8Internal::postMessageMethodCallback, v8Undefined(), v8::Signature::New(V8PerIsolateData::from(info.GetIsolate())->rawTemplate(&V8TestActiveDOMObject::info, currentWorldType)));
     135    v8::Persistent<v8::FunctionTemplate> privateTemplate = data->privateTemplate(currentWorldType, &privateTemplateUniqueKey, TestActiveDOMObjectV8Internal::postMessageMethodCallback, v8Undefined(), v8::Signature::New(V8PerIsolateData::from(info.GetIsolate())->rawTemplate(&V8TestActiveDOMObject::info)));
    136136
    137137    v8::Handle<v8::Object> holder = info.This()->FindInstanceInPrototypeChain(V8TestActiveDOMObject::GetTemplate(info.GetIsolate(), currentWorldType));
     
    144144    if (!BindingSecurity::shouldAllowAccessToFrame(BindingState::instance(), imp->frame(), DoNotReportSecurityError)) {
    145145        static const char* sharedTemplateUniqueKey = "postMessageSharedTemplate";
    146         v8::Persistent<v8::FunctionTemplate> sharedTemplate = data->privateTemplate(currentWorldType, &sharedTemplateUniqueKey, TestActiveDOMObjectV8Internal::postMessageMethodCallback, v8Undefined(), v8::Signature::New(V8PerIsolateData::from(info.GetIsolate())->rawTemplate(&V8TestActiveDOMObject::info, currentWorldType)));
     146        v8::Persistent<v8::FunctionTemplate> sharedTemplate = data->privateTemplate(currentWorldType, &sharedTemplateUniqueKey, TestActiveDOMObjectV8Internal::postMessageMethodCallback, v8Undefined(), v8::Signature::New(V8PerIsolateData::from(info.GetIsolate())->rawTemplate(&V8TestActiveDOMObject::info)));
    147147        return sharedTemplate->GetFunction();
    148148    }
     
    196196    // Custom Signature 'excitingFunction'
    197197    const int excitingFunctionArgc = 1;
    198     v8::Handle<v8::FunctionTemplate> excitingFunctionArgv[excitingFunctionArgc] = { V8PerIsolateData::from(isolate)->rawTemplate(&V8Node::info, worldType) };
     198    v8::Handle<v8::FunctionTemplate> excitingFunctionArgv[excitingFunctionArgc] = { V8PerIsolateData::from(isolate)->rawTemplate(&V8Node::info) };
    199199    v8::Handle<v8::Signature> excitingFunctionSignature = v8::Signature::New(desc, excitingFunctionArgc, excitingFunctionArgv);
    200200    proto->Set(v8::String::NewSymbol("excitingFunction"), v8::FunctionTemplate::New(TestActiveDOMObjectV8Internal::excitingFunctionMethodCallback, v8Undefined(), excitingFunctionSignature));
     
    211211{
    212212    V8PerIsolateData* data = V8PerIsolateData::from(isolate);
    213     V8PerIsolateData::TemplateMap::iterator result = data->templateMap(worldType).find(&info);
    214     if (result != data->templateMap(worldType).end())
     213    V8PerIsolateData::TemplateMap::iterator result = data->templateMap().find(&info);
     214    if (result != data->templateMap().end())
    215215        return result->value;
    216216
    217217    v8::HandleScope handleScope;
    218218    v8::Persistent<v8::FunctionTemplate> templ =
    219         ConfigureV8TestActiveDOMObjectTemplate(data->rawTemplate(&info, worldType), isolate, worldType);
    220     data->templateMap(worldType).add(&info, templ);
     219        ConfigureV8TestActiveDOMObjectTemplate(data->rawTemplate(&info), isolate, worldType);
     220    data->templateMap().add(&info, templ);
    221221    return templ;
    222222}
    223223
    224 bool V8TestActiveDOMObject::HasInstance(v8::Handle<v8::Value> value, v8::Isolate* isolate, WrapperWorldType worldType)
    225 {
    226     return V8PerIsolateData::from(isolate)->hasInstance(&info, value, worldType);
     224bool V8TestActiveDOMObject::HasInstance(v8::Handle<v8::Value> value, v8::Isolate* isolate)
     225{
     226    return V8PerIsolateData::from(isolate)->hasInstance(&info, value);
    227227}
    228228
  • trunk/Source/WebCore/bindings/scripts/test/V8/V8TestActiveDOMObject.h

    r145554 r145575  
    3535public:
    3636    static const bool hasDependentLifetime = false;
    37     static bool HasInstance(v8::Handle<v8::Value>, v8::Isolate*, WrapperWorldType = GetFromContext);
     37    static bool HasInstance(v8::Handle<v8::Value>, v8::Isolate*);
    3838    static v8::Persistent<v8::FunctionTemplate> GetTemplate(v8::Isolate*, WrapperWorldType);
    3939    static TestActiveDOMObject* toNative(v8::Handle<v8::Object> object)
  • trunk/Source/WebCore/bindings/scripts/test/V8/V8TestCustomNamedGetter.cpp

    r145554 r145575  
    116116{
    117117    V8PerIsolateData* data = V8PerIsolateData::from(isolate);
    118     V8PerIsolateData::TemplateMap::iterator result = data->templateMap(worldType).find(&info);
    119     if (result != data->templateMap(worldType).end())
     118    V8PerIsolateData::TemplateMap::iterator result = data->templateMap().find(&info);
     119    if (result != data->templateMap().end())
    120120        return result->value;
    121121
    122122    v8::HandleScope handleScope;
    123123    v8::Persistent<v8::FunctionTemplate> templ =
    124         ConfigureV8TestCustomNamedGetterTemplate(data->rawTemplate(&info, worldType), isolate, worldType);
    125     data->templateMap(worldType).add(&info, templ);
     124        ConfigureV8TestCustomNamedGetterTemplate(data->rawTemplate(&info), isolate, worldType);
     125    data->templateMap().add(&info, templ);
    126126    return templ;
    127127}
    128128
    129 bool V8TestCustomNamedGetter::HasInstance(v8::Handle<v8::Value> value, v8::Isolate* isolate, WrapperWorldType worldType)
     129bool V8TestCustomNamedGetter::HasInstance(v8::Handle<v8::Value> value, v8::Isolate* isolate)
    130130{
    131     return V8PerIsolateData::from(isolate)->hasInstance(&info, value, worldType);
     131    return V8PerIsolateData::from(isolate)->hasInstance(&info, value);
    132132}
    133133
  • trunk/Source/WebCore/bindings/scripts/test/V8/V8TestCustomNamedGetter.h

    r145554 r145575  
    3535public:
    3636    static const bool hasDependentLifetime = false;
    37     static bool HasInstance(v8::Handle<v8::Value>, v8::Isolate*, WrapperWorldType = GetFromContext);
     37    static bool HasInstance(v8::Handle<v8::Value>, v8::Isolate*);
    3838    static v8::Persistent<v8::FunctionTemplate> GetTemplate(v8::Isolate*, WrapperWorldType);
    3939    static TestCustomNamedGetter* toNative(v8::Handle<v8::Object> object)
  • trunk/Source/WebCore/bindings/scripts/test/V8/V8TestEventConstructor.cpp

    r145554 r145575  
    158158{
    159159    V8PerIsolateData* data = V8PerIsolateData::from(isolate);
    160     V8PerIsolateData::TemplateMap::iterator result = data->templateMap(worldType).find(&info);
    161     if (result != data->templateMap(worldType).end())
     160    V8PerIsolateData::TemplateMap::iterator result = data->templateMap().find(&info);
     161    if (result != data->templateMap().end())
    162162        return result->value;
    163163
    164164    v8::HandleScope handleScope;
    165165    v8::Persistent<v8::FunctionTemplate> templ =
    166         ConfigureV8TestEventConstructorTemplate(data->rawTemplate(&info, worldType), isolate, worldType);
    167     data->templateMap(worldType).add(&info, templ);
     166        ConfigureV8TestEventConstructorTemplate(data->rawTemplate(&info), isolate, worldType);
     167    data->templateMap().add(&info, templ);
    168168    return templ;
    169169}
    170170
    171 bool V8TestEventConstructor::HasInstance(v8::Handle<v8::Value> value, v8::Isolate* isolate, WrapperWorldType worldType)
     171bool V8TestEventConstructor::HasInstance(v8::Handle<v8::Value> value, v8::Isolate* isolate)
    172172{
    173     return V8PerIsolateData::from(isolate)->hasInstance(&info, value, worldType);
     173    return V8PerIsolateData::from(isolate)->hasInstance(&info, value);
    174174}
    175175
  • trunk/Source/WebCore/bindings/scripts/test/V8/V8TestEventConstructor.h

    r145554 r145575  
    3636public:
    3737    static const bool hasDependentLifetime = false;
    38     static bool HasInstance(v8::Handle<v8::Value>, v8::Isolate*, WrapperWorldType = GetFromContext);
     38    static bool HasInstance(v8::Handle<v8::Value>, v8::Isolate*);
    3939    static v8::Persistent<v8::FunctionTemplate> GetTemplate(v8::Isolate*, WrapperWorldType);
    4040    static TestEventConstructor* toNative(v8::Handle<v8::Object> object)
  • trunk/Source/WebCore/bindings/scripts/test/V8/V8TestEventTarget.cpp

    r145554 r145575  
    180180    // Custom Signature 'dispatchEvent'
    181181    const int dispatchEventArgc = 1;
    182     v8::Handle<v8::FunctionTemplate> dispatchEventArgv[dispatchEventArgc] = { V8PerIsolateData::from(isolate)->rawTemplate(&V8Event::info, worldType) };
     182    v8::Handle<v8::FunctionTemplate> dispatchEventArgv[dispatchEventArgc] = { V8PerIsolateData::from(isolate)->rawTemplate(&V8Event::info) };
    183183    v8::Handle<v8::Signature> dispatchEventSignature = v8::Signature::New(desc, dispatchEventArgc, dispatchEventArgv);
    184184    proto->Set(v8::String::NewSymbol("dispatchEvent"), v8::FunctionTemplate::New(TestEventTargetV8Internal::dispatchEventMethodCallback, v8Undefined(), dispatchEventSignature));
     
    192192{
    193193    V8PerIsolateData* data = V8PerIsolateData::from(isolate);
    194     V8PerIsolateData::TemplateMap::iterator result = data->templateMap(worldType).find(&info);
    195     if (result != data->templateMap(worldType).end())
     194    V8PerIsolateData::TemplateMap::iterator result = data->templateMap().find(&info);
     195    if (result != data->templateMap().end())
    196196        return result->value;
    197197
    198198    v8::HandleScope handleScope;
    199199    v8::Persistent<v8::FunctionTemplate> templ =
    200         ConfigureV8TestEventTargetTemplate(data->rawTemplate(&info, worldType), isolate, worldType);
    201     data->templateMap(worldType).add(&info, templ);
     200        ConfigureV8TestEventTargetTemplate(data->rawTemplate(&info), isolate, worldType);
     201    data->templateMap().add(&info, templ);
    202202    return templ;
    203203}
    204204
    205 bool V8TestEventTarget::HasInstance(v8::Handle<v8::Value> value, v8::Isolate* isolate, WrapperWorldType worldType)
    206 {
    207     return V8PerIsolateData::from(isolate)->hasInstance(&info, value, worldType);
     205bool V8TestEventTarget::HasInstance(v8::Handle<v8::Value> value, v8::Isolate* isolate)
     206{
     207    return V8PerIsolateData::from(isolate)->hasInstance(&info, value);
    208208}
    209209
  • trunk/Source/WebCore/bindings/scripts/test/V8/V8TestEventTarget.h

    r145554 r145575  
    3535public:
    3636    static const bool hasDependentLifetime = false;
    37     static bool HasInstance(v8::Handle<v8::Value>, v8::Isolate*, WrapperWorldType = GetFromContext);
     37    static bool HasInstance(v8::Handle<v8::Value>, v8::Isolate*);
    3838    static v8::Persistent<v8::FunctionTemplate> GetTemplate(v8::Isolate*, WrapperWorldType);
    3939    static TestEventTarget* toNative(v8::Handle<v8::Object> object)
  • trunk/Source/WebCore/bindings/scripts/test/V8/V8TestException.cpp

    r145554 r145575  
    107107{
    108108    V8PerIsolateData* data = V8PerIsolateData::from(isolate);
    109     V8PerIsolateData::TemplateMap::iterator result = data->templateMap(worldType).find(&info);
    110     if (result != data->templateMap(worldType).end())
     109    V8PerIsolateData::TemplateMap::iterator result = data->templateMap().find(&info);
     110    if (result != data->templateMap().end())
    111111        return result->value;
    112112
    113113    v8::HandleScope handleScope;
    114114    v8::Persistent<v8::FunctionTemplate> templ =
    115         ConfigureV8TestExceptionTemplate(data->rawTemplate(&info, worldType), isolate, worldType);
    116     data->templateMap(worldType).add(&info, templ);
     115        ConfigureV8TestExceptionTemplate(data->rawTemplate(&info), isolate, worldType);
     116    data->templateMap().add(&info, templ);
    117117    return templ;
    118118}
    119119
    120 bool V8TestException::HasInstance(v8::Handle<v8::Value> value, v8::Isolate* isolate, WrapperWorldType worldType)
     120bool V8TestException::HasInstance(v8::Handle<v8::Value> value, v8::Isolate* isolate)
    121121{
    122     return V8PerIsolateData::from(isolate)->hasInstance(&info, value, worldType);
     122    return V8PerIsolateData::from(isolate)->hasInstance(&info, value);
    123123}
    124124
  • trunk/Source/WebCore/bindings/scripts/test/V8/V8TestException.h

    r145554 r145575  
    3535public:
    3636    static const bool hasDependentLifetime = false;
    37     static bool HasInstance(v8::Handle<v8::Value>, v8::Isolate*, WrapperWorldType = GetFromContext);
     37    static bool HasInstance(v8::Handle<v8::Value>, v8::Isolate*);
    3838    static v8::Persistent<v8::FunctionTemplate> GetTemplate(v8::Isolate*, WrapperWorldType);
    3939    static TestException* toNative(v8::Handle<v8::Object> object)
  • trunk/Source/WebCore/bindings/scripts/test/V8/V8TestInterface.cpp

    r145554 r145575  
    439439    // Custom Signature 'supplementalMethod2'
    440440    const int supplementalMethod2Argc = 2;
    441     v8::Handle<v8::FunctionTemplate> supplementalMethod2Argv[supplementalMethod2Argc] = { v8::Handle<v8::FunctionTemplate>(), V8PerIsolateData::from(isolate)->rawTemplate(&V8TestObj::info, worldType) };
     441    v8::Handle<v8::FunctionTemplate> supplementalMethod2Argv[supplementalMethod2Argc] = { v8::Handle<v8::FunctionTemplate>(), V8PerIsolateData::from(isolate)->rawTemplate(&V8TestObj::info) };
    442442    v8::Handle<v8::Signature> supplementalMethod2Signature = v8::Signature::New(desc, supplementalMethod2Argc, supplementalMethod2Argv);
    443443#if ENABLE(Condition11) || ENABLE(Condition12)
     
    457457{
    458458    V8PerIsolateData* data = V8PerIsolateData::from(isolate);
    459     V8PerIsolateData::TemplateMap::iterator result = data->templateMap(worldType).find(&info);
    460     if (result != data->templateMap(worldType).end())
     459    V8PerIsolateData::TemplateMap::iterator result = data->templateMap().find(&info);
     460    if (result != data->templateMap().end())
    461461        return result->value;
    462462
    463463    v8::HandleScope handleScope;
    464464    v8::Persistent<v8::FunctionTemplate> templ =
    465         ConfigureV8TestInterfaceTemplate(data->rawTemplate(&info, worldType), isolate, worldType);
    466     data->templateMap(worldType).add(&info, templ);
     465        ConfigureV8TestInterfaceTemplate(data->rawTemplate(&info), isolate, worldType);
     466    data->templateMap().add(&info, templ);
    467467    return templ;
    468468}
    469469
    470 bool V8TestInterface::HasInstance(v8::Handle<v8::Value> value, v8::Isolate* isolate, WrapperWorldType worldType)
    471 {
    472     return V8PerIsolateData::from(isolate)->hasInstance(&info, value, worldType);
     470bool V8TestInterface::HasInstance(v8::Handle<v8::Value> value, v8::Isolate* isolate)
     471{
     472    return V8PerIsolateData::from(isolate)->hasInstance(&info, value);
    473473}
    474474
  • trunk/Source/WebCore/bindings/scripts/test/V8/V8TestInterface.h

    r145554 r145575  
    3636public:
    3737    static const bool hasDependentLifetime = true;
    38     static bool HasInstance(v8::Handle<v8::Value>, v8::Isolate*, WrapperWorldType = GetFromContext);
     38    static bool HasInstance(v8::Handle<v8::Value>, v8::Isolate*);
    3939    static v8::Persistent<v8::FunctionTemplate> GetTemplate(v8::Isolate*, WrapperWorldType);
    4040    static TestInterface* toNative(v8::Handle<v8::Object> object)
  • trunk/Source/WebCore/bindings/scripts/test/V8/V8TestMediaQueryListListener.cpp

    r145554 r145575  
    116116{
    117117    V8PerIsolateData* data = V8PerIsolateData::from(isolate);
    118     V8PerIsolateData::TemplateMap::iterator result = data->templateMap(worldType).find(&info);
    119     if (result != data->templateMap(worldType).end())
     118    V8PerIsolateData::TemplateMap::iterator result = data->templateMap().find(&info);
     119    if (result != data->templateMap().end())
    120120        return result->value;
    121121
    122122    v8::HandleScope handleScope;
    123123    v8::Persistent<v8::FunctionTemplate> templ =
    124         ConfigureV8TestMediaQueryListListenerTemplate(data->rawTemplate(&info, worldType), isolate, worldType);
    125     data->templateMap(worldType).add(&info, templ);
     124        ConfigureV8TestMediaQueryListListenerTemplate(data->rawTemplate(&info), isolate, worldType);
     125    data->templateMap().add(&info, templ);
    126126    return templ;
    127127}
    128128
    129 bool V8TestMediaQueryListListener::HasInstance(v8::Handle<v8::Value> value, v8::Isolate* isolate, WrapperWorldType worldType)
     129bool V8TestMediaQueryListListener::HasInstance(v8::Handle<v8::Value> value, v8::Isolate* isolate)
    130130{
    131     return V8PerIsolateData::from(isolate)->hasInstance(&info, value, worldType);
     131    return V8PerIsolateData::from(isolate)->hasInstance(&info, value);
    132132}
    133133
  • trunk/Source/WebCore/bindings/scripts/test/V8/V8TestMediaQueryListListener.h

    r145554 r145575  
    3535public:
    3636    static const bool hasDependentLifetime = false;
    37     static bool HasInstance(v8::Handle<v8::Value>, v8::Isolate*, WrapperWorldType = GetFromContext);
     37    static bool HasInstance(v8::Handle<v8::Value>, v8::Isolate*);
    3838    static v8::Persistent<v8::FunctionTemplate> GetTemplate(v8::Isolate*, WrapperWorldType);
    3939    static TestMediaQueryListListener* toNative(v8::Handle<v8::Object> object)
  • trunk/Source/WebCore/bindings/scripts/test/V8/V8TestNamedConstructor.cpp

    r145554 r145575  
    147147{
    148148    V8PerIsolateData* data = V8PerIsolateData::from(isolate);
    149     V8PerIsolateData::TemplateMap::iterator result = data->templateMap(worldType).find(&info);
    150     if (result != data->templateMap(worldType).end())
     149    V8PerIsolateData::TemplateMap::iterator result = data->templateMap().find(&info);
     150    if (result != data->templateMap().end())
    151151        return result->value;
    152152
    153153    v8::HandleScope handleScope;
    154154    v8::Persistent<v8::FunctionTemplate> templ =
    155         ConfigureV8TestNamedConstructorTemplate(data->rawTemplate(&info, worldType), isolate, worldType);
    156     data->templateMap(worldType).add(&info, templ);
     155        ConfigureV8TestNamedConstructorTemplate(data->rawTemplate(&info), isolate, worldType);
     156    data->templateMap().add(&info, templ);
    157157    return templ;
    158158}
    159159
    160 bool V8TestNamedConstructor::HasInstance(v8::Handle<v8::Value> value, v8::Isolate* isolate, WrapperWorldType worldType)
     160bool V8TestNamedConstructor::HasInstance(v8::Handle<v8::Value> value, v8::Isolate* isolate)
    161161{
    162     return V8PerIsolateData::from(isolate)->hasInstance(&info, value, worldType);
     162    return V8PerIsolateData::from(isolate)->hasInstance(&info, value);
    163163}
    164164
  • trunk/Source/WebCore/bindings/scripts/test/V8/V8TestNamedConstructor.h

    r145554 r145575  
    4141public:
    4242    static const bool hasDependentLifetime = true;
    43     static bool HasInstance(v8::Handle<v8::Value>, v8::Isolate*, WrapperWorldType = GetFromContext);
     43    static bool HasInstance(v8::Handle<v8::Value>, v8::Isolate*);
    4444    static v8::Persistent<v8::FunctionTemplate> GetTemplate(v8::Isolate*, WrapperWorldType);
    4545    static TestNamedConstructor* toNative(v8::Handle<v8::Object> object)
  • trunk/Source/WebCore/bindings/scripts/test/V8/V8TestNode.cpp

    r145554 r145575  
    114114{
    115115    V8PerIsolateData* data = V8PerIsolateData::from(isolate);
    116     V8PerIsolateData::TemplateMap::iterator result = data->templateMap(worldType).find(&info);
    117     if (result != data->templateMap(worldType).end())
     116    V8PerIsolateData::TemplateMap::iterator result = data->templateMap().find(&info);
     117    if (result != data->templateMap().end())
    118118        return result->value;
    119119
    120120    v8::HandleScope handleScope;
    121121    v8::Persistent<v8::FunctionTemplate> templ =
    122         ConfigureV8TestNodeTemplate(data->rawTemplate(&info, worldType), isolate, worldType);
    123     data->templateMap(worldType).add(&info, templ);
     122        ConfigureV8TestNodeTemplate(data->rawTemplate(&info), isolate, worldType);
     123    data->templateMap().add(&info, templ);
    124124    return templ;
    125125}
    126126
    127 bool V8TestNode::HasInstance(v8::Handle<v8::Value> value, v8::Isolate* isolate, WrapperWorldType worldType)
     127bool V8TestNode::HasInstance(v8::Handle<v8::Value> value, v8::Isolate* isolate)
    128128{
    129     return V8PerIsolateData::from(isolate)->hasInstance(&info, value, worldType);
     129    return V8PerIsolateData::from(isolate)->hasInstance(&info, value);
    130130}
    131131
  • trunk/Source/WebCore/bindings/scripts/test/V8/V8TestNode.h

    r145554 r145575  
    3535public:
    3636    static const bool hasDependentLifetime = true;
    37     static bool HasInstance(v8::Handle<v8::Value>, v8::Isolate*, WrapperWorldType = GetFromContext);
     37    static bool HasInstance(v8::Handle<v8::Value>, v8::Isolate*);
    3838    static v8::Persistent<v8::FunctionTemplate> GetTemplate(v8::Isolate*, WrapperWorldType);
    3939    static TestNode* toNative(v8::Handle<v8::Object> object)
  • trunk/Source/WebCore/bindings/scripts/test/V8/V8TestObj.cpp

    r145554 r145575  
    30633063    // Custom Signature 'voidMethodWithArgs'
    30643064    const int voidMethodWithArgsArgc = 3;
    3065     v8::Handle<v8::FunctionTemplate> voidMethodWithArgsArgv[voidMethodWithArgsArgc] = { v8::Handle<v8::FunctionTemplate>(), v8::Handle<v8::FunctionTemplate>(), V8PerIsolateData::from(isolate)->rawTemplate(&V8TestObj::info, worldType) };
     3065    v8::Handle<v8::FunctionTemplate> voidMethodWithArgsArgv[voidMethodWithArgsArgc] = { v8::Handle<v8::FunctionTemplate>(), v8::Handle<v8::FunctionTemplate>(), V8PerIsolateData::from(isolate)->rawTemplate(&V8TestObj::info) };
    30663066    v8::Handle<v8::Signature> voidMethodWithArgsSignature = v8::Signature::New(desc, voidMethodWithArgsArgc, voidMethodWithArgsArgv);
    30673067    proto->Set(v8::String::NewSymbol("voidMethodWithArgs"), v8::FunctionTemplate::New(TestObjV8Internal::voidMethodWithArgsMethodCallback, v8Undefined(), voidMethodWithArgsSignature));
     
    30693069    // Custom Signature 'longMethodWithArgs'
    30703070    const int longMethodWithArgsArgc = 3;
    3071     v8::Handle<v8::FunctionTemplate> longMethodWithArgsArgv[longMethodWithArgsArgc] = { v8::Handle<v8::FunctionTemplate>(), v8::Handle<v8::FunctionTemplate>(), V8PerIsolateData::from(isolate)->rawTemplate(&V8TestObj::info, worldType) };
     3071    v8::Handle<v8::FunctionTemplate> longMethodWithArgsArgv[longMethodWithArgsArgc] = { v8::Handle<v8::FunctionTemplate>(), v8::Handle<v8::FunctionTemplate>(), V8PerIsolateData::from(isolate)->rawTemplate(&V8TestObj::info) };
    30723072    v8::Handle<v8::Signature> longMethodWithArgsSignature = v8::Signature::New(desc, longMethodWithArgsArgc, longMethodWithArgsArgv);
    30733073    proto->Set(v8::String::NewSymbol("longMethodWithArgs"), v8::FunctionTemplate::New(TestObjV8Internal::longMethodWithArgsMethodCallback, v8Undefined(), longMethodWithArgsSignature));
     
    30753075    // Custom Signature 'objMethodWithArgs'
    30763076    const int objMethodWithArgsArgc = 3;
    3077     v8::Handle<v8::FunctionTemplate> objMethodWithArgsArgv[objMethodWithArgsArgc] = { v8::Handle<v8::FunctionTemplate>(), v8::Handle<v8::FunctionTemplate>(), V8PerIsolateData::from(isolate)->rawTemplate(&V8TestObj::info, worldType) };
     3077    v8::Handle<v8::FunctionTemplate> objMethodWithArgsArgv[objMethodWithArgsArgc] = { v8::Handle<v8::FunctionTemplate>(), v8::Handle<v8::FunctionTemplate>(), V8PerIsolateData::from(isolate)->rawTemplate(&V8TestObj::info) };
    30783078    v8::Handle<v8::Signature> objMethodWithArgsSignature = v8::Signature::New(desc, objMethodWithArgsArgc, objMethodWithArgsArgv);
    30793079    proto->Set(v8::String::NewSymbol("objMethodWithArgs"), v8::FunctionTemplate::New(TestObjV8Internal::objMethodWithArgsMethodCallback, v8Undefined(), objMethodWithArgsSignature));
     
    30813081    // Custom Signature 'methodWithSequenceArg'
    30823082    const int methodWithSequenceArgArgc = 1;
    3083     v8::Handle<v8::FunctionTemplate> methodWithSequenceArgArgv[methodWithSequenceArgArgc] = { V8PerIsolateData::from(isolate)->rawTemplate(&V8sequence<ScriptProfile>::info, worldType) };
     3083    v8::Handle<v8::FunctionTemplate> methodWithSequenceArgArgv[methodWithSequenceArgArgc] = { V8PerIsolateData::from(isolate)->rawTemplate(&V8sequence<ScriptProfile>::info) };
    30843084    v8::Handle<v8::Signature> methodWithSequenceArgSignature = v8::Signature::New(desc, methodWithSequenceArgArgc, methodWithSequenceArgArgv);
    30853085    proto->Set(v8::String::NewSymbol("methodWithSequenceArg"), v8::FunctionTemplate::New(TestObjV8Internal::methodWithSequenceArgMethodCallback, v8Undefined(), methodWithSequenceArgSignature));
     
    30873087    // Custom Signature 'methodThatRequiresAllArgsAndThrows'
    30883088    const int methodThatRequiresAllArgsAndThrowsArgc = 2;
    3089     v8::Handle<v8::FunctionTemplate> methodThatRequiresAllArgsAndThrowsArgv[methodThatRequiresAllArgsAndThrowsArgc] = { v8::Handle<v8::FunctionTemplate>(), V8PerIsolateData::from(isolate)->rawTemplate(&V8TestObj::info, worldType) };
     3089    v8::Handle<v8::FunctionTemplate> methodThatRequiresAllArgsAndThrowsArgv[methodThatRequiresAllArgsAndThrowsArgc] = { v8::Handle<v8::FunctionTemplate>(), V8PerIsolateData::from(isolate)->rawTemplate(&V8TestObj::info) };
    30903090    v8::Handle<v8::Signature> methodThatRequiresAllArgsAndThrowsSignature = v8::Signature::New(desc, methodThatRequiresAllArgsAndThrowsArgc, methodThatRequiresAllArgsAndThrowsArgv);
    30913091    proto->Set(v8::String::NewSymbol("methodThatRequiresAllArgsAndThrows"), v8::FunctionTemplate::New(TestObjV8Internal::methodThatRequiresAllArgsAndThrowsMethodCallback, v8Undefined(), methodThatRequiresAllArgsAndThrowsSignature));
     
    31053105    // Custom Signature 'stringArrayFunction'
    31063106    const int stringArrayFunctionArgc = 1;
    3107     v8::Handle<v8::FunctionTemplate> stringArrayFunctionArgv[stringArrayFunctionArgc] = { V8PerIsolateData::from(isolate)->rawTemplate(&V8DOMString[]::info, worldType) };
     3107    v8::Handle<v8::FunctionTemplate> stringArrayFunctionArgv[stringArrayFunctionArgc] = { V8PerIsolateData::from(isolate)->rawTemplate(&V8DOMString[]::info) };
    31083108    v8::Handle<v8::Signature> stringArrayFunctionSignature = v8::Signature::New(desc, stringArrayFunctionArgc, stringArrayFunctionArgv);
    31093109    proto->Set(v8::String::NewSymbol("stringArrayFunction"), v8::FunctionTemplate::New(TestObjV8Internal::stringArrayFunctionMethodCallback, v8Undefined(), stringArrayFunctionSignature));
     
    31113111    // Custom Signature 'domStringListFunction'
    31123112    const int domStringListFunctionArgc = 1;
    3113     v8::Handle<v8::FunctionTemplate> domStringListFunctionArgv[domStringListFunctionArgc] = { V8PerIsolateData::from(isolate)->rawTemplate(&V8DOMStringList::info, worldType) };
     3113    v8::Handle<v8::FunctionTemplate> domStringListFunctionArgv[domStringListFunctionArgc] = { V8PerIsolateData::from(isolate)->rawTemplate(&V8DOMStringList::info) };
    31143114    v8::Handle<v8::Signature> domStringListFunctionSignature = v8::Signature::New(desc, domStringListFunctionArgc, domStringListFunctionArgv);
    31153115    proto->Set(v8::String::NewSymbol("domStringListFunction"), v8::FunctionTemplate::New(TestObjV8Internal::domStringListFunctionMethodCallback, v8Undefined(), domStringListFunctionSignature));
     
    31173117    // Custom Signature 'convert1'
    31183118    const int convert1Argc = 1;
    3119     v8::Handle<v8::FunctionTemplate> convert1Argv[convert1Argc] = { V8PerIsolateData::from(isolate)->rawTemplate(&V8a::info, worldType) };
     3119    v8::Handle<v8::FunctionTemplate> convert1Argv[convert1Argc] = { V8PerIsolateData::from(isolate)->rawTemplate(&V8a::info) };
    31203120    v8::Handle<v8::Signature> convert1Signature = v8::Signature::New(desc, convert1Argc, convert1Argv);
    31213121    proto->Set(v8::String::NewSymbol("convert1"), v8::FunctionTemplate::New(TestObjV8Internal::convert1MethodCallback, v8Undefined(), convert1Signature));
     
    31233123    // Custom Signature 'convert2'
    31243124    const int convert2Argc = 1;
    3125     v8::Handle<v8::FunctionTemplate> convert2Argv[convert2Argc] = { V8PerIsolateData::from(isolate)->rawTemplate(&V8b::info, worldType) };
     3125    v8::Handle<v8::FunctionTemplate> convert2Argv[convert2Argc] = { V8PerIsolateData::from(isolate)->rawTemplate(&V8b::info) };
    31263126    v8::Handle<v8::Signature> convert2Signature = v8::Signature::New(desc, convert2Argc, convert2Argv);
    31273127    proto->Set(v8::String::NewSymbol("convert2"), v8::FunctionTemplate::New(TestObjV8Internal::convert2MethodCallback, v8Undefined(), convert2Signature));
     
    31293129    // Custom Signature 'convert4'
    31303130    const int convert4Argc = 1;
    3131     v8::Handle<v8::FunctionTemplate> convert4Argv[convert4Argc] = { V8PerIsolateData::from(isolate)->rawTemplate(&V8d::info, worldType) };
     3131    v8::Handle<v8::FunctionTemplate> convert4Argv[convert4Argc] = { V8PerIsolateData::from(isolate)->rawTemplate(&V8d::info) };
    31323132    v8::Handle<v8::Signature> convert4Signature = v8::Signature::New(desc, convert4Argc, convert4Argv);
    31333133    proto->Set(v8::String::NewSymbol("convert4"), v8::FunctionTemplate::New(TestObjV8Internal::convert4MethodCallback, v8Undefined(), convert4Signature));
     
    31353135    // Custom Signature 'convert5'
    31363136    const int convert5Argc = 1;
    3137     v8::Handle<v8::FunctionTemplate> convert5Argv[convert5Argc] = { V8PerIsolateData::from(isolate)->rawTemplate(&V8e::info, worldType) };
     3137    v8::Handle<v8::FunctionTemplate> convert5Argv[convert5Argc] = { V8PerIsolateData::from(isolate)->rawTemplate(&V8e::info) };
    31383138    v8::Handle<v8::Signature> convert5Signature = v8::Signature::New(desc, convert5Argc, convert5Argv);
    31393139    proto->Set(v8::String::NewSymbol("convert5"), v8::FunctionTemplate::New(TestObjV8Internal::convert5MethodCallback, v8Undefined(), convert5Signature));
     
    31413141    // Custom Signature 'variadicNodeMethod'
    31423142    const int variadicNodeMethodArgc = 2;
    3143     v8::Handle<v8::FunctionTemplate> variadicNodeMethodArgv[variadicNodeMethodArgc] = { V8PerIsolateData::from(isolate)->rawTemplate(&V8Node::info, worldType), V8PerIsolateData::from(isolate)->rawTemplate(&V8Node::info, worldType) };
     3143    v8::Handle<v8::FunctionTemplate> variadicNodeMethodArgv[variadicNodeMethodArgc] = { V8PerIsolateData::from(isolate)->rawTemplate(&V8Node::info), V8PerIsolateData::from(isolate)->rawTemplate(&V8Node::info) };
    31443144    v8::Handle<v8::Signature> variadicNodeMethodSignature = v8::Signature::New(desc, variadicNodeMethodArgc, variadicNodeMethodArgv);
    31453145    proto->Set(v8::String::NewSymbol("variadicNodeMethod"), v8::FunctionTemplate::New(TestObjV8Internal::variadicNodeMethodMethodCallback, v8Undefined(), variadicNodeMethodSignature));
     
    31543154{
    31553155    V8PerIsolateData* data = V8PerIsolateData::from(isolate);
    3156     V8PerIsolateData::TemplateMap::iterator result = data->templateMap(worldType).find(&info);
    3157     if (result != data->templateMap(worldType).end())
     3156    V8PerIsolateData::TemplateMap::iterator result = data->templateMap().find(&info);
     3157    if (result != data->templateMap().end())
    31583158        return result->value;
    31593159
    31603160    v8::HandleScope handleScope;
    31613161    v8::Persistent<v8::FunctionTemplate> templ =
    3162         ConfigureV8TestObjTemplate(data->rawTemplate(&info, worldType), isolate, worldType);
    3163     data->templateMap(worldType).add(&info, templ);
     3162        ConfigureV8TestObjTemplate(data->rawTemplate(&info), isolate, worldType);
     3163    data->templateMap().add(&info, templ);
    31643164    return templ;
    31653165}
    31663166
    3167 bool V8TestObj::HasInstance(v8::Handle<v8::Value> value, v8::Isolate* isolate, WrapperWorldType worldType)
    3168 {
    3169     return V8PerIsolateData::from(isolate)->hasInstance(&info, value, worldType);
     3167bool V8TestObj::HasInstance(v8::Handle<v8::Value> value, v8::Isolate* isolate)
     3168{
     3169    return V8PerIsolateData::from(isolate)->hasInstance(&info, value);
    31703170}
    31713171
  • trunk/Source/WebCore/bindings/scripts/test/V8/V8TestObj.h

    r145554 r145575  
    3535public:
    3636    static const bool hasDependentLifetime = false;
    37     static bool HasInstance(v8::Handle<v8::Value>, v8::Isolate*, WrapperWorldType = GetFromContext);
     37    static bool HasInstance(v8::Handle<v8::Value>, v8::Isolate*);
    3838    static v8::Persistent<v8::FunctionTemplate> GetTemplate(v8::Isolate*, WrapperWorldType);
    3939    static TestObj* toNative(v8::Handle<v8::Object> object)
  • trunk/Source/WebCore/bindings/scripts/test/V8/V8TestOverloadedConstructors.cpp

    r145554 r145575  
    168168{
    169169    V8PerIsolateData* data = V8PerIsolateData::from(isolate);
    170     V8PerIsolateData::TemplateMap::iterator result = data->templateMap(worldType).find(&info);
    171     if (result != data->templateMap(worldType).end())
     170    V8PerIsolateData::TemplateMap::iterator result = data->templateMap().find(&info);
     171    if (result != data->templateMap().end())
    172172        return result->value;
    173173
    174174    v8::HandleScope handleScope;
    175175    v8::Persistent<v8::FunctionTemplate> templ =
    176         ConfigureV8TestOverloadedConstructorsTemplate(data->rawTemplate(&info, worldType), isolate, worldType);
    177     data->templateMap(worldType).add(&info, templ);
     176        ConfigureV8TestOverloadedConstructorsTemplate(data->rawTemplate(&info), isolate, worldType);
     177    data->templateMap().add(&info, templ);
    178178    return templ;
    179179}
    180180
    181 bool V8TestOverloadedConstructors::HasInstance(v8::Handle<v8::Value> value, v8::Isolate* isolate, WrapperWorldType worldType)
    182 {
    183     return V8PerIsolateData::from(isolate)->hasInstance(&info, value, worldType);
     181bool V8TestOverloadedConstructors::HasInstance(v8::Handle<v8::Value> value, v8::Isolate* isolate)
     182{
     183    return V8PerIsolateData::from(isolate)->hasInstance(&info, value);
    184184}
    185185
  • trunk/Source/WebCore/bindings/scripts/test/V8/V8TestOverloadedConstructors.h

    r145554 r145575  
    3535public:
    3636    static const bool hasDependentLifetime = false;
    37     static bool HasInstance(v8::Handle<v8::Value>, v8::Isolate*, WrapperWorldType = GetFromContext);
     37    static bool HasInstance(v8::Handle<v8::Value>, v8::Isolate*);
    3838    static v8::Persistent<v8::FunctionTemplate> GetTemplate(v8::Isolate*, WrapperWorldType);
    3939    static TestOverloadedConstructors* toNative(v8::Handle<v8::Object> object)
  • trunk/Source/WebCore/bindings/scripts/test/V8/V8TestSerializedScriptValueInterface.cpp

    r145554 r145575  
    333333{
    334334    V8PerIsolateData* data = V8PerIsolateData::from(isolate);
    335     V8PerIsolateData::TemplateMap::iterator result = data->templateMap(worldType).find(&info);
    336     if (result != data->templateMap(worldType).end())
     335    V8PerIsolateData::TemplateMap::iterator result = data->templateMap().find(&info);
     336    if (result != data->templateMap().end())
    337337        return result->value;
    338338
    339339    v8::HandleScope handleScope;
    340340    v8::Persistent<v8::FunctionTemplate> templ =
    341         ConfigureV8TestSerializedScriptValueInterfaceTemplate(data->rawTemplate(&info, worldType), isolate, worldType);
    342     data->templateMap(worldType).add(&info, templ);
     341        ConfigureV8TestSerializedScriptValueInterfaceTemplate(data->rawTemplate(&info), isolate, worldType);
     342    data->templateMap().add(&info, templ);
    343343    return templ;
    344344}
    345345
    346 bool V8TestSerializedScriptValueInterface::HasInstance(v8::Handle<v8::Value> value, v8::Isolate* isolate, WrapperWorldType worldType)
    347 {
    348     return V8PerIsolateData::from(isolate)->hasInstance(&info, value, worldType);
     346bool V8TestSerializedScriptValueInterface::HasInstance(v8::Handle<v8::Value> value, v8::Isolate* isolate)
     347{
     348    return V8PerIsolateData::from(isolate)->hasInstance(&info, value);
    349349}
    350350
  • trunk/Source/WebCore/bindings/scripts/test/V8/V8TestSerializedScriptValueInterface.h

    r145554 r145575  
    3636public:
    3737    static const bool hasDependentLifetime = false;
    38     static bool HasInstance(v8::Handle<v8::Value>, v8::Isolate*, WrapperWorldType = GetFromContext);
     38    static bool HasInstance(v8::Handle<v8::Value>, v8::Isolate*);
    3939    static v8::Persistent<v8::FunctionTemplate> GetTemplate(v8::Isolate*, WrapperWorldType);
    4040    static TestSerializedScriptValueInterface* toNative(v8::Handle<v8::Object> object)
  • trunk/Source/WebCore/bindings/scripts/test/V8/V8TestTypedefs.cpp

    r145554 r145575  
    552552    // Custom Signature 'methodWithSequenceArg'
    553553    const int methodWithSequenceArgArgc = 1;
    554     v8::Handle<v8::FunctionTemplate> methodWithSequenceArgArgv[methodWithSequenceArgArgc] = { V8PerIsolateData::from(isolate)->rawTemplate(&V8sequence<SerializedScriptValue>::info, worldType) };
     554    v8::Handle<v8::FunctionTemplate> methodWithSequenceArgArgv[methodWithSequenceArgArgc] = { V8PerIsolateData::from(isolate)->rawTemplate(&V8sequence<SerializedScriptValue>::info) };
    555555    v8::Handle<v8::Signature> methodWithSequenceArgSignature = v8::Signature::New(desc, methodWithSequenceArgArgc, methodWithSequenceArgArgv);
    556556    proto->Set(v8::String::NewSymbol("methodWithSequenceArg"), v8::FunctionTemplate::New(TestTypedefsV8Internal::methodWithSequenceArgMethodCallback, v8Undefined(), methodWithSequenceArgSignature));
     
    558558    // Custom Signature 'nullableArrayArg'
    559559    const int nullableArrayArgArgc = 1;
    560     v8::Handle<v8::FunctionTemplate> nullableArrayArgArgv[nullableArrayArgArgc] = { V8PerIsolateData::from(isolate)->rawTemplate(&V8DOMString[]::info, worldType) };
     560    v8::Handle<v8::FunctionTemplate> nullableArrayArgArgv[nullableArrayArgArgc] = { V8PerIsolateData::from(isolate)->rawTemplate(&V8DOMString[]::info) };
    561561    v8::Handle<v8::Signature> nullableArrayArgSignature = v8::Signature::New(desc, nullableArrayArgArgc, nullableArrayArgArgv);
    562562    proto->Set(v8::String::NewSymbol("nullableArrayArg"), v8::FunctionTemplate::New(TestTypedefsV8Internal::nullableArrayArgMethodCallback, v8Undefined(), nullableArrayArgSignature));
     
    564564    // Custom Signature 'stringArrayFunction'
    565565    const int stringArrayFunctionArgc = 1;
    566     v8::Handle<v8::FunctionTemplate> stringArrayFunctionArgv[stringArrayFunctionArgc] = { V8PerIsolateData::from(isolate)->rawTemplate(&V8DOMString[]::info, worldType) };
     566    v8::Handle<v8::FunctionTemplate> stringArrayFunctionArgv[stringArrayFunctionArgc] = { V8PerIsolateData::from(isolate)->rawTemplate(&V8DOMString[]::info) };
    567567    v8::Handle<v8::Signature> stringArrayFunctionSignature = v8::Signature::New(desc, stringArrayFunctionArgc, stringArrayFunctionArgv);
    568568    proto->Set(v8::String::NewSymbol("stringArrayFunction"), v8::FunctionTemplate::New(TestTypedefsV8Internal::stringArrayFunctionMethodCallback, v8Undefined(), stringArrayFunctionSignature));
     
    570570    // Custom Signature 'stringArrayFunction2'
    571571    const int stringArrayFunction2Argc = 1;
    572     v8::Handle<v8::FunctionTemplate> stringArrayFunction2Argv[stringArrayFunction2Argc] = { V8PerIsolateData::from(isolate)->rawTemplate(&V8DOMString[]::info, worldType) };
     572    v8::Handle<v8::FunctionTemplate> stringArrayFunction2Argv[stringArrayFunction2Argc] = { V8PerIsolateData::from(isolate)->rawTemplate(&V8DOMString[]::info) };
    573573    v8::Handle<v8::Signature> stringArrayFunction2Signature = v8::Signature::New(desc, stringArrayFunction2Argc, stringArrayFunction2Argv);
    574574    proto->Set(v8::String::NewSymbol("stringArrayFunction2"), v8::FunctionTemplate::New(TestTypedefsV8Internal::stringArrayFunction2MethodCallback, v8Undefined(), stringArrayFunction2Signature));
     
    582582{
    583583    V8PerIsolateData* data = V8PerIsolateData::from(isolate);
    584     V8PerIsolateData::TemplateMap::iterator result = data->templateMap(worldType).find(&info);
    585     if (result != data->templateMap(worldType).end())
     584    V8PerIsolateData::TemplateMap::iterator result = data->templateMap().find(&info);
     585    if (result != data->templateMap().end())
    586586        return result->value;
    587587
    588588    v8::HandleScope handleScope;
    589589    v8::Persistent<v8::FunctionTemplate> templ =
    590         ConfigureV8TestTypedefsTemplate(data->rawTemplate(&info, worldType), isolate, worldType);
    591     data->templateMap(worldType).add(&info, templ);
     590        ConfigureV8TestTypedefsTemplate(data->rawTemplate(&info), isolate, worldType);
     591    data->templateMap().add(&info, templ);
    592592    return templ;
    593593}
    594594
    595 bool V8TestTypedefs::HasInstance(v8::Handle<v8::Value> value, v8::Isolate* isolate, WrapperWorldType worldType)
    596 {
    597     return V8PerIsolateData::from(isolate)->hasInstance(&info, value, worldType);
     595bool V8TestTypedefs::HasInstance(v8::Handle<v8::Value> value, v8::Isolate* isolate)
     596{
     597    return V8PerIsolateData::from(isolate)->hasInstance(&info, value);
    598598}
    599599
  • trunk/Source/WebCore/bindings/scripts/test/V8/V8TestTypedefs.h

    r145554 r145575  
    3535public:
    3636    static const bool hasDependentLifetime = false;
    37     static bool HasInstance(v8::Handle<v8::Value>, v8::Isolate*, WrapperWorldType = GetFromContext);
     37    static bool HasInstance(v8::Handle<v8::Value>, v8::Isolate*);
    3838    static v8::Persistent<v8::FunctionTemplate> GetTemplate(v8::Isolate*, WrapperWorldType);
    3939    static TestTypedefs* toNative(v8::Handle<v8::Object> object)
  • trunk/Source/WebCore/bindings/v8/V8AdaptorFunction.cpp

    r145554 r145575  
    4545    ASSERT(isolate);
    4646    V8PerIsolateData* data = V8PerIsolateData::from(isolate);
    47     V8PerIsolateData::TemplateMap::iterator result = data->rawTemplateMap(worldType).find(&info);
    48     if (result != data->rawTemplateMap(worldType).end())
     47    V8PerIsolateData::TemplateMap::iterator result = data->rawTemplateMap().find(&info);
     48    if (result != data->rawTemplateMap().end())
    4949        return result->value;
    5050    // The lifetime is of newTemplate is delegated to the TemplateMap thus this won't be leaked.
    5151    v8::Persistent<v8::FunctionTemplate> newTemplate = v8::Persistent<v8::FunctionTemplate>::New(isolate, v8::FunctionTemplate::New());
    52     data->rawTemplateMap(worldType).add(&info, configureTemplate(newTemplate));
     52    data->rawTemplateMap().add(&info, configureTemplate(newTemplate));
    5353    return newTemplate;
    5454}
  • trunk/Source/WebCore/bindings/v8/V8GCController.cpp

    r145554 r145575  
    304304        v8::Persistent<v8::Object> wrapper = v8::Persistent<v8::Object>::Cast(value);
    305305        ASSERT(V8DOMWrapper::maybeDOMWrapper(value));
    306         ASSERT(V8Node::HasInstance(wrapper, m_isolate, MainWorld) || V8Node::HasInstance(wrapper, m_isolate, IsolatedWorld));
     306        ASSERT(V8Node::HasInstance(wrapper, m_isolate));
    307307        Node* node = V8Node::toNative(wrapper);
    308308        // A minor DOM GC can handle only node wrappers in the main world.
     
    377377        if (classId == v8DOMNodeClassId) {
    378378            UNUSED_PARAM(m_isolate);
    379             ASSERT(V8Node::HasInstance(wrapper, m_isolate, MainWorld) || V8Node::HasInstance(wrapper, m_isolate, IsolatedWorld));
     379            ASSERT(V8Node::HasInstance(wrapper, m_isolate));
    380380            ASSERT(!wrapper.IsIndependent(m_isolate));
    381381
  • trunk/Source/WebCore/bindings/v8/V8PerIsolateData.cpp

    r145554 r145575  
    105105{
    106106    MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::Binding);
    107     info.addMember(m_rawTemplatesForMainWorld, "rawTemplatesForMainWorld");
    108     info.addMember(m_rawTemplatesForNonMainWorld, "rawTemplatesForNonMainWorld");
    109     info.addMember(m_templatesForMainWorld, "templatesForMainWorld");
    110     info.addMember(m_templatesForNonMainWorld, "templatesForNonMainWorld");
     107    info.addMember(m_rawTemplates, "rawTemplates");
     108    info.addMember(m_templates, "templates");
    111109    info.addMember(m_stringCache, "stringCache");
    112110    info.addMember(m_integerCache, "integerCache");
     
    125123}
    126124
    127 v8::Persistent<v8::FunctionTemplate> V8PerIsolateData::privateTemplate(WrapperWorldType currentWorldType, void* privatePointer, v8::InvocationCallback callback, v8::Handle<v8::Value> data, v8::Handle<v8::Signature> signature, int length)
     125v8::Persistent<v8::FunctionTemplate> V8PerIsolateData::privateTemplate(WrapperWorldType, void* privatePointer, v8::InvocationCallback callback, v8::Handle<v8::Value> data, v8::Handle<v8::Signature> signature, int length)
    128126{
    129     ASSERT(currentWorldType != GetFromContext);
    130127    v8::Persistent<v8::FunctionTemplate> privateTemplate;
    131     TemplateMap& templates = templateMap(currentWorldType);
    132     TemplateMap::iterator result = templates.find(privatePointer);
    133     if (result != templates.end())
     128    V8PerIsolateData::TemplateMap::iterator result = m_templates.find(privatePointer);
     129    if (result != m_templates.end())
    134130        return result->value;
    135131    v8::Persistent<v8::FunctionTemplate> newPrivateTemplate = v8::Persistent<v8::FunctionTemplate>::New(m_isolate, v8::FunctionTemplate::New(callback, data, signature, length));
    136     templates.add(privatePointer, newPrivateTemplate);
     132    m_templates.add(privatePointer, newPrivateTemplate);
    137133    return newPrivateTemplate;
    138134}
    139135
    140 v8::Persistent<v8::FunctionTemplate> V8PerIsolateData::rawTemplate(WrapperTypeInfo* info, WrapperWorldType currentWorldType)
     136v8::Persistent<v8::FunctionTemplate> V8PerIsolateData::rawTemplate(WrapperTypeInfo* info)
    141137{
    142     ASSERT(currentWorldType != GetFromContext);
    143     TemplateMap& templates = rawTemplateMap(currentWorldType);
    144     TemplateMap::iterator result = templates.find(info);
    145     if (result != templates.end())
     138    TemplateMap::iterator result = m_rawTemplates.find(info);
     139    if (result != m_rawTemplates.end())
    146140        return result->value;
    147141
    148142    v8::HandleScope handleScope;
    149143    v8::Persistent<v8::FunctionTemplate> templ = createRawTemplate(m_isolate);
    150     templates.add(info, templ);
     144    m_rawTemplates.add(info, templ);
    151145    return templ;
    152146}
    153147
    154 bool V8PerIsolateData::hasInstance(WrapperTypeInfo* info, v8::Handle<v8::Value> value, WrapperWorldType currentWorldType)
     148bool V8PerIsolateData::hasInstance(WrapperTypeInfo* info, v8::Handle<v8::Value> value)
    155149{
    156     if (currentWorldType == GetFromContext)
    157         currentWorldType = worldType(m_isolate);
    158     TemplateMap& templates = rawTemplateMap(currentWorldType);
    159     TemplateMap::iterator result = templates.find(info);
    160     if (result == templates.end())
    161         return false;
    162     return result->value->HasInstance(value);
     150    return rawTemplate(info)->HasInstance(value);
    163151}
    164152
  • trunk/Source/WebCore/bindings/v8/V8PerIsolateData.h

    r145554 r145575  
    6868    typedef HashMap<void*, v8::Persistent<v8::FunctionTemplate> > TemplateMap;
    6969
    70     TemplateMap& rawTemplateMap(WrapperWorldType worldType)
    71     {
    72         if (worldType == MainWorld)
    73             return m_rawTemplatesForMainWorld;
    74         return m_rawTemplatesForNonMainWorld;
    75     }
    76 
    77     TemplateMap& templateMap(WrapperWorldType worldType)
    78     {
    79         if (worldType == MainWorld)
    80             return m_templatesForMainWorld;
    81         return m_templatesForNonMainWorld;
    82     }
     70    TemplateMap& rawTemplateMap() { return m_rawTemplates; }
     71    TemplateMap& templateMap() { return m_templates; }
    8372
    8473    v8::Handle<v8::FunctionTemplate> toStringTemplate();
     
    142131    v8::Persistent<v8::FunctionTemplate> privateTemplate(WrapperWorldType, void* privatePointer, v8::InvocationCallback, v8::Handle<v8::Value> data, v8::Handle<v8::Signature>, int length = 0);
    143132
    144     v8::Persistent<v8::FunctionTemplate> rawTemplate(WrapperTypeInfo*, WrapperWorldType);
     133    v8::Persistent<v8::FunctionTemplate> rawTemplate(WrapperTypeInfo*);
    145134
    146     bool hasInstance(WrapperTypeInfo*, v8::Handle<v8::Value>, WrapperWorldType);
     135    bool hasInstance(WrapperTypeInfo*, v8::Handle<v8::Value>);
    147136
    148137private:
     
    152141
    153142    v8::Isolate* m_isolate;
    154     TemplateMap m_rawTemplatesForMainWorld;
    155     TemplateMap m_rawTemplatesForNonMainWorld;
    156     TemplateMap m_templatesForMainWorld;
    157     TemplateMap m_templatesForNonMainWorld;
     143    TemplateMap m_rawTemplates;
     144    TemplateMap m_templates;
    158145    ScopedPersistent<v8::FunctionTemplate> m_toStringTemplate;
    159146    v8::Persistent<v8::FunctionTemplate> m_lazyEventListenerToStringTemplate;
  • trunk/Source/WebCore/bindings/v8/WrapperTypeInfo.h

    r145554 r145575  
    5353        MainWorld,
    5454        IsolatedWorld,
    55         WorkerWorld,
    56         // Whatever world type the current context has. FIXME: remove this.
    57         GetFromContext
     55        WorkerWorld
    5856    };
    5957
  • trunk/Source/WebCore/bindings/v8/custom/V8LocationCustom.cpp

    r145554 r145575  
    144144    WrapperWorldType currentWorldType = worldType(isolate);
    145145    V8PerIsolateData* data = V8PerIsolateData::from(info.GetIsolate());
    146     v8::Persistent<v8::FunctionTemplate> privateTemplate = data->privateTemplate(currentWorldType, &privateTemplateUniqueKey, V8Location::reloadMethodCustom, v8Undefined(), v8::Signature::New(data->rawTemplate(&V8Location::info, currentWorldType)));
     146    v8::Persistent<v8::FunctionTemplate> privateTemplate = data->privateTemplate(currentWorldType, &privateTemplateUniqueKey, V8Location::reloadMethodCustom, v8Undefined(), v8::Signature::New(data->rawTemplate(&V8Location::info)));
    147147
    148148    v8::Handle<v8::Object> holder = info.This()->FindInstanceInPrototypeChain(V8Location::GetTemplate(isolate, currentWorldType));
     
    155155    if (!BindingSecurity::shouldAllowAccessToFrame(BindingState::instance(), imp->frame(), DoNotReportSecurityError)) {
    156156        static const char* sharedTemplateUniqueKey = "reloadSharedTemplate";
    157         v8::Persistent<v8::FunctionTemplate> sharedTemplate = data->privateTemplate(currentWorldType, &sharedTemplateUniqueKey, V8Location::reloadMethodCustom, v8Undefined(), v8::Signature::New(data->rawTemplate(&V8Location::info, currentWorldType)));
     157        v8::Persistent<v8::FunctionTemplate> sharedTemplate = data->privateTemplate(currentWorldType, &sharedTemplateUniqueKey, V8Location::reloadMethodCustom, v8Undefined(), v8::Signature::New(data->rawTemplate(&V8Location::info)));
    158158        return sharedTemplate->GetFunction();
    159159    }
     
    168168    WrapperWorldType currentWorldType = worldType(info.GetIsolate());
    169169    V8PerIsolateData* data = V8PerIsolateData::from(info.GetIsolate());
    170     v8::Persistent<v8::FunctionTemplate> privateTemplate = V8PerIsolateData::from(isolate)->privateTemplate(currentWorldType, &privateTemplateUniqueKey, V8Location::replaceMethodCustom, v8Undefined(), v8::Signature::New(data->rawTemplate(&V8Location::info, currentWorldType)));
     170    v8::Persistent<v8::FunctionTemplate> privateTemplate = V8PerIsolateData::from(isolate)->privateTemplate(currentWorldType, &privateTemplateUniqueKey, V8Location::replaceMethodCustom, v8Undefined(), v8::Signature::New(data->rawTemplate(&V8Location::info)));
    171171
    172172    v8::Handle<v8::Object> holder = info.This()->FindInstanceInPrototypeChain(V8Location::GetTemplate(isolate, currentWorldType));
     
    179179    if (!BindingSecurity::shouldAllowAccessToFrame(BindingState::instance(), imp->frame(), DoNotReportSecurityError)) {
    180180        static const char* sharedTemplateUniqueKey = "replaceSharedTemplate";
    181         v8::Persistent<v8::FunctionTemplate> sharedTemplate = V8PerIsolateData::from(info.GetIsolate())->privateTemplate(currentWorldType, &sharedTemplateUniqueKey, V8Location::replaceMethodCustom, v8Undefined(), v8::Signature::New(data->rawTemplate(&V8Location::info, currentWorldType)));
     181        v8::Persistent<v8::FunctionTemplate> sharedTemplate = V8PerIsolateData::from(info.GetIsolate())->privateTemplate(currentWorldType, &sharedTemplateUniqueKey, V8Location::replaceMethodCustom, v8Undefined(), v8::Signature::New(data->rawTemplate(&V8Location::info)));
    182182        return sharedTemplate->GetFunction();
    183183    }
     
    192192    WrapperWorldType currentWorldType = worldType(info.GetIsolate());
    193193    V8PerIsolateData* data = V8PerIsolateData::from(info.GetIsolate());
    194     v8::Persistent<v8::FunctionTemplate> privateTemplate = data->privateTemplate(currentWorldType, &privateTemplateUniqueKey, V8Location::assignMethodCustom, v8Undefined(), v8::Signature::New(data->rawTemplate(&V8Location::info, currentWorldType)));
     194    v8::Persistent<v8::FunctionTemplate> privateTemplate = data->privateTemplate(currentWorldType, &privateTemplateUniqueKey, V8Location::assignMethodCustom, v8Undefined(), v8::Signature::New(data->rawTemplate(&V8Location::info)));
    195195
    196196    v8::Handle<v8::Object> holder = info.This()->FindInstanceInPrototypeChain(V8Location::GetTemplate(isolate, currentWorldType));
     
    203203    if (!BindingSecurity::shouldAllowAccessToFrame(BindingState::instance(), imp->frame(), DoNotReportSecurityError)) {
    204204        static const char* sharedTemplateUniqueKey = "assignSharedTemplate";
    205         v8::Persistent<v8::FunctionTemplate> sharedTemplate = data->privateTemplate(currentWorldType, &sharedTemplateUniqueKey, V8Location::assignMethodCustom, v8Undefined(), v8::Signature::New(data->rawTemplate(&V8Location::info, currentWorldType)));
     205        v8::Persistent<v8::FunctionTemplate> sharedTemplate = data->privateTemplate(currentWorldType, &sharedTemplateUniqueKey, V8Location::assignMethodCustom, v8Undefined(), v8::Signature::New(data->rawTemplate(&V8Location::info)));
    206206        return sharedTemplate->GetFunction();
    207207    }
  • trunk/Source/WebCore/bindings/v8/custom/V8NodeListCustom.cpp

    r145554 r145575  
    6262void* V8NodeList::opaqueRootForGC(void* object, v8::Persistent<v8::Object> wrapper, v8::Isolate* isolate)
    6363{
    64     ASSERT(V8NodeList::HasInstance(wrapper, isolate, MainWorld) || V8NodeList::HasInstance(wrapper, isolate, IsolatedWorld));
     64    ASSERT(V8NodeList::HasInstance(wrapper, isolate));
    6565    NodeList* impl = static_cast<NodeList*>(object);
    6666    if (!impl->isLiveNodeList())
Note: See TracChangeset for help on using the changeset viewer.