diff options
Diffstat (limited to 'WebKitLibraries/win')
-rw-r--r-- | WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h | 15 | ||||
-rw-r--r-- | WebKitLibraries/win/lib/WebKitSystemInterface.lib | bin | 469556 -> 556678 bytes | |||
-rw-r--r-- | WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib | bin | 482276 -> 567246 bytes | |||
-rw-r--r-- | WebKitLibraries/win/tools/scripts/COPYRIGHT-END-YEAR | 2 | ||||
-rw-r--r-- | WebKitLibraries/win/tools/vsprops/WinCairo.vsprops | 34 | ||||
-rw-r--r-- | WebKitLibraries/win/tools/vsprops/cURL.vsprops | 26 | ||||
-rw-r--r-- | WebKitLibraries/win/tools/vsprops/common.vsprops | 30 | ||||
-rw-r--r-- | WebKitLibraries/win/tools/vsprops/debug_wincairo.vsprops | 68 | ||||
-rw-r--r-- | WebKitLibraries/win/tools/vsprops/release.vsprops | 4 |
9 files changed, 102 insertions, 77 deletions
diff --git a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h index 52aac61..744f80b 100644 --- a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h +++ b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h @@ -144,7 +144,15 @@ void wkCACFContextDestroy(WKCACFContext*); void wkCACFContextSetLayer(WKCACFContext*, CACFLayerRef); void wkCACFContextFlush(WKCACFContext*); -void wkCACFContextInitializeD3DDevice(WKCACFContext*, IDirect3DDevice9*); +CFTimeInterval wkCACFContextGetLastCommitTime(WKCACFContext*); +CFTimeInterval wkCACFContextGetNextUpdateTime(WKCACFContext*); + +void* wkCACFContextGetUserData(WKCACFContext*); +void wkCACFContextSetUserData(WKCACFContext*, void*); + +void* wkCACFLayerGetContextUserData(CACFLayerRef); + +void wkCACFContextSetD3DDevice(WKCACFContext*, IDirect3DDevice9*); void wkCACFContextReleaseD3DResources(WKCACFContext*); bool wkCACFContextBeginUpdate(WKCACFContext*, void* buffer, size_t bufferSize, CFTimeInterval time, const CGRect& bounds, const CGRect dirtyRects[], size_t dirtyRectCount); @@ -156,6 +164,11 @@ WKCACFUpdateRectEnumerator* wkCACFContextCopyUpdateRectEnumerator(WKCACFContext* const CGRect* wkCACFUpdateRectEnumeratorNextRect(WKCACFUpdateRectEnumerator*); void wkCACFUpdateRectEnumeratorRelease(WKCACFUpdateRectEnumerator*); +CFDictionaryRef wkCFURLRequestCreateSerializableRepresentation(CFURLRequestRef cfRequest, CFTypeRef tokenNull); +CFURLRequestRef wkCFURLRequestCreateFromSerializableRepresentation(CFDictionaryRef representation, CFTypeRef tokenNull); +CFDictionaryRef wkCFURLResponseCreateSerializableRepresentation(CFURLResponseRef cfResponse, CFTypeRef tokenNull); +CFURLResponseRef wkCFURLResponseCreateFromSerializableRepresentation(CFDictionaryRef representation, CFTypeRef tokenNull); + typedef enum { WKMediaUIPartFullscreenButton = 0, WKMediaUIPartMuteButton, diff --git a/WebKitLibraries/win/lib/WebKitSystemInterface.lib b/WebKitLibraries/win/lib/WebKitSystemInterface.lib Binary files differindex 686a355..f1af3b0 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 f0257a0..f21c19a 100644 --- a/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib +++ b/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib diff --git a/WebKitLibraries/win/tools/scripts/COPYRIGHT-END-YEAR b/WebKitLibraries/win/tools/scripts/COPYRIGHT-END-YEAR index 48ad625..cb4176b 100644 --- a/WebKitLibraries/win/tools/scripts/COPYRIGHT-END-YEAR +++ b/WebKitLibraries/win/tools/scripts/COPYRIGHT-END-YEAR @@ -1 +1 @@ -2010 +2011 diff --git a/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops b/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops index 9710568..704cd7a 100644 --- a/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops +++ b/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops @@ -1,17 +1,17 @@ -<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
- ProjectType="Visual C++"
- Version="8.00"
- Name="WinCairo"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(WebKitLibrariesDir)\include\cairo";"$(SolutionDir)\..\..\..\JavaScriptCore\os-win32""
- PreprocessorDefinitions="WIN_CAIRO=1"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="cairo.lib libjpeg.lib zlib.lib libpng.lib"
- AdditionalLibraryDirectories=""$(WebKitLibrariesDir)\lib""
- />
-</VisualStudioPropertySheet>
+<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioPropertySheet + ProjectType="Visual C++" + Version="8.00" + Name="WinCairo" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(WebKitLibrariesDir)\include\cairo";"$(SolutionDir)\..\..\..\JavaScriptCore\os-win32"" + PreprocessorDefinitions="WIN_CAIRO=1" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="cairo.lib libjpeg.lib zlib.lib libpng.lib" + AdditionalLibraryDirectories=""$(WebKitLibrariesDir)\lib"" + /> +</VisualStudioPropertySheet> diff --git a/WebKitLibraries/win/tools/vsprops/cURL.vsprops b/WebKitLibraries/win/tools/vsprops/cURL.vsprops index 3f06aa6..db7680a 100644 --- a/WebKitLibraries/win/tools/vsprops/cURL.vsprops +++ b/WebKitLibraries/win/tools/vsprops/cURL.vsprops @@ -1,13 +1,13 @@ -<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
- ProjectType="Visual C++"
- Version="8.00"
- Name="cURL"
- >
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib wininet.lib Wldap32.lib libeay32.lib ssleay32.lib libcurl_imp.lib"
- IgnoreAllDefaultLibraries="false"
- IgnoreDefaultLibraryNames=""
- />
-</VisualStudioPropertySheet>
+<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioPropertySheet + ProjectType="Visual C++" + Version="8.00" + Name="cURL" + > + <Tool + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib wininet.lib Wldap32.lib libeay32.lib ssleay32.lib libcurl_imp.lib" + IgnoreAllDefaultLibraries="false" + IgnoreDefaultLibraryNames="" + /> +</VisualStudioPropertySheet> diff --git a/WebKitLibraries/win/tools/vsprops/common.vsprops b/WebKitLibraries/win/tools/vsprops/common.vsprops index b9c710c..46e73b6 100644 --- a/WebKitLibraries/win/tools/vsprops/common.vsprops +++ b/WebKitLibraries/win/tools/vsprops/common.vsprops @@ -3,8 +3,8 @@ ProjectType="Visual C++" Version="8.00" Name="common" - OutputDirectory="$(WebKitOutputDir)\bin" - IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)" + OutputDirectory="$(ConfigurationBuildDir)\bin" + IntermediateDirectory="$(ConfigurationBuildDir)\obj\$(ProjectName)" > <Tool Name="VCCLCompilerTool" @@ -25,12 +25,12 @@ <Tool Name="VCLinkerTool" LinkLibraryDependencies="false" - AdditionalOptions="/SAFESEH /FIXED:NO /dynamicbase /ignore:4221" + AdditionalOptions="/SAFESEH /FIXED:NO /dynamicbase /ignore:4221" OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).exe" - AdditionalLibraryDirectories=""$(WebKitOutputDir)\lib";"$(WebKitLibrariesDir)\lib"" + AdditionalLibraryDirectories=""$(ConfigurationBuildDir)\lib";"$(WebKitLibrariesDir)\lib"" GenerateDebugInformation="true" SubSystem="2" - ImportLibrary="$(WebKitOutputDir)\lib\$(TargetName).lib" + ImportLibrary="$(ConfigurationBuildDir)\lib\$(TargetName).lib" TargetMachine="1" /> <Tool @@ -40,15 +40,31 @@ HeaderFileName="$(OutDir)\$(InputName).h" /> <Tool + Name="VCPostBuildEventTool" + CommandLine="REM Do not edit from the Visual Studio IDE! Customize via a $(ProjectName)PostBuild.cmd file
if not exist "$(ProjectDir)$(ProjectName)PostBuild.cmd" exit /b

set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)
set CONFIGURATIONNAME=$(ConfigurationName)
set INPUTDIR=$(InputDir)
set INPUTFILENAME=$(InputFileName)
set INPUTPATH=$(InputPath)
set INTDIR=$(IntDir)
set LIBRARYCONFIGSUFFIX=$(LibraryConfigSuffix)
set OUTDIR=$(OutDir)
set PLATFORMNAME=$(PlatformName)
set PROJECTDIR=$(ProjectDir)
set PROJECTFILENAME=$(ProjectFileName)
set PROJECTNAME=$(ProjectName)
set PROJECTPATH=$(ProjectPath)
set SOLUTIONDIR=$(SolutionDir)
set SOLUTIONFILENAME=$(SolutionFileName)
set SOLUTIONNAME=$(SolutionName)
set SOLUTIONPATH=$(SolutionPath)
set TARGETDIR=$(TargetDir)
set TARGETEXT=$(TargetExt)
set TARGETFILENAME=$(TargetFileName)
set TARGETPATH=$(TargetPath)
set WEBKITCONFIGSUFFIX=$(WebKitConfigSuffix)
set WEBKITDLLCONFIGSUFFIX=$(WebKitDLLConfigSuffix)

