Index: cc/resources/video_resource_updater.cc |
diff --git a/cc/resources/video_resource_updater.cc b/cc/resources/video_resource_updater.cc |
index a1286b917b4f2bde8af4248eb7654b2da202db4d..88c84683339d4586cb9674179b64d91704c639c5 100644 |
--- a/cc/resources/video_resource_updater.cc |
+++ b/cc/resources/video_resource_updater.cc |
@@ -7,11 +7,11 @@ |
#include "base/bind.h" |
#include "base/debug/trace_event.h" |
#include "cc/output/gl_renderer.h" |
+#include "cc/resources/media/skcanvas_video_renderer.h" |
#include "cc/resources/resource_provider.h" |
#include "gpu/GLES2/gl2extchromium.h" |
#include "gpu/command_buffer/client/gles2_interface.h" |
#include "media/base/video_frame.h" |
-#include "media/filters/skcanvas_video_renderer.h" |
#include "third_party/khronos/GLES2/gl2.h" |
#include "third_party/khronos/GLES2/gl2ext.h" |
#include "ui/gfx/size_conversions.h" |
@@ -244,15 +244,17 @@ VideoFrameExternalResources VideoResourceUpdater::CreateForSoftwarePlanes( |
DCHECK(plane_resources[0].mailbox.IsZero()); |
if (!video_renderer_) |
- video_renderer_.reset(new media::SkCanvasVideoRenderer); |
+ video_renderer_.reset(new SkCanvasVideoRenderer); |
{ |
ResourceProvider::ScopedWriteLockSoftware lock( |
resource_provider_, plane_resources[0].resource_id); |
+ lock.sk_canvas()->clear(SK_ColorTRANSPARENT); |
video_renderer_->Paint(video_frame.get(), |
lock.sk_canvas(), |
video_frame->visible_rect(), |
- 0xff); |
+ 0xff, |
+ 0); |
} |
RecycleResourceData recycle_data = { |