diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog index 779b0e02e26efc0bd1b54298129b01dd83176e84..cc9caac23dbdefc41e58df2f1fc698632c166794 100644 --- a/JavaScriptCore/ChangeLog +++ b/JavaScriptCore/ChangeLog @@ -1,3 +1,32 @@ +2008-04-08 Adam Roben + + Move callOnMainThread to WTF + + Reviewed by Alexey Proskuryakov. + + * GNUmakefile.am: + * JavaScriptCore.pri: + * JavaScriptCore.vcproj/WTF/WTF.vcproj: + * JavaScriptCore.xcodeproj/project.pbxproj: + * JavaScriptCoreSources.bkl: + Added new files. + + * wtf/MainThread.cpp: + * wtf/MainThread.h: + * wtf/gtk/MainThreadGtk.cpp: + * wtf/mac/MainThreadMac.mm: + * wtf/qt/MainThreadQt.cpp: + * wtf/win/MainThreadWin.cpp: + * wtf/wx/MainThreadWx.cpp: + Moved here from WebCore/platform. Replaced all instances of "WebCore" + with "WTF". + + * kjs/bool_object.cpp: Touched to force JavaScriptCore.vcproj to + build. + to the WTF namespace. + * wtf/ThreadingWin.cpp: + (WTF::initializeThreading): Call initializeMainThread. + 2008-04-07 Brady Eidson Add "ENABLE_DOM_STORAGE" to keep in sync with the rest of the project diff --git a/JavaScriptCore/GNUmakefile.am b/JavaScriptCore/GNUmakefile.am index 899c7dc3289a8fbe7b6fb2ac45f8d809a18b82d6..2dd60bd52128949cf09e6f3626626daf81120b8e 100644 --- a/JavaScriptCore/GNUmakefile.am +++ b/JavaScriptCore/GNUmakefile.am @@ -49,7 +49,9 @@ javascriptcore_sources += \ JavaScriptCore/pcre/pcre_xclass.cpp \ JavaScriptCore/wtf/Assertions.cpp \ JavaScriptCore/wtf/HashTable.cpp \ + JavaScriptCore/wtf/MainThread.cpp \ JavaScriptCore/wtf/ThreadingGtk.cpp \ + JavaScriptCore/wtf/gtk/MainThreadGtk.cpp \ JavaScriptCore/wtf/unicode/CollatorDefault.cpp \ JavaScriptCore/wtf/unicode/icu/CollatorICU.cpp \ JavaScriptCore/wtf/unicode/UTF8.cpp diff --git a/JavaScriptCore/JavaScriptCore.pri b/JavaScriptCore/JavaScriptCore.pri index 7afdaa28169d2cf23debc40b45677ea84a3c5a7e..5139c20f6b3140f5b012adda9e97c302eeac2d68 100644 --- a/JavaScriptCore/JavaScriptCore.pri +++ b/JavaScriptCore/JavaScriptCore.pri @@ -35,6 +35,7 @@ KJSBISON += \ SOURCES += \ wtf/Assertions.cpp \ wtf/HashTable.cpp \ + wtf/MainThread.cpp \ wtf/unicode/CollatorDefault.cpp \ wtf/unicode/icu/CollatorICU.cpp \ wtf/unicode/UTF8.cpp \ @@ -104,10 +105,12 @@ SOURCES += \ } gtk-port:SOURCES += \ - wtf/ThreadingGtk.cpp + wtf/ThreadingGtk.cpp \ + wtf/gtk/MainThreadGtk.cpp !gtk-port:SOURCES += \ - wtf/ThreadingNone.cpp + wtf/ThreadingNone.cpp \ + wtf/qt/MainThreadQt.cpp !CONFIG(QTDIR_build) { defineTest(addExtraCompiler) { diff --git a/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj b/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj index 8810ae30f3be4b2a9aa656ed8e2e0bef8e26195e..91e96fb35cf6786fb726e6bd4b77c01b269127c7 100644 --- a/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj +++ b/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj @@ -203,6 +203,14 @@ + + + + @@ -295,6 +303,14 @@ RelativePath="..\..\wtf\Locker.h" > + + + + diff --git a/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj b/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj index a40a4b8b91b9346955afcc04b019d651c0f4b718..261789f5add3544e2c3c08b59e52eb1609645052 100644 --- a/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj +++ b/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj @@ -33,6 +33,9 @@ /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ + 06D358B20DAADA93003B174E /* MainThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 06D358A30DAAD9C4003B174E /* MainThread.h */; settings = {ATTRIBUTES = (Private, ); }; }; + 06D358B30DAADAA4003B174E /* MainThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 06D358A20DAAD9C4003B174E /* MainThread.cpp */; }; + 06D358B40DAADAAA003B174E /* MainThreadMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 06D358A10DAAD9C4003B174E /* MainThreadMac.mm */; }; 141211310A48794D00480255 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 932F5BD90822A1C700736975 /* JavaScriptCore.framework */; }; 141211340A48795800480255 /* minidom.c in Sources */ = {isa = PBXBuildFile; fileRef = 141211020A48780900480255 /* minidom.c */; }; 1419D32D0CEA7CDE00FF507A /* RefCounted.h in Headers */ = {isa = PBXBuildFile; fileRef = 1419D32C0CEA7CDE00FF507A /* RefCounted.h */; settings = {ATTRIBUTES = (Private, ); }; }; @@ -331,6 +334,9 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 06D358A10DAAD9C4003B174E /* MainThreadMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MainThreadMac.mm; sourceTree = ""; }; + 06D358A20DAAD9C4003B174E /* MainThread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MainThread.cpp; sourceTree = ""; }; + 06D358A30DAAD9C4003B174E /* MainThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MainThread.h; sourceTree = ""; }; 141211020A48780900480255 /* minidom.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = minidom.c; sourceTree = ""; }; 1412110D0A48788700480255 /* minidom.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = minidom.js; sourceTree = ""; }; 141211200A48793C00480255 /* minidom */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = minidom; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -613,6 +619,14 @@ tabWidth = 4; usesTabs = 0; }; + 06D358A00DAAD9C4003B174E /* mac */ = { + isa = PBXGroup; + children = ( + 06D358A10DAAD9C4003B174E /* MainThreadMac.mm */, + ); + path = mac; + sourceTree = ""; + }; 0867D691FE84028FC02AAC07 /* JavaScriptCore */ = { isa = PBXGroup; children = ( @@ -748,6 +762,7 @@ 65162EF108E6A21C007556CD /* wtf */ = { isa = PBXGroup; children = ( + 06D358A00DAAD9C4003B174E /* mac */, 93AA4F770957251F0084B3A7 /* AlwaysInline.h */, 938C4F690CA06BC700D9310A /* ASCIICType.h */, 65E217B808E7EECC0023E5F6 /* Assertions.cpp */, @@ -769,6 +784,8 @@ 657EB7450B708F540063461B /* ListHashSet.h */, 148A1626095D16BB00666D0D /* ListRefPtr.h */, E1EE79270D6C964500FEA3BA /* Locker.h */, + 06D358A20DAAD9C4003B174E /* MainThread.cpp */, + 06D358A30DAAD9C4003B174E /* MainThread.h */, 5DBD18AF0C5401A700C15EAE /* MallocZoneSupport.h */, BCF6553B0A2048DE0038A194 /* MathExtras.h */, E1EE798B0D6CA53D00FEA3BA /* MessageQueue.h */, @@ -1100,6 +1117,7 @@ E1EE79280D6C964500FEA3BA /* Locker.h in Headers */, E1A862AB0D7EBB7D001EC6AA /* Collator.h in Headers */, E17863400D9BEC0000D74E75 /* InitializeThreading.h in Headers */, + 06D358B20DAADA93003B174E /* MainThread.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1353,6 +1371,8 @@ E1A862A90D7EBB76001EC6AA /* CollatorICU.cpp in Sources */, E1A862D60D7F2B5C001EC6AA /* CollatorDefault.cpp in Sources */, E178636D0D9BEEC300D74E75 /* InitializeThreading.cpp in Sources */, + 06D358B30DAADAA4003B174E /* MainThread.cpp in Sources */, + 06D358B40DAADAAA003B174E /* MainThreadMac.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/JavaScriptCore/JavaScriptCoreSources.bkl b/JavaScriptCore/JavaScriptCoreSources.bkl index 9058a41e300bcc494000b0dc801279898bcde3dc..d582189f1a1d2672d9933c4a3c01a8501c42f1c1 100644 --- a/JavaScriptCore/JavaScriptCoreSources.bkl +++ b/JavaScriptCore/JavaScriptCoreSources.bkl @@ -99,8 +99,10 @@ Source files for JSCore. wtf/Assertions.cpp wtf/FastMalloc.cpp wtf/HashTable.cpp + wtf/MainThread.cpp wtf/TCSystemAlloc.cpp wtf/ThreadingNone.cpp + wtf/wx/MainThreadWx.cpp wtf/unicode/CollatorDefault.cpp wtf/unicode/icu/CollatorICU.cpp wtf/unicode/UTF8.cpp diff --git a/JavaScriptCore/kjs/bool_object.cpp b/JavaScriptCore/kjs/bool_object.cpp index 10bb73803152c08ba327418fa1f33c2e3c3d7815..1e129f58ffda10cafeac83ad16282f8bab44e48c 100644 --- a/JavaScriptCore/kjs/bool_object.cpp +++ b/JavaScriptCore/kjs/bool_object.cpp @@ -93,7 +93,6 @@ BooleanObjectImp::BooleanObjectImp(ExecState* exec, FunctionPrototype* functionP putDirect(exec->propertyNames().length, jsNumber(1), ReadOnly | DontDelete | DontEnum); } - bool BooleanObjectImp::implementsConstruct() const { return true; diff --git a/WebCore/platform/MainThread.cpp b/JavaScriptCore/wtf/MainThread.cpp similarity index 93% rename from WebCore/platform/MainThread.cpp rename to JavaScriptCore/wtf/MainThread.cpp index 426d7ecb507b06730e023c9778ce301ef436b2d8..4a4cfafe75dc5267a5f9d2cc6e32e25ab839f63c 100644 --- a/WebCore/platform/MainThread.cpp +++ b/JavaScriptCore/wtf/MainThread.cpp @@ -29,11 +29,10 @@ #include "config.h" #include "MainThread.h" -#include "Logging.h" -#include -#include +#include "Threading.h" +#include "Vector.h" -namespace WebCore { +namespace WTF { struct FunctionWithContext { MainThreadFunction* function; @@ -68,7 +67,6 @@ void dispatchFunctionsFromMainThread() queueCopy.swap(functionQueue()); } - LOG(Threading, "Calling %u functions on the main thread", static_cast(queueCopy.size())); for (unsigned i = 0; i < queueCopy.size(); ++i) queueCopy[i].function(queueCopy[i].context); } @@ -96,4 +94,4 @@ void setMainThreadCallbacksPaused(bool paused) scheduleDispatchFunctionsOnMainThread(); } -} // namespace WebCore +} // namespace WTF diff --git a/WebCore/platform/MainThread.h b/JavaScriptCore/wtf/MainThread.h similarity index 90% rename from WebCore/platform/MainThread.h rename to JavaScriptCore/wtf/MainThread.h index 92d30bb1617b991a7747efe35bcf863ff40a6d50..391ef1bda9f051a78443c4111c1f291f93071fac 100644 --- a/WebCore/platform/MainThread.h +++ b/JavaScriptCore/wtf/MainThread.h @@ -30,28 +30,24 @@ #ifndef MainThread_h #define MainThread_h -#include - -namespace WebCore { +namespace WTF { typedef void MainThreadFunction(void*); void callOnMainThread(MainThreadFunction*, void* context); void setMainThreadCallbacksPaused(bool paused); -void initializeThreadingAndMainThread(); - -#if !PLATFORM(WIN) -inline void initializeThreadingAndMainThread() -{ - KJS::initializeThreading(); -} +#if PLATFORM(WIN) +void initializeMainThread(); #endif // These functions are internal to the callOnMainThread implementation. void dispatchFunctionsFromMainThread(); void scheduleDispatchFunctionsOnMainThread(); -} // namespace WebCore +} // namespace WTF + +using WTF::callOnMainThread; +using WTF::setMainThreadCallbacksPaused; #endif // MainThread_h diff --git a/JavaScriptCore/wtf/ThreadingWin.cpp b/JavaScriptCore/wtf/ThreadingWin.cpp index 6a9a5d76de82dc064a9e2e20efd1c476017abe0d..9fef5c3935f90715172e999ac5dc2d90fce454fc 100644 --- a/JavaScriptCore/wtf/ThreadingWin.cpp +++ b/JavaScriptCore/wtf/ThreadingWin.cpp @@ -63,6 +63,7 @@ #include "config.h" #include "Threading.h" +#include "MainThread.h" #include #include #include @@ -78,6 +79,7 @@ void initializeThreading() if (!atomicallyInitializedStaticMutex) { atomicallyInitializedStaticMutex = new Mutex; wtf_random_init(); + initializeMainThread(); mainThreadIdentifier = currentThread(); } } diff --git a/WebCore/platform/gtk/MainThreadGtk.cpp b/JavaScriptCore/wtf/gtk/MainThreadGtk.cpp similarity index 98% rename from WebCore/platform/gtk/MainThreadGtk.cpp rename to JavaScriptCore/wtf/gtk/MainThreadGtk.cpp index 6e74f869cc824ceadd20908dd05118a7bab6e3b8..a6e061f637421381ddcab4d6a5e645dfb517330d 100644 --- a/WebCore/platform/gtk/MainThreadGtk.cpp +++ b/JavaScriptCore/wtf/gtk/MainThreadGtk.cpp @@ -32,7 +32,7 @@ #include -namespace WebCore { +namespace WTF { static gboolean timeoutFired(gpointer) { diff --git a/WebCore/platform/mac/MainThreadMac.mm b/JavaScriptCore/wtf/mac/MainThreadMac.mm similarity index 85% rename from WebCore/platform/mac/MainThreadMac.mm rename to JavaScriptCore/wtf/mac/MainThreadMac.mm index 6b23d63a7ac0aba3d57e7611b39f4103d63157df..b04ef0e427b0058f3e6f05e2da01f358132829a0 100644 --- a/WebCore/platform/mac/MainThreadMac.mm +++ b/JavaScriptCore/wtf/mac/MainThreadMac.mm @@ -29,27 +29,29 @@ #import "config.h" #import "MainThread.h" -@interface WebCoreMainThreadCaller : NSObject { +#import + +@interface WTFMainThreadCaller : NSObject { } - (void)call; @end -@implementation WebCoreMainThreadCaller +@implementation WTFMainThreadCaller - (void)call { - WebCore::dispatchFunctionsFromMainThread(); + WTF::dispatchFunctionsFromMainThread(); } -@end // implementation WebCoreMainThreadCaller +@end // implementation WTFMainThreadCaller -namespace WebCore { +namespace WTF { void scheduleDispatchFunctionsOnMainThread() { - WebCoreMainThreadCaller *caller = [[WebCoreMainThreadCaller alloc] init]; + WTFMainThreadCaller *caller = [[WTFMainThreadCaller alloc] init]; [caller performSelectorOnMainThread:@selector(call) withObject:nil waitUntilDone:NO]; [caller release]; } -} // namespace WebCore +} // namespace WTF diff --git a/WebCore/platform/qt/MainThreadQt.cpp b/JavaScriptCore/wtf/qt/MainThreadQt.cpp similarity index 99% rename from WebCore/platform/qt/MainThreadQt.cpp rename to JavaScriptCore/wtf/qt/MainThreadQt.cpp index 51ccdbe1dc4e8eff7243d3b0baf4592d5c2bc83a..e6d5e30bc41680505ae205c1e3dfa39ba4c299fd 100644 --- a/WebCore/platform/qt/MainThreadQt.cpp +++ b/JavaScriptCore/wtf/qt/MainThreadQt.cpp @@ -35,7 +35,7 @@ #include -namespace WebCore { +namespace WTF { class MainThreadInvoker : public QObject { Q_OBJECT diff --git a/WebCore/platform/win/MainThreadWin.cpp b/JavaScriptCore/wtf/win/MainThreadWin.cpp similarity index 91% rename from WebCore/platform/win/MainThreadWin.cpp rename to JavaScriptCore/wtf/win/MainThreadWin.cpp index 72b51e633f6a152e8e09298e2f27f165957d2bf9..e9c2febdcaa22377e97caa62392420b33a746f4e 100644 --- a/WebCore/platform/win/MainThreadWin.cpp +++ b/JavaScriptCore/wtf/win/MainThreadWin.cpp @@ -29,10 +29,10 @@ #include "config.h" #include "MainThread.h" -#include "Page.h" +#include "Assertions.h" #include -namespace WebCore { +namespace WTF { static HWND threadingWindowHandle; static UINT threadingFiredMessage; @@ -47,23 +47,20 @@ LRESULT CALLBACK ThreadingWindowWndProc(HWND hWnd, UINT message, WPARAM wParam, return 0; } -void initializeThreadingAndMainThread() +void initializeMainThread() { if (threadingWindowHandle) return; - KJS::initializeThreading(); - WNDCLASSEX wcex; memset(&wcex, 0, sizeof(WNDCLASSEX)); wcex.cbSize = sizeof(WNDCLASSEX); wcex.lpfnWndProc = ThreadingWindowWndProc; - wcex.hInstance = Page::instanceHandle(); wcex.lpszClassName = kThreadingWindowClassName; RegisterClassEx(&wcex); threadingWindowHandle = CreateWindow(kThreadingWindowClassName, 0, 0, - CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, HWND_MESSAGE, 0, Page::instanceHandle(), 0); + CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, HWND_MESSAGE, 0, 0, 0); threadingFiredMessage = RegisterWindowMessage(L"com.apple.WebKit.MainThreadFired"); } diff --git a/WebCore/platform/wx/MainThreadWx.cpp b/JavaScriptCore/wtf/wx/MainThreadWx.cpp similarity index 95% rename from WebCore/platform/wx/MainThreadWx.cpp rename to JavaScriptCore/wtf/wx/MainThreadWx.cpp index fce99d4e86d60553335722042a9273140661b5a9..31663311bd077a1c873ecd109c6c930fe9f53a1b 100644 --- a/WebCore/platform/wx/MainThreadWx.cpp +++ b/JavaScriptCore/wtf/wx/MainThreadWx.cpp @@ -29,13 +29,10 @@ #include "config.h" #include "MainThread.h" -#include "NotImplemented.h" - -namespace WebCore { +namespace WTF { void scheduleDispatchFunctionsOnMainThread() { - notImplemented(); } } diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog index aee1fdd5f720f5a083f44942e82a4dca6c4630df..88ddaf7d062ea4dcfdf3d89059fd5dea9016411d 100644 --- a/WebCore/ChangeLog +++ b/WebCore/ChangeLog @@ -1,3 +1,33 @@ +2008-04-08 Adam Roben + + Move callOnMainThread to WTF + + Reviewed by Alexey Proskuryakov. + + * GNUmakefile.am: + * WebCore.pro: + * WebCore.vcproj/WebCore.vcproj: + * WebCoreSources.bkl: + Removed MainThread files. + + * bindings/js/JSCustomSQLTransactionCallback.cpp: + * loader/icon/IconDatabase.cpp: + (WebCore::iconDatabase): + * storage/Database.cpp: + (WebCore::Database::Database): + * storage/DatabaseTracker.cpp: + Updated #includes and replaced calls to + WebCore::initializeThreadingAndMainThread with calls to + KJS::initializeThreading. + + * platform/MainThread.cpp: Removed. + * platform/MainThread.h: Removed. + * platform/gtk/MainThreadGtk.cpp: Removed. + * platform/mac/MainThreadMac.mm: Removed. + * platform/qt/MainThreadQt.cpp: Removed. + * platform/win/MainThreadWin.cpp: Removed. + * platform/wx/MainThreadWx.cpp: Removed. + 2008-04-07 Timothy Hatcher Makes the Network timeline graph resource sizes on the bar graph diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am index 7026f9389b6cd433b7f03a184cd55227f2cc4e11..db699cd593cdc0928b6f2d2dc1508896ad9bb263 100644 --- a/WebCore/GNUmakefile.am +++ b/WebCore/GNUmakefile.am @@ -866,7 +866,6 @@ webcore_sources += \ WebCore/platform/KURL.cpp \ WebCore/platform/Logging.cpp \ WebCore/platform/MIMETypeRegistry.cpp \ - WebCore/platform/MainThread.cpp \ WebCore/platform/network/AuthenticationChallengeBase.cpp \ WebCore/platform/network/Credential.cpp \ WebCore/platform/network/FormData.cpp \ @@ -1000,7 +999,6 @@ webkitgtk_sources += \ WebCore/platform/gtk/Language.cpp \ WebCore/platform/gtk/LocalizedStringsGtk.cpp \ WebCore/platform/gtk/LoggingGtk.cpp \ - WebCore/platform/gtk/MainThreadGtk.cpp \ WebCore/platform/gtk/MIMETypeRegistryGtk.cpp \ WebCore/platform/gtk/MouseEventGtk.cpp \ WebCore/platform/gtk/PasteboardGtk.cpp \ diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro index ed01ede8808db12d2f461920fbaf6a4e765f7abd..85b00a67fa55c91d0b0e5eb6dbc9902f4449d518 100644 --- a/WebCore/WebCore.pro +++ b/WebCore/WebCore.pro @@ -804,7 +804,6 @@ SOURCES += \ platform/KURL.cpp \ platform/Logging.cpp \ platform/MIMETypeRegistry.cpp \ - platform/MainThread.cpp \ platform/network/AuthenticationChallengeBase.cpp \ platform/network/Credential.cpp \ platform/network/FormData.cpp \ diff --git a/WebCore/WebCore.vcproj/WebCore.vcproj b/WebCore/WebCore.vcproj/WebCore.vcproj index 933ae0104dd4535fd0103cacae4d4a7eef52a619..fa9583bcaad28ba9ad7ac8d109995c6ef84e9ad1 100644 --- a/WebCore/WebCore.vcproj/WebCore.vcproj +++ b/WebCore/WebCore.vcproj/WebCore.vcproj @@ -4061,14 +4061,6 @@ RelativePath="..\platform\Logging.h" > - - - - @@ -4332,10 +4324,6 @@ RelativePath="..\platform\win\Language.cpp" > - - @@ -4738,11 +4726,11 @@ RelativePath="..\platform\graphics\GlyphWidthMap.h" > - - @@ -5453,7 +5441,7 @@ /> - - + + diff --git a/WebCore/WebCoreSources.bkl b/WebCore/WebCoreSources.bkl index 177eb9afebab018f09c7c5ad91b1ca27b13ad021..2f9c865273dd65a869b9ec8a3d6688a3832ff68c 100644 --- a/WebCore/WebCoreSources.bkl +++ b/WebCore/WebCoreSources.bkl @@ -622,7 +622,6 @@ This file contains the list of files needed to build WebCore. platform/KURL.cpp platform/Logging.cpp platform/MIMETypeRegistry.cpp - platform/MainThread.cpp platform/text/RegularExpression.cpp platform/ScrollBar.cpp platform/SecurityOrigin.cpp diff --git a/WebCore/bindings/js/JSCustomSQLTransactionCallback.cpp b/WebCore/bindings/js/JSCustomSQLTransactionCallback.cpp index cd50ebd4b6996f0b0d8cc36a2e76177745481f75..f562fef4f568f93fbd5214776456fafabe26c7f3 100644 --- a/WebCore/bindings/js/JSCustomSQLTransactionCallback.cpp +++ b/WebCore/bindings/js/JSCustomSQLTransactionCallback.cpp @@ -32,10 +32,10 @@ #include "CString.h" #include "Frame.h" #include "Logging.h" -#include "MainThread.h" #include "kjs_proxy.h" #include "JSSQLTransaction.h" #include "Page.h" +#include namespace WebCore { diff --git a/WebCore/loader/icon/IconDatabase.cpp b/WebCore/loader/icon/IconDatabase.cpp index 95f3be77fa959ab9b814fb62d44f2189592dfb8b..5d7ddf1455b2408c68ea77f529bf7287f1373b1a 100644 --- a/WebCore/loader/icon/IconDatabase.cpp +++ b/WebCore/loader/icon/IconDatabase.cpp @@ -37,11 +37,12 @@ #include "IntSize.h" #include "KURL.h" #include "Logging.h" -#include "MainThread.h" #include "PageURLRecord.h" #include "SQLiteStatement.h" #include "SQLiteTransaction.h" #include "SystemTime.h" +#include +#include #if PLATFORM(WIN_OS) #include @@ -102,7 +103,7 @@ static IconDatabaseClient* defaultClient() IconDatabase* iconDatabase() { if (!sharedIconDatabase) { - initializeThreadingAndMainThread(); + KJS::initializeThreading(); sharedIconDatabase = new IconDatabase; } return sharedIconDatabase; diff --git a/WebCore/storage/Database.cpp b/WebCore/storage/Database.cpp index 927d1990bbd0de06a20f7a87c11f0e16aafa1e37..6381a993d9ca5847c2a66e69fa3624420dbdff27 100644 --- a/WebCore/storage/Database.cpp +++ b/WebCore/storage/Database.cpp @@ -41,13 +41,14 @@ #include "Frame.h" #include "InspectorController.h" #include "Logging.h" -#include "MainThread.h" #include "NotImplemented.h" #include "Page.h" #include "OriginQuotaManager.h" #include "SQLiteDatabase.h" #include "SQLiteStatement.h" #include "SQLResultSet.h" +#include +#include namespace WebCore { @@ -124,7 +125,7 @@ Database::Database(Document* document, const String& name, const String& expecte if (m_name.isNull()) m_name = ""; - initializeThreadingAndMainThread(); + KJS::initializeThreading(); m_guid = guidForOriginAndName(m_securityOrigin->toString(), name); diff --git a/WebCore/storage/DatabaseTracker.cpp b/WebCore/storage/DatabaseTracker.cpp index ffdd5898b3be06a8768ab33685bd7166d03eceee..0c06deeb46744877e2d4757f5970cdf0ccc20ce9 100644 --- a/WebCore/storage/DatabaseTracker.cpp +++ b/WebCore/storage/DatabaseTracker.cpp @@ -35,12 +35,12 @@ #include "Document.h" #include "FileSystem.h" #include "Logging.h" -#include "MainThread.h" #include "OriginQuotaManager.h" #include "Page.h" #include "SecurityOrigin.h" #include "SecurityOriginHash.h" #include "SQLiteStatement.h" +#include using namespace std; diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog index e75c74e2412fc3489b55e071a5238deca3ed1393..5be126645c58b316aedfe2fb2c72137ec7cd7a70 100644 --- a/WebKit/gtk/ChangeLog +++ b/WebKit/gtk/ChangeLog @@ -1,3 +1,12 @@ +2008-04-08 Adam Roben + + Move callOnMainThread to WTF + + Reviewed by Alexey Proskuryakov. + + * webkit/webkitprivate.cpp: Updated #include. + (webkit_init): Changed to call KJS::initializeThreading. + 2008-04-06 Luca Bruno Reviewed by Alp Toker. diff --git a/WebKit/gtk/webkit/webkitprivate.cpp b/WebKit/gtk/webkit/webkitprivate.cpp index 9ec51ba449627d67650955d79d70c4cc01247ba7..245c98147341dd0cc620c25d2799de9da1faf28e 100644 --- a/WebKit/gtk/webkit/webkitprivate.cpp +++ b/WebKit/gtk/webkit/webkitprivate.cpp @@ -24,10 +24,10 @@ #include "FrameLoader.h" #include "FrameLoaderClientGtk.h" #include "Logging.h" -#include "MainThread.h" #include "NotImplemented.h" #include "Pasteboard.h" #include "PasteboardHelperGtk.h" +#include #if ENABLE(DATABASE) #include "DatabaseTracker.h" @@ -90,7 +90,7 @@ void webkit_init() return; isInitialized = true; - WebCore::initializeThreadingAndMainThread(); + KJS::initializeThreading(); WebCore::InitializeLoggingChannelsIfNecessary(); #if ENABLE(DATABASE) diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog index b1910cc8110e143a6b7d7903b7c2279eabb4a900..55aa3c33cc377bc4980b3a7fc9d96a56b51c19ea 100644 --- a/WebKit/win/ChangeLog +++ b/WebKit/win/ChangeLog @@ -1,3 +1,11 @@ +2008-04-08 Adam Roben + + Move callOnMainThread to WTF + + Reviewed by Alexey Proskuryakov. + + * WebIconDatabase.cpp: Updated #include + 2008-04-08 Steve Falkenburg Add missing increment/decrement COM class counts to detect leaks. diff --git a/WebKit/win/WebIconDatabase.cpp b/WebKit/win/WebIconDatabase.cpp index e15309a695a6f93233fe73b60d37d68c964d8cf9..15623821463ceac511d345ce5cece8f09ed74ef1 100644 --- a/WebKit/win/WebIconDatabase.cpp +++ b/WebKit/win/WebIconDatabase.cpp @@ -36,9 +36,9 @@ #include #include #include -#include #include #pragma warning(pop) +#include #include "shlobj.h" using namespace WebCore;