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

Side by Side Diff: Source/core/html/HTMLMediaElement.cpp

Issue 26759003: Remove HTMLMediaElement.webkitHasClosedCaptions/webkitClosedCaptionsVisible (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebase to resolve conflicts Created 7 years, 2 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
« no previous file with comments | « Source/core/html/HTMLMediaElement.h ('k') | Source/core/html/HTMLMediaElement.idl » ('j') | 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) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 3609 matching lines...) Expand 10 before | Expand all | Expand 10 after
3620 3620
3621 if (RuntimeEnabledFeatures::videoTrackEnabled()) { 3621 if (RuntimeEnabledFeatures::videoTrackEnabled()) {
3622 m_processingPreferenceChange = true; 3622 m_processingPreferenceChange = true;
3623 markCaptionAndSubtitleTracksAsUnconfigured(); 3623 markCaptionAndSubtitleTracksAsUnconfigured();
3624 m_processingPreferenceChange = false; 3624 m_processingPreferenceChange = false;
3625 3625
3626 updateTextTrackDisplay(); 3626 updateTextTrackDisplay();
3627 } 3627 }
3628 } 3628 }
3629 3629
3630 void HTMLMediaElement::setWebkitClosedCaptionsVisible(bool visible)
3631 {
3632 setClosedCaptionsVisible(visible);
3633 }
3634
3635 bool HTMLMediaElement::webkitClosedCaptionsVisible() const
3636 {
3637 return closedCaptionsVisible();
3638 }
3639
3640
3641 bool HTMLMediaElement::webkitHasClosedCaptions() const
3642 {
3643 return hasClosedCaptions();
3644 }
3645
3646 unsigned HTMLMediaElement::webkitAudioDecodedByteCount() const 3630 unsigned HTMLMediaElement::webkitAudioDecodedByteCount() const
3647 { 3631 {
3648 if (!m_player) 3632 if (!m_player)
3649 return 0; 3633 return 0;
3650 return m_player->audioDecodedByteCount(); 3634 return m_player->audioDecodedByteCount();
3651 } 3635 }
3652 3636
3653 unsigned HTMLMediaElement::webkitVideoDecodedByteCount() const 3637 unsigned HTMLMediaElement::webkitVideoDecodedByteCount() const
3654 { 3638 {
3655 if (!m_player) 3639 if (!m_player)
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after
3979 { 3963 {
3980 m_restrictions = NoRestrictions; 3964 m_restrictions = NoRestrictions;
3981 } 3965 }
3982 3966
3983 void HTMLMediaElement::mediaPlayerScheduleLayerUpdate() 3967 void HTMLMediaElement::mediaPlayerScheduleLayerUpdate()
3984 { 3968 {
3985 scheduleLayerUpdate(); 3969 scheduleLayerUpdate();
3986 } 3970 }
3987 3971
3988 } 3972 }
OLDNEW
« no previous file with comments | « Source/core/html/HTMLMediaElement.h ('k') | Source/core/html/HTMLMediaElement.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698