Update from https://crrev.com/309717

cc/test/tiled_layer_test_common.cc

 // Copyright 2012 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/tiled_layer_test_common.h"
 
 namespace cc {
 
 FakeLayerUpdater::Resource::Resource(FakeLayerUpdater* layer,
                                      scoped_ptr<PrioritizedResource> texture)
@@ skipping 81 matching lines @@
   TiledLayer::SetNeedsDisplayRect(rect);
 }
 
 void FakeTiledLayer::SetTexturePriorities(
     const PriorityCalculator& calculator) {
   // Ensure there is always a target render surface available. If none has been
   // set (the layer is an orphan for the test), then just set a surface on
   // itself.
   bool missing_target_render_surface = !render_target();
 
-  if (missing_target_render_surface)
+  if (missing_target_render_surface) {
     CreateRenderSurface();
+    draw_properties().render_target = this;
+  }
 
   TiledLayer::SetTexturePriorities(calculator);
 
   if (missing_target_render_surface) {
     ClearRenderSurface();
     draw_properties().render_target = 0;
   }
 }
 
 PrioritizedResourceManager* FakeTiledLayer::ResourceManager() {
@@ skipping 43 matching lines @@
     float* contents_scale_y,
     gfx::Size* content_bounds) {
   *contents_scale_x =
       static_cast<float>(forced_content_bounds_.width()) / bounds().width();
   *contents_scale_y =
       static_cast<float>(forced_content_bounds_.height()) / bounds().height();
   *content_bounds = forced_content_bounds_;
 }
 
 }  // namespace cc