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

Side by Side Diff: content/renderer/media/webmediaplayer_ms.h

Issue 1083683003: Speculative revert by sheriff (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed an unrelated commit that had accidentally slipped in. Created 5 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_
6 #define CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_ 6 #define CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_
7 7
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 blink::WebGraphicsContext3D* web_graphics_context, 127 blink::WebGraphicsContext3D* web_graphics_context,
128 unsigned int texture, 128 unsigned int texture,
129 unsigned int internal_format, 129 unsigned int internal_format,
130 unsigned int type, 130 unsigned int type,
131 bool premultiply_alpha, 131 bool premultiply_alpha,
132 bool flip_y); 132 bool flip_y);
133 133
134 // VideoFrameProvider implementation. 134 // VideoFrameProvider implementation.
135 void SetVideoFrameProviderClient( 135 void SetVideoFrameProviderClient(
136 cc::VideoFrameProvider::Client* client) override; 136 cc::VideoFrameProvider::Client* client) override;
137 bool UpdateCurrentFrame(base::TimeTicks deadline_min,
138 base::TimeTicks deadline_max) override;
139 scoped_refptr<media::VideoFrame> GetCurrentFrame() override; 137 scoped_refptr<media::VideoFrame> GetCurrentFrame() override;
140 void PutCurrentFrame() override; 138 void PutCurrentFrame(const scoped_refptr<media::VideoFrame>& frame) override;
141 139
142 private: 140 private:
143 // The callback for VideoFrameProvider to signal a new frame is available. 141 // The callback for VideoFrameProvider to signal a new frame is available.
144 void OnFrameAvailable(const scoped_refptr<media::VideoFrame>& frame); 142 void OnFrameAvailable(const scoped_refptr<media::VideoFrame>& frame);
145 // Need repaint due to state change. 143 // Need repaint due to state change.
146 void RepaintInternal(); 144 void RepaintInternal();
147 145
148 // The callback for source to report error. 146 // The callback for source to report error.
149 void OnSourceError(); 147 void OnSourceError();
150 148
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 scoped_refptr<media::MediaLog> media_log_; 205 scoped_refptr<media::MediaLog> media_log_;
208 206
209 scoped_ptr<MediaStreamRendererFactory> renderer_factory_; 207 scoped_ptr<MediaStreamRendererFactory> renderer_factory_;
210 208
211 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerMS); 209 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerMS);
212 }; 210 };
213 211
214 } // namespace content 212 } // namespace content
215 213
216 #endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_ 214 #endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_
OLDNEW
« no previous file with comments | « content/renderer/media/android/webmediaplayer_android.cc ('k') | content/renderer/media/webmediaplayer_ms.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698