webkit/media/webmediaplayer_ms.cc - Issue 14651027: Move webkit/compositor_bindings into webkit/renderer

Side by Side Diff: webkit/media/webmediaplayer_ms.cc

Issue 14651027: Move webkit/compositor_bindings into webkit/renderer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 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/media/webmediaplayer_impl.cc ('k') | webkit/plugins/npapi/webplugin_impl.cc » ('j') | no next file with comments »

OLD	NEW
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 #include "webkit/media/webmediaplayer_ms.h"	5 #include "webkit/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 "media/base/media_log.h"	14 #include "media/base/media_log.h"

15 #include "media/base/video_frame.h"	15 #include "media/base/video_frame.h"

16 #include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h"	16 #include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h"

17 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h"	17 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h"

18 #include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h"	18 #include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h"

19 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"	19 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"

20 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerClient. h"	20 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerClient. h"

21 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"	21 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"

22 #include "webkit/compositor_bindings/web_layer_impl.h"

23 #include "webkit/media/media_stream_audio_renderer.h"	22 #include "webkit/media/media_stream_audio_renderer.h"

24 #include "webkit/media/media_stream_client.h"	23 #include "webkit/media/media_stream_client.h"

25 #include "webkit/media/video_frame_provider.h"	24 #include "webkit/media/video_frame_provider.h"

26 #include "webkit/media/webmediaplayer_delegate.h"	25 #include "webkit/media/webmediaplayer_delegate.h"

27 #include "webkit/media/webmediaplayer_util.h"	26 #include "webkit/media/webmediaplayer_util.h"

	27 #include "webkit/renderer/compositor_bindings/web_layer_impl.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 webkit_media {

35	35

36 WebMediaPlayerMS::WebMediaPlayerMS(	36 WebMediaPlayerMS::WebMediaPlayerMS(

37 WebKit::WebFrame* frame,	37 WebKit::WebFrame* frame,

(...skipping 425 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
463 GetClient()->readyStateChanged();	463 GetClient()->readyStateChanged();

464 }	464 }

465	465

466 WebKit::WebMediaPlayerClient* WebMediaPlayerMS::GetClient() {	466 WebKit::WebMediaPlayerClient* WebMediaPlayerMS::GetClient() {

467 DCHECK(thread_checker_.CalledOnValidThread());	467 DCHECK(thread_checker_.CalledOnValidThread());

468 DCHECK(client_);	468 DCHECK(client_);

469 return client_;	469 return client_;

470 }	470 }

471	471

472 } // namespace webkit_media	472 } // namespace webkit_media

OLD	NEW