Removed Windows platform configurations from WebKitTestRunner.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 30 Oct 2013 11:31:46 +0000 (11:31 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 30 Oct 2013 11:31:46 +0000 (11:31 +0000)
https://bugs.webkit.org/show_bug.cgi?id=123152

Patch by Tamas Gergely <gertom@inf.u-szeged.hu> on 2013-10-30
Reviewed by Csaba Osztrogon√°c.

Removed Windows specific parts from the source files, Windows specific
subdirectory (win) and Visual Studio property files from the WebKitTestRunner,
as the platform is no longer supported by this tool.

* WebKitTestRunner/Configurations/InjectedBundleCFLite.vsprops: Removed.
* WebKitTestRunner/Configurations/InjectedBundleCommon.vsprops: Removed.
* WebKitTestRunner/Configurations/InjectedBundleCoreFoundation.vsprops: Removed.
* WebKitTestRunner/Configurations/WebKitTestRunnerCFLite.vsprops: Removed.
* WebKitTestRunner/Configurations/WebKitTestRunnerCommon.vsprops: Removed.
* WebKitTestRunner/Configurations/WebKitTestRunnerCoreFoundation.vsprops: Removed.
* WebKitTestRunner/Configurations/WebKitTestRunnerCoreGraphics.vsprops: Removed.
* WebKitTestRunner/InjectedBundle/AccessibilityController.cpp:
(WTR::AccessibilityController::rootElement):
(WTR::AccessibilityController::focusedElement):
* WebKitTestRunner/InjectedBundle/AccessibilityController.h:
* WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h:
* WebKitTestRunner/InjectedBundle/InjectedBundleMain.cpp:
* WebKitTestRunner/InjectedBundle/TestRunner.h:
* WebKitTestRunner/PlatformWebView.h:
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::initialize):
* WebKitTestRunner/TestInvocation.cpp:
(WTR::createWKURL):
* WebKitTestRunner/cg/TestInvocationCG.cpp:
* WebKitTestRunner/config.h:
* WebKitTestRunner/win/InjectedBundle.vcproj: Removed.
* WebKitTestRunner/win/InjectedBundleDebug.vsprops: Removed.
* WebKitTestRunner/win/InjectedBundleDebugAll.vsprops: Removed.
* WebKitTestRunner/win/InjectedBundleDebugCairoCFLite.vsprops: Removed.
* WebKitTestRunner/win/InjectedBundleGenerated.vcproj: Removed.
* WebKitTestRunner/win/InjectedBundleGeneratedCommon.vsprops: Removed.
* WebKitTestRunner/win/InjectedBundlePostBuild.cmd: Removed.
* WebKitTestRunner/win/InjectedBundlePreBuild.cmd: Removed.
* WebKitTestRunner/win/InjectedBundleProduction.vsprops: Removed.
* WebKitTestRunner/win/InjectedBundleRelease.vsprops: Removed.
* WebKitTestRunner/win/InjectedBundleReleaseCairoCFLite.vsprops: Removed.
* WebKitTestRunner/win/PlatformWebViewWin.cpp: Removed.
* WebKitTestRunner/win/TestControllerWin.cpp: Removed.
* WebKitTestRunner/win/TestInvocationWin.cpp: Removed.
* WebKitTestRunner/win/WebKitTestRunner.vcproj: Removed.
* WebKitTestRunner/win/WebKitTestRunnerDebug.vsprops: Removed.
* WebKitTestRunner/win/WebKitTestRunnerDebugAll.vsprops: Removed.
* WebKitTestRunner/win/WebKitTestRunnerDebugCairoCFLite.vsprops: Removed.
* WebKitTestRunner/win/WebKitTestRunnerLauncher.vcproj: Removed.
* WebKitTestRunner/win/WebKitTestRunnerLauncherCommon.vsprops: Removed.
* WebKitTestRunner/win/WebKitTestRunnerLauncherDebug.vsprops: Removed.
* WebKitTestRunner/win/WebKitTestRunnerLauncherDebugAll.vsprops: Removed.
* WebKitTestRunner/win/WebKitTestRunnerLauncherDebugCairoCFLite.vsprops: Removed.
* WebKitTestRunner/win/WebKitTestRunnerLauncherProduction.vsprops: Removed.
* WebKitTestRunner/win/WebKitTestRunnerLauncherRelease.vsprops: Removed.
* WebKitTestRunner/win/WebKitTestRunnerLauncherReleaseCairoCFLite.vsprops: Removed.
* WebKitTestRunner/win/WebKitTestRunnerPostBuild.cmd: Removed.
* WebKitTestRunner/win/WebKitTestRunnerPreBuild.cmd: Removed.
* WebKitTestRunner/win/WebKitTestRunnerProduction.vsprops: Removed.
* WebKitTestRunner/win/WebKitTestRunnerRelease.vsprops: Removed.
* WebKitTestRunner/win/WebKitTestRunnerReleaseCairoCFLite.vsprops: Removed.
* WebKitTestRunner/win/build-generated-files.sh: Removed.
* WebKitTestRunner/win/main.cpp: Removed.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@158266 268f45cc-cd09-0410-ab3c-d52691b4dbfc

51 files changed:
Tools/ChangeLog
Tools/WebKitTestRunner/Configurations/InjectedBundleCFLite.vsprops [deleted file]
Tools/WebKitTestRunner/Configurations/InjectedBundleCommon.vsprops [deleted file]
Tools/WebKitTestRunner/Configurations/InjectedBundleCoreFoundation.vsprops [deleted file]
Tools/WebKitTestRunner/Configurations/WebKitTestRunnerCFLite.vsprops [deleted file]
Tools/WebKitTestRunner/Configurations/WebKitTestRunnerCommon.vsprops [deleted file]
Tools/WebKitTestRunner/Configurations/WebKitTestRunnerCoreFoundation.vsprops [deleted file]
Tools/WebKitTestRunner/Configurations/WebKitTestRunnerCoreGraphics.vsprops [deleted file]
Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.cpp
Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.h
Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h
Tools/WebKitTestRunner/InjectedBundle/InjectedBundleMain.cpp
Tools/WebKitTestRunner/InjectedBundle/TestRunner.h
Tools/WebKitTestRunner/PlatformWebView.h
Tools/WebKitTestRunner/TestController.cpp
Tools/WebKitTestRunner/TestInvocation.cpp
Tools/WebKitTestRunner/cg/TestInvocationCG.cpp
Tools/WebKitTestRunner/config.h
Tools/WebKitTestRunner/win/InjectedBundle.vcproj [deleted file]
Tools/WebKitTestRunner/win/InjectedBundleDebug.vsprops [deleted file]
Tools/WebKitTestRunner/win/InjectedBundleDebugAll.vsprops [deleted file]
Tools/WebKitTestRunner/win/InjectedBundleDebugCairoCFLite.vsprops [deleted file]
Tools/WebKitTestRunner/win/InjectedBundleGenerated.vcproj [deleted file]
Tools/WebKitTestRunner/win/InjectedBundleGeneratedCommon.vsprops [deleted file]
Tools/WebKitTestRunner/win/InjectedBundlePostBuild.cmd [deleted file]
Tools/WebKitTestRunner/win/InjectedBundlePreBuild.cmd [deleted file]
Tools/WebKitTestRunner/win/InjectedBundleProduction.vsprops [deleted file]
Tools/WebKitTestRunner/win/InjectedBundleRelease.vsprops [deleted file]
Tools/WebKitTestRunner/win/InjectedBundleReleaseCairoCFLite.vsprops [deleted file]
Tools/WebKitTestRunner/win/PlatformWebViewWin.cpp [deleted file]
Tools/WebKitTestRunner/win/TestControllerWin.cpp [deleted file]
Tools/WebKitTestRunner/win/TestInvocationWin.cpp [deleted file]
Tools/WebKitTestRunner/win/WebKitTestRunner.vcproj [deleted file]
Tools/WebKitTestRunner/win/WebKitTestRunnerDebug.vsprops [deleted file]
Tools/WebKitTestRunner/win/WebKitTestRunnerDebugAll.vsprops [deleted file]
Tools/WebKitTestRunner/win/WebKitTestRunnerDebugCairoCFLite.vsprops [deleted file]
Tools/WebKitTestRunner/win/WebKitTestRunnerLauncher.vcproj [deleted file]
Tools/WebKitTestRunner/win/WebKitTestRunnerLauncherCommon.vsprops [deleted file]
Tools/WebKitTestRunner/win/WebKitTestRunnerLauncherDebug.vsprops [deleted file]
Tools/WebKitTestRunner/win/WebKitTestRunnerLauncherDebugAll.vsprops [deleted file]
Tools/WebKitTestRunner/win/WebKitTestRunnerLauncherDebugCairoCFLite.vsprops [deleted file]
Tools/WebKitTestRunner/win/WebKitTestRunnerLauncherProduction.vsprops [deleted file]
Tools/WebKitTestRunner/win/WebKitTestRunnerLauncherRelease.vsprops [deleted file]
Tools/WebKitTestRunner/win/WebKitTestRunnerLauncherReleaseCairoCFLite.vsprops [deleted file]
Tools/WebKitTestRunner/win/WebKitTestRunnerPostBuild.cmd [deleted file]
Tools/WebKitTestRunner/win/WebKitTestRunnerPreBuild.cmd [deleted file]
Tools/WebKitTestRunner/win/WebKitTestRunnerProduction.vsprops [deleted file]
Tools/WebKitTestRunner/win/WebKitTestRunnerRelease.vsprops [deleted file]
Tools/WebKitTestRunner/win/WebKitTestRunnerReleaseCairoCFLite.vsprops [deleted file]
Tools/WebKitTestRunner/win/build-generated-files.sh [deleted file]
Tools/WebKitTestRunner/win/main.cpp [deleted file]

