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

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: add dangling pointer check 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 3550 matching lines...) Expand 10 before | Expand all | Expand 10 after
3561 void HTMLMediaElement::exitFullscreen() 3561 void HTMLMediaElement::exitFullscreen()
3562 { 3562 {
3563 LOG(Media, "HTMLMediaElement::exitFullscreen"); 3563 LOG(Media, "HTMLMediaElement::exitFullscreen");
3564 3564
3565 if (document().settings() && document().settings()->fullScreenEnabled() && i sFullscreen()) 3565 if (document().settings() && document().settings()->fullScreenEnabled() && i sFullscreen())
3566 FullscreenElementStack::from(&document())->webkitCancelFullScreen(); 3566 FullscreenElementStack::from(&document())->webkitCancelFullScreen();
3567 } 3567 }
3568 3568
3569 void HTMLMediaElement::didBecomeFullscreenElement() 3569 void HTMLMediaElement::didBecomeFullscreenElement()
3570 { 3570 {
3571 Element::didBecomeFullscreenElement();
3571 if (hasMediaControls()) 3572 if (hasMediaControls())
3572 mediaControls()->enteredFullscreen(); 3573 mediaControls()->enteredFullscreen();
3573 } 3574 }
3574 3575
3575 void HTMLMediaElement::willStopBeingFullscreenElement() 3576 void HTMLMediaElement::willStopBeingFullscreenElement()
3576 { 3577 {
3577 if (hasMediaControls()) 3578 if (hasMediaControls())
3578 mediaControls()->exitedFullscreen(); 3579 mediaControls()->exitedFullscreen();
3580 Element::willStopBeingFullscreenElement();
3579 } 3581 }
3580 3582
3581 WebKit::WebLayer* HTMLMediaElement::platformLayer() const 3583 WebKit::WebLayer* HTMLMediaElement::platformLayer() const
3582 { 3584 {
3583 return m_player ? m_player->platformLayer() : 0; 3585 return m_player ? m_player->platformLayer() : 0;
3584 } 3586 }
3585 3587
3586 bool HTMLMediaElement::hasClosedCaptions() const 3588 bool HTMLMediaElement::hasClosedCaptions() const
3587 { 3589 {
3588 if (RuntimeEnabledFeatures::videoTrackEnabled() && m_textTracks) { 3590 if (RuntimeEnabledFeatures::videoTrackEnabled() && m_textTracks) {
(...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after
3996 { 3998 {
3997 m_restrictions = NoRestrictions; 3999 m_restrictions = NoRestrictions;
3998 } 4000 }
3999 4001
4000 void HTMLMediaElement::mediaPlayerScheduleLayerUpdate() 4002 void HTMLMediaElement::mediaPlayerScheduleLayerUpdate()
4001 { 4003 {
4002 scheduleLayerUpdate(); 4004 scheduleLayerUpdate();
4003 } 4005 }
4004 4006
4005 } 4007 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698