Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / cc / layers / ui_resource_layer_impl_unittest.cc

diff --git a/src/cc/layers/ui_resource_layer_impl_unittest.cc b/src/cc/layers/ui_resource_layer_impl_unittest.cc
index 35ff05b..596cb3b 100644 (file)
--- a/src/cc/layers/ui_resource_layer_impl_unittest.cc
+++ b/src/cc/layers/ui_resource_layer_impl_unittest.cc
@@ -21,8 +21,8 @@ namespace {
 
 scoped_ptr<UIResourceLayerImpl> GenerateUIResourceLayer(
     FakeUIResourceLayerTreeHostImpl* host_impl,
-    gfx::Size bitmap_size,
-    gfx::Size layer_size,
+    const gfx::Size& bitmap_size,
+    const gfx::Size& layer_size,
     bool opaque,
     UIResourceId uid) {
   gfx::Rect visible_content_rect(layer_size);
@@ -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);
@@ -87,7 +89,7 @@ TEST(UIResourceLayerImplTest, VerifyDrawQuads) {
 }
 
 void OpaqueBoundsTest(scoped_ptr<UIResourceLayerImpl> layer,
-                 gfx::Rect expected_opaque_bounds) {
+                 const gfx::Rect& expected_opaque_bounds) {
   MockQuadCuller quad_culler;
   AppendQuadsData data;
   layer->AppendQuads(&quad_culler, &data);