Update from https://crrev.com/316786

cc/test/fake_picture_layer_impl.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/test/fake_picture_layer_impl.h"
 
 #include <vector>
 #include "cc/resources/tile.h"
 #include "cc/trees/layer_tree_impl.h"
 
@@ skipping 68 matching lines @@
 
 void FakePictureLayerImpl::PushPropertiesTo(LayerImpl* layer_impl) {
   FakePictureLayerImpl* picture_layer_impl =
       static_cast<FakePictureLayerImpl*>(layer_impl);
   picture_layer_impl->fixed_tile_size_ = fixed_tile_size_;
   PictureLayerImpl::PushPropertiesTo(layer_impl);
 }
 
 void FakePictureLayerImpl::AppendQuads(
     RenderPass* render_pass,
-    const Occlusion& occlusion_in_content_space,
     AppendQuadsData* append_quads_data) {
-  PictureLayerImpl::AppendQuads(
-      render_pass, occlusion_in_content_space, append_quads_data);
+  PictureLayerImpl::AppendQuads(render_pass, append_quads_data);
   ++append_quads_count_;
 }
 
 gfx::Size FakePictureLayerImpl::CalculateTileSize(
     const gfx::Size& content_bounds) const {
   if (fixed_tile_size_.IsEmpty()) {
     return PictureLayerImpl::CalculateTileSize(content_bounds);
   }
 
   return fixed_tile_size_;
@@ skipping 27 matching lines @@
 
 void FakePictureLayerImpl::SetRasterSourceOnPending(
     scoped_refptr<RasterSource> raster_source,
     const Region& invalidation) {
   DCHECK(layer_tree_impl()->IsPendingTree());
   Region invalidation_temp = invalidation;
   const PictureLayerTilingSet* pending_set = nullptr;
   UpdateRasterSource(raster_source, &invalidation_temp, pending_set);
 }
 
+void FakePictureLayerImpl::SetIsDrawnRenderSurfaceLayerListMember(bool is) {
+  draw_properties().last_drawn_render_surface_layer_list_id =
+      is ? layer_tree_impl()->current_render_surface_list_id()
+         : layer_tree_impl()->current_render_surface_list_id() - 1;
+}
+
 void FakePictureLayerImpl::CreateAllTiles() {
   for (size_t i = 0; i < num_tilings(); ++i)
     tilings_->tiling_at(i)->CreateAllTilesForTesting();
 }
 
 void FakePictureLayerImpl::SetAllTilesVisible() {
   WhichTree tree =
       layer_tree_impl()->IsActiveTree() ? ACTIVE_TREE : PENDING_TREE;
 
   for (size_t tiling_idx = 0; tiling_idx < tilings_->num_tilings();
@@ skipping 116 matching lines @@
   return CountTilesRequired(
       &PictureLayerTiling::IsTileRequiredForDrawIfVisible);
 }
 
 void FakePictureLayerImpl::ReleaseResources() {
   PictureLayerImpl::ReleaseResources();
   ++release_resources_count_;
 }
 
 }  // namespace cc