diff options
Diffstat (limited to 'WebKitLibraries/win')
| -rw-r--r-- | WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h | 7 | ||||
| -rw-r--r-- | WebKitLibraries/win/lib/WebKitSystemInterface.lib | bin | 658846 -> 660276 bytes | |||
| -rw-r--r-- | WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib | bin | 567246 -> 0 bytes | |||
| -rw-r--r-- | WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops | 2 | ||||
| -rw-r--r-- | WebKitLibraries/win/tools/vsprops/common.vsprops | 9 | ||||
| -rw-r--r-- | WebKitLibraries/win/tools/vsprops/production.vsprops | 28 |
6 files changed, 36 insertions, 10 deletions
diff --git a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h index 5d17561..0838028 100644 --- a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h +++ b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h @@ -86,10 +86,12 @@ CGAffineTransform wkGetUserToBaseCTM(CGContextRef); void wkDrawFocusRing(CGContextRef, CGColorRef, float radius); CFDictionaryRef wkGetSSLCertificateInfo(CFURLResponseRef); -void* wkGetSSLPeerCertificateData(CFDictionaryRef); +CFDataRef wkGetSSLPeerCertificateData(CFDictionaryRef); +void* wkGetSSLPeerCertificateDataBytePtr(CFDictionaryRef); +void wkSetSSLPeerCertificateData(CFMutableDictionaryRef, CFDataRef); void* wkGetSSLCertificateChainContext(CFDictionaryRef); CFHTTPCookieStorageRef wkGetDefaultHTTPCookieStorage(); -CFHTTPCookieStorageRef wkCreatePrivateInMemoryHTTPCookieStorage(CFURLStorageSessionRef); +CFHTTPCookieStorageRef wkCreateInMemoryHTTPCookieStorage(); void wkSetCFURLRequestShouldContentSniff(CFMutableURLRequestRef, bool); CFStringRef wkCopyFoundationCacheDirectory(); void wkSetClientCertificateInSSLProperties(CFMutableDictionaryRef, CFDataRef); @@ -100,6 +102,7 @@ void wkCFURLRequestSetHTTPRequestBodyParts(CFMutableURLRequestRef, CFArrayRef bo CFURLStorageSessionRef wkCreatePrivateStorageSession(CFStringRef identifier); void wkSetRequestStorageSession(CFURLStorageSessionRef, CFMutableURLRequestRef); CFURLCacheRef wkCopyURLCache(CFURLStorageSessionRef); +CFHTTPCookieStorageRef wkCopyHTTPCookieStorage(CFURLStorageSessionRef); CFArrayRef wkCFURLCacheCopyAllHostNamesInPersistentStore(); void wkCFURLCacheDeleteHostNamesInPersistentStore(CFArrayRef hostNames); diff --git a/WebKitLibraries/win/lib/WebKitSystemInterface.lib b/WebKitLibraries/win/lib/WebKitSystemInterface.lib Binary files differindex c6fe998..d212612 100644 --- a/WebKitLibraries/win/lib/WebKitSystemInterface.lib +++ b/WebKitLibraries/win/lib/WebKitSystemInterface.lib diff --git a/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib b/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib Binary files differdeleted file mode 100644 index f21c19a..0000000 --- a/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib +++ /dev/null diff --git a/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops b/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops index b6edbca..32664b8 100644 --- a/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops +++ b/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops @@ -133,7 +133,7 @@ /> <UserMacro Name="ENABLE_MATHML" - Value="" + Value="ENABLE_MATHML" PerformEnvironmentSet="true" /> <UserMacro diff --git a/WebKitLibraries/win/tools/vsprops/common.vsprops b/WebKitLibraries/win/tools/vsprops/common.vsprops index 0f07f75..d5889de 100644 --- a/WebKitLibraries/win/tools/vsprops/common.vsprops +++ b/WebKitLibraries/win/tools/vsprops/common.vsprops @@ -9,8 +9,8 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/GS" - PreprocessorDefinitions="WIN32;_WINDOWS;WINVER=0x502;_WIN32_WINNT=0x502;_WIN32_IE=0x603;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;__PRODUCTION__=0$(ProductionBuild);_HAS_EXCEPTIONS=0;BUILDING_$(ProjectName)" - ExceptionHandling="0" + PreprocessorDefinitions="WIN32;_WINDOWS;WINVER=0x502;_WIN32_WINNT=0x502;_WIN32_IE=0x603;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_HAS_EXCEPTIONS=0;BUILDING_$(ProjectName)" + ExceptionHandling= "0" RuntimeTypeInfo="false" WarningLevel="4" WarnAsError="true" @@ -35,7 +35,6 @@ /> <Tool Name="VCMIDLTool" - PreprocessorDefinitions="__PRODUCTION__=0$(ProductionBuild)" WarnAsError="true" HeaderFileName="$(OutDir)\$(InputName).h" /> @@ -57,10 +56,6 @@ AdditionalIncludeDirectories=""$(IntDir)\include"" /> <UserMacro - Name="ProductionBuild" - Value="$(PRODUCTION)" - /> - <UserMacro Name="ConfigurationBuildDir" Value="$(WebKitOutputDir)\$(ConfigurationName)" /> diff --git a/WebKitLibraries/win/tools/vsprops/production.vsprops b/WebKitLibraries/win/tools/vsprops/production.vsprops new file mode 100644 index 0000000..cc5ba1c --- /dev/null +++ b/WebKitLibraries/win/tools/vsprops/production.vsprops @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioPropertySheet + ProjectType="Visual C++" + Version="8.00" + Name="production" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="__PRODUCTION__=1" + /> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="__PRODUCTION__=1" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="__PRODUCTION__=1" + /> + <UserMacro + Name="ProductionBuild" + Value="1" + /> + <UserMacro + Name="PRODUCTION" + Value="1" + PerformEnvironmentSet="true" + /> +</VisualStudioPropertySheet> |