Revert of Move scaling of ui resources for scrollbars to the time of upload

cc/trees/layer_tree_host_impl.cc

 // Copyright 2011 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/trees/layer_tree_host_impl.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 3743 matching lines @@
   switch (bitmap.GetFormat()) {
     case UIResourceBitmap::RGBA8:
       break;
     case UIResourceBitmap::ALPHA_8:
       format = ALPHA_8;
       break;
     case UIResourceBitmap::ETC1:
       format = ETC1;
       break;
   }
-
-  const gfx::Size source_size = bitmap.GetSize();
-  gfx::Size upload_size = bitmap.GetSize();
-  bool scaled = false;
-
-  int max_texture_size = resource_provider_->max_texture_size();
-  if (source_size.width() > max_texture_size ||
-      source_size.height() > max_texture_size) {
-    // Must resize the bitmap to fit within the max texture size.
-    scaled = true;
-    int edge = std::max(source_size.width(), source_size.height());
-    float scale = nextafterf(static_cast<float>(max_texture_size) / edge, 0);
-    DCHECK_LT(scale, 1.f);
-    upload_size = gfx::ScaleToFlooredSize(source_size, scale, scale);
-  }
-
   id = resource_provider_->CreateResource(
-      upload_size, ResourceProvider::TEXTURE_HINT_IMMUTABLE, format,
+      bitmap.GetSize(), ResourceProvider::TEXTURE_HINT_IMMUTABLE, format,
       gfx::ColorSpace());
 
-  if (!scaled) {
-    AutoLockUIResourceBitmap bitmap_lock(bitmap);
-    auto* pixels = bitmap_lock.GetPixels();
-    resource_provider_->CopyToResource(id, pixels, source_size);
-  } else {
-    // Only support auto-resizing for N32 textures (since this is primarily for
-    // scrollbars). Users of other types need to ensure they are not too big.
-    DCHECK_EQ(bitmap.GetFormat(), UIResourceBitmap::RGBA8);
-
-    float canvas_scale_x =
-        upload_size.width() / static_cast<float>(source_size.width());
-    float canvas_scale_y =
-        upload_size.height() / static_cast<float>(source_size.height());
-
-    // Uses kPremul_SkAlphaType since that is what SkBitmap's allocN32Pixels
-    // makes, and we only support the RGBA8 format here.
-    SkImageInfo info = SkImageInfo::MakeN32(
-        source_size.width(), source_size.height(), kPremul_SkAlphaType);
-    int row_bytes = source_size.width() * 4;
-
-    AutoLockUIResourceBitmap bitmap_lock(bitmap);
-    SkBitmap source_bitmap;
-    source_bitmap.setInfo(info, row_bytes);
-    source_bitmap.setPixels(const_cast<uint8_t*>(bitmap_lock.GetPixels()));
-
-    // This applies the scale to draw the |bitmap| into |scaled_bitmap|.
-    SkBitmap scaled_bitmap;
-    scaled_bitmap.allocN32Pixels(upload_size.width(), upload_size.height());
-    SkCanvas scaled_canvas(scaled_bitmap);
-    scaled_canvas.scale(canvas_scale_x, canvas_scale_y);
-    scaled_canvas.drawBitmap(source_bitmap, 0, 0);
-
-    SkAutoLockPixels scaled_bitmap_lock(scaled_bitmap);
-    auto* pixels = static_cast<uint8_t*>(scaled_bitmap.getPixels());
-    resource_provider_->CopyToResource(id, pixels, upload_size);
-  }
-
   UIResourceData data;
   data.resource_id = id;
+  data.size = bitmap.GetSize();
   data.opaque = bitmap.GetOpaque();
+
   ui_resource_map_[uid] = data;
 
+  AutoLockUIResourceBitmap bitmap_lock(bitmap);
+  resource_provider_->CopyToResource(id, bitmap_lock.GetPixels(),
+                                     bitmap.GetSize());
+
   resource_provider_->GenerateSyncTokenForResource(id);
   MarkUIResourceNotEvicted(uid);
 }
 
 void LayerTreeHostImpl::DeleteUIResource(UIResourceId uid) {
   ResourceId id = ResourceIdForUIResource(uid);
   if (id) {
     resource_provider_->DeleteResource(id);
     ui_resource_map_.erase(uid);
   }
@@ skipping 323 matching lines @@
   return task_runner_provider_->HasImplThread();
 }
 
 bool LayerTreeHostImpl::CommitToActiveTree() const {
   // In single threaded mode we skip the pending tree and commit directly to the
   // active tree.
   return !task_runner_provider_->HasImplThread();
 }
 
 }  // namespace cc