A host of micro-optimizations and a refactor of TimeForBoundsToIntersect

cc/tile_manager.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/tile_manager.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
@@ skipping 16 matching lines @@
 #if defined(OS_ANDROID)
 // For reference, the Nexus10 can upload 1MB in about 2.5ms.
 // Assuming a three frame deep pipeline this implies ~20MB.
 const int kMaxPendingUploadBytes = 20 * 1024 * 1024;
 #else
 const int kMaxPendingUploadBytes = 100 * 1024 * 1024;
 #endif
 
 // Determine bin based on three categories of tiles: things we need now,
 // things we need soon, and eventually.
-TileManagerBin BinFromTilePriority(const TilePriority& prio) {
+inline TileManagerBin BinFromTilePriority(const TilePriority& prio) {
 
   // The amount of time for which we want to have prepainting coverage.
   const double prepainting_window_time_seconds = 1.0;
   const double backfling_guard_distance_pixels = 314.0;
 
   // Explicitly limit how far ahead we will prepaint for low and non-low res.
   const double max_lores_paint_distance_pixels = 8192.0;
   const double max_hires_paint_distance_pixels = 4096.0;
   if (prio.resolution == cc::LOW_RESOLUTION) {
     if (prio.distance_to_visible_in_pixels > max_lores_paint_distance_pixels)
@@ skipping 140 matching lines @@
       for (int i = 0; i < NUM_TREES; ++i)
         --raster_state_count_[mts.raster_state][i][mts.tree_bin[i]];
       FreeResourcesForTile(tile);
       tiles_.erase(it);
       return;
     }
   }
   DCHECK(false) << "Could not find tile version.";
 }
 
-void TileManager::WillModifyTilePriority(
-    Tile* tile, WhichTree tree, const TilePriority& new_priority) {
-  // TODO(nduca): Do something smarter if reprioritization turns out to be
-  // costly.
-  ScheduleManageTiles();
-}
-
-void TileManager::ScheduleManageTiles() {
-  if (manage_tiles_pending_)
-    return;
-  client_->ScheduleManageTiles();
-  manage_tiles_pending_ = true;
-}
-
 class BinComparator {
 public:
   bool operator() (const Tile* a, const Tile* b) const {
     const ManagedTileState& ams = a->managed_state();
     const ManagedTileState& bms = b->managed_state();
     if (ams.bin[HIGH_PRIORITY_BIN] != bms.bin[HIGH_PRIORITY_BIN])
       return ams.bin[HIGH_PRIORITY_BIN] < bms.bin[HIGH_PRIORITY_BIN];
 
     if (ams.bin[LOW_PRIORITY_BIN] != bms.bin[LOW_PRIORITY_BIN])
       return ams.bin[LOW_PRIORITY_BIN] < bms.bin[LOW_PRIORITY_BIN];
@@ skipping 528 matching lines @@
   --raster_state_count_[mts.raster_state][tree][mts.tree_bin[tree]];
   DCHECK_GE(raster_state_count_[mts.raster_state][tree][mts.tree_bin[tree]], 0);
 
   // Increment count for new bin.
   ++raster_state_count_[mts.raster_state][tree][bin];
 
   mts.tree_bin[tree] = bin;
 }
 
 }  // namespace cc