Modified: trunk/Source/WebCore/ChangeLog (114803 => 114804)
--- trunk/Source/WebCore/ChangeLog 2012-04-21 00:12:04 UTC (rev 114803)
+++ trunk/Source/WebCore/ChangeLog 2012-04-21 00:12:30 UTC (rev 114804)
@@ -1,3 +1,19 @@
+2012-04-20 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r114789.
+ http://trac.webkit.org/changeset/114789
+ https://bugs.webkit.org/show_bug.cgi?id=84515
+
+ Caused 5 tests to fail on mac/ (Requested by jernoble on
+ #webkit).
+
+ * css/CSSPrimitiveValueMappings.h:
+ (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
+ * css/CSSValueKeywords.in:
+ * platform/ThemeTypes.h:
+ * rendering/RenderTheme.cpp:
+ (WebCore::RenderTheme::paint):
+
2012-04-20 Brady Eidson <beid...@apple.com>
https://bugs.webkit.org/show_bug.cgi?id=84512
Modified: trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h (114803 => 114804)
--- trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2012-04-21 00:12:04 UTC (rev 114803)
+++ trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2012-04-21 00:12:30 UTC (rev 114804)
@@ -371,9 +371,12 @@
case ListItemPart:
m_value.ident = CSSValueListitem;
break;
- case MediaFullscreenButtonPart:
- m_value.ident = CSSValueMediaFullscreenButton;
+ case MediaEnterFullscreenButtonPart:
+ m_value.ident = CSSValueMediaEnterFullscreenButton;
break;
+ case MediaExitFullscreenButtonPart:
+ m_value.ident = CSSValueMediaExitFullscreenButton;
+ break;
case MediaPlayButtonPart:
m_value.ident = CSSValueMediaPlayButton;
break;
Modified: trunk/Source/WebCore/css/CSSValueKeywords.in (114803 => 114804)
--- trunk/Source/WebCore/css/CSSValueKeywords.in 2012-04-21 00:12:04 UTC (rev 114803)
+++ trunk/Source/WebCore/css/CSSValueKeywords.in 2012-04-21 00:12:30 UTC (rev 114804)
@@ -622,7 +622,8 @@
-webkit-input-speech-button
listbox
listitem
-media-fullscreen-button
+media-enter-fullscreen-button
+media-exit-fullscreen-button
media-fullscreen-volume-slider
media-fullscreen-volume-slider-thumb
media-mute-button
Modified: trunk/Source/WebCore/platform/ThemeTypes.h (114803 => 114804)
--- trunk/Source/WebCore/platform/ThemeTypes.h 2012-04-21 00:12:04 UTC (rev 114803)
+++ trunk/Source/WebCore/platform/ThemeTypes.h 2012-04-21 00:12:30 UTC (rev 114804)
@@ -48,7 +48,7 @@
enum ControlPart {
NoControlPart, CheckboxPart, RadioPart, PushButtonPart, SquareButtonPart, ButtonPart,
ButtonBevelPart, DefaultButtonPart, InnerSpinButtonPart, InputSpeechButtonPart, ListboxPart, ListItemPart,
- MediaFullscreenButtonPart, MediaFullScreenVolumeSliderPart, MediaFullScreenVolumeSliderThumbPart, MediaMuteButtonPart, MediaPlayButtonPart, MediaSeekBackButtonPart,
+ MediaEnterFullscreenButtonPart, MediaExitFullscreenButtonPart, 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 (114803 => 114804)
--- trunk/Source/WebCore/rendering/RenderTheme.cpp 2012-04-21 00:12:04 UTC (rev 114803)
+++ trunk/Source/WebCore/rendering/RenderTheme.cpp 2012-04-21 00:12:30 UTC (rev 114804)
@@ -308,7 +308,8 @@
case SliderThumbHorizontalPart:
case SliderThumbVerticalPart:
return paintSliderThumb(o, paintInfo, r);
- case MediaFullscreenButtonPart:
+ case MediaEnterFullscreenButtonPart:
+ case MediaExitFullscreenButtonPart:
return paintMediaFullscreenButton(o, paintInfo, r);
case MediaPlayButtonPart:
return paintMediaPlayButton(o, paintInfo, r);
