OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 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 21 matching lines...) Expand all Loading... |
32 #include "modules/webdatabase/DatabaseTracker.h" | 32 #include "modules/webdatabase/DatabaseTracker.h" |
33 | 33 |
34 #include "core/dom/ExecutionContext.h" | 34 #include "core/dom/ExecutionContext.h" |
35 #include "core/dom/ExecutionContextTask.h" | 35 #include "core/dom/ExecutionContextTask.h" |
36 #include "modules/webdatabase/DatabaseBackendBase.h" | 36 #include "modules/webdatabase/DatabaseBackendBase.h" |
37 #include "modules/webdatabase/DatabaseClient.h" | 37 #include "modules/webdatabase/DatabaseClient.h" |
38 #include "modules/webdatabase/DatabaseContext.h" | 38 #include "modules/webdatabase/DatabaseContext.h" |
39 #include "modules/webdatabase/DatabaseObserver.h" | 39 #include "modules/webdatabase/DatabaseObserver.h" |
40 #include "modules/webdatabase/QuotaTracker.h" | 40 #include "modules/webdatabase/QuotaTracker.h" |
41 #include "modules/webdatabase/sqlite/SQLiteFileSystem.h" | 41 #include "modules/webdatabase/sqlite/SQLiteFileSystem.h" |
| 42 #include "platform/weborigin/DatabaseIdentifier.h" |
| 43 #include "platform/weborigin/SecurityOrigin.h" |
| 44 #include "platform/weborigin/SecurityOriginHash.h" |
42 #include "public/platform/Platform.h" | 45 #include "public/platform/Platform.h" |
43 #include "public/platform/WebPlatformDatabaseObserver.h" | 46 #include "public/platform/WebPlatformDatabaseObserver.h" |
44 #include "weborigin/DatabaseIdentifier.h" | |
45 #include "weborigin/SecurityOrigin.h" | |
46 #include "weborigin/SecurityOriginHash.h" | |
47 #include "wtf/Assertions.h" | 47 #include "wtf/Assertions.h" |
48 #include "wtf/StdLibExtras.h" | 48 #include "wtf/StdLibExtras.h" |
49 | 49 |
50 namespace WebCore { | 50 namespace WebCore { |
51 | 51 |
52 static void databaseClosed(DatabaseBackendBase* database) | 52 static void databaseClosed(DatabaseBackendBase* database) |
53 { | 53 { |
54 if (blink::Platform::current()->databaseObserver()) { | 54 if (blink::Platform::current()->databaseObserver()) { |
55 blink::Platform::current()->databaseObserver()->databaseClosed( | 55 blink::Platform::current()->databaseObserver()->databaseClosed( |
56 createDatabaseIdentifierFromSecurityOrigin(database->securityOrigin(
)), | 56 createDatabaseIdentifierFromSecurityOrigin(database->securityOrigin(
)), |
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
291 DatabaseSet::iterator found = databaseSet->find(database); | 291 DatabaseSet::iterator found = databaseSet->find(database); |
292 if (found == databaseSet->end()) | 292 if (found == databaseSet->end()) |
293 return; | 293 return; |
294 } | 294 } |
295 | 295 |
296 // And we have to call closeImmediately() without our collection lock being
held. | 296 // And we have to call closeImmediately() without our collection lock being
held. |
297 database->closeImmediately(); | 297 database->closeImmediately(); |
298 } | 298 } |
299 | 299 |
300 } | 300 } |
OLD | NEW |