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

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

Issue 2588823002: Media Controls: change how the MediaControls object is created and handled. (Closed)
Patch Set: fix tests Created 3 years, 12 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
« no previous file with comments | « no previous file | third_party/WebKit/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 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 465 matching lines...) Expand 10 before | Expand all | Expand 10 after
476 476
477 void setShouldDelayLoadEvent(bool); 477 void setShouldDelayLoadEvent(bool);
478 478
479 double earliestPossiblePosition() const; 479 double earliestPossiblePosition() const;
480 double currentPlaybackPosition() const; 480 double currentPlaybackPosition() const;
481 double officialPlaybackPosition() const; 481 double officialPlaybackPosition() const;
482 void setOfficialPlaybackPosition(double) const; 482 void setOfficialPlaybackPosition(double) const;
483 void requireOfficialPlaybackPositionUpdate() const; 483 void requireOfficialPlaybackPositionUpdate() const;
484 484
485 void ensureMediaControls(); 485 void ensureMediaControls();
486 void configureMediaControls(); 486 void updateControlsVisibility();
487 487
488 TextTrackContainer& ensureTextTrackContainer(); 488 TextTrackContainer& ensureTextTrackContainer();
489 489
490 void changeNetworkStateFromLoadingToIdle(); 490 void changeNetworkStateFromLoadingToIdle();
491 491
492 bool isAutoplaying() const { return m_autoplaying; } 492 bool isAutoplaying() const { return m_autoplaying; }
493 493
494 WebMediaPlayer::CORSMode corsMode() const; 494 WebMediaPlayer::CORSMode corsMode() const;
495 495
496 // Returns the "direction of playback" value as specified in the HTML5 spec. 496 // Returns the "direction of playback" value as specified in the HTML5 spec.
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
739 739
740 Member<AutoplayUmaHelper> m_autoplayUmaHelper; 740 Member<AutoplayUmaHelper> m_autoplayUmaHelper;
741 741
742 WebRemotePlaybackClient* m_remotePlaybackClient; 742 WebRemotePlaybackClient* m_remotePlaybackClient;
743 743
744 // class AutoplayVisibilityObserver; 744 // class AutoplayVisibilityObserver;
745 Member<ElementVisibilityObserver> m_autoplayVisibilityObserver; 745 Member<ElementVisibilityObserver> m_autoplayVisibilityObserver;
746 746
747 IntRect m_currentIntersectRect; 747 IntRect m_currentIntersectRect;
748 748
749 Member<MediaControls> m_mediaControls;
750
749 static URLRegistry* s_mediaStreamRegistry; 751 static URLRegistry* s_mediaStreamRegistry;
750 }; 752 };
751 753
752 inline bool isHTMLMediaElement(const HTMLElement& element) { 754 inline bool isHTMLMediaElement(const HTMLElement& element) {
753 return isHTMLAudioElement(element) || isHTMLVideoElement(element); 755 return isHTMLAudioElement(element) || isHTMLVideoElement(element);
754 } 756 }
755 757
756 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); 758 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement);
757 759
758 } // namespace blink 760 } // namespace blink
759 761
760 #endif // HTMLMediaElement_h 762 #endif // HTMLMediaElement_h
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/html/HTMLMediaElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698