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

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

Issue 208483002: Implement the activation behavior of media elements (click to play/pause) (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: cancel activation behavior in a failing fullscreen test 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 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 void beginScrubbing() OVERRIDE; 89 virtual void beginScrubbing() OVERRIDE;
90 virtual void endScrubbing() OVERRIDE; 90 virtual void endScrubbing() OVERRIDE;
91 91
92 virtual bool canPlay() const OVERRIDE; 92 virtual bool canPlay() const OVERRIDE;
93 93
94 bool isRestrained() const;
94 bool isBlocked() const; 95 bool isBlocked() const;
95 96
96 void clearExecutionContext() { m_executionContext = 0; } 97 void clearExecutionContext() { m_executionContext = 0; }
97 98
98 private: 99 private:
99 MediaController(ExecutionContext*); 100 MediaController(ExecutionContext*);
100 void reportControllerState(); 101 void reportControllerState();
101 void updateReadyState(); 102 void updateReadyState();
102 void updatePlaybackState(); 103 void updatePlaybackState();
103 void updateMediaElements(); 104 void updateMediaElements();
(...skipping 25 matching lines...) Expand all
129 mutable Timer<MediaController> m_clearPositionTimer; 130 mutable Timer<MediaController> m_clearPositionTimer;
130 OwnPtr<Clock> m_clock; 131 OwnPtr<Clock> m_clock;
131 ExecutionContext* m_executionContext; 132 ExecutionContext* m_executionContext;
132 Timer<MediaController> m_timeupdateTimer; 133 Timer<MediaController> m_timeupdateTimer;
133 double m_previousTimeupdateTime; 134 double m_previousTimeupdateTime;
134 }; 135 };
135 136
136 } // namespace WebCore 137 } // namespace WebCore
137 138
138 #endif 139 #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