index 606a254..aa6011b 100644 (file)
@@ -1,3 +1,69 @@
+2013-10-30  Tamas Gergely  <gertom@inf.u-szeged.hu>
+
+        Removed Windows platform configurations from WebKitTestRunner.
+        https://bugs.webkit.org/show_bug.cgi?id=123152
+
+        Reviewed by Csaba Osztrogon√°c.
+
+        Removed Windows specific parts from the source files, Windows specific
+        subdirectory (win) and Visual Studio property files from the WebKitTestRunner,
+        as the platform is no longer supported by this tool.
+
+        * WebKitTestRunner/Configurations/InjectedBundleCFLite.vsprops: Removed.
+        * WebKitTestRunner/Configurations/InjectedBundleCommon.vsprops: Removed.
+        * WebKitTestRunner/Configurations/InjectedBundleCoreFoundation.vsprops: Removed.
+        * WebKitTestRunner/Configurations/WebKitTestRunnerCFLite.vsprops: Removed.
+        * WebKitTestRunner/Configurations/WebKitTestRunnerCommon.vsprops: Removed.
+        * WebKitTestRunner/Configurations/WebKitTestRunnerCoreFoundation.vsprops: Removed.
+        * WebKitTestRunner/Configurations/WebKitTestRunnerCoreGraphics.vsprops: Removed.
+        * WebKitTestRunner/InjectedBundle/AccessibilityController.cpp:
+        (WTR::AccessibilityController::rootElement):
+        (WTR::AccessibilityController::focusedElement):
+        * WebKitTestRunner/InjectedBundle/AccessibilityController.h:
+        * WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h:
+        * WebKitTestRunner/InjectedBundle/InjectedBundleMain.cpp:
+        * WebKitTestRunner/InjectedBundle/TestRunner.h:
+        * WebKitTestRunner/PlatformWebView.h:
+        * WebKitTestRunner/TestController.cpp:
+        (WTR::TestController::initialize):
+        * WebKitTestRunner/TestInvocation.cpp:
+        (WTR::createWKURL):
+        * WebKitTestRunner/cg/TestInvocationCG.cpp:
+        * WebKitTestRunner/config.h:
+        * WebKitTestRunner/win/InjectedBundle.vcproj: Removed.
+        * WebKitTestRunner/win/InjectedBundleDebug.vsprops: Removed.
+        * WebKitTestRunner/win/InjectedBundleDebugAll.vsprops: Removed.
+        * WebKitTestRunner/win/InjectedBundleDebugCairoCFLite.vsprops: Removed.
+        * WebKitTestRunner/win/InjectedBundleGenerated.vcproj: Removed.
+        * WebKitTestRunner/win/InjectedBundleGeneratedCommon.vsprops: Removed.
+        * WebKitTestRunner/win/InjectedBundlePostBuild.cmd: Removed.
+        * WebKitTestRunner/win/InjectedBundlePreBuild.cmd: Removed.
+        * WebKitTestRunner/win/InjectedBundleProduction.vsprops: Removed.
+        * WebKitTestRunner/win/InjectedBundleRelease.vsprops: Removed.
+        * WebKitTestRunner/win/InjectedBundleReleaseCairoCFLite.vsprops: Removed.
+        * WebKitTestRunner/win/PlatformWebViewWin.cpp: Removed.
+        * WebKitTestRunner/win/TestControllerWin.cpp: Removed.
+        * WebKitTestRunner/win/TestInvocationWin.cpp: Removed.
+        * WebKitTestRunner/win/WebKitTestRunner.vcproj: Removed.
+        * WebKitTestRunner/win/WebKitTestRunnerDebug.vsprops: Removed.
+        * WebKitTestRunner/win/WebKitTestRunnerDebugAll.vsprops: Removed.
+        * WebKitTestRunner/win/WebKitTestRunnerDebugCairoCFLite.vsprops: Removed.
+        * WebKitTestRunner/win/WebKitTestRunnerLauncher.vcproj: Removed.
+        * WebKitTestRunner/win/WebKitTestRunnerLauncherCommon.vsprops: Removed.
+        * WebKitTestRunner/win/WebKitTestRunnerLauncherDebug.vsprops: Removed.
+        * WebKitTestRunner/win/WebKitTestRunnerLauncherDebugAll.vsprops: Removed.
+        * WebKitTestRunner/win/WebKitTestRunnerLauncherDebugCairoCFLite.vsprops: Removed.
+        * WebKitTestRunner/win/WebKitTestRunnerLauncherProduction.vsprops: Removed.
+        * WebKitTestRunner/win/WebKitTestRunnerLauncherRelease.vsprops: Removed.
+        * WebKitTestRunner/win/WebKitTestRunnerLauncherReleaseCairoCFLite.vsprops: Removed.
+        * WebKitTestRunner/win/WebKitTestRunnerPostBuild.cmd: Removed.
+        * WebKitTestRunner/win/WebKitTestRunnerPreBuild.cmd: Removed.
+        * WebKitTestRunner/win/WebKitTestRunnerProduction.vsprops: Removed.
+        * WebKitTestRunner/win/WebKitTestRunnerRelease.vsprops: Removed.
+        * WebKitTestRunner/win/WebKitTestRunnerReleaseCairoCFLite.vsprops: Removed.
+        * WebKitTestRunner/win/build-generated-files.sh: Removed.
+        * WebKitTestRunner/win/main.cpp: Removed.
+
 2013-10-29  Alexey Proskuryakov  <ap@apple.com>
 
         Result of focus-option-control-on-page.html depends on system preferences
diff --git a/Tools/WebKitTestRunner/Configurations/InjectedBundleCFLite.vsprops b/Tools/WebKitTestRunner/Configurations/InjectedBundleCFLite.vsprops
deleted file mode 100644 (file)
index b3d9f03..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="InjectedBundleCFLite"
-       >
-       <Tool
-               Name="VCLinkerTool"
-               AdditionalDependencies="JavaScriptCore$(WebKitDLLConfigSuffix).lib WebCoreTestSupport$(WebKitDLLConfigSuffix).lib WebKit$(WebKitDLLConfigSuffix).lib CFLite$(LibraryConfigSuffix).lib"
-               OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).dll"
-       />
-</VisualStudioPropertySheet>
diff --git a/Tools/WebKitTestRunner/Configurations/InjectedBundleCommon.vsprops b/Tools/WebKitTestRunner/Configurations/InjectedBundleCommon.vsprops
deleted file mode 100644 (file)
index cfb5640..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="InjectedBundleCommon"
-       >
-       <Tool
-               Name="VCCLCompilerTool"
-               AdditionalIncludeDirectories="&quot;$(ProjectDir)\..&quot;;&quot;$(ProjectDir)\..\InjectedBundle\&quot;;&quot;$(ProjectDir)\..\InjectedBundle\Bindings&quot;;&quot;$(ConfigurationBuildDir)\Include&quot;;&quot;$(ConfigurationBuildDir)\Include\private&quot;;&quot;$(ConfigurationBuildDir)\Include\private\JavaScriptCore&quot;;&quot;$(ConfigurationBuildDir)\Include\WebCore\ForwardingHeaders&quot;;&quot;$(ConfigurationBuildDir)\include\WebCoreTestSupport&quot;;&quot;$(WebKitLibrariesDir)\include&quot;;&quot;$(ConfigurationBuildDir)\obj\InjectedBundle\DerivedSources\&quot;"
-               ForcedIncludeFiles="WebKitTestRunnerPrefix.h"
-       />
-</VisualStudioPropertySheet>
diff --git a/Tools/WebKitTestRunner/Configurations/InjectedBundleCoreFoundation.vsprops b/Tools/WebKitTestRunner/Configurations/InjectedBundleCoreFoundation.vsprops
deleted file mode 100644 (file)
index ac322f2..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="InjectedBundleCoreFoundation"
-       >
-       <Tool
-               Name="VCLinkerTool"
-               AdditionalDependencies="JavaScriptCore$(WebKitDLLConfigSuffix).lib WebCoreTestSupport$(WebKitDLLConfigSuffix).lib WebKit$(WebKitDLLConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib"
-               OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).dll"
-       />
-</VisualStudioPropertySheet>
diff --git a/Tools/WebKitTestRunner/Configurations/WebKitTestRunnerCFLite.vsprops b/Tools/WebKitTestRunner/Configurations/WebKitTestRunnerCFLite.vsprops
deleted file mode 100644 (file)
index 3b18ee0..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="WebKitTestRunnerCFLite"
-       >
-       <Tool
-               Name="VCLinkerTool"
-               AdditionalDependencies="CFLite$(LibraryConfigSuffix).lib cairo.lib"
-       />
-</VisualStudioPropertySheet>
diff --git a/Tools/WebKitTestRunner/Configurations/WebKitTestRunnerCommon.vsprops b/Tools/WebKitTestRunner/Configurations/WebKitTestRunnerCommon.vsprops
deleted file mode 100644 (file)
index e7232b0..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="WebKitTestRunnerCommon"
-       >
-       <Tool
-               Name="VCCLCompilerTool"
-               AdditionalIncludeDirectories="&quot;$(ProjectDir)\..&quot;;&quot;$(ConfigurationBuildDir)\Include&quot;;&quot;$(ConfigurationBuildDir)\Include\private&quot;;&quot;$(ConfigurationBuildDir)\Include\private\JavaScriptCore&quot;;&quot;$(ConfigurationBuildDir)\Include\WebCore\ForwardingHeaders&quot;;&quot;$(WebKitLibrariesDir)\Include&quot;"
-               PreprocessorDefinitions="__WIN32__;_CONSOLE"
-               DisableSpecificWarnings="4146"
-               ForcedIncludeFiles="WebKitTestRunnerPrefix.h"
-       />
-       <Tool
-               Name="VCLinkerTool"
-               AdditionalOptions="/NXCOMPAT"
-               AdditionalDependencies="JavaScriptCore$(WebKitDLLConfigSuffix).lib WebKit$(WebKitDLLConfigSuffix).lib shlwapi.lib"
-               OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).dll"
-               SubSystem="1"
-       />
-</VisualStudioPropertySheet>
diff --git a/Tools/WebKitTestRunner/Configurations/WebKitTestRunnerCoreFoundation.vsprops b/Tools/WebKitTestRunner/Configurations/WebKitTestRunnerCoreFoundation.vsprops
deleted file mode 100644 (file)
index 11e031a..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="WebKitTestRunnerCoreFoundation"
-       >
-       <Tool
-               Name="VCLinkerTool"
-               AdditionalDependencies="CoreFoundation$(LibraryConfigSuffix).lib"
-       />
-</VisualStudioPropertySheet>
diff --git a/Tools/WebKitTestRunner/Configurations/WebKitTestRunnerCoreGraphics.vsprops b/Tools/WebKitTestRunner/Configurations/WebKitTestRunnerCoreGraphics.vsprops
deleted file mode 100644 (file)
index 70da2ba..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="WebKitTestRunnerCoreGraphics"
-       >
-       <Tool
-               Name="VCLinkerTool"
-               AdditionalDependencies="CoreGraphics$(LibraryConfigSuffix).lib"
-       />
-</VisualStudioPropertySheet>
index fb43cfb..702dade 100644 (file)
@@ -64,28 +64,18 @@ JSClassRef AccessibilityController::wrapperClass()
 #if !PLATFORM(GTK) && !PLATFORM(EFL)
 PassRefPtr<AccessibilityUIElement> AccessibilityController::rootElement()
 {
-    // FIXME: Make this work on Windows.
-#if PLATFORM(WIN)
-    return 0;
-#else
     WKBundlePageRef page = InjectedBundle::shared().page()->page();
     void* root = WKAccessibilityRootObject(page);
     
     return AccessibilityUIElement::create(static_cast<PlatformUIElement>(root));    
-#endif
 }
 
 PassRefPtr<AccessibilityUIElement> AccessibilityController::focusedElement()
 {
-    // FIXME: Make this work on Windows.
-#if PLATFORM(WIN)
-    return 0;
-#else    
     WKBundlePageRef page = InjectedBundle::shared().page()->page();
     void* root = WKAccessibilityFocusedObject(page);
     
     return AccessibilityUIElement::create(static_cast<PlatformUIElement>(root));    
-#endif
 }
 #endif
 
