Modified: trunk/Source/WebCore/ChangeLog (114788 => 114789)
--- trunk/Source/WebCore/ChangeLog 2012-04-20 22:32:04 UTC (rev 114788)
+++ trunk/Source/WebCore/ChangeLog 2012-04-20 22:33:35 UTC (rev 114789)
@@ -1,3 +1,24 @@
+2012-04-17 Jer Noble <jer.no...@apple.com>
+
+ media-exit-fullscreen-button (and related enums) is unnecessary and should be removed.
+ https://bugs.webkit.org/show_bug.cgi?id=84162
+
+ Reviewed by Eric Carlson.
+
+ No new tests; no change in functionality so covered by existing tests.
+
+ Remove the media-exit-fullscreen-button keyword, and rename media-enter-fullscreen-button to
+ media-fullscreen-button.
+
+ * css/CSSPrimitiveValueMappings.h:
+ (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
+ * css/CSSValueKeywords.in:
+ * css/mediaControls.css:
+ (audio::-webkit-media-controls-fullscreen-button, video::-webkit-media-controls-fullscreen-button):
+ * platform/ThemeTypes.h:
+ * rendering/RenderTheme.cpp:
+ (WebCore::RenderTheme::paint):
+
2012-04-20 Alexandre Elias <ael...@google.com>
[chromium] Fix compile errors when DEBUG_GL_CALLS is enabled
Modified: trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h (114788 => 114789)
--- trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2012-04-20 22:32:04 UTC (rev 114788)
+++ trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2012-04-20 22:33:35 UTC (rev 114789)
@@ -371,12 +371,9 @@
case ListItemPart:
m_value.ident = CSSValueListitem;
break;
- case MediaEnterFullscreenButtonPart:
- m_value.ident = CSSValueMediaEnterFullscreenButton;
+ case MediaFullscreenButtonPart:
+ m_value.ident = CSSValueMediaFullscreenButton;
break;
- case MediaExitFullscreenButtonPart:
- m_value.ident = CSSValueMediaExitFullscreenButton;
- break;
case MediaPlayButtonPart:
m_value.ident = CSSValueMediaPlayButton;
break;
Modified: trunk/Source/WebCore/css/CSSValueKeywords.in (114788 => 114789)
--- trunk/Source/WebCore/css/CSSValueKeywords.in 2012-04-20 22:32:04 UTC (rev 114788)
+++ trunk/Source/WebCore/css/CSSValueKeywords.in 2012-04-20 22:33:35 UTC (rev 114789)
@@ -622,8 +622,7 @@
-webkit-input-speech-button
listbox
listitem
-media-enter-fullscreen-button
-media-exit-fullscreen-button
+media-fullscreen-button
media-fullscreen-volume-slider
media-fullscreen-volume-slider-thumb
media-mute-button
Modified: trunk/Source/WebCore/platform/ThemeTypes.h (114788 => 114789)
--- trunk/Source/WebCore/platform/ThemeTypes.h 2012-04-20 22:32:04 UTC (rev 114788)
+++ trunk/Source/WebCore/platform/ThemeTypes.h 2012-04-20 22:33:35 UTC (rev 114789)
@@ -48,7 +48,7 @@
enum ControlPart {
NoControlPart, CheckboxPart, RadioPart, PushButtonPart, SquareButtonPart, ButtonPart,
ButtonBevelPart, DefaultButtonPart, InnerSpinButtonPart, InputSpeechButtonPart, ListboxPart, ListItemPart,
- MediaEnterFullscreenButtonPart, MediaExitFullscreenButtonPart, MediaFullScreenVolumeSliderPart, MediaFullScreenVolumeSliderThumbPart, MediaMuteButtonPart, MediaPlayButtonPart, MediaSeekBackButtonPart,
+ MediaFullscreenButtonPart, MediaFullScreenVolumeSliderPart, MediaFullScreenVolumeSliderThumbPart, MediaMuteButtonPart, MediaPlayButtonPart, MediaSeekBackButtonPart,
MediaSeekForwardButtonPart, MediaRewindButtonPart, MediaReturnToRealtimeButtonPart, MediaToggleClosedCaptionsButtonPart,
MediaSliderPart, MediaSliderThumbPart, MediaVolumeSliderContainerPart, MediaVolumeSliderPart, MediaVolumeSliderThumbPart,
MediaVolumeSliderMuteButtonPart, MediaControlsBackgroundPart, MediaControlsFullscreenBackgroundPart, MediaCurrentTimePart, MediaTimeRemainingPart,
Modified: trunk/Source/WebCore/rendering/RenderTheme.cpp (114788 => 114789)
--- trunk/Source/WebCore/rendering/RenderTheme.cpp 2012-04-20 22:32:04 UTC (rev 114788)
+++ trunk/Source/WebCore/rendering/RenderTheme.cpp 2012-04-20 22:33:35 UTC (rev 114789)
@@ -308,8 +308,7 @@
case SliderThumbHorizontalPart:
case SliderThumbVerticalPart:
return paintSliderThumb(o, paintInfo, r);
- case MediaEnterFullscreenButtonPart:
- case MediaExitFullscreenButtonPart:
+ case MediaFullscreenButtonPart:
return paintMediaFullscreenButton(o, paintInfo, r);
case MediaPlayButtonPart:
return paintMediaPlayButton(o, paintInfo, r);