Index: cc/resources/resource_update.cc |
diff --git a/cc/resources/resource_update.cc b/cc/resources/resource_update.cc |
index 5760ddf4a0dde663b3fdb6bb336d66638c1dc37d..7f89d8cd9673fc049e5c457e833affc0ec508b34 100644 |
--- a/cc/resources/resource_update.cc |
+++ b/cc/resources/resource_update.cc |
@@ -5,37 +5,18 @@ |
#include "cc/resources/resource_update.h" |
#include "base/logging.h" |
-#include "third_party/skia/include/core/SkCanvas.h" |
-#include "third_party/skia/include/core/SkDevice.h" |
namespace cc { |
-ResourceUpdate ResourceUpdate::Create(PrioritizedResource* texture, |
+ResourceUpdate ResourceUpdate::Create(PrioritizedResource* resource, |
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; |