Title: [144967] branches/chromium/1410
- Revision
- 144967
- Author
- scher...@chromium.org
- Date
- 2013-03-06 12:58:37 -0800 (Wed, 06 Mar 2013)
Log Message
Merge 144789
> REGRESSION(r142191): Fix closed caption buttons for ports still using the painting path.
> https://bugs.webkit.org/show_bug.cgi?id=111109
>
> Reviewed by Eric Carlson.
>
> Source/WebCore:
>
> Covered by following tests:
> media/track/track-cue-rendering-horizontal.html
> media/track/track-cue-rendering-vertical.html
>
> * rendering/RenderTheme.cpp:
> (WebCore::RenderTheme::paint):
> * rendering/RenderTheme.h:
> (WebCore::RenderTheme::paintMediaToggleClosedCaptionsButton):
>
> LayoutTests:
>
> * platform/chromium/TestExpectations:
TBR=scher...@chromium.org
Review URL: https://codereview.chromium.org/12463019
Modified Paths
Diff
Modified: branches/chromium/1410/LayoutTests/platform/chromium/TestExpectations (144966 => 144967)
--- branches/chromium/1410/LayoutTests/platform/chromium/TestExpectations 2013-03-06 20:45:35 UTC (rev 144966)
+++ branches/chromium/1410/LayoutTests/platform/chromium/TestExpectations 2013-03-06 20:58:37 UTC (rev 144967)
@@ -4391,3 +4391,6 @@
webkit.org/b/97037 media/encrypted-media/encrypted-media-v2-events.html [ Timeout ]
webkit.org/b/97037 media/encrypted-media/encrypted-media-v2-syntax.html [ Timeout ]
+# Current baselines are incorrect -- needs rebaseline after webkit.org/b/111388 lands.
+webkit.org/b/111388 media/track/track-cue-rendering-horizontal.html [ ImageOnlyFailure ]
+webkit.org/b/111388 media/track/track-cue-rendering-vertical.html [ ImageOnlyFailure ]
Modified: branches/chromium/1410/Source/WebCore/rendering/RenderTheme.cpp (144966 => 144967)
--- branches/chromium/1410/Source/WebCore/rendering/RenderTheme.cpp 2013-03-06 20:45:35 UTC (rev 144966)
+++ branches/chromium/1410/Source/WebCore/rendering/RenderTheme.cpp 2013-03-06 20:58:37 UTC (rev 144967)
@@ -341,6 +341,8 @@
return paintMediaRewindButton(o, paintInfo, r);
case MediaReturnToRealtimeButtonPart:
return paintMediaReturnToRealtimeButton(o, paintInfo, r);
+ case MediaToggleClosedCaptionsButtonPart:
+ return paintMediaToggleClosedCaptionsButton(o, paintInfo, r);
case MediaSliderPart:
return paintMediaSliderTrack(o, paintInfo, r);
case MediaSliderThumbPart:
Modified: branches/chromium/1410/Source/WebCore/rendering/RenderTheme.h (144966 => 144967)
--- branches/chromium/1410/Source/WebCore/rendering/RenderTheme.h 2013-03-06 20:45:35 UTC (rev 144966)
+++ branches/chromium/1410/Source/WebCore/rendering/RenderTheme.h 2013-03-06 20:58:37 UTC (rev 144967)
@@ -338,6 +338,7 @@
virtual bool paintMediaVolumeSliderThumb(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
virtual bool paintMediaRewindButton(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
virtual bool paintMediaReturnToRealtimeButton(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
+ virtual bool paintMediaToggleClosedCaptionsButton(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
virtual bool paintMediaControlsBackground(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
virtual bool paintMediaCurrentTime(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
virtual bool paintMediaTimeRemaining(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
