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

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

Issue 217103004: Ignore MediaController in the muted/volume controls logic (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: repaint in updateVolume Created 6 years, 8 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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 void play(); 65 void play();
66 void pause(); 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 double volume() const { return m_volume; }
76 virtual void setVolume(double, ExceptionState&) OVERRIDE; 76 void setVolume(double, ExceptionState&);
77 77
78 virtual bool muted() const OVERRIDE { return m_muted; } 78 bool muted() const { return m_muted; }
79 virtual void setMuted(bool) OVERRIDE; 79 void setMuted(bool);
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;
88
89 bool isRestrained() const; 87 bool isRestrained() const;
90 bool isBlocked() const; 88 bool isBlocked() const;
91 89
92 void clearExecutionContext() { m_executionContext = 0; } 90 void clearExecutionContext() { m_executionContext = 0; }
93 91
94 private: 92 private:
95 MediaController(ExecutionContext*); 93 MediaController(ExecutionContext*);
96 void reportControllerState(); 94 void reportControllerState();
97 void updateReadyState(); 95 void updateReadyState();
98 void updatePlaybackState(); 96 void updatePlaybackState();
(...skipping 26 matching lines...) Expand all
125 mutable Timer<MediaController> m_clearPositionTimer; 123 mutable Timer<MediaController> m_clearPositionTimer;
126 OwnPtr<Clock> m_clock; 124 OwnPtr<Clock> m_clock;
127 ExecutionContext* m_executionContext; 125 ExecutionContext* m_executionContext;
128 Timer<MediaController> m_timeupdateTimer; 126 Timer<MediaController> m_timeupdateTimer;
129 double m_previousTimeupdateTime; 127 double m_previousTimeupdateTime;
130 }; 128 };
131 129
132 } // namespace WebCore 130 } // namespace WebCore
133 131
134 #endif 132 #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