summaryrefslogtreecommitdiffstats
path: root/cc/layers/scrollbar_layer_unittest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'cc/layers/scrollbar_layer_unittest.cc')
-rw-r--r--cc/layers/scrollbar_layer_unittest.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/cc/layers/scrollbar_layer_unittest.cc b/cc/layers/scrollbar_layer_unittest.cc
index 1e9442d5..a58f24b 100644
--- a/cc/layers/scrollbar_layer_unittest.cc
+++ b/cc/layers/scrollbar_layer_unittest.cc
@@ -527,7 +527,8 @@ class MockLayerTreeHost : public LayerTreeHost {
virtual UIResourceId CreateUIResource(UIResourceClient* content) OVERRIDE {
total_ui_resource_created_++;
UIResourceId nid = next_id_++;
- ui_resource_bitmap_map_[nid] = content->GetBitmap(nid, false);
+ ui_resource_bitmap_map_.insert(
+ std::make_pair(nid, content->GetBitmap(nid, false)));
return nid;
}
@@ -546,13 +547,13 @@ class MockLayerTreeHost : public LayerTreeHost {
gfx::Size ui_resource_size(UIResourceId id) {
UIResourceBitmapMap::iterator iter = ui_resource_bitmap_map_.find(id);
- if (iter != ui_resource_bitmap_map_.end() && iter->second.get())
- return iter->second->GetSize();
+ if (iter != ui_resource_bitmap_map_.end())
+ return iter->second.GetSize();
return gfx::Size();
}
private:
- typedef base::hash_map<UIResourceId, scoped_refptr<UIResourceBitmap> >
+ typedef base::hash_map<UIResourceId, UIResourceBitmap>
UIResourceBitmapMap;
UIResourceBitmapMap ui_resource_bitmap_map_;