cc: Make discardable image metadata generation work with no caching.

cc/playback/display_item_list.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/playback/display_item_list.h"
 
 #include <string>
 
 #include "base/numerics/safe_conversions.h"
 #include "base/trace_event/trace_event.h"
@@ skipping 254 matching lines @@
       TRACE_DISABLED_BY_DEFAULT("cc.debug.picture") ","
       TRACE_DISABLED_BY_DEFAULT("devtools.timeline.picture"),
       "cc::DisplayItemList", this,
       TracedDisplayItemList::AsTraceableDisplayItemList(this,
           DisplayItemsTracingEnabled()));
 }
 
 void DisplayItemList::GenerateDiscardableImagesMetadata() {
   DCHECK(ProcessAppendedItemsCalled());
   // This should be only called once, and only after CreateAndCacheSkPicture.
-  DCHECK(picture_);
   DCHECK(image_map_.empty());
-  if (!picture_->willPlayBackBitmaps())
+  DCHECK_IMPLIES(use_cached_picture_, picture_);
+  if (use_cached_picture_ && !picture_->willPlayBackBitmaps())
     return;
 
   // The cached picture is translated by -layer_rect_.origin during record,
   // so we need to offset that back in order to get right positioning for
   // images.
   DiscardableImageMap::ScopedMetadataGenerator generator(
       &image_map_, gfx::Size(layer_rect_.right(), layer_rect_.bottom()));
-  generator.canvas()->translate(layer_rect_.x(), layer_rect_.y());
-  generator.canvas()->drawPicture(picture_.get());
+  Raster(generator.canvas(), nullptr,
+         gfx::Rect(layer_rect_.right(), layer_rect_.bottom()), 1.f);
 }
 
 void DisplayItemList::GetDiscardableImagesInRect(
     const gfx::Rect& rect,
     std::vector<PositionImage>* images) {
   image_map_.GetDiscardableImagesInRect(rect, images);
 }
 
 }  // namespace cc