diff options
| author | Steve Block <steveblock@google.com> | 2011-01-05 12:15:11 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-01-06 14:14:00 +0000 |
| commit | d06194330da2bb8da887d2e1adeacb3a5c1504b2 (patch) | |
| tree | e0af8413af65a8e30630563441af7bdb8478e513 /WebKitLibraries | |
| parent | 419a5cf2f8db6ca014df624865197ffb82caad37 (diff) | |
| download | external_webkit-d06194330da2bb8da887d2e1adeacb3a5c1504b2.zip external_webkit-d06194330da2bb8da887d2e1adeacb3a5c1504b2.tar.gz external_webkit-d06194330da2bb8da887d2e1adeacb3a5c1504b2.tar.bz2 | |
Merge WebKit at r72805: Initial merge by Git
Note that this is a backwards merge from Chromium release 9.0.600.0
to 9.0.597.0, to align with the Chromium 9 stable release branch.
Change-Id: I5d2bb4e8cee9d39ae8485abf48bdb55ecf8b3790
Diffstat (limited to 'WebKitLibraries')
| -rw-r--r-- | WebKitLibraries/ChangeLog | 64 | ||||
| -rw-r--r-- | WebKitLibraries/WebKitSystemInterface.h | 21 | ||||
| -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 | 14 | ||||
| -rw-r--r-- | WebKitLibraries/win/tools/vsprops/debug_wincairo.vsprops | 68 | ||||
| -rw-r--r-- | WebKitLibraries/win/tools/vsprops/release.vsprops | 4 |
7 files changed, 70 insertions, 161 deletions
diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog index 60cb1f6..5280178 100644 --- a/WebKitLibraries/ChangeLog +++ b/WebKitLibraries/ChangeLog @@ -1,67 +1,3 @@ -2010-12-01 Adam Roben <aroben@apple.com> - - Don't let harmless errorlevels from the "set" utility leak into - project-specific build scripts - - When using set to unset an environment variable that didn't previously - exist, set raises the errorlevel to 1. This was leaking into - project-specific scripts, causing them to think the build has failed. - We now clear the errorlevel after we finish setting environment - variables. - - Fixes <http://webkit.org/b/50350> Windows builds mysteriously fail in - some configurations - - Reviewed by Steve Falkenburg. - - * win/tools/vsprops/common.vsprops: Call "cmd /c" after setting - environment variables to get rid of any errorlevel that "set" set. - -2010-12-01 Steve Falkenburg <sfalken@apple.com> - - Reviewed by Adam Roben. - - vcproj changes can't be applied cleanly by the Windows EWS bot - https://bugs.webkit.org/show_bug.cgi?id=50328 - - * win/tools/vsprops/WinCairo.vsprops: Added property svn:eol-style. - * win/tools/vsprops/cURL.vsprops: Added property svn:eol-style. - * win/tools/vsprops/debug_wincairo.vsprops: Added property svn:eol-style. - -2010-11-29 Steve Falkenburg <sfalken@apple.com> - - Windows build fix (part 2). - Define Visual Studio internal variables used in pre-build/pre-link/post-build commands in environment for separated cmd files. - - * win/tools/vsprops/common.vsprops: - -2010-11-19 Steve Falkenburg <sfalken@apple.com> - - Reviewed by Adam Roben. - - Add a mechanism for Windows pre-build/pre-link/post-build events to be separated into individual cmd files - https://bugs.webkit.org/show_bug.cgi?id=49858 - - We're migrating our prebuild/prelink/postbuild steps out of vcproj and vsprops files: - - To simplify editing (editing vsprops build steps is confusing). - - For more readable diffs. - - To add a prebuild/prelink/postbuild step for a vcproj, - Add a new file named {ProjectName}PreBuild|PreLink|PostBuild.cmd to the project directory. - For example, a WTF prebuild script would be named WTFPreBuild.cmd and would be located - in the directory JavaScriptCore/JavaScriptCore.vcproj/WTF (alongside WTF.vcproj). - - * win/tools/vsprops/common.vsprops: - * win/tools/vsprops/release.vsprops: - -2010-11-29 Anders Carlsson <andersca@apple.com> - - Reviewed by Sam Weinig and Simon Fraser. - - WebKitSystemInterface.h piece of r72438. - - * WebKitSystemInterface.h: - 2010-11-22 Adam Roben <aroben@apple.com> Use paths relative to $WebKitVSPropsRedirectionDir to access shared .vsprops files diff --git a/WebKitLibraries/WebKitSystemInterface.h b/WebKitLibraries/WebKitSystemInterface.h index d135304..7ec07fb 100644 --- a/WebKitLibraries/WebKitSystemInterface.h +++ b/WebKitLibraries/WebKitSystemInterface.h @@ -143,7 +143,7 @@ CGAffineTransform WKGetUserToBaseCTM(CGContextRef); void WKGetGlyphsForCharacters(CGFontRef, const UniChar[], CGGlyph[], size_t); #else typedef void *WKGlyphVectorRef; -OSStatus WKConvertCharToGlyphs(void *styleGroup, const UniChar* characters, unsigned numCharacters, WKGlyphVectorRef glyphs); +OSStatus WKConvertCharToGlyphs(void *styleGroup, const UniChar *characters, unsigned numCharacters, WKGlyphVectorRef glyphs); OSStatus WKGetATSStyleGroup(ATSUStyle fontStyle, void **styleGroup); void WKReleaseStyleGroup(void *group); OSStatus WKInitializeGlyphVector(int count, WKGlyphVectorRef glyphs); @@ -336,25 +336,6 @@ void WKSyncSurfaceToView(NSView *view); CFIndex WKGetHyphenationLocationBeforeIndex(CFStringRef string, CFIndex index); #endif -#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD) -typedef enum { - WKSandboxExtensionTypeReadOnly, - WKSandboxExtensionTypeWriteOnly, - WKSandboxExtensionTypeReadWrite, -} WKSandboxExtensionType; -typedef struct __WKSandboxExtension *WKSandboxExtensionRef; - -WKSandboxExtensionRef WKSandboxExtensionCreate(const char* path, WKSandboxExtensionType type); -void WKSandboxExtensionDestroy(WKSandboxExtensionRef sandboxExtension); - -bool WKSandboxExtensionConsume(WKSandboxExtensionRef sandboxExtension); -bool WKSandboxExtensionInvalidate(WKSandboxExtensionRef sandboxExtension); - -const char* WKSandboxExtensionGetSerializedFormat(WKSandboxExtensionRef sandboxExtension, size_t* length); -WKSandboxExtensionRef WKSandboxExtensionCreateFromSerializedFormat(const char* serializationFormat, size_t length); - -#endif - #ifdef __cplusplus } #endif diff --git a/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops b/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops index 704cd7a..9710568 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 db7680a..3f06aa6 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 b787f6b..b9c710c 100644 --- a/WebKitLibraries/win/tools/vsprops/common.vsprops +++ b/WebKitLibraries/win/tools/vsprops/common.vsprops @@ -25,7 +25,7 @@ <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"" GenerateDebugInformation="true" @@ -40,18 +40,6 @@ 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 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 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 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"" diff --git a/WebKitLibraries/win/tools/vsprops/debug_wincairo.vsprops b/WebKitLibraries/win/tools/vsprops/debug_wincairo.vsprops index c9f5722..7d424e6 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 6416e3f..8b38b73 100644 --- a/WebKitLibraries/win/tools/vsprops/release.vsprops +++ b/WebKitLibraries/win/tools/vsprops/release.vsprops @@ -18,6 +18,10 @@ OptimizeForWindows98="1" /> <Tool + Name="VCPreLinkEventTool" + CommandLine="if not exist "$(WebKitOutputDir)\public\sym" mkdir "$(WebKitOutputDir)\public\sym"" + /> + <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" /> |