From dd8bb3de4f353a81954234999f1fea748aee2ea9 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Wed, 11 Aug 2010 14:44:44 +0100 Subject: Merge WebKit at r65072 : Initial merge by git. Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585 --- WebKitLibraries/ChangeLog | 30 +++++++++++++++++++++ WebKitLibraries/WebKitSystemInterface.h | 14 ++++++---- WebKitLibraries/libWebKitSystemInterfaceLeopard.a | Bin 1637632 -> 1637568 bytes .../libWebKitSystemInterfaceSnowLeopard.a | Bin 1347700 -> 1347668 bytes WebKitLibraries/libWebKitSystemInterfaceTiger.a | Bin 605256 -> 605224 bytes .../win/tools/vsprops/FeatureDefines.vsprops | 11 +++----- .../win/tools/vsprops/FeatureDefinesCairo.vsprops | 9 ++----- 7 files changed, 44 insertions(+), 20 deletions(-) (limited to 'WebKitLibraries') diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog index 5f626fd..3d603d9 100644 --- a/WebKitLibraries/ChangeLog +++ b/WebKitLibraries/ChangeLog @@ -1,3 +1,33 @@ +2010-08-05 Jian Li + + Reviewed by David Levin. + + Unify blob related feature defines to ENABLE(BLOB). + https://bugs.webkit.org/show_bug.cgi?id=43081 + + * win/tools/vsprops/FeatureDefines.vsprops: + * win/tools/vsprops/FeatureDefinesCairo.vsprops: + +2010-08-04 Dan Bernstein + + Reviewed by Darin Adler. + + WebKitSystemInterface part of: Allow the language for hyphenation to be specified + https://bugs.webkit.org/show_bug.cgi?id=43467 + + * WebKitSystemInterface.h: + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceSnowLeopard.a: + * libWebKitSystemInterfaceTiger.a: + +2010-08-03 Beth Dakin + + Reviewed by Alice Liu. + + Enable MathML on Windows. + + * win/tools/vsprops/FeatureDefines.vsprops: + 2010-07-30 Adam Roben Roll our r64361 and r64363 diff --git a/WebKitLibraries/WebKitSystemInterface.h b/WebKitLibraries/WebKitSystemInterface.h index 4f46719..8732d81 100644 --- a/WebKitLibraries/WebKitSystemInterface.h +++ b/WebKitLibraries/WebKitSystemInterface.h @@ -1,6 +1,6 @@ /* WebKitSystemInterface.h - Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. + Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. Public header file. */ @@ -210,8 +210,8 @@ typedef enum { WKMediaUIPartPlayButton, WKMediaUIPartSeekBackButton, WKMediaUIPartSeekForwardButton, - WKMediaUIPartSlider, - WKMediaUIPartSliderThumb, + WKMediaUIPartTimelineSlider, + WKMediaUIPartTimelineSliderThumb, WKMediaUIPartRewindButton, WKMediaUIPartSeekToRealtimeButton, WKMediaUIPartShowClosedCaptionsButton, @@ -220,7 +220,12 @@ typedef enum { WKMediaUIPartPauseButton, WKMediaUIPartBackground, WKMediaUIPartCurrentTimeDisplay, - WKMediaUIPartTimeRemainingDisplay + WKMediaUIPartTimeRemainingDisplay, + WKMediaUIPartStatusDisplay, + WKMediaUIPartControlsPanel, + WKMediaUIPartVolumeSliderContainer, + WKMediaUIPartVolumeSlider, + WKMediaUIPartVolumeSliderThumb } WKMediaUIPart; typedef enum { @@ -251,7 +256,6 @@ typedef enum { WKMediaUIControlFastForwardButton, WKMediaUIControlVolumeUpButton, WKMediaUIControlVolumeDownButton - } WKMediaUIControlType; NSControl *WKCreateMediaUIControl(int controlType); diff --git a/WebKitLibraries/libWebKitSystemInterfaceLeopard.a b/WebKitLibraries/libWebKitSystemInterfaceLeopard.a index 76c174a..fc5b8a0 100644 Binary files a/WebKitLibraries/libWebKitSystemInterfaceLeopard.a and b/WebKitLibraries/libWebKitSystemInterfaceLeopard.a differ diff --git a/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a b/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a index 6423601..dd6e22e 100644 Binary files a/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a and b/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a differ diff --git a/WebKitLibraries/libWebKitSystemInterfaceTiger.a b/WebKitLibraries/libWebKitSystemInterfaceTiger.a index abf266d..103eed6 100644 Binary files a/WebKitLibraries/libWebKitSystemInterfaceTiger.a and b/WebKitLibraries/libWebKitSystemInterfaceTiger.a differ diff --git a/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops b/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops index 104b479..73622e1 100644 --- a/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops +++ b/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops @@ -9,7 +9,7 @@ > @@ -77,11 +77,6 @@ PerformEnvironmentSet="true" /> - @@ -77,11 +77,6 @@ PerformEnvironmentSet="true" /> -