| OLD | NEW |
|---|
| 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 #ifndef DatabaseManager_h | 26 #ifndef DatabaseManager_h |
| 27 #define DatabaseManager_h | 27 #define DatabaseManager_h |
| 28 | 28 |
| 29 #if ENABLE(SQL_DATABASE) | |
| 30 | |
| 31 #include "DatabaseBasicTypes.h" | 29 #include "DatabaseBasicTypes.h" |
| 32 #include "DatabaseDetails.h" | 30 #include "DatabaseDetails.h" |
| 33 #include "DatabaseError.h" | 31 #include "DatabaseError.h" |
| 34 #include <wtf/Assertions.h> | 32 #include <wtf/Assertions.h> |
| 35 #include <wtf/HashMap.h> | 33 #include <wtf/HashMap.h> |
| 36 #include <wtf/PassRefPtr.h> | 34 #include <wtf/PassRefPtr.h> |
| 37 #include <wtf/Threading.h> | 35 #include <wtf/Threading.h> |
| 38 | 36 |
| 39 namespace WebCore { | 37 namespace WebCore { |
| 40 | 38 |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 133 ContextMap m_contextMap; | 131 ContextMap m_contextMap; |
| 134 #if !ASSERT_DISABLED | 132 #if !ASSERT_DISABLED |
| 135 int m_databaseContextRegisteredCount; | 133 int m_databaseContextRegisteredCount; |
| 136 int m_databaseContextInstanceCount; | 134 int m_databaseContextInstanceCount; |
| 137 #endif | 135 #endif |
| 138 Mutex m_contextMapLock; | 136 Mutex m_contextMapLock; |
| 139 }; | 137 }; |
| 140 | 138 |
| 141 } // namespace WebCore | 139 } // namespace WebCore |
| 142 | 140 |
| 143 #endif // ENABLE(SQL_DATABASE) | |
| 144 | |
| 145 #endif // DatabaseManager_h | 141 #endif // DatabaseManager_h |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 13774005:
Remove the ENABLE_SQL_DATABASE compile-time flag. (Closed)
Base URL: svn://svn.chromium.org/blink/trunk