| OLD | NEW |
| 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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 44 if (!window->isCurrentlyDisplayedInFrame()) | 44 if (!window->isCurrentlyDisplayedInFrame()) |
| 45 return 0; | 45 return 0; |
| 46 | 46 |
| 47 RefPtr<Database> database = 0; | 47 RefPtr<Database> database = 0; |
| 48 DatabaseManager& dbManager = DatabaseManager::manager(); | 48 DatabaseManager& dbManager = DatabaseManager::manager(); |
| 49 DatabaseError error = DatabaseError::None; | 49 DatabaseError error = DatabaseError::None; |
| 50 if (RuntimeEnabledFeatures::databaseEnabled() && window->document()->securit
yOrigin()->canAccessDatabase(window->document()->topOrigin())) { | 50 if (RuntimeEnabledFeatures::databaseEnabled() && window->document()->securit
yOrigin()->canAccessDatabase(window->document()->topOrigin())) { |
| 51 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); |
| 52 ASSERT(database || error != DatabaseError::None); | 52 ASSERT(database || error != DatabaseError::None); |
| 53 ec = DatabaseManager::exceptionCodeForDatabaseError(error); | 53 ec = DatabaseManager::exceptionCodeForDatabaseError(error); |
| 54 } else | 54 } else { |
| 55 ec = SECURITY_ERR; | 55 ec = SecurityError; |
| 56 } |
| 56 | 57 |
| 57 return database; | 58 return database; |
| 58 } | 59 } |
| 59 | 60 |
| 60 } // namespace WebCore | 61 } // namespace WebCore |
| OLD | NEW |