| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 Google 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 are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * 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 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 29 matching lines...) Expand all Loading... |
| 40 #include "WebViewImpl.h" | 40 #include "WebViewImpl.h" |
| 41 #include "WorkerPermissionClient.h" | 41 #include "WorkerPermissionClient.h" |
| 42 #include "bindings/v8/WorkerScriptController.h" | 42 #include "bindings/v8/WorkerScriptController.h" |
| 43 #include "core/dom/Document.h" | 43 #include "core/dom/Document.h" |
| 44 #include "core/dom/ExecutionContext.h" | 44 #include "core/dom/ExecutionContext.h" |
| 45 #include "core/workers/WorkerGlobalScope.h" | 45 #include "core/workers/WorkerGlobalScope.h" |
| 46 #include "modules/webdatabase/DatabaseBackendBase.h" | 46 #include "modules/webdatabase/DatabaseBackendBase.h" |
| 47 #include "modules/webdatabase/DatabaseContext.h" | 47 #include "modules/webdatabase/DatabaseContext.h" |
| 48 #include "platform/CrossThreadCopier.h" | 48 #include "platform/CrossThreadCopier.h" |
| 49 | 49 |
| 50 using namespace WebKit; | 50 using namespace blink; |
| 51 | 51 |
| 52 namespace WebCore { | 52 namespace WebCore { |
| 53 | 53 |
| 54 bool DatabaseObserver::canEstablishDatabase(ExecutionContext* executionContext,
const String& name, const String& displayName, unsigned long estimatedSize) | 54 bool DatabaseObserver::canEstablishDatabase(ExecutionContext* executionContext,
const String& name, const String& displayName, unsigned long estimatedSize) |
| 55 { | 55 { |
| 56 ASSERT(executionContext->isContextThread()); | 56 ASSERT(executionContext->isContextThread()); |
| 57 ASSERT(executionContext->isDocument() || executionContext->isWorkerGlobalSco
pe()); | 57 ASSERT(executionContext->isDocument() || executionContext->isWorkerGlobalSco
pe()); |
| 58 if (executionContext->isDocument()) { | 58 if (executionContext->isDocument()) { |
| 59 Document* document = toDocument(executionContext); | 59 Document* document = toDocument(executionContext); |
| 60 WebFrameImpl* webFrame = WebFrameImpl::fromFrame(document->frame()); | 60 WebFrameImpl* webFrame = WebFrameImpl::fromFrame(document->frame()); |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 { | 114 { |
| 115 WebDatabase::observer()->reportExecuteStatementResult(WebDatabase(database),
errorSite, webSqlErrorCode, sqliteErrorCode); | 115 WebDatabase::observer()->reportExecuteStatementResult(WebDatabase(database),
errorSite, webSqlErrorCode, sqliteErrorCode); |
| 116 } | 116 } |
| 117 | 117 |
| 118 void DatabaseObserver::reportVacuumDatabaseResult(DatabaseBackendBase* database,
int sqliteErrorCode) | 118 void DatabaseObserver::reportVacuumDatabaseResult(DatabaseBackendBase* database,
int sqliteErrorCode) |
| 119 { | 119 { |
| 120 WebDatabase::observer()->reportVacuumDatabaseResult(WebDatabase(database), s
qliteErrorCode); | 120 WebDatabase::observer()->reportVacuumDatabaseResult(WebDatabase(database), s
qliteErrorCode); |
| 121 } | 121 } |
| 122 | 122 |
| 123 } // namespace WebCore | 123 } // namespace WebCore |
| OLD | NEW |