diff options
Diffstat (limited to 'src/3rdparty/webkit/WebCore/loader/icon/IconDatabase.h')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/loader/icon/IconDatabase.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/3rdparty/webkit/WebCore/loader/icon/IconDatabase.h b/src/3rdparty/webkit/WebCore/loader/icon/IconDatabase.h index 4303ae1201..40f641a298 100644 --- a/src/3rdparty/webkit/WebCore/loader/icon/IconDatabase.h +++ b/src/3rdparty/webkit/WebCore/loader/icon/IconDatabase.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. + * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. * Copyright (C) 2007 Justin Haygood (jhaygood@reaktix.com) * * Redistribution and use in source and binary forms, with or without @@ -27,17 +27,15 @@ #ifndef IconDatabase_h #define IconDatabase_h -#if ENABLE(ICONDATABASE) -#include "SQLiteDatabase.h" -#endif - #include "StringHash.h" #include "Timer.h" #include <wtf/HashMap.h> #include <wtf/HashSet.h> #include <wtf/Noncopyable.h> #include <wtf/OwnPtr.h> + #if ENABLE(ICONDATABASE) +#include "SQLiteDatabase.h" #include <wtf/Threading.h> #endif @@ -116,9 +114,9 @@ private: void wakeSyncThread(); void scheduleOrDeferSyncTimer(); - OwnPtr<Timer<IconDatabase> > m_syncTimer; void syncTimerFired(Timer<IconDatabase>*); + Timer<IconDatabase> m_syncTimer; ThreadIdentifier m_syncThread; bool m_syncThreadRunning; |