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

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

Issue 1254613003: Let the WebMediaPlayer decide whether to use overlay video. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixes after rebase 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 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 // causes an ambiguity error at compile time. This class's constructor 204 // causes an ambiguity error at compile time. This class's constructor
205 // ensures that both implementations return document, so return the result 205 // ensures that both implementations return document, so return the result
206 // of one of them here. 206 // of one of them here.
207 using HTMLElement::executionContext; 207 using HTMLElement::executionContext;
208 208
209 bool hasSingleSecurityOrigin() const { return webMediaPlayer() && webMediaPl ayer()->hasSingleSecurityOrigin(); } 209 bool hasSingleSecurityOrigin() const { return webMediaPlayer() && webMediaPl ayer()->hasSingleSecurityOrigin(); }
210 210
211 bool isFullscreen() const; 211 bool isFullscreen() const;
212 void enterFullscreen(); 212 void enterFullscreen();
213 void exitFullscreen(); 213 void exitFullscreen();
214 virtual bool supportsOverlayFullscreenVideo() const { return false; }
trchen 2015/07/30 21:29:21 "supports" feels like the implementation can do it
watk 2015/08/03 21:47:43 Done.
214 215
215 bool hasClosedCaptions() const; 216 bool hasClosedCaptions() const;
216 bool closedCaptionsVisible() const; 217 bool closedCaptionsVisible() const;
217 void setClosedCaptionsVisible(bool); 218 void setClosedCaptionsVisible(bool);
218 219
219 static void setTextTrackKindUserPreferenceForAllMediaElements(Document*); 220 static void setTextTrackKindUserPreferenceForAllMediaElements(Document*);
220 void automaticTrackSelectionForUpdatedUserPreference(); 221 void automaticTrackSelectionForUpdatedUserPreference();
221 222
222 // Returns the MediaControls, or null if they have not been added yet. 223 // Returns the MediaControls, or null if they have not been added yet.
223 // Note that this can be non-null even if there is no controls attribute. 224 // Note that this can be non-null even if there is no controls attribute.
(...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after
538 bool m_delayingLoadForPreloadNone : 1; 539 bool m_delayingLoadForPreloadNone : 1;
539 540
540 bool m_tracksAreReady : 1; 541 bool m_tracksAreReady : 1;
541 bool m_haveVisibleTextTrack : 1; 542 bool m_haveVisibleTextTrack : 1;
542 bool m_processingPreferenceChange : 1; 543 bool m_processingPreferenceChange : 1;
543 bool m_remoteRoutesAvailable : 1; 544 bool m_remoteRoutesAvailable : 1;
544 bool m_playingRemotely : 1; 545 bool m_playingRemotely : 1;
545 bool m_isFinalizing : 1; 546 bool m_isFinalizing : 1;
546 bool m_initialPlayWithoutUserGestures : 1; 547 bool m_initialPlayWithoutUserGestures : 1;
547 bool m_autoplayMediaCounted : 1; 548 bool m_autoplayMediaCounted : 1;
549 // Whether this element is in overlay fullscreen mode.
550 bool m_inOverlayFullscreenVideo : 1;
548 551
549 PersistentWillBeMember<AudioTrackList> m_audioTracks; 552 PersistentWillBeMember<AudioTrackList> m_audioTracks;
550 PersistentWillBeMember<VideoTrackList> m_videoTracks; 553 PersistentWillBeMember<VideoTrackList> m_videoTracks;
551 PersistentWillBeMember<TextTrackList> m_textTracks; 554 PersistentWillBeMember<TextTrackList> m_textTracks;
552 PersistentHeapVectorWillBeHeapVector<Member<TextTrack>> m_textTracksWhenReso urceSelectionBegan; 555 PersistentHeapVectorWillBeHeapVector<Member<TextTrack>> m_textTracksWhenReso urceSelectionBegan;
553 556
554 OwnPtrWillBeMember<CueTimeline> m_cueTimeline; 557 OwnPtrWillBeMember<CueTimeline> m_cueTimeline;
555 558
556 #if ENABLE(WEB_AUDIO) 559 #if ENABLE(WEB_AUDIO)
557 // This is a weak reference, since m_audioSourceNode holds a reference to us . 560 // This is a weak reference, since m_audioSourceNode holds a reference to us .
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
621 inline bool isHTMLMediaElement(const HTMLElement& element) 624 inline bool isHTMLMediaElement(const HTMLElement& element)
622 { 625 {
623 return isHTMLAudioElement(element) || isHTMLVideoElement(element); 626 return isHTMLAudioElement(element) || isHTMLVideoElement(element);
624 } 627 }
625 628
626 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); 629 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement);
627 630
628 } // namespace blink 631 } // namespace blink
629 632
630 #endif // HTMLMediaElement_h 633 #endif // HTMLMediaElement_h
OLDNEW
« no previous file with comments | « no previous file | Source/core/html/HTMLMediaElement.cpp » ('j') | Source/core/html/HTMLVideoElement.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698