REM If any of the above variables didn't exist previously and
REM were set to an empty string, set will set the errorlevel to 1,
REM which will cause the project-specific script to think the build
REM has failed. This cmd /c call will clear the errorlevel.
cmd /c

"$(ProjectDir)$(ProjectName)PostBuild.cmd"
" + /> + <Tool + Name="VCPreBuildEventTool" + CommandLine="REM Do not edit from the Visual Studio IDE! Customize via a $(ProjectName)PreBuild.cmd file.
if not exist "$(ProjectDir)$(ProjectName)PreBuild.cmd" exit /b

set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)
set CONFIGURATIONNAME=$(ConfigurationName)
set INPUTDIR=$(InputDir)
set INPUTFILENAME=$(InputFileName)
set INPUTPATH=$(InputPath)
set INTDIR=$(IntDir)
set LIBRARYCONFIGSUFFIX=$(LibraryConfigSuffix)
set OUTDIR=$(OutDir)
set PLATFORMNAME=$(PlatformName)
set PROJECTDIR=$(ProjectDir)
set PROJECTFILENAME=$(ProjectFileName)
set PROJECTNAME=$(ProjectName)
set PROJECTPATH=$(ProjectPath)
set SOLUTIONDIR=$(SolutionDir)
set SOLUTIONFILENAME=$(SolutionFileName)
set SOLUTIONNAME=$(SolutionName)
set SOLUTIONPATH=$(SolutionPath)
set TARGETDIR=$(TargetDir)
set TARGETEXT=$(TargetExt)
set TARGETFILENAME=$(TargetFileName)
set TARGETPATH=$(TargetPath)
set WEBKITCONFIGSUFFIX=$(WebKitConfigSuffix)
set WEBKITDLLCONFIGSUFFIX=$(WebKitDLLConfigSuffix)

