Reviewed by NOBODY (OOPS!).
Mac OS X media controls should have a way to adjust volume incrementally
https://bugs.webkit.org/show_bug.cgi?id=41718
<rdar://problem/5679472>
* css/CSSPrimitiveValueMappings.h:
(WebCore::CSSPrimitiveValue::CSSPrimitiveValue): Handle MediaVolumeSliderMuteButtonPart.
* css/CSSSelector.cpp:
(WebCore::CSSSelector::pseudoId): Handle PseudoMediaControlsVolumeSliderMuteButton.
(WebCore::nameToPseudoTypeMap): Define mediaControlsVolumeSliderMuteButton.
(WebCore::CSSSelector::extractPseudoType): Handle PseudoMediaControlsVolumeSliderMuteButton.
* css/CSSSelector.h:
(WebCore::CSSSelector::): Define PseudoMediaControlsVolumeSliderMuteButton.
* css/CSSValueKeywords.in: Define media-volume-slider-mute-button.
* css/mediaControls.css:
(audio::-webkit-media-controls-volume-slider-mute-button, video::-webkit-media-controls-volume-slider-mute-button): New.
* css/mediaControlsQuickTime.css:
(audio::-webkit-media-controls-panel, video::-webkit-media-controls-panel): Add "overflow: visible"
so volume slider pop-up will be visible.
(audio::-webkit-media-controls-mute-button, video::-webkit-media-controls-mute-button): Make
mute button 14x12 instead of 15x14 so it matches the size in the volume slider.
(audio::-webkit-media-controls-volume-slider-container, video::-webkit-media-controls-volume-slider-container):
(audio::-webkit-media-controls-volume-slider, video::-webkit-media-controls-volume-slider):
(audio::-webkit-media-controls-volume-slider-mute-button, video::-webkit-media-controls-volume-slider-mute-button):
New.
* platform/ThemeTypes.h: Define MediaVolumeSliderMuteButtonPart.
* rendering/MediaControlElements.cpp:
(WebCore::MediaControlInputElement::MediaControlInputElement): Handle MEDIA_CONTROLS_VOLUME_SLIDER_MUTE_BUTTON.
(WebCore::MediaControlMuteButtonElement::MediaControlMuteButtonElement): Add ButtonLocation
parameter both mute buttons can be created.
(WebCore::MediaControlMuteButtonElement::create): Ditto.
* rendering/MediaControlElements.h: Define MediaVolumeSliderMuteButton and ButtonLocation.
* rendering/RenderMedia.cpp:
(WebCore::RenderMedia::styleDidChange): Update volume slider mute button.
(WebCore::RenderMedia::createMuteButton): Pass ButtonLocation parameter to MediaControlMuteButtonElement::create.
(WebCore::RenderMedia::createVolumeSliderMuteButton): New.
(WebCore::RenderMedia::updateControls): Deal with volume slider mute button.
(WebCore::RenderMedia::updateVolumeSliderContainer): Don't assume all ports want to position
the volume slider in the same place, call new volumeSliderOffsetFromMuteButton theme function.
(WebCore::RenderMedia::forwardEvent): Handle volume slider mute button.
* rendering/RenderMedia.h:
* rendering/RenderTheme.cpp:
(WebCore::RenderTheme::paint): Handle MediaVolumeSliderMuteButtonPart.
(WebCore::RenderTheme::volumeSliderOffsetFromMuteButton): New, return location previously hard
coded in RenderMedia::updateVolumeSliderContainer.
* rendering/RenderTheme.h:
* rendering/RenderThemeMac.h:
* rendering/RenderThemeMac.mm:
(WebCore::RenderThemeMac::adjustMediaSliderThumbSize): Deal with the volume slider thumb.
(WebCore::RenderThemeMac::paintMediaVolumeSliderContainer): New, call the WKSI paint function
for this button.
(WebCore::RenderThemeMac::paintMediaVolumeSliderTrack): Ditto.
(WebCore::RenderThemeMac::paintMediaVolumeSliderThumb): Ditto.
(WebCore::RenderThemeMac::shouldRenderMediaControlPart): Draw the volume slider parts when
using the new controller UI for a movie that has audio.
(WebCore::RenderThemeMac::volumeSliderOffsetFromMuteButton): New, position the volume slider
directly above the mute button.
* rendering/style/RenderStyleConstants.h: Define MEDIA_CONTROLS_VOLUME_SLIDER_MUTE_BUTTON.
2010-07-08 Eric Carlson <eric.carlson@apple.com>
Reviewed by Dan Bernstein.
Update WebKitSystemInterface.
* libWebKitSystemInterfaceLeopard.a:
* libWebKitSystemInterfaceSnowLeopard.a:
* libWebKitSystemInterfaceTiger.a:
2010-07-08 Eric Carlson <eric.carlson@apple.com>
Reviewed by Dan Bernstein.
Mac OS X media controls should have a way to adjust volume incrementally
https://bugs.webkit.org/show_bug.cgi?id=41718
<rdar://problem/5679472>
Updated results for the mute button size change. Remove some Leopard test results
where the SnowLeopard results are identical.
* platform/mac-leopard/media/audio-controls-rendering-expected.checksum: Removed.
* platform/mac-leopard/media/audio-controls-rendering-expected.png: Removed.
* platform/mac-leopard/media/audio-controls-rendering-expected.txt: Removed.
* platform/mac-leopard/media/controls-after-reload-expected.checksum: Removed.
* platform/mac-leopard/media/controls-after-reload-expected.png: Removed.
* platform/mac-leopard/media/controls-after-reload-expected.txt: Removed.
* platform/mac-leopard/media/controls-styling-expected.checksum: Removed.
* platform/mac-leopard/media/controls-styling-expected.png: Removed.
* platform/mac-leopard/media/controls-styling-expected.txt: Removed.
* platform/mac-leopard/media/video-zoom-controls-expected.checksum: Removed.
* platform/mac-leopard/media/video-zoom-controls-expected.png: Removed.
* platform/mac-leopard/media/video-zoom-controls-expected.txt: Removed.
* platform/mac/media/audio-controls-rendering-expected.txt:
* platform/mac/media/controls-after-reload-expected.txt:
* platform/mac/media/controls-styling-expected.txt:
* platform/mac/media/video-zoom-controls-expected.txt:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@62821
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
+2010-07-08 Eric Carlson <eric.carlson@apple.com>
+
+ Reviewed by Dan Bernstein.
+
+ Mac OS X media controls should have a way to adjust volume incrementally
+ https://bugs.webkit.org/show_bug.cgi?id=41718
+ <rdar://problem/5679472>
+
+ Updated results for the mute button size change. Remove some Leopard test results
+ where the SnowLeopard results are identical.
+
+ * platform/mac-leopard/media/audio-controls-rendering-expected.checksum: Removed.
+ * platform/mac-leopard/media/audio-controls-rendering-expected.png: Removed.
+ * platform/mac-leopard/media/audio-controls-rendering-expected.txt: Removed.
+ * platform/mac-leopard/media/controls-after-reload-expected.txt:
+ * platform/mac-leopard/media/controls-strict-expected.txt:
+ * platform/mac-leopard/media/controls-styling-expected.txt:
+ * platform/mac-leopard/media/video-controls-rendering-expected.txt:
+ * platform/mac-leopard/media/video-display-toggle-expected.txt:
+ * platform/mac-leopard/media/video-zoom-controls-expected.txt:
+ * platform/mac/media/audio-controls-rendering-expected.txt:
+ * platform/mac/media/controls-after-reload-expected.txt:
+ * platform/mac/media/controls-styling-expected.txt:
+ * platform/mac/media/video-zoom-controls-expected.txt:
+
2010-07-07 Ojan Vafai <ojan@chromium.org>
Reviewed by Darin Adler.
+++ /dev/null
-23d92921001dcac799a7bf70535f0723
\ No newline at end of file
+++ /dev/null
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {P} at (0,0) size 784x18
- RenderText {#text} at (0,0) size 153x18
- text run at (0,0) width 153: "Test controls placement."
- RenderBlock (anonymous) at (0,34) size 784x104
- RenderMedia {AUDIO} at (0,0) size 200x25 [bgcolor=#0000FF]
- RenderBR {BR} at (200,25) size 0x0
- RenderBR {BR} at (0,25) size 0x18
- RenderMedia {AUDIO} at (0,43) size 320x25 [bgcolor=#0000FF]
- RenderBR {BR} at (320,68) size 0x0
- RenderBR {BR} at (0,68) size 0x18
- RenderBR {BR} at (0,86) size 0x18
-layer at (8,42) size 200x25
- RenderBlock (relative positioned) {DIV} at (0,0) size 200x25
-layer at (8,42) size 200x25
- RenderFlexibleBox (positioned) {DIV} at (0,0) size 200x25
- RenderButton {INPUT} at (6,3) size 18x18
- RenderButton {INPUT} at (32,4) size 16x16
- RenderFlexibleBox {DIV} at (49,1) size 126x22
- RenderSlider {INPUT} at (0,5) size 126x13
- RenderBlock {DIV} at (0,2) size 10x8
- RenderButton {INPUT} at (177,5) size 15x14
-layer at (8,85) size 320x25
- RenderBlock (relative positioned) {DIV} at (0,0) size 320x25
-layer at (8,85) size 320x25
- RenderFlexibleBox (positioned) {DIV} at (0,0) size 320x25
- RenderButton {INPUT} at (6,3) size 18x18
- RenderButton {INPUT} at (32,4) size 16x16
- RenderFlexibleBox {DIV} at (49,5) size 246x15
- RenderSlider {INPUT} at (45,2) size 156x13
- RenderBlock {DIV} at (0,2) size 10x8
- RenderButton {INPUT} at (297,5) size 15x14
-layer at (57,92) size 45x11
- RenderFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
- RenderBlock (anonymous) at (9,0) size 26x11
- RenderText {#text} at (0,0) size 26x11
- text run at (0,0) width 26: "00:00"
-layer at (258,92) size 45x11
- RenderFlexibleBox {DIV} at (201,2) size 45x11 [color=#FFFFFF]
- RenderBlock (anonymous) at (6,0) size 32x11
- RenderText {#text} at (0,0) size 32x11
- text run at (0,0) width 32: "-00:07"
-layer at (8,128) size 320x100
- RenderMedia {AUDIO} at (8,128) size 320x100 [bgcolor=#0000FF]
-layer at (8,128) size 320x100
- RenderBlock (relative positioned) {DIV} at (0,0) size 320x100
-layer at (8,203) size 320x25
- RenderFlexibleBox (positioned) {DIV} at (0,75) size 320x25
- RenderButton {INPUT} at (6,3) size 18x18
- RenderButton {INPUT} at (32,4) size 16x16
- RenderFlexibleBox {DIV} at (49,5) size 246x15
- RenderSlider {INPUT} at (45,2) size 156x13
- RenderBlock {DIV} at (0,2) size 10x8
- RenderButton {INPUT} at (297,5) size 15x14
-layer at (57,210) size 45x11
- RenderFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
- RenderBlock (anonymous) at (9,0) size 26x11
- RenderText {#text} at (0,0) size 26x11
- text run at (0,0) width 26: "00:00"
-layer at (258,210) size 45x11
- RenderFlexibleBox {DIV} at (201,2) size 45x11 [color=#FFFFFF]
- RenderBlock (anonymous) at (6,0) size 32x11
- RenderText {#text} at (0,0) size 32x11
- text run at (0,0) width 32: "-00:07"
RenderFlexibleBox {DIV} at (49,5) size 246x15
RenderSlider {INPUT} at (45,2) size 156x13
RenderBlock {DIV} at (0,2) size 10x8
- RenderButton {INPUT} at (297,5) size 15x14
+ RenderButton {INPUT} at (297,6) size 14x12
layer at (57,264) size 45x11
RenderFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
RenderBlock (anonymous) at (9,0) size 26x11
RenderFlexibleBox {DIV} at (49,5) size 246x15
RenderSlider {INPUT} at (45,2) size 156x13
RenderBlock {DIV} at (0,2) size 10x8
- RenderButton {INPUT} at (297,5) size 15x14
+ RenderButton {INPUT} at (297,6) size 14x12
layer at (57,272) size 45x11
RenderFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
RenderBlock (anonymous) at (9,0) size 26x11
RenderFlexibleBox {DIV} at (49,5) size 246x15
RenderSlider {INPUT} at (45,2) size 156x13
RenderBlock {DIV} at (0,2) size 10x8
- RenderButton {INPUT} at (297,5) size 15x14
+ RenderButton {INPUT} at (297,6) size 14x12
layer at (67,264) size 45x11
RenderFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
RenderBlock (anonymous) at (9,0) size 26x11
RenderFlexibleBox {DIV} at (49,5) size 246x15
RenderSlider {INPUT} at (45,2) size 156x13
RenderBlock {DIV} at (0,2) size 10x8
- RenderButton {INPUT} at (297,5) size 15x14
+ RenderButton {INPUT} at (297,6) size 14x12
layer at (57,504) size 45x11
RenderFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
RenderBlock (anonymous) at (9,0) size 26x11
RenderFlexibleBox {DIV} at (49,5) size 246x15
RenderSlider {INPUT} at (45,2) size 156x13
RenderBlock {DIV} at (0,2) size 10x8
- RenderButton {INPUT} at (297,5) size 15x14
+ RenderButton {INPUT} at (297,6) size 14x12
layer at (57,264) size 45x11
RenderFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
RenderBlock (anonymous) at (9,0) size 26x11
RenderFlexibleBox {DIV} at (49,5) size 246x15
RenderSlider {INPUT} at (45,2) size 156x13
RenderBlock {DIV} at (0,2) size 10x8
- RenderButton {INPUT} at (297,5) size 15x14
+ RenderButton {INPUT} at (297,6) size 14x12
layer at (57,504) size 45x11
RenderFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
RenderBlock (anonymous) at (9,0) size 26x11
RenderFlexibleBox {DIV} at (49,5) size 246x15
RenderSlider {INPUT} at (45,2) size 156x13
RenderBlock {DIV} at (0,2) size 10x8
- RenderButton {INPUT} at (297,5) size 15x14
+ RenderButton {INPUT} at (297,6) size 14x12
layer at (57,744) size 45x11
RenderFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
RenderBlock (anonymous) at (9,0) size 26x11
RenderFlexibleBox {DIV} at (49,5) size 246x15
RenderSlider {INPUT} at (45,2) size 156x13
RenderBlock {DIV} at (0,2) size 10x8
- RenderButton {INPUT} at (297,5) size 15x14
+ RenderButton {INPUT} at (297,6) size 14x12
layer at (57,248) size 45x11
RenderFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
RenderBlock (anonymous) at (9,0) size 26x11
RenderFlexibleBox {DIV} at (73,1) size 130x34
RenderSlider {INPUT} at (0,9) size 130x19
RenderBlock {DIV} at (0,3) size 15x12
- RenderButton {INPUT} at (206,8) size 22x21
+ RenderButton {INPUT} at (206,9) size 21x18
layer at (57,310) size 240x180
RenderVideo {VIDEO} at (45,298) size 240x180
layer at (57,310) size 240x180
RenderFlexibleBox {DIV} at (73,1) size 130x34
RenderSlider {INPUT} at (0,9) size 130x19
RenderBlock {DIV} at (0,3) size 15x12
- RenderButton {INPUT} at (206,8) size 22x21
+ RenderButton {INPUT} at (206,9) size 21x18
RenderFlexibleBox {DIV} at (49,1) size 126x22
RenderSlider {INPUT} at (0,5) size 126x13
RenderBlock {DIV} at (0,2) size 10x8
- RenderButton {INPUT} at (177,5) size 15x14
+ RenderButton {INPUT} at (177,6) size 14x12
layer at (8,85) size 320x25
RenderBlock (relative positioned) {DIV} at (0,0) size 320x25
layer at (8,85) size 320x25
RenderFlexibleBox {DIV} at (49,5) size 246x15
RenderSlider {INPUT} at (45,2) size 156x13
RenderBlock {DIV} at (0,2) size 10x8
- RenderButton {INPUT} at (297,5) size 15x14
+ RenderButton {INPUT} at (297,6) size 14x12
layer at (57,92) size 45x11
RenderFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
RenderBlock (anonymous) at (9,0) size 26x11
RenderFlexibleBox {DIV} at (49,5) size 246x15
RenderSlider {INPUT} at (45,2) size 156x13
RenderBlock {DIV} at (0,2) size 10x8
- RenderButton {INPUT} at (297,5) size 15x14
+ RenderButton {INPUT} at (297,6) size 14x12
layer at (57,210) size 45x11
RenderFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
RenderBlock (anonymous) at (9,0) size 26x11
RenderSlider {INPUT} at (45,2) size 126x13
RenderBlock {DIV} at (0,2) size 10x8
RenderButton {INPUT} at (297,4) size 16x16
- RenderButton {INPUT} at (267,5) size 15x14
+ RenderButton {INPUT} at (267,6) size 14x12
layer at (57,264) size 45x11
RenderFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
RenderBlock (anonymous) at (9,0) size 26x11
RenderSlider {INPUT} at (45,2) size 126x13
RenderBlock {DIV} at (0,2) size 10x8
RenderButton {INPUT} at (297,4) size 16x16
- RenderButton {INPUT} at (267,5) size 15x14
+ RenderButton {INPUT} at (267,6) size 14x12
layer at (67,264) size 45x11
RenderFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
RenderBlock (anonymous) at (9,0) size 26x11
RenderSlider {INPUT} at (45,2) size 126x13
RenderBlock {DIV} at (0,2) size 10x8
RenderButton {INPUT} at (297,4) size 16x16
- RenderButton {INPUT} at (267,5) size 15x14
+ RenderButton {INPUT} at (267,6) size 14x12
layer at (57,504) size 45x11
RenderFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
RenderBlock (anonymous) at (9,0) size 26x11
RenderSlider {INPUT} at (0,9) size 86x19
RenderBlock {DIV} at (0,3) size 15x12
RenderButton {INPUT} at (206,6) size 24x24
- RenderButton {INPUT} at (162,8) size 22x21
+ RenderButton {INPUT} at (162,9) size 21x18
layer at (57,310) size 240x180
RenderVideo {VIDEO} at (45,298) size 240x180
layer at (57,310) size 240x180
RenderSlider {INPUT} at (0,9) size 86x19
RenderBlock {DIV} at (0,3) size 15x12
RenderButton {INPUT} at (206,6) size 24x24
- RenderButton {INPUT} at (162,8) size 22x21
+ RenderButton {INPUT} at (162,9) size 21x18
+2010-07-08 Eric Carlson <eric.carlson@apple.com>
+
+ Reviewed by Dan Bernstein.
+
+ Mac OS X media controls should have a way to adjust volume incrementally
+ https://bugs.webkit.org/show_bug.cgi?id=41718
+ <rdar://problem/5679472>
+
+ * css/CSSPrimitiveValueMappings.h:
+ (WebCore::CSSPrimitiveValue::CSSPrimitiveValue): Handle MediaVolumeSliderMuteButtonPart.
+
+ * css/CSSSelector.cpp:
+ (WebCore::CSSSelector::pseudoId): Handle PseudoMediaControlsVolumeSliderMuteButton.
+ (WebCore::nameToPseudoTypeMap): Define mediaControlsVolumeSliderMuteButton.
+ (WebCore::CSSSelector::extractPseudoType): Handle PseudoMediaControlsVolumeSliderMuteButton.
+
+ * css/CSSSelector.h:
+ (WebCore::CSSSelector::): Define PseudoMediaControlsVolumeSliderMuteButton.
+
+ * css/CSSValueKeywords.in: Define media-volume-slider-mute-button.
+
+ * css/mediaControls.css:
+ (audio::-webkit-media-controls-volume-slider-mute-button, video::-webkit-media-controls-volume-slider-mute-button): New.
+
+ * css/mediaControlsQuickTime.css:
+ (audio::-webkit-media-controls-panel, video::-webkit-media-controls-panel): Add "overflow: visible"
+ so volume slider pop-up will be visible.
+
+ (audio::-webkit-media-controls-mute-button, video::-webkit-media-controls-mute-button): Make
+ mute button 14x12 instead of 15x14 so it matches the size in the volume slider.
+
+ (audio::-webkit-media-controls-volume-slider-container, video::-webkit-media-controls-volume-slider-container):
+ (audio::-webkit-media-controls-volume-slider, video::-webkit-media-controls-volume-slider):
+ (audio::-webkit-media-controls-volume-slider-mute-button, video::-webkit-media-controls-volume-slider-mute-button):
+ New.
+
+ * platform/ThemeTypes.h: Define MediaVolumeSliderMuteButtonPart.
+
+ * rendering/MediaControlElements.cpp:
+ (WebCore::MediaControlInputElement::MediaControlInputElement): Handle MEDIA_CONTROLS_VOLUME_SLIDER_MUTE_BUTTON.
+ (WebCore::MediaControlMuteButtonElement::MediaControlMuteButtonElement): Add ButtonLocation
+ parameter both mute buttons can be created.
+ (WebCore::MediaControlMuteButtonElement::create): Ditto.
+
+ * rendering/MediaControlElements.h: Define MediaVolumeSliderMuteButton and ButtonLocation.
+
+ * rendering/RenderMedia.cpp:
+ (WebCore::RenderMedia::styleDidChange): Update volume slider mute button.
+ (WebCore::RenderMedia::createMuteButton): Pass ButtonLocation parameter to MediaControlMuteButtonElement::create.
+ (WebCore::RenderMedia::createVolumeSliderMuteButton): New.
+ (WebCore::RenderMedia::updateControls): Deal with volume slider mute button.
+ (WebCore::RenderMedia::updateVolumeSliderContainer): Don't assume all ports want to position
+ the volume slider in the same place, call new volumeSliderOffsetFromMuteButton theme function.
+ (WebCore::RenderMedia::forwardEvent): Handle volume slider mute button.
+ * rendering/RenderMedia.h:
+
+ * rendering/RenderTheme.cpp:
+ (WebCore::RenderTheme::paint): Handle MediaVolumeSliderMuteButtonPart.
+ (WebCore::RenderTheme::volumeSliderOffsetFromMuteButton): New, return location previously hard
+ coded in RenderMedia::updateVolumeSliderContainer.
+ * rendering/RenderTheme.h:
+
+ * rendering/RenderThemeMac.h:
+ * rendering/RenderThemeMac.mm:
+ (WebCore::RenderThemeMac::adjustMediaSliderThumbSize): Deal with the volume slider thumb.
+ (WebCore::RenderThemeMac::paintMediaVolumeSliderContainer): New, call the WKSI paint function
+ for this button.
+ (WebCore::RenderThemeMac::paintMediaVolumeSliderTrack): Ditto.
+ (WebCore::RenderThemeMac::paintMediaVolumeSliderThumb): Ditto.
+ (WebCore::RenderThemeMac::shouldRenderMediaControlPart): Draw the volume slider parts when
+ using the new controller UI for a movie that has audio.
+ (WebCore::RenderThemeMac::volumeSliderOffsetFromMuteButton): New, position the volume slider
+ directly above the mute button.
+
+ * rendering/style/RenderStyleConstants.h: Define MEDIA_CONTROLS_VOLUME_SLIDER_MUTE_BUTTON.
+
2010-07-08 Antonio Gomes <tonikitoo@webkit.org>
Unreviewed complementary fix for r62815
case MediaVolumeSliderPart:
m_value.ident = CSSValueMediaVolumeSlider;
break;
+ case MediaVolumeSliderMuteButtonPart:
+ m_value.ident = CSSValueMediaVolumeSliderMuteButton;
+ break;
case MediaVolumeSliderThumbPart:
m_value.ident = CSSValueMediaVolumeSliderthumb;
break;
* 1999 Waldo Bastian (bastian@kde.org)
* 2001 Andreas Schlapbach (schlpbch@iam.unibe.ch)
* 2001-2003 Dirk Mueller (mueller@kde.org)
- * Copyright (C) 2002, 2006, 2007, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2002, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
* Copyright (C) 2008 David Smith (catfish.man@gmail.com)
* Copyright (C) 2010 Google Inc. All rights reserved.
*
return MEDIA_CONTROLS_TIMELINE;
case PseudoMediaControlsVolumeSlider:
return MEDIA_CONTROLS_VOLUME_SLIDER;
+ case PseudoMediaControlsVolumeSliderMuteButton:
+ return MEDIA_CONTROLS_VOLUME_SLIDER_MUTE_BUTTON;
case PseudoMediaControlsSeekBackButton:
return MEDIA_CONTROLS_SEEK_BACK_BUTTON;
case PseudoMediaControlsSeekForwardButton:
DEFINE_STATIC_LOCAL(AtomicString, mediaControlsPlayButton, ("-webkit-media-controls-play-button"));
DEFINE_STATIC_LOCAL(AtomicString, mediaControlsTimeline, ("-webkit-media-controls-timeline"));
DEFINE_STATIC_LOCAL(AtomicString, mediaControlsVolumeSlider, ("-webkit-media-controls-volume-slider"));
+ DEFINE_STATIC_LOCAL(AtomicString, mediaControlsVolumeSliderMuteButton, ("-webkit-media-controls-volume-slider-mute-button"));
DEFINE_STATIC_LOCAL(AtomicString, mediaControlsSeekBackButton, ("-webkit-media-controls-seek-back-button"));
DEFINE_STATIC_LOCAL(AtomicString, mediaControlsSeekForwardButton, ("-webkit-media-controls-seek-forward-button"));
DEFINE_STATIC_LOCAL(AtomicString, mediaControlsRewindButton, ("-webkit-media-controls-rewind-button"));
nameToPseudoType->set(mediaControlsTimeRemainingDisplay.impl(), CSSSelector::PseudoMediaControlsTimeRemainingDisplay);
nameToPseudoType->set(mediaControlsTimeline.impl(), CSSSelector::PseudoMediaControlsTimeline);
nameToPseudoType->set(mediaControlsVolumeSlider.impl(), CSSSelector::PseudoMediaControlsVolumeSlider);
+ nameToPseudoType->set(mediaControlsVolumeSliderMuteButton.impl(), CSSSelector::PseudoMediaControlsVolumeSliderMuteButton);
nameToPseudoType->set(mediaControlsSeekBackButton.impl(), CSSSelector::PseudoMediaControlsSeekBackButton);
nameToPseudoType->set(mediaControlsSeekForwardButton.impl(), CSSSelector::PseudoMediaControlsSeekForwardButton);
nameToPseudoType->set(mediaControlsRewindButton.impl(), CSSSelector::PseudoMediaControlsRewindButton);
case PseudoMediaControlsTimeRemainingDisplay:
case PseudoMediaControlsTimeline:
case PseudoMediaControlsVolumeSlider:
+ case PseudoMediaControlsVolumeSliderMuteButton:
case PseudoMediaControlsSeekBackButton:
case PseudoMediaControlsSeekForwardButton:
case PseudoMediaControlsRewindButton:
/*
* Copyright (C) 1999-2003 Lars Knoll (knoll@kde.org)
* 1999 Waldo Bastian (bastian@kde.org)
- * Copyright (C) 2004, 2006, 2007, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2004, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
PseudoMediaControlsPlayButton,
PseudoMediaControlsTimelineContainer,
PseudoMediaControlsVolumeSliderContainer,
+ PseudoMediaControlsVolumeSliderMuteButton,
PseudoMediaControlsCurrentTimeDisplay,
PseudoMediaControlsTimeRemainingDisplay,
PseudoMediaControlsToggleClosedCaptions,
media-volume-slider-container
media-volume-slider
media-volume-sliderthumb
+media-volume-slider-mute-button
media-controls-background
media-current-time-display
media-time-remaining-display
/*
- * Copyright (C) 2009 Apple Inc. All rights reserved.
+ * Copyright (C) 2009, 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
width: 16px;
height: 16px;
}
+
+audio::-webkit-media-controls-volume-slider-mute-button, video::-webkit-media-controls-volume-slider-mute-button {
+ -webkit-appearance: media-volume-slider-mute-button;
+ display: none;
+}
/*
- * Copyright (C) 2009 Apple Inc. All rights reserved.
+ * Copyright (C) 2009, 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
audio::-webkit-media-controls-panel, video::-webkit-media-controls-panel {
/* In mediaControls.css */
-webkit-appearance: media-controls-background;
+ overflow: visible;
height: 25px;
}
audio::-webkit-media-controls-mute-button, video::-webkit-media-controls-mute-button {
-webkit-box-ordinal-group: 2; /* Before the fullscreen button */
- width: 15px;
- height: 14px;
+
+ width: 14px;
+ height: 12px;
margin-left: 2px;
- margin-right: 8px;
+ margin-right: 9px;
}
audio::-webkit-media-controls-play-button, video::-webkit-media-controls-play-button {
margin-right: 7px;
-webkit-box-ordinal-group: 3; /* between mute and fullscreen */
}
+
+audio::-webkit-media-controls-volume-slider-container, video::-webkit-media-controls-volume-slider-container {
+ -webkit-appearance: media-volume-slider-container;
+ position: absolute;
+
+ top: 0;
+ left: 0;
+
+ width: 22px;
+ height: 114px;
+}
+
+audio::-webkit-media-controls-volume-slider, video::-webkit-media-controls-volume-slider {
+ -webkit-appearance: media-volume-slider;
+ display: inline;
+ position: absolute;
+
+ top: 7px;
+ left: 6px;
+
+ width: 10px;
+ height: 80px;
+}
+
+audio::-webkit-media-controls-volume-slider-mute-button, video::-webkit-media-controls-volume-slider-mute-button {
+ -webkit-appearance: media-volume-slider-mute-button;
+ display: inline;
+ position: absolute;
+
+ bottom: 5px;
+ left: 4px;
+
+ width: 14px;
+ height: 12px;
+}
/*
- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
+ * Copyright (C) 2008, 2009, 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
MediaFullscreenButtonPart, MediaMuteButtonPart, MediaPlayButtonPart, MediaSeekBackButtonPart,
MediaSeekForwardButtonPart, MediaRewindButtonPart, MediaReturnToRealtimeButtonPart, MediaToggleClosedCaptionsButtonPart,
MediaSliderPart, MediaSliderThumbPart, MediaVolumeSliderContainerPart, MediaVolumeSliderPart, MediaVolumeSliderThumbPart,
- MediaControlsBackgroundPart, MediaCurrentTimePart, MediaTimeRemainingPart,
+ MediaVolumeSliderMuteButtonPart, MediaControlsBackgroundPart, MediaCurrentTimePart, MediaTimeRemainingPart,
MenulistPart, MenulistButtonPart, MenulistTextPart, MenulistTextFieldPart, MeterPart, OuterSpinButtonPart, ProgressBarPart, ProgressBarValuePart,
SliderHorizontalPart, SliderVerticalPart, SliderThumbHorizontalPart,
SliderThumbVerticalPart, CaretPart, SearchFieldPart, SearchFieldDecorationPart,
case MEDIA_CONTROLS_VOLUME_SLIDER:
m_displayType = MediaVolumeSlider;
break;
+ case MEDIA_CONTROLS_VOLUME_SLIDER_MUTE_BUTTON:
+ m_displayType = MediaVolumeSliderMuteButton;
+ break;
case MEDIA_CONTROLS_TOGGLE_CLOSED_CAPTIONS_BUTTON:
m_displayType = MediaShowClosedCaptionsButton;
break;
// ----------------------------
-inline MediaControlMuteButtonElement::MediaControlMuteButtonElement(HTMLMediaElement* mediaElement)
- : MediaControlInputElement(mediaElement, MEDIA_CONTROLS_MUTE_BUTTON, "button")
+inline MediaControlMuteButtonElement::MediaControlMuteButtonElement(HTMLMediaElement* mediaElement, ButtonLocation location)
+ : MediaControlInputElement(mediaElement, location == Controller ? MEDIA_CONTROLS_MUTE_BUTTON : MEDIA_CONTROLS_VOLUME_SLIDER_MUTE_BUTTON, "button")
{
}
-PassRefPtr<MediaControlMuteButtonElement> MediaControlMuteButtonElement::create(HTMLMediaElement* mediaElement)
+PassRefPtr<MediaControlMuteButtonElement> MediaControlMuteButtonElement::create(HTMLMediaElement* mediaElement, ButtonLocation location)
{
- return adoptRef(new MediaControlMuteButtonElement(mediaElement));
+ return adoptRef(new MediaControlMuteButtonElement(mediaElement, location));
}
void MediaControlMuteButtonElement::defaultEventHandler(Event* event)
MediaControlsPanel,
MediaVolumeSliderContainer,
MediaVolumeSlider,
- MediaVolumeSliderThumb
+ MediaVolumeSliderThumb,
+ MediaVolumeSliderMuteButton,
};
HTMLMediaElement* toParentMediaElement(RenderObject*);
class MediaControlMuteButtonElement : public MediaControlInputElement {
public:
- static PassRefPtr<MediaControlMuteButtonElement> create(HTMLMediaElement*);
+ enum ButtonLocation { Controller, VolumeSlider };
+ static PassRefPtr<MediaControlMuteButtonElement> create(HTMLMediaElement*, ButtonLocation);
virtual void defaultEventHandler(Event*);
private:
- MediaControlMuteButtonElement(HTMLMediaElement*);
+ MediaControlMuteButtonElement(HTMLMediaElement*, ButtonLocation);
virtual void updateDisplayType();
};
#include "HTMLNames.h"
#include "MediaControlElements.h"
#include "MouseEvent.h"
+#include "Page.h"
#include "RenderTheme.h"
#include <wtf/CurrentTime.h>
#include <wtf/MathExtras.h>
m_timeRemainingDisplay->updateStyle();
if (m_volumeSliderContainer)
m_volumeSliderContainer->updateStyle();
+ if (m_volumeSliderMuteButton)
+ m_volumeSliderMuteButton->updateStyle();
if (m_volumeSlider)
m_volumeSlider->updateStyle();
}
void RenderMedia::createMuteButton()
{
ASSERT(!m_muteButton);
- m_muteButton = MediaControlMuteButtonElement::create(mediaElement());
+ m_muteButton = MediaControlMuteButtonElement::create(mediaElement(), MediaControlMuteButtonElement::Controller);
m_muteButton->attachToParent(m_panel.get());
}
m_volumeSlider->attachToParent(m_volumeSliderContainer.get());
}
+void RenderMedia::createVolumeSliderMuteButton()
+{
+ ASSERT(!m_volumeSliderMuteButton);
+ m_volumeSliderMuteButton = MediaControlMuteButtonElement::create(mediaElement(), MediaControlMuteButtonElement::VolumeSlider);
+ m_volumeSliderMuteButton->attachToParent(m_volumeSliderContainer.get());
+
+}
+
void RenderMedia::createCurrentTimeDisplay()
{
ASSERT(!m_currentTimeDisplay);
m_fullscreenButton = 0;
m_volumeSliderContainer = 0;
m_volumeSlider = 0;
+ m_volumeSliderMuteButton = 0;
m_controlsShadowRoot = 0;
m_toggleClosedCaptionsButton = 0;
}
createFullscreenButton();
createMuteButton();
createVolumeSliderContainer();
- if (m_volumeSliderContainer)
+ if (m_volumeSliderContainer) {
createVolumeSlider();
+ createVolumeSliderMuteButton();
+ }
m_panel->attach();
}
}
m_fullscreenButton->update();
if (m_volumeSlider)
m_volumeSlider->update();
+ if (m_volumeSliderMuteButton)
+ m_volumeSliderMuteButton->update();
updateTimeDisplay();
updateControlVisibility();
RefPtr<RenderStyle> s = m_volumeSliderContainer->styleForElement();
int height = s->height().isPercent() ? 0 : s->height().value();
- int x = m_muteButton->renderBox()->offsetLeft();
- int y = m_muteButton->renderBox()->offsetTop() - height;
- FloatPoint absPoint = m_muteButton->renderer()->localToAbsolute(FloatPoint(x, y), true, true);
- if (absPoint.y() < 0)
- y = m_muteButton->renderBox()->offsetTop() + m_muteButton->renderBox()->height();
- m_volumeSliderContainer->setVisible(true);
+ int width = s->width().isPercent() ? 0 : s->width().value();
+ IntPoint offset = document()->page()->theme()->volumeSliderOffsetFromMuteButton(m_muteButton->renderer()->node(), IntSize(width, height));
+ int x = offset.x() + m_muteButton->renderBox()->offsetLeft();
+ int y = offset.y() + m_muteButton->renderBox()->offsetTop();
+
m_volumeSliderContainer->setPosition(x, y);
+ m_volumeSliderContainer->setVisible(true);
m_volumeSliderContainer->update();
m_volumeSlider->update();
} else if (!visible && m_volumeSliderContainer->isVisible()) {
if (event->isMouseEvent() && m_controlsShadowRoot) {
MouseEvent* mouseEvent = static_cast<MouseEvent*>(event);
IntPoint point(mouseEvent->absoluteLocation());
+
+ bool defaultHandled = false;
+ if (m_volumeSliderMuteButton && m_volumeSliderMuteButton->hitTest(point)) {
+ m_volumeSliderMuteButton->defaultEventHandler(event);
+ defaultHandled = event->defaultHandled();
+ }
+
bool showVolumeSlider = false;
- if (m_muteButton && m_muteButton->hitTest(point)) {
+ if (!defaultHandled && m_muteButton && m_muteButton->hitTest(point)) {
m_muteButton->defaultEventHandler(event);
if (event->type() != eventNames().mouseoutEvent)
showVolumeSlider = true;
void createTimeline();
void createVolumeSliderContainer();
void createVolumeSlider();
+ void createVolumeSliderMuteButton();
void createCurrentTimeDisplay();
void createTimeRemainingDisplay();
void createFullscreenButton();
RefPtr<MediaControlToggleClosedCaptionsButtonElement> m_toggleClosedCaptionsButton;
RefPtr<MediaControlTimelineElement> m_timeline;
RefPtr<MediaControlVolumeSliderElement> m_volumeSlider;
+ RefPtr<MediaControlMuteButtonElement> m_volumeSliderMuteButton;
RefPtr<MediaControlFullscreenButtonElement> m_fullscreenButton;
RefPtr<MediaControlTimelineContainerElement> m_timelineContainer;
RefPtr<MediaControlVolumeSliderContainerElement> m_volumeSliderContainer;
/**
* This file is part of the theme implementation for form controls in WebCore.
*
- * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Computer, Inc.
+ * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Computer, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
if (o->parent()->isSlider())
return paintMediaSliderThumb(o, paintInfo, r);
break;
+ case MediaVolumeSliderMuteButtonPart:
+ return paintMediaMuteButton(o, paintInfo, r);
case MediaVolumeSliderContainerPart:
return paintMediaVolumeSliderContainer(o, paintInfo, r);
case MediaVolumeSliderPart:
return formatMediaControlsTime(currentTime - duration);
}
+IntPoint RenderTheme::volumeSliderOffsetFromMuteButton(Node* muteButton, const IntSize& size) const
+{
+ int y = -size.height();
+ FloatPoint absPoint = muteButton->renderer()->localToAbsolute(FloatPoint(muteButton->renderBox()->offsetLeft(), y), true, true);
+ if (absPoint.y() < 0)
+ y = muteButton->renderBox()->height();
+ return IntPoint(0, y);
+}
+
#endif
Color RenderTheme::activeSelectionBackgroundColor() const
/*
* This file is part of the theme implementation for form controls in WebCore.
*
- * Copyright (C) 2005, 2006, 2007, 2008 Apple Computer, Inc.
+ * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Computer, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
virtual String formatMediaControlsTime(float time) const;
virtual String formatMediaControlsCurrentTime(float currentTime, float duration) const;
virtual String formatMediaControlsRemainingTime(float currentTime, float duration) const;
+
+ // Returns the media volume slider container's offset from the mute button.
+ virtual IntPoint volumeSliderOffsetFromMuteButton(Node*, const IntSize&) const;
#endif
#if ENABLE(METER_TAG)
/*
* This file is part of the theme implementation for form controls in WebCore.
*
- * Copyright (C) 2005 Apple Computer, Inc.
+ * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Computer, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
virtual bool paintMediaControlsBackground(RenderObject*, const PaintInfo&, const IntRect&);
virtual bool paintMediaCurrentTime(RenderObject*, const PaintInfo&, const IntRect&);
virtual bool paintMediaTimeRemaining(RenderObject*, const PaintInfo&, const IntRect&);
+ virtual bool paintMediaVolumeSliderContainer(RenderObject*, const PaintInfo&, const IntRect&);
+ virtual bool paintMediaVolumeSliderTrack(RenderObject*, const PaintInfo&, const IntRect&);
+ virtual bool paintMediaVolumeSliderThumb(RenderObject*, const PaintInfo&, const IntRect&);
// Media controls
virtual String extraMediaControlsStyleSheet();
virtual bool shouldRenderMediaControlPart(ControlPart, Element*);
virtual void adjustMediaSliderThumbSize(RenderObject*) const;
+ virtual IntPoint volumeSliderOffsetFromMuteButton(Node*, const IntSize&) const;
#endif
private:
/*
- * 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.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
void RenderThemeMac::adjustMediaSliderThumbSize(RenderObject* o) const
{
- if (o->style()->appearance() == MediaSliderThumbPart) {
+ ControlPart part = o->style()->appearance();
+
+ if (part == MediaSliderThumbPart || part == MediaVolumeSliderThumbPart) {
int width = mediaSliderThumbWidth;
int height = mediaSliderThumbHeight;
if (mediaControllerTheme() == MediaControllerThemeQuickTime) {
CGSize size;
- wkMeasureMediaUIPart(MediaSliderThumb, MediaControllerThemeQuickTime, NULL, &size);
+ wkMeasureMediaUIPart(part == MediaSliderThumbPart ? MediaSliderThumb : MediaVolumeSliderThumb, MediaControllerThemeQuickTime, NULL, &size);
width = size.width;
height = size.height;
}
return false;
}
+bool RenderThemeMac::paintMediaVolumeSliderContainer(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
+{
+ Node* node = o->node();
+ if (!node)
+ return false;
+
+ LocalCurrentGraphicsContext localContext(paintInfo.context);
+ wkDrawMediaUIPart(MediaVolumeSliderContainer, mediaControllerTheme(), paintInfo.context->platformContext(), r, getMediaUIPartStateFlags(node));
+ return false;
+}
+
+bool RenderThemeMac::paintMediaVolumeSliderTrack(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
+{
+ Node* node = o->node();
+ if (!node)
+ return false;
+
+ LocalCurrentGraphicsContext localContext(paintInfo.context);
+ wkDrawMediaUIPart(MediaVolumeSlider, mediaControllerTheme(), paintInfo.context->platformContext(), r, getMediaUIPartStateFlags(node));
+ return false;
+}
+
+bool RenderThemeMac::paintMediaVolumeSliderThumb(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
+{
+ Node* node = o->node();
+ if (!node)
+ return false;
+
+ LocalCurrentGraphicsContext localContext(paintInfo.context);
+ wkDrawMediaUIPart(MediaVolumeSliderThumb, mediaControllerTheme(), paintInfo.context->platformContext(), r, getMediaUIPartStateFlags(node));
+ return false;
+}
+
String RenderThemeMac::extraMediaControlsStyleSheet()
{
#if PLATFORM(MAC)
if (mediaControllerTheme() == MediaControllerThemeQuickTime)
return String(mediaControlsQuickTimeUserAgentStyleSheet, sizeof(mediaControlsQuickTimeUserAgentStyleSheet));
- else
- return String();
+
+ return String();
#else
ASSERT_NOT_REACHED();
return String();
bool RenderThemeMac::shouldRenderMediaControlPart(ControlPart part, Element* element)
{
- if (part == MediaToggleClosedCaptionsButtonPart) {
-
+ switch (part) {
+ case MediaVolumeSliderContainerPart:
+ case MediaVolumeSliderPart:
+ case MediaVolumeSliderMuteButtonPart:
+ case MediaVolumeSliderThumbPart: {
+ HTMLMediaElement* mediaElement = static_cast<HTMLMediaElement*>(element);
+ return mediaControllerTheme() == MediaControllerThemeQuickTime && mediaElement->hasAudio();
+ }
+ case MediaToggleClosedCaptionsButtonPart:
// We rely on QTKit to render captions so don't enable the button unless it will be able to do so.
if (!element->hasTagName(videoTag))
return false;
+ default:
+ break;
}
return RenderTheme::shouldRenderMediaControlPart(part, element);
}
+IntPoint RenderThemeMac::volumeSliderOffsetFromMuteButton(Node* muteButton, const IntSize& size) const
+{
+ static const int xOffset = -4;
+ static const int yOffset = 5;
+
+ float zoomLevel = muteButton->renderer()->style()->effectiveZoom();
+ int y = yOffset * zoomLevel + muteButton->renderBox()->offsetHeight() - size.height();
+ FloatPoint absPoint = muteButton->renderer()->localToAbsolute(FloatPoint(muteButton->renderBox()->offsetLeft(), y), true, true);
+ if (absPoint.y() < 0)
+ y = muteButton->renderBox()->height();
+ return IntPoint(xOffset * zoomLevel, y);
+}
+
#endif // ENABLE(VIDEO)
NSPopUpButtonCell* RenderThemeMac::popupButton() const
* Copyright (C) 2000 Lars Knoll (knoll@kde.org)
* (C) 2000 Antti Koivisto (koivisto@kde.org)
* (C) 2000 Dirk Mueller (mueller@kde.org)
- * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
+ * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
* Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
* Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
*
NOPSEUDO, FIRST_LINE, FIRST_LETTER, BEFORE, AFTER, SELECTION, FIRST_LINE_INHERITED, SCROLLBAR, FILE_UPLOAD_BUTTON, INPUT_PLACEHOLDER,
SLIDER_THUMB, SEARCH_CANCEL_BUTTON, SEARCH_DECORATION, SEARCH_RESULTS_DECORATION, SEARCH_RESULTS_BUTTON, MEDIA_CONTROLS_PANEL,
MEDIA_CONTROLS_PLAY_BUTTON, MEDIA_CONTROLS_MUTE_BUTTON, MEDIA_CONTROLS_TIMELINE, MEDIA_CONTROLS_TIMELINE_CONTAINER,
- MEDIA_CONTROLS_VOLUME_SLIDER, MEDIA_CONTROLS_VOLUME_SLIDER_CONTAINER, MEDIA_CONTROLS_CURRENT_TIME_DISPLAY, MEDIA_CONTROLS_TIME_REMAINING_DISPLAY,
+ MEDIA_CONTROLS_VOLUME_SLIDER, MEDIA_CONTROLS_VOLUME_SLIDER_CONTAINER, MEDIA_CONTROLS_VOLUME_SLIDER_MUTE_BUTTON,
+ MEDIA_CONTROLS_CURRENT_TIME_DISPLAY, MEDIA_CONTROLS_TIME_REMAINING_DISPLAY,
MEDIA_CONTROLS_SEEK_BACK_BUTTON, MEDIA_CONTROLS_SEEK_FORWARD_BUTTON, MEDIA_CONTROLS_FULLSCREEN_BUTTON, MEDIA_CONTROLS_REWIND_BUTTON,
MEDIA_CONTROLS_RETURN_TO_REALTIME_BUTTON, MEDIA_CONTROLS_TOGGLE_CLOSED_CAPTIONS_BUTTON,
MEDIA_CONTROLS_STATUS_DISPLAY, SCROLLBAR_THUMB, SCROLLBAR_BUTTON, SCROLLBAR_TRACK, SCROLLBAR_TRACK_PIECE, SCROLLBAR_CORNER, RESIZER,
+2010-07-08 Eric Carlson <eric.carlson@apple.com>
+
+ Reviewed by Dan Bernstein.
+
+ Update WebKitSystemInterface.
+
+ * libWebKitSystemInterfaceLeopard.a:
+ * libWebKitSystemInterfaceSnowLeopard.a:
+ * libWebKitSystemInterfaceTiger.a:
+
2010-07-07 Dumitru Daniliuc <dumi@chromium.org>
Reviewed by Adam Roben.
git://git.webkit.org / WebKit-https.git / commitdiff
