Changeset 139326 in webkit

Timestamp:

Jan 10, 2013 9:45:41 AM (11 years ago)

Author:

victor@rosedu.org

Message:

media/video-controls-captions.html fails after fixing ​https://bugs.webkit.org/show_bug.cgi?id=105536
​https://bugs.webkit.org/show_bug.cgi?id=106230

Reviewed by Eric Carlson.

Source/WebCore:

Until Chromium has proper controls for lists of text tracks, the caption button
needs to preserve its functionality.

Updated TestExpectations to reactivate test.

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::setClosedCaptionsVisible): Added explicit call to updateTextTrackDisplay.
This enables hiding the tracks immediately.

• html/shadow/MediaControlElements.cpp:

(WebCore::MediaControlTextTrackContainerElement::updateDisplay): Added extra check before rendering
that captions should actually be displayed.

LayoutTests:

• platform/chromium/TestExpectations: Reactivated test.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/chromium/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLMediaElement.cpp (modified) (1 diff)
• Source/WebCore/html/shadow/MediaControlElements.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-01-10  Victor Carbune  <victor@rosedu.org>
+
+        media/video-controls-captions.html fails after fixing https://bugs.webkit.org/show_bug.cgi?id=105536
+        https://bugs.webkit.org/show_bug.cgi?id=106230
+
+        Reviewed by Eric Carlson.
+
+        * platform/chromium/TestExpectations: Reactivated test.
+
 2013-01-10  Alexander Pavlov  <apavlov@chromium.org>
 

trunk/LayoutTests/platform/chromium/TestExpectations

@@ -3040 +3040 @@
 webkit.org/b/103926 media/track/opera/track/webvtt/rendering/adhoc/voice_with_evil_timestamp.html [ Skip ]
 
-# Started failing upon fixing webkit.org/b/105536
-webkit.org/b/106230 media/video-controls-captions.html [ Failure ]
-
 webkit.org/b/72271 [ SnowLeopard Debug ] fast/dom/node-iterator-reference-node-moved-crash.html [ Crash Pass ]
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-10  Victor Carbune  <victor@rosedu.org>
+
+        media/video-controls-captions.html fails after fixing https://bugs.webkit.org/show_bug.cgi?id=105536
+        https://bugs.webkit.org/show_bug.cgi?id=106230
+
+        Reviewed by Eric Carlson.
+
+        Until Chromium has proper controls for lists of text tracks, the caption button
+        needs to preserve its functionality.
+
+        Updated TestExpectations to reactivate test.
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::setClosedCaptionsVisible): Added explicit call to updateTextTrackDisplay.
+        This enables hiding the tracks immediately.
+        * html/shadow/MediaControlElements.cpp:
+        (WebCore::MediaControlTextTrackContainerElement::updateDisplay): Added extra check before rendering
+        that captions should actually be displayed.
+
 2013-01-10  Hajime Morrita  <morrita@google.com>
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -4137 +4137 @@
 
         markCaptionAndSubtitleTracksAsUnconfigured();
+        mediaControls()->updateTextTrackDisplay();
     }
 #else

trunk/Source/WebCore/html/shadow/MediaControlElements.cpp

@@ -1248 +1248 @@
 void MediaControlTextTrackContainerElement::updateDisplay()
 {
+    if (!mediaController()->closedCaptionsVisible()) {
+        m_cueContainer->removeChildren();
+        return;
+    }
+
     HTMLMediaElement* mediaElement = toParentMediaElement(this);
-
     // 1. If the media element is an audio element, or is another playback
     // mechanism with no rendering area, abort these steps. There is nothing to
     // render.
-    if (!mediaElement->isVideo())
+    if (!mediaElement || !mediaElement->isVideo())
         return;