| Index: cc/texture_uploader.cc
|
| diff --git a/cc/texture_uploader.cc b/cc/texture_uploader.cc
|
| index 2ed6a842309f92cf47301c505a3be5c04a085f4c..812ad6a85b9918356d1d15e873f03e025b681ea5 100644
|
| --- a/cc/texture_uploader.cc
|
| +++ b/cc/texture_uploader.cc
|
| @@ -9,7 +9,6 @@
|
| #include <algorithm>
|
| #include <vector>
|
|
|
| -#include "IntSize.h"
|
| #include "base/debug/alias.h"
|
| #include "base/debug/trace_event.h"
|
| #include "base/metrics/histogram.h"
|
| @@ -207,8 +206,7 @@ void TextureUploader::uploadWithTexSubImage(const uint8_t* image,
|
| TRACE_EVENT0("cc", "TextureUploader::uploadWithTexSubImage");
|
|
|
| // Offset from image-rect to source-rect.
|
| - IntPoint offset(source_rect.x() - image_rect.x(),
|
| - source_rect.y() - image_rect.y());
|
| + gfx::Vector2d offset(source_rect.origin() - image_rect.origin());
|
|
|
| const uint8_t* pixel_source;
|
| unsigned int bytes_per_pixel = Texture::bytesPerPixel(format);
|
| @@ -275,8 +273,7 @@ void TextureUploader::uploadWithMapTexSubImage(const uint8_t* image,
|
| TRACE_EVENT0("cc", "TextureUploader::uploadWithMapTexSubImage");
|
|
|
| // Offset from image-rect to source-rect.
|
| - IntPoint offset(source_rect.x() - image_rect.x(),
|
| - source_rect.y() - image_rect.y());
|
| + gfx::Vector2d offset(source_rect.origin() - image_rect.origin());
|
|
|
| // Upload tile data via a mapped transfer buffer
|
| uint8_t* pixel_dest = static_cast<uint8_t*>(
|
|
|