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

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

Issue 606703002: Comply (more) with check-webkit-style in and around HTMLMediaElement (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 2 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 | « no previous file | 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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 class VideoTrackList; 67 class VideoTrackList;
68 68
69 typedef PODIntervalTree<double, TextTrackCue*> CueIntervalTree; 69 typedef PODIntervalTree<double, TextTrackCue*> CueIntervalTree;
70 typedef CueIntervalTree::IntervalType CueInterval; 70 typedef CueIntervalTree::IntervalType CueInterval;
71 typedef Vector<CueInterval> CueList; 71 typedef Vector<CueInterval> CueList;
72 72
73 // FIXME: The inheritance from MediaPlayerClient here should be private inherita nce. 73 // FIXME: The inheritance from MediaPlayerClient here should be private inherita nce.
74 // But it can't be until the Chromium WebMediaPlayerClientImpl class is fixed so it 74 // But it can't be until the Chromium WebMediaPlayerClientImpl class is fixed so it
75 // no longer depends on typecasting a MediaPlayerClient to an HTMLMediaElement. 75 // no longer depends on typecasting a MediaPlayerClient to an HTMLMediaElement.
76 76
77 class HTMLMediaElement : public HTMLElement, public WillBeHeapSupplementable<HTM LMediaElement>, public MediaPlayerClient, public ActiveDOMObject 77 class HTMLMediaElement : public HTMLElement, public WillBeHeapSupplementable<HTM LMediaElement>, public MediaPlayerClient, public ActiveDOMObject {
78 {
79 DEFINE_WRAPPERTYPEINFO(); 78 DEFINE_WRAPPERTYPEINFO();
80 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(HTMLMediaElement); 79 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(HTMLMediaElement);
81 public: 80 public:
82 static blink::WebMimeRegistry::SupportsType supportsType(const ContentType&, const String& keySystem = String()); 81 static blink::WebMimeRegistry::SupportsType supportsType(const ContentType&, const String& keySystem = String());
83 82
84 static void setMediaStreamRegistry(URLRegistry*); 83 static void setMediaStreamRegistry(URLRegistry*);
85 static bool isMediaStreamURL(const String& url); 84 static bool isMediaStreamURL(const String& url);
86 85
87 virtual void trace(Visitor*) OVERRIDE; 86 virtual void trace(Visitor*) OVERRIDE;
88 #if ENABLE(WEB_AUDIO) 87 #if ENABLE(WEB_AUDIO)
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 double defaultPlaybackRate() const; 138 double defaultPlaybackRate() const;
140 void setDefaultPlaybackRate(double); 139 void setDefaultPlaybackRate(double);
141 double playbackRate() const; 140 double playbackRate() const;
142 void setPlaybackRate(double); 141 void setPlaybackRate(double);
143 void updatePlaybackRate(); 142 void updatePlaybackRate();
144 PassRefPtrWillBeRawPtr<TimeRanges> played(); 143 PassRefPtrWillBeRawPtr<TimeRanges> played();
145 PassRefPtrWillBeRawPtr<TimeRanges> seekable() const; 144 PassRefPtrWillBeRawPtr<TimeRanges> seekable() const;
146 bool ended() const; 145 bool ended() const;
147 bool autoplay() const; 146 bool autoplay() const;
148 bool loop() const; 147 bool loop() const;
149 void setLoop(bool b); 148 void setLoop(bool);
150 void play(); 149 void play();
151 void pause(); 150 void pause();
152 void requestRemotePlayback(); 151 void requestRemotePlayback();
153 void requestRemotePlaybackControl(); 152 void requestRemotePlaybackControl();
154 153
155 // statistics 154 // statistics
156 unsigned webkitAudioDecodedByteCount() const; 155 unsigned webkitAudioDecodedByteCount() const;
157 unsigned webkitVideoDecodedByteCount() const; 156 unsigned webkitVideoDecodedByteCount() const;
158 157
159 // media source extensions 158 // media source extensions
(...skipping 471 matching lines...) Expand 10 before | Expand all | Expand 10 after
631 inline bool isHTMLMediaElement(const HTMLElement& element) 630 inline bool isHTMLMediaElement(const HTMLElement& element)
632 { 631 {
633 return isHTMLAudioElement(element) || isHTMLVideoElement(element); 632 return isHTMLAudioElement(element) || isHTMLVideoElement(element);
634 } 633 }
635 634
636 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); 635 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement);
637 636
638 } // namespace blink 637 } // namespace blink
639 638
640 #endif // HTMLMediaElement_h 639 #endif // HTMLMediaElement_h
OLDNEW
« no previous file with comments | « no previous file | Source/core/html/HTMLMediaElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698