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

Side by Side Diff: Source/WebCore/Modules/webdatabase/DatabaseServer.cpp

Issue 13774005: Remove the ENABLE_SQL_DATABASE compile-time flag. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: python Created 7 years, 8 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) 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2012 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27 #include "DatabaseServer.h" 27 #include "DatabaseServer.h"
28 28
29 #if ENABLE(SQL_DATABASE)
30
31 #include "Database.h" 29 #include "Database.h"
32 #include "DatabaseBackend.h" 30 #include "DatabaseBackend.h"
33 #include "DatabaseBackendContext.h" 31 #include "DatabaseBackendContext.h"
34 #include "DatabaseBackendSync.h" 32 #include "DatabaseBackendSync.h"
35 #include "DatabaseSync.h" 33 #include "DatabaseSync.h"
36 #include "DatabaseTracker.h" 34 #include "DatabaseTracker.h"
37 #include <wtf/UnusedParam.h> 35 #include <wtf/UnusedParam.h>
38 36
39 namespace WebCore { 37 namespace WebCore {
40 38
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 } 173 }
176 174
177 if (!database->openAndVerifyVersion(setVersionInNewDatabase, error, errorMes sage)) 175 if (!database->openAndVerifyVersion(setVersionInNewDatabase, error, errorMes sage))
178 return 0; 176 return 0;
179 177
180 DatabaseTracker::tracker().setDatabaseDetails(backendContext->securityOrigin (), name, displayName, estimatedSize); 178 DatabaseTracker::tracker().setDatabaseDetails(backendContext->securityOrigin (), name, displayName, estimatedSize);
181 return database.release(); 179 return database.release();
182 } 180 }
183 181
184 } // namespace WebCore 182 } // namespace WebCore
185
186 #endif // ENABLE(SQL_DATABASE)
OLDNEW
« no previous file with comments | « Source/WebCore/Modules/webdatabase/DatabaseServer.h ('k') | Source/WebCore/Modules/webdatabase/DatabaseSync.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698