diff options
Diffstat (limited to 'chromium/third_party/WebKit/Source/modules/webdatabase/DOMWindowWebDatabase.cpp')
-rw-r--r-- | chromium/third_party/WebKit/Source/modules/webdatabase/DOMWindowWebDatabase.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/chromium/third_party/WebKit/Source/modules/webdatabase/DOMWindowWebDatabase.cpp b/chromium/third_party/WebKit/Source/modules/webdatabase/DOMWindowWebDatabase.cpp index e5871988f62..9c5ff3462ba 100644 --- a/chromium/third_party/WebKit/Source/modules/webdatabase/DOMWindowWebDatabase.cpp +++ b/chromium/third_party/WebKit/Source/modules/webdatabase/DOMWindowWebDatabase.cpp @@ -28,29 +28,29 @@ #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/frame/DOMWindow.h" +#include "core/frame/LocalDOMWindow.h" #include "modules/webdatabase/Database.h" #include "modules/webdatabase/DatabaseCallback.h" #include "modules/webdatabase/DatabaseManager.h" +#include "platform/RuntimeEnabledFeatures.h" #include "platform/weborigin/SecurityOrigin.h" namespace WebCore { -PassRefPtr<Database> DOMWindowWebDatabase::openDatabase(DOMWindow* window, const String& name, const String& version, const String& displayName, unsigned long estimatedSize, PassOwnPtr<DatabaseCallback> creationCallback, ExceptionState& exceptionState) +PassRefPtrWillBeRawPtr<Database> DOMWindowWebDatabase::openDatabase(LocalDOMWindow& window, const String& name, const String& version, const String& displayName, unsigned long estimatedSize, PassOwnPtr<DatabaseCallback> creationCallback, ExceptionState& exceptionState) { - if (!window->isCurrentlyDisplayedInFrame()) - return 0; + if (!window.isCurrentlyDisplayedInFrame()) + return nullptr; - RefPtr<Database> database = 0; + RefPtrWillBeRawPtr<Database> database = nullptr; DatabaseManager& dbManager = DatabaseManager::manager(); DatabaseError error = DatabaseError::None; - if (RuntimeEnabledFeatures::databaseEnabled() && window->document()->securityOrigin()->canAccessDatabase()) { + if (RuntimeEnabledFeatures::databaseEnabled() && window.document()->securityOrigin()->canAccessDatabase()) { String errorMessage; - database = dbManager.openDatabase(window->document(), name, version, displayName, estimatedSize, creationCallback, error, errorMessage); + database = dbManager.openDatabase(window.document(), name, version, displayName, estimatedSize, creationCallback, error, errorMessage); ASSERT(database || error != DatabaseError::None); if (error != DatabaseError::None) DatabaseManager::throwExceptionForDatabaseError(error, errorMessage, exceptionState); |