diff options
Diffstat (limited to 'Tools/TestWebKitAPI/win')
-rw-r--r-- | Tools/TestWebKitAPI/win/PlatformUtilitiesWin.cpp | 14 | ||||
-rw-r--r-- | Tools/TestWebKitAPI/win/TestWebKitAPI.sln | 14 | ||||
-rw-r--r-- | Tools/TestWebKitAPI/win/TestWebKitAPI.vcproj | 42 | ||||
-rw-r--r-- | Tools/TestWebKitAPI/win/TestWebKitAPIGenerated.vcproj | 2 | ||||
-rw-r--r-- | Tools/TestWebKitAPI/win/TestWebKitAPIInjectedBundle.vcproj | 6 |
5 files changed, 66 insertions, 12 deletions
diff --git a/Tools/TestWebKitAPI/win/PlatformUtilitiesWin.cpp b/Tools/TestWebKitAPI/win/PlatformUtilitiesWin.cpp index 8ed2fbf..181d88e 100644 --- a/Tools/TestWebKitAPI/win/PlatformUtilitiesWin.cpp +++ b/Tools/TestWebKitAPI/win/PlatformUtilitiesWin.cpp @@ -29,6 +29,10 @@ #include <WebKit2/WKURLCF.h> #include <wtf/RetainPtr.h> +#if USE(CFNETWORK) +#include <WebKit2/WKURLResponseCF.h> +#endif + namespace TestWebKitAPI { namespace Util { @@ -81,6 +85,16 @@ WKURLRef URLForNonExistentResource() return WKURLCreateWithUTF8CString("file:///does-not-exist.html"); } +WKRetainPtr<WKStringRef> MIMETypeForWKURLResponse(WKURLResponseRef wkResponse) +{ +#if USE(CFNETWORK) + RetainPtr<CFURLResponseRef> response(AdoptCF, WKURLResponseCopyCFURLResponse(0, wkResponse)); + return adoptWK(WKStringCreateWithCFString(CFURLResponseGetMIMEType(response.get()))); +#else + return 0; +#endif +} + bool isKeyDown(WKNativeEventPtr event) { return event->message == WM_KEYDOWN; diff --git a/Tools/TestWebKitAPI/win/TestWebKitAPI.sln b/Tools/TestWebKitAPI/win/TestWebKitAPI.sln index 4202817..c2728d3 100644 --- a/Tools/TestWebKitAPI/win/TestWebKitAPI.sln +++ b/Tools/TestWebKitAPI/win/TestWebKitAPI.sln @@ -19,7 +19,7 @@ Global 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 + Production|Win32 = Production|Win32 Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution @@ -31,8 +31,8 @@ Global {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}.Production|Win32.ActiveCfg = Production|Win32 + {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Production|Win32.Build.0 = Production|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}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 @@ -43,8 +43,8 @@ Global {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}.Production|Win32.ActiveCfg = Production|Win32 + {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Production|Win32.Build.0 = Production|Win32 {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Release|Win32.ActiveCfg = Release|Win32 {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Release|Win32.Build.0 = Release|Win32 {B0101604-B483-4F8C-9C51-90B46A2B1CD3}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 @@ -55,8 +55,8 @@ Global {B0101604-B483-4F8C-9C51-90B46A2B1CD3}.Debug|Win32.Build.0 = Debug|Win32 {B0101604-B483-4F8C-9C51-90B46A2B1CD3}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32 {B0101604-B483-4F8C-9C51-90B46A2B1CD3}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32 - {B0101604-B483-4F8C-9C51-90B46A2B1CD3}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32 - {B0101604-B483-4F8C-9C51-90B46A2B1CD3}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32 + {B0101604-B483-4F8C-9C51-90B46A2B1CD3}.Production|Win32.ActiveCfg = Production|Win32 + {B0101604-B483-4F8C-9C51-90B46A2B1CD3}.Production|Win32.Build.0 = Production|Win32 {B0101604-B483-4F8C-9C51-90B46A2B1CD3}.Release|Win32.ActiveCfg = Release|Win32 {B0101604-B483-4F8C-9C51-90B46A2B1CD3}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection diff --git a/Tools/TestWebKitAPI/win/TestWebKitAPI.vcproj b/Tools/TestWebKitAPI/win/TestWebKitAPI.vcproj index a894029..468ed71 100644 --- a/Tools/TestWebKitAPI/win/TestWebKitAPI.vcproj +++ b/Tools/TestWebKitAPI/win/TestWebKitAPI.vcproj @@ -320,7 +320,7 @@ /> </Configuration> <Configuration - Name="Release_LTCG|Win32" + Name="Production|Win32" ConfigurationType="1" InheritedPropertySheets="..\Configurations\TestWebKitAPIRelease.vsprops" CharacterSet="1" @@ -412,6 +412,18 @@ Name="WebKit2" > <File + RelativePath="..\Tests\WebKit2\AboutBlankLoad.cpp" + > + </File> + <File + RelativePath="..\Tests\WebKit2\CanHandleRequest.cpp" + > + </File> + <File + RelativePath="..\Tests\WebKit2\CookieManager.cpp" + > + </File> + <File RelativePath="..\Tests\WebKit2\DocumentStartUserScriptAlertCrash.cpp" > </File> @@ -448,11 +460,11 @@ > </File> <File - RelativePath="..\Tests\WebKit2\icon.png" + RelativePath="..\Tests\WebKit2\HitTestResultNodeHandle.cpp" > </File> <File - RelativePath="..\Tests\WebKit2\HitTestResultNodeHandle.cpp" + RelativePath="..\Tests\WebKit2\icon.png" > </File> <File @@ -480,6 +492,10 @@ > </File> <File + RelativePath="..\Tests\WebKit2\SendingMessagesToTheWebProcessBeforeItIsValid.cpp" + > + </File> + <File RelativePath="..\Tests\WebKit2\simple-accelerated-compositing.html" > </File> @@ -519,6 +535,26 @@ > </File> <File + RelativePath="..\Tests\WebKit2\win\DoNotCopyANullCFURLResponse.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> + <File RelativePath="..\Tests\WebKit2\win\HideFindIndicator.cpp" > </File> diff --git a/Tools/TestWebKitAPI/win/TestWebKitAPIGenerated.vcproj b/Tools/TestWebKitAPI/win/TestWebKitAPIGenerated.vcproj index d52560a..78bbdbf 100644 --- a/Tools/TestWebKitAPI/win/TestWebKitAPIGenerated.vcproj +++ b/Tools/TestWebKitAPI/win/TestWebKitAPIGenerated.vcproj @@ -42,7 +42,7 @@ /> </Configuration> <Configuration - Name="Release_LTCG|Win32" + Name="Production|Win32" ConfigurationType="0" InheritedPropertySheets=".\TestWebKitAPIGeneratedCommon.vsprops" > diff --git a/Tools/TestWebKitAPI/win/TestWebKitAPIInjectedBundle.vcproj b/Tools/TestWebKitAPI/win/TestWebKitAPIInjectedBundle.vcproj index 3b18238..faf8059 100644 --- a/Tools/TestWebKitAPI/win/TestWebKitAPIInjectedBundle.vcproj +++ b/Tools/TestWebKitAPI/win/TestWebKitAPIInjectedBundle.vcproj @@ -198,7 +198,7 @@ /> </Configuration> <Configuration - Name="Release_LTCG|Win32" + Name="Production|Win32" ConfigurationType="2" InheritedPropertySheets="..\Configurations\TestWebKitAPIRelease.vsprops;..\Configurations\TestWebKitAPIInjectedBundleCommon.vsprops" CharacterSet="1" @@ -400,6 +400,10 @@ Name="WebKit2" > <File + RelativePath="..\Tests\WebKit2\CanHandleRequest_Bundle.cpp" + > + </File> + <File RelativePath="..\Tests\WebKit2\DocumentStartUserScriptAlertCrash_Bundle.cpp" > </File> |