From d06194330da2bb8da887d2e1adeacb3a5c1504b2 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Wed, 5 Jan 2011 12:15:11 +0000 Subject: Merge WebKit at r72805: Initial merge by Git Note that this is a backwards merge from Chromium release 9.0.600.0 to 9.0.597.0, to align with the Chromium 9 stable release branch. Change-Id: I5d2bb4e8cee9d39ae8485abf48bdb55ecf8b3790 --- .../Configurations/TestWebKitAPICFLite.vsprops | 22 +- .../Configurations/TestWebKitAPICommon.vsprops | 42 +- .../TestWebKitAPICoreFoundation.vsprops | 22 +- .../TestWebKitAPI/InjectedBundleController.cpp | 22 +- .../TestWebKitAPI/InjectedBundleController.h | 9 +- WebKitTools/TestWebKitAPI/InjectedBundleTest.h | 3 +- WebKitTools/TestWebKitAPI/PlatformUtilities.cpp | 12 +- WebKitTools/TestWebKitAPI/PlatformUtilities.h | 2 +- WebKitTools/TestWebKitAPI/PlatformWebView.h | 2 +- .../WebKit2/DocumentStartUserScriptAlertCrash.cpp | 6 +- .../DocumentStartUserScriptAlertCrash_Bundle.cpp | 14 +- .../TestWebKitAPI/mac/PlatformWebViewMac.mm | 4 +- .../TestWebKitAPI/win/PlatformWebViewWin.cpp | 4 +- WebKitTools/TestWebKitAPI/win/TestWebKitAPI.sln | 108 +- WebKitTools/TestWebKitAPI/win/TestWebKitAPI.vcproj | 1055 ++++++++++---------- .../win/TestWebKitAPIGenerated.vcproj | 164 +-- .../win/TestWebKitAPIGeneratedCommon.vsprops | 26 +- .../TestWebKitAPI/win/TestWebKitAPIPostBuild.cmd | 1 - .../TestWebKitAPI/win/TestWebKitAPIPreBuild.cmd | 6 - 19 files changed, 747 insertions(+), 777 deletions(-) delete mode 100644 WebKitTools/TestWebKitAPI/win/TestWebKitAPIPostBuild.cmd delete mode 100644 WebKitTools/TestWebKitAPI/win/TestWebKitAPIPreBuild.cmd (limited to 'WebKitTools/TestWebKitAPI') diff --git a/WebKitTools/TestWebKitAPI/Configurations/TestWebKitAPICFLite.vsprops b/WebKitTools/TestWebKitAPI/Configurations/TestWebKitAPICFLite.vsprops index cfbcfad..61b6614 100644 --- a/WebKitTools/TestWebKitAPI/Configurations/TestWebKitAPICFLite.vsprops +++ b/WebKitTools/TestWebKitAPI/Configurations/TestWebKitAPICFLite.vsprops @@ -1,11 +1,11 @@ - - - - + + + + diff --git a/WebKitTools/TestWebKitAPI/Configurations/TestWebKitAPICommon.vsprops b/WebKitTools/TestWebKitAPI/Configurations/TestWebKitAPICommon.vsprops index 43927f2..1de3506 100644 --- a/WebKitTools/TestWebKitAPI/Configurations/TestWebKitAPICommon.vsprops +++ b/WebKitTools/TestWebKitAPI/Configurations/TestWebKitAPICommon.vsprops @@ -1,17 +1,25 @@ - - - - - + + + + + + + diff --git a/WebKitTools/TestWebKitAPI/Configurations/TestWebKitAPICoreFoundation.vsprops b/WebKitTools/TestWebKitAPI/Configurations/TestWebKitAPICoreFoundation.vsprops index 1260b1a..ee139c0 100644 --- a/WebKitTools/TestWebKitAPI/Configurations/TestWebKitAPICoreFoundation.vsprops +++ b/WebKitTools/TestWebKitAPI/Configurations/TestWebKitAPICoreFoundation.vsprops @@ -1,11 +1,11 @@ - - - - + + + + diff --git a/WebKitTools/TestWebKitAPI/InjectedBundleController.cpp b/WebKitTools/TestWebKitAPI/InjectedBundleController.cpp index e438afd..5942ec8 100644 --- a/WebKitTools/TestWebKitAPI/InjectedBundleController.cpp +++ b/WebKitTools/TestWebKitAPI/InjectedBundleController.cpp @@ -54,20 +54,15 @@ void InjectedBundleController::initialize(WKBundleRef bundle, WKTypeRef initiali this, didCreatePage, willDestroyPage, - didInitializePageGroup, didReceiveMessage }; WKBundleSetClient(m_bundle, &client); // Initialize the test from the "initializationUserData". + assert(WKGetTypeID(initializationUserData) == WKStringGetTypeID()); + WKStringRef testName = static_cast(initializationUserData); - assert(WKGetTypeID(initializationUserData) == WKDictionaryGetTypeID()); - WKDictionaryRef initializationDictionary = static_cast(initializationUserData); - - WKStringRef testName = static_cast(WKDictionaryGetItemForKey(initializationDictionary, WKStringCreateWithUTF8CString("TestName"))); - WKTypeRef userData = WKDictionaryGetItemForKey(initializationDictionary, WKStringCreateWithUTF8CString("UserData")); - - initializeTestNamed(bundle, Util::toSTD(testName), userData); + initializeTestNamed(bundle, Util::toSTD(testName)); } void InjectedBundleController::didCreatePage(WKBundleRef bundle, WKBundlePageRef page, const void* clientInfo) @@ -84,13 +79,6 @@ void InjectedBundleController::willDestroyPage(WKBundleRef bundle, WKBundlePageR self->m_currentTest->willDestroyPage(bundle, page); } -void InjectedBundleController::didInitializePageGroup(WKBundleRef bundle, WKBundlePageGroupRef pageGroup, const void* clientInfo) -{ - InjectedBundleController* self = static_cast(const_cast(clientInfo)); - assert(self->m_currentTest); - self->m_currentTest->didInitializePageGroup(bundle, pageGroup); -} - void InjectedBundleController::didReceiveMessage(WKBundleRef bundle, WKStringRef messageName, WKTypeRef messageBody, const void* clientInfo) { InjectedBundleController* self = static_cast(const_cast(clientInfo)); @@ -106,7 +94,7 @@ void InjectedBundleController::dumpTestNames() printf("%s\n", (*it).first.c_str()); } -void InjectedBundleController::initializeTestNamed(WKBundleRef bundle, const std::string& identifier, WKTypeRef userData) +void InjectedBundleController::initializeTestNamed(WKBundleRef bundle, const std::string& identifier) { CreateInjectedBundleTestFunction createTestFunction = m_createInjectedBundleTestFunctions[identifier]; if (!createTestFunction) { @@ -115,7 +103,7 @@ void InjectedBundleController::initializeTestNamed(WKBundleRef bundle, const std } m_currentTest = createTestFunction(identifier); - m_currentTest->initialize(bundle, userData); + m_currentTest->initialize(bundle); } void InjectedBundleController::registerCreateInjectedBundleTestFunction(const std::string& identifier, CreateInjectedBundleTestFunction function) diff --git a/WebKitTools/TestWebKitAPI/InjectedBundleController.h b/WebKitTools/TestWebKitAPI/InjectedBundleController.h index b84be4b..91c571e 100644 --- a/WebKitTools/TestWebKitAPI/InjectedBundleController.h +++ b/WebKitTools/TestWebKitAPI/InjectedBundleController.h @@ -41,7 +41,7 @@ public: void initialize(WKBundleRef, WKTypeRef); void dumpTestNames(); - void initializeTestNamed(WKBundleRef bundle, const std::string&, WKTypeRef userData); + void initializeTestNamed(WKBundleRef bundle, const std::string&); typedef InjectedBundleTest* (*CreateInjectedBundleTestFunction)(const std::string&); void registerCreateInjectedBundleTestFunction(const std::string&, CreateInjectedBundleTestFunction); @@ -50,10 +50,9 @@ private: InjectedBundleController(); ~InjectedBundleController(); - static void didCreatePage(WKBundleRef, WKBundlePageRef, const void* clientInfo); - static void willDestroyPage(WKBundleRef, WKBundlePageRef, const void* clientInfo); - static void didInitializePageGroup(WKBundleRef, WKBundlePageGroupRef, const void* clientInfo); - static void didReceiveMessage(WKBundleRef, WKStringRef messageName, WKTypeRef messageBody, const void* clientInfo); + static void didCreatePage(WKBundleRef bundle, WKBundlePageRef page, const void* clientInfo); + static void willDestroyPage(WKBundleRef bundle, WKBundlePageRef page, const void* clientInfo); + static void didReceiveMessage(WKBundleRef bundle, WKStringRef messageName, WKTypeRef messageBody, const void* clientInfo); std::map m_createInjectedBundleTestFunctions; WKBundleRef m_bundle; diff --git a/WebKitTools/TestWebKitAPI/InjectedBundleTest.h b/WebKitTools/TestWebKitAPI/InjectedBundleTest.h index 5285cdf..b0224f2 100644 --- a/WebKitTools/TestWebKitAPI/InjectedBundleTest.h +++ b/WebKitTools/TestWebKitAPI/InjectedBundleTest.h @@ -34,11 +34,10 @@ class InjectedBundleTest { public: virtual ~InjectedBundleTest() { } - virtual void initialize(WKBundleRef, WKTypeRef) { } + virtual void initialize(WKBundleRef) { } virtual void didCreatePage(WKBundleRef, WKBundlePageRef) { } virtual void willDestroyPage(WKBundleRef, WKBundlePageRef) { } - virtual void didInitializePageGroup(WKBundleRef, WKBundlePageGroupRef) { } virtual void didReceiveMessage(WKBundleRef, WKStringRef messageName, WKTypeRef messageBody) { } std::string name() const { return m_identifier; } diff --git a/WebKitTools/TestWebKitAPI/PlatformUtilities.cpp b/WebKitTools/TestWebKitAPI/PlatformUtilities.cpp index 23678a0..281fb13 100644 --- a/WebKitTools/TestWebKitAPI/PlatformUtilities.cpp +++ b/WebKitTools/TestWebKitAPI/PlatformUtilities.cpp @@ -33,21 +33,13 @@ namespace TestWebKitAPI { namespace Util { -WKContextRef createContextForInjectedBundleTest(const std::string& testName, WKTypeRef userData) +WKContextRef createContextForInjectedBundleTest(const std::string& testName) { WKRetainPtr injectedBundlePath(AdoptWK, createInjectedBundlePath()); WKContextRef context = WKContextCreateWithInjectedBundlePath(injectedBundlePath.get()); - WKRetainPtr initializationDictionary(AdoptWK, WKMutableDictionaryCreate()); - - WKRetainPtr testNameKey(AdoptWK, WKStringCreateWithUTF8CString("TestName")); WKRetainPtr testNameString(AdoptWK, WKStringCreateWithUTF8CString(testName.c_str())); - WKDictionaryAddItem(initializationDictionary.get(), testNameKey.get(), testNameString.get()); - - WKRetainPtr userDataKey(AdoptWK, WKStringCreateWithUTF8CString("UserData")); - WKDictionaryAddItem(initializationDictionary.get(), userDataKey.get(), userData); - - WKContextSetInitializationUserDataForInjectedBundle(context, initializationDictionary.get()); + WKContextSetInitializationUserDataForInjectedBundle(context, testNameString.get()); return context; } diff --git a/WebKitTools/TestWebKitAPI/PlatformUtilities.h b/WebKitTools/TestWebKitAPI/PlatformUtilities.h index 0e67dfd..8ae347c 100644 --- a/WebKitTools/TestWebKitAPI/PlatformUtilities.h +++ b/WebKitTools/TestWebKitAPI/PlatformUtilities.h @@ -35,7 +35,7 @@ namespace Util { // Runs a platform runloop until the 'done' is true. void run(bool* done); -WKContextRef createContextForInjectedBundleTest(const std::string&, WKTypeRef userData = 0); +WKContextRef createContextForInjectedBundleTest(const std::string&); WKStringRef createInjectedBundlePath(); WKURLRef createURLForResource(const char* resource, const char* extension); diff --git a/WebKitTools/TestWebKitAPI/PlatformWebView.h b/WebKitTools/TestWebKitAPI/PlatformWebView.h index 349d855..7f4f057 100644 --- a/WebKitTools/TestWebKitAPI/PlatformWebView.h +++ b/WebKitTools/TestWebKitAPI/PlatformWebView.h @@ -51,7 +51,7 @@ class WindowMessageObserver; class PlatformWebView { public: - PlatformWebView(WKPageNamespaceRef, WKPageGroupRef = 0); + PlatformWebView(WKPageNamespaceRef); ~PlatformWebView(); WKPageRef page(); diff --git a/WebKitTools/TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash.cpp b/WebKitTools/TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash.cpp index b935b6f..5e0655e 100644 --- a/WebKitTools/TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash.cpp +++ b/WebKitTools/TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash.cpp @@ -45,11 +45,9 @@ static void runJavaScriptAlert(WKPageRef page, WKStringRef alertText, WKFrameRef TEST(WebKit2, DocumentStartUserScriptAlertCrashTest) { - WKRetainPtr pageGroup(AdoptWK, WKPageGroupCreateWithIdentifier(WKStringCreateWithUTF8CString("DocumentStartUserScriptAlertCrashTestPageGroup"))); - - WKRetainPtr context(AdoptWK, Util::createContextForInjectedBundleTest("DocumentStartUserScriptAlertCrashTest", pageGroup.get())); + WKRetainPtr context(AdoptWK, Util::createContextForInjectedBundleTest("DocumentStartUserScriptAlertCrashTest")); WKRetainPtr pageNamespace(AdoptWK, WKPageNamespaceCreate(context.get())); - PlatformWebView webView(pageNamespace.get(), pageGroup.get()); + PlatformWebView webView(pageNamespace.get()); WKPageUIClient uiClient; memset(&uiClient, 0, sizeof(uiClient)); diff --git a/WebKitTools/TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash_Bundle.cpp b/WebKitTools/TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash_Bundle.cpp index dbd5d21..a96bef2 100644 --- a/WebKitTools/TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash_Bundle.cpp +++ b/WebKitTools/TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash_Bundle.cpp @@ -24,12 +24,10 @@ */ #include "InjectedBundleTest.h" -#include +#include #include #include #include -#include -#include namespace TestWebKitAPI { @@ -40,17 +38,11 @@ public: { } - virtual void initialize(WKBundleRef bundle, WKTypeRef userData) + virtual void initialize(WKBundleRef bundle) { - assert(WKGetTypeID(userData) == WKBundlePageGroupGetTypeID()); - WKBundlePageGroupRef pageGroup = static_cast(userData); - WKRetainPtr source(AdoptWK, WKStringCreateWithUTF8CString("alert('an alert');")); - WKBundleAddUserScript(bundle, pageGroup, WKBundleScriptWorldNormalWorld(), source.get(), 0, 0, 0, kWKInjectAtDocumentStart, kWKInjectInAllFrames); + WKBundleAddUserScript(bundle, WKBundleScriptWorldNormalWorld(), source.get(), 0, 0, 0, kWKInjectAtDocumentStart, kWKInjectInAllFrames); } - -private: - WKBundlePageGroupRef m_pageGroup; }; static InjectedBundleTest::Register registrar("DocumentStartUserScriptAlertCrashTest"); diff --git a/WebKitTools/TestWebKitAPI/mac/PlatformWebViewMac.mm b/WebKitTools/TestWebKitAPI/mac/PlatformWebViewMac.mm index e06e2e6..d4c31eb 100644 --- a/WebKitTools/TestWebKitAPI/mac/PlatformWebViewMac.mm +++ b/WebKitTools/TestWebKitAPI/mac/PlatformWebViewMac.mm @@ -29,10 +29,10 @@ namespace TestWebKitAPI { -PlatformWebView::PlatformWebView(WKPageNamespaceRef pageNamespaceRef, WKPageGroupRef pageGroupRef) +PlatformWebView::PlatformWebView(WKPageNamespaceRef namespaceRef) { NSRect rect = NSMakeRect(0, 0, 800, 600); - m_view = [[WKView alloc] initWithFrame:rect pageNamespaceRef:pageNamespaceRef pageGroupRef:pageGroupRef]; + m_view = [[WKView alloc] initWithFrame:rect pageNamespaceRef:namespaceRef]; NSRect windowRect = NSOffsetRect(rect, -10000, [[[NSScreen screens] objectAtIndex:0] frame].size.height - rect.size.height + 10000); m_window = [[NSWindow alloc] initWithContentRect:windowRect styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:YES]; diff --git a/WebKitTools/TestWebKitAPI/win/PlatformWebViewWin.cpp b/WebKitTools/TestWebKitAPI/win/PlatformWebViewWin.cpp index 0a4060c..65bdbc6 100644 --- a/WebKitTools/TestWebKitAPI/win/PlatformWebViewWin.cpp +++ b/WebKitTools/TestWebKitAPI/win/PlatformWebViewWin.cpp @@ -56,14 +56,14 @@ void PlatformWebView::registerWindowClass() ::RegisterClassExW(&wndClass); } -PlatformWebView::PlatformWebView(WKPageNamespaceRef namespaceRef, WKPageGroupRef pageGroupRef) +PlatformWebView::PlatformWebView(WKPageNamespaceRef namespaceRef) : m_parentWindowMessageObserver(0) { registerWindowClass(); RECT viewRect = {0, 0, 800, 600}; m_window = CreateWindowExW(0, hostWindowClassName, L"TestWebKitAPI", WS_OVERLAPPEDWINDOW, viewRect.left, viewRect.top, viewRect.right, viewRect.bottom, 0, 0, 0, this); - m_view = WKViewCreate(viewRect, namespaceRef, pageGroupRef, m_window); + m_view = WKViewCreate(viewRect, namespaceRef, m_window); } PlatformWebView::~PlatformWebView() diff --git a/WebKitTools/TestWebKitAPI/win/TestWebKitAPI.sln b/WebKitTools/TestWebKitAPI/win/TestWebKitAPI.sln index 5354271..c4def79 100644 --- a/WebKitTools/TestWebKitAPI/win/TestWebKitAPI.sln +++ b/WebKitTools/TestWebKitAPI/win/TestWebKitAPI.sln @@ -1,54 +1,54 @@ - -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestWebKitAPI", "TestWebKitAPI.vcproj", "{3E48AB23-D249-488F-A1C4-43CDF52FBD28}" - ProjectSection(ProjectDependencies) = postProject - {45C45411-7F0E-404D-919A-4EE9BB60BE86} = {45C45411-7F0E-404D-919A-4EE9BB60BE86} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestWebKitAPIGenerated", "TestWebKitAPIGenerated.vcproj", "{45C45411-7F0E-404D-919A-4EE9BB60BE86}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - all|Win32 = all|Win32 - Debug_All|Win32 = Debug_All|Win32 - Debug_Cairo_CFLite|Win32 = Debug_Cairo_CFLite|Win32 - Debug|Win32 = Debug|Win32 - Release_Cairo_CFLite|Win32 = Release_Cairo_CFLite|Win32 - Release_LTCG|Win32 = Release_LTCG|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.all|Win32.ActiveCfg = Release_Cairo_CFLite|Win32 - {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.all|Win32.Build.0 = Release_Cairo_CFLite|Win32 - {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 - {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Debug_All|Win32.Build.0 = Debug_All|Win32 - {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug_Cairo_CFLite|Win32 - {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Debug_Cairo_CFLite|Win32.Build.0 = Debug_Cairo_CFLite|Win32 - {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Debug|Win32.ActiveCfg = Debug|Win32 - {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Debug|Win32.Build.0 = Debug|Win32 - {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32 - {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32 - {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32 - {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32 - {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Release|Win32.ActiveCfg = Release|Win32 - {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Release|Win32.Build.0 = Release|Win32 - {45C45411-7F0E-404D-919A-4EE9BB60BE86}.all|Win32.ActiveCfg = Debug_Cairo_CFLite|Win32 - {45C45411-7F0E-404D-919A-4EE9BB60BE86}.all|Win32.Build.0 = Debug_Cairo_CFLite|Win32 - {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 - {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Debug_All|Win32.Build.0 = Debug_All|Win32 - {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug_Cairo_CFLite|Win32 - {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Debug_Cairo_CFLite|Win32.Build.0 = Debug_Cairo_CFLite|Win32 - {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Debug|Win32.ActiveCfg = Debug|Win32 - {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Debug|Win32.Build.0 = Debug|Win32 - {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32 - {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32 - {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32 - {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32 - {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Release|Win32.ActiveCfg = Release|Win32 - {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestWebKitAPI", "TestWebKitAPI.vcproj", "{3E48AB23-D249-488F-A1C4-43CDF52FBD28}" + ProjectSection(ProjectDependencies) = postProject + {45C45411-7F0E-404D-919A-4EE9BB60BE86} = {45C45411-7F0E-404D-919A-4EE9BB60BE86} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestWebKitAPIGenerated", "TestWebKitAPIGenerated.vcproj", "{45C45411-7F0E-404D-919A-4EE9BB60BE86}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + all|Win32 = all|Win32 + Debug_All|Win32 = Debug_All|Win32 + Debug_Cairo_CFLite|Win32 = Debug_Cairo_CFLite|Win32 + Debug|Win32 = Debug|Win32 + Release_Cairo_CFLite|Win32 = Release_Cairo_CFLite|Win32 + Release_LTCG|Win32 = Release_LTCG|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.all|Win32.ActiveCfg = Release_Cairo_CFLite|Win32 + {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.all|Win32.Build.0 = Release_Cairo_CFLite|Win32 + {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 + {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Debug_All|Win32.Build.0 = Debug_All|Win32 + {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug_Cairo_CFLite|Win32 + {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Debug_Cairo_CFLite|Win32.Build.0 = Debug_Cairo_CFLite|Win32 + {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Debug|Win32.ActiveCfg = Debug|Win32 + {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Debug|Win32.Build.0 = Debug|Win32 + {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32 + {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32 + {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32 + {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32 + {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Release|Win32.ActiveCfg = Release|Win32 + {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Release|Win32.Build.0 = Release|Win32 + {45C45411-7F0E-404D-919A-4EE9BB60BE86}.all|Win32.ActiveCfg = Debug_Cairo_CFLite|Win32 + {45C45411-7F0E-404D-919A-4EE9BB60BE86}.all|Win32.Build.0 = Debug_Cairo_CFLite|Win32 + {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 + {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Debug_All|Win32.Build.0 = Debug_All|Win32 + {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug_Cairo_CFLite|Win32 + {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Debug_Cairo_CFLite|Win32.Build.0 = Debug_Cairo_CFLite|Win32 + {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Debug|Win32.ActiveCfg = Debug|Win32 + {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Debug|Win32.Build.0 = Debug|Win32 + {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32 + {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32 + {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32 + {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32 + {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Release|Win32.ActiveCfg = Release|Win32 + {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/WebKitTools/TestWebKitAPI/win/TestWebKitAPI.vcproj b/WebKitTools/TestWebKitAPI/win/TestWebKitAPI.vcproj index 28c9c6b..05048e3 100644 --- a/WebKitTools/TestWebKitAPI/win/TestWebKitAPI.vcproj +++ b/WebKitTools/TestWebKitAPI/win/TestWebKitAPI.vcproj @@ -1,527 +1,528 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/WebKitTools/TestWebKitAPI/win/TestWebKitAPIGenerated.vcproj b/WebKitTools/TestWebKitAPI/win/TestWebKitAPIGenerated.vcproj index 3f30a05..afc5336 100644 --- a/WebKitTools/TestWebKitAPI/win/TestWebKitAPIGenerated.vcproj +++ b/WebKitTools/TestWebKitAPI/win/TestWebKitAPIGenerated.vcproj @@ -1,82 +1,82 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/WebKitTools/TestWebKitAPI/win/TestWebKitAPIGeneratedCommon.vsprops b/WebKitTools/TestWebKitAPI/win/TestWebKitAPIGeneratedCommon.vsprops index 7e1587b..0786d24 100644 --- a/WebKitTools/TestWebKitAPI/win/TestWebKitAPIGeneratedCommon.vsprops +++ b/WebKitTools/TestWebKitAPI/win/TestWebKitAPIGeneratedCommon.vsprops @@ -1,13 +1,13 @@ - - - - + + + + diff --git a/WebKitTools/TestWebKitAPI/win/TestWebKitAPIPostBuild.cmd b/WebKitTools/TestWebKitAPI/win/TestWebKitAPIPostBuild.cmd deleted file mode 100644 index f011495..0000000 --- a/WebKitTools/TestWebKitAPI/win/TestWebKitAPIPostBuild.cmd +++ /dev/null @@ -1 +0,0 @@ -if exist "%WEBKITOUTPUTDIR%\buildfailed" del "%WEBKITOUTPUTDIR%\buildfailed" diff --git a/WebKitTools/TestWebKitAPI/win/TestWebKitAPIPreBuild.cmd b/WebKitTools/TestWebKitAPI/win/TestWebKitAPIPreBuild.cmd deleted file mode 100644 index 3a84c26..0000000 --- a/WebKitTools/TestWebKitAPI/win/TestWebKitAPIPreBuild.cmd +++ /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 "%WEBKITOUTPUTDIR%\buildfailed" grep XX%PROJECTNAME%XX "%WEBKITOUTPUTDIR%\buildfailed" -if errorlevel 1 exit 1 -echo XX%PROJECTNAME%XX > "%WEBKITOUTPUTDIR%\buildfailed" -- cgit v1.1