summaryrefslogtreecommitdiffstats
path: root/cc
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-06 05:42:23 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-06 05:42:23 +0000
commit65340173a0a90fc60885998e201af93ad24b009b (patch)
treead3f45be0680e297acc0909418a8980087b2cba4 /cc
parent67c703b8d9d0128531daf15c679526b9049b7386 (diff)
downloadchromium_src-65340173a0a90fc60885998e201af93ad24b009b.zip
chromium_src-65340173a0a90fc60885998e201af93ad24b009b.tar.gz
chromium_src-65340173a0a90fc60885998e201af93ad24b009b.tar.bz2
Switch from (deprecated) setIsOpaque to setAlphaType.
BUG=None TEST=cc_unittests R=reed@google.com,danakj@chromium.org,thakis@chromium.org Review URL: https://codereview.chromium.org/57153002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233221 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc')
-rw-r--r--cc/layers/ui_resource_layer_impl_unittest.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/cc/layers/ui_resource_layer_impl_unittest.cc b/cc/layers/ui_resource_layer_impl_unittest.cc
index 35ff05b..4a2a116 100644
--- a/cc/layers/ui_resource_layer_impl_unittest.cc
+++ b/cc/layers/ui_resource_layer_impl_unittest.cc
@@ -35,11 +35,13 @@ scoped_ptr<UIResourceLayerImpl> GenerateUIResourceLayer(
layer->draw_properties().render_target = layer.get();
SkBitmap skbitmap;
- skbitmap.setConfig(
- SkBitmap::kARGB_8888_Config, bitmap_size.width(), bitmap_size.height());
+ skbitmap.setConfig(SkBitmap::kARGB_8888_Config,
+ bitmap_size.width(),
+ bitmap_size.height(),
+ 0,
+ opaque ? kOpaque_SkAlphaType : kPremul_SkAlphaType);
skbitmap.allocPixels();
skbitmap.setImmutable();
- skbitmap.setIsOpaque(opaque);
UIResourceBitmap bitmap(skbitmap);
host_impl->CreateUIResource(uid, bitmap);