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

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

Issue 441303002: 2D Canvas doesn't blend video with the destination buffer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase to ToT. improve TODO comments Created 6 years, 4 months 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 | « no previous file | content/browser/renderer_host/render_widget_host_view_browsertest.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_->Paint(video_frame.get(), 252 video_renderer_->Copy(video_frame.get(), lock.sk_canvas());
253 lock.sk_canvas(),
254 video_frame->visible_rect(),
255 0xff,
256 media::VIDEO_ROTATION_0);
257 } 253 }
258 254
259 RecycleResourceData recycle_data = { 255 RecycleResourceData recycle_data = {
260 plane_resources[0].resource_id, 256 plane_resources[0].resource_id,
261 plane_resources[0].resource_size, 257 plane_resources[0].resource_size,
262 plane_resources[0].resource_format, 258 plane_resources[0].resource_format,
263 gpu::Mailbox() 259 gpu::Mailbox()
264 }; 260 };
265 external_resources.software_resources.push_back( 261 external_resources.software_resources.push_back(
266 plane_resources[0].resource_id); 262 plane_resources[0].resource_id);
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
392 } 388 }
393 389
394 PlaneResource recycled_resource(data.resource_id, 390 PlaneResource recycled_resource(data.resource_id,
395 data.resource_size, 391 data.resource_size,
396 data.resource_format, 392 data.resource_format,
397 data.mailbox); 393 data.mailbox);
398 updater->recycled_resources_.push_back(recycled_resource); 394 updater->recycled_resources_.push_back(recycled_resource);
399 } 395 }
400 396
401 } // namespace cc 397 } // namespace cc
OLDNEW
« no previous file with comments | « no previous file | content/browser/renderer_host/render_widget_host_view_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698