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 #include "content/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" |
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
316 return true; | 316 return true; |
317 } | 317 } |
318 | 318 |
319 void WebMediaPlayerMS::paint(WebCanvas* canvas, | 319 void WebMediaPlayerMS::paint(WebCanvas* canvas, |
320 const WebRect& rect, | 320 const WebRect& rect, |
321 unsigned char alpha) { | 321 unsigned char alpha) { |
322 DVLOG(3) << "WebMediaPlayerMS::paint"; | 322 DVLOG(3) << "WebMediaPlayerMS::paint"; |
323 DCHECK(thread_checker_.CalledOnValidThread()); | 323 DCHECK(thread_checker_.CalledOnValidThread()); |
324 | 324 |
325 gfx::RectF dest_rect(rect.x, rect.y, rect.width, rect.height); | 325 gfx::RectF dest_rect(rect.x, rect.y, rect.width, rect.height); |
326 video_renderer_.Paint(current_frame_.get(), canvas, dest_rect, alpha); | 326 video_renderer_.Paint(current_frame_.get(), canvas, dest_rect, alpha, 0); |
327 | 327 |
328 { | 328 { |
329 base::AutoLock auto_lock(current_frame_lock_); | 329 base::AutoLock auto_lock(current_frame_lock_); |
330 if (current_frame_.get()) | 330 if (current_frame_.get()) |
331 current_frame_used_ = true; | 331 current_frame_used_ = true; |
332 } | 332 } |
333 } | 333 } |
334 | 334 |
335 bool WebMediaPlayerMS::hasSingleSecurityOrigin() const { | 335 bool WebMediaPlayerMS::hasSingleSecurityOrigin() const { |
336 DCHECK(thread_checker_.CalledOnValidThread()); | 336 DCHECK(thread_checker_.CalledOnValidThread()); |
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
469 GetClient()->readyStateChanged(); | 469 GetClient()->readyStateChanged(); |
470 } | 470 } |
471 | 471 |
472 blink::WebMediaPlayerClient* WebMediaPlayerMS::GetClient() { | 472 blink::WebMediaPlayerClient* WebMediaPlayerMS::GetClient() { |
473 DCHECK(thread_checker_.CalledOnValidThread()); | 473 DCHECK(thread_checker_.CalledOnValidThread()); |
474 DCHECK(client_); | 474 DCHECK(client_); |
475 return client_; | 475 return client_; |
476 } | 476 } |
477 | 477 |
478 } // namespace content | 478 } // namespace content |
OLD | NEW |