equal
deleted
inserted
replaced
90 return url; |
90 return url; |
91 return url.substring(0, urlTruncationLength) + "..."; |
91 return url.substring(0, urlTruncationLength) + "..."; |
92 } |
92 } |
93 #endif |
93 #endif |
94 |
94 |
|
95 static IconDatabaseClient* defaultClientObj; |
95 static IconDatabaseClient* defaultClient() |
96 static IconDatabaseClient* defaultClient() |
96 { |
97 { |
97 static IconDatabaseClient* defaultClient = new IconDatabaseClient(); |
98 if( !defaultClientObj ) { |
98 return defaultClient; |
99 defaultClientObj = new IconDatabaseClient(); |
|
100 } |
|
101 return defaultClientObj; |
99 } |
102 } |
100 |
103 |
101 IconDatabase* iconDatabase() |
104 IconDatabase* iconDatabase() |
102 { |
105 { |
103 if (!sharedIconDatabase) |
106 if (!sharedIconDatabase) |
248 retainedString = retainedIter.get(); |
251 retainedString = retainedIter.get(); |
249 *retainedString = String(); |
252 *retainedString = String(); |
250 } |
253 } |
251 m_retainedPageURLs.clear(); |
254 m_retainedPageURLs.clear(); |
252 |
255 |
253 delete m_client; |
|
254 delete sharedIconDatabase; |
|
255 m_syncLock.~Mutex(); |
256 m_syncLock.~Mutex(); |
256 m_urlAndIconLock.~Mutex(); |
257 m_urlAndIconLock.~Mutex(); |
257 m_pendingSyncLock.~Mutex(); |
258 m_pendingSyncLock.~Mutex(); |
258 m_pendingReadingLock.~Mutex(); |
259 m_pendingReadingLock.~Mutex(); |
|
260 |
|
261 delete m_client; |
|
262 defaultClientObj = NULL; |
|
263 delete sharedIconDatabase; |
|
264 sharedIconDatabase = NULL; |
259 #endif |
265 #endif |
260 } |
266 } |
261 |
267 |
262 void IconDatabase::removeAllIcons() |
268 void IconDatabase::removeAllIcons() |
263 { |
269 { |