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

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

Issue 2654083006: Revert of Sync requestFullscreen() and exitFullscreen() algorithms with the spec (Closed)
Patch Set: add failing test expectations 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 3431 matching lines...) Expand 10 before | Expand all | Expand 10 after
3442 return true; 3442 return true;
3443 3443
3444 // Wait for any pending events to be fired. 3444 // Wait for any pending events to be fired.
3445 if (m_asyncEventQueue->hasPendingEvents()) 3445 if (m_asyncEventQueue->hasPendingEvents())
3446 return true; 3446 return true;
3447 3447
3448 return false; 3448 return false;
3449 } 3449 }
3450 3450
3451 bool HTMLMediaElement::isFullscreen() const { 3451 bool HTMLMediaElement::isFullscreen() const {
3452 return Fullscreen::isFullscreenElement(*this); 3452 return Fullscreen::isCurrentFullScreenElement(*this);
3453 } 3453 }
3454 3454
3455 void HTMLMediaElement::didEnterFullscreen() { 3455 void HTMLMediaElement::didEnterFullscreen() {
3456 updateControlsVisibility(); 3456 updateControlsVisibility();
3457 3457
3458 // FIXME: There is no embedder-side handling in layout test mode. 3458 // FIXME: There is no embedder-side handling in layout test mode.
3459 if (webMediaPlayer() && !LayoutTestSupport::isRunningLayoutTest()) 3459 if (webMediaPlayer() && !LayoutTestSupport::isRunningLayoutTest())
3460 webMediaPlayer()->enteredFullscreen(); 3460 webMediaPlayer()->enteredFullscreen();
3461 // Cache this in case the player is destroyed before leaving fullscreen. 3461 // Cache this in case the player is destroyed before leaving fullscreen.
3462 m_inOverlayFullscreenVideo = usesOverlayFullscreenVideo(); 3462 m_inOverlayFullscreenVideo = usesOverlayFullscreenVideo();
(...skipping 665 matching lines...) Expand 10 before | Expand all | Expand 10 after
4128 kMostlyFillViewportBecomeStableSeconds, BLINK_FROM_HERE); 4128 kMostlyFillViewportBecomeStableSeconds, BLINK_FROM_HERE);
4129 } 4129 }
4130 4130
4131 void HTMLMediaElement::viewportFillDebouncerTimerFired(TimerBase*) { 4131 void HTMLMediaElement::viewportFillDebouncerTimerFired(TimerBase*) {
4132 m_mostlyFillingViewport = true; 4132 m_mostlyFillingViewport = true;
4133 if (m_webMediaPlayer) 4133 if (m_webMediaPlayer)
4134 m_webMediaPlayer->becameDominantVisibleContent(m_mostlyFillingViewport); 4134 m_webMediaPlayer->becameDominantVisibleContent(m_mostlyFillingViewport);
4135 } 4135 }
4136 4136
4137 } // namespace blink 4137 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698