Title: [139326] trunk
- Revision
- 139326
- Author
- vic...@rosedu.org
- Date
- 2013-01-10 09:45:41 -0800 (Thu, 10 Jan 2013)
Log 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.
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (139325 => 139326)
--- trunk/LayoutTests/ChangeLog 2013-01-10 17:44:05 UTC (rev 139325)
+++ trunk/LayoutTests/ChangeLog 2013-01-10 17:45:41 UTC (rev 139326)
@@ -1,3 +1,12 @@
+2013-01-10 Victor Carbune <vic...@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 <apav...@chromium.org>
The "outline-offset" property is not found in the computed style property list
Modified: trunk/LayoutTests/platform/chromium/TestExpectations (139325 => 139326)
--- trunk/LayoutTests/platform/chromium/TestExpectations 2013-01-10 17:44:05 UTC (rev 139325)
+++ trunk/LayoutTests/platform/chromium/TestExpectations 2013-01-10 17:45:41 UTC (rev 139326)
@@ -3039,9 +3039,6 @@
webkit.org/b/103926 media/track/opera/track/webvtt/rendering/adhoc/cue_font_size_transition.html [ Skip ]
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 ]
webkit.org/b/72376 [ Win ] fast/forms/file/input-file-label.html [ Failure Pass ]
Modified: trunk/Source/WebCore/ChangeLog (139325 => 139326)
--- trunk/Source/WebCore/ChangeLog 2013-01-10 17:44:05 UTC (rev 139325)
+++ trunk/Source/WebCore/ChangeLog 2013-01-10 17:45:41 UTC (rev 139326)
@@ -1,3 +1,22 @@
+2013-01-10 Victor Carbune <vic...@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 <morr...@google.com>
ComposedShadowTreeWalker shouldn't be exposed to non-ShadowDOM classes
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (139325 => 139326)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2013-01-10 17:44:05 UTC (rev 139325)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2013-01-10 17:45:41 UTC (rev 139326)
@@ -4136,6 +4136,7 @@
m_disableCaptions = !m_closedCaptionsVisible;
markCaptionAndSubtitleTracksAsUnconfigured();
+ mediaControls()->updateTextTrackDisplay();
}
#else
if (hasMediaControls())
Modified: trunk/Source/WebCore/html/shadow/MediaControlElements.cpp (139325 => 139326)
--- trunk/Source/WebCore/html/shadow/MediaControlElements.cpp 2013-01-10 17:44:05 UTC (rev 139325)
+++ trunk/Source/WebCore/html/shadow/MediaControlElements.cpp 2013-01-10 17:45:41 UTC (rev 139326)
@@ -1247,12 +1247,16 @@
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;
// 2. Let video be the media element or other playback mechanism.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
