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

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

Issue 213193010: Restore the HTMLVideoElement-specific prefixed fullscreen API behind a flag (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: revive full-screen-iframe-legacy.html 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/HTMLMediaElement.h ('k') | Source/core/html/HTMLVideoElement.h » ('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 3171 matching lines...) Expand 10 before | Expand all | Expand 10 after
3182 } 3182 }
3183 3183
3184 void HTMLMediaElement::enterFullscreen() 3184 void HTMLMediaElement::enterFullscreen()
3185 { 3185 {
3186 WTF_LOG(Media, "HTMLMediaElement::enterFullscreen"); 3186 WTF_LOG(Media, "HTMLMediaElement::enterFullscreen");
3187 3187
3188 if (document().settings() && document().settings()->fullScreenEnabled()) 3188 if (document().settings() && document().settings()->fullScreenEnabled())
3189 FullscreenElementStack::from(document()).requestFullScreenForElement(thi s, 0, FullscreenElementStack::ExemptIFrameAllowFullScreenRequirement); 3189 FullscreenElementStack::from(document()).requestFullScreenForElement(thi s, 0, FullscreenElementStack::ExemptIFrameAllowFullScreenRequirement);
3190 } 3190 }
3191 3191
3192 void HTMLMediaElement::exitFullscreen()
3193 {
3194 WTF_LOG(Media, "HTMLMediaElement::exitFullscreen");
3195
3196 if (document().settings() && document().settings()->fullScreenEnabled() && i sFullscreen())
3197 FullscreenElementStack::from(document()).webkitCancelFullScreen();
3198 }
3199
3192 void HTMLMediaElement::didBecomeFullscreenElement() 3200 void HTMLMediaElement::didBecomeFullscreenElement()
3193 { 3201 {
3194 if (hasMediaControls()) 3202 if (hasMediaControls())
3195 mediaControls()->enteredFullscreen(); 3203 mediaControls()->enteredFullscreen();
3196 if (RuntimeEnabledFeatures::overlayFullscreenVideoEnabled() && isHTMLVideoEl ement(*this)) 3204 if (RuntimeEnabledFeatures::overlayFullscreenVideoEnabled() && isHTMLVideoEl ement(*this))
3197 document().renderView()->compositor()->setCompositingLayersNeedRebuild() ; 3205 document().renderView()->compositor()->setCompositingLayersNeedRebuild() ;
3198 } 3206 }
3199 3207
3200 void HTMLMediaElement::willStopBeingFullscreenElement() 3208 void HTMLMediaElement::willStopBeingFullscreenElement()
3201 { 3209 {
(...skipping 443 matching lines...) Expand 10 before | Expand all | Expand 10 after
3645 { 3653 {
3646 m_mediaSource->setWebMediaSourceAndOpen(adoptPtr(webMediaSource)); 3654 m_mediaSource->setWebMediaSourceAndOpen(adoptPtr(webMediaSource));
3647 } 3655 }
3648 3656
3649 bool HTMLMediaElement::isInteractiveContent() const 3657 bool HTMLMediaElement::isInteractiveContent() const
3650 { 3658 {
3651 return fastHasAttribute(controlsAttr); 3659 return fastHasAttribute(controlsAttr);
3652 } 3660 }
3653 3661
3654 } 3662 }
OLDNEW
« no previous file with comments | « Source/core/html/HTMLMediaElement.h ('k') | Source/core/html/HTMLVideoElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698