Fix MultiPictureDraw issues with GpuImageDecodeController

cc/raster/gpu_raster_buffer_provider.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 "cc/raster/gpu_raster_buffer_provider.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/trace_event/trace_event.h"
 #include "cc/base/histograms.h"
+#include "cc/playback/image_hijack_canvas.h"
 #include "cc/playback/raster_source.h"
 #include "cc/raster/scoped_gpu_raster.h"
 #include "cc/resources/resource.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "third_party/skia/include/core/SkMultiPictureDraw.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
 #include "third_party/skia/include/core/SkSurface.h"
 #include "third_party/skia/include/gpu/GrContext.h"
 
 namespace cc {
@@ skipping 30 matching lines @@
                            client_name),
         100.0f * fraction_saved);
   }
 
   // Play back raster_source into temp SkPicture.
   SkPictureRecorder recorder;
   const int flags = SkPictureRecorder::kComputeSaveLayerInfo_RecordFlag;
   sk_sp<SkCanvas> canvas = sk_ref_sp(recorder.beginRecording(
       resource_size.width(), resource_size.height(), NULL, flags));
   canvas->save();
+
+  // The GPU image decode controller assumes that Skia is done with an image
+  // when playback is complete. However, in this case, where we play back to a
+  // picture, we don't actually finish with the images until the picture is
+  // rasterized later. This can cause lifetime issues in the GPU image decode
+  // controller. To avoid this, we disable the image hijack canvas (and image
+  // decode controller) for this playback step, instead enabling it for the
+  // later picture rasterization.
+  RasterSource::PlaybackSettings settings = playback_settings;
+  settings.use_image_hijack_canvas = false;
   raster_source->PlaybackToCanvas(canvas.get(), raster_full_rect, playback_rect,
-                                  scale, playback_settings);
+                                  scale, settings);
   canvas->restore();
   return recorder.finishRecordingAsPicture();
 }
 
-static void RasterizePicture(SkPicture* picture,
-                             ContextProvider* context_provider,
-                             ResourceProvider::ScopedWriteLockGL* resource_lock,
-                             bool async_worker_context_enabled,
-                             bool use_distance_field_text,
-                             bool can_use_lcd_text,
-                             int msaa_sample_count) {
+static void RasterizePicture(
+    SkPicture* picture,
+    ContextProvider* context_provider,
+    ResourceProvider::ScopedWriteLockGL* resource_lock,
+    bool async_worker_context_enabled,
+    bool use_distance_field_text,
+    bool can_use_lcd_text,
+    int msaa_sample_count,
+    const RasterSource* raster_source,

[vmpstr, 2016/07/14 21:41:54]

Can you just pass IDC here? and just "use_hijack_canvas" instead of full
playback settings?

[ericrk, 2016/07/14 22:04:20]

yup, makes sense.

+    const RasterSource::PlaybackSettings& playback_settings) {
   ScopedGpuRaster gpu_raster(context_provider);
 
   ResourceProvider::ScopedSkSurfaceProvider scoped_surface(
       context_provider, resource_lock, async_worker_context_enabled,
       use_distance_field_text, can_use_lcd_text, msaa_sample_count);
   SkSurface* sk_surface = scoped_surface.sk_surface();
   // Allocating an SkSurface will fail after a lost context.  Pretend we
   // rasterized, as the contents of the resource don't matter anymore.
   if (!sk_surface)
     return;
 
+  // As we did not use the image hijack canvas during the initial playback to
+  // |picture| (see PlaybackToPicture), we must enable it here if requested.
+  SkCanvas* canvas = sk_surface->getCanvas();
+  std::unique_ptr<ImageHijackCanvas> hijack_canvas;
+  if (playback_settings.use_image_hijack_canvas) {
+    const SkImageInfo& info = canvas->imageInfo();
+    hijack_canvas.reset(
+        new ImageHijackCanvas(info.width(), info.height(),
+                              raster_source->GetImageDecodeController()));
+    SkIRect raster_bounds;
+    canvas->getClipDeviceBounds(&raster_bounds);
+    hijack_canvas->clipRect(SkRect::MakeFromIRect(raster_bounds));
+    hijack_canvas->setMatrix(canvas->getTotalMatrix());
+    hijack_canvas->addCanvas(canvas);
+
+    // Replace canvas with our ImageHijackCanvas which is wrapping it.
+    canvas = hijack_canvas.get();
+  }
+
   SkMultiPictureDraw multi_picture_draw;
-  multi_picture_draw.add(sk_surface->getCanvas(), picture);
+  multi_picture_draw.add(canvas, picture);
   multi_picture_draw.draw(false);
 }
 
 }  // namespace
 
 GpuRasterBufferProvider::RasterBufferImpl::RasterBufferImpl(
     GpuRasterBufferProvider* client,
     ResourceProvider* resource_provider,
     ResourceId resource_id,
     bool async_worker_context_enabled,
@@ skipping 127 matching lines @@
       raster_source, resource_has_previous_content, resource_lock->size(),
       raster_full_rect, raster_dirty_rect, scale, playback_settings);
 
   // Turn on distance fields for layers that have ever animated.
   bool use_distance_field_text =
       use_distance_field_text_ ||
       raster_source->ShouldAttemptToUseDistanceFieldText();
 
   RasterizePicture(picture.get(), worker_context_provider_, resource_lock,
                    async_worker_context_enabled_, use_distance_field_text,
-                   raster_source->CanUseLCDText(), msaa_sample_count_);
+                   raster_source->CanUseLCDText(), msaa_sample_count_,
+                   raster_source, playback_settings);
 
   const uint64_t fence_sync = gl->InsertFenceSyncCHROMIUM();
 
   // Barrier to sync worker context output to cc context.
   gl->OrderingBarrierCHROMIUM();
 
   // Generate sync token after the barrier for cross context synchronization.
   gpu::SyncToken resource_sync_token;
   gl->GenUnverifiedSyncTokenCHROMIUM(fence_sync, resource_sync_token.GetData());
   resource_lock->set_sync_token(resource_sync_token);
   resource_lock->set_synchronized(!async_worker_context_enabled_);
 }
 
 }  // namespace cc