diff options
| author | John Reck <jreck@google.com> | 2010-11-04 12:00:17 -0700 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2010-11-09 11:35:04 -0800 |
| commit | e14391e94c850b8bd03680c23b38978db68687a8 (patch) | |
| tree | 3fed87e6620fecaf3edc7259ae58a11662bedcb2 /WebKitLibraries/win | |
| parent | 1bd705833a68f07850cf7e204b26f8d328d16951 (diff) | |
| download | external_webkit-e14391e94c850b8bd03680c23b38978db68687a8.zip external_webkit-e14391e94c850b8bd03680c23b38978db68687a8.tar.gz external_webkit-e14391e94c850b8bd03680c23b38978db68687a8.tar.bz2 | |
Merge Webkit at r70949: Initial merge by git.
Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e
Diffstat (limited to 'WebKitLibraries/win')
| -rw-r--r-- | WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h | 1 | ||||
| -rw-r--r-- | WebKitLibraries/win/lib/WebKitSystemInterface.lib | bin | 1237016 -> 1246502 bytes | |||
| -rw-r--r-- | WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib | bin | 482408 -> 484884 bytes | |||
| -rw-r--r-- | WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops | 35 | ||||
| -rw-r--r-- | WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops | 39 |
5 files changed, 68 insertions, 7 deletions
diff --git a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h index a87cfb6..52aac61 100644 --- a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h +++ b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h @@ -85,6 +85,7 @@ CFDictionaryRef wkGetSSLCertificateInfo(CFURLResponseRef); void* wkGetSSLPeerCertificateData(CFDictionaryRef); void* wkGetSSLCertificateChainContext(CFDictionaryRef); CFHTTPCookieStorageRef wkGetDefaultHTTPCookieStorage(); +CFHTTPCookieStorageRef wkCreatePrivateHTTPCookieStorage(); void wkSetCFURLRequestShouldContentSniff(CFMutableURLRequestRef, bool); CFStringRef wkCopyFoundationCacheDirectory(); void wkSetClientCertificateInSSLProperties(CFMutableDictionaryRef, CFDataRef); diff --git a/WebKitLibraries/win/lib/WebKitSystemInterface.lib b/WebKitLibraries/win/lib/WebKitSystemInterface.lib Binary files differindex 6e2018b..1938e9d 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 b9f1433..fe4a228 100644 --- a/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib +++ b/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib diff --git a/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops b/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops index 17b5da4..addcae2 100644 --- a/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops +++ b/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops @@ -9,7 +9,7 @@ > <Tool Name="VCCLCompilerTool" - PreprocessorDefinitions="$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_BLOB);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CLIENT_BASED_GEOLOCATION);$(ENABLE_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_DOM_STORAGE);$(ENABLE_EVENTSOURCE);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_IMAGE_RESIZER);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_SPEECH);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_MATHML);$(ENABLE_NOTIFICATIONS);$(ENABLE_OFFLINE_WEB_APPLICATIONS);$(ENABLE_RUBY);$(ENABLE_SANDBOX);$(ENABLE_SHARED_WORKERS);$(ENABLE_SVG);$(ENABLE_SVG_ANIMATION);$(ENABLE_SVG_AS_IMAGE);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_SVG_FOREIGN_OBJECT);$(ENABLE_SVG_USE);$(ENABLE_VIDEO);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WML);$(ENABLE_WORKERS);$(ENABLE_XHTMLMP);$(ENABLE_XPATH);$(ENABLE_XSLT)" + PreprocessorDefinitions="$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_BLOB);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CLIENT_BASED_GEOLOCATION);$(ENABLE_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_DOM_STORAGE);$(ENABLE_EVENTSOURCE);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_IMAGE_RESIZER);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_SPEECH);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_LINK_PREFETCH);$(ENABLE_MATHML);$(ENABLE_METER_TAG);$(ENABLE_NOTIFICATIONS);$(ENABLE_OFFLINE_WEB_APPLICATIONS);$(ENABLE_PROGRESS_TAG);$(ENABLE_RUBY);$(ENABLE_SHARED_WORKERS);$(ENABLE_SVG);$(ENABLE_SVG_ANIMATION);$(ENABLE_SVG_AS_IMAGE);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_SVG_FOREIGN_OBJECT);$(ENABLE_SVG_USE);$(ENABLE_VIDEO);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WML);$(ENABLE_WORKERS);$(ENABLE_XHTMLMP);$(ENABLE_XPATH);$(ENABLE_XSLT)" /> <UserMacro Name="ENABLE_3D_CANVAS" @@ -18,6 +18,11 @@ /> <UserMacro Name="ENABLE_3D_RENDERING" + Value="ENABLE_3D_RENDERING" + PerformEnvironmentSet="true" + /> + <UserMacro + Name="ENABLE_ACCELERATED_2D_CANVAS" Value="" PerformEnvironmentSet="true" /> @@ -82,6 +87,11 @@ PerformEnvironmentSet="true" /> <UserMacro + Name="ENABLE_FULLSCREEN_API" + Value="" + PerformEnvironmentSet="true" + /> + <UserMacro Name="ENABLE_GEOLOCATION" Value="ENABLE_GEOLOCATION" PerformEnvironmentSet="true" @@ -112,11 +122,21 @@ PerformEnvironmentSet="true" /> <UserMacro + Name="ENABLE_LINK_PREFETCH" + Value="" + PerformEnvironmentSet="true" + /> + <UserMacro Name="ENABLE_MATHML" Value="ENABLE_MATHML" PerformEnvironmentSet="true" /> <UserMacro + Name="ENABLE_METER_TAG" + Value="ENABLE_METER_TAG" + PerformEnvironmentSet="true" + /> + <UserMacro Name="ENABLE_NOTIFICATIONS" Value="" PerformEnvironmentSet="true" @@ -127,13 +147,13 @@ PerformEnvironmentSet="true" /> <UserMacro - Name="ENABLE_RUBY" - Value="ENABLE_RUBY" + Name="ENABLE_PROGRESS_TAG" + Value="" PerformEnvironmentSet="true" /> <UserMacro - Name="ENABLE_SANDBOX" - Value="ENABLE_SANDBOX" + Name="ENABLE_RUBY" + Value="ENABLE_RUBY" PerformEnvironmentSet="true" /> <UserMacro @@ -182,6 +202,11 @@ PerformEnvironmentSet="true" /> <UserMacro + Name="ENABLE_WEB_AUDIO" + Value="" + PerformEnvironmentSet="true" + /> + <UserMacro Name="ENABLE_WEB_SOCKETS" Value="ENABLE_WEB_SOCKETS" PerformEnvironmentSet="true" diff --git a/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops b/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops index 1aa406a..f9ffafc 100644 --- a/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops +++ b/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops @@ -5,11 +5,11 @@ <VisualStudioPropertySheet ProjectType="Visual C++" Version="8.00" - Name="FeatureDefines" + Name="FeatureDefinesCairo" > <Tool Name="VCCLCompilerTool" - PreprocessorDefinitions="$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_BLOB);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CLIENT_BASED_GEOLOCATION);$(ENABLE_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_DOM_STORAGE);$(ENABLE_EVENTSOURCE);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_IMAGE_RESIZER);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_SPEECH);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_MATHML);$(ENABLE_NOTIFICATIONS);$(ENABLE_OFFLINE_WEB_APPLICATIONS);$(ENABLE_SHARED_WORKERS);$(ENABLE_SVG);$(ENABLE_SVG_ANIMATION);$(ENABLE_SVG_AS_IMAGE);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_SVG_FOREIGN_OBJECT);$(ENABLE_SVG_USE);$(ENABLE_VIDEO);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WML);$(ENABLE_WORKERS);$(ENABLE_XHTMLMP);$(ENABLE_XPATH);$(ENABLE_XSLT)" + PreprocessorDefinitions="$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_BLOB);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CLIENT_BASED_GEOLOCATION);$(ENABLE_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_DOM_STORAGE);$(ENABLE_EVENTSOURCE);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_IMAGE_RESIZER);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_SPEECH);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_LINK_PREFETCH);$(ENABLE_MATHML);$(ENABLE_METER_TAG);$(ENABLE_NOTIFICATIONS);$(ENABLE_OFFLINE_WEB_APPLICATIONS);$(ENABLE_PROGRESS_TAG);$(ENABLE_RUBY);$(ENABLE_SHARED_WORKERS);$(ENABLE_SVG);$(ENABLE_SVG_ANIMATION);$(ENABLE_SVG_AS_IMAGE);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_SVG_FOREIGN_OBJECT);$(ENABLE_SVG_USE);$(ENABLE_VIDEO);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WML);$(ENABLE_WORKERS);$(ENABLE_XHTMLMP);$(ENABLE_XPATH);$(ENABLE_XSLT)" /> <UserMacro Name="ENABLE_3D_CANVAS" @@ -22,6 +22,11 @@ PerformEnvironmentSet="true" /> <UserMacro + Name="ENABLE_ACCELERATED_2D_CANVAS" + Value="" + PerformEnvironmentSet="true" + /> + <UserMacro Name="ENABLE_BLOB" Value="" PerformEnvironmentSet="true" @@ -82,6 +87,11 @@ PerformEnvironmentSet="true" /> <UserMacro + Name="ENABLE_FULLSCREEN_API" + Value="" + PerformEnvironmentSet="true" + /> + <UserMacro Name="ENABLE_GEOLOCATION" Value="" PerformEnvironmentSet="true" @@ -112,11 +122,21 @@ PerformEnvironmentSet="true" /> <UserMacro + Name="ENABLE_LINK_PREFETCH" + Value="" + PerformEnvironmentSet="true" + /> + <UserMacro Name="ENABLE_MATHML" Value="" PerformEnvironmentSet="true" /> <UserMacro + Name="ENABLE_METER_TAG" + Value="ENABLE_METER_TAG" + PerformEnvironmentSet="true" + /> + <UserMacro Name="ENABLE_NOTIFICATIONS" Value="" PerformEnvironmentSet="true" @@ -127,6 +147,16 @@ PerformEnvironmentSet="true" /> <UserMacro + Name="ENABLE_PROGRESS_TAG" + Value="" + PerformEnvironmentSet="true" + /> + <UserMacro + Name="ENABLE_RUBY" + Value="ENABLE_RUBY" + PerformEnvironmentSet="true" + /> + <UserMacro Name="ENABLE_SHARED_WORKERS" Value="ENABLE_SHARED_WORKERS" PerformEnvironmentSet="true" @@ -172,6 +202,11 @@ PerformEnvironmentSet="true" /> <UserMacro + Name="ENABLE_WEB_AUDIO" + Value="" + PerformEnvironmentSet="true" + /> + <UserMacro Name="ENABLE_WEB_SOCKETS" Value="ENABLE_WEB_SOCKETS" PerformEnvironmentSet="true" |