| Index: Source/modules/webdatabase/DOMWindowWebDatabase.cpp
|
| diff --git a/Source/modules/webdatabase/DOMWindowWebDatabase.cpp b/Source/modules/webdatabase/DOMWindowWebDatabase.cpp
|
| index 1d049ae62e0b66f8623905c1e3abd7adcb7cc316..b4652b3bc67b1086d2bc8d88771bb4c872fbaa16 100644
|
| --- a/Source/modules/webdatabase/DOMWindowWebDatabase.cpp
|
| +++ b/Source/modules/webdatabase/DOMWindowWebDatabase.cpp
|
| @@ -29,9 +29,7 @@
|
| #include "modules/webdatabase/DOMWindowWebDatabase.h"
|
|
|
| #include "RuntimeEnabledFeatures.h"
|
| -#include "bindings/v8/ExceptionState.h"
|
| #include "core/dom/Document.h"
|
| -#include "core/dom/ExceptionCode.h"
|
| #include "core/page/DOMWindow.h"
|
| #include "core/page/Frame.h"
|
| #include "modules/webdatabase/Database.h"
|
| @@ -41,7 +39,7 @@
|
|
|
| namespace WebCore {
|
|
|
| -PassRefPtr<Database> DOMWindowWebDatabase::openDatabase(DOMWindow* window, const String& name, const String& version, const String& displayName, unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback, ExceptionState& es)
|
| +PassRefPtr<Database> DOMWindowWebDatabase::openDatabase(DOMWindow* window, const String& name, const String& version, const String& displayName, unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback, ExceptionCode& ec)
|
| {
|
| if (!window->isCurrentlyDisplayedInFrame())
|
| return 0;
|
| @@ -52,9 +50,9 @@ PassRefPtr<Database> DOMWindowWebDatabase::openDatabase(DOMWindow* window, const
|
| if (RuntimeEnabledFeatures::databaseEnabled() && window->document()->securityOrigin()->canAccessDatabase(window->document()->topOrigin())) {
|
| database = dbManager.openDatabase(window->document(), name, version, displayName, estimatedSize, creationCallback, error);
|
| ASSERT(database || error != DatabaseError::None);
|
| - es.throwDOMException(DatabaseManager::exceptionCodeForDatabaseError(error));
|
| + ec = DatabaseManager::exceptionCodeForDatabaseError(error);
|
| } else {
|
| - es.throwDOMException(SecurityError);
|
| + ec = SecurityError;
|
| }
|
|
|
| return database;
|
|
|