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

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

Issue 428263004: Revert of Delete mediaPlaybackRequiresUserGesture (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/frame/Settings.in ('k') | Source/core/html/HTMLMediaElement.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 528 matching lines...) Expand 10 before | Expand all | Expand 10 after
539 mutable double m_cachedTimeWallClockUpdateTime; 539 mutable double m_cachedTimeWallClockUpdateTime;
540 mutable double m_minimumWallClockTimeToCacheMediaTime; 540 mutable double m_minimumWallClockTimeToCacheMediaTime;
541 541
542 double m_fragmentStartTime; 542 double m_fragmentStartTime;
543 double m_fragmentEndTime; 543 double m_fragmentEndTime;
544 544
545 typedef unsigned PendingActionFlags; 545 typedef unsigned PendingActionFlags;
546 PendingActionFlags m_pendingActionFlags; 546 PendingActionFlags m_pendingActionFlags;
547 547
548 // FIXME: MediaElement has way too many state bits. 548 // FIXME: MediaElement has way too many state bits.
549 bool m_userGestureRequiredForPlay : 1;
549 bool m_playing : 1; 550 bool m_playing : 1;
550 bool m_shouldDelayLoadEvent : 1; 551 bool m_shouldDelayLoadEvent : 1;
551 bool m_haveFiredLoadedData : 1; 552 bool m_haveFiredLoadedData : 1;
552 bool m_active : 1; 553 bool m_active : 1;
553 bool m_autoplaying : 1; 554 bool m_autoplaying : 1;
554 bool m_muted : 1; 555 bool m_muted : 1;
555 bool m_paused : 1; 556 bool m_paused : 1;
556 bool m_seeking : 1; 557 bool m_seeking : 1;
557 558
558 // data has not been loaded since sending a "stalled" event 559 // data has not been loaded since sending a "stalled" event
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
625 inline bool isHTMLMediaElement(const HTMLElement& element) 626 inline bool isHTMLMediaElement(const HTMLElement& element)
626 { 627 {
627 return isHTMLAudioElement(element) || isHTMLVideoElement(element); 628 return isHTMLAudioElement(element) || isHTMLVideoElement(element);
628 } 629 }
629 630
630 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); 631 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement);
631 632
632 } //namespace 633 } //namespace
633 634
634 #endif 635 #endif
OLDNEW
« no previous file with comments | « Source/core/frame/Settings.in ('k') | Source/core/html/HTMLMediaElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698