Changeset 127168 in webkit

Timestamp:

Aug 30, 2012 11:53:02 AM (12 years ago)

Author:

victor@rosedu.org

Message:

[Chromium] The CC button is not painted
​https://bugs.webkit.org/show_bug.cgi?id=95395

Reviewed by Eric Carlson.

Source/WebCore:

The actual Chromium resource for the CC button was not used by the Chromium theme.

Existing track rendering tests will be rebaselined and contain the new CC button.

• rendering/RenderMediaControlsChromium.cpp:

(WebCore::paintMediaClosedCaptionsButton): Added for proper painting of the resource.
(WebCore):
(WebCore::RenderMediaControlsChromium::paintMediaControlsPart):
Changed to call paintMediaClosedCaptionsButton when the control is the CC button.

• rendering/RenderThemeChromiumSkia.cpp:

(WebCore::RenderThemeChromiumSkia::paintMediaToggleClosedCaptionsButton):
Implemented proper behaviour.
(WebCore):

• rendering/RenderThemeChromiumSkia.h:

(RenderThemeChromiumSkia):

LayoutTests:

No new tests, the existing ones will need to be rebaselined and include the CC button.

• platform/chromium/TestExpectations: Marked tests failing accordingly for rebaselining.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/chromium/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderMediaControlsChromium.cpp (modified) (3 diffs)
• Source/WebCore/rendering/RenderThemeChromiumSkia.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderThemeChromiumSkia.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-08-30  Victor Carbune  <victor@rosedu.org>
+
+        [Chromium] The CC button is not painted
+        https://bugs.webkit.org/show_bug.cgi?id=95395
+
+        Reviewed by Eric Carlson.
+
+        No new tests, the existing ones will need to be rebaselined and include the CC button.
+
+        * platform/chromium/TestExpectations: Marked tests failing accordingly for rebaselining.
+
 2012-08-30  Jessie Berlin  <jberlin@apple.com>
 

trunk/LayoutTests/platform/chromium/TestExpectations

@@ -3613 +3613 @@
 BUGWK95101 SNOWLEOPARD : fast/text/atsui-bidi-control.html = PASS TIMEOUT
 
+// These need new baselines: both new tests and new CC button has just been added.
+BUGWK95395 : media/track/track-cue-rendering-horizontal.html = IMAGE+TEXT
+BUGWK95395 : media/track/track-cue-rendering-vertical.html = IMAGE+TEXT
+
 // Failing due to sub-pixel layout.
 BUGWK95136 : fast/css/sticky/sticky-left-percentage.html = IMAGE

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-08-30  Victor Carbune  <victor@rosedu.org>
+
+        [Chromium] The CC button is not painted
+        https://bugs.webkit.org/show_bug.cgi?id=95395
+
+        Reviewed by Eric Carlson.
+
+        The actual Chromium resource for the CC button was not used by the Chromium theme.
+
+        Existing track rendering tests will be rebaselined and contain the new CC button.
+
+        * rendering/RenderMediaControlsChromium.cpp:
+        (WebCore::paintMediaClosedCaptionsButton): Added for proper painting of the resource.
+        (WebCore):
+        (WebCore::RenderMediaControlsChromium::paintMediaControlsPart):
+        Changed to call paintMediaClosedCaptionsButton when the control is the CC button.
+        * rendering/RenderThemeChromiumSkia.cpp:
+        (WebCore::RenderThemeChromiumSkia::paintMediaToggleClosedCaptionsButton):
+        Implemented proper behaviour.
+        (WebCore):
+        * rendering/RenderThemeChromiumSkia.h:
+        (RenderThemeChromiumSkia):
+
 2012-08-30  Tommy Widenflycht  <tommyw@google.com>
 

trunk/Source/WebCore/rendering/RenderMediaControlsChromium.cpp

@@ -328 +328 @@
 }
 
+static bool paintMediaClosedCaptionsButton(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
+{
+    HTMLMediaElement* mediaElement = toParentMediaElement(object);
+    if (!mediaElement)
+        return false;
+
+    static Image* mediaClosedCaptionButton = platformResource("mediaplayerClosedCaption");
+    return paintMediaButton(paintInfo.context, rect, mediaClosedCaptionButton);
+}
+
+
 bool RenderMediaControlsChromium::paintMediaControlsPart(MediaControlElementType part, RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
 {
@@ -337 +348 @@
     case MediaPlayButton:
         return paintMediaPlayButton(object, paintInfo, rect);
+    case MediaShowClosedCaptionsButton:
+        return paintMediaClosedCaptionsButton(object, paintInfo, rect);
     case MediaSlider:
         return paintMediaSlider(object, paintInfo, rect);
@@ -361 +374 @@
     case MediaReturnToRealtimeButton:
     case MediaStatusDisplay:
-    case MediaShowClosedCaptionsButton:
     case MediaHideClosedCaptionsButton:
     case MediaTextTrackDisplayContainer:

trunk/Source/WebCore/rendering/RenderThemeChromiumSkia.cpp

@@ -435 +435 @@
 }
 
+bool RenderThemeChromiumSkia::paintMediaToggleClosedCaptionsButton(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
+{
+#if ENABLE(VIDEO_TRACK)
+    return RenderMediaControlsChromium::paintMediaControlsPart(MediaShowClosedCaptionsButton, o, paintInfo, r);
+#else
+    UNUSED_PARAM(object);
+    UNUSED_PARAM(paintInfo);
+    UNUSED_PARAM(rect);
+    return false;
+#endif
+}
+
 bool RenderThemeChromiumSkia::paintMediaVolumeSliderThumb(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
 {

trunk/Source/WebCore/rendering/RenderThemeChromiumSkia.h

@@ -99 +99 @@
         virtual void adjustSliderThumbSize(RenderStyle*, Element*) const;
         virtual bool paintMediaSliderThumb(RenderObject*, const PaintInfo&, const IntRect&);
+        virtual bool paintMediaToggleClosedCaptionsButton(RenderObject*, const PaintInfo&, const IntRect&);
         virtual bool paintMediaVolumeSliderThumb(RenderObject*, const PaintInfo&, const IntRect&);
         virtual bool paintMediaPlayButton(RenderObject*, const PaintInfo&, const IntRect&);