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

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

Issue 18123002: Migrate webkit/renderer/media/ to content/renderer/media/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 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
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 #include "webkit/renderer/media/webmediaplayer_ms.h" 5 #include "content/renderer/media/webmediaplayer_ms.h"
6 6
7 #include <limits> 7 #include <limits>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
11 #include "base/message_loop.h" 11 #include "base/message_loop.h"
12 #include "base/metrics/histogram.h" 12 #include "base/metrics/histogram.h"
13 #include "cc/layers/video_layer.h" 13 #include "cc/layers/video_layer.h"
14 #include "content/renderer/media/media_stream_audio_renderer.h"
15 #include "content/renderer/media/media_stream_client.h"
16 #include "content/renderer/media/video_frame_provider.h"
17 #include "content/renderer/media/webmediaplayer_delegate.h"
18 #include "content/renderer/media/webmediaplayer_util.h"
14 #include "media/base/media_log.h" 19 #include "media/base/media_log.h"
15 #include "media/base/video_frame.h" 20 #include "media/base/video_frame.h"
16 #include "third_party/WebKit/public/platform/WebRect.h" 21 #include "third_party/WebKit/public/platform/WebRect.h"
17 #include "third_party/WebKit/public/platform/WebSize.h" 22 #include "third_party/WebKit/public/platform/WebSize.h"
18 #include "third_party/WebKit/public/platform/WebURL.h" 23 #include "third_party/WebKit/public/platform/WebURL.h"
19 #include "third_party/WebKit/public/web/WebFrame.h" 24 #include "third_party/WebKit/public/web/WebFrame.h"
20 #include "third_party/WebKit/public/web/WebMediaPlayerClient.h" 25 #include "third_party/WebKit/public/web/WebMediaPlayerClient.h"
21 #include "third_party/WebKit/public/web/WebView.h" 26 #include "third_party/WebKit/public/web/WebView.h"
22 #include "webkit/renderer/compositor_bindings/web_layer_impl.h" 27 #include "webkit/renderer/compositor_bindings/web_layer_impl.h"
23 #include "webkit/renderer/media/media_stream_audio_renderer.h"
24 #include "webkit/renderer/media/media_stream_client.h"
25 #include "webkit/renderer/media/video_frame_provider.h"
26 #include "webkit/renderer/media/webmediaplayer_delegate.h"
27 #include "webkit/renderer/media/webmediaplayer_util.h"
28 28
29 using WebKit::WebCanvas; 29 using WebKit::WebCanvas;
30 using WebKit::WebMediaPlayer; 30 using WebKit::WebMediaPlayer;
31 using WebKit::WebRect; 31 using WebKit::WebRect;
32 using WebKit::WebSize; 32 using WebKit::WebSize;
33 33
34 namespace webkit_media { 34 namespace content {
35 35
36 WebMediaPlayerMS::WebMediaPlayerMS( 36 WebMediaPlayerMS::WebMediaPlayerMS(
37 WebKit::WebFrame* frame, 37 WebKit::WebFrame* frame,
38 WebKit::WebMediaPlayerClient* client, 38 WebKit::WebMediaPlayerClient* client,
39 base::WeakPtr<WebMediaPlayerDelegate> delegate, 39 base::WeakPtr<WebMediaPlayerDelegate> delegate,
40 MediaStreamClient* media_stream_client, 40 MediaStreamClient* media_stream_client,
41 media::MediaLog* media_log) 41 media::MediaLog* media_log)
42 : frame_(frame), 42 : frame_(frame),
43 network_state_(WebMediaPlayer::NetworkStateEmpty), 43 network_state_(WebMediaPlayer::NetworkStateEmpty),
44 ready_state_(WebMediaPlayer::ReadyStateHaveNothing), 44 ready_state_(WebMediaPlayer::ReadyStateHaveNothing),
(...skipping 388 matching lines...) Expand 10 before | Expand all | Expand 10 after
433 // Always notify to ensure client has the latest value. 433 // Always notify to ensure client has the latest value.
434 GetClient()->readyStateChanged(); 434 GetClient()->readyStateChanged();
435 } 435 }
436 436
437 WebKit::WebMediaPlayerClient* WebMediaPlayerMS::GetClient() { 437 WebKit::WebMediaPlayerClient* WebMediaPlayerMS::GetClient() {
438 DCHECK(thread_checker_.CalledOnValidThread()); 438 DCHECK(thread_checker_.CalledOnValidThread());
439 DCHECK(client_); 439 DCHECK(client_);
440 return client_; 440 return client_;
441 } 441 }
442 442
443 } // namespace webkit_media 443 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698