| Index: cc/scheduler/texture_uploader.cc
|
| diff --git a/cc/scheduler/texture_uploader.cc b/cc/scheduler/texture_uploader.cc
|
| index 91d80474ce0684e9f6737620066a4f3fc937dc6d..54d351527d690821ea0a7c33c1ca93707a64a937 100644
|
| --- a/cc/scheduler/texture_uploader.cc
|
| +++ b/cc/scheduler/texture_uploader.cc
|
| @@ -147,14 +147,14 @@ void TextureUploader::Upload(const uint8* image,
|
| // ETC1 does not support subimage uploads.
|
| DCHECK(is_full_upload);
|
| UploadWithTexImageETC1(image, size);
|
| - return;
|
| - }
|
| -
|
| - if (use_map_tex_sub_image_) {
|
| - UploadWithMapTexSubImage(
|
| - image, image_rect, source_rect, dest_offset, format);
|
| } else {
|
| - UploadWithTexSubImage(image, image_rect, source_rect, dest_offset, format);
|
| + if (use_map_tex_sub_image_) {
|
| + UploadWithMapTexSubImage(
|
| + image, image_rect, source_rect, dest_offset, format);
|
| + } else {
|
| + UploadWithTexSubImage(
|
| + image, image_rect, source_rect, dest_offset, format);
|
| + }
|
| }
|
|
|
| if (is_full_upload)
|
|
|