projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 10.38.208.0
[platform/framework/web/crosswalk.git]
/
src
/
content
/
renderer
/
media
/
webmediaplayer_impl.cc
diff --git
a/src/content/renderer/media/webmediaplayer_impl.cc
b/src/content/renderer/media/webmediaplayer_impl.cc
index
cd5f9ef
..
fc723c7
100644
(file)
--- a/
src/content/renderer/media/webmediaplayer_impl.cc
+++ b/
src/content/renderer/media/webmediaplayer_impl.cc
@@
-536,9
+536,16
@@
bool WebMediaPlayerImpl::didLoadingProgress() {
return pipeline_progress || data_progress;
}
return pipeline_progress || data_progress;
}
-void WebMediaPlayerImpl::paint(WebCanvas* canvas,
- const WebRect& rect,
+void WebMediaPlayerImpl::paint(
blink::
WebCanvas* canvas,
+ const
blink::
WebRect& rect,
unsigned char alpha) {
unsigned char alpha) {
+ paint(canvas, rect, alpha, SkXfermode::kSrcOver_Mode);
+}
+
+void WebMediaPlayerImpl::paint(blink::WebCanvas* canvas,
+ const blink::WebRect& rect,
+ unsigned char alpha,
+ SkXfermode::Mode mode) {
DCHECK(main_loop_->BelongsToCurrentThread());
TRACE_EVENT0("media", "WebMediaPlayerImpl:paint");
DCHECK(main_loop_->BelongsToCurrentThread());
TRACE_EVENT0("media", "WebMediaPlayerImpl:paint");
@@
-556,6
+563,7
@@
void WebMediaPlayerImpl::paint(WebCanvas* canvas,
canvas,
gfx_rect,
alpha,
canvas,
gfx_rect,
alpha,
+ mode,
pipeline_metadata_.video_rotation);
}
pipeline_metadata_.video_rotation);
}