| Index: Source/modules/indexeddb/IDBFactory.cpp
|
| diff --git a/Source/modules/indexeddb/IDBFactory.cpp b/Source/modules/indexeddb/IDBFactory.cpp
|
| index af7c44a501cd90c97197f3816352a3202fc70270..247cc96b2872011beb19e9882d61010c691c438d 100644
|
| --- a/Source/modules/indexeddb/IDBFactory.cpp
|
| +++ b/Source/modules/indexeddb/IDBFactory.cpp
|
| @@ -68,13 +68,13 @@ static bool isContextValid(ExecutionContext* context)
|
| return true;
|
| }
|
|
|
| -PassRefPtr<IDBRequest> IDBFactory::getDatabaseNames(ExecutionContext* context, ExceptionState& es)
|
| +PassRefPtr<IDBRequest> IDBFactory::getDatabaseNames(ExecutionContext* context, ExceptionState& exceptionState)
|
| {
|
| IDB_TRACE("IDBFactory::getDatabaseNames");
|
| if (!isContextValid(context))
|
| return 0;
|
| if (!context->securityOrigin()->canAccessDatabase()) {
|
| - es.throwSecurityError(ExceptionMessages::failedToExecute("getDatabaseNames", "IDBFactory", "access to the Indexed Database API is denied in this context."));
|
| + exceptionState.throwSecurityError(ExceptionMessages::failedToExecute("getDatabaseNames", "IDBFactory", "access to the Indexed Database API is denied in this context."));
|
| return 0;
|
| }
|
|
|
| @@ -83,28 +83,28 @@ PassRefPtr<IDBRequest> IDBFactory::getDatabaseNames(ExecutionContext* context, E
|
| return request;
|
| }
|
|
|
| -PassRefPtr<IDBOpenDBRequest> IDBFactory::open(ExecutionContext* context, const String& name, unsigned long long version, ExceptionState& es)
|
| +PassRefPtr<IDBOpenDBRequest> IDBFactory::open(ExecutionContext* context, const String& name, unsigned long long version, ExceptionState& exceptionState)
|
| {
|
| IDB_TRACE("IDBFactory::open");
|
| if (!version) {
|
| - es.throwUninformativeAndGenericTypeError();
|
| + exceptionState.throwUninformativeAndGenericTypeError();
|
| return 0;
|
| }
|
| - return openInternal(context, name, version, es);
|
| + return openInternal(context, name, version, exceptionState);
|
| }
|
|
|
| -PassRefPtr<IDBOpenDBRequest> IDBFactory::openInternal(ExecutionContext* context, const String& name, int64_t version, ExceptionState& es)
|
| +PassRefPtr<IDBOpenDBRequest> IDBFactory::openInternal(ExecutionContext* context, const String& name, int64_t version, ExceptionState& exceptionState)
|
| {
|
| blink::Platform::current()->histogramEnumeration("WebCore.IndexedDB.FrontEndAPICalls", IDBOpenCall, IDBMethodsMax);
|
| ASSERT(version >= 1 || version == IDBDatabaseMetadata::NoIntVersion);
|
| if (name.isNull()) {
|
| - es.throwUninformativeAndGenericTypeError();
|
| + exceptionState.throwUninformativeAndGenericTypeError();
|
| return 0;
|
| }
|
| if (!isContextValid(context))
|
| return 0;
|
| if (!context->securityOrigin()->canAccessDatabase()) {
|
| - es.throwSecurityError(ExceptionMessages::failedToExecute("open", "IDBFactory", "access to the Indexed Database API is denied in this context."));
|
| + exceptionState.throwSecurityError(ExceptionMessages::failedToExecute("open", "IDBFactory", "access to the Indexed Database API is denied in this context."));
|
| return 0;
|
| }
|
|
|
| @@ -115,24 +115,24 @@ PassRefPtr<IDBOpenDBRequest> IDBFactory::openInternal(ExecutionContext* context,
|
| return request;
|
| }
|
|
|
| -PassRefPtr<IDBOpenDBRequest> IDBFactory::open(ExecutionContext* context, const String& name, ExceptionState& es)
|
| +PassRefPtr<IDBOpenDBRequest> IDBFactory::open(ExecutionContext* context, const String& name, ExceptionState& exceptionState)
|
| {
|
| IDB_TRACE("IDBFactory::open");
|
| - return openInternal(context, name, IDBDatabaseMetadata::NoIntVersion, es);
|
| + return openInternal(context, name, IDBDatabaseMetadata::NoIntVersion, exceptionState);
|
| }
|
|
|
| -PassRefPtr<IDBOpenDBRequest> IDBFactory::deleteDatabase(ExecutionContext* context, const String& name, ExceptionState& es)
|
| +PassRefPtr<IDBOpenDBRequest> IDBFactory::deleteDatabase(ExecutionContext* context, const String& name, ExceptionState& exceptionState)
|
| {
|
| IDB_TRACE("IDBFactory::deleteDatabase");
|
| blink::Platform::current()->histogramEnumeration("WebCore.IndexedDB.FrontEndAPICalls", IDBDeleteDatabaseCall, IDBMethodsMax);
|
| if (name.isNull()) {
|
| - es.throwUninformativeAndGenericTypeError();
|
| + exceptionState.throwUninformativeAndGenericTypeError();
|
| return 0;
|
| }
|
| if (!isContextValid(context))
|
| return 0;
|
| if (!context->securityOrigin()->canAccessDatabase()) {
|
| - es.throwSecurityError(ExceptionMessages::failedToExecute("deleteDatabase", "IDBFactory", "access to the Indexed Database API is denied in this context."));
|
| + exceptionState.throwSecurityError(ExceptionMessages::failedToExecute("deleteDatabase", "IDBFactory", "access to the Indexed Database API is denied in this context."));
|
| return 0;
|
| }
|
|
|
| @@ -141,7 +141,7 @@ PassRefPtr<IDBOpenDBRequest> IDBFactory::deleteDatabase(ExecutionContext* contex
|
| return request;
|
| }
|
|
|
| -short IDBFactory::cmp(ExecutionContext* context, const ScriptValue& firstValue, const ScriptValue& secondValue, ExceptionState& es)
|
| +short IDBFactory::cmp(ExecutionContext* context, const ScriptValue& firstValue, const ScriptValue& secondValue, ExceptionState& exceptionState)
|
| {
|
| DOMRequestState requestState(context);
|
| RefPtr<IDBKey> first = scriptValueToIDBKey(&requestState, firstValue);
|
| @@ -151,7 +151,7 @@ short IDBFactory::cmp(ExecutionContext* context, const ScriptValue& firstValue,
|
| ASSERT(second);
|
|
|
| if (!first->isValid() || !second->isValid()) {
|
| - es.throwDOMException(DataError, IDBDatabase::notValidKeyErrorMessage);
|
| + exceptionState.throwDOMException(DataError, IDBDatabase::notValidKeyErrorMessage);
|
| return 0;
|
| }
|
|
|
|
|