Chromium Code Reviews| Index: cc/resources/resource_update.cc |
| diff --git a/cc/resources/resource_update.cc b/cc/resources/resource_update.cc |
| index 5760ddf4a0dde663b3fdb6bb336d66638c1dc37d..b3777d09cfb94e00512044f527f23574e4d2d63b 100644 |
| --- a/cc/resources/resource_update.cc |
| +++ b/cc/resources/resource_update.cc |
| @@ -10,32 +10,15 @@ |
| namespace cc { |
| -ResourceUpdate ResourceUpdate::Create(PrioritizedResource* texture, |
| +ResourceUpdate ResourceUpdate::Create(PrioritizedResource* resource, |
|
simonhong
2014/01/09 04:36:25
Changed to resource, too.
|
| const SkBitmap* bitmap, |
| gfx::Rect content_rect, |
| gfx::Rect source_rect, |
| gfx::Vector2d dest_offset) { |
| CHECK(content_rect.Contains(source_rect)); |
| ResourceUpdate update; |
| - update.texture = texture; |
| - update.bitmap = bitmap; |
| - update.content_rect = content_rect; |
| - update.source_rect = source_rect; |
| - update.dest_offset = dest_offset; |
| - return update; |
| -} |
| - |
| -ResourceUpdate ResourceUpdate::CreateFromCanvas( |
| - PrioritizedResource* resource, |
| - const skia::RefPtr<SkCanvas>& canvas, |
| - gfx::Rect content_rect, |
| - gfx::Rect source_rect, |
| - gfx::Vector2d dest_offset) { |
| - CHECK(content_rect.Contains(source_rect)); |
| - ResourceUpdate update; |
| update.texture = resource; |
| - update.canvas = canvas; |
| - update.bitmap = &canvas->getDevice()->accessBitmap(false); |
| + update.bitmap = bitmap; |
| update.content_rect = content_rect; |
| update.source_rect = source_rect; |
| update.dest_offset = dest_offset; |