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

Side by Side Diff: webkit/media/webmediaplayer_impl.h

Issue 10392018: remove WEBKIT_USING_CG (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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 | « webkit/glue/webkit_glue.cc ('k') | webkit/media/webmediaplayer_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 // Delegate calls from WebCore::MediaPlayerPrivate to Chrome's video player. 5 // Delegate calls from WebCore::MediaPlayerPrivate to Chrome's video player.
6 // It contains Pipeline which is the actual media player pipeline, it glues 6 // It contains Pipeline which is the actual media player pipeline, it glues
7 // the media player pipeline, data source, audio renderer and renderer. 7 // the media player pipeline, data source, audio renderer and renderer.
8 // Pipeline would creates multiple threads and access some public methods 8 // Pipeline would creates multiple threads and access some public methods
9 // of this class, so we need to be extra careful about concurrent access of 9 // of this class, so we need to be extra careful about concurrent access of
10 // methods and members. 10 // methods and members.
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 float pending_seek_seconds_; 297 float pending_seek_seconds_;
298 298
299 WebKit::WebMediaPlayerClient* client_; 299 WebKit::WebMediaPlayerClient* client_;
300 300
301 scoped_refptr<WebMediaPlayerProxy> proxy_; 301 scoped_refptr<WebMediaPlayerProxy> proxy_;
302 302
303 base::WeakPtr<WebMediaPlayerDelegate> delegate_; 303 base::WeakPtr<WebMediaPlayerDelegate> delegate_;
304 304
305 MediaStreamClient* media_stream_client_; 305 MediaStreamClient* media_stream_client_;
306 306
307 #if WEBKIT_USING_CG
308 scoped_ptr<skia::PlatformCanvas> skia_canvas_;
309 #endif
310
311 scoped_refptr<media::MediaLog> media_log_; 307 scoped_refptr<media::MediaLog> media_log_;
312 308
313 // Since accelerated compositing status is only known after the first layout, 309 // Since accelerated compositing status is only known after the first layout,
314 // we delay reporting it to UMA until that time. 310 // we delay reporting it to UMA until that time.
315 bool accelerated_compositing_reported_; 311 bool accelerated_compositing_reported_;
316 312
317 bool incremented_externally_allocated_memory_; 313 bool incremented_externally_allocated_memory_;
318 314
319 WebKit::WebAudioSourceProvider* audio_source_provider_; 315 WebKit::WebAudioSourceProvider* audio_source_provider_;
320 316
321 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl); 317 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
322 }; 318 };
323 319
324 } // namespace webkit_media 320 } // namespace webkit_media
325 321
326 #endif // WEBKIT_MEDIA_WEBMEDIAPLAYER_IMPL_H_ 322 #endif // WEBKIT_MEDIA_WEBMEDIAPLAYER_IMPL_H_
OLDNEW
« no previous file with comments | « webkit/glue/webkit_glue.cc ('k') | webkit/media/webmediaplayer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698