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

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

Issue 15937016: Update refernces to Blink's Platform API (webkit) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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/media/webmediasourceclient_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 #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/public/platform/WebRect.h"
17 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" 17 #include "third_party/WebKit/public/platform/WebSize.h"
18 #include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" 18 #include "third_party/WebKit/public/platform/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/media/media_stream_audio_renderer.h" 22 #include "webkit/media/media_stream_audio_renderer.h"
23 #include "webkit/media/media_stream_client.h" 23 #include "webkit/media/media_stream_client.h"
24 #include "webkit/media/video_frame_provider.h" 24 #include "webkit/media/video_frame_provider.h"
25 #include "webkit/media/webmediaplayer_delegate.h" 25 #include "webkit/media/webmediaplayer_delegate.h"
26 #include "webkit/media/webmediaplayer_util.h" 26 #include "webkit/media/webmediaplayer_util.h"
27 #include "webkit/renderer/compositor_bindings/web_layer_impl.h" 27 #include "webkit/renderer/compositor_bindings/web_layer_impl.h"
28 28
(...skipping 438 matching lines...) Expand 10 before | Expand all | Expand 10 after
467 GetClient()->readyStateChanged(); 467 GetClient()->readyStateChanged();
468 } 468 }
469 469
470 WebKit::WebMediaPlayerClient* WebMediaPlayerMS::GetClient() { 470 WebKit::WebMediaPlayerClient* WebMediaPlayerMS::GetClient() {
471 DCHECK(thread_checker_.CalledOnValidThread()); 471 DCHECK(thread_checker_.CalledOnValidThread());
472 DCHECK(client_); 472 DCHECK(client_);
473 return client_; 473 return client_;
474 } 474 }
475 475
476 } // namespace webkit_media 476 } // namespace webkit_media
OLDNEW
« no previous file with comments | « webkit/media/webmediaplayer_impl.cc ('k') | webkit/media/webmediasourceclient_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698