Plumb can_use_lcd_text, contents_opaque directly to ContentLayerClient.

cc/resources/picture_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/resources/picture.h"
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "cc/test/fake_content_layer_client.h"
@@ skipping 31 matching lines @@
   scoped_refptr<Picture> invalid_picture =
       Picture::CreateFromValue(tmp.get());
   EXPECT_FALSE(invalid_picture.get());
 
   // Single full-size rect picture.
   content_layer_client.add_draw_rect(layer_rect, red_paint);
 
   scoped_refptr<Picture> one_rect_picture =
       Picture::Create(layer_rect,
                       &content_layer_client,
+                      false,
+                      false,
                       tile_grid_info,
                       false,
                       Picture::RECORD_NORMALLY);
   scoped_ptr<base::Value> serialized_one_rect(one_rect_picture->AsValue());
 
   // Reconstruct the picture.
   scoped_refptr<Picture> one_rect_picture_check =
       Picture::CreateFromValue(serialized_one_rect.get());
   EXPECT_TRUE(!!one_rect_picture_check.get());
 
   // Check for equivalence.
   unsigned char one_rect_buffer[4 * 100 * 100] = {0};
   DrawPicture(one_rect_buffer, layer_rect, one_rect_picture);
   unsigned char one_rect_buffer_check[4 * 100 * 100] = {0};
   DrawPicture(one_rect_buffer_check, layer_rect, one_rect_picture_check);
 
   EXPECT_EQ(one_rect_picture->LayerRect(), one_rect_picture_check->LayerRect());
   EXPECT_EQ(0, memcmp(one_rect_buffer, one_rect_buffer_check, 4 * 100 * 100));
 
   // Two rect picture.
   content_layer_client.add_draw_rect(gfx::Rect(25, 25, 50, 50), green_paint);
 
   scoped_refptr<Picture> two_rect_picture =
       Picture::Create(layer_rect,
                       &content_layer_client,
+                      false,
+                      false,
                       tile_grid_info,
                       false,
                       Picture::RECORD_NORMALLY);
 
   scoped_ptr<base::Value> serialized_two_rect(two_rect_picture->AsValue());
 
   // Reconstruct the picture.
   scoped_refptr<Picture> two_rect_picture_check =
       Picture::CreateFromValue(serialized_two_rect.get());
   EXPECT_TRUE(!!two_rect_picture_check.get());
@@ skipping 37 matching lines @@
         SkPaint paint;
         content_layer_client.add_draw_bitmap(
             discardable_bitmap[y][x],
             gfx::Point(x * 512 + 6, y * 512 + 6), paint);
       }
     }
   }
 
   scoped_refptr<Picture> picture = Picture::Create(layer_rect,
                                                    &content_layer_client,
+                                                   false,
+                                                   false,
                                                    tile_grid_info,
                                                    true,
                                                    Picture::RECORD_NORMALLY);
 
   // Default iterator does not have any pixel refs
   {
     Picture::PixelRefIterator iterator;
     EXPECT_FALSE(iterator);
   }
   for (int y = 0; y < 4; ++y) {
@@ skipping 80 matching lines @@
         SkPaint paint;
         content_layer_client.add_draw_bitmap(
             discardable_bitmap[y][x],
             gfx::Point(1024 + x * 512 + 6, y * 512 + 6), paint);
       }
     }
   }
 
   scoped_refptr<Picture> picture = Picture::Create(layer_rect,
                                                    &content_layer_client,
+                                                   false,
+                                                   false,
                                                    tile_grid_info,
                                                    true,
                                                    Picture::RECORD_NORMALLY);
 
   // Default iterator does not have any pixel refs
   {
     Picture::PixelRefIterator iterator;
     EXPECT_FALSE(iterator);
   }
   for (int y = 0; y < 4; ++y) {
@@ skipping 103 matching lines @@
         SkPaint paint;
         content_layer_client.add_draw_bitmap(
             discardable_bitmap[y][x],
             gfx::Point(x * 512 + 6, y * 512 + 6), paint);
       }
     }
   }
 
   scoped_refptr<Picture> picture = Picture::Create(layer_rect,
                                                    &content_layer_client,
+                                                   false,
+                                                   false,
                                                    tile_grid_info,
                                                    true,
                                                    Picture::RECORD_NORMALLY);
 
   for (int y = 0; y < 4; ++y) {
     for (int x = 0; x < 4; ++x) {
       Picture::PixelRefIterator iterator(
           gfx::Rect(x * 512, y * 512 + 256, 1, 1), picture.get());
       if ((x + y) & 1) {
         EXPECT_TRUE(iterator) << x << " " << y;
@@ skipping 29 matching lines @@
   tmp.reset(new base::StringValue("abc!@#$%"));
   scoped_refptr<Picture> invalid_picture =
       Picture::CreateFromSkpValue(tmp.get());
   EXPECT_TRUE(!invalid_picture.get());
 
   // Single full-size rect picture.
   content_layer_client.add_draw_rect(layer_rect, red_paint);
   scoped_refptr<Picture> one_rect_picture =
       Picture::Create(layer_rect,
                       &content_layer_client,
+                      false,
+                      false,
                       tile_grid_info,
                       false,
                       Picture::RECORD_NORMALLY);
   scoped_ptr<base::Value> serialized_one_rect(
       one_rect_picture->AsValue());
 
   const base::DictionaryValue* value = NULL;
   EXPECT_TRUE(serialized_one_rect->GetAsDictionary(&value));
 
   // Decode the picture from base64.
@@ skipping 17 matching lines @@
   SkTileGridFactory::TileGridInfo tile_grid_info;
   tile_grid_info.fTileInterval = SkISize::Make(100, 200);
   tile_grid_info.fMargin.setEmpty();
   tile_grid_info.fOffset.setZero();
 
   FakeContentLayerClient content_layer_client;
   EXPECT_EQ(NULL, content_layer_client.last_canvas());
 
   scoped_refptr<Picture> picture = Picture::Create(layer_rect,
                                                    &content_layer_client,
+                                                   false,
+                                                   false,
                                                    tile_grid_info,
                                                    false,
                                                    Picture::RECORD_NORMALLY);
   EXPECT_TRUE(content_layer_client.last_canvas() != NULL);
   EXPECT_EQ(ContentLayerClient::GRAPHICS_CONTEXT_ENABLED,
             content_layer_client.last_context_status());
   EXPECT_TRUE(picture.get());
 
   picture = Picture::Create(layer_rect,
                             &content_layer_client,
+                            false,
+                            false,
                             tile_grid_info,
                             false,
                             Picture::RECORD_WITH_SK_NULL_CANVAS);
   EXPECT_TRUE(content_layer_client.last_canvas() != NULL);
   EXPECT_EQ(ContentLayerClient::GRAPHICS_CONTEXT_ENABLED,
             content_layer_client.last_context_status());
   EXPECT_TRUE(picture.get());
 
   picture = Picture::Create(layer_rect,
                             &content_layer_client,
+                            false,
+                            false,
                             tile_grid_info,
                             false,
                             Picture::RECORD_WITH_PAINTING_DISABLED);
   EXPECT_TRUE(content_layer_client.last_canvas() != NULL);
   EXPECT_EQ(ContentLayerClient::GRAPHICS_CONTEXT_DISABLED,
             content_layer_client.last_context_status());
   EXPECT_TRUE(picture.get());
 
   EXPECT_EQ(3, Picture::RECORDING_MODE_COUNT);
 }
 
 }  // namespace
 }  // namespace cc