Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(246)

Side by Side Diff: cc/resources/video_resource_updater.cc

Issue 754433003: Update from https://crrev.com/305340 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « cc/resources/resource_provider_unittest.cc ('k') | cc/scheduler/begin_frame_source.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "cc/resources/video_resource_updater.h" 5 #include "cc/resources/video_resource_updater.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/debug/trace_event.h" 8 #include "base/debug/trace_event.h"
9 #include "cc/output/gl_renderer.h" 9 #include "cc/output/gl_renderer.h"
10 #include "cc/resources/resource_provider.h" 10 #include "cc/resources/resource_provider.h"
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 DCHECK_EQ(plane_resources.size(), 1u); 242 DCHECK_EQ(plane_resources.size(), 1u);
243 DCHECK_EQ(plane_resources[0].resource_format, kRGBResourceFormat); 243 DCHECK_EQ(plane_resources[0].resource_format, kRGBResourceFormat);
244 DCHECK(plane_resources[0].mailbox.IsZero()); 244 DCHECK(plane_resources[0].mailbox.IsZero());
245 245
246 if (!video_renderer_) 246 if (!video_renderer_)
247 video_renderer_.reset(new media::SkCanvasVideoRenderer); 247 video_renderer_.reset(new media::SkCanvasVideoRenderer);
248 248
249 { 249 {
250 ResourceProvider::ScopedWriteLockSoftware lock( 250 ResourceProvider::ScopedWriteLockSoftware lock(
251 resource_provider_, plane_resources[0].resource_id); 251 resource_provider_, plane_resources[0].resource_id);
252 video_renderer_->Copy(video_frame, lock.sk_canvas()); 252 SkCanvas canvas(lock.sk_bitmap());
253 video_renderer_->Copy(video_frame, &canvas);
253 } 254 }
254 255
255 RecycleResourceData recycle_data = { 256 RecycleResourceData recycle_data = {
256 plane_resources[0].resource_id, 257 plane_resources[0].resource_id,
257 plane_resources[0].resource_size, 258 plane_resources[0].resource_size,
258 plane_resources[0].resource_format, 259 plane_resources[0].resource_format,
259 gpu::Mailbox() 260 gpu::Mailbox()
260 }; 261 };
261 external_resources.software_resources.push_back( 262 external_resources.software_resources.push_back(
262 plane_resources[0].resource_id); 263 plane_resources[0].resource_id);
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
390 } 391 }
391 392
392 PlaneResource recycled_resource(data.resource_id, 393 PlaneResource recycled_resource(data.resource_id,
393 data.resource_size, 394 data.resource_size,
394 data.resource_format, 395 data.resource_format,
395 data.mailbox); 396 data.mailbox);
396 updater->recycled_resources_.push_back(recycled_resource); 397 updater->recycled_resources_.push_back(recycled_resource);
397 } 398 }
398 399
399 } // namespace cc 400 } // namespace cc
OLDNEW
« no previous file with comments | « cc/resources/resource_provider_unittest.cc ('k') | cc/scheduler/begin_frame_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698