diff options
author | Steve Block <steveblock@google.com> | 2009-12-15 10:12:09 +0000 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2009-12-17 17:41:10 +0000 |
commit | 643ca7872b450ea4efacab6188849e5aac2ba161 (patch) | |
tree | 6982576c228bcd1a7efe98afed544d840751094c /WebKitLibraries/win | |
parent | d026980fde6eb3b01c1fe49441174e89cd1be298 (diff) | |
download | external_webkit-643ca7872b450ea4efacab6188849e5aac2ba161.zip external_webkit-643ca7872b450ea4efacab6188849e5aac2ba161.tar.gz external_webkit-643ca7872b450ea4efacab6188849e5aac2ba161.tar.bz2 |
Merge webkit.org at r51976 : Initial merge by git.
Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
Diffstat (limited to 'WebKitLibraries/win')
-rw-r--r-- | WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h | 12 | ||||
-rw-r--r-- | WebKitLibraries/win/lib/WebKitSystemInterface.lib | bin | 167466 -> 172868 bytes | |||
-rw-r--r-- | WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib | bin | 66330 -> 74364 bytes | |||
-rwxr-xr-x | WebKitLibraries/win/tools/scripts/auto-version.sh | 2 | ||||
-rw-r--r-- | WebKitLibraries/win/tools/vsprops/WinCairo.vsprops | 2 |
5 files changed, 14 insertions, 2 deletions
diff --git a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h index b5ce097..e3feae6 100644 --- a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h +++ b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h @@ -42,6 +42,12 @@ typedef struct _CFURLResponse* CFURLResponseRef; typedef struct OpaqueCFHTTPCookieStorage* CFHTTPCookieStorageRef; typedef struct _CFURLRequest* CFMutableURLRequestRef; typedef const struct _CFURLRequest* CFURLRequestRef; +typedef struct _CFURLCredential* CFURLCredentialRef; +typedef struct __CFHTTPMessage* CFHTTPMessageRef; +typedef const struct __CFNumber* CFNumberRef; +typedef struct __CFReadStream* CFReadStreamRef; +typedef const struct __CFURL* CFURLRef; +typedef struct _CFURLProtectionSpace* CFURLProtectionSpaceRef; void wkSetFontSmoothingLevel(int type); int wkGetFontSmoothingLevel(); @@ -77,6 +83,12 @@ void wkCFURLRequestSetHTTPRequestBodyParts(CFMutableURLRequestRef, CFArrayRef bo unsigned wkInitializeMaximumHTTPConnectionCountPerHost(unsigned preferredConnectionCount); +void wkSetCONNECTProxyForStream(CFReadStreamRef, CFStringRef proxyHost, CFNumberRef proxyPort); +void wkSetCONNECTProxyAuthorizationForStream(CFReadStreamRef, CFStringRef proxyAuthorizationString); +CFHTTPMessageRef wkCopyCONNECTProxyResponse(CFReadStreamRef, CFURLRef responseURL); + +CFURLCredentialRef wkCopyCredentialFromCFPersistentStorage(CFURLProtectionSpaceRef); + CFStringRef wkCFNetworkErrorGetLocalizedDescription(CFIndex errorCode); #endif // WebKitSystemInterface_h diff --git a/WebKitLibraries/win/lib/WebKitSystemInterface.lib b/WebKitLibraries/win/lib/WebKitSystemInterface.lib Binary files differindex d4f9dd9..60d4e1e 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 differindex 6d18588..56cbdcf 100644 --- a/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib +++ b/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib diff --git a/WebKitLibraries/win/tools/scripts/auto-version.sh b/WebKitLibraries/win/tools/scripts/auto-version.sh index a67184f..c448db7 100755 --- a/WebKitLibraries/win/tools/scripts/auto-version.sh +++ b/WebKitLibraries/win/tools/scripts/auto-version.sh @@ -34,7 +34,7 @@ chomp() FALLBACK_VERSION_PATH=`cygpath -u "$WEBKITLIBRARIESDIR\\tools\\scripts\\VERSION"` OUTPUT_FILE=$(cygpath -u "$1")/include/autoversion.h -mkdir -p $(dirname "$OUTPUT_FILE") +mkdir -p "$(dirname "$OUTPUT_FILE")" # Take the initial version number from RC_PROJECTSOURCEVERSION if it # exists, otherwise fall back to the version number stored in the source. diff --git a/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops b/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops index b3b1e4c..1a8f4b2 100644 --- a/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops +++ b/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops @@ -6,7 +6,7 @@ >
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN_CAIRO=1"
+ PreprocessorDefinitions="WIN_CAIRO=1;ENABLE_FILTERS"
AdditionalIncludeDirectories=""$(WebKitLibrariesDir)\include\cairo""
/>
<Tool
|