Support text track selection in video controls

third_party/WebKit/Source/core/paint/MediaControlsPainter.cpp

Index: third_party/WebKit/Source/core/paint/MediaControlsPainter.cpp
diff --git a/third_party/WebKit/Source/core/paint/MediaControlsPainter.cpp b/third_party/WebKit/Source/core/paint/MediaControlsPainter.cpp
index da562288d7eadb66726660b4ba61fcbcd6cdcf9d..e765bad2961b3bf695500bcc6a6e75828af20944 100644
--- a/third_party/WebKit/Source/core/paint/MediaControlsPainter.cpp
+++ b/third_party/WebKit/Source/core/paint/MediaControlsPainter.cpp
@@ -504,7 +504,7 @@ bool MediaControlsPainter::paintMediaToggleClosedCaptionsButton(const LayoutObje
 
     bool isEnabled = mediaElement->hasClosedCaptions();
 
-    if (mediaElement->closedCaptionsVisible())
+    if (mediaElement->textTracksVisible())
         return paintMediaButton(paintInfo.context, rect, mediaClosedCaptionButton, isEnabled);
 
     return paintMediaButton(paintInfo.context, rect, mediaClosedCaptionButtonDisabled, isEnabled);
@@ -541,6 +541,39 @@ bool MediaControlsPainter::paintMediaCastButton(const LayoutObject& object, cons
     }
 }
 
+bool MediaControlsPainter::paintMediaTrackSelectionCheckmark(const LayoutObject& object, const PaintInfo& paintInfo, const IntRect& rect)
+{
+    const HTMLMediaElement* mediaElement = toParentMediaElement(object);
+    if (!mediaElement)
+        return false;
+
+    static Image* mediaTrackSelectionCheckmark = platformResource("mediaplayerTrackSelectionCheckmark",
+        "mediaplayerTrackSelectionCheckmarkNew");
+    return paintMediaButton(paintInfo.context, rect, mediaTrackSelectionCheckmark);
+}
+
+bool MediaControlsPainter::paintMediaClosedCaptionsIcon(const LayoutObject& object, const PaintInfo& paintInfo, const IntRect& rect)
+{
+    const HTMLMediaElement* mediaElement = toParentMediaElement(object);
+    if (!mediaElement)
+        return false;
+
+    static Image* mediaClosedCaptionsIcon = platformResource("mediaplayerClosedCaptionsIcon",
+        "mediaplayerClosedCaptionsIconNew");
+    return paintMediaButton(paintInfo.context, rect, mediaClosedCaptionsIcon);
+}
+
+bool MediaControlsPainter::paintMediaSubtitlesIcon(const LayoutObject& object, const PaintInfo& paintInfo, const IntRect& rect)
+{
+    const HTMLMediaElement* mediaElement = toParentMediaElement(object);
+    if (!mediaElement)
+        return false;
+
+    static Image* mediaSubtitlesIcon = platformResource("mediaplayerSubtitlesIcon",
+        "mediaplayerSubtitlesIconNew");
+    return paintMediaButton(paintInfo.context, rect, mediaSubtitlesIcon);
+}
+
 void MediaControlsPainter::adjustMediaSliderThumbSize(ComputedStyle& style)
 {
     static Image* mediaSliderThumb = platformResource("mediaplayerSliderThumb",