| 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 28 matching lines...) Expand all Loading... |
| 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 "public/platform/Platform.h" | 42 #include "public/platform/Platform.h" |
| 43 #include "public/platform/WebPlatformDatabaseObserver.h" | 43 #include "public/platform/WebPlatformDatabaseObserver.h" |
| 44 #include "weborigin/DatabaseIdentifier.h" | 44 #include "weborigin/DatabaseIdentifier.h" |
| 45 #include "weborigin/SecurityOrigin.h" | 45 #include "weborigin/SecurityOrigin.h" |
| 46 #include "weborigin/SecurityOriginHash.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 #include "wtf/text/WTFString.h" | |
| 50 | 49 |
| 51 namespace WebCore { | 50 namespace WebCore { |
| 52 | 51 |
| 53 static void databaseClosed(DatabaseBackendBase* database) | 52 static void databaseClosed(DatabaseBackendBase* database) |
| 54 { | 53 { |
| 55 if (blink::Platform::current()->databaseObserver()) { | 54 if (blink::Platform::current()->databaseObserver()) { |
| 56 blink::Platform::current()->databaseObserver()->databaseClosed( | 55 blink::Platform::current()->databaseObserver()->databaseClosed( |
| 57 createDatabaseIdentifierFromSecurityOrigin(database->securityOrigin(
)), | 56 createDatabaseIdentifierFromSecurityOrigin(database->securityOrigin(
)), |
| 58 database->stringIdentifier()); | 57 database->stringIdentifier()); |
| 59 } else { | 58 } else { |
| (...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 292 DatabaseSet::iterator found = databaseSet->find(database); | 291 DatabaseSet::iterator found = databaseSet->find(database); |
| 293 if (found == databaseSet->end()) | 292 if (found == databaseSet->end()) |
| 294 return; | 293 return; |
| 295 } | 294 } |
| 296 | 295 |
| 297 // 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. |
| 298 database->closeImmediately(); | 297 database->closeImmediately(); |
| 299 } | 298 } |
| 300 | 299 |
| 301 } | 300 } |
| OLD | NEW |