REM If any of the above variables didn't exist previously and
REM were set to an empty string, set will set the errorlevel to 1,
REM which will cause the project-specific script to think the build
REM has failed. This cmd /c call will clear the errorlevel.
cmd /c

"$(ProjectDir)$(ProjectName)PreBuild.cmd"
" + /> + <Tool + Name="VCPreLinkEventTool" + CommandLine="REM Do not edit from the Visual Studio IDE! Customize via a $(ProjectName)PreLink.cmd file.
if not exist "$(ProjectDir)$(ProjectName)PreLink.cmd" exit /b

set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)
set CONFIGURATIONNAME=$(ConfigurationName)
set INPUTDIR=$(InputDir)
set INPUTFILENAME=$(InputFileName)
set INPUTPATH=$(InputPath)
set INTDIR=$(IntDir)
set LIBRARYCONFIGSUFFIX=$(LibraryConfigSuffix)
set OUTDIR=$(OutDir)
set PLATFORMNAME=$(PlatformName)
set PROJECTDIR=$(ProjectDir)
set PROJECTFILENAME=$(ProjectFileName)
set PROJECTNAME=$(ProjectName)
set PROJECTPATH=$(ProjectPath)
set SOLUTIONDIR=$(SolutionDir)
set SOLUTIONFILENAME=$(SolutionFileName)
set SOLUTIONNAME=$(SolutionName)
set SOLUTIONPATH=$(SolutionPath)
set TARGETDIR=$(TargetDir)
set TARGETEXT=$(TargetExt)
set TARGETFILENAME=$(TargetFileName)
set TARGETPATH=$(TargetPath)
set WEBKITCONFIGSUFFIX=$(WebKitConfigSuffix)
set WEBKITDLLCONFIGSUFFIX=$(WebKitDLLConfigSuffix)

