diff options
| author | Ben Murdoch <benm@google.com> | 2010-08-11 14:44:44 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-08-12 19:15:41 +0100 |
| commit | dd8bb3de4f353a81954234999f1fea748aee2ea9 (patch) | |
| tree | 729b52bf09294f0d6c67cd5ea80aee1b727b7bd8 /WebKitLibraries/WebKitSystemInterface.h | |
| parent | f3d41ba51d86bf719c7a65ab5297aea3c17e2d98 (diff) | |
| download | external_webkit-dd8bb3de4f353a81954234999f1fea748aee2ea9.zip external_webkit-dd8bb3de4f353a81954234999f1fea748aee2ea9.tar.gz external_webkit-dd8bb3de4f353a81954234999f1fea748aee2ea9.tar.bz2 | |
Merge WebKit at r65072 : Initial merge by git.
Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585
Diffstat (limited to 'WebKitLibraries/WebKitSystemInterface.h')
| -rw-r--r-- | WebKitLibraries/WebKitSystemInterface.h | 14 |
1 files changed, 9 insertions, 5 deletions
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); |