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

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

Issue 214793005: Use HTMLMediaElement::togglePlayState() where appropriate (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: documentation Created 6 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/html/HTMLMediaElement.cpp ('k') | Source/core/html/MediaController.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) 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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 bool containsMediaElement(HTMLMediaElement*) const; 54 bool containsMediaElement(HTMLMediaElement*) const;
55 55
56 PassRefPtr<TimeRanges> buffered() const; 56 PassRefPtr<TimeRanges> buffered() const;
57 PassRefPtr<TimeRanges> seekable() const; 57 PassRefPtr<TimeRanges> seekable() const;
58 PassRefPtr<TimeRanges> played(); 58 PassRefPtr<TimeRanges> played();
59 59
60 virtual double duration() const OVERRIDE; 60 virtual double duration() const OVERRIDE;
61 virtual double currentTime() const OVERRIDE; 61 virtual double currentTime() const OVERRIDE;
62 virtual void setCurrentTime(double, ExceptionState&) OVERRIDE; 62 virtual void setCurrentTime(double, ExceptionState&) OVERRIDE;
63 63
64 virtual bool paused() const OVERRIDE { return m_paused; } 64 bool paused() const { return m_paused; }
65 virtual void play() OVERRIDE; 65 void play();
66 virtual void pause() OVERRIDE; 66 void pause();
67 void unpause(); 67 void unpause();
68 68
69 double defaultPlaybackRate() const { return m_defaultPlaybackRate; } 69 double defaultPlaybackRate() const { return m_defaultPlaybackRate; }
70 void setDefaultPlaybackRate(double); 70 void setDefaultPlaybackRate(double);
71 71
72 double playbackRate() const; 72 double playbackRate() const;
73 void setPlaybackRate(double); 73 void setPlaybackRate(double);
74 74
75 virtual double volume() const OVERRIDE { return m_volume; } 75 virtual double volume() const OVERRIDE { return m_volume; }
76 virtual void setVolume(double, ExceptionState&) OVERRIDE; 76 virtual void setVolume(double, ExceptionState&) OVERRIDE;
77 77
78 virtual bool muted() const OVERRIDE { return m_muted; } 78 virtual bool muted() const OVERRIDE { return m_muted; }
79 virtual void setMuted(bool) OVERRIDE; 79 virtual void setMuted(bool) OVERRIDE;
80 80
81 typedef HTMLMediaElement::ReadyState ReadyState; 81 typedef HTMLMediaElement::ReadyState ReadyState;
82 ReadyState readyState() const { return m_readyState; } 82 ReadyState readyState() const { return m_readyState; }
83 83
84 enum PlaybackState { WAITING, PLAYING, ENDED }; 84 enum PlaybackState { WAITING, PLAYING, ENDED };
85 const AtomicString& playbackState() const; 85 const AtomicString& playbackState() const;
86 86
87 virtual bool hasAudio() const OVERRIDE; 87 virtual bool hasAudio() const OVERRIDE;
88 88
89 virtual bool canPlay() const OVERRIDE;
90
91 bool isRestrained() const; 89 bool isRestrained() const;
92 bool isBlocked() const; 90 bool isBlocked() const;
93 91
94 void clearExecutionContext() { m_executionContext = 0; } 92 void clearExecutionContext() { m_executionContext = 0; }
95 93
96 private: 94 private:
97 MediaController(ExecutionContext*); 95 MediaController(ExecutionContext*);
98 void reportControllerState(); 96 void reportControllerState();
99 void updateReadyState(); 97 void updateReadyState();
100 void updatePlaybackState(); 98 void updatePlaybackState();
(...skipping 26 matching lines...) Expand all
127 mutable Timer<MediaController> m_clearPositionTimer; 125 mutable Timer<MediaController> m_clearPositionTimer;
128 OwnPtr<Clock> m_clock; 126 OwnPtr<Clock> m_clock;
129 ExecutionContext* m_executionContext; 127 ExecutionContext* m_executionContext;
130 Timer<MediaController> m_timeupdateTimer; 128 Timer<MediaController> m_timeupdateTimer;
131 double m_previousTimeupdateTime; 129 double m_previousTimeupdateTime;
132 }; 130 };
133 131
134 } // namespace WebCore 132 } // namespace WebCore
135 133
136 #endif 134 #endif
OLDNEW
« no previous file with comments | « Source/core/html/HTMLMediaElement.cpp ('k') | Source/core/html/MediaController.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698