| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 Google Inc. All rights reserved. |
| 3 * Copyright (C) 2013 Apple Inc. All rights reserved. | 3 * Copyright (C) 2013 Apple Inc. All rights reserved. |
| 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 * | 8 * |
| 9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 25 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 26 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 26 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| 27 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 27 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 28 */ | 28 */ |
| 29 | 29 |
| 30 #include "config.h" | 30 #include "config.h" |
| 31 #include "modules/webdatabase/DatabaseBackendBase.h" | 31 #include "modules/webdatabase/DatabaseBackendBase.h" |
| 32 | 32 |
| 33 #include "core/dom/ExceptionCode.h" | 33 #include "core/dom/ExceptionCode.h" |
| 34 #include "core/dom/ExecutionContext.h" | 34 #include "core/dom/ExecutionContext.h" |
| 35 #include "core/inspector/ConsoleMessage.h" |
| 35 #include "platform/Logging.h" | 36 #include "platform/Logging.h" |
| 36 #include "modules/webdatabase/DatabaseAuthorizer.h" | 37 #include "modules/webdatabase/DatabaseAuthorizer.h" |
| 37 #include "modules/webdatabase/DatabaseBase.h" | 38 #include "modules/webdatabase/DatabaseBase.h" |
| 38 #include "modules/webdatabase/DatabaseContext.h" | 39 #include "modules/webdatabase/DatabaseContext.h" |
| 39 #include "modules/webdatabase/DatabaseManager.h" | 40 #include "modules/webdatabase/DatabaseManager.h" |
| 40 #include "modules/webdatabase/DatabaseTracker.h" | 41 #include "modules/webdatabase/DatabaseTracker.h" |
| 41 #include "modules/webdatabase/sqlite/SQLiteStatement.h" | 42 #include "modules/webdatabase/sqlite/SQLiteStatement.h" |
| 42 #include "modules/webdatabase/sqlite/SQLiteTransaction.h" | 43 #include "modules/webdatabase/sqlite/SQLiteTransaction.h" |
| 43 #include "platform/weborigin/DatabaseIdentifier.h" | 44 #include "platform/weborigin/DatabaseIdentifier.h" |
| 44 #include "public/platform/Platform.h" | 45 #include "public/platform/Platform.h" |
| (...skipping 612 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 657 { | 658 { |
| 658 if (blink::Platform::current()->databaseObserver()) { | 659 if (blink::Platform::current()->databaseObserver()) { |
| 659 blink::Platform::current()->databaseObserver()->reportVacuumDatabaseResu
lt( | 660 blink::Platform::current()->databaseObserver()->reportVacuumDatabaseResu
lt( |
| 660 createDatabaseIdentifierFromSecurityOrigin(securityOrigin()), | 661 createDatabaseIdentifierFromSecurityOrigin(securityOrigin()), |
| 661 stringIdentifier(), isSyncDatabase(), sqliteErrorCode); | 662 stringIdentifier(), isSyncDatabase(), sqliteErrorCode); |
| 662 } | 663 } |
| 663 } | 664 } |
| 664 | 665 |
| 665 void DatabaseBackendBase::logErrorMessage(const String& message) | 666 void DatabaseBackendBase::logErrorMessage(const String& message) |
| 666 { | 667 { |
| 667 executionContext()->addConsoleMessage(StorageMessageSource, ErrorMessageLeve
l, message); | 668 executionContext()->addConsoleMessage(ConsoleMessage::create(StorageMessageS
ource, ErrorMessageLevel, message)); |
| 668 } | 669 } |
| 669 | 670 |
| 670 ExecutionContext* DatabaseBackendBase::executionContext() const | 671 ExecutionContext* DatabaseBackendBase::executionContext() const |
| 671 { | 672 { |
| 672 return databaseContext()->executionContext(); | 673 return databaseContext()->executionContext(); |
| 673 } | 674 } |
| 674 | 675 |
| 675 } // namespace blink | 676 } // namespace blink |
| OLD | NEW |