Plumb PaintImage to the PictureImageLayer.

content/renderer/child_frame_compositing_helper.cc

 // Copyright 2014 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 "content/renderer/child_frame_compositing_helper.h"
 
 #include <utility>
 
 #include "cc/blink/web_layer_impl.h"
 #include "cc/layers/picture_image_layer.h"
 #include "cc/layers/solid_color_layer.h"
 #include "cc/layers/surface_layer.h"
 #include "cc/output/context_provider.h"
 #include "cc/output/copy_output_request.h"
 #include "cc/output/copy_output_result.h"
+#include "cc/paint/paint_image.h"
 #include "cc/resources/single_release_callback.h"
 #include "cc/surfaces/sequence_surface_reference_factory.h"
 #include "content/child/thread_safe_sender.h"
 #include "content/common/browser_plugin/browser_plugin_messages.h"
 #include "content/common/content_switches_internal.h"
 #include "content/common/frame_messages.h"
 #include "content/public/common/content_client.h"
 #include "content/public/renderer/content_renderer_client.h"
 #include "content/renderer/browser_plugin/browser_plugin.h"
 #include "content/renderer/browser_plugin/browser_plugin_manager.h"
@@ skipping 158 matching lines @@
   crashed_layer->SetMasksToBounds(true);
   crashed_layer->SetBackgroundColor(SK_ColorBLACK);
 
   if (web_layer_) {
     SkBitmap* sad_bitmap =
         GetContentClient()->renderer()->GetSadWebViewBitmap();
     if (sad_bitmap && web_layer_->Bounds().width > sad_bitmap->width() &&
         web_layer_->Bounds().height > sad_bitmap->height()) {
       scoped_refptr<cc::PictureImageLayer> sad_layer =
           cc::PictureImageLayer::Create();
-      sad_layer->SetImage(SkImage::MakeFromBitmap(*sad_bitmap));
+      sad_layer->SetImage(
+          cc::PaintImage(SkImage::MakeFromBitmap(*sad_bitmap),
+                         cc::PaintImage::AnimationType::STATIC,
+                         cc::PaintImage::CompletionState::DONE));
       sad_layer->SetBounds(
           gfx::Size(sad_bitmap->width(), sad_bitmap->height()));
       sad_layer->SetPosition(gfx::PointF(
           (web_layer_->Bounds().width - sad_bitmap->width()) / 2,
           (web_layer_->Bounds().height - sad_bitmap->height()) / 2));
       sad_layer->SetIsDrawable(true);
 
       crashed_layer->AddChild(sad_layer);
     }
   }
@@ skipping 44 matching lines @@
       surface_info.size_in_pixels(), surface_info.device_scale_factor(),
       static_cast<cc_blink::WebLayerImpl*>(web_layer_.get())->layer());
 }
 
 void ChildFrameCompositingHelper::UpdateVisibility(bool visible) {
   if (web_layer_)
     web_layer_->SetDrawsContent(visible);
 }
 
 }  // namespace content