[bindings] Rename IDBBindingUtilities.cpp to V8BindingForModules.cpp

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 10 matching lines @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "modules/indexeddb/IDBCursor.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptState.h"
-#include "bindings/modules/v8/IDBBindingUtilities.h"
+#include "bindings/modules/v8/ToV8ForModules.h"
+#include "bindings/modules/v8/V8BindingForModules.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/inspector/ScriptCallStack.h"
 #include "modules/IndexedDBNames.h"
 #include "modules/indexeddb/IDBAny.h"
 #include "modules/indexeddb/IDBDatabase.h"
 #include "modules/indexeddb/IDBObjectStore.h"
 #include "modules/indexeddb/IDBTracing.h"
 #include "modules/indexeddb/IDBTransaction.h"
 #include "modules/indexeddb/WebIDBCallbacksImpl.h"
 #include "public/platform/WebIDBDatabase.h"
@@ skipping 99 matching lines @@
     }
 
     m_request->setPendingCursor(this);
     m_gotValue = false;
     m_backend->advance(count, WebIDBCallbacksImpl::create(m_request).leakPtr());
 }
 
 void IDBCursor::continueFunction(ScriptState* scriptState, const ScriptValue& keyValue, ExceptionState& exceptionState)
 {
     IDB_TRACE("IDBCursor::continue");
-    IDBKey* key = keyValue.isUndefined() || keyValue.isNull() ? nullptr : scriptValueToIDBKey(scriptState->isolate(), keyValue);
+    IDBKey* key = keyValue.isUndefined() || keyValue.isNull() ? nullptr : script_value_cast<IDBKey*>(keyValue, scriptState->isolate(), exceptionState);
     if (key && !key->isValid()) {
         exceptionState.throwDOMException(DataError, IDBDatabase::notValidKeyErrorMessage);
         return;
     }
     continueFunction(key, 0, exceptionState);
 }
 
 void IDBCursor::continuePrimaryKey(ScriptState* scriptState, const ScriptValue& keyValue, const ScriptValue& primaryKeyValue, ExceptionState& exceptionState)
 {
     IDB_TRACE("IDBCursor::continuePrimaryKey");
-    IDBKey* key = scriptValueToIDBKey(scriptState->isolate(), keyValue);
-    IDBKey* primaryKey = scriptValueToIDBKey(scriptState->isolate(), primaryKeyValue);
+    IDBKey* key = script_value_cast<IDBKey*>(keyValue, scriptState->isolate(), exceptionState);
+    IDBKey* primaryKey = script_value_cast<IDBKey*>(primaryKeyValue, scriptState->isolate(), exceptionState);
     if (!key->isValid() || !primaryKey->isValid()) {
         exceptionState.throwDOMException(DataError, IDBDatabase::notValidKeyErrorMessage);
         return;
     }
     continueFunction(key, primaryKey, exceptionState);
 }
 
 void IDBCursor::continueFunction(IDBKey* key, IDBKey* primaryKey, ExceptionState& exceptionState)
 {
     ASSERT(!primaryKey || (key && primaryKey));
@@ skipping 94 matching lines @@
 void IDBCursor::close()
 {
     m_blobs.clear();
     m_request.clear();
     m_backend.clear();
 }
 
 ScriptValue IDBCursor::key(ScriptState* scriptState)
 {
     m_keyDirty = false;
-    return idbKeyToScriptValue(scriptState, m_key);
+    return ScriptValue::from(scriptState, m_key);
 }
 
 ScriptValue IDBCursor::primaryKey(ScriptState* scriptState)
 {
     m_primaryKeyDirty = false;
-    return idbKeyToScriptValue(scriptState, m_primaryKey);
+    return ScriptValue::from(scriptState, m_primaryKey);
 }
 
 ScriptValue IDBCursor::value(ScriptState* scriptState)
 {
     ASSERT(isCursorWithValue());
 
     IDBObjectStore* objectStore = effectiveObjectStore();
     const IDBObjectStoreMetadata& metadata = objectStore->metadata();
     IDBAny* value;
     if (metadata.autoIncrement && !metadata.keyPath.isNull()) {
         value = IDBAny::create(m_value, m_blobs->getInfo(), m_primaryKey, metadata.keyPath);
 #if ENABLE(ASSERT)
         assertPrimaryKeyValidOrInjectable(scriptState, m_value, m_blobs->getInfo(), m_primaryKey, metadata.keyPath);
 #endif
     } else {
         value = IDBAny::create(m_value, m_blobs->getInfo());
     }
 
     m_valueDirty = false;
-    ScriptValue scriptValue = idbAnyToScriptValue(scriptState, value);
+    ScriptValue scriptValue = ScriptValue::from(scriptState, value);
     return scriptValue;
 }
 
 ScriptValue IDBCursor::source(ScriptState* scriptState) const
 {
-    return idbAnyToScriptValue(scriptState, m_source);
+    return ScriptValue::from(scriptState, m_source);
 }
 
 void IDBCursor::setValueReady(IDBKey* key, IDBKey* primaryKey, PassRefPtr<SharedBuffer> value, PassOwnPtr<IDBRequest::IDBBlobHolder> blobs)
 {
     m_key = key;
     m_keyDirty = true;
 
     m_primaryKey = primaryKey;
     m_primaryKeyDirty = true;
 
@@ skipping 50 matching lines @@
     case WebIDBCursorDirectionPrevNoDuplicate:
         return IndexedDBNames::prevunique;
 
     default:
         ASSERT_NOT_REACHED();
         return IndexedDBNames::next;
     }
 }
 
 } // namespace blink