From d0825bca7fe65beaee391d30da42e937db621564 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Tue, 2 Feb 2010 14:57:50 +0000 Subject: Merge webkit.org at r54127 : Initial merge by git Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82 --- WebKitLibraries/ChangeLog | 167 ++++++++++++++++++++ WebKitLibraries/WebKitSystemInterface.h | 8 +- WebKitLibraries/libWebKitSystemInterfaceLeopard.a | Bin 2000440 -> 2524760 bytes .../libWebKitSystemInterfaceSnowLeopard.a | Bin 1625052 -> 2011036 bytes WebKitLibraries/libWebKitSystemInterfaceTiger.a | Bin 966704 -> 933152 bytes WebKitLibraries/win/bin/QuartzCoreInterface.dll | Bin 0 -> 27648 bytes .../QuartzCoreInterface/QuartzCoreInterface.h | 33 ++++ .../WebKitSystemInterface/WebKitSystemInterface.h | 4 +- WebKitLibraries/win/lib/QuartzCoreInterface.lib | Bin 0 -> 2496 bytes WebKitLibraries/win/lib/WebKitSystemInterface.lib | Bin 172868 -> 176088 bytes .../win/lib/WebKitSystemInterface_debug.lib | Bin 74364 -> 78858 bytes .../win/tools/scripts/feature-defines.sh | 31 ++++ .../win/tools/vsprops/FeatureDefines.vsprops | 174 +++++++++++++++++++++ .../win/tools/vsprops/FeatureDefinesCairo.vsprops | 174 +++++++++++++++++++++ WebKitLibraries/win/tools/vsprops/WinCairo.vsprops | 4 +- WebKitLibraries/win/tools/vsprops/common.vsprops | 2 +- 16 files changed, 592 insertions(+), 5 deletions(-) create mode 100755 WebKitLibraries/win/bin/QuartzCoreInterface.dll create mode 100644 WebKitLibraries/win/include/QuartzCoreInterface/QuartzCoreInterface.h create mode 100755 WebKitLibraries/win/lib/QuartzCoreInterface.lib create mode 100644 WebKitLibraries/win/tools/scripts/feature-defines.sh create mode 100644 WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops create mode 100644 WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops (limited to 'WebKitLibraries') diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog index a0f1cef..b4d72ac 100644 --- a/WebKitLibraries/ChangeLog +++ b/WebKitLibraries/ChangeLog @@ -1,3 +1,170 @@ +2010-01-29 Mark Rowe + + Keep the Windows feature defines in sync with FeatureDefines.xcconfig. + + * win/tools/vsprops/FeatureDefines.vsprops: + * win/tools/vsprops/FeatureDefinesCairo.vsprops: + +2010-01-26 Alexey Proskuryakov + + More Windows build fixing. + + * win/tools/vsprops/common.vsprops: Disable warning C4180 (qualifier applied to function + type has no meaning; ignored). This is a known bug - MSVC tries to compile a wrong + specialization sometimes - but it's not instantiated, so it's harmless. + +2010-01-22 Steve Falkenburg + + Reviewed by Darin Adler. + + https://bugs.webkit.org/show_bug.cgi?id=34025 + Enable client-based Geolocation abstraction for Mac, Windows AppleWebKit targets. + + * win/tools/vsprops/FeatureDefines.vsprops: + * win/tools/vsprops/FeatureDefinesCairo.vsprops: + +2010-01-20 Steve Falkenburg + + Reviewed by Darin Adler and Adam Roben. + + Feature defines are difficult to maintain on Windows builds + https://bugs.webkit.org/show_bug.cgi?id=33883 + + FeatureDefines.vsprops are now maintained in a way similar to + Configurations/FeatureDefines.xcconfig, with the added advantage + of having a single FeatureDefines file across all projects. + + Keep this list of features (not enabled/disabled state) in sync with + FeatureDefines.xcconfig files in JavaScriptCore, WebCore, and WebKit. + + Add new features to both PreprocessorDefinitions and UserMacro sections. + Set any ENABLE_FEATURE_NAME macro to an empty string to disable that feature. + + * win/tools/scripts/feature-defines.sh: Added. + * win/tools/vsprops/FeatureDefines.vsprops: Added. + * win/tools/vsprops/FeatureDefinesCairo.vsprops: Added. + * win/tools/vsprops/WinCairo.vsprops: Removed ENABLE_FILTERS. Now set in FeatureDefinesCairo.vsprops. + +2010-01-13 Simon Fraser + + Reviewed by Darin Adler. + + + + Expose new method on WebKitSystemInterface, WKGetUserToBaseCTM(), which will + be used for a shadow drawing fix. Once more, with feeling. On Windows. + + * win/include/WebKitSystemInterface/WebKitSystemInterface.h: + * win/lib/WebKitSystemInterface.lib: + * win/lib/WebKitSystemInterface_debug.lib: + +2010-01-13 Simon Fraser + + Reviewed by Darin Adler. + + + + Expose new method on WebKitSystemInterface, WKGetUserToBaseCTM(), which will + be used for a shadow drawing fix. + + * win/lib/WebKitSystemInterface.lib: + * win/lib/WebKitSystemInterface_debug.lib: + +2010-01-13 Simon Fraser + + Reviewed by Darin Adler. + + + + Expose new method on WebKitSystemInterface, WKGetUserToBaseCTM(), which will + be used for a shadow drawing fix. + + * WebKitSystemInterface.h: + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceSnowLeopard.a: + * libWebKitSystemInterfaceTiger.a: + +2010-01-07 Alexey Proskuryakov + + Not reviewed, build fix. + + Windows buid fix - disable warning 4251 (class needs to have dll-interface to be used by + clients of another class). WebCore doesn't use all methods of JSString, so + we don't export all classes clients could theoretically access via JSString. + + * win/tools/vsprops/common.vsprops: + +2009-12-21 Mark Rowe + + Reviewed by Samuel Weinig. + + Update WebKitSystemInterface. + + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceSnowLeopard.a: + * libWebKitSystemInterfaceTiger.a: + +2009-12-21 Mark Rowe + + Reviewed by Samuel Weinig. + + Update WebKitSystemInterface. + + * WebKitSystemInterface.h: + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceSnowLeopard.a: + * libWebKitSystemInterfaceTiger.a: + +2009-12-18 Sam Weinig + + Reviewed by Anders Carlsson. + + Update WebKitSystemInterface for . + + * WebKitSystemInterface.h: + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceSnowLeopard.a: + * libWebKitSystemInterfaceTiger.a: + +2009-12-15 Dan Bernstein + + Reviewed by Adam Roben. + + WebKitSystemInterface part of Use LOGFONT support in + Core Graphics when available + + * win/include/WebKitSystemInterface/WebKitSystemInterface.h: Declared + wkCanCreateCGFontWithLOGFONT(). + * win/lib/WebKitSystemInterface.lib: + * win/lib/WebKitSystemInterface_debug.lib: + +2009-12-12 Eric Carlson + + Reviewed by Darin Adler. + + Pull shared UI code into WebKit + + * WebKitSystemInterface.h: + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceSnowLeopard.a: + * libWebKitSystemInterfaceTiger.a: + +2009-12-11 Chris Marrin + + Reviewed by Adam Roben. + + Add QuartzCore build files to OpenSource tree + https://bugs.webkit.org/show_bug.cgi?id=31856 + + This allows proper building and linking with QuartzCore + when present. + + * win/bin: Added. + * win/bin/QuartzCoreInterface.dll: Added. + * win/include/QuartzCoreInterface: Added. + * win/include/QuartzCoreInterface/QuartzCoreInterface.h: Added. + * win/lib/QuartzCoreInterface.lib: Added. + 2009-12-07 Adam Roben Windows build fix for checkouts with a space in the path diff --git a/WebKitLibraries/WebKitSystemInterface.h b/WebKitLibraries/WebKitSystemInterface.h index f6234fe..ed68410 100644 --- a/WebKitLibraries/WebKitSystemInterface.h +++ b/WebKitLibraries/WebKitSystemInterface.h @@ -130,6 +130,7 @@ CFStringRef WKCopyFullFontName(CGFontRef font); void WKSetPatternBaseCTM(CGContextRef, CGAffineTransform); void WKSetPatternPhaseInUserSpace(CGContextRef, CGPoint); +CGAffineTransform WKGetUserToBaseCTM(CGContextRef); #ifndef BUILDING_ON_TIGER void WKGetGlyphsForCharacters(CGFontRef, const UniChar[], CGGlyph[], size_t); @@ -228,6 +229,7 @@ typedef enum { WKMediaControllerFlagDisabled = 1 << 0, WKMediaControllerFlagPressed = 1 << 1, WKMediaControllerFlagDrawEndCaps = 1 << 3, + WKMediaControllerFlagFocused = 1 << 4 } WKMediaControllerThemeState; BOOL WKMediaControllerThemeAvailable(int themeStyle); @@ -289,7 +291,11 @@ BOOL WKIsLatchingWheelEvent(NSEvent *); void WKWindowSetAlpha(NSWindow *window, float alphaValue); void WKWindowSetScaledFrame(NSWindow *window, NSRect scaleFrame, NSRect nonScaledFrame); #endif - + +#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) +NSMutableArray *WKNoteOpenPanelFiles(NSArray *paths); +#endif + #ifdef __cplusplus } #endif diff --git a/WebKitLibraries/libWebKitSystemInterfaceLeopard.a b/WebKitLibraries/libWebKitSystemInterfaceLeopard.a index 71f4659..a9d0480 100644 Binary files a/WebKitLibraries/libWebKitSystemInterfaceLeopard.a and b/WebKitLibraries/libWebKitSystemInterfaceLeopard.a differ diff --git a/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a b/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a index 6ecfb8b..3e3e1d7 100644 Binary files a/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a and b/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a differ diff --git a/WebKitLibraries/libWebKitSystemInterfaceTiger.a b/WebKitLibraries/libWebKitSystemInterfaceTiger.a index bd780bd..3dd651a 100644 Binary files a/WebKitLibraries/libWebKitSystemInterfaceTiger.a and b/WebKitLibraries/libWebKitSystemInterfaceTiger.a differ diff --git a/WebKitLibraries/win/bin/QuartzCoreInterface.dll b/WebKitLibraries/win/bin/QuartzCoreInterface.dll new file mode 100755 index 0000000..0b64349 Binary files /dev/null and b/WebKitLibraries/win/bin/QuartzCoreInterface.dll differ diff --git a/WebKitLibraries/win/include/QuartzCoreInterface/QuartzCoreInterface.h b/WebKitLibraries/win/include/QuartzCoreInterface/QuartzCoreInterface.h new file mode 100644 index 0000000..b3cef10 --- /dev/null +++ b/WebKitLibraries/win/include/QuartzCoreInterface/QuartzCoreInterface.h @@ -0,0 +1,33 @@ +/* + * Copyright (C) 2009 Apple Inc. All rights reserved. + */ + +#ifndef QuartzCoreInterface_h +#define QuartzCoreInterface_h + +#ifdef QUARTZCOREINTERFACE_EXPORTS +#define QUARTZCOREINTERFACE_API __declspec(dllexport) +#else +#define QUARTZCOREINTERFACE_API __declspec(dllimport) +#endif + +// Interface to give access to QuartzCore data symbols. +enum WKQCStringRefType { wkqckCACFLayer, wkqckCACFTransformLayer, wkqckCACFFilterLinear, wkqckCACFFilterNearest, + wkqckCACFFilterTrilinear, wkqckCACFFilterLanczos, wkqckCACFGravityCenter, wkqckCACFGravityTop, + wkqckCACFGravityBottom, wkqckCACFGravityLeft, wkqckCACFGravityRight, wkqckCACFGravityTopLeft, + wkqckCACFGravityTopRight, wkqckCACFGravityBottomLeft, wkqckCACFGravityBottomRight, + wkqckCACFGravityResize, wkqckCACFGravityResizeAspect, wkqckCACFGravityResizeAspectFill }; + +enum WKQCCARenderOGLCallbacksType { wkqckCARenderDX9Callbacks }; + +typedef const struct __CFString * CFStringRef; +typedef struct _CARenderOGLCallbacks CARenderOGLCallbacks; +typedef struct CATransform3D CATransform3D; + +extern "C" { +QUARTZCOREINTERFACE_API CFStringRef wkqcCFStringRef(WKQCStringRefType); +QUARTZCOREINTERFACE_API const CARenderOGLCallbacks* wkqcCARenderOGLCallbacks(WKQCCARenderOGLCallbacksType); +QUARTZCOREINTERFACE_API const CATransform3D& wkqcCATransform3DIdentity(); +} + +#endif // QuartzCoreInterface_h diff --git a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h index e3feae6..824b44d 100644 --- a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h +++ b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h @@ -58,6 +58,7 @@ void wkRestoreFontSmoothingStyle(CGContextRef cg, uint32_t oldStyle); void wkSetCGContextFontRenderingStyle(CGContextRef, bool isSystemFont, bool isPrinterFont, bool usePlatformNativeGlyphs); void wkGetGlyphAdvances(CGFontRef, const CGAffineTransform&, bool isSystemFont, bool isPrinterFont, CGGlyph, CGSize& advance); void wkGetGlyphs(CGFontRef, const UChar[], CGGlyph[], size_t count); +bool wkCanCreateCGFontWithLOGFONT(); void wkSetFontPlatformInfo(CGFontRef, LOGFONT*, void(*)(void*)); void wkSetUpFontCache(size_t s); void wkAddFontsInDirectory(CFStringRef); @@ -68,6 +69,7 @@ CFPropertyListRef wkCreateFontsPlist(); void wkSetPatternBaseCTM(CGContextRef, CGAffineTransform); void wkSetPatternPhaseInUserSpace(CGContextRef, CGPoint phasePoint); +CGAffineTransform wkGetUserToBaseCTM(CGContextRef); void wkDrawFocusRing(CGContextRef, CGColorRef, float radius); @@ -87,7 +89,7 @@ void wkSetCONNECTProxyForStream(CFReadStreamRef, CFStringRef proxyHost, CFNumber void wkSetCONNECTProxyAuthorizationForStream(CFReadStreamRef, CFStringRef proxyAuthorizationString); CFHTTPMessageRef wkCopyCONNECTProxyResponse(CFReadStreamRef, CFURLRef responseURL); -CFURLCredentialRef wkCopyCredentialFromCFPersistentStorage(CFURLProtectionSpaceRef); +CFURLCredentialRef wkCopyCredentialFromCFPersistentStorage(CFURLProtectionSpaceRef protectionSpace); CFStringRef wkCFNetworkErrorGetLocalizedDescription(CFIndex errorCode); diff --git a/WebKitLibraries/win/lib/QuartzCoreInterface.lib b/WebKitLibraries/win/lib/QuartzCoreInterface.lib new file mode 100755 index 0000000..0a556d3 Binary files /dev/null and b/WebKitLibraries/win/lib/QuartzCoreInterface.lib differ diff --git a/WebKitLibraries/win/lib/WebKitSystemInterface.lib b/WebKitLibraries/win/lib/WebKitSystemInterface.lib index 60d4e1e..f1857e7 100644 Binary files a/WebKitLibraries/win/lib/WebKitSystemInterface.lib and b/WebKitLibraries/win/lib/WebKitSystemInterface.lib differ diff --git a/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib b/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib index 56cbdcf..9722d97 100644 Binary files a/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib and b/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib differ diff --git a/WebKitLibraries/win/tools/scripts/feature-defines.sh b/WebKitLibraries/win/tools/scripts/feature-defines.sh new file mode 100644 index 0000000..71c3a9b --- /dev/null +++ b/WebKitLibraries/win/tools/scripts/feature-defines.sh @@ -0,0 +1,31 @@ +#!/usr/bin/bash + +# Copyright (C) 2010 Apple Inc. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY +# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +# DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY +# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +if [ "$2" = "cairo" ]; then + FeatureDefines=$1/tools/vsprops/FeatureDefinesCairo.vsprops +else + FeatureDefines=$1/tools/vsprops/FeatureDefines.vsprops +fi + +grep Value=\"ENABLE_ $FeatureDefines | sed 's/^.*Value\=\"/ /' | sed 's/\"//' | tr -d '\n' diff --git a/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops b/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops new file mode 100644 index 0000000..45495a3 --- /dev/null +++ b/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops @@ -0,0 +1,174 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops b/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops new file mode 100644 index 0000000..1c16a9b --- /dev/null +++ b/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops @@ -0,0 +1,174 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops b/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops index 1a8f4b2..60873a3 100644 --- a/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops +++ b/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops @@ -4,9 +4,9 @@ Version="8.00" Name="WinCairo" > -