Chromium roll (https://codereview.chromium.org/976353002)

cc/resources/picture_pile.cc

 // Copyright 2012 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/resources/picture_pile.h"
 
 #include <algorithm>
 #include <limits>
 #include <vector>
 
@@ skipping 196 matching lines @@
 
   CreatePictures(painter, recording_mode, record_rects);
 
   DetermineIfSolidColor();
 
   has_any_recordings_ = true;
   DCHECK(CanRasterSlowTileCheck(recorded_viewport_));
   return true;
 }
 
+void PicturePile::DidMoveToNewCompositor() {
+  for (auto& map_pair : picture_map_)
+    map_pair.second.ResetInvalidationHistory();
+}
+
 bool PicturePile::ApplyInvalidationAndResize(const gfx::Rect& interest_rect,
                                              Region* invalidation,
                                              const gfx::Size& layer_size,
                                              int frame_number) {
   bool updated = false;
 
   Region synthetic_invalidation;
   gfx::Size old_tiling_size = GetSize();
   if (old_tiling_size != layer_size) {
     tiling_.SetTilingSize(layer_size);
@@ skipping 513 matching lines @@
 
   // We only need recording if we don't have a picture. Furthermore, we only
   // need a recording if we're within frequent invalidation distance threshold
   // or the invalidation is not frequent enough (below invalidation frequency
   // threshold).
   return !picture_.get() &&
          ((distance_to_visible <= kFrequentInvalidationDistanceThreshold) ||
           (GetInvalidationFrequency() < kInvalidationFrequencyThreshold));
 }
 
+void PicturePile::PictureInfo::ResetInvalidationHistory() {
+  invalidation_history_.reset();
+  last_frame_number_ = 0;
+}
+
 void PicturePile::SetBufferPixels(int new_buffer_pixels) {
   if (new_buffer_pixels == buffer_pixels())
     return;
 
   Clear();
   tiling_.SetBorderTexels(new_buffer_pixels);
 }
 
 void PicturePile::PictureInfo::SetPicture(scoped_refptr<Picture> picture) {
   picture_ = picture;
 }
 
 const Picture* PicturePile::PictureInfo::GetPicture() const {
   return picture_.get();
 }
 
 float PicturePile::PictureInfo::GetInvalidationFrequency() const {
   return invalidation_history_.count() /
          static_cast<float>(INVALIDATION_FRAMES_TRACKED);
 }
 
 }  // namespace cc