cc: Fix incomplete changes to add ETC1 support

cc/scheduler/texture_uploader.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/scheduler/texture_uploader.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/debug/trace_event.h"
@@ skipping 129 matching lines @@
 
   bool is_full_upload = dest_offset.IsZero() && source_rect.size() == size;
 
   if (is_full_upload)
     BeginQuery();
 
   if (format == ETC1) {
     // 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)
     EndQuery();
 
   num_texture_uploads_since_last_flush_++;
   if (num_texture_uploads_since_last_flush_ >= kTextureUploadFlushPeriod)
     Flush();
 }
 
@@ skipping 164 matching lines @@
       textures_per_second_history_.erase(textures_per_second_history_.begin());
       textures_per_second_history_.erase(--textures_per_second_history_.end());
     }
     textures_per_second_history_.insert(textures_per_second);
 
     available_queries_.push_back(pending_queries_.take_front());
   }
 }
 
 }  // namespace cc