Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(227)

Unified Diff: trunk/src/cc/trees/layer_tree_host_impl.cc

Issue 23740010: Revert 223162 "Update the nine patch layer to use UI resources" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/cc/trees/layer_tree_host_impl.h ('k') | trunk/src/cc/trees/layer_tree_host_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/cc/trees/layer_tree_host_impl.cc
===================================================================
--- trunk/src/cc/trees/layer_tree_host_impl.cc (revision 223178)
+++ trunk/src/cc/trees/layer_tree_host_impl.cc (working copy)
@@ -2618,13 +2618,14 @@
SetFullRootLayerDamage();
}
-void LayerTreeHostImpl::CreateUIResource(UIResourceId uid,
- const UIResourceBitmap& bitmap) {
+void LayerTreeHostImpl::CreateUIResource(
+ UIResourceId uid,
+ scoped_refptr<UIResourceBitmap> bitmap) {
DCHECK_GT(uid, 0);
- DCHECK_EQ(bitmap.GetFormat(), UIResourceBitmap::RGBA8);
+ DCHECK_EQ(bitmap->GetFormat(), UIResourceBitmap::RGBA8);
GLint wrap_mode = 0;
- switch (bitmap.GetWrapMode()) {
+ switch (bitmap->GetWrapMode()) {
case UIResourceBitmap::CLAMP_TO_EDGE:
wrap_mode = GL_CLAMP_TO_EDGE;
break;
@@ -2639,16 +2640,16 @@
if (id)
DeleteUIResource(uid);
id = resource_provider_->CreateResource(
- bitmap.GetSize(),
+ bitmap->GetSize(),
resource_provider_->best_texture_format(),
wrap_mode,
ResourceProvider::TextureUsageAny);
ui_resource_map_[uid] = id;
resource_provider_->SetPixels(id,
- bitmap.GetPixels(),
- gfx::Rect(bitmap.GetSize()),
- gfx::Rect(bitmap.GetSize()),
+ reinterpret_cast<uint8_t*>(bitmap->GetPixels()),
+ gfx::Rect(bitmap->GetSize()),
+ gfx::Rect(bitmap->GetSize()),
gfx::Vector2d(0, 0));
MarkUIResourceNotEvicted(uid);
}
« no previous file with comments | « trunk/src/cc/trees/layer_tree_host_impl.h ('k') | trunk/src/cc/trees/layer_tree_host_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698