Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1923)

Unified Diff: Source/modules/indexeddb/IDBCursor.cpp

Issue 1003713002: [bindings] Rename IDBBindingUtilities.cpp to V8BindingForModules.cpp (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/modules/indexeddb/IDBCursor.cpp
diff --git a/Source/modules/indexeddb/IDBCursor.cpp b/Source/modules/indexeddb/IDBCursor.cpp
index cd0bf54885e79f80c7ca30ca0d2e2061710e2282..1064321bb4e2c4e35d20c19cef342b7016ce2464 100644
--- a/Source/modules/indexeddb/IDBCursor.cpp
+++ b/Source/modules/indexeddb/IDBCursor.cpp
@@ -28,7 +28,8 @@
#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"
@@ -148,7 +149,7 @@ void IDBCursor::advance(unsigned count, ExceptionState& exceptionState)
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;
@@ -159,8 +160,8 @@ void IDBCursor::continueFunction(ScriptState* scriptState, const ScriptValue& ke
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;
@@ -275,13 +276,13 @@ void IDBCursor::close()
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)
@@ -301,13 +302,13 @@ ScriptValue IDBCursor::value(ScriptState* scriptState)
}
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)

Powered by Google App Engine
This is Rietveld 408576698