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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 150423006: Remove MediaController::m_mediaGroup (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 10 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 | no next file » | 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) 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2011 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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 class MediaController FINAL : public RefCounted<MediaController>, public ScriptW rappable, public MediaControllerInterface, public EventTargetWithInlineData { 46 class MediaController FINAL : public RefCounted<MediaController>, public ScriptW rappable, public MediaControllerInterface, public EventTargetWithInlineData {
47 REFCOUNTED_EVENT_TARGET(MediaController); 47 REFCOUNTED_EVENT_TARGET(MediaController);
48 public: 48 public:
49 static PassRefPtr<MediaController> create(ExecutionContext*); 49 static PassRefPtr<MediaController> create(ExecutionContext*);
50 virtual ~MediaController(); 50 virtual ~MediaController();
51 51
52 void addMediaElement(HTMLMediaElement*); 52 void addMediaElement(HTMLMediaElement*);
53 void removeMediaElement(HTMLMediaElement*); 53 void removeMediaElement(HTMLMediaElement*);
54 bool containsMediaElement(HTMLMediaElement*) const; 54 bool containsMediaElement(HTMLMediaElement*) const;
55 55
56 const String& mediaGroup() const { return m_mediaGroup; }
57
58 virtual PassRefPtr<TimeRanges> buffered() const OVERRIDE; 56 virtual PassRefPtr<TimeRanges> buffered() const OVERRIDE;
59 virtual PassRefPtr<TimeRanges> seekable() const OVERRIDE; 57 virtual PassRefPtr<TimeRanges> seekable() const OVERRIDE;
60 virtual PassRefPtr<TimeRanges> played() OVERRIDE; 58 virtual PassRefPtr<TimeRanges> played() OVERRIDE;
61 59
62 virtual double duration() const OVERRIDE; 60 virtual double duration() const OVERRIDE;
63 virtual double currentTime() const OVERRIDE; 61 virtual double currentTime() const OVERRIDE;
64 virtual void setCurrentTime(double, ExceptionState&) OVERRIDE; 62 virtual void setCurrentTime(double, ExceptionState&) OVERRIDE;
65 63
66 virtual bool paused() const OVERRIDE { return m_paused; } 64 virtual bool paused() const OVERRIDE { return m_paused; }
67 virtual void play() OVERRIDE; 65 virtual void play() OVERRIDE;
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 bool m_paused; 128 bool m_paused;
131 double m_defaultPlaybackRate; 129 double m_defaultPlaybackRate;
132 double m_volume; 130 double m_volume;
133 mutable double m_position; 131 mutable double m_position;
134 bool m_muted; 132 bool m_muted;
135 ReadyState m_readyState; 133 ReadyState m_readyState;
136 PlaybackState m_playbackState; 134 PlaybackState m_playbackState;
137 Vector<RefPtr<Event> > m_pendingEvents; 135 Vector<RefPtr<Event> > m_pendingEvents;
138 Timer<MediaController> m_asyncEventTimer; 136 Timer<MediaController> m_asyncEventTimer;
139 mutable Timer<MediaController> m_clearPositionTimer; 137 mutable Timer<MediaController> m_clearPositionTimer;
140 String m_mediaGroup;
141 bool m_closedCaptionsVisible; 138 bool m_closedCaptionsVisible;
142 OwnPtr<Clock> m_clock; 139 OwnPtr<Clock> m_clock;
143 ExecutionContext* m_executionContext; 140 ExecutionContext* m_executionContext;
144 Timer<MediaController> m_timeupdateTimer; 141 Timer<MediaController> m_timeupdateTimer;
145 double m_previousTimeupdateTime; 142 double m_previousTimeupdateTime;
146 }; 143 };
147 144
148 } // namespace WebCore 145 } // namespace WebCore
149 146
150 #endif 147 #endif
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698