| 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 303 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 314 return blink::WebTimeRanges(); | 314 return blink::WebTimeRanges(); |
| 315 } | 315 } |
| 316 | 316 |
| 317 bool WebMediaPlayerMS::didLoadingProgress() { | 317 bool WebMediaPlayerMS::didLoadingProgress() { |
| 318 DCHECK(thread_checker_.CalledOnValidThread()); | 318 DCHECK(thread_checker_.CalledOnValidThread()); |
| 319 return true; | 319 return true; |
| 320 } | 320 } |
| 321 | 321 |
| 322 void WebMediaPlayerMS::paint(blink::WebCanvas* canvas, | 322 void WebMediaPlayerMS::paint(blink::WebCanvas* canvas, |
| 323 const blink::WebRect& rect, | 323 const blink::WebRect& rect, |
| 324 unsigned char alpha) { | |
| 325 paint(canvas, rect, alpha, SkXfermode::kSrcOver_Mode); | |
| 326 } | |
| 327 | |
| 328 void WebMediaPlayerMS::paint(blink::WebCanvas* canvas, | |
| 329 const blink::WebRect& rect, | |
| 330 unsigned char alpha, | 324 unsigned char alpha, |
| 331 SkXfermode::Mode mode) { | 325 SkXfermode::Mode mode) { |
| 332 DVLOG(3) << "WebMediaPlayerMS::paint"; | 326 DVLOG(3) << "WebMediaPlayerMS::paint"; |
| 333 DCHECK(thread_checker_.CalledOnValidThread()); | 327 DCHECK(thread_checker_.CalledOnValidThread()); |
| 334 | 328 |
| 335 gfx::RectF dest_rect(rect.x, rect.y, rect.width, rect.height); | 329 gfx::RectF dest_rect(rect.x, rect.y, rect.width, rect.height); |
| 336 video_renderer_.Paint( | 330 video_renderer_.Paint( |
| 337 current_frame_, canvas, dest_rect, alpha, mode, media::VIDEO_ROTATION_0); | 331 current_frame_, canvas, dest_rect, alpha, mode, media::VIDEO_ROTATION_0); |
| 338 | 332 |
| 339 { | 333 { |
| (...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 481 GetClient()->readyStateChanged(); | 475 GetClient()->readyStateChanged(); |
| 482 } | 476 } |
| 483 | 477 |
| 484 blink::WebMediaPlayerClient* WebMediaPlayerMS::GetClient() { | 478 blink::WebMediaPlayerClient* WebMediaPlayerMS::GetClient() { |
| 485 DCHECK(thread_checker_.CalledOnValidThread()); | 479 DCHECK(thread_checker_.CalledOnValidThread()); |
| 486 DCHECK(client_); | 480 DCHECK(client_); |
| 487 return client_; | 481 return client_; |
| 488 } | 482 } |
| 489 | 483 |
| 490 } // namespace content | 484 } // namespace content |
| OLD | NEW |