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

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

Issue 2573773002: Sync requestFullscreen() and exitFullscreen() algorithms with the spec (Closed)
Patch Set: address feedback Created 4 years 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 3394 matching lines...) Expand 10 before | Expand all | Expand 10 after
3405 return true; 3405 return true;
3406 3406
3407 // Wait for any pending events to be fired. 3407 // Wait for any pending events to be fired.
3408 if (m_asyncEventQueue->hasPendingEvents()) 3408 if (m_asyncEventQueue->hasPendingEvents())
3409 return true; 3409 return true;
3410 3410
3411 return false; 3411 return false;
3412 } 3412 }
3413 3413
3414 bool HTMLMediaElement::isFullscreen() const { 3414 bool HTMLMediaElement::isFullscreen() const {
3415 return Fullscreen::isCurrentFullScreenElement(*this); 3415 return Fullscreen::isFullscreenElement(*this);
3416 } 3416 }
3417 3417
3418 void HTMLMediaElement::didEnterFullscreen() { 3418 void HTMLMediaElement::didEnterFullscreen() {
3419 configureMediaControls(); 3419 configureMediaControls();
3420 if (mediaControls()) 3420 if (mediaControls())
3421 mediaControls()->enteredFullscreen(); 3421 mediaControls()->enteredFullscreen();
3422 // FIXME: There is no embedder-side handling in layout test mode. 3422 // FIXME: There is no embedder-side handling in layout test mode.
3423 if (webMediaPlayer() && !LayoutTestSupport::isRunningLayoutTest()) 3423 if (webMediaPlayer() && !LayoutTestSupport::isRunningLayoutTest())
3424 webMediaPlayer()->enteredFullscreen(); 3424 webMediaPlayer()->enteredFullscreen();
3425 // Cache this in case the player is destroyed before leaving fullscreen. 3425 // Cache this in case the player is destroyed before leaving fullscreen.
(...skipping 677 matching lines...) Expand 10 before | Expand all | Expand 10 after
4103 kMostlyFillViewportBecomeStableSeconds, BLINK_FROM_HERE); 4103 kMostlyFillViewportBecomeStableSeconds, BLINK_FROM_HERE);
4104 } 4104 }
4105 4105
4106 void HTMLMediaElement::viewportFillDebouncerTimerFired(TimerBase*) { 4106 void HTMLMediaElement::viewportFillDebouncerTimerFired(TimerBase*) {
4107 m_mostlyFillingViewport = true; 4107 m_mostlyFillingViewport = true;
4108 if (m_webMediaPlayer) 4108 if (m_webMediaPlayer)
4109 m_webMediaPlayer->becameDominantVisibleContent(m_mostlyFillingViewport); 4109 m_webMediaPlayer->becameDominantVisibleContent(m_mostlyFillingViewport);
4110 } 4110 }
4111 4111
4112 } // namespace blink 4112 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698