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

Side by Side Diff: Source/modules/webdatabase/DOMWindowWebDatabase.cpp

Issue 24469004: Amusingly deprecate the generic version of 'ExceptionState::throwDOMException'. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 2 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
« no previous file with comments | « Source/modules/webaudio/WaveShaperNode.cpp ('k') | Source/modules/webdatabase/DatabaseSync.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 if (!window->isCurrentlyDisplayedInFrame()) 45 if (!window->isCurrentlyDisplayedInFrame())
46 return 0; 46 return 0;
47 47
48 RefPtr<Database> database = 0; 48 RefPtr<Database> database = 0;
49 DatabaseManager& dbManager = DatabaseManager::manager(); 49 DatabaseManager& dbManager = DatabaseManager::manager();
50 DatabaseError error = DatabaseError::None; 50 DatabaseError error = DatabaseError::None;
51 if (RuntimeEnabledFeatures::databaseEnabled() && window->document()->securit yOrigin()->canAccessDatabase()) { 51 if (RuntimeEnabledFeatures::databaseEnabled() && window->document()->securit yOrigin()->canAccessDatabase()) {
52 database = dbManager.openDatabase(window->document(), name, version, dis playName, estimatedSize, creationCallback, error); 52 database = dbManager.openDatabase(window->document(), name, version, dis playName, estimatedSize, creationCallback, error);
53 ASSERT(database || error != DatabaseError::None); 53 ASSERT(database || error != DatabaseError::None);
54 if (error != DatabaseError::None) 54 if (error != DatabaseError::None)
55 es.throwDOMException(DatabaseManager::exceptionCodeForDatabaseError( error)); 55 es.throwUninformativeAndGenericDOMException(DatabaseManager::excepti onCodeForDatabaseError(error));
56 } else { 56 } else {
57 es.throwDOMException(SecurityError); 57 es.throwUninformativeAndGenericDOMException(SecurityError);
58 } 58 }
59 59
60 return database; 60 return database;
61 } 61 }
62 62
63 } // namespace WebCore 63 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/modules/webaudio/WaveShaperNode.cpp ('k') | Source/modules/webdatabase/DatabaseSync.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698