Add a flag to disable partial raster in renderer

cc/trees/layer_tree_host_pixeltest_tiles.cc

 // Copyright 2015 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/layers/content_layer_client.h"
 #include "cc/layers/picture_layer.h"
 #include "cc/output/copy_output_request.h"
 #include "cc/playback/display_item_list.h"
 #include "cc/playback/display_item_list_settings.h"
 #include "cc/playback/drawing_display_item.h"
 #include "cc/test/layer_tree_pixel_test.h"
 #include "cc/test/test_gpu_memory_buffer_manager.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
 
 #if !defined(OS_ANDROID)
 
 namespace cc {
 namespace {
 
 enum RasterMode {
   PARTIAL_ONE_COPY,
   FULL_ONE_COPY,
-  GPU,
-  BITMAP,
+  PARTIAL_GPU,
+  FULL_GPU,
+  PARTIAL_BITMAP,
+  FULL_BITMAP,
 };
 
 class LayerTreeHostTilesPixelTest : public LayerTreePixelTest {
  protected:
   void InitializeSettings(LayerTreeSettings* settings) override {
     LayerTreePixelTest::InitializeSettings(settings);
     switch (raster_mode_) {
       case PARTIAL_ONE_COPY:
         settings->use_zero_copy = false;
-        settings->use_persistent_map_for_gpu_memory_buffers = true;
+        settings->use_partial_raster = true;
         break;
       case FULL_ONE_COPY:
         settings->use_zero_copy = false;
-        settings->use_persistent_map_for_gpu_memory_buffers = false;
+        settings->use_partial_raster = false;
         break;
-      case BITMAP:
-        // This is done via context creation. No settings to change here!
+      case PARTIAL_BITMAP:
+        settings->use_partial_raster = true;
         break;
-      case GPU:
+      case FULL_BITMAP:
+        settings->use_partial_raster = false;
+        break;
+      case PARTIAL_GPU:
         settings->gpu_rasterization_enabled = true;
         settings->gpu_rasterization_forced = true;
+        settings->use_partial_raster = true;
+        break;
+      case FULL_GPU:
+        settings->gpu_rasterization_enabled = true;
+        settings->gpu_rasterization_forced = true;
+        settings->use_partial_raster = false;
         break;
     }
   }
 
   void BeginTest() override {
     // Don't set up a readback target at the start of the test.
     PostSetNeedsCommitToMainThread();
   }
 
   void DoReadback() {
     Layer* target =
         readback_target_ ? readback_target_ : layer_tree_host()->root_layer();
     target->RequestCopyOfOutput(CreateCopyOutputRequest());
   }
 
   void RunRasterPixelTest(bool threaded,
                           RasterMode mode,
                           scoped_refptr<Layer> content_root,
                           base::FilePath file_name) {
     raster_mode_ = mode;
 
     PixelTestType test_type = PIXEL_TEST_SOFTWARE;
     switch (mode) {
       case PARTIAL_ONE_COPY:
       case FULL_ONE_COPY:
-      case GPU:
+      case PARTIAL_GPU:
+      case FULL_GPU:
         test_type = PIXEL_TEST_GL;
         break;
-      case BITMAP:
+      case PARTIAL_BITMAP:
+      case FULL_BITMAP:
         test_type = PIXEL_TEST_SOFTWARE;
     }
 
     if (threaded)
       RunPixelTest(test_type, content_root, file_name);
     else
       RunSingleThreadedPixelTest(test_type, content_root, file_name);
   }
 
   base::FilePath ref_file_;
@@ skipping 112 matching lines @@
 TEST_F(LayerTreeHostTilesTestPartialInvalidation,
        FullRaster_MultiThread_OneCopy) {
   RunRasterPixelTest(
       true, FULL_ONE_COPY, picture_layer_,
       base::FilePath(FILE_PATH_LITERAL("blue_yellow_flipped.png")));
 }
 
 TEST_F(LayerTreeHostTilesTestPartialInvalidation,
        PartialRaster_SingleThread_Software) {
   RunRasterPixelTest(
-      false, BITMAP, picture_layer_,
+      false, PARTIAL_BITMAP, picture_layer_,
       base::FilePath(FILE_PATH_LITERAL("blue_yellow_partial_flipped.png")));
 }
 
 TEST_F(LayerTreeHostTilesTestPartialInvalidation,
+       FulllRaster_SingleThread_Software) {
+  RunRasterPixelTest(
+      false, FULL_BITMAP, picture_layer_,
+      base::FilePath(FILE_PATH_LITERAL("blue_yellow_flipped.png")));
+}
+
+TEST_F(LayerTreeHostTilesTestPartialInvalidation,
        PartialRaster_SingleThread_GpuRaster) {
   RunRasterPixelTest(
-      false, GPU, picture_layer_,
+      false, PARTIAL_GPU, picture_layer_,
       base::FilePath(FILE_PATH_LITERAL("blue_yellow_partial_flipped.png")));
 }
 
+TEST_F(LayerTreeHostTilesTestPartialInvalidation,
+       FullRaster_SingleThread_GpuRaster) {
+  RunRasterPixelTest(
+      false, FULL_GPU, picture_layer_,
+      base::FilePath(FILE_PATH_LITERAL("blue_yellow_flipped.png")));
+}
+
 }  // namespace
 }  // namespace cc
 
 #endif  // !defined(OS_ANDROID)