cc: Use Skia information about whether pictures have bitmaps

This information allows us to early out of functions around gathering
and iterating through pixel refs.

BUG=316196

Review URL: https://codereview.chromium.org/115273003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241103 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 6 insertions, 1 deletions

diff --git a/cc/resources/picture.cc b/cc/resources/picture.cc
index 7e278f8..8c3be9c 100644
--- a/cc/resources/picture.cc
+++ b/cc/resources/picture.cc
@@ -248,6 +248,8 @@ void Picture::GatherPixelRefs(
                "height", layer_rect_.height());
 
   DCHECK(picture_);
+  if (!WillPlayBackBitmaps())
+    return;
   cell_size_ = gfx::Size(
       tile_grid_info.fTileInterval.width() +
           2 * tile_grid_info.fMargin.width(),
diff --git a/cc/resources/picture.h b/cc/resources/picture.h
index 4eb238a..085fb6a 100644
--- a/cc/resources/picture.h
+++ b/cc/resources/picture.h
@@ -117,6 +117,8 @@ class CC_EXPORT Picture
   void EmitTraceSnapshot();
   void EmitTraceSnapshotAlias(Picture* original);
 
+  bool WillPlayBackBitmaps() const { return picture_->willPlayBackBitmaps(); }
+
  private:
   explicit Picture(gfx::Rect layer_rect);
   // This constructor assumes SkPicture is already ref'd and transfers
diff --git a/cc/resources/picture_pile_impl.cc b/cc/resources/picture_pile_impl.cc
index ca160b5..b6f4d77 100644
--- a/cc/resources/picture_pile_impl.cc
+++ b/cc/resources/picture_pile_impl.cc
@@ -386,7 +386,8 @@ void PicturePileImpl::PixelRefIterator::AdvanceToTilePictureWithPixelRefs() {
       continue;
 
     const Picture* picture = it->second.GetPicture();
-    if (!picture || (processed_pictures_.count(picture) != 0))
+    if (!picture || (processed_pictures_.count(picture) != 0) ||
+        !picture->WillPlayBackBitmaps())
       continue;
 
     processed_pictures_.insert(picture);