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

Unified Diff: Source/modules/webdatabase/DOMWindowWebDatabase.cpp

Issue 19724003: Revert "Transition modules/** to use ExceptionState" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 5 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/webdatabase/DOMWindowWebDatabase.h ('k') | Source/modules/webdatabase/DatabaseBasicTypes.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « Source/modules/webdatabase/DOMWindowWebDatabase.h ('k') | Source/modules/webdatabase/DatabaseBasicTypes.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698