REM If any of the above variables didn't exist previously and
REM were set to an empty string, set will set the errorlevel to 1,
REM which will cause the project-specific script to think the build
REM has failed. This cmd /c call will clear the errorlevel.
cmd /c

"$(ProjectDir)$(ProjectName)PreLink.cmd"
" + /> + <Tool Name="VCResourceCompilerTool" Culture="1033" AdditionalIncludeDirectories=""$(IntDir)\include"" /> - <UserMacro + <UserMacro Name="ProductionBuild" Value="$(PRODUCTION)" /> - <UserMacro + <UserMacro + Name="ConfigurationBuildDir" + Value="$(WebKitOutputDir)\$(ConfigurationName)" + /> + <UserMacro Name="AnalyzeWithLargeStack" Value="" /> diff --git a/WebKitLibraries/win/tools/vsprops/debug_wincairo.vsprops b/WebKitLibraries/win/tools/vsprops/debug_wincairo.vsprops index 7d424e6..c9f5722 100644 --- a/WebKitLibraries/win/tools/vsprops/debug_wincairo.vsprops +++ b/WebKitLibraries/win/tools/vsprops/debug_wincairo.vsprops @@ -1,34 +1,34 @@ -<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
- ProjectType="Visual C++"
- Version="8.00"
- Name="debug_wincairo"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="2"
- AdditionalIncludeDirectories=""$(WebKitLibrariesDir)\include\cairo""
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="2"
- AdditionalLibraryDirectories=""$(WebKitLibrariesDir)\lib""
- />
- <UserMacro
- Name="WebKitConfigSuffix"
- Value="_debug"
- PerformEnvironmentSet="true"
- />
- <UserMacro
- Name="LibraryConfigSuffix"
- Value=""
- PerformEnvironmentSet="true"
- />
- <UserMacro
- Name="WebKitDLLConfigSuffix"
- Value="_debug"
- />
-</VisualStudioPropertySheet>
+<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioPropertySheet + ProjectType="Visual C++" + Version="8.00" + Name="debug_wincairo" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="2" + AdditionalIncludeDirectories=""$(WebKitLibrariesDir)\include\cairo"" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="2" + AdditionalLibraryDirectories=""$(WebKitLibrariesDir)\lib"" + /> + <UserMacro + Name="WebKitConfigSuffix" + Value="_debug" + PerformEnvironmentSet="true" + /> + <UserMacro + Name="LibraryConfigSuffix" + Value="" + PerformEnvironmentSet="true" + /> + <UserMacro + Name="WebKitDLLConfigSuffix" + Value="_debug" + /> +</VisualStudioPropertySheet> diff --git a/WebKitLibraries/win/tools/vsprops/release.vsprops b/WebKitLibraries/win/tools/vsprops/release.vsprops index 8b38b73..6416e3f 100644 --- a/WebKitLibraries/win/tools/vsprops/release.vsprops +++ b/WebKitLibraries/win/tools/vsprops/release.vsprops @@ -18,10 +18,6 @@ OptimizeForWindows98="1" /> <Tool - Name="VCPreLinkEventTool" - CommandLine="if not exist "$(WebKitOutputDir)\public\sym" mkdir "$(WebKitOutputDir)\public\sym"" - /> - <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" /> |