Index: cc/resources/resource_provider_unittest.cc |
diff --git a/cc/resources/resource_provider_unittest.cc b/cc/resources/resource_provider_unittest.cc |
index d5f414e7deb8b88b487ce48a07f951f71e38d50a..136855847db72d82a8ea2ccd33be7fb3b16a3daa 100644 |
--- a/cc/resources/resource_provider_unittest.cc |
+++ b/cc/resources/resource_provider_unittest.cc |
@@ -535,73 +535,6 @@ TEST_P(ResourceProviderTest, Basic) { |
CheckCreateResource(GetParam(), resource_provider_.get(), context()); |
} |
-TEST_P(ResourceProviderTest, Upload) { |
- gfx::Size size(2, 2); |
- ResourceFormat format = RGBA_8888; |
- size_t pixel_size = TextureSizeBytes(size, format); |
- ASSERT_EQ(16U, pixel_size); |
- |
- ResourceId id = resource_provider_->CreateResource( |
- size, GL_CLAMP_TO_EDGE, ResourceProvider::TEXTURE_HINT_IMMUTABLE, format); |
- |
- uint8_t image[16] = { 0 }; |
- gfx::Rect image_rect(size); |
- resource_provider_->SetPixels( |
- id, image, image_rect, image_rect, gfx::Vector2d()); |
- |
- for (uint8_t i = 0; i < pixel_size; ++i) |
- image[i] = i; |
- |
- uint8_t result[16] = { 0 }; |
- { |
- gfx::Rect source_rect(0, 0, 1, 1); |
- gfx::Vector2d dest_offset(0, 0); |
- resource_provider_->SetPixels( |
- id, image, image_rect, source_rect, dest_offset); |
- |
- uint8_t expected[16] = { 0, 1, 2, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; |
- GetResourcePixels( |
- resource_provider_.get(), context(), id, size, format, result); |
- EXPECT_EQ(0, memcmp(expected, result, pixel_size)); |
- } |
- { |
- gfx::Rect source_rect(0, 0, 1, 1); |
- gfx::Vector2d dest_offset(1, 1); |
- resource_provider_->SetPixels( |
- id, image, image_rect, source_rect, dest_offset); |
- |
- uint8_t expected[16] = { 0, 1, 2, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3 }; |
- GetResourcePixels( |
- resource_provider_.get(), context(), id, size, format, result); |
- EXPECT_EQ(0, memcmp(expected, result, pixel_size)); |
- } |
- { |
- gfx::Rect source_rect(1, 0, 1, 1); |
- gfx::Vector2d dest_offset(0, 1); |
- resource_provider_->SetPixels( |
- id, image, image_rect, source_rect, dest_offset); |
- |
- uint8_t expected[16] = { 0, 1, 2, 3, 0, 0, 0, 0, 4, 5, 6, 7, 0, 1, 2, 3 }; |
- GetResourcePixels( |
- resource_provider_.get(), context(), id, size, format, result); |
- EXPECT_EQ(0, memcmp(expected, result, pixel_size)); |
- } |
- { |
- gfx::Rect offset_image_rect(gfx::Point(100, 100), size); |
- gfx::Rect source_rect(100, 100, 1, 1); |
- gfx::Vector2d dest_offset(1, 0); |
- resource_provider_->SetPixels( |
- id, image, offset_image_rect, source_rect, dest_offset); |
- |
- uint8_t expected[16] = { 0, 1, 2, 3, 0, 1, 2, 3, 4, 5, 6, 7, 0, 1, 2, 3 }; |
- GetResourcePixels( |
- resource_provider_.get(), context(), id, size, format, result); |
- EXPECT_EQ(0, memcmp(expected, result, pixel_size)); |
- } |
- |
- resource_provider_->DeleteResource(id); |
-} |
- |
TEST_P(ResourceProviderTest, SimpleUpload) { |
gfx::Size size(2, 2); |
ResourceFormat format = RGBA_8888; |