| 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 |
| (...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 169 case DatabaseError::InvalidDatabaseState: | 169 case DatabaseError::InvalidDatabaseState: |
| 170 exceptionState.throwDOMException(InvalidStateError, errorMessage); | 170 exceptionState.throwDOMException(InvalidStateError, errorMessage); |
| 171 return; | 171 return; |
| 172 default: | 172 default: |
| 173 ASSERT_NOT_REACHED(); | 173 ASSERT_NOT_REACHED(); |
| 174 } | 174 } |
| 175 } | 175 } |
| 176 | 176 |
| 177 static void logOpenDatabaseError(ExecutionContext* context, const String& name) | 177 static void logOpenDatabaseError(ExecutionContext* context, const String& name) |
| 178 { | 178 { |
| 179 UNUSED_PARAM(context); | |
| 180 UNUSED_PARAM(name); | |
| 181 WTF_LOG(StorageAPI, "Database %s for origin %s not allowed to be established
", name.ascii().data(), | 179 WTF_LOG(StorageAPI, "Database %s for origin %s not allowed to be established
", name.ascii().data(), |
| 182 context->securityOrigin()->toString().ascii().data()); | 180 context->securityOrigin()->toString().ascii().data()); |
| 183 } | 181 } |
| 184 | 182 |
| 185 PassRefPtr<DatabaseBackendBase> DatabaseManager::openDatabaseBackend(ExecutionCo
ntext* context, | 183 PassRefPtr<DatabaseBackendBase> DatabaseManager::openDatabaseBackend(ExecutionCo
ntext* context, |
| 186 DatabaseType type, const String& name, const String& expectedVersion, const
String& displayName, | 184 DatabaseType type, const String& name, const String& expectedVersion, const
String& displayName, |
| 187 unsigned long estimatedSize, bool setVersionInNewDatabase, DatabaseError& er
ror, String& errorMessage) | 185 unsigned long estimatedSize, bool setVersionInNewDatabase, DatabaseError& er
ror, String& errorMessage) |
| 188 { | 186 { |
| 189 ASSERT(error == DatabaseError::None); | 187 ASSERT(error == DatabaseError::None); |
| 190 | 188 |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 299 if (databaseContext) | 297 if (databaseContext) |
| 300 m_server->interruptAllDatabasesForContext(databaseContext->backend().get
()); | 298 m_server->interruptAllDatabasesForContext(databaseContext->backend().get
()); |
| 301 } | 299 } |
| 302 | 300 |
| 303 void DatabaseManager::logErrorMessage(ExecutionContext* context, const String& m
essage) | 301 void DatabaseManager::logErrorMessage(ExecutionContext* context, const String& m
essage) |
| 304 { | 302 { |
| 305 context->addConsoleMessage(StorageMessageSource, ErrorMessageLevel, message)
; | 303 context->addConsoleMessage(StorageMessageSource, ErrorMessageLevel, message)
; |
| 306 } | 304 } |
| 307 | 305 |
| 308 } // namespace WebCore | 306 } // namespace WebCore |
| OLD | NEW |