cc: Fix BytesPerPixel issue and refactor.

cc/tiles/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/tiles/tile_manager.h"
 
 #include <algorithm>
 #include <limits>
 #include <string>
 
@@ skipping 1007 matching lines @@
   DCHECK_LE(memory_bytes,
             static_cast<size_t>(std::numeric_limits<int64>::max()));
   DCHECK_LE(resource_count,
             static_cast<size_t>(std::numeric_limits<int>::max()));
 }
 
 // static
 TileManager::MemoryUsage TileManager::MemoryUsage::FromConfig(
     const gfx::Size& size,
     ResourceFormat format) {
-  // We can use UncheckedMemorySizeBytes here since this is used with a tile
+  // We can use UncheckedSizeInBytes here since this is used with a tile
   // size which is determined by the compositor (it's at most max texture size).
-  return MemoryUsage(Resource::UncheckedMemorySizeBytes(size, format), 1);
+  return MemoryUsage(ResourceUtil::UncheckedSizeInBytes(size, format), 1);
 }
 
 // static
 TileManager::MemoryUsage TileManager::MemoryUsage::FromTile(const Tile* tile) {
   const TileDrawInfo& draw_info = tile->draw_info();
   if (draw_info.resource_) {
     return MemoryUsage::FromConfig(draw_info.resource_->size(),
                                    draw_info.resource_->format());
   }
   return MemoryUsage();
@@ skipping 19 matching lines @@
   result -= other;
   return result;
 }
 
 bool TileManager::MemoryUsage::Exceeds(const MemoryUsage& limit) const {
   return memory_bytes_ > limit.memory_bytes_ ||
          resource_count_ > limit.resource_count_;
 }
 
 }  // namespace cc