From d06194330da2bb8da887d2e1adeacb3a5c1504b2 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Wed, 5 Jan 2011 12:15:11 +0000 Subject: 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 --- WebKitLibraries/ChangeLog | 64 -------------------- WebKitLibraries/WebKitSystemInterface.h | 21 +------ WebKitLibraries/win/tools/vsprops/WinCairo.vsprops | 34 +++++------ WebKitLibraries/win/tools/vsprops/cURL.vsprops | 26 ++++----- WebKitLibraries/win/tools/vsprops/common.vsprops | 14 +---- .../win/tools/vsprops/debug_wincairo.vsprops | 68 +++++++++++----------- WebKitLibraries/win/tools/vsprops/release.vsprops | 4 ++ 7 files changed, 70 insertions(+), 161 deletions(-) (limited to 'WebKitLibraries') 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 - - 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 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 - - 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 - - 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 - - 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 - - Reviewed by Sam Weinig and Simon Fraser. - - WebKitSystemInterface.h piece of r72438. - - * WebKitSystemInterface.h: - 2010-11-22 Adam Roben 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 @@ - - - - - + + + + + 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 @@ - - - - + + + + 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 @@ - - - - - - - - - - + + + + + + + + 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" /> + -- cgit v1.1