[iOS] TextTrackRepresentation not cleared when captions are disabled
authoreric.carlson@apple.com <eric.carlson@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 12 Jul 2013 23:35:15 +0000 (23:35 +0000)
committereric.carlson@apple.com <eric.carlson@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 12 Jul 2013 23:35:15 +0000 (23:35 +0000)
https://bugs.webkit.org/show_bug.cgi?id=118623

Reviewed by Dean Jackson.

* html/shadow/MediaControlElements.cpp:
(WebCore::MediaControlTextTrackContainerElement::updateDisplay): Do not return immediately
    when captions are disabled so the necessary cleanup happens.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@152607 268f45cc-cd09-0410-ab3c-d52691b4dbfc

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

index 9e1bb4d..4894253 100644 (file)
@@ -1,3 +1,14 @@
+2013-07-12  Eric Carlson  <eric.carlson@apple.com>
+
+        [iOS] TextTrackRepresentation not cleared when captions are disabled
+        https://bugs.webkit.org/show_bug.cgi?id=118623
+
+        Reviewed by Dean Jackson.
+
+        * html/shadow/MediaControlElements.cpp:
+        (WebCore::MediaControlTextTrackContainerElement::updateDisplay): Do not return immediately
+            when captions are disabled so the necessary cleanup happens.
+
 2013-07-12  Brent Fulgham  <bfulgham@apple.com>
 
         [Windows] Attempt to satisfy the Open Source Windows bots.
index 0051fcf..d9ff436 100644 (file)
@@ -1227,10 +1227,8 @@ const AtomicString& MediaControlTextTrackContainerElement::shadowPseudoId() cons
 
 void MediaControlTextTrackContainerElement::updateDisplay()
 {
-    if (!mediaController()->closedCaptionsVisible()) {
+    if (!mediaController()->closedCaptionsVisible())
         removeChildren();
-        return;
-    }
 
     HTMLMediaElement* mediaElement = toParentMediaElement(this);
     // 1. If the media element is an audio element, or is another playback