Changeset 26707 in webkit for trunk/JavaScriptCore/kjs/testkjs.cpp

Timestamp:

Oct 17, 2007, 1:12:19 PM (18 years ago)

Author:

aroben

Message:

Stop delay-loading WebKit in DRT and teskjs

JavaScriptCore:

Make testkjs not delay-load WebKit

Soon, delay-loading WebKit will be impossible (because we will be
using declspec(thread) for thread-local storage). This change
prepares testkjs for the future.

Reviewed by Sam.

• JavaScriptCore.vcproj/JavaScriptCore.sln: Removed WebKitInitializer, added FindSafari.
• JavaScriptCore.vcproj/testkjs/testkjs.vcproj: Don't link against WebKitInitializer, don't delay-load WebKit.
• kjs/testkjs.cpp: Don't use WebKitInitializer.

WebKitTools:

Replace WebKitInitializer with FindSafari

We now rely on setting the PATH environment variable to tell Windows
where to find WebKit and its dependencies (similar to
DYLD_FRAMEWORK_PATH on Mac).

This change also make DumpRenderTree no longer delay-load WebKit.

Reviewed by Sam.

• DumpRenderTree/DumpRenderTree.sln: Removed WebKitInitializer, added FindSafari.
• DumpRenderTree/win/DumpRenderTree.cpp: Don't use WebKitInitializer.
• DumpRenderTree/win/DumpRenderTree.vcproj: Don't link against WebKitInitializer, don't delay-load WebKit.
• Scripts/run-javascriptcore-tests: Call setPathForRunningWebKitApp.
• Scripts/run-webkit-tests: Ditto.
• Scripts/webkitdirs.pm: (sub setPathForRunningWebKitApp): Added.
• WebKitInitializer/WebKitInitializer.cpp: Removed.
• WebKitInitializer/WebKitInitializer.h: Removed.
• WebKitInitializer/WebKitInitializer.vcproj: Removed.
• WebKitInitializer/debug.vsprops: Removed.
• WebKitInitializer/debug_internal.vsprops: Removed.
• WebKitInitializer/release.vsprops: Removed.

WebKit/win:

Remove WebKitInitializer

Reviewed by Sam.

• WebKit.vcproj/WebKit.sln:

File:

• trunk/JavaScriptCore/kjs/testkjs.cpp (modified) (2 diffs)

trunk/JavaScriptCore/kjs/testkjs.cpp

@@ -40 +40 @@
 
 #if PLATFORM(WIN)
-#include <WebKitInitializer/WebKitInitializer.h>
 #include <crtdbg.h>
 #include <windows.h>
@@ -222 +221 @@
 int main(int argc, char** argv)
 {
-#if PLATFORM(WIN)
-    if (!initializeWebKit()) {
-        fprintf(stderr, "Failed to initialize WebKit\n");
-        abort();
-    }
-#endif
 #if defined(_DEBUG) && PLATFORM(WIN_OS)
     _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);