Plumb PaintImage for the img.decode instead of SkImage.

content/renderer/gpu/render_widget_compositor.cc

 // Copyright (c) 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 "content/renderer/gpu/render_widget_compositor.h"
 
 #include <stddef.h>
 
 #include <cmath>
 #include <limits>
@@ skipping 1079 matching lines @@
 
 void RenderWidgetCompositor::SetBrowserControlsShownRatio(float ratio) {
   layer_tree_host_->SetBrowserControlsShownRatio(ratio);
 }
 
 void RenderWidgetCompositor::setBottomControlsHeight(float height) {
   layer_tree_host_->SetBottomControlsHeight(height);
 }
 
 void RenderWidgetCompositor::RequestDecode(
-    sk_sp<SkImage> image,
+    const PaintImage& image,
     const base::Callback<void(bool)>& callback) {
-  layer_tree_host_->QueueImageDecode(std::move(image), callback);
+  layer_tree_host_->QueueImageDecode(image, callback);
 
   // If we're compositing synchronously, the SetNeedsCommit call which will be
   // issued by |layer_tree_host_| is not going to cause a commit, due to the
   // fact that this would make layout tests slow and cause flakiness. However,
   // in this case we actually need a commit to transfer the decode requests to
   // the impl side. So, force a commit to happen.
   if (CompositeIsSynchronous()) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE, base::Bind(&RenderWidgetCompositor::SynchronouslyComposite,
                               weak_factory_.GetWeakPtr()));
@@ skipping 141 matching lines @@
     const cc::LocalSurfaceId& local_surface_id) {
   layer_tree_host_->SetLocalSurfaceId(local_surface_id);
 }
 
 void RenderWidgetCompositor::NotifySwapTime(ReportTimeCallback callback) {
   QueueSwapPromise(base::MakeUnique<ReportTimeSwapPromise>(
       std::move(callback), base::ThreadTaskRunnerHandle::Get()));
 }
 
 }  // namespace content