| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2007 Justin Haygood (jhaygood@reaktix.com) | 3 * Copyright (C) 2007 Justin Haygood (jhaygood@reaktix.com) |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 45 #include <wtf/StdLibExtras.h> | 45 #include <wtf/StdLibExtras.h> |
| 46 #include <wtf/text/CString.h> | 46 #include <wtf/text/CString.h> |
| 47 | 47 |
| 48 // For methods that are meant to support API from the main thread - should not b
e called internally | 48 // For methods that are meant to support API from the main thread - should not b
e called internally |
| 49 #define ASSERT_NOT_SYNC_THREAD() ASSERT(!m_syncThreadRunning || !IS_ICON_SYNC_TH
READ()) | 49 #define ASSERT_NOT_SYNC_THREAD() ASSERT(!m_syncThreadRunning || !IS_ICON_SYNC_TH
READ()) |
| 50 | 50 |
| 51 // For methods that are meant to support the sync thread ONLY | 51 // For methods that are meant to support the sync thread ONLY |
| 52 #define IS_ICON_SYNC_THREAD() (m_syncThread == currentThread()) | 52 #define IS_ICON_SYNC_THREAD() (m_syncThread == currentThread()) |
| 53 #define ASSERT_ICON_SYNC_THREAD() ASSERT(IS_ICON_SYNC_THREAD()) | 53 #define ASSERT_ICON_SYNC_THREAD() ASSERT(IS_ICON_SYNC_THREAD()) |
| 54 | 54 |
| 55 #if PLATFORM(QT) || PLATFORM(GTK) | 55 #if PLATFORM(GTK) |
| 56 #define CAN_THEME_URL_ICON | 56 #define CAN_THEME_URL_ICON |
| 57 #endif | 57 #endif |
| 58 | 58 |
| 59 namespace WebCore { | 59 namespace WebCore { |
| 60 | 60 |
| 61 static int databaseCleanupCounter = 0; | 61 static int databaseCleanupCounter = 0; |
| 62 | 62 |
| 63 // This version number is in the DB and marks the current generation of the sche
ma | 63 // This version number is in the DB and marks the current generation of the sche
ma |
| 64 // Currently, a mismatched schema causes the DB to be wiped and reset. This isn
't | 64 // Currently, a mismatched schema causes the DB to be wiped and reset. This isn
't |
| 65 // so bad during development but in the future, we would need to write a convers
ion | 65 // so bad during development but in the future, we would need to write a convers
ion |
| (...skipping 2191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2257 ASSERT_ICON_SYNC_THREAD(); | 2257 ASSERT_ICON_SYNC_THREAD(); |
| 2258 | 2258 |
| 2259 FinishedURLImport* work = new FinishedURLImport(m_client); | 2259 FinishedURLImport* work = new FinishedURLImport(m_client); |
| 2260 callOnMainThread(performWorkItem, work); | 2260 callOnMainThread(performWorkItem, work); |
| 2261 } | 2261 } |
| 2262 | 2262 |
| 2263 | 2263 |
| 2264 } // namespace WebCore | 2264 } // namespace WebCore |
| 2265 | 2265 |
| 2266 #endif // ENABLE(ICONDATABASE) | 2266 #endif // ENABLE(ICONDATABASE) |
| OLD | NEW |