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

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

Issue 2667913002: Revert of Sync requestFullscreen() and exitFullscreen() algorithms with the spec (patchset #3 id:40… (Closed)
Patch Set: Created 3 years, 10 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights
3 * reserved. 3 * reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 3429 matching lines...) Expand 10 before | Expand all | Expand 10 after
3440 return true; 3440 return true;
3441 3441
3442 // Wait for any pending events to be fired. 3442 // Wait for any pending events to be fired.
3443 if (m_asyncEventQueue->hasPendingEvents()) 3443 if (m_asyncEventQueue->hasPendingEvents())
3444 return true; 3444 return true;
3445 3445
3446 return false; 3446 return false;
3447 } 3447 }
3448 3448
3449 bool HTMLMediaElement::isFullscreen() const { 3449 bool HTMLMediaElement::isFullscreen() const {
3450 return Fullscreen::isFullscreenElement(*this); 3450 return Fullscreen::isCurrentFullScreenElement(*this);
3451 } 3451 }
3452 3452
3453 void HTMLMediaElement::didEnterFullscreen() { 3453 void HTMLMediaElement::didEnterFullscreen() {
3454 updateControlsVisibility(); 3454 updateControlsVisibility();
3455 3455
3456 // FIXME: There is no embedder-side handling in layout test mode. 3456 // FIXME: There is no embedder-side handling in layout test mode.
3457 if (webMediaPlayer() && !LayoutTestSupport::isRunningLayoutTest()) 3457 if (webMediaPlayer() && !LayoutTestSupport::isRunningLayoutTest())
3458 webMediaPlayer()->enteredFullscreen(); 3458 webMediaPlayer()->enteredFullscreen();
3459 // Cache this in case the player is destroyed before leaving fullscreen. 3459 // Cache this in case the player is destroyed before leaving fullscreen.
3460 m_inOverlayFullscreenVideo = usesOverlayFullscreenVideo(); 3460 m_inOverlayFullscreenVideo = usesOverlayFullscreenVideo();
(...skipping 665 matching lines...) Expand 10 before | Expand all | Expand 10 after
4126 kMostlyFillViewportBecomeStableSeconds, BLINK_FROM_HERE); 4126 kMostlyFillViewportBecomeStableSeconds, BLINK_FROM_HERE);
4127 } 4127 }
4128 4128
4129 void HTMLMediaElement::viewportFillDebouncerTimerFired(TimerBase*) { 4129 void HTMLMediaElement::viewportFillDebouncerTimerFired(TimerBase*) {
4130 m_mostlyFillingViewport = true; 4130 m_mostlyFillingViewport = true;
4131 if (m_webMediaPlayer) 4131 if (m_webMediaPlayer)
4132 m_webMediaPlayer->becameDominantVisibleContent(m_mostlyFillingViewport); 4132 m_webMediaPlayer->becameDominantVisibleContent(m_mostlyFillingViewport);
4133 } 4133 }
4134 4134
4135 } // namespace blink 4135 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698