Rename isolateFor*() utility functions to toIsolate()

Source/bindings/v8/V8CustomElementLifecycleCallbacks.cpp

 /*
  * Copyright (C) 2013 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 73 matching lines @@
 template <typename T>
 static void weakCallback(v8::Isolate*, v8::Persistent<T>*, ScopedPersistent<T>* handle)
 {
     handle->clear();
 }
 
 V8CustomElementLifecycleCallbacks::V8CustomElementLifecycleCallbacks(ScriptExecutionContext* scriptExecutionContext, v8::Handle<v8::Object> prototype, v8::Handle<v8::Function> created, v8::Handle<v8::Function> enteredView, v8::Handle<v8::Function> leftView, v8::Handle<v8::Function> attributeChanged)
     : CustomElementLifecycleCallbacks(flagSet(enteredView, leftView, attributeChanged))
     , ActiveDOMCallback(scriptExecutionContext)
     , m_world(DOMWrapperWorld::current())
-    , m_prototype(isolateForScriptExecutionContext(scriptExecutionContext), prototype)
-    , m_created(isolateForScriptExecutionContext(scriptExecutionContext), created)
-    , m_enteredView(isolateForScriptExecutionContext(scriptExecutionContext), enteredView)
-    , m_leftView(isolateForScriptExecutionContext(scriptExecutionContext), leftView)
-    , m_attributeChanged(isolateForScriptExecutionContext(scriptExecutionContext), attributeChanged)
+    , m_prototype(toIsolate(scriptExecutionContext), prototype)
+    , m_created(toIsolate(scriptExecutionContext), created)
+    , m_enteredView(toIsolate(scriptExecutionContext), enteredView)
+    , m_leftView(toIsolate(scriptExecutionContext), leftView)
+    , m_attributeChanged(toIsolate(scriptExecutionContext), attributeChanged)
     , m_owner(0)
 {
     m_prototype.makeWeak(&m_prototype, weakCallback<v8::Object>);
 
 #define MAKE_WEAK(Var, _) \
     if (!m_##Var.isEmpty()) \
         m_##Var.makeWeak(&m_##Var, weakCallback<v8::Function>);
 
     CALLBACK_LIST(MAKE_WEAK)
 #undef MAKE_WEAK
 }
 
 V8PerContextData* V8CustomElementLifecycleCallbacks::creationContextData()
 {
     if (!scriptExecutionContext())
         return 0;
 
     v8::Handle<v8::Context> context = toV8Context(scriptExecutionContext(), m_world.get());
     if (context.IsEmpty())
         return 0;
 
     return V8PerContextData::from(context);
 }
 
 V8CustomElementLifecycleCallbacks::~V8CustomElementLifecycleCallbacks()
 {
     if (!m_owner)
         return;
 
-    v8::HandleScope handleScope(isolateForScriptExecutionContext(scriptExecutionContext()));
+    v8::HandleScope handleScope(toIsolate(scriptExecutionContext()));
     if (V8PerContextData* perContextData = creationContextData())
         perContextData->clearCustomElementBinding(m_owner);
 }
 
 bool V8CustomElementLifecycleCallbacks::setBinding(CustomElementDefinition* owner, PassOwnPtr<CustomElementBinding> binding)
 {
     ASSERT(!m_owner);
 
     V8PerContextData* perContextData = creationContextData();
     if (!perContextData)
         return false;
 
     m_owner = owner;
 
     // Bindings retrieve the prototype when needed from per-context data.
     perContextData->addCustomElementBinding(owner, binding);
 
     return true;
 }
 
 void V8CustomElementLifecycleCallbacks::created(Element* element)
 {
     if (!canInvokeCallback())
         return;
 
     element->setCustomElementState(Element::Upgraded);
 
-    v8::Isolate* isolate = isolateForScriptExecutionContext(scriptExecutionContext());
+    v8::Isolate* isolate = toIsolate(scriptExecutionContext());
     v8::HandleScope handleScope(isolate);
     v8::Handle<v8::Context> context = toV8Context(scriptExecutionContext(), m_world.get());
     if (context.IsEmpty())
         return;
 
     v8::Context::Scope scope(context);
 
     v8::Handle<v8::Object> receiver = DOMDataStore::current(isolate)->get<V8Element>(element, isolate);
     if (!receiver.IsEmpty()) {
         // Swizzle the prototype of the existing wrapper. We don't need to
@@ skipping 27 matching lines @@
 void V8CustomElementLifecycleCallbacks::leftView(Element* element)
 {
     call(m_leftView, element);
 }
 
 void V8CustomElementLifecycleCallbacks::attributeChanged(Element* element, const AtomicString& name, const AtomicString& oldValue, const AtomicString& newValue)
 {
     if (!canInvokeCallback())
         return;
 
-    v8::Isolate* isolate = isolateForScriptExecutionContext(scriptExecutionContext());
+    v8::Isolate* isolate = toIsolate(scriptExecutionContext());
     v8::HandleScope handleScope(isolate);
     v8::Handle<v8::Context> context = toV8Context(scriptExecutionContext(), m_world.get());
     if (context.IsEmpty())
         return;
 
     v8::Context::Scope scope(context);
 
     v8::Handle<v8::Object> receiver = toV8(element, context->Global(), isolate).As<v8::Object>();
     ASSERT(!receiver.IsEmpty());
 
@@ skipping 10 matching lines @@
     v8::TryCatch exceptionCatcher;
     exceptionCatcher.SetVerbose(true);
     ScriptController::callFunctionWithInstrumentation(scriptExecutionContext(), callback, receiver, WTF_ARRAY_LENGTH(argv), argv, isolate);
 }
 
 void V8CustomElementLifecycleCallbacks::call(const ScopedPersistent<v8::Function>& weakCallback, Element* element)
 {
     if (!canInvokeCallback())
         return;
 
-    v8::HandleScope handleScope(isolateForScriptExecutionContext(scriptExecutionContext()));
+    v8::HandleScope handleScope(toIsolate(scriptExecutionContext()));
     v8::Handle<v8::Context> context = toV8Context(scriptExecutionContext(), m_world.get());
     if (context.IsEmpty())
         return;
 
     v8::Context::Scope scope(context);
     v8::Isolate* isolate = context->GetIsolate();
 
     v8::Handle<v8::Function> callback = weakCallback.newLocal(isolate);
     if (callback.IsEmpty())
         return;
 
     v8::Handle<v8::Object> receiver = toV8(element, context->Global(), isolate).As<v8::Object>();
     ASSERT(!receiver.IsEmpty());
 
     v8::TryCatch exceptionCatcher;
     exceptionCatcher.SetVerbose(true);
     ScriptController::callFunctionWithInstrumentation(scriptExecutionContext(), callback, receiver, 0, 0, isolate);
 }
 
 } // namespace WebCore