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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved.
3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 11 matching lines...) Expand all
22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */ 25 */
26 26
27 #include "config.h" 27 #include "config.h"
28 28
29 #include "modules/webdatabase/DOMWindowWebDatabase.h" 29 #include "modules/webdatabase/DOMWindowWebDatabase.h"
30 30
31 #include "RuntimeEnabledFeatures.h" 31 #include "RuntimeEnabledFeatures.h"
32 #include "bindings/v8/ExceptionState.h"
33 #include "core/dom/Document.h" 32 #include "core/dom/Document.h"
34 #include "core/dom/ExceptionCode.h"
35 #include "core/page/DOMWindow.h" 33 #include "core/page/DOMWindow.h"
36 #include "core/page/Frame.h" 34 #include "core/page/Frame.h"
37 #include "modules/webdatabase/Database.h" 35 #include "modules/webdatabase/Database.h"
38 #include "modules/webdatabase/DatabaseCallback.h" 36 #include "modules/webdatabase/DatabaseCallback.h"
39 #include "modules/webdatabase/DatabaseManager.h" 37 #include "modules/webdatabase/DatabaseManager.h"
40 #include "weborigin/SecurityOrigin.h" 38 #include "weborigin/SecurityOrigin.h"
41 39
42 namespace WebCore { 40 namespace WebCore {
43 41
44 PassRefPtr<Database> DOMWindowWebDatabase::openDatabase(DOMWindow* window, const String& name, const String& version, const String& displayName, unsigned long e stimatedSize, PassRefPtr<DatabaseCallback> creationCallback, ExceptionState& es) 42 PassRefPtr<Database> DOMWindowWebDatabase::openDatabase(DOMWindow* window, const String& name, const String& version, const String& displayName, unsigned long e stimatedSize, PassRefPtr<DatabaseCallback> creationCallback, ExceptionCode& ec)
45 { 43 {
46 if (!window->isCurrentlyDisplayedInFrame()) 44 if (!window->isCurrentlyDisplayedInFrame())
47 return 0; 45 return 0;
48 46
49 RefPtr<Database> database = 0; 47 RefPtr<Database> database = 0;
50 DatabaseManager& dbManager = DatabaseManager::manager(); 48 DatabaseManager& dbManager = DatabaseManager::manager();
51 DatabaseError error = DatabaseError::None; 49 DatabaseError error = DatabaseError::None;
52 if (RuntimeEnabledFeatures::databaseEnabled() && window->document()->securit yOrigin()->canAccessDatabase(window->document()->topOrigin())) { 50 if (RuntimeEnabledFeatures::databaseEnabled() && window->document()->securit yOrigin()->canAccessDatabase(window->document()->topOrigin())) {
53 database = dbManager.openDatabase(window->document(), name, version, dis playName, estimatedSize, creationCallback, error); 51 database = dbManager.openDatabase(window->document(), name, version, dis playName, estimatedSize, creationCallback, error);
54 ASSERT(database || error != DatabaseError::None); 52 ASSERT(database || error != DatabaseError::None);
55 es.throwDOMException(DatabaseManager::exceptionCodeForDatabaseError(erro r)); 53 ec = DatabaseManager::exceptionCodeForDatabaseError(error);
56 } else { 54 } else {
57 es.throwDOMException(SecurityError); 55 ec = SecurityError;
58 } 56 }
59 57
60 return database; 58 return database;
61 } 59 }
62 60
63 } // namespace WebCore 61 } // namespace WebCore
OLDNEW
« 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