Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(92)

Side by Side Diff: Source/core/html/shadow/MediaControls.cpp

Issue 201123004: Ignore MediaController in the closed captions button logic (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/html/shadow/MediaControlElements.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011, 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2011, 2012 Apple Inc. All rights reserved.
3 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. 3 * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
296 m_muteButton->renderer()->repaint(); 296 m_muteButton->renderer()->repaint();
297 } 297 }
298 298
299 void MediaControls::changedClosedCaptionsVisibility() 299 void MediaControls::changedClosedCaptionsVisibility()
300 { 300 {
301 m_toggleClosedCaptionsButton->updateDisplayType(); 301 m_toggleClosedCaptionsButton->updateDisplayType();
302 } 302 }
303 303
304 void MediaControls::refreshClosedCaptionsButtonVisibility() 304 void MediaControls::refreshClosedCaptionsButtonVisibility()
305 { 305 {
306 if (mediaControllerInterface().hasClosedCaptions()) 306 if (mediaElement().hasClosedCaptions())
307 m_toggleClosedCaptionsButton->show(); 307 m_toggleClosedCaptionsButton->show();
308 else 308 else
309 m_toggleClosedCaptionsButton->hide(); 309 m_toggleClosedCaptionsButton->hide();
310 } 310 }
311 311
312 void MediaControls::closedCaptionTracksChanged() 312 void MediaControls::closedCaptionTracksChanged()
313 { 313 {
314 refreshClosedCaptionsButtonVisibility(); 314 refreshClosedCaptionsButtonVisibility();
315 } 315 }
316 316
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
438 438
439 void MediaControls::updateTextTrackDisplay() 439 void MediaControls::updateTextTrackDisplay()
440 { 440 {
441 if (!m_textDisplayContainer) 441 if (!m_textDisplayContainer)
442 createTextTrackDisplay(); 442 createTextTrackDisplay();
443 443
444 m_textDisplayContainer->updateDisplay(); 444 m_textDisplayContainer->updateDisplay();
445 } 445 }
446 446
447 } 447 }
OLDNEW
« no previous file with comments | « Source/core/html/shadow/MediaControlElements.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698