cc/layers/scrollbar_layer_unittest.cc - Issue 22870016: Update the nine patch layer to use UI resources

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: cc/layers/scrollbar_layer_unittest.cc

Issue 22870016: Update the nine patch layer to use UI resources (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: UIResourceBitmap holds SkPixelRef* instead of uint8_t* 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:

Index: cc/layers/scrollbar_layer_unittest.cc

diff --git a/cc/layers/scrollbar_layer_unittest.cc b/cc/layers/scrollbar_layer_unittest.cc

index 21b4bb7efe23ce0cb2e46eea365543fc1f0ca3e6..58113cf368f8d0b045436a7e2dbb010653951f85 100644

--- a/cc/layers/scrollbar_layer_unittest.cc

+++ b/cc/layers/scrollbar_layer_unittest.cc

@@ -541,13 +541,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_;