Diff
Modified: trunk/Tools/ChangeLog (158265 => 158266)
--- trunk/Tools/ChangeLog 2013-10-30 11:16:10 UTC (rev 158265)
+++ trunk/Tools/ChangeLog 2013-10-30 11:31:46 UTC (rev 158266)
@@ -1,3 +1,69 @@
+2013-10-30 Tamas Gergely <ger...@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 <a...@apple.com>
Result of focus-option-control-on-page.html depends on system preferences
Deleted: trunk/Tools/WebKitTestRunner/Configurations/InjectedBundleCFLite.vsprops (158265 => 158266)
--- trunk/Tools/WebKitTestRunner/Configurations/InjectedBundleCFLite.vsprops 2013-10-30 11:16:10 UTC (rev 158265)
+++ trunk/Tools/WebKitTestRunner/Configurations/InjectedBundleCFLite.vsprops 2013-10-30 11:31:46 UTC (rev 158266)
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
- ProjectType="Visual C++"
- Version="8.00"
- Name="InjectedBundleCFLite"
- >
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="_javascript_Core$(WebKitDLLConfigSuffix).lib WebCoreTestSupport$(WebKitDLLConfigSuffix).lib WebKit$(WebKitDLLConfigSuffix).lib CFLite$(LibraryConfigSuffix).lib"
- OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).dll"
- />
-</VisualStudioPropertySheet>
Deleted: trunk/Tools/WebKitTestRunner/Configurations/InjectedBundleCommon.vsprops (158265 => 158266)
--- trunk/Tools/WebKitTestRunner/Configurations/InjectedBundleCommon.vsprops 2013-10-30 11:16:10 UTC (rev 158265)
+++ trunk/Tools/WebKitTestRunner/Configurations/InjectedBundleCommon.vsprops 2013-10-30 11:31:46 UTC (rev 158266)
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
- ProjectType="Visual C++"
- Version="8.00"
- Name="InjectedBundleCommon"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(ProjectDir)\..";"$(ProjectDir)\..\InjectedBundle\";"$(ProjectDir)\..\InjectedBundle\Bindings";"$(ConfigurationBuildDir)\Include";"$(ConfigurationBuildDir)\Include\private";"$(ConfigurationBuildDir)\Include\private\_javascript_Core";"$(ConfigurationBuildDir)\Include\WebCore\ForwardingHeaders";"$(ConfigurationBuildDir)\include\WebCoreTestSupport";"$(WebKitLibrariesDir)\include";"$(ConfigurationBuildDir)\obj\InjectedBundle\DerivedSources\""
- ForcedIncludeFiles="WebKitTestRunnerPrefix.h"
- />
-</VisualStudioPropertySheet>
Deleted: trunk/Tools/WebKitTestRunner/Configurations/InjectedBundleCoreFoundation.vsprops (158265 => 158266)
--- trunk/Tools/WebKitTestRunner/Configurations/InjectedBundleCoreFoundation.vsprops 2013-10-30 11:16:10 UTC (rev 158265)
+++ trunk/Tools/WebKitTestRunner/Configurations/InjectedBundleCoreFoundation.vsprops 2013-10-30 11:31:46 UTC (rev 158266)
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
- ProjectType="Visual C++"
- Version="8.00"
- Name="InjectedBundleCoreFoundation"
- >
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="_javascript_Core$(WebKitDLLConfigSuffix).lib WebCoreTestSupport$(WebKitDLLConfigSuffix).lib WebKit$(WebKitDLLConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib"
- OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).dll"
- />
-</VisualStudioPropertySheet>
Deleted: trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunnerCFLite.vsprops (158265 => 158266)
--- trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunnerCFLite.vsprops 2013-10-30 11:16:10 UTC (rev 158265)
+++ trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunnerCFLite.vsprops 2013-10-30 11:31:46 UTC (rev 158266)
@@ -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>
Deleted: trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunnerCommon.vsprops (158265 => 158266)
--- trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunnerCommon.vsprops 2013-10-30 11:16:10 UTC (rev 158265)
+++ trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunnerCommon.vsprops 2013-10-30 11:31:46 UTC (rev 158266)
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
- ProjectType="Visual C++"
- Version="8.00"
- Name="WebKitTestRunnerCommon"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(ProjectDir)\..";"$(ConfigurationBuildDir)\Include";"$(ConfigurationBuildDir)\Include\private";"$(ConfigurationBuildDir)\Include\private\_javascript_Core";"$(ConfigurationBuildDir)\Include\WebCore\ForwardingHeaders";"$(WebKitLibrariesDir)\Include""
- PreprocessorDefinitions="__WIN32__;_CONSOLE"
- DisableSpecificWarnings="4146"
- ForcedIncludeFiles="WebKitTestRunnerPrefix.h"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalOptions="/NXCOMPAT"
- AdditionalDependencies="_javascript_Core$(WebKitDLLConfigSuffix).lib WebKit$(WebKitDLLConfigSuffix).lib shlwapi.lib"
- OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).dll"
- SubSystem="1"
- />
-</VisualStudioPropertySheet>
Deleted: trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunnerCoreFoundation.vsprops (158265 => 158266)
--- trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunnerCoreFoundation.vsprops 2013-10-30 11:16:10 UTC (rev 158265)
+++ trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunnerCoreFoundation.vsprops 2013-10-30 11:31:46 UTC (rev 158266)
@@ -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>
Deleted: trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunnerCoreGraphics.vsprops (158265 => 158266)
--- trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunnerCoreGraphics.vsprops 2013-10-30 11:16:10 UTC (rev 158265)
+++ trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunnerCoreGraphics.vsprops 2013-10-30 11:31:46 UTC (rev 158266)
@@ -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>
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.cpp (158265 => 158266)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.cpp 2013-10-30 11:16:10 UTC (rev 158265)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.cpp 2013-10-30 11:31:46 UTC (rev 158266)
@@ -64,28 +64,18 @@
#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
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.h (158265 => 158266)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.h 2013-10-30 11:16:10 UTC (rev 158265)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.h 2013-10-30 11:31:46 UTC (rev 158266)
@@ -30,9 +30,6 @@
#include "JSWrappable.h"
#include <_javascript_Core/JSObjectRef.h>
#include <wtf/Platform.h>
-#if PLATFORM(WIN)
-#include <windows.h>
-#endif
#if PLATFORM(GTK) || (PLATFORM(EFL) && HAVE(ACCESSIBILITY))
#include "AccessibilityNotificationHandlerAtk.h"
#endif
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h (158265 => 158266)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h 2013-10-30 11:16:10 UTC (rev 158265)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h 2013-10-30 11:31:46 UTC (rev 158266)
@@ -41,14 +41,6 @@
#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>
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundleMain.cpp (158265 => 158266)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundleMain.cpp 2013-10-30 11:16:10 UTC (rev 158265)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundleMain.cpp 2013-10-30 11:31:46 UTC (rev 158266)
@@ -28,11 +28,7 @@
#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);
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h (158265 => 158266)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h 2013-10-30 11:16:10 UTC (rev 158265)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h 2013-10-30 11:31:46 UTC (rev 158266)
@@ -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)
Modified: trunk/Tools/WebKitTestRunner/PlatformWebView.h (158265 => 158266)
--- trunk/Tools/WebKitTestRunner/PlatformWebView.h 2013-10-30 11:16:10 UTC (rev 158265)
+++ trunk/Tools/WebKitTestRunner/PlatformWebView.h 2013-10-30 11:31:46 UTC (rev 158266)
@@ -38,9 +38,6 @@
#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;
Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (158265 => 158266)
--- trunk/Tools/WebKitTestRunner/TestController.cpp 2013-10-30 11:16:10 UTC (rev 158265)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2013-10-30 11:31:46 UTC (rev 158266)
@@ -364,11 +364,7 @@
// 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());
Modified: trunk/Tools/WebKitTestRunner/TestInvocation.cpp (158265 => 158266)
--- trunk/Tools/WebKitTestRunner/TestInvocation.cpp 2013-10-30 11:16:10 UTC (rev 158265)
+++ trunk/Tools/WebKitTestRunner/TestInvocation.cpp 2013-10-30 11:31:46 UTC (rev 158266)
@@ -46,13 +46,7 @@
#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 @@
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;
Modified: trunk/Tools/WebKitTestRunner/cg/TestInvocationCG.cpp (158265 => 158266)
--- trunk/Tools/WebKitTestRunner/cg/TestInvocationCG.cpp 2013-10-30 11:16:10 UTC (rev 158265)
+++ trunk/Tools/WebKitTestRunner/cg/TestInvocationCG.cpp 2013-10-30 11:31:46 UTC (rev 158266)
@@ -39,10 +39,6 @@
#include <LaunchServices/UTCoreTypes.h>
#endif
-#if PLATFORM(WIN)
-static const CFStringRef kUTTypePNG = CFSTR("public.png");
-#endif
-
namespace WTR {
enum FlipGraphicsContextOrNot {
Modified: trunk/Tools/WebKitTestRunner/config.h (158265 => 158266)
--- trunk/Tools/WebKitTestRunner/config.h 2013-10-30 11:16:10 UTC (rev 158265)
+++ trunk/Tools/WebKitTestRunner/config.h 2013-10-30 11:31:46 UTC (rev 158266)
@@ -35,15 +35,4 @@
#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