index 330287d..3470447 100644 (file)
@@ -30,9 +30,6 @@
 #include "JSWrappable.h"
 #include <JavaScriptCore/JSObjectRef.h>
 #include <wtf/Platform.h>
-#if PLATFORM(WIN)
-#include <windows.h>
-#endif
 #if PLATFORM(GTK) || (PLATFORM(EFL) && HAVE(ACCESSIBILITY))
 #include "AccessibilityNotificationHandlerAtk.h"
 #endif
index 3e23d12..da8d4b3 100644 (file)
@@ -41,14 +41,6 @@ typedef id PlatformUIElement;
 #else
 typedef struct objc_object* PlatformUIElement;
 #endif
-#elif PLATFORM(WIN)
-#undef _WINSOCKAPI_
-#define _WINSOCKAPI_ // Prevent inclusion of winsock.h in windows.h
-
-#include <WebCore/COMPtr.h>
-#include <oleacc.h>
-
-typedef COMPtr<IAccessible> PlatformUIElement;
 #elif PLATFORM(GTK) || (PLATFORM(EFL) && HAVE(ACCESSIBILITY))
 #include "AccessibilityNotificationHandlerAtk.h"
 #include <atk/atk.h>
index 7244077..58af682 100644 (file)
 #include "InjectedBundle.h"
 #include <WebKit2/WKBundleInitialize.h>
 
-#if defined(WIN32) || defined(_WIN32)
-extern "C" __declspec(dllexport) 
-#else
 extern "C"
