cc: Separate tiling set functionality into explicit separate functions.

cc/layers/picture_layer_impl.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/layers/picture_layer_impl.h"
 
 #include <algorithm>
 #include <cmath>
 #include <limits>
 #include <set>
@@ skipping 520 matching lines @@
 
   // Need to call UpdateTiles again if CanHaveTilings changed.
   if (could_have_tilings != can_have_tilings)
     layer_tree_impl()->set_needs_update_draw_properties();
 
   if (!can_have_tilings) {
     RemoveAllTilings();
     return;
   }
 
+  tilings_->RemoveTilingsBelowScale(MinimumContentsScale());

[enne (OOO), 2015/03/31 19:53:02]

I'm not 100% on moving this.  I agree that something called "UpdateRasterSource"
maybe shouldn't be removing tilings, but it really is all about adding tilings
from the pending set if needed, and so removing tilings that aren't needed also
seems like a legit operation to have there too.

What if the RemoveTilings code went into
UpdateTilingsToCurrentRasterSourceForCommit?

[vmpstr, 2015/04/01 23:53:41]

I moved back into both functions (as it would have been before). It makes sense
that since we're creating tilings in that function that we would be removing
them as well. I did add it to both, since I don't want to change behavior with
this patch, just restructure the calls a bit.

+  tilings_->RemoveTilingsAboveScale(MaximumContentsScale());
   // We could do this after doing UpdateTiles, which would avoid doing this for
   // tilings that are going to disappear on the pending tree (if scale changed).
   // But that would also be more complicated, so we just do it here for now.
-  tilings_->UpdateTilingsToCurrentRasterSource(
-      raster_source_, pending_set, invalidation_, MinimumContentsScale(),
-      MaximumContentsScale());
+  if (pending_set) {
+    tilings_->UpdateTilingsToCurrentRasterSourceForActivation(
+        raster_source_, pending_set, invalidation_);
+  } else {
+    tilings_->UpdateTilingsToCurrentRasterSourceForCommit(raster_source_,
+                                                          invalidation_);
+  }
 }
 
 void PictureLayerImpl::UpdateCanUseLCDTextAfterCommit() {
   // This function is only allowed to be called after commit, due to it not
   // being smart about sharing tiles and because otherwise it would cause
   // flashes by switching out tiles in place that may be currently on screen.
   DCHECK(layer_tree_impl()->IsSyncTree());
 
   // Don't allow the LCD text state to change once disabled.
   if (!RasterSourceUsesLCDText())
     return;
   if (can_use_lcd_text() == RasterSourceUsesLCDText())
     return;
 
   // Raster sources are considered const, so in order to update the state
   // a new one must be created and all tiles recreated.
   scoped_refptr<RasterSource> new_raster_source =
       raster_source_->CreateCloneWithoutLCDText();
+  raster_source_.swap(new_raster_source);
+
   // Synthetically invalidate everything.
   gfx::Rect bounds_rect(bounds());
-  Region invalidation(bounds_rect);
-  UpdateRasterSource(new_raster_source, &invalidation, nullptr);
+  invalidation_ = Region(bounds_rect);
+  tilings_->UpdateRasterSourceDueToLCDChange(raster_source_, invalidation_);
   SetUpdateRect(bounds_rect);
 
   DCHECK(!RasterSourceUsesLCDText());
 }
 
 bool PictureLayerImpl::RasterSourceUsesLCDText() const {
   return raster_source_ ? raster_source_->CanUseLCDText()
                         : layer_tree_impl()->settings().can_use_lcd_text;
 }
 
@@ skipping 656 matching lines @@
 
 bool PictureLayerImpl::IsOnActiveOrPendingTree() const {
   return !layer_tree_impl()->IsRecycleTree();
 }
 
 bool PictureLayerImpl::HasValidTilePriorities() const {
   return IsOnActiveOrPendingTree() && IsDrawnRenderSurfaceLayerListMember();
 }
 
 }  // namespace cc