| 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 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 87 const String& name, | 87 const String& name, |
| 88 bool) { | 88 bool) { |
| 89 return String(Platform::current()->databaseCreateOriginIdentifier( | 89 return String(Platform::current()->databaseCreateOriginIdentifier( |
| 90 WebSecurityOrigin(origin))) + | 90 WebSecurityOrigin(origin))) + |
| 91 "/" + name + "#"; | 91 "/" + name + "#"; |
| 92 } | 92 } |
| 93 | 93 |
| 94 void DatabaseTracker::addOpenDatabase(Database* database) { | 94 void DatabaseTracker::addOpenDatabase(Database* database) { |
| 95 MutexLocker openDatabaseMapLock(m_openDatabaseMapGuard); | 95 MutexLocker openDatabaseMapLock(m_openDatabaseMapGuard); |
| 96 if (!m_openDatabaseMap) | 96 if (!m_openDatabaseMap) |
| 97 m_openDatabaseMap = wrapUnique(new DatabaseOriginMap); | 97 m_openDatabaseMap = WTF::wrapUnique(new DatabaseOriginMap); |
| 98 | 98 |
| 99 String originString = database->getSecurityOrigin()->toRawString(); | 99 String originString = database->getSecurityOrigin()->toRawString(); |
| 100 DatabaseNameMap* nameMap = m_openDatabaseMap->get(originString); | 100 DatabaseNameMap* nameMap = m_openDatabaseMap->get(originString); |
| 101 if (!nameMap) { | 101 if (!nameMap) { |
| 102 nameMap = new DatabaseNameMap(); | 102 nameMap = new DatabaseNameMap(); |
| 103 m_openDatabaseMap->set(originString, nameMap); | 103 m_openDatabaseMap->set(originString, nameMap); |
| 104 } | 104 } |
| 105 | 105 |
| 106 String name(database->stringIdentifier()); | 106 String name(database->stringIdentifier()); |
| 107 DatabaseSet* databaseSet = nameMap->get(name); | 107 DatabaseSet* databaseSet = nameMap->get(name); |
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 233 if (found == databaseSet->end()) | 233 if (found == databaseSet->end()) |
| 234 return; | 234 return; |
| 235 } | 235 } |
| 236 | 236 |
| 237 // And we have to call closeImmediately() without our collection lock being | 237 // And we have to call closeImmediately() without our collection lock being |
| 238 // held. | 238 // held. |
| 239 database->closeImmediately(); | 239 database->closeImmediately(); |
| 240 } | 240 } |
| 241 | 241 |
| 242 } // namespace blink | 242 } // namespace blink |
| OLD | NEW |