Pass NewScriptState to idbAnyToScriptValue() and idbKeyToScriptValue()

Source/bindings/v8/IDBBindingUtilities.cpp

 /*
  * Copyright (C) 2011 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
@@ skipping 385 matching lines @@
     IDBParseKeyPath(keyPath.string(), keyPathElements, error);
     ASSERT(error == IDBKeyPathParseErrorNone);
 
     if (!keyPathElements.size())
         return false;
 
     v8::Handle<v8::Value> v8Value(scriptValue.v8Value());
     return canInjectNthValueOnKeyPath(v8Value, keyPathElements, keyPathElements.size() - 1, state->context()->GetIsolate());
 }
 
-ScriptValue idbAnyToScriptValue(DOMRequestState* state, PassRefPtr<IDBAny> any)
+ScriptValue idbAnyToScriptValue(NewScriptState* scriptState, PassRefPtr<IDBAny> any)
 {
-    v8::Isolate* isolate = state ? state->isolate() : v8::Isolate::GetCurrent();
-    ASSERT(isolate->InContext());
-    v8::Local<v8::Context> context = state ? state->context() : isolate->GetCurrentContext();
+    v8::Isolate* isolate = scriptState->isolate();
     v8::HandleScope handleScope(isolate);
-    v8::Handle<v8::Value> v8Value(toV8(any.get(), context->Global(), isolate));
+    v8::Handle<v8::Value> v8Value(toV8(any.get(), scriptState->context()->Global(), isolate));
     return ScriptValue(v8Value, isolate);
 }
 
-ScriptValue idbKeyToScriptValue(DOMRequestState* state, PassRefPtr<IDBKey> key)
+ScriptValue idbKeyToScriptValue(NewScriptState* scriptState, PassRefPtr<IDBKey> key)
 {
-    v8::Isolate* isolate = state ? state->isolate() : v8::Isolate::GetCurrent();
-    ASSERT(isolate->InContext());
-    v8::Local<v8::Context> context = state ? state->context() : isolate->GetCurrentContext();
+    v8::Isolate* isolate = scriptState->isolate();
     v8::HandleScope handleScope(isolate);
-    v8::Handle<v8::Value> v8Value(toV8(key.get(), context->Global(), isolate));
+    v8::Handle<v8::Value> v8Value(toV8(key.get(), scriptState->context()->Global(), isolate));
     return ScriptValue(v8Value, isolate);
 }
 
 PassRefPtr<IDBKey> scriptValueToIDBKey(DOMRequestState* state, const ScriptValue& scriptValue)
 {
     v8::Isolate* isolate = state ? state->isolate() : v8::Isolate::GetCurrent();
     ASSERT(isolate->InContext());
     v8::HandleScope handleScope(isolate);
     v8::Handle<v8::Value> v8Value(scriptValue.v8Value());
     return createIDBKeyFromValue(v8Value, isolate);
 }
 
 PassRefPtr<IDBKeyRange> scriptValueToIDBKeyRange(DOMRequestState* state, const ScriptValue& scriptValue)
 {
     v8::Isolate* isolate = state ? state->isolate() : v8::Isolate::GetCurrent();
     v8::HandleScope handleScope(isolate);
     v8::Handle<v8::Value> value(scriptValue.v8Value());
     return V8IDBKeyRange::toNativeWithTypeCheck(isolate, value);
 }
 
 #ifndef NDEBUG
 void assertPrimaryKeyValidOrInjectable(DOMRequestState* state, PassRefPtr<SharedBuffer> buffer, PassRefPtr<IDBKey> prpKey, const IDBKeyPath& keyPath)
 {
     RefPtr<IDBKey> key(prpKey);
 
     DOMRequestState::Scope scope(*state);
     v8::Isolate* isolate = state ? state->isolate() : v8::Isolate::GetCurrent();
 
-    ScriptValue keyValue = idbKeyToScriptValue(state, key);
+    ScriptValue keyValue = idbKeyToScriptValue(state->scriptState(), key);
     ScriptValue scriptValue(deserializeIDBValueBuffer(buffer.get(), isolate), isolate);
 
     // This assertion is about already persisted data, so allow experimental types.
     const bool allowExperimentalTypes = true;
     RefPtr<IDBKey> expectedKey = createIDBKeyFromScriptValueAndKeyPath(scriptValue, keyPath, isolate, allowExperimentalTypes);
     ASSERT(!expectedKey || expectedKey->isEqual(key.get()));
 
     bool injected = injectV8KeyIntoV8Value(keyValue.v8Value(), scriptValue.v8Value(), keyPath, isolate);
     ASSERT_UNUSED(injected, injected);
 }
 #endif
 
 } // namespace WebCore