Pass NewScriptState to idbAnyToScriptValue() and idbKeyToScriptValue()

Source/modules/indexeddb/IDBCursor.cpp

 /*
  * Copyright (C) 2010 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 291 matching lines @@
     // to each other, then explicitly break the cycle.
     if (!m_request || m_request->getResultCursor() != this)
         return;
 
     if (!hasOneRef() || !m_request->hasOneRef())
         return;
 
     m_request.clear();
 }
 
-ScriptValue IDBCursor::key(ExecutionContext* context)
+ScriptValue IDBCursor::key(NewScriptState* scriptState)
 {
     m_keyDirty = false;
-    DOMRequestState requestState(toIsolate(context));
-    return idbKeyToScriptValue(&requestState, m_key);
+    return idbKeyToScriptValue(scriptState, m_key);
 }
 
-ScriptValue IDBCursor::primaryKey(ExecutionContext* context)
+ScriptValue IDBCursor::primaryKey(NewScriptState* scriptState)
 {
     m_primaryKeyDirty = false;
-    DOMRequestState requestState(toIsolate(context));
-    return idbKeyToScriptValue(&requestState, m_primaryKey);
+    return idbKeyToScriptValue(scriptState, m_primaryKey);
 }
 
-ScriptValue IDBCursor::value(ExecutionContext* context)
+ScriptValue IDBCursor::value(NewScriptState* scriptState)
 {
     ASSERT(isCursorWithValue());
 
-    DOMRequestState requestState(toIsolate(context));
     RefPtr<IDBObjectStore> objectStore = effectiveObjectStore();
     const IDBObjectStoreMetadata& metadata = objectStore->metadata();
     RefPtr<IDBAny> value;
     if (metadata.autoIncrement && !metadata.keyPath.isNull()) {
         value = IDBAny::create(m_value, m_primaryKey, metadata.keyPath);
 #ifndef NDEBUG
+        DOMRequestState requestState(scriptState->isolate());
         assertPrimaryKeyValidOrInjectable(&requestState, m_value, m_primaryKey, metadata.keyPath);
 #endif
     } else {
         value = IDBAny::create(m_value);
     }
 
     m_valueDirty = false;
-    return idbAnyToScriptValue(&requestState, value);
+    return idbAnyToScriptValue(scriptState, value);
 }
 
-ScriptValue IDBCursor::source(ExecutionContext* context) const
+ScriptValue IDBCursor::source(NewScriptState* scriptState) const
 {
-    DOMRequestState requestState(toIsolate(context));
-    return idbAnyToScriptValue(&requestState, m_source);
+    return idbAnyToScriptValue(scriptState, m_source);
 }
 
 void IDBCursor::setValueReady(PassRefPtr<IDBKey> key, PassRefPtr<IDBKey> primaryKey, PassRefPtr<SharedBuffer> value)
 {
     m_key = key;
     m_keyDirty = true;
 
     m_primaryKey = primaryKey;
     m_primaryKeyDirty = true;
 
@@ skipping 50 matching lines @@
     case WebIDBCursor::PrevNoDuplicate:
         return IDBCursor::directionPrevUnique();
 
     default:
         ASSERT_NOT_REACHED();
         return IDBCursor::directionNext();
     }
 }
 
 } // namespace WebCore