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

Side by Side Diff: cc/layers/nine_patch_layer_unittest.cc

Issue 197883017: SkColorType instead of (deprecated) SkBitmap::Config (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/layers/nine_patch_layer.h" 5 #include "cc/layers/nine_patch_layer.h"
6 6
7 #include "cc/resources/prioritized_resource_manager.h" 7 #include "cc/resources/prioritized_resource_manager.h"
8 #include "cc/resources/resource_provider.h" 8 #include "cc/resources/resource_provider.h"
9 #include "cc/resources/resource_update_queue.h" 9 #include "cc/resources/resource_update_queue.h"
10 #include "cc/resources/scoped_ui_resource.h" 10 #include "cc/resources/scoped_ui_resource.h"
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 EXPECT_EQ(test_layer->layer_tree_host(), layer_tree_host_.get()); 56 EXPECT_EQ(test_layer->layer_tree_host(), layer_tree_host_.get());
57 57
58 ResourceUpdateQueue queue; 58 ResourceUpdateQueue queue;
59 gfx::Rect screen_space_clip_rect; 59 gfx::Rect screen_space_clip_rect;
60 OcclusionTracker<Layer> occlusion_tracker(screen_space_clip_rect); 60 OcclusionTracker<Layer> occlusion_tracker(screen_space_clip_rect);
61 test_layer->SavePaintProperties(); 61 test_layer->SavePaintProperties();
62 test_layer->Update(&queue, &occlusion_tracker); 62 test_layer->Update(&queue, &occlusion_tracker);
63 63
64 EXPECT_FALSE(test_layer->DrawsContent()); 64 EXPECT_FALSE(test_layer->DrawsContent());
65 65
66 SkBitmap bitmap;
67 bitmap.setConfig(SkBitmap::kARGB_8888_Config, 10, 10);
68 bitmap.allocPixels();
69 bitmap.setImmutable();
70
71 scoped_ptr<ScopedUIResource> resource = ScopedUIResource::Create( 66 scoped_ptr<ScopedUIResource> resource = ScopedUIResource::Create(
72 layer_tree_host_.get(), UIResourceBitmap(bitmap)); 67 layer_tree_host_.get(), UIResourceBitmap(10, 10));
73 gfx::Rect aperture(5, 5, 1, 1); 68 gfx::Rect aperture(5, 5, 1, 1);
74 bool fill_center = true; 69 bool fill_center = true;
75 test_layer->SetAperture(aperture); 70 test_layer->SetAperture(aperture);
76 test_layer->SetUIResourceId(resource->id()); 71 test_layer->SetUIResourceId(resource->id());
77 test_layer->SetFillCenter(fill_center); 72 test_layer->SetFillCenter(fill_center);
78 test_layer->Update(&queue, &occlusion_tracker); 73 test_layer->Update(&queue, &occlusion_tracker);
79 74
80 EXPECT_TRUE(test_layer->DrawsContent()); 75 EXPECT_TRUE(test_layer->DrawsContent());
81 } 76 }
82 77
83 } // namespace 78 } // namespace
84 } // namespace cc 79 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698