OLD | NEW |
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 <memory> | 8 #include <memory> |
9 #include <string> | 9 #include <string> |
10 | 10 |
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
157 unsigned int texture, | 157 unsigned int texture, |
158 unsigned internal_format, | 158 unsigned internal_format, |
159 unsigned format, | 159 unsigned format, |
160 unsigned type, | 160 unsigned type, |
161 bool premultiply_alpha, | 161 bool premultiply_alpha, |
162 bool flip_y) override; | 162 bool flip_y) override; |
163 | 163 |
164 bool TexImageImpl(TexImageFunctionID functionID, | 164 bool TexImageImpl(TexImageFunctionID functionID, |
165 unsigned target, | 165 unsigned target, |
166 gpu::gles2::GLES2Interface* gl, | 166 gpu::gles2::GLES2Interface* gl, |
| 167 unsigned int texture, |
167 int level, | 168 int level, |
168 int internalformat, | 169 int internalformat, |
169 unsigned format, | 170 unsigned format, |
170 unsigned type, | 171 unsigned type, |
171 int xoffset, | 172 int xoffset, |
172 int yoffset, | 173 int yoffset, |
173 int zoffset, | 174 int zoffset, |
174 bool flip_y, | 175 bool flip_y, |
175 bool premultiply_alpha) override; | 176 bool premultiply_alpha) override; |
176 | 177 |
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
261 // True if playback should be started upon the next call to OnShown(). Only | 262 // True if playback should be started upon the next call to OnShown(). Only |
262 // used on Android. | 263 // used on Android. |
263 bool should_play_upon_shown_; | 264 bool should_play_upon_shown_; |
264 | 265 |
265 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerMS); | 266 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerMS); |
266 }; | 267 }; |
267 | 268 |
268 } // namespace content | 269 } // namespace content |
269 | 270 |
270 #endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_ | 271 #endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_ |
OLD | NEW |