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 523 matching lines @@
     layer_tree_impl()->set_needs_update_draw_properties();
 
   if (!can_have_tilings) {
     RemoveAllTilings();
     return;
   }
 
   // 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_, MinimumContentsScale(),
+        MaximumContentsScale());
+  } else {
+    tilings_->UpdateTilingsToCurrentRasterSourceForCommit(
+        raster_source_, invalidation_, MinimumContentsScale(),
+        MaximumContentsScale());
+  }
 }
 
 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