-#endif
 void WKBundleInitialize(WKBundleRef bundle, WKTypeRef initializationUserData)
 {
     WTR::InjectedBundle::shared().initialize(bundle, initializationUserData);
index 46252ae..f0ccb54 100644 (file)
@@ -37,8 +37,6 @@
 #include <wtf/RetainPtr.h>
 #include <CoreFoundation/CFRunLoop.h>
 typedef RetainPtr<CFRunLoopTimerRef> PlatformTimerRef;
-#elif PLATFORM(WIN)
-typedef UINT_PTR PlatformTimerRef;
 #elif PLATFORM(GTK)
 typedef unsigned int PlatformTimerRef;
 #elif PLATFORM(EFL)
index d0f4d49..fa8d123 100644 (file)
@@ -38,9 +38,6 @@ class WebKitTestRunnerWindow;
 #endif
 typedef WKView* PlatformWKView;
 typedef WebKitTestRunnerWindow* PlatformWindow;
-#elif defined(WIN32) || defined(_WIN32)
-typedef WKViewRef PlatformWKView;
-typedef HWND PlatformWindow;
 #elif defined(BUILDING_GTK__)
 typedef struct _GtkWidget GtkWidget;
 typedef WKViewRef PlatformWKView;
index 53f620f..4395f0b 100644 (file)
@@ -364,11 +364,7 @@ void TestController::initialize(int argc, const char* argv[])
 
         // WebCore::pathByAppendingComponent is not used here because of the namespace,
         // which leads us to this ugly #ifdef and file path concatenation.
-#if OS(WINDOWS)
-        const char separator = '\\';
-#else
         const char separator = '/';
-#endif
 
         WKContextSetApplicationCacheDirectory(m_context.get(), toWK(temporaryFolder + separator + "ApplicationCache").get());
         WKContextSetDatabaseDirectory(m_context.get(), toWK(temporaryFolder + separator + "Databases").get());
index 1c8bc61..9bfaabc 100644 (file)
 #include <WebKit2/WKPagePrivateMac.h>
 #endif
 
-#if OS(WINDOWS)
-#include <direct.h> // For _getcwd.
-#define getcwd _getcwd // MSDN says getcwd is deprecated.
-#define PATH_MAX _MAX_PATH
-#else
 #include <unistd.h> // For getcwd.
-#endif
 
 using namespace WebKit;
 using namespace std;
@@ -69,16 +63,9 @@ static WKURLRef createWKURL(const char* pathOrURL)
     if (!length)
         return 0;
 
-#if OS(WINDOWS)
-    const char separator = '\\';
-    bool isAbsolutePath = length >= 3 && pathOrURL[1] == ':' && pathOrURL[2] == separator;
-    // FIXME: Remove the "localhost/" suffix once <http://webkit.org/b/55683> is fixed.
-    const char* filePrefix = "file://localhost/";
-#else
     const char separator = '/';
     bool isAbsolutePath = pathOrURL[0] == separator;
     const char* filePrefix = "file://";
-#endif
     static const size_t prefixLength = strlen(filePrefix);
 
     std::unique_ptr<char[]> buffer;
index 4e60aeb..f7a4053 100644 (file)
 #include <LaunchServices/UTCoreTypes.h>
 #endif
 
-#if PLATFORM(WIN)
-static const CFStringRef kUTTypePNG = CFSTR("public.png");
-#endif
-
 namespace WTR {
 
 enum FlipGraphicsContextOrNot {
index f6c3dd2..60f3998 100644 (file)
 
 #include <WebKit2/WebKit2_C.h>
 
-#if PLATFORM(WIN)
-#define WTF_USE_CF 1 
-#if defined(WIN_CAIRO)
-#define WTF_USE_CAIRO 1
-#define WTF_USE_CURL 1
-#else
-#define WTF_USE_CG 1
-#define WTF_USE_CFNETWORK 1
-#endif
-#endif
-
 #endif
diff --git a/Tools/WebKitTestRunner/win/InjectedBundle.vcproj b/Tools/WebKitTestRunner/win/InjectedBundle.vcproj
deleted file mode 100644 (file)
index c20bad9..0000000
+++ /dev/null
@@ -1,992 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="InjectedBundle"
-       ProjectGUID="{CBC3391C-F060-4BF5-A66E-81404168816B}"
-       RootNamespace="InjectedBundle"
-       Keyword="Win32Proj"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Debug|Win32"
-                       ConfigurationType="2"
-                       InheritedPropertySheets=".\InjectedBundleDebug.vsprops"
-                       CharacterSet="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|Win32"
-                       ConfigurationType="2"
-                       InheritedPropertySheets=".\InjectedBundleRelease.vsprops"
-                       CharacterSet="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Debug_All|Win32"
-                       ConfigurationType="2"
-                       InheritedPropertySheets=".\InjectedBundleDebugAll.vsprops"
-                       CharacterSet="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Debug_Cairo_CFLite|Win32"
-                       ConfigurationType="2"
-                       InheritedPropertySheets=".\InjectedBundleDebugCairoCFLite.vsprops"
-                       CharacterSet="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release_Cairo_CFLite|Win32"
-                       ConfigurationType="2"
-                       InheritedPropertySheets=".\InjectedBundleReleaseCairoCFLite.vsprops"
-                       CharacterSet="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Production|Win32"
-                       ConfigurationType="2"
-                       InheritedPropertySheets=".\InjectedBundleProduction.vsprops"
-                       CharacterSet="1"
-                       WholeProgramOptimization="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <Filter
-                       Name="Bindings"
-                       >
-                       <File
-                               RelativePath="..\InjectedBundle\Bindings\CodeGeneratorTestRunner.pm"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\InjectedBundle\Bindings\AccessibilityController.idl"
-                               >
-                               <FileConfiguration
-                                       Name="Debug|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCMIDLTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCMIDLTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Debug_All|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCMIDLTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Debug_Cairo_CFLite|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCMIDLTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release_Cairo_CFLite|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCMIDLTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Production|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCMIDLTool"
-                                       />
-                               </FileConfiguration>
-                       </File>
-                       <File
-                               RelativePath="..\InjectedBundle\Bindings\AccessibilityTextMarker.idl"
-                               >
-                               <FileConfiguration
-                                       Name="Debug|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCMIDLTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCMIDLTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Debug_All|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCMIDLTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Debug_Cairo_CFLite|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCMIDLTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release_Cairo_CFLite|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCMIDLTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Production|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCMIDLTool"
-                                       />
-                               </FileConfiguration>
-                       </File>
-                       <File
-                               RelativePath="..\InjectedBundle\Bindings\AccessibilityTextMarkerRange.idl"
-                               >
-                               <FileConfiguration
-                                       Name="Debug|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCMIDLTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCMIDLTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Debug_All|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCMIDLTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Debug_Cairo_CFLite|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCMIDLTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release_Cairo_CFLite|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCMIDLTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Production|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCMIDLTool"
-                                       />
-                               </FileConfiguration>
-                       </File>
-                       <File
-                               RelativePath="..\InjectedBundle\Bindings\AccessibilityUIElement.idl"
-                               >
-                               <FileConfiguration
-                                       Name="Debug|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCMIDLTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCMIDLTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Debug_All|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCMIDLTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Debug_Cairo_CFLite|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCMIDLTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release_Cairo_CFLite|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCMIDLTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Production|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCMIDLTool"
-                                       />
-                               </FileConfiguration>
-                       </File>
-                       <File
-                               RelativePath="..\InjectedBundle\Bindings\EventSendingController.idl"
-                               >
-                               <FileConfiguration
-                                       Name="Debug|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCMIDLTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCMIDLTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Debug_All|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCMIDLTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Debug_Cairo_CFLite|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCMIDLTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release_Cairo_CFLite|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCMIDLTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Production|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCMIDLTool"
-                                       />
-                               </FileConfiguration>
-                       </File>
-                       <File
-                               RelativePath="..\InjectedBundle\Bindings\GCController.idl"
-                               >
-                               <FileConfiguration
-                                       Name="Debug|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCMIDLTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCMIDLTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Debug_All|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCMIDLTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Debug_Cairo_CFLite|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCMIDLTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release_Cairo_CFLite|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCMIDLTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Production|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCMIDLTool"
-                                       />
-                               </FileConfiguration>
-                       </File>
-                       <File
-                               RelativePath="..\InjectedBundle\Bindings\JSWrappable.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\InjectedBundle\Bindings\JSWrapper.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\InjectedBundle\Bindings\JSWrapper.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\InjectedBundle\Bindings\TestRunner.idl"
-                               >
-                               <FileConfiguration
-                                       Name="Debug|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCMIDLTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCMIDLTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Debug_All|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCMIDLTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Debug_Cairo_CFLite|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCMIDLTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release_Cairo_CFLite|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCMIDLTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Production|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCMIDLTool"
-                                       />
-                               </FileConfiguration>
-                       </File>
-                       <File
-                               RelativePath="..\InjectedBundle\Bindings\TextInputController.idl"
-                               >
-                               <FileConfiguration
-                                       Name="Debug|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCMIDLTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCMIDLTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Debug_All|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCMIDLTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Debug_Cairo_CFLite|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCMIDLTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release_Cairo_CFLite|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCMIDLTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Production|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCMIDLTool"
-                                       />
-                               </FileConfiguration>
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Derived Sources"
-                       >
-                       <File
-                               RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSAccessibilityController.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSAccessibilityController.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSAccessibilityTextMarker.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSAccessibilityTextMarker.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSAccessibilityTextMarkerRange.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSAccessibilityTextMarkerRange.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSAccessibilityUIElement.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSAccessibilityUIElement.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSEventSendingController.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSEventSendingController.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSGCController.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSGCController.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSTestRunner.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSTestRunner.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSTextInputController.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSTextInputController.h"
-                               >
-                       </File>
-               </Filter>
-               <File
-                       RelativePath="..\InjectedBundle\AccessibilityController.cpp"
-                       >
-               </File>
-               <File
-                       RelativePath="..\InjectedBundle\AccessibilityController.h"
-                       >
-               </File>
-               <File
-                       RelativePath="..\InjectedBundle\AccessibilityTextMarker.cpp"
-                       >
-               </File>
-               <File
-                       RelativePath="..\InjectedBundle\AccessibilityTextMarker.h"
-                       >
-               </File>
-               <File
-                       RelativePath="..\InjectedBundle\AccessibilityTextMarkerRange.cpp"
-                       >
-               </File>
-               <File
-                       RelativePath="..\InjectedBundle\AccessibilityTextMarkerRange.h"
-                       >
-               </File>
-               <File
-                       RelativePath="..\InjectedBundle\AccessibilityUIElement.cpp"
-                       >
-               </File>
-               <File
-                       RelativePath="..\InjectedBundle\AccessibilityUIElement.h"
-                       >
-               </File>
-               <File
-                       RelativePath="..\InjectedBundle\win\ActivateFonts.cpp"
-                       >
-               </File>
-               <File
-                       RelativePath="..\InjectedBundle\EventSendingController.cpp"
-                       >
-               </File>
-               <File
-                       RelativePath="..\InjectedBundle\EventSendingController.h"
-                       >
-               </File>
-               <File
-                       RelativePath="..\InjectedBundle\GCController.cpp"
-                       >
-               </File>
-               <File
-                       RelativePath="..\InjectedBundle\GCController.h"
-                       >
-               </File>
-               <File
-                       RelativePath="..\InjectedBundle\InjectedBundle.cpp"
-                       >
-               </File>
-               <File
-                       RelativePath="..\InjectedBundle\InjectedBundle.h"
-                       >
-               </File>
-               <File
-                       RelativePath="..\InjectedBundle\InjectedBundleMain.cpp"
-                       >
-               </File>
-               <File
-                       RelativePath="..\InjectedBundle\InjectedBundlePage.cpp"
-                       >
-               </File>
-               <File
-                       RelativePath="..\InjectedBundle\InjectedBundlePage.h"
-                       >
-               </File>
-               <File
-                       RelativePath="..\InjectedBundle\win\InjectedBundleWin.cpp"
-                       >
-               </File>
-               <File
-                       RelativePath="..\InjectedBundle\TestRunner.cpp"
-                       >
-               </File>
-               <File
-                       RelativePath="..\InjectedBundle\TestRunner.h"
-                       >
-               </File>
-               <File
-                       RelativePath="..\InjectedBundle\win\TestRunnerWin.cpp"
-                       >
-               </File>
-               <File
-                       RelativePath="..\InjectedBundle\TextInputController.cpp"
-                       >
-               </File>
-               <File
-                       RelativePath="..\InjectedBundle\TextInputController.h"
-                       >
-               </File>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
diff --git a/Tools/WebKitTestRunner/win/InjectedBundleDebug.vsprops b/Tools/WebKitTestRunner/win/InjectedBundleDebug.vsprops
deleted file mode 100644 (file)
index 6946189..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="InjectedBundleDebug"
-       InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;..\Configurations\InjectedBundleCoreFoundation.vsprops;..\Configurations\InjectedBundleCommon.vsprops"
-       >
-</VisualStudioPropertySheet>
diff --git a/Tools/WebKitTestRunner/win/InjectedBundleDebugAll.vsprops b/Tools/WebKitTestRunner/win/InjectedBundleDebugAll.vsprops
deleted file mode 100644 (file)
index 0979bf5..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="InjectedBundleDebugAll"
-       InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug_all.vsprops;..\Configurations\InjectedBundleCoreFoundation.vsprops;..\Configurations\InjectedBundleCommon.vsprops"
-       >
-</VisualStudioPropertySheet>
diff --git a/Tools/WebKitTestRunner/win/InjectedBundleDebugCairoCFLite.vsprops b/Tools/WebKitTestRunner/win/InjectedBundleDebugCairoCFLite.vsprops
deleted file mode 100644 (file)
index f268ced..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="InjectedBundleDebugCairoCFLite"
-       InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug_wincairo.vsprops;..\Configurations\InjectedBundleCFLite.vsprops;..\Configurations\InjectedBundleCommon.vsprops"
-       >
-</VisualStudioPropertySheet>
diff --git a/Tools/WebKitTestRunner/win/InjectedBundleGenerated.vcproj b/Tools/WebKitTestRunner/win/InjectedBundleGenerated.vcproj
deleted file mode 100755 (executable)
index c74fd3e..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="InjectedBundleGenerated"
-       ProjectGUID="{4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}"
-       RootNamespace="InjectedBundleGenerated"
-       Keyword="MakeFileProj"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Debug|Win32"
-                       ConfigurationType="0"
-                       InheritedPropertySheets=".\InjectedBundleGeneratedCommon.vsprops"
-                       >
-                       <Tool
-                               Name="VCNMakeTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|Win32"
-                       ConfigurationType="0"
-                       InheritedPropertySheets=".\InjectedBundleGeneratedCommon.vsprops"
-                       >
-                       <Tool
-                               Name="VCNMakeTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Debug_All|Win32"
-                       ConfigurationType="0"
-                       InheritedPropertySheets=".\InjectedBundleGeneratedCommon.vsprops"
-                       >
-                       <Tool
-                               Name="VCNMakeTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Production|Win32"
-                       ConfigurationType="0"
-                       InheritedPropertySheets=".\InjectedBundleGeneratedCommon.vsprops"
-                       >
-                       <Tool
-                               Name="VCNMakeTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release_Cairo_CFLite|Win32"
-                       ConfigurationType="0"
-                       InheritedPropertySheets=".\InjectedBundleGeneratedCommon.vsprops"
-                       >
-                       <Tool
-                               Name="VCNMakeTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Debug_Cairo_CFLite|Win32"
-                       ConfigurationType="0"
-                       InheritedPropertySheets=".\InjectedBundleGeneratedCommon.vsprops"
-                       >
-                       <Tool
-                               Name="VCNMakeTool"
-                       />
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <File
-                       RelativePath=".\build-generated-files.sh"
-                       >
-               </File>
-               <File
-                       RelativePath="..\DerivedSources.make"
-                       >
-               </File>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
diff --git a/Tools/WebKitTestRunner/win/InjectedBundleGeneratedCommon.vsprops b/Tools/WebKitTestRunner/win/InjectedBundleGeneratedCommon.vsprops
deleted file mode 100644 (file)
index 303a15f..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="InjectedBundleGeneratedCommon"
-       OutputDirectory="$(ConfigurationBuildDir)\lib"
-       InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops"
-       >
-       <Tool
-               Name="VCNMakeTool"
-               BuildCommandLine="if exist &quot;$(ConfigurationBuildDir)\buildfailed&quot; grep XX$(ProjectName)XX &quot;$(ConfigurationBuildDir)\buildfailed&quot;&#x0D;&#x0A;if errorlevel 1 exit 1&#x0D;&#x0A;echo XX$(ProjectName)XX &gt; &quot;$(ConfigurationBuildDir)\buildfailed&quot;&#x0D;&#x0A;&#x0D;&#x0A;set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;bash build-generated-files.sh &quot;$(ConfigurationBuildDir)&quot; &quot;$(WebKitLibrariesDir)&quot;&#x0D;&#x0A;if errorlevel 1 exit 1&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(ConfigurationBuildDir)\buildfailed&quot; del &quot;$(ConfigurationBuildDir)\buildfailed&quot;&#x0D;&#x0A;"
-               ReBuildCommandLine="echo XX$(ProjectName)XX &gt; &quot;$(ConfigurationBuildDir)\buildfailed&quot;&#x0D;&#x0A;&#x0D;&#x0A;del /s /q &quot;$(ConfigurationBuildDir)\obj\InjectedBundle\DerivedSources&quot;&#x0D;&#x0A;set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;bash build-generated-files.sh &quot;$(ConfigurationBuildDir)&quot; &quot;$(WebKitLibrariesDir)&quot;&#x0D;&#x0A;if errorlevel 1 exit 1&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(ConfigurationBuildDir)\buildfailed&quot; del &quot;$(ConfigurationBuildDir)\buildfailed&quot;&#x0D;&#x0A;"
-               CleanCommandLine="del /s /q &quot;$(ConfigurationBuildDir)\obj\InjectedBundle\DerivedSources&quot;&#x0D;&#x0A;if exist &quot;$(ConfigurationBuildDir)\buildfailed&quot; del &quot;$(ConfigurationBuildDir)\buildfailed&quot;&#x0D;&#x0A;"
-       />
-</VisualStudioPropertySheet>
diff --git a/Tools/WebKitTestRunner/win/InjectedBundlePostBuild.cmd b/Tools/WebKitTestRunner/win/InjectedBundlePostBuild.cmd
deleted file mode 100644 (file)
index 26707ca..0000000
+++ /dev/null
@@ -1 +0,0 @@
-if exist "%CONFIGURATIONBUILDDIR%\buildfailed" del "%CONFIGURATIONBUILDDIR%\buildfailed"
diff --git a/Tools/WebKitTestRunner/win/InjectedBundlePreBuild.cmd b/Tools/WebKitTestRunner/win/InjectedBundlePreBuild.cmd
deleted file mode 100644 (file)
index a770776..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-%SystemDrive%\cygwin\bin\which.exe bash
-if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
-cmd /c
-if exist "%CONFIGURATIONBUILDDIR%\buildfailed" grep XX%PROJECTNAME%XX "%CONFIGURATIONBUILDDIR%\buildfailed"
-if errorlevel 1 exit 1
-echo XX%PROJECTNAME%XX > "%CONFIGURATIONBUILDDIR%\buildfailed"
diff --git a/Tools/WebKitTestRunner/win/InjectedBundleProduction.vsprops b/Tools/WebKitTestRunner/win/InjectedBundleProduction.vsprops
deleted file mode 100644 (file)
index 8f81320..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="InjectedBundleProduction"
-       InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\production.vsprops;..\Configurations\InjectedBundleCoreFoundation.vsprops;..\Configurations\InjectedBundleCommon.vsprops"
-       >
-</VisualStudioPropertySheet>
diff --git a/Tools/WebKitTestRunner/win/InjectedBundleRelease.vsprops b/Tools/WebKitTestRunner/win/InjectedBundleRelease.vsprops
deleted file mode 100644 (file)
index b5a1745..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="InjectedBundleRelease"
-       InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;..\Configurations\InjectedBundleCoreFoundation.vsprops;..\Configurations\InjectedBundleCommon.vsprops"
-       >
-</VisualStudioPropertySheet>
diff --git a/Tools/WebKitTestRunner/win/InjectedBundleReleaseCairoCFLite.vsprops b/Tools/WebKitTestRunner/win/InjectedBundleReleaseCairoCFLite.vsprops
deleted file mode 100644 (file)
index c2c2e28..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="InjectedBundleReleaseCairoCFLite"
-       InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\WinCairo.vsprops;..\Configurations\InjectedBundleCFLite.vsprops;..\Configurations\InjectedBundleCommon.vsprops"
-       >
-</VisualStudioPropertySheet>
diff --git a/Tools/WebKitTestRunner/win/PlatformWebViewWin.cpp b/Tools/WebKitTestRunner/win/PlatformWebViewWin.cpp
deleted file mode 100644 (file)
index cab77a3..0000000
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "PlatformWebView.h"
-
-namespace WTR {
-
-static LPCWSTR hostWindowClassName = L"WTRWebViewHostWindow";
-
-static void registerWindowClass()
-{
-    static bool initialized;
-    if (initialized)
-        return;
-    initialized = true;
-
-    WNDCLASSEXW wndClass = {0};
-    wndClass.cbSize = sizeof(wndClass);
-    wndClass.style = CS_HREDRAW | CS_VREDRAW;
-    wndClass.lpfnWndProc = DefWindowProcW;
-    wndClass.hCursor = LoadCursor(0, IDC_ARROW);
-    wndClass.hInstance = GetModuleHandle(0);
-    wndClass.lpszClassName = hostWindowClassName;
-
-    RegisterClassExW(&wndClass);
-}
-
-PlatformWebView::PlatformWebView(WKContextRef contextRef, WKPageGroupRef pageGroupRef, WKPageRef /* relatedPage */, WKDictionaryRef /*options*/)
-    : m_windowIsKey(true)
-{
-    registerWindowClass();
-
-    RECT viewRect = {0, 0, 800, 600};
-    m_window = CreateWindowExW(0, hostWindowClassName, L"WebKitTestRunner", WS_OVERLAPPEDWINDOW, 0 /*XOFFSET*/, 0 /*YOFFSET*/, viewRect.right, viewRect.bottom, 0, 0, GetModuleHandle(0), 0);
-    m_view = WKViewCreate(viewRect, contextRef, pageGroupRef, m_window);
-    WKViewSetIsInWindow(m_view, true);
-}
-
-PlatformWebView::~PlatformWebView()
-{
-    if (::IsWindow(m_window))
-        ::DestroyWindow(m_window);
-    WKRelease(m_view);
-}
-
-void PlatformWebView::resizeTo(unsigned width, unsigned height)
-{
-    ::SetWindowPos(WKViewGetWindow(m_view), 0, 0, 0, width, height, SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOCOPYBITS);
-}
-
-WKPageRef PlatformWebView::page()
-{
-    return WKViewGetPage(m_view);
-}
-
-void PlatformWebView::focus()
-{
-    ::SetFocus(::WKViewGetWindow(m_view));
-}
-
-WKRect PlatformWebView::windowFrame()
-{
-    // Implement.
-
-    WKRect wkFrame;
-    wkFrame.origin.x = 0;
-    wkFrame.origin.y = 0;
-    wkFrame.size.width = 0;
-    wkFrame.size.height = 0;
-    return wkFrame;
-}
-
-void PlatformWebView::setWindowFrame(WKRect)
-{
-    // Implement.
-}
-
-
-void PlatformWebView::addChromeInputField()
-{
-}
-
-void PlatformWebView::removeChromeInputField()
-{
-}
-
-void PlatformWebView::makeWebViewFirstResponder()
-{
-}
-
-WKRetainPtr<WKImageRef> PlatformWebView::windowSnapshotImage()
-{
-    // FIXME: implement to capture pixels in the UI process,
-    // which may be necessary to capture things like 3D transforms.
-    return 0;
-}
-
-void PlatformWebView::didInitializeClients()
-{
-}
-
-} // namespace WTR
diff --git a/Tools/WebKitTestRunner/win/TestControllerWin.cpp b/Tools/WebKitTestRunner/win/TestControllerWin.cpp
deleted file mode 100644 (file)
index 6e80f56..0000000
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "TestController.h"
-
-#include <fcntl.h>
-#include <io.h>
-#include <shlwapi.h>
-#include <string>
-#include <WebKit2/WKContextPrivateWin.h>
-#include <WebKit2/WKStringCF.h>
-#include <wtf/RetainPtr.h>
-#include <wtf/Vector.h>
-
-using namespace std;
-
-namespace WTR {
-
-static HANDLE webProcessCrashingEvent;
-static const char webProcessCrashingEventName[] = "WebKitTestRunner.WebProcessCrashing";
-// This is the longest we'll wait (in seconds) for the web process to finish crashing and a crash
-// log to be saved. This interval should be just a tiny bit longer than it will ever reasonably
-// take to save a crash log.
-static const double maximumWaitForWebProcessToCrash = 60;
-
-#ifdef DEBUG_ALL
-const LPWSTR testPluginDirectoryName = L"TestNetscapePlugin_Debug";
-const char* injectedBundleDLL = "\\InjectedBundle_debug.dll";
-#else
-const LPWSTR testPluginDirectoryName = L"TestNetscapePlugin";
-const char* injectedBundleDLL = "\\InjectedBundle.dll";
-#endif
-
-static void addQTDirToPATH()
-{
-    static LPCWSTR pathEnvironmentVariable = L"PATH";
-    static LPCWSTR quickTimeKeyName = L"Software\\Apple Computer, Inc.\\QuickTime";
-    static LPCWSTR quickTimeSysDir = L"QTSysDir";
-    static bool initialized;
-
-    if (initialized)
-        return;
-    initialized = true;
-
-    // Get the QuickTime dll directory from the registry. The key can be in either HKLM or HKCU.
-    WCHAR qtPath[MAX_PATH];
-    DWORD qtPathBufferLen = sizeof(qtPath);
-    DWORD keyType;
-    HRESULT result = ::SHGetValueW(HKEY_LOCAL_MACHINE, quickTimeKeyName, quickTimeSysDir, &keyType, (LPVOID)qtPath, &qtPathBufferLen);
-    if (result != ERROR_SUCCESS || !qtPathBufferLen || keyType != REG_SZ) {
-        qtPathBufferLen = sizeof(qtPath);
-        result = ::SHGetValueW(HKEY_CURRENT_USER, quickTimeKeyName, quickTimeSysDir, &keyType, (LPVOID)qtPath, &qtPathBufferLen);
-        if (result != ERROR_SUCCESS || !qtPathBufferLen || keyType != REG_SZ)
-            return;
-    }
-
-    // Read the current PATH.
-    DWORD pathSize = ::GetEnvironmentVariableW(pathEnvironmentVariable, 0, 0);
-    Vector<WCHAR> oldPath(pathSize);
-    if (!::GetEnvironmentVariableW(pathEnvironmentVariable, oldPath.data(), oldPath.size()))
-        return;
-
-    // And add the QuickTime dll.
-    wstring newPath;
-    newPath.append(qtPath);
-    newPath.append(L";");
-    newPath.append(oldPath.data(), oldPath.size());
-    ::SetEnvironmentVariableW(pathEnvironmentVariable, newPath.data());
-}
-
-static LONG WINAPI exceptionFilter(EXCEPTION_POINTERS*)
-{
-    fputs("#CRASHED\n", stderr);
-    fflush(stderr);
-    return EXCEPTION_CONTINUE_SEARCH;
-}
-
-void TestController::notifyDone()
-{
-}
-
-void TestController::platformInitialize()
-{
-    // Cygwin calls ::SetErrorMode(SEM_FAILCRITICALERRORS), which we will inherit. This is bad for
-    // testing/debugging, as it causes the post-mortem debugger not to be invoked. We reset the
-    // error mode here to work around Cygwin's behavior. See <http://webkit.org/b/55222>.
-    ::SetErrorMode(0);
-
-    ::SetUnhandledExceptionFilter(exceptionFilter);
-
-    _setmode(1, _O_BINARY);
-    _setmode(2, _O_BINARY);
-
-    // Add the QuickTime dll directory to PATH or QT 7.6 will fail to initialize on systems
-    // linked with older versions of qtmlclientlib.dll.
-    addQTDirToPATH();
-
-    webProcessCrashingEvent = ::CreateEventA(0, FALSE, FALSE, webProcessCrashingEventName);
-}
-
-void TestController::platformDestroy()
-{
-}
-
-void TestController::initializeInjectedBundlePath()
-{
-    CFStringRef exeContainerPath = CFURLCopyFileSystemPath(CFURLCreateCopyDeletingLastPathComponent(0, CFBundleCopyExecutableURL(CFBundleGetMainBundle())), kCFURLWindowsPathStyle);
-    CFMutableStringRef bundlePath = CFStringCreateMutableCopy(0, 0, exeContainerPath);
-    CFStringAppendCString(bundlePath, injectedBundleDLL, kCFStringEncodingWindowsLatin1);
-    m_injectedBundlePath.adopt(WKStringCreateWithCFString(bundlePath));
-}
-
-void TestController::initializeTestPluginDirectory()
-{
-    RetainPtr<CFURLRef> bundleURL = adoptCF(CFBundleCopyExecutableURL(CFBundleGetMainBundle()));
-    RetainPtr<CFURLRef> bundleDirectoryURL = adoptCF(CFURLCreateCopyDeletingLastPathComponent(0, bundleURL.get()));
-    RetainPtr<CFStringRef> testPluginDirectoryNameString = adoptCF(CFStringCreateWithCharacters(0, reinterpret_cast<const UniChar*>(testPluginDirectoryName), wcslen(testPluginDirectoryName)));
-    RetainPtr<CFURLRef> testPluginDirectoryURL = adoptCF(CFURLCreateCopyAppendingPathComponent(0, bundleDirectoryURL.get(), testPluginDirectoryNameString.get(), true));
-    RetainPtr<CFStringRef> testPluginDirectoryPath = adoptCF(CFURLCopyFileSystemPath(testPluginDirectoryURL.get(), kCFURLWindowsPathStyle));
-    m_testPluginDirectory.adopt(WKStringCreateWithCFString(testPluginDirectoryPath.get()));
-}
-
-enum RunLoopResult { TimedOut, ObjectSignaled, ConditionSatisfied };
-
-static RunLoopResult runRunLoopUntil(bool& condition, HANDLE object, double timeout)
-{
-    DWORD end = ::GetTickCount() + timeout * 1000;
-    while (!condition) {
-        DWORD now = ::GetTickCount();
-        if (now > end)
-            return TimedOut;
-
-        DWORD objectCount = object ? 1 : 0;
-        const HANDLE* objects = object ? &object : 0;
-        DWORD result = ::MsgWaitForMultipleObjectsEx(objectCount, objects, end - now, QS_ALLINPUT, MWMO_INPUTAVAILABLE);
-        if (result == WAIT_TIMEOUT)
-            return TimedOut;
-
-        if (objectCount && result >= WAIT_OBJECT_0 && result < WAIT_OBJECT_0 + objectCount)
-            return ObjectSignaled;
-
-        ASSERT(result == WAIT_OBJECT_0 + objectCount);
-        // There are messages in the queue. Process them.
-        MSG msg;
-        while (::PeekMessageW(&msg, 0, 0, 0, PM_REMOVE)) {
-            ::TranslateMessage(&msg);
-            ::DispatchMessageW(&msg);
-        }
-    }
-
-    return ConditionSatisfied;
-}
-
-void TestController::platformRunUntil(bool& done, double timeout)
-{
-    // FIXME: No timeout should occur if timeout is equal to m_noTimeout (necessary when running performance tests).
-    RunLoopResult result = runRunLoopUntil(done, webProcessCrashingEvent, timeout);
-    if (result == TimedOut || result == ConditionSatisfied)
-        return;
-    ASSERT(result == ObjectSignaled);
-
-    // The web process is crashing. A crash log might be being saved, which can take a long
-    // time, and we don't want to time out while that happens.
-
-    // First, let the test harness know this happened so it won't think we've hung. But
-    // make sure we don't exit just yet!
-    m_shouldExitWhenWebProcessCrashes = false;
-    processDidCrash();
-    m_shouldExitWhenWebProcessCrashes = true;
-
-    // Then spin a run loop until it finishes crashing to give time for a crash log to be saved. If
-    // it takes too long for a crash log to be saved, we'll just give up.
-    bool neverSetCondition = false;
-    result = runRunLoopUntil(neverSetCondition, 0, maximumWaitForWebProcessToCrash);
-    ASSERT_UNUSED(result, result == TimedOut);
-    exit(1);
-}
-
-static WKRetainPtr<WKStringRef> toWK(const char* string)
-{
-    return WKRetainPtr<WKStringRef>(AdoptWK, WKStringCreateWithUTF8CString(string));
-}
-
-void TestController::platformInitializeContext()
-{
-    // FIXME: Make DRT pass with Windows native controls. <http://webkit.org/b/25592>
-    WKContextSetShouldPaintNativeControls(m_context.get(), false);
-
-    WKContextSetInitializationUserDataForInjectedBundle(m_context.get(), toWK(webProcessCrashingEventName).get());
-}
-
-void TestController::runModal(PlatformWebView*)
-{
-    // FIXME: Need to implement this to test showModalDialog.
-}
-
-const char* TestController::platformLibraryPathForTesting()
-{
-    return 0;
-}
-
-} // namespace WTR
diff --git a/Tools/WebKitTestRunner/win/TestInvocationWin.cpp b/Tools/WebKitTestRunner/win/TestInvocationWin.cpp
deleted file mode 100644 (file)
index 8945aa6..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2011 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "TestInvocation.h"
-
-namespace WTR {
-
-#if !USE(CG) && !USE(CAIRO)
-void TestInvocation::dumpPixelsAndCompareWithExpected(WKImageRef, WKArrayRef)
-{
-}
-#endif
-
-} // namespace WTR
diff --git a/Tools/WebKitTestRunner/win/WebKitTestRunner.vcproj b/Tools/WebKitTestRunner/win/WebKitTestRunner.vcproj
deleted file mode 100644 (file)
index d2d79ee..0000000
+++ /dev/null
@@ -1,540 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="WebKitTestRunner"
-       ProjectGUID="{3B99669B-1817-443B-BCBE-835580146668}"
-       RootNamespace="WebKitTestRunner"
-       Keyword="Win32Proj"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Debug|Win32"
-                       ConfigurationType="2"
-                       InheritedPropertySheets=".\WebKitTestRunnerDebug.vsprops"
-                       CharacterSet="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|Win32"
-                       ConfigurationType="2"
-                       InheritedPropertySheets=".\WebKitTestRunnerRelease.vsprops"
-                       CharacterSet="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Debug_All|Win32"
-                       ConfigurationType="2"
-                       InheritedPropertySheets=".\WebKitTestRunnerDebugAll.vsprops"
-                       CharacterSet="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Debug_Cairo_CFLite|Win32"
-                       ConfigurationType="2"
-                       InheritedPropertySheets=".\WebKitTestRunnerDebugCairoCFLite.vsprops"
-                       CharacterSet="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release_Cairo_CFLite|Win32"
-                       ConfigurationType="2"
-                       InheritedPropertySheets=".\WebKitTestRunnerReleaseCairoCFLite.vsprops"
-                       CharacterSet="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Production|Win32"
-                       ConfigurationType="2"
-                       InheritedPropertySheets=".\WebKitTestRunnerProduction.vsprops"
-                       CharacterSet="1"
-                       WholeProgramOptimization="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <Filter
-                       Name="win"
-                       >
-                       <File
-                               RelativePath=".\main.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\PlatformWebViewWin.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\TestControllerWin.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\TestInvocationWin.cpp"
-                               >
-                       </File>
-               </Filter>
-               <Filter
-                       Name="cg"
-                       >
-                       <File
-                               RelativePath="..\cg\TestInvocationCG.cpp"
-                               >
-                               <FileConfiguration
-                                       Name="Debug_Cairo_CFLite|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release_Cairo_CFLite|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                       />
-                               </FileConfiguration>
-                       </File>
-               </Filter>
-               <Filter
-                       Name="cairo"
-                       >
-                       <File
-                               RelativePath="..\cairo\TestInvocationCairo.cpp"
-                               >
-                               <FileConfiguration
-                                       Name="Debug|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Debug_All|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Production|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                       />
-                               </FileConfiguration>
-                       </File>
-               </Filter>
-               <File
-                       RelativePath="..\CyclicRedundancyCheck.cpp"
-                       >
-               </File>
-               <File
-                       RelativePath="..\CyclicRedundancyCheck.h"
-                       >
-               </File>
-               <File
-                       RelativePath="..\GeolocationProviderMock.cpp"
-                       >
-               </File>
-               <File
-                       RelativePath="..\GeolocationProviderMock.h"
-                       >
-               </File>
-               <File
-                       RelativePath="..\PixelDumpSupport.cpp"
-                       >
-               </File>
-               <File
-                       RelativePath="..\PixelDumpSupport.h"
-                       >
-               </File>
-               <File
-                       RelativePath="..\PlatformWebView.h"
-                       >
-               </File>
-               <File
-                       RelativePath="..\TestController.cpp"
-                       >
-               </File>
-               <File
-                       RelativePath="..\TestController.h"
-                       >
-               </File>
-               <File
-                       RelativePath="..\TestInvocation.cpp"
-                       >
-               </File>
-               <File
-                       RelativePath="..\TestInvocation.h"
-                       >
-               </File>
-               <File
-                       RelativePath="..\WebNotificationProvider.cpp"
-                       >
-               </File>
-               <File
-                       RelativePath="..\WebNotificationProvider.h"
-                       >
-               </File>
-               <File
-                       RelativePath="..\WebKitTestRunnerPrefix.h"
-                       >
-               </File>
-               <File
-                       RelativePath="..\WorkQueueManager.cpp"
-                       >
-               </File>
-               <File
-                       RelativePath="..\WorkQueueManager.h"
-                       >
-               </File>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
diff --git a/Tools/WebKitTestRunner/win/WebKitTestRunnerDebug.vsprops b/Tools/WebKitTestRunner/win/WebKitTestRunnerDebug.vsprops
deleted file mode 100644 (file)
index 000f97c..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="WebKitTestRunnerDebug"
-       InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;..\Configurations\WebKitTestRunnerCommon.vsprops;..\Configurations\WebKitTestRunnerCoreFoundation.vsprops;..\Configurations\WebKitTestRunnerCoreGraphics.vsprops"
-       >
-</VisualStudioPropertySheet>
diff --git a/Tools/WebKitTestRunner/win/WebKitTestRunnerDebugAll.vsprops b/Tools/WebKitTestRunner/win/WebKitTestRunnerDebugAll.vsprops
deleted file mode 100644 (file)
index 3f8cec8..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="WebKitTestRunnerDebugAll"
-       InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug_all.vsprops;..\Configurations\WebKitTestRunnerCommon.vsprops;..\Configurations\WebKitTestRunnerCoreFoundation.vsprops;..\Configurations\WebKitTestRunnerCoreGraphics.vsprops"
-       >
-</VisualStudioPropertySheet>
diff --git a/Tools/WebKitTestRunner/win/WebKitTestRunnerDebugCairoCFLite.vsprops b/Tools/WebKitTestRunner/win/WebKitTestRunnerDebugCairoCFLite.vsprops
deleted file mode 100644 (file)
index 3107f9c..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="WebKitTestRunnerDebugCairoCFLite"
-       InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug_wincairo.vsprops;..\Configurations\WebKitTestRunnerCommon.vsprops;..\Configurations\WebKitTestRunnerCFLite.vsprops"
-       >
-</VisualStudioPropertySheet>
diff --git a/Tools/WebKitTestRunner/win/WebKitTestRunnerLauncher.vcproj b/Tools/WebKitTestRunner/win/WebKitTestRunnerLauncher.vcproj
deleted file mode 100644 (file)
index b29fa55..0000000
+++ /dev/null
@@ -1,396 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="WebKitTestRunnerLauncher"
-       ProjectGUID="{C13FA6EF-B531-4BAD-9A23-18E2BEB8B040}"
-       RootNamespace="WebKitTestRunnerLauncher"
-       Keyword="Win32Proj"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Debug|Win32"
-                       ConfigurationType="1"
-                       InheritedPropertySheets=".\WebKitTestRunnerLauncherDebug.vsprops"
-                       CharacterSet="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|Win32"
-                       ConfigurationType="1"
-                       InheritedPropertySheets=".\WebKitTestRunnerLauncherRelease.vsprops"
-                       CharacterSet="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Debug_Cairo_CFLite|Win32"
-                       ConfigurationType="1"
-                       InheritedPropertySheets=".\WebKitTestRunnerLauncherDebugCairoCFLite.vsprops"
-                       CharacterSet="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Debug_All|Win32"
-                       ConfigurationType="1"
-                       InheritedPropertySheets=".\WebKitTestRunnerLauncherDebugAll.vsprops"
-                       CharacterSet="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Production|Win32"
-                       ConfigurationType="1"
-                       InheritedPropertySheets=".\WebKitTestRunnerLauncherProduction.vsprops"
-                       CharacterSet="1"
-                       WholeProgramOptimization="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release_Cairo_CFLite|Win32"
-                       ConfigurationType="1"
-                       InheritedPropertySheets=".\WebKitTestRunnerLauncherReleaseCairoCFLite.vsprops"
-                       CharacterSet="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <File
-                       RelativePath="..\..\win\DLLLauncher\DLLLauncherMain.cpp"
-                       >
-               </File>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
diff --git a/Tools/WebKitTestRunner/win/WebKitTestRunnerLauncherCommon.vsprops b/Tools/WebKitTestRunner/win/WebKitTestRunnerLauncherCommon.vsprops
deleted file mode 100644 (file)
index 02ccc64..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="WebKitTestRunnerLauncherCommon"
-       >
-       <Tool
-               Name="VCCLCompilerTool"
-               PreprocessorDefinitions="USE_CONSOLE_ENTRY_POINT"
-       />
-       <Tool
-               Name="VCLinkerTool"
-               AdditionalDependencies="shlwapi.lib"
-               OutputFile="$(OutDir)\WebKitTestRunner$(WebKitConfigSuffix).exe"
-               ProgramDatabaseFile="$(TargetDir)$(TargetName)Launcher.pdb"
-               SubSystem="1"
-       />
-</VisualStudioPropertySheet>
diff --git a/Tools/WebKitTestRunner/win/WebKitTestRunnerLauncherDebug.vsprops b/Tools/WebKitTestRunner/win/WebKitTestRunnerLauncherDebug.vsprops
deleted file mode 100644 (file)
index 1d7190e..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="WebKitTestRunnerLauncherDebug"
-       InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;.\WebKitTestRunnerLauncherCommon.vsprops"
-       >
-</VisualStudioPropertySheet>
diff --git a/Tools/WebKitTestRunner/win/WebKitTestRunnerLauncherDebugAll.vsprops b/Tools/WebKitTestRunner/win/WebKitTestRunnerLauncherDebugAll.vsprops
deleted file mode 100644 (file)
index 06928e1..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="WebKitTestRunnerLauncherDebugAll"
-       InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug_all.vsprops;.\WebKitTestRunnerLauncherCommon.vsprops"
-       >
-</VisualStudioPropertySheet>
diff --git a/Tools/WebKitTestRunner/win/WebKitTestRunnerLauncherDebugCairoCFLite.vsprops b/Tools/WebKitTestRunner/win/WebKitTestRunnerLauncherDebugCairoCFLite.vsprops
deleted file mode 100644 (file)
index 7745ad5..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="WebKitTestRunnerDebugCairoCFLite"
-       InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;.\WebKitTestRunnerLauncherCommon.vsprops"
-       >
-</VisualStudioPropertySheet>
diff --git a/Tools/WebKitTestRunner/win/WebKitTestRunnerLauncherProduction.vsprops b/Tools/WebKitTestRunner/win/WebKitTestRunnerLauncherProduction.vsprops
deleted file mode 100644 (file)
index 1e5a125..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="WebKitTestRunnerLauncherProduction"
-       InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\production.vsprops;.\WebKitTestRunnerLauncherCommon.vsprops"
-       >
-</VisualStudioPropertySheet>
diff --git a/Tools/WebKitTestRunner/win/WebKitTestRunnerLauncherRelease.vsprops b/Tools/WebKitTestRunner/win/WebKitTestRunnerLauncherRelease.vsprops
deleted file mode 100644 (file)
index bc9b755..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="WebKitTestRunnerLauncherRelease"
-       InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\WebKitTestRunnerLauncherCommon.vsprops"
-       >
-</VisualStudioPropertySheet>
diff --git a/Tools/WebKitTestRunner/win/WebKitTestRunnerLauncherReleaseCairoCFLite.vsprops b/Tools/WebKitTestRunner/win/WebKitTestRunnerLauncherReleaseCairoCFLite.vsprops
deleted file mode 100644 (file)
index b2e5bee..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="WebKitTestRunnerLauncherReleaseCairoCFLite"
-       InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\WebKitTestRunnerLauncherCommon.vsprops"
-       >
-</VisualStudioPropertySheet>
diff --git a/Tools/WebKitTestRunner/win/WebKitTestRunnerPostBuild.cmd b/Tools/WebKitTestRunner/win/WebKitTestRunnerPostBuild.cmd
deleted file mode 100644 (file)
index cf7272a..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-if exist "%CONFIGURATIONBUILDDIR%\buildfailed" del "%CONFIGURATIONBUILDDIR%\buildfailed"
-
-if not defined ARCHIVE_BUILD (if defined PRODUCTION exit /b)
-
-mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\bin"
-
-if not exist "%WEBKITLIBRARIESDIR%\bin\CoreFoundation%LIBRARYCONFIGSUFFIX%.dll" exit /b
-
-xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\CoreFoundation%LIBRARYCONFIGSUFFIX%.dll" "%CONFIGURATIONBUILDDIR%\bin"
-xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\CoreFoundation%LIBRARYCONFIGSUFFIX%.pdb" "%CONFIGURATIONBUILDDIR%\bin"
-xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\CFNetwork%LIBRARYCONFIGSUFFIX%.dll" "%CONFIGURATIONBUILDDIR%\bin"
-xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\CFNetwork%LIBRARYCONFIGSUFFIX%.pdb" "%CONFIGURATIONBUILDDIR%\bin"
-xcopy /y /d /e /i "%WEBKITLIBRARIESDIR%\bin\CFNetwork.resources" "%CONFIGURATIONBUILDDIR%\bin\CFNetwork.resources"
-xcopy /y /d /e /i "%WEBKITLIBRARIESDIR%\bin\CoreFoundation.resources" "%CONFIGURATIONBUILDDIR%\bin\CoreFoundation.resources"
-xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\CoreGraphics%LIBRARYCONFIGSUFFIX%.dll" "%CONFIGURATIONBUILDDIR%\bin"
-xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\CoreGraphics%LIBRARYCONFIGSUFFIX%.pdb" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WEBKITLIBRARIESDIR%\bin\icudt40.dll" xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\icudt40.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WEBKITLIBRARIESDIR%\bin\icudt40%LIBRARYCONFIGSUFFIX%.dll"xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\icudt40%LIBRARYCONFIGSUFFIX%.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WEBKITLIBRARIESDIR%\bin\icuin40%LIBRARYCONFIGSUFFIX%.dll"xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\icuin40%LIBRARYCONFIGSUFFIX%.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WEBKITLIBRARIESDIR%\bin\icuin40%LIBRARYCONFIGSUFFIX%.pdb"xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\icuin40%LIBRARYCONFIGSUFFIX%.pdb" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WEBKITLIBRARIESDIR%\bin\icuuc40%LIBRARYCONFIGSUFFIX%.dll"xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\icuuc40%LIBRARYCONFIGSUFFIX%.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WEBKITLIBRARIESDIR%\bin\icuuc40%LIBRARYCONFIGSUFFIX%.pdb"xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\icuuc40%LIBRARYCONFIGSUFFIX%.pdb" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WEBKITLIBRARIESDIR%\bin\icudt42.dll" xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\icudt42.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WEBKITLIBRARIESDIR%\bin\icudt42%LIBRARYCONFIGSUFFIX%.dll"xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\icudt42%LIBRARYCONFIGSUFFIX%.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WEBKITLIBRARIESDIR%\bin\icuin42%LIBRARYCONFIGSUFFIX%.dll"xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\icuin42%LIBRARYCONFIGSUFFIX%.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WEBKITLIBRARIESDIR%\bin\icuin42%LIBRARYCONFIGSUFFIX%.pdb"xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\icuin42%LIBRARYCONFIGSUFFIX%.pdb" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WEBKITLIBRARIESDIR%\bin\icuuc42%LIBRARYCONFIGSUFFIX%.dll"xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\icuuc42%LIBRARYCONFIGSUFFIX%.dll" "%CONFIGURATIONBUILDDIR%\bin"
-if exist "%WEBKITLIBRARIESDIR%\bin\icuuc42%LIBRARYCONFIGSUFFIX%.pdb"xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\icuuc42%LIBRARYCONFIGSUFFIX%.pdb" "%CONFIGURATIONBUILDDIR%\bin"
-xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\libxml2%LIBRARYCONFIGSUFFIX%.dll" "%CONFIGURATIONBUILDDIR%\bin"
-xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\libxslt%LIBRARYCONFIGSUFFIX%.dll" "%CONFIGURATIONBUILDDIR%\bin"
-xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\pthreadVC2%LIBRARYCONFIGSUFFIX%.dll" "%CONFIGURATIONBUILDDIR%\bin"
-xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\pthreadVC2%LIBRARYCONFIGSUFFIX%.pdb" "%CONFIGURATIONBUILDDIR%\bin"
-xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\SQLite3%LIBRARYCONFIGSUFFIX%.dll" "%CONFIGURATIONBUILDDIR%\bin"
-xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\SQLite3%LIBRARYCONFIGSUFFIX%.pdb" "%CONFIGURATIONBUILDDIR%\bin"
-xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\zlib1%LIBRARYCONFIGSUFFIX%.dll" "%CONFIGURATIONBUILDDIR%\bin"
-xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\zlib1%LIBRARYCONFIGSUFFIX%.pdb" "%CONFIGURATIONBUILDDIR%\bin"
diff --git a/Tools/WebKitTestRunner/win/WebKitTestRunnerPreBuild.cmd b/Tools/WebKitTestRunner/win/WebKitTestRunnerPreBuild.cmd
deleted file mode 100644 (file)
index a770776..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-%SystemDrive%\cygwin\bin\which.exe bash
-if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
-cmd /c
-if exist "%CONFIGURATIONBUILDDIR%\buildfailed" grep XX%PROJECTNAME%XX "%CONFIGURATIONBUILDDIR%\buildfailed"
-if errorlevel 1 exit 1
-echo XX%PROJECTNAME%XX > "%CONFIGURATIONBUILDDIR%\buildfailed"
diff --git a/Tools/WebKitTestRunner/win/WebKitTestRunnerProduction.vsprops b/Tools/WebKitTestRunner/win/WebKitTestRunnerProduction.vsprops
deleted file mode 100644 (file)
index 6f48bc8..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="WebKitTestRunnerProduction"
-       InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\production.vsprops;..\Configurations\WebKitTestRunnerCommon.vsprops;..\Configurations\WebKitTestRunnerCoreFoundation.vsprops;..\Configurations\WebKitTestRunnerCoreGraphics.vsprops"
-       >
-</VisualStudioPropertySheet>
diff --git a/Tools/WebKitTestRunner/win/WebKitTestRunnerRelease.vsprops b/Tools/WebKitTestRunner/win/WebKitTestRunnerRelease.vsprops
deleted file mode 100644 (file)
index ce5b18d..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="WebKitTestRunnerRelease"
-       InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;..\Configurations\WebKitTestRunnerCommon.vsprops;..\Configurations\WebKitTestRunnerCoreFoundation.vsprops;..\Configurations\WebKitTestRunnerCoreGraphics.vsprops"
-       >
-</VisualStudioPropertySheet>
diff --git a/Tools/WebKitTestRunner/win/WebKitTestRunnerReleaseCairoCFLite.vsprops b/Tools/WebKitTestRunner/win/WebKitTestRunnerReleaseCairoCFLite.vsprops
deleted file mode 100644 (file)
index 990946c..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="WebKitTestRunnerReleaseCairoCFLite"
-       InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\WinCairo.vsprops;..\Configurations\WebKitTestRunnerCommon.vsprops;..\Configurations\WebKitTestRunnerCFLite.vsprops"
-       >
-</VisualStudioPropertySheet>
diff --git a/Tools/WebKitTestRunner/win/build-generated-files.sh b/Tools/WebKitTestRunner/win/build-generated-files.sh
deleted file mode 100755 (executable)
index 8c599c1..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright (C) 2010 Apple Inc. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-# THE POSSIBILITY OF SUCH DAMAGE.
-
-# Calls to `cygpath -ms` below are needed to remove spaces from paths, which
-# confuse GNU make. See <http://webkit.org/b/8173>.
-
-WebKitOutputDir=$(cygpath -u "$(cygpath -ms "${1}")")
-WebKitLibrariesDir=$(cygpath -u "$(cygpath -ms "${2}")")
-DerivedSources="${WebKitOutputDir}/obj/InjectedBundle/DerivedSources"
-
-export WebKitTestRunner=$(cygpath -u "$(cygpath -ms "$(realpath ..)")")
-
-if [ -e "${WebKitOutputDir}/obj/WebCore/scripts" ]; then
-    export WebCoreScripts="${WebKitOutputDir}/obj/WebCore/scripts"
-else
-    export WebCoreScripts="${WebKitLibrariesDir}/tools/scripts"
-fi
-
-mkdir -p "${DerivedSources}"
-cd "${DerivedSources}"
-
-make -f "${WebKitTestRunner}/DerivedSources.make"
diff --git a/Tools/WebKitTestRunner/win/main.cpp b/Tools/WebKitTestRunner/win/main.cpp
deleted file mode 100644 (file)
index c511be5..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-
-#include "TestController.h"
-
-extern "C" __declspec(dllexport) int WINAPI dllLauncherEntryPoint(int argc, const char* argv[])
-{
-    {
-        WTR::TestController controller(argc, argv);
-    }
-
-    return 0;
-}