Remove WrapperWorldType from V8 binding

Source/bindings/v8/V8PerIsolateData.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 75 matching lines @@
     return m_liveRoot.getUnsafe();
 }
 
 void V8PerIsolateData::dispose(v8::Isolate* isolate)
 {
     void* data = isolate->GetData(gin::kEmbedderBlink);
     delete static_cast<V8PerIsolateData*>(data);
     isolate->SetData(gin::kEmbedderBlink, 0);
 }
 
-v8::Handle<v8::FunctionTemplate> V8PerIsolateData::domTemplate(WrapperWorldType currentWorldType, void* domTemplateKey, v8::FunctionCallback callback, v8::Handle<v8::Value> data, v8::Handle<v8::Signature> signature, int length)
+V8PerIsolateData::TemplateMap& V8PerIsolateData::templateMap()
 {
-    TemplateMap& templates = templateMap(currentWorldType);
+    if (DOMWrapperWorld::current(m_isolate)->isMainWorld())
+        return m_templatesForMainWorld;
+    return m_templatesForNonMainWorld;
+}
+
+v8::Handle<v8::FunctionTemplate> V8PerIsolateData::domTemplate(void* domTemplateKey, v8::FunctionCallback callback, v8::Handle<v8::Value> data, v8::Handle<v8::Signature> signature, int length)
+{
+    TemplateMap& templates = templateMap();
     TemplateMap::iterator result = templates.find(domTemplateKey);
     if (result != templates.end())
         return result->value.newLocal(m_isolate);
     v8::Local<v8::FunctionTemplate> templ = v8::FunctionTemplate::New(m_isolate, callback, data, signature, length);
     templates.add(domTemplateKey, UnsafePersistent<v8::FunctionTemplate>(m_isolate, templ));
     return templ;
 }
 
-v8::Handle<v8::FunctionTemplate> V8PerIsolateData::existingDOMTemplate(WrapperWorldType currentWorldType, void* domTemplateKey)
+v8::Handle<v8::FunctionTemplate> V8PerIsolateData::existingDOMTemplate(void* domTemplateKey)
 {
-    TemplateMap& templates = templateMap(currentWorldType);
+    TemplateMap& templates = templateMap();
     TemplateMap::iterator result = templates.find(domTemplateKey);
     if (result != templates.end())
         return result->value.newLocal(m_isolate);
     return v8::Local<v8::FunctionTemplate>();
 }
 
-void V8PerIsolateData::setDOMTemplate(WrapperWorldType currentWorldType, void* domTemplateKey, v8::Handle<v8::FunctionTemplate> templ)
+void V8PerIsolateData::setDOMTemplate(void* domTemplateKey, v8::Handle<v8::FunctionTemplate> templ)
 {
-    templateMap(currentWorldType).add(domTemplateKey, UnsafePersistent<v8::FunctionTemplate>(m_isolate, templ));
+    templateMap().add(domTemplateKey, UnsafePersistent<v8::FunctionTemplate>(m_isolate, templ));
 }
 
 v8::Local<v8::Context> V8PerIsolateData::ensureRegexContext()
 {
     if (m_regexContext.isEmpty())
         m_regexContext.set(m_isolate, v8::Context::New(m_isolate));
     return m_regexContext.newLocal(m_isolate);
 }
 
 bool V8PerIsolateData::hasInstance(const WrapperTypeInfo* info, v8::Handle<v8::Value> value)
@@ skipping 49 matching lines @@
 }
 
 v8::Handle<v8::FunctionTemplate> V8PerIsolateData::toStringTemplate()
 {
     if (m_toStringTemplate.isEmpty())
         m_toStringTemplate.set(m_isolate, v8::FunctionTemplate::New(m_isolate, constructorOfToString));
     return m_toStringTemplate.newLocal(m_isolate);
 }
 
 } // namespace WebCore