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

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

Issue 1297983002: Update poster code as per https://html.spec.whatwg.org/#show-poster-flag (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 4 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 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 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 , m_lastSeekTime(0) 330 , m_lastSeekTime(0)
331 , m_previousProgressTime(std::numeric_limits<double>::max()) 331 , m_previousProgressTime(std::numeric_limits<double>::max())
332 , m_duration(std::numeric_limits<double>::quiet_NaN()) 332 , m_duration(std::numeric_limits<double>::quiet_NaN())
333 , m_lastTimeUpdateEventWallTime(0) 333 , m_lastTimeUpdateEventWallTime(0)
334 , m_lastTimeUpdateEventMovieTime(0) 334 , m_lastTimeUpdateEventMovieTime(0)
335 , m_defaultPlaybackStartPosition(0) 335 , m_defaultPlaybackStartPosition(0)
336 , m_loadState(WaitingForSource) 336 , m_loadState(WaitingForSource)
337 , m_deferredLoadState(NotDeferred) 337 , m_deferredLoadState(NotDeferred)
338 , m_deferredLoadTimer(this, &HTMLMediaElement::deferredLoadTimerFired) 338 , m_deferredLoadTimer(this, &HTMLMediaElement::deferredLoadTimerFired)
339 , m_webLayer(nullptr) 339 , m_webLayer(nullptr)
340 , m_displayMode(Unknown)
341 , m_cachedTime(std::numeric_limits<double>::quiet_NaN()) 340 , m_cachedTime(std::numeric_limits<double>::quiet_NaN())
342 , m_fragmentEndTime(std::numeric_limits<double>::quiet_NaN()) 341 , m_fragmentEndTime(std::numeric_limits<double>::quiet_NaN())
343 , m_pendingActionFlags(0) 342 , m_pendingActionFlags(0)
344 , m_userGestureRequiredForPlay(false) 343 , m_userGestureRequiredForPlay(false)
345 , m_playing(false) 344 , m_playing(false)
346 , m_shouldDelayLoadEvent(false) 345 , m_shouldDelayLoadEvent(false)
347 , m_haveFiredLoadedData(false) 346 , m_haveFiredLoadedData(false)
348 , m_autoplaying(true) 347 , m_autoplaying(true)
349 , m_muted(false) 348 , m_muted(false)
350 , m_paused(true) 349 , m_paused(true)
(...skipping 374 matching lines...) Expand 10 before | Expand all | Expand 10 after
725 stopPeriodicTimers(); 724 stopPeriodicTimers();
726 m_loadTimer.stop(); 725 m_loadTimer.stop();
727 cancelDeferredLoad(); 726 cancelDeferredLoad();
728 // FIXME: Figure out appropriate place to reset LoadTextTrackResource if nec essary and set m_pendingActionFlags to 0 here. 727 // FIXME: Figure out appropriate place to reset LoadTextTrackResource if nec essary and set m_pendingActionFlags to 0 here.
729 m_pendingActionFlags &= ~LoadMediaResource; 728 m_pendingActionFlags &= ~LoadMediaResource;
730 m_sentEndEvent = false; 729 m_sentEndEvent = false;
731 m_sentStalledEvent = false; 730 m_sentStalledEvent = false;
732 m_haveFiredLoadedData = false; 731 m_haveFiredLoadedData = false;
733 m_completelyLoaded = false; 732 m_completelyLoaded = false;
734 m_havePreparedToPlay = false; 733 m_havePreparedToPlay = false;
735 m_displayMode = Unknown; 734 setDisplayMode(Unknown);
736 735
737 // 1 - Abort any already-running instance of the resource selection algorith m for this element. 736 // 1 - Abort any already-running instance of the resource selection algorith m for this element.
738 m_loadState = WaitingForSource; 737 m_loadState = WaitingForSource;
739 m_currentSourceNode = nullptr; 738 m_currentSourceNode = nullptr;
740 739
741 // 2 - If there are any tasks from the media element's media element event t ask source in 740 // 2 - If there are any tasks from the media element's media element event t ask source in
742 // one of the task queues, then remove those tasks. 741 // one of the task queues, then remove those tasks.
743 cancelPendingEventsAndCallbacks(); 742 cancelPendingEventsAndCallbacks();
744 743
745 // 3 - If the media element's networkState is set to NETWORK_LOADING or NETW ORK_IDLE, queue 744 // 3 - If the media element's networkState is set to NETWORK_LOADING or NETW ORK_IDLE, queue
(...skipping 3036 matching lines...) Expand 10 before | Expand all | Expand 10 after
3782 visitor->trace(m_client); 3781 visitor->trace(m_client);
3783 } 3782 }
3784 3783
3785 DEFINE_TRACE(HTMLMediaElement::AudioSourceProviderImpl) 3784 DEFINE_TRACE(HTMLMediaElement::AudioSourceProviderImpl)
3786 { 3785 {
3787 visitor->trace(m_client); 3786 visitor->trace(m_client);
3788 } 3787 }
3789 #endif 3788 #endif
3790 3789
3791 } 3790 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698