OLD | NEW |
---|---|
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 234 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
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_->Paint(video_frame.get(), |
253 lock.sk_canvas(), | 253 lock.sk_canvas(), |
254 video_frame->visible_rect(), | 254 video_frame->visible_rect(), |
255 0xff); | 255 0xff, |
256 0); | |
danakj
2014/08/07 14:07:31
This should be NULL right? It's a pointer?
dshwang
2014/08/07 15:10:43
Done. I was confused with Blink coding style.
| |
256 } | 257 } |
257 | 258 |
258 RecycleResourceData recycle_data = { | 259 RecycleResourceData recycle_data = { |
259 plane_resources[0].resource_id, | 260 plane_resources[0].resource_id, |
260 plane_resources[0].resource_size, | 261 plane_resources[0].resource_size, |
261 plane_resources[0].resource_format, | 262 plane_resources[0].resource_format, |
262 gpu::Mailbox() | 263 gpu::Mailbox() |
263 }; | 264 }; |
264 external_resources.software_resources.push_back( | 265 external_resources.software_resources.push_back( |
265 plane_resources[0].resource_id); | 266 plane_resources[0].resource_id); |
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
391 } | 392 } |
392 | 393 |
393 PlaneResource recycled_resource(data.resource_id, | 394 PlaneResource recycled_resource(data.resource_id, |
394 data.resource_size, | 395 data.resource_size, |
395 data.resource_format, | 396 data.resource_format, |
396 data.mailbox); | 397 data.mailbox); |
397 updater->recycled_resources_.push_back(recycled_resource); | 398 updater->recycled_resources_.push_back(recycled_resource); |
398 } | 399 } |
399 | 400 |
400 } // namespace cc | 401 } // namespace cc |
OLD | NEW |