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

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

Issue 387233002: Introduce FullscreenElementStack::fullyExitFullscreen() (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 5 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/dom/FullscreenElementStack.cpp ('k') | Source/web/FullscreenController.cpp » ('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 3454 matching lines...) Expand 10 before | Expand all | Expand 10 after
3465 { 3465 {
3466 WTF_LOG(Media, "HTMLMediaElement::enterFullscreen"); 3466 WTF_LOG(Media, "HTMLMediaElement::enterFullscreen");
3467 3467
3468 FullscreenElementStack::from(document()).requestFullScreenForElement(*this, FullscreenElementStack::PrefixedVideoRequest); 3468 FullscreenElementStack::from(document()).requestFullScreenForElement(*this, FullscreenElementStack::PrefixedVideoRequest);
3469 } 3469 }
3470 3470
3471 void HTMLMediaElement::exitFullscreen() 3471 void HTMLMediaElement::exitFullscreen()
3472 { 3472 {
3473 WTF_LOG(Media, "HTMLMediaElement::exitFullscreen"); 3473 WTF_LOG(Media, "HTMLMediaElement::exitFullscreen");
3474 3474
3475 FullscreenElementStack::from(document()).webkitCancelFullScreen(); 3475 FullscreenElementStack::from(document()).fullyExitFullscreen();
3476 } 3476 }
3477 3477
3478 void HTMLMediaElement::didBecomeFullscreenElement() 3478 void HTMLMediaElement::didBecomeFullscreenElement()
3479 { 3479 {
3480 if (hasMediaControls()) 3480 if (hasMediaControls())
3481 mediaControls()->enteredFullscreen(); 3481 mediaControls()->enteredFullscreen();
3482 if (RuntimeEnabledFeatures::overlayFullscreenVideoEnabled() && isHTMLVideoEl ement(*this)) 3482 if (RuntimeEnabledFeatures::overlayFullscreenVideoEnabled() && isHTMLVideoEl ement(*this))
3483 document().renderView()->compositor()->setNeedsCompositingUpdate(Composi tingUpdateRebuildTree); 3483 document().renderView()->compositor()->setNeedsCompositingUpdate(Composi tingUpdateRebuildTree);
3484 } 3484 }
3485 3485
(...skipping 481 matching lines...) Expand 10 before | Expand all | Expand 10 after
3967 3967
3968 #if ENABLE(WEB_AUDIO) 3968 #if ENABLE(WEB_AUDIO)
3969 void HTMLMediaElement::clearWeakMembers(Visitor* visitor) 3969 void HTMLMediaElement::clearWeakMembers(Visitor* visitor)
3970 { 3970 {
3971 if (!visitor->isAlive(m_audioSourceNode) && audioSourceProvider()) 3971 if (!visitor->isAlive(m_audioSourceNode) && audioSourceProvider())
3972 audioSourceProvider()->setClient(0); 3972 audioSourceProvider()->setClient(0);
3973 } 3973 }
3974 #endif 3974 #endif
3975 3975
3976 } 3976 }
OLDNEW
« no previous file with comments | « Source/core/dom/FullscreenElementStack.cpp ('k') | Source/web/FullscreenController.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698