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

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

Issue 22454003: Support subtitles for native fullscreen video (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: enabling layout tests Created 7 years, 3 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
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 3541 matching lines...) Expand 10 before | Expand all | Expand 10 after
3552 void HTMLMediaElement::exitFullscreen() 3552 void HTMLMediaElement::exitFullscreen()
3553 { 3553 {
3554 LOG(Media, "HTMLMediaElement::exitFullscreen"); 3554 LOG(Media, "HTMLMediaElement::exitFullscreen");
3555 3555
3556 if (document().settings() && document().settings()->fullScreenEnabled() && i sFullscreen()) 3556 if (document().settings() && document().settings()->fullScreenEnabled() && i sFullscreen())
3557 FullscreenElementStack::from(&document())->webkitCancelFullScreen(); 3557 FullscreenElementStack::from(&document())->webkitCancelFullScreen();
3558 } 3558 }
3559 3559
3560 void HTMLMediaElement::didBecomeFullscreenElement() 3560 void HTMLMediaElement::didBecomeFullscreenElement()
3561 { 3561 {
3562 Element::didBecomeFullscreenElement();
3562 if (hasMediaControls()) 3563 if (hasMediaControls())
3563 mediaControls()->enteredFullscreen(); 3564 mediaControls()->enteredFullscreen();
3564 } 3565 }
3565 3566
3566 void HTMLMediaElement::willStopBeingFullscreenElement() 3567 void HTMLMediaElement::willStopBeingFullscreenElement()
3567 { 3568 {
3568 if (hasMediaControls()) 3569 if (hasMediaControls())
3569 mediaControls()->exitedFullscreen(); 3570 mediaControls()->exitedFullscreen();
3571 Element::willStopBeingFullscreenElement();
3570 } 3572 }
3571 3573
3572 WebKit::WebLayer* HTMLMediaElement::platformLayer() const 3574 WebKit::WebLayer* HTMLMediaElement::platformLayer() const
3573 { 3575 {
3574 return m_player ? m_player->platformLayer() : 0; 3576 return m_player ? m_player->platformLayer() : 0;
3575 } 3577 }
3576 3578
3577 bool HTMLMediaElement::hasClosedCaptions() const 3579 bool HTMLMediaElement::hasClosedCaptions() const
3578 { 3580 {
3579 if (RuntimeEnabledFeatures::videoTrackEnabled() && m_textTracks) { 3581 if (RuntimeEnabledFeatures::videoTrackEnabled() && m_textTracks) {
(...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after
3987 { 3989 {
3988 m_restrictions = NoRestrictions; 3990 m_restrictions = NoRestrictions;
3989 } 3991 }
3990 3992
3991 void HTMLMediaElement::mediaPlayerScheduleLayerUpdate() 3993 void HTMLMediaElement::mediaPlayerScheduleLayerUpdate()
3992 { 3994 {
3993 scheduleLayerUpdate(); 3995 scheduleLayerUpdate();
3994 } 3996 }
3995 3997
3996 } 3998 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698