| 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 22 matching lines...) Expand all Loading... |
| 33 #include "core/dom/ExceptionCode.h" | 33 #include "core/dom/ExceptionCode.h" |
| 34 #include "core/frame/LocalDOMWindow.h" | 34 #include "core/frame/LocalDOMWindow.h" |
| 35 #include "modules/webdatabase/Database.h" | 35 #include "modules/webdatabase/Database.h" |
| 36 #include "modules/webdatabase/DatabaseCallback.h" | 36 #include "modules/webdatabase/DatabaseCallback.h" |
| 37 #include "modules/webdatabase/DatabaseManager.h" | 37 #include "modules/webdatabase/DatabaseManager.h" |
| 38 #include "platform/RuntimeEnabledFeatures.h" | 38 #include "platform/RuntimeEnabledFeatures.h" |
| 39 #include "platform/weborigin/SecurityOrigin.h" | 39 #include "platform/weborigin/SecurityOrigin.h" |
| 40 | 40 |
| 41 namespace blink { | 41 namespace blink { |
| 42 | 42 |
| 43 Database* DOMWindowWebDatabase::openDatabase(LocalDOMWindow& window, const Strin
g& name, const String& version, const String& displayName, unsigned long estimat
edSize, DatabaseCallback* creationCallback, ExceptionState& exceptionState) | 43 Database* DOMWindowWebDatabase::openDatabase(DOMWindow& windowArg, const String&
name, const String& version, const String& displayName, unsigned long estimated
Size, DatabaseCallback* creationCallback, ExceptionState& exceptionState) |
| 44 { | 44 { |
| 45 LocalDOMWindow& window = toLocalDOMWindow(windowArg); |
| 45 if (!window.isCurrentlyDisplayedInFrame()) | 46 if (!window.isCurrentlyDisplayedInFrame()) |
| 46 return nullptr; | 47 return nullptr; |
| 47 | 48 |
| 48 Database* database = nullptr; | 49 Database* database = nullptr; |
| 49 DatabaseManager& dbManager = DatabaseManager::manager(); | 50 DatabaseManager& dbManager = DatabaseManager::manager(); |
| 50 DatabaseError error = DatabaseError::None; | 51 DatabaseError error = DatabaseError::None; |
| 51 if (RuntimeEnabledFeatures::databaseEnabled() && window.document()->security
Origin()->canAccessDatabase()) { | 52 if (RuntimeEnabledFeatures::databaseEnabled() && window.document()->security
Origin()->canAccessDatabase()) { |
| 52 String errorMessage; | 53 String errorMessage; |
| 53 database = dbManager.openDatabase(window.document(), name, version, disp
layName, estimatedSize, creationCallback, error, errorMessage); | 54 database = dbManager.openDatabase(window.document(), name, version, disp
layName, estimatedSize, creationCallback, error, errorMessage); |
| 54 ASSERT(database || error != DatabaseError::None); | 55 ASSERT(database || error != DatabaseError::None); |
| 55 if (error != DatabaseError::None) | 56 if (error != DatabaseError::None) |
| 56 DatabaseManager::throwExceptionForDatabaseError(error, errorMessage,
exceptionState); | 57 DatabaseManager::throwExceptionForDatabaseError(error, errorMessage,
exceptionState); |
| 57 } else { | 58 } else { |
| 58 exceptionState.throwSecurityError("Access to the WebDatabase API is deni
ed in this context."); | 59 exceptionState.throwSecurityError("Access to the WebDatabase API is deni
ed in this context."); |
| 59 } | 60 } |
| 60 | 61 |
| 61 return database; | 62 return database; |
| 62 } | 63 } |
| 63 | 64 |
| 64 } // namespace blink | 65 } // namespace blink |
| OLD | NEW |