[cc] Allow resources and ui resources to specify wrap mode

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 <algorithm>
 
 #include "base/basictypes.h"
 #include "base/containers/hash_tables.h"
@@ skipping 34 matching lines @@
 #include "cc/resources/ui_resource_bitmap.h"
 #include "cc/scheduler/delay_based_time_source.h"
 #include "cc/scheduler/texture_uploader.h"
 #include "cc/trees/damage_tracker.h"
 #include "cc/trees/layer_tree_host.h"
 #include "cc/trees/layer_tree_host_common.h"
 #include "cc/trees/layer_tree_impl.h"
 #include "cc/trees/quad_culler.h"
 #include "cc/trees/single_thread_proxy.h"
 #include "cc/trees/tree_synchronizer.h"
+#include "gpu/GLES2/gl2extchromium.h"
 #include "ui/gfx/size_conversions.h"
 #include "ui/gfx/vector2d_conversions.h"
 
 namespace {
 
 void DidVisibilityChange(cc::LayerTreeHostImpl* id, bool visible) {
   if (visible) {
     TRACE_EVENT_ASYNC_BEGIN1("webkit",
                              "LayerTreeHostImpl::SetVisible",
                              id,
@@ skipping 2514 matching lines @@
   debug_state_ = new_debug_state;
   SetFullRootLayerDamage();
 }
 
 void LayerTreeHostImpl::CreateUIResource(
     UIResourceId uid,
     scoped_refptr<UIResourceBitmap> bitmap) {
   DCHECK_GT(uid, 0);
   DCHECK_EQ(bitmap->GetFormat(), UIResourceBitmap::RGBA8);
 
+  GLint wrap_mode = 0;
+  switch (bitmap->GetWrapMode()) {
+    case UIResourceBitmap::CLAMP_TO_EDGE:
+      wrap_mode = GL_CLAMP_TO_EDGE;
+      break;
+    case UIResourceBitmap::REPEAT:
+      wrap_mode = GL_REPEAT;
+      break;
+    default:
+      NOTREACHED();
+      break;
+  }
+
   // Allow for multiple creation requests with the same UIResourceId.  The
   // previous resource is simply deleted.
   ResourceProvider::ResourceId id = ResourceIdForUIResource(uid);
   if (id)
     DeleteUIResource(uid);
-  id = resource_provider_->CreateResource(
+  id = resource_provider_->CreateGLTexture(

[enne (OOO), 2013/09/03 22:18:52]

This seems like an unfortunate restriction to only let UI resources be backed by
hardware textures.  I'm no Skia expert, but it seems like maybe an SkShader
could be applied in the SoftwareRenderer with kRepeat_TileMode.

Could you change this call back to CreateResource (adding a wrap_mode there) and
filing a bug to support repeated textures in the software renderer? At least
that way UI resources (e.g. scrollbars) will still work for the software
compositor in the meantime.

[ccameron, 2013/09/03 22:52:08]

Good point -- done (crbug.com/284796).

       bitmap->GetSize(),
       resource_provider_->best_texture_format(),
+      GL_TEXTURE_POOL_UNMANAGED_CHROMIUM,
+      wrap_mode,
       ResourceProvider::TextureUsageAny);
 
   ui_resource_map_[uid] = id;
   resource_provider_->SetPixels(id,
                                 reinterpret_cast<uint8_t*>(bitmap->GetPixels()),
                                 gfx::Rect(bitmap->GetSize()),
                                 gfx::Rect(bitmap->GetSize()),
                                 gfx::Vector2d(0, 0));
 }
 
 void LayerTreeHostImpl::DeleteUIResource(UIResourceId uid) {
   ResourceProvider::ResourceId id = ResourceIdForUIResource(uid);
   if (id) {
     resource_provider_->DeleteResource(id);
     ui_resource_map_.erase(uid);
   }
 }
 
 ResourceProvider::ResourceId LayerTreeHostImpl::ResourceIdForUIResource(
     UIResourceId uid) const {
   UIResourceMap::const_iterator iter = ui_resource_map_.find(uid);
   if (iter != ui_resource_map_.end())
     return iter->second;
   return 0;
 }
 
 }  // namespace cc