| Index: Source/modules/indexeddb/IDBFactory.cpp
|
| diff --git a/Source/modules/indexeddb/IDBFactory.cpp b/Source/modules/indexeddb/IDBFactory.cpp
|
| index b57ec27cd20baa5f1c4940d06531de08de1bb9cd..d3181dacc1f05ad212ef6b5ff1a410755b2bff34 100644
|
| --- a/Source/modules/indexeddb/IDBFactory.cpp
|
| +++ b/Source/modules/indexeddb/IDBFactory.cpp
|
| @@ -29,6 +29,7 @@
|
| #include "config.h"
|
| #include "modules/indexeddb/IDBFactory.h"
|
|
|
| +#include "bindings/v8/ExceptionState.h"
|
| #include "bindings/v8/IDBBindingUtilities.h"
|
| #include "core/dom/Document.h"
|
| #include "core/dom/ExceptionCode.h"
|
| @@ -74,13 +75,13 @@ static bool isContextValid(ScriptExecutionContext* context)
|
| return true;
|
| }
|
|
|
| -PassRefPtr<IDBRequest> IDBFactory::getDatabaseNames(ScriptExecutionContext* context, ExceptionCode& ec)
|
| +PassRefPtr<IDBRequest> IDBFactory::getDatabaseNames(ScriptExecutionContext* context, ExceptionState& es)
|
| {
|
| IDB_TRACE("IDBFactory::getDatabaseNames");
|
| if (!isContextValid(context))
|
| return 0;
|
| if (!context->securityOrigin()->canAccessDatabase(context->topOrigin())) {
|
| - ec = SecurityError;
|
| + es.throwDOMException(SecurityError);
|
| return 0;
|
| }
|
|
|
| @@ -89,28 +90,28 @@ PassRefPtr<IDBRequest> IDBFactory::getDatabaseNames(ScriptExecutionContext* cont
|
| return request;
|
| }
|
|
|
| -PassRefPtr<IDBOpenDBRequest> IDBFactory::open(ScriptExecutionContext* context, const String& name, unsigned long long version, ExceptionCode& ec)
|
| +PassRefPtr<IDBOpenDBRequest> IDBFactory::open(ScriptExecutionContext* context, const String& name, unsigned long long version, ExceptionState& es)
|
| {
|
| IDB_TRACE("IDBFactory::open");
|
| if (!version) {
|
| - ec = TypeError;
|
| + es.throwTypeError();
|
| return 0;
|
| }
|
| - return openInternal(context, name, version, ec);
|
| + return openInternal(context, name, version, es);
|
| }
|
|
|
| -PassRefPtr<IDBOpenDBRequest> IDBFactory::openInternal(ScriptExecutionContext* context, const String& name, int64_t version, ExceptionCode& ec)
|
| +PassRefPtr<IDBOpenDBRequest> IDBFactory::openInternal(ScriptExecutionContext* context, const String& name, int64_t version, ExceptionState& es)
|
| {
|
| HistogramSupport::histogramEnumeration("WebCore.IndexedDB.FrontEndAPICalls", IDBOpenCall, IDBMethodsMax);
|
| ASSERT(version >= 1 || version == IDBDatabaseMetadata::NoIntVersion);
|
| if (name.isNull()) {
|
| - ec = TypeError;
|
| + es.throwTypeError();
|
| return 0;
|
| }
|
| if (!isContextValid(context))
|
| return 0;
|
| if (!context->securityOrigin()->canAccessDatabase(context->topOrigin())) {
|
| - ec = SecurityError;
|
| + es.throwDOMException(SecurityError);
|
| return 0;
|
| }
|
|
|
| @@ -121,24 +122,24 @@ PassRefPtr<IDBOpenDBRequest> IDBFactory::openInternal(ScriptExecutionContext* co
|
| return request;
|
| }
|
|
|
| -PassRefPtr<IDBOpenDBRequest> IDBFactory::open(ScriptExecutionContext* context, const String& name, ExceptionCode& ec)
|
| +PassRefPtr<IDBOpenDBRequest> IDBFactory::open(ScriptExecutionContext* context, const String& name, ExceptionState& es)
|
| {
|
| IDB_TRACE("IDBFactory::open");
|
| - return openInternal(context, name, IDBDatabaseMetadata::NoIntVersion, ec);
|
| + return openInternal(context, name, IDBDatabaseMetadata::NoIntVersion, es);
|
| }
|
|
|
| -PassRefPtr<IDBOpenDBRequest> IDBFactory::deleteDatabase(ScriptExecutionContext* context, const String& name, ExceptionCode& ec)
|
| +PassRefPtr<IDBOpenDBRequest> IDBFactory::deleteDatabase(ScriptExecutionContext* context, const String& name, ExceptionState& es)
|
| {
|
| IDB_TRACE("IDBFactory::deleteDatabase");
|
| HistogramSupport::histogramEnumeration("WebCore.IndexedDB.FrontEndAPICalls", IDBDeleteDatabaseCall, IDBMethodsMax);
|
| if (name.isNull()) {
|
| - ec = TypeError;
|
| + es.throwTypeError();
|
| return 0;
|
| }
|
| if (!isContextValid(context))
|
| return 0;
|
| if (!context->securityOrigin()->canAccessDatabase(context->topOrigin())) {
|
| - ec = SecurityError;
|
| + es.throwDOMException(SecurityError);
|
| return 0;
|
| }
|
|
|
| @@ -147,7 +148,7 @@ PassRefPtr<IDBOpenDBRequest> IDBFactory::deleteDatabase(ScriptExecutionContext*
|
| return request;
|
| }
|
|
|
| -short IDBFactory::cmp(ScriptExecutionContext* context, const ScriptValue& firstValue, const ScriptValue& secondValue, ExceptionCode& ec)
|
| +short IDBFactory::cmp(ScriptExecutionContext* context, const ScriptValue& firstValue, const ScriptValue& secondValue, ExceptionState& es)
|
| {
|
| DOMRequestState requestState(context);
|
| RefPtr<IDBKey> first = scriptValueToIDBKey(&requestState, firstValue);
|
| @@ -157,7 +158,7 @@ short IDBFactory::cmp(ScriptExecutionContext* context, const ScriptValue& firstV
|
| ASSERT(second);
|
|
|
| if (!first->isValid() || !second->isValid()) {
|
| - ec = DataError;
|
| + es.throwDOMException(DataError);
|
| return 0;
|
| }
|
|
|
|
|