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

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

Issue 170603003: Use nullptr_t for RefPtr, PassRefPtr and RawPtr. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Final rebase Created 6 years, 10 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 25 matching lines...) Expand all
36 #include "modules/webdatabase/Database.h" 36 #include "modules/webdatabase/Database.h"
37 #include "modules/webdatabase/DatabaseCallback.h" 37 #include "modules/webdatabase/DatabaseCallback.h"
38 #include "modules/webdatabase/DatabaseManager.h" 38 #include "modules/webdatabase/DatabaseManager.h"
39 #include "platform/weborigin/SecurityOrigin.h" 39 #include "platform/weborigin/SecurityOrigin.h"
40 40
41 namespace WebCore { 41 namespace WebCore {
42 42
43 PassRefPtr<Database> DOMWindowWebDatabase::openDatabase(DOMWindow& window, const String& name, const String& version, const String& displayName, unsigned long e stimatedSize, PassOwnPtr<DatabaseCallback> creationCallback, ExceptionState& exc eptionState) 43 PassRefPtr<Database> DOMWindowWebDatabase::openDatabase(DOMWindow& window, const String& name, const String& version, const String& displayName, unsigned long e stimatedSize, PassOwnPtr<DatabaseCallback> creationCallback, ExceptionState& exc eptionState)
44 { 44 {
45 if (!window.isCurrentlyDisplayedInFrame()) 45 if (!window.isCurrentlyDisplayedInFrame())
46 return 0; 46 return nullptr;
47 47
48 RefPtr<Database> database = 0; 48 RefPtr<Database> database = nullptr;
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()->security Origin()->canAccessDatabase()) { 51 if (RuntimeEnabledFeatures::databaseEnabled() && window.document()->security Origin()->canAccessDatabase()) {
52 String errorMessage; 52 String errorMessage;
53 database = dbManager.openDatabase(window.document(), name, version, disp layName, estimatedSize, creationCallback, error, errorMessage); 53 database = dbManager.openDatabase(window.document(), name, version, disp layName, estimatedSize, creationCallback, error, errorMessage);
54 ASSERT(database || error != DatabaseError::None); 54 ASSERT(database || error != DatabaseError::None);
55 if (error != DatabaseError::None) 55 if (error != DatabaseError::None)
56 DatabaseManager::throwExceptionForDatabaseError(error, errorMessage, exceptionState); 56 DatabaseManager::throwExceptionForDatabaseError(error, errorMessage, exceptionState);
57 } else { 57 } else {
58 exceptionState.throwSecurityError("Access to the WebDatabase API is deni ed in this context."); 58 exceptionState.throwSecurityError("Access to the WebDatabase API is deni ed in this context.");
59 } 59 }
60 60
61 return database; 61 return database;
62 } 62 }
63 63
64 } // namespace WebCore 64 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/modules/webaudio/ScriptProcessorNode.cpp ('k') | Source/modules/webdatabase/DatabaseBackend.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698