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

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

Issue 236783002: Pass NewScriptState to idbAnyToScriptValue() and idbKeyToScriptValue() (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 8 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
« no previous file with comments | « Source/modules/indexeddb/IDBRequest.h ('k') | Source/modules/indexeddb/IDBRequest.idl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/indexeddb/IDBRequest.cpp
diff --git a/Source/modules/indexeddb/IDBRequest.cpp b/Source/modules/indexeddb/IDBRequest.cpp
index e9232c45e0c80e54e9cc4d9bc6cd8b088474929c..c7e3223a44cba98c1ec88d1b010f88689ddec1ce 100644
--- a/Source/modules/indexeddb/IDBRequest.cpp
+++ b/Source/modules/indexeddb/IDBRequest.cpp
@@ -78,7 +78,7 @@ IDBRequest::~IDBRequest()
ASSERT(m_readyState == DONE || m_readyState == EarlyDeath || !executionContext());
}
-ScriptValue IDBRequest::result(ExceptionState& exceptionState)
+ScriptValue IDBRequest::result(NewScriptState* scriptState, ExceptionState& exceptionState)
{
if (m_readyState != DONE) {
exceptionState.throwDOMException(InvalidStateError, IDBDatabase::requestNotFinishedErrorMessage);
@@ -87,7 +87,7 @@ ScriptValue IDBRequest::result(ExceptionState& exceptionState)
if (m_contextStopped || !executionContext())
return ScriptValue();
m_resultDirty = false;
- return idbAnyToScriptValue(&m_requestState, m_result);
+ return idbAnyToScriptValue(scriptState, m_result);
}
PassRefPtrWillBeRawPtr<DOMError> IDBRequest::error(ExceptionState& exceptionState) const
@@ -99,13 +99,12 @@ PassRefPtrWillBeRawPtr<DOMError> IDBRequest::error(ExceptionState& exceptionStat
return m_error;
}
-ScriptValue IDBRequest::source(ExecutionContext* context) const
+ScriptValue IDBRequest::source(NewScriptState* scriptState) const
{
if (m_contextStopped || !executionContext())
return ScriptValue();
- DOMRequestState requestState(toIsolate(context));
- return idbAnyToScriptValue(&requestState, m_source);
+ return idbAnyToScriptValue(scriptState, m_source);
}
const String& IDBRequest::readyState() const
« no previous file with comments | « Source/modules/indexeddb/IDBRequest.h ('k') | Source/modules/indexeddb/IDBRequest.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698