diff options
Diffstat (limited to 'WebKitLibraries')
| -rw-r--r-- | WebKitLibraries/ChangeLog | 120 | ||||
| -rw-r--r-- | WebKitLibraries/WebKitSystemInterface.h | 22 | ||||
| -rw-r--r-- | WebKitLibraries/libWebKitSystemInterfaceLeopard.a | bin | 1790264 -> 1878776 bytes | |||
| -rw-r--r-- | WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a | bin | 1488420 -> 1549884 bytes | |||
| -rw-r--r-- | WebKitLibraries/libWebKitSystemInterfaceTiger.a | bin | 872272 -> 905336 bytes | |||
| -rw-r--r-- | WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h | 5 | ||||
| -rw-r--r-- | WebKitLibraries/win/lib/WebKitSystemInterface.lib | bin | 134314 -> 167466 bytes | |||
| -rw-r--r-- | WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib | bin | 65782 -> 66330 bytes | |||
| -rw-r--r-- | WebKitLibraries/win/tools/scripts/PRODUCTVERSION | 1 | ||||
| -rwxr-xr-x | WebKitLibraries/win/tools/scripts/auto-version.sh | 29 | ||||
| -rw-r--r-- | WebKitLibraries/win/tools/vsprops/WinCairo.vsprops | 4 | ||||
| -rw-r--r-- | WebKitLibraries/win/tools/vsprops/common.vsprops | 2 | ||||
| -rw-r--r-- | WebKitLibraries/win/tools/vsprops/debug_wincairo.vsprops | 32 |
13 files changed, 196 insertions, 19 deletions
diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog index 66f1e38..6ad863d 100644 --- a/WebKitLibraries/ChangeLog +++ b/WebKitLibraries/ChangeLog @@ -1,3 +1,123 @@ +2009-10-05 Pierre d'Herbemont <pdherbemont@webkit.org> + + Reviewed by Simon Fraser + + Support fullscreen in MediaPlayer (Mac) + https://bugs.webkit.org/show_bug.cgi?id=26742 + + New methods required for video fullscreen. + + * WebKitSystemInterface.h: + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceSnowLeopard.a: + * libWebKitSystemInterfaceTiger.a: + +2009-10-02 Steve Falkenburg <sfalken@apple.com> + + Windows build fix. + Re-apply lost changes to auto-version.sh. + + * win/tools/scripts/auto-version.sh: + +2009-10-02 Eric Carlson <eric.carlson@apple.com> + + Reviewed by Adam Roben. + + <rdar://problem/7271334> + Rename MediaControllerThemeQT to MediaControllerThemeQuickTime + + * WebKitSystemInterface.h: + MediaControllerThemeQT -> MediaControllerThemeQuickTime + +2009-10-02 Steve Falkenburg <sfalken@apple.com> + + Reviewed by Mark Rowe. + + <https://bugs.webkit.org/show_bug.cgi?id=29989> + Safari version number shouldn't be exposed in WebKit code + + For a WebKit version of 532.3.4: + Product version is: 5.32.3.4 (was 4.0.3.0) + File version is: 5.32.3.4 (was 4.532.3.4) + + * win/tools/scripts/PRODUCTVERSION: Removed. + * win/tools/scripts/auto-version.sh: Re-worked script to remove references to PRODUCTVERSION. + +2009-09-25 Dan Bernstein <mitz@apple.com> + + Reviewed by Adam Roben. + + WebKitSystemInterface changes for + <rdar://problem/7211635> 2 byte characters are displayed as garbaged + <rdar://problem/7212626> garbled/gibberish text (off-by-one) + + * win/include/WebKitSystemInterface/WebKitSystemInterface.h: Added + wkAddFontsFromPlistRepresentation() and replaced + wkCreateFontsPlistRepresentation() with wkCreateFontsPlist() and + wkAddFontsFromPlistRepresentation() with wkAddFontsFromPlist(). + * win/lib/WebKitSystemInterface.lib: + * win/lib/WebKitSystemInterface_debug.lib: + +2009-09-23 Marshall Culpepper <mculpepper@appcelerator.com> + + Reviewed by Eric Seidel. + + Added $(WebKitLibrariesDir)/include/cairo so cairo.h is found by + default when the necessary dependencies are extracted into the + WebKitLibrariesDir. + https://bugs.webkit.org/show_bug.cgi?id=29661 + + * win/tools/vsprops/WinCairo.vsprops: + +2009-09-09 Brent Fulgham <bfulgham@webkit.org> + + Reviewed by Dave Levin. + + Adjust WinCairo-specific property sheet to use static versions of + libjpeg.lib and libpng.lib. Change to libpng.lib required addition + of zlib.lib to link. + + * win/tools/vsprops/WinCairo.vsprops: + +2009-08-28 Steve Falkenburg <sfalken@apple.com> + + Reviewed by Adam Roben. + + Define _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1 + to automatically use secure versions of C runtime lib calls on Windows. + https://bugs.webkit.org/show_bug.cgi?id=28824 + + * win/tools/vsprops/common.vsprops: + +2009-08-25 Brent Fulgham <bfulgham@webkit.org> + + Rubber stamped by Steve Falkenburg. + + debug_wincairo.vsprops was linking against wrong C runtime. + + * win/tools/vsprops/debug_wincairo.vsprops: Link to correct + C runtime (as in the standard 'debug.vsprops' file.) + +2009-08-24 Brent Fulgham <bfulgham@webkit.org> + + Reviewed by Steve Falkenburg. + + Revise CFLite Debug build to emit DLL's with _debug label. + https://bugs.webkit.org/show_bug.cgi?id=28695. + + * win/tools/vsprops/debug_wincairo.vsprops: Added. + +2009-08-12 Peter Kasting <pkasting@google.com> + + Reviewed by Darin Adler. + + https://bugs.webkit.org/show_bug.cgi?id=27323 + Change pattern that strips all trailing whitespace to just remove EOL + chars (\r, \n), to make it clear that varying EOL chars is the primary + problem being solved. + + * win/tools/scripts/auto-version.sh: + 2009-08-10 Peter Kasting <pkasting@google.com> Reviewed by George Staikos. diff --git a/WebKitLibraries/WebKitSystemInterface.h b/WebKitLibraries/WebKitSystemInterface.h index 0efa2f4..a97e635 100644 --- a/WebKitLibraries/WebKitSystemInterface.h +++ b/WebKitLibraries/WebKitSystemInterface.h @@ -216,7 +216,7 @@ typedef enum { typedef enum { WKMediaControllerThemeClassic = 1, - WKMediaControllerThemeQT = 2 + WKMediaControllerThemeQuickTime = 2 } WKMediaControllerThemeStyle; typedef enum { @@ -229,6 +229,21 @@ BOOL WKHitTestMediaUIPart(int part, int themeStyle, CGRect bounds, CGPoint point void WKMeasureMediaUIPart(int part, int themeStyle, CGRect *bounds, CGSize *naturalSize); void WKDrawMediaUIPart(int part, int themeStyle, CGContextRef context, CGRect rect, unsigned state); void WKDrawMediaSliderTrack(int themeStyle, CGContextRef context, CGRect rect, float timeLoaded, float currentTime, float duration, unsigned state); +NSView *WKCreateMediaUIBackgroundView(void); + +typedef enum { + WKMediaUIControlTimeline, + WKMediaUIControlSlider, + WKMediaUIControlPlayPauseButton, + WKMediaUIControlExitFullscreenButton, + WKMediaUIControlRewindButton, + WKMediaUIControlFastForwardButton, + WKMediaUIControlVolumeUpButton, + WKMediaUIControlVolumeDownButton + +} WKMediaUIControlType; + +NSControl *WKCreateMediaUIControl(int controlType); #if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && defined(__x86_64__) mach_port_t WKInitializeRenderServer(void); @@ -259,6 +274,11 @@ void WKSetCAAnimationValueFunction(CAPropertyAnimation*, NSString* function); unsigned WKInitializeMaximumHTTPConnectionCountPerHost(unsigned preferredConnectionCount); BOOL WKIsLatchingWheelEvent(NSEvent *); + +#ifndef BUILDING_ON_TIGER +void WKWindowSetAlpha(NSWindow *window, float alphaValue); +void WKWindowSetScaledFrame(NSWindow *window, NSRect scaleFrame, NSRect nonScaledFrame); +#endif #ifdef __cplusplus } diff --git a/WebKitLibraries/libWebKitSystemInterfaceLeopard.a b/WebKitLibraries/libWebKitSystemInterfaceLeopard.a Binary files differindex 1e9e637..60c8017 100644 --- a/WebKitLibraries/libWebKitSystemInterfaceLeopard.a +++ b/WebKitLibraries/libWebKitSystemInterfaceLeopard.a diff --git a/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a b/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a Binary files differindex 61daf46..a4b8ae7 100644 --- a/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a +++ b/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a diff --git a/WebKitLibraries/libWebKitSystemInterfaceTiger.a b/WebKitLibraries/libWebKitSystemInterfaceTiger.a Binary files differindex 83fa4dc..9ef1695 100644 --- a/WebKitLibraries/libWebKitSystemInterfaceTiger.a +++ b/WebKitLibraries/libWebKitSystemInterfaceTiger.a diff --git a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h index d2183d4..b5ce097 100644 --- a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h +++ b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h @@ -56,8 +56,9 @@ void wkSetFontPlatformInfo(CGFontRef, LOGFONT*, void(*)(void*)); void wkSetUpFontCache(size_t s); void wkAddFontsInDirectory(CFStringRef); void wkAddFontsAtPath(CFStringRef); -void wkAddFontsFromPlistRepresentation(CFDataRef); -CFDataRef wkCreateFontsPlistRepresentation(); +void wkAddFontsFromRegistry(); +void wkAddFontsFromPlist(CFPropertyListRef); +CFPropertyListRef wkCreateFontsPlist(); void wkSetPatternBaseCTM(CGContextRef, CGAffineTransform); void wkSetPatternPhaseInUserSpace(CGContextRef, CGPoint phasePoint); diff --git a/WebKitLibraries/win/lib/WebKitSystemInterface.lib b/WebKitLibraries/win/lib/WebKitSystemInterface.lib Binary files differindex 718f791..d4f9dd9 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 02b431a..6d18588 100644 --- a/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib +++ b/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib diff --git a/WebKitLibraries/win/tools/scripts/PRODUCTVERSION b/WebKitLibraries/win/tools/scripts/PRODUCTVERSION deleted file mode 100644 index aa31e71..0000000 --- a/WebKitLibraries/win/tools/scripts/PRODUCTVERSION +++ /dev/null @@ -1 +0,0 @@ -4.0.3
\ No newline at end of file diff --git a/WebKitLibraries/win/tools/scripts/auto-version.sh b/WebKitLibraries/win/tools/scripts/auto-version.sh index 06f7667..2e9a9ed 100755 --- a/WebKitLibraries/win/tools/scripts/auto-version.sh +++ b/WebKitLibraries/win/tools/scripts/auto-version.sh @@ -29,20 +29,12 @@ VERSIONPATH=$VERSIONPATH/include VERSIONFILE=$VERSIONPATH/autoversion.h mkdir -p "$VERSIONPATH" -PRODUCTVERSION=`cat $SRCPATH/PRODUCTVERSION | sed -r 's/(.*\S+)\s*$/\1/'` -MAJORVERSION=`echo "$PRODUCTVERSION" | sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\1/'` -MINORVERSION=`echo "$PRODUCTVERSION" | sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\2/'` -TINYVERSION=`echo "$PRODUCTVERSION" | sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\4/'` -if [ "$TINYVERSION" == "" ]; then - TINYVERSION=0 -fi - if [ "$RC_PROJECTSOURCEVERSION" == "" ]; then PROPOSEDVERSION=`cat $SRCPATH/VERSION` else PROPOSEDVERSION="$RC_PROJECTSOURCEVERSION" fi -PROPOSEDVERSION=`echo "$PROPOSEDVERSION" | sed -r 's/(.*\S+)\s*$/\1/'` +PROPOSEDVERSION=`echo "$PROPOSEDVERSION" | sed -r 's/(.+?)[\r\n]*$/\1/'` BLDMAJORVERSION=`echo "$PROPOSEDVERSION" | sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\1/'` BLDMINORVERSION=`echo "$PROPOSEDVERSION" | sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\3/'` @@ -53,25 +45,36 @@ fi if [ "$BLDVARIANTVERSION" == "" ]; then BLDVARIANTVERSION=0 fi -SVNOPENSOURCEREVISION=`svn info | grep '^Revision' | sed -r 's/^Revision: (.*\S+)\s*$/\1/'` +SVNOPENSOURCEREVISION=`svn info | grep '^Revision' | sed -r 's/^Revision: (.+?)[\r\n]*$/\1/'` + +MAJORVERSION=`echo "$PROPOSEDVERSION" | sed 's/\(.\)[^\.]*\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\1/'` +MINORVERSION=`echo "$PROPOSEDVERSION" | sed 's/.\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\1/'` +TINYVERSION=`echo "$PROPOSEDVERSION" | sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\3/'` +if [ "$MINORVERSION" == "" ]; then + MINORVERSION=0 +fi +if [ "$TINYVERSION" == "" ]; then + TINYVERSION=0 +fi BLDNMBR="$PROPOSEDVERSION" BLDNMBRSHORT="$BLDNMBR" if [ "$RC_PROJECTSOURCEVERSION" == "" ]; then BLDNMBRSHORT="$BLDNMBRSHORT+" - BLDUSERNAME=`echo "$(whoami)" | sed -r 's/(.*\S+)\s*$/\1/'` - BLDDATE=`echo "$(date)" | sed -r 's/(.*\S+)\s*$/\1/'` + BLDUSERNAME=`echo "$(whoami)" | sed -r 's/(.+?)[\r\n]*$/\1/'` + BLDDATE=`echo "$(date)" | sed -r 's/(.+?)[\r\n]*$/\1/'` BLDNMBR="$BLDNMBRSHORT $BLDUSERNAME - $BLDDATE - r$SVNOPENSOURCEREVISION" fi cat > "$VERSIONFILE" <<EOF -#define __VERSION_TEXT__ "$PRODUCTVERSION ($BLDNMBR)" +#define __VERSION_TEXT__ "$BLDNMBR" #define __BUILD_NUMBER__ "$BLDNMBR" #define __BUILD_NUMBER_SHORT__ "$BLDNMBRSHORT" #define __VERSION_MAJOR__ $MAJORVERSION #define __VERSION_MINOR__ $MINORVERSION #define __VERSION_TINY__ $TINYVERSION +#define __VERSION_BUILD__ $BLDVARIANTVERSION #define __BUILD_NUMBER_MAJOR__ $BLDMAJORVERSION #define __BUILD_NUMBER_MINOR__ $BLDMINORVERSION #define __BUILD_NUMBER_VARIANT__ $BLDVARIANTVERSION diff --git a/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops b/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops index f42c8ec..b3b1e4c 100644 --- a/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops +++ b/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops @@ -7,9 +7,11 @@ <Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="WIN_CAIRO=1"
+ AdditionalIncludeDirectories=""$(WebKitLibrariesDir)\include\cairo""
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="cairo.lib jpeg.lib libpng.lib"
+ AdditionalDependencies="cairo.lib libjpeg.lib zlib.lib libpng.lib"
+ AdditionalLibraryDirectories=""$(WebKitLibrariesDir)\lib""
/>
</VisualStudioPropertySheet>
diff --git a/WebKitLibraries/win/tools/vsprops/common.vsprops b/WebKitLibraries/win/tools/vsprops/common.vsprops index 4c7c9df..290db9a 100644 --- a/WebKitLibraries/win/tools/vsprops/common.vsprops +++ b/WebKitLibraries/win/tools/vsprops/common.vsprops @@ -9,7 +9,7 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/GS" - PreprocessorDefinitions="WIN32;_WINDOWS;WINVER=0x501;_WIN32_WINNT=0x501;_WIN32_IE=0x600;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;__PRODUCTION__=0$(ProductionBuild);_HAS_EXCEPTIONS=0;BUILDING_$(ProjectName)" + PreprocessorDefinitions="WIN32;_WINDOWS;WINVER=0x501;_WIN32_WINNT=0x501;_WIN32_IE=0x600;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;__PRODUCTION__=0$(ProductionBuild);_HAS_EXCEPTIONS=0;BUILDING_$(ProjectName)" ExceptionHandling="0" RuntimeTypeInfo="false" WarningLevel="4" diff --git a/WebKitLibraries/win/tools/vsprops/debug_wincairo.vsprops b/WebKitLibraries/win/tools/vsprops/debug_wincairo.vsprops new file mode 100644 index 0000000..0e7db13 --- /dev/null +++ b/WebKitLibraries/win/tools/vsprops/debug_wincairo.vsprops @@ -0,0 +1,32 @@ +<?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"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ LinkIncremental="2"
+ />
+ <UserMacro
+ Name="WebKitConfigSuffix"
+ Value="_debug"
+ PerformEnvironmentSet="true"
+ />
+ <UserMacro
+ Name="LibraryConfigSuffix"
+ Value=""
+ PerformEnvironmentSet="true"
+ />
+ <UserMacro
+ Name="WebKitDLLConfigSuffix"
+ Value="_debug"
+ />
+</VisualStudioPropertySheet>
|