Update from https://crrev.com/305340
Added a few #includes of base/compiler_specific.h for upstream cleanup.
Changed callers for cc::BeginFrameArgs and cc::RendererSettings API
changes.
Review URL: https://codereview.chromium.org/754433003
diff --git a/cc/resources/video_resource_updater.cc b/cc/resources/video_resource_updater.cc
index 01a6042..7a775d9 100644
--- a/cc/resources/video_resource_updater.cc
+++ b/cc/resources/video_resource_updater.cc
@@ -249,7 +249,8 @@
{
ResourceProvider::ScopedWriteLockSoftware lock(
resource_provider_, plane_resources[0].resource_id);
- video_renderer_->Copy(video_frame, lock.sk_canvas());
+ SkCanvas canvas(lock.sk_bitmap());
+ video_renderer_->Copy(video_frame, &canvas);
}
RecycleResourceData recycle_data = {
