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

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

Issue 988763002: Start separating the text track container from the media controls (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase. Created 5 years, 9 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/dom/Node.h ('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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 class CueTimeline; 51 class CueTimeline;
52 class Event; 52 class Event;
53 class ExceptionState; 53 class ExceptionState;
54 class HTMLSourceElement; 54 class HTMLSourceElement;
55 class HTMLTrackElement; 55 class HTMLTrackElement;
56 class KURL; 56 class KURL;
57 class MediaController; 57 class MediaController;
58 class MediaControls; 58 class MediaControls;
59 class MediaError; 59 class MediaError;
60 class HTMLMediaSource; 60 class HTMLMediaSource;
61 class TextTrackContainer;
61 class TextTrackList; 62 class TextTrackList;
62 class TimeRanges; 63 class TimeRanges;
63 class URLRegistry; 64 class URLRegistry;
64 class VideoTrackList; 65 class VideoTrackList;
65 66
66 // FIXME: The inheritance from MediaPlayerClient here should be private inherita nce. 67 // FIXME: The inheritance from MediaPlayerClient here should be private inherita nce.
67 // But it can't be until the Chromium WebMediaPlayerClientImpl class is fixed so it 68 // But it can't be until the Chromium WebMediaPlayerClientImpl class is fixed so it
68 // no longer depends on typecasting a MediaPlayerClient to an HTMLMediaElement. 69 // no longer depends on typecasting a MediaPlayerClient to an HTMLMediaElement.
69 70
70 class HTMLMediaElement : public HTMLElement, public WillBeHeapSupplementable<HTM LMediaElement>, public MediaPlayerClient, public ActiveDOMObject { 71 class HTMLMediaElement : public HTMLElement, public WillBeHeapSupplementable<HTM LMediaElement>, public MediaPlayerClient, public ActiveDOMObject {
(...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after
407 enum class LoopCondition { Included, Ignored }; 408 enum class LoopCondition { Included, Ignored };
408 bool endedPlayback(LoopCondition = LoopCondition::Included) const; 409 bool endedPlayback(LoopCondition = LoopCondition::Included) const;
409 410
410 void setShouldDelayLoadEvent(bool); 411 void setShouldDelayLoadEvent(bool);
411 void invalidateCachedTime(); 412 void invalidateCachedTime();
412 void refreshCachedTime() const; 413 void refreshCachedTime() const;
413 414
414 void ensureMediaControls(); 415 void ensureMediaControls();
415 void configureMediaControls(); 416 void configureMediaControls();
416 417
418 TextTrackContainer& ensureTextTrackContainer();
419
417 virtual void* preDispatchEventHandler(Event*) override final; 420 virtual void* preDispatchEventHandler(Event*) override final;
418 421
419 void changeNetworkStateFromLoadingToIdle(); 422 void changeNetworkStateFromLoadingToIdle();
420 423
421 const AtomicString& mediaGroup() const; 424 const AtomicString& mediaGroup() const;
422 void setMediaGroup(const AtomicString&); 425 void setMediaGroup(const AtomicString&);
423 void updateMediaController(); 426 void updateMediaController();
424 bool isBlocked() const; 427 bool isBlocked() const;
425 bool isBlockedOnMediaController() const; 428 bool isBlockedOnMediaController() const;
426 bool isAutoplaying() const { return m_autoplaying; } 429 bool isAutoplaying() const { return m_autoplaying; }
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
579 inline bool isHTMLMediaElement(const HTMLElement& element) 582 inline bool isHTMLMediaElement(const HTMLElement& element)
580 { 583 {
581 return isHTMLAudioElement(element) || isHTMLVideoElement(element); 584 return isHTMLAudioElement(element) || isHTMLVideoElement(element);
582 } 585 }
583 586
584 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); 587 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement);
585 588
586 } // namespace blink 589 } // namespace blink
587 590
588 #endif // HTMLMediaElement_h 591 #endif // HTMLMediaElement_h
OLDNEW
« no previous file with comments | « Source/core/dom/Node.h ('k') | Source/core/html/HTMLMediaElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698