Decrease call sites of ScriptState::current()

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 32 matching lines @@
 #include "wtf/PassOwnPtr.h"
 
 namespace WebCore {
 
 #define CALLBACK_LIST(V)                  \
     V(created, Created)                   \
     V(attached, Attached)           \
     V(detached, Detached)                 \
     V(attributeChanged, AttributeChanged)
 
-PassRefPtr<V8CustomElementLifecycleCallbacks> V8CustomElementLifecycleCallbacks::create(ExecutionContext* executionContext, v8::Handle<v8::Object> prototype, v8::Handle<v8::Function> created, v8::Handle<v8::Function> attached, v8::Handle<v8::Function> detached, v8::Handle<v8::Function> attributeChanged)
+PassRefPtr<V8CustomElementLifecycleCallbacks> V8CustomElementLifecycleCallbacks::create(ScriptState* scriptState, v8::Handle<v8::Object> prototype, v8::Handle<v8::Function> created, v8::Handle<v8::Function> attached, v8::Handle<v8::Function> detached, v8::Handle<v8::Function> attributeChanged)
 {
-    v8::Isolate* isolate = toIsolate(executionContext);
+    v8::Isolate* isolate = scriptState->isolate();
     // A given object can only be used as a Custom Element prototype
     // once; see customElementIsInterfacePrototypeObject
 #define SET_HIDDEN_VALUE(Value, Name) \
     ASSERT(V8HiddenValue::getHiddenValue(isolate, prototype, V8HiddenValue::customElement##Name(isolate)).IsEmpty()); \
     if (!Value.IsEmpty()) \
         V8HiddenValue::setHiddenValue(isolate, prototype, V8HiddenValue::customElement##Name(isolate), Value);
 
     CALLBACK_LIST(SET_HIDDEN_VALUE)
 #undef SET_HIDDEN_VALUE
 
-    return adoptRef(new V8CustomElementLifecycleCallbacks(executionContext, prototype, created, attached, detached, attributeChanged));
+    return adoptRef(new V8CustomElementLifecycleCallbacks(scriptState, prototype, created, attached, detached, attributeChanged));
 }
 
 static CustomElementLifecycleCallbacks::CallbackType flagSet(v8::Handle<v8::Function> attached, v8::Handle<v8::Function> detached, v8::Handle<v8::Function> attributeChanged)
 {
     // V8 Custom Elements always run created to swizzle prototypes.
     int flags = CustomElementLifecycleCallbacks::Created;
 
     if (!attached.IsEmpty())
         flags |= CustomElementLifecycleCallbacks::Attached;
 
     if (!detached.IsEmpty())
         flags |= CustomElementLifecycleCallbacks::Detached;
 
     if (!attributeChanged.IsEmpty())
         flags |= CustomElementLifecycleCallbacks::AttributeChanged;
 
     return CustomElementLifecycleCallbacks::CallbackType(flags);
 }
 
 template <typename T>
 static void weakCallback(const v8::WeakCallbackData<T, ScopedPersistent<T> >& data)
 {
     data.GetParameter()->clear();
 }
 
-V8CustomElementLifecycleCallbacks::V8CustomElementLifecycleCallbacks(ExecutionContext* executionContext, v8::Handle<v8::Object> prototype, v8::Handle<v8::Function> created, v8::Handle<v8::Function> attached, v8::Handle<v8::Function> detached, v8::Handle<v8::Function> attributeChanged)
+V8CustomElementLifecycleCallbacks::V8CustomElementLifecycleCallbacks(ScriptState* scriptState, v8::Handle<v8::Object> prototype, v8::Handle<v8::Function> created, v8::Handle<v8::Function> attached, v8::Handle<v8::Function> detached, v8::Handle<v8::Function> attributeChanged)
     : CustomElementLifecycleCallbacks(flagSet(attached, detached, attributeChanged))
-    , ContextLifecycleObserver(executionContext)
+    , ContextLifecycleObserver(scriptState->executionContext())
     , m_owner(0)
-    , m_scriptState(ScriptState::current(toIsolate(executionContext)))
-    , m_prototype(m_scriptState->isolate(), prototype)
-    , m_created(m_scriptState->isolate(), created)
-    , m_attached(m_scriptState->isolate(), attached)
-    , m_detached(m_scriptState->isolate(), detached)
-    , m_attributeChanged(m_scriptState->isolate(), attributeChanged)
+    , m_scriptState(scriptState)
+    , m_prototype(scriptState->isolate(), prototype)
+    , m_created(scriptState->isolate(), created)
+    , m_attached(scriptState->isolate(), attached)
+    , m_detached(scriptState->isolate(), detached)
+    , m_attributeChanged(scriptState->isolate(), attributeChanged)
 {
     m_prototype.setWeak(&m_prototype, weakCallback<v8::Object>);
 
 #define MAKE_WEAK(Var, _) \
     if (!m_##Var.isEmpty()) \
         m_##Var.setWeak(&m_##Var, weakCallback<v8::Function>);
 
     CALLBACK_LIST(MAKE_WEAK)
 #undef MAKE_WEAK
 }
@@ skipping 142 matching lines @@
     ASSERT(!receiver.IsEmpty());
 
     InspectorInstrumentation::willExecuteCustomElementCallback(element);
 
     v8::TryCatch exceptionCatcher;
     exceptionCatcher.SetVerbose(true);
     ScriptController::callFunction(executionContext(), callback, receiver, 0, 0, isolate);
 }
 
 } // namespace WebCore