android: Use ScreenInfo to calculate tile size

blimp/client/support/compositor/blimp_layer_tree_settings.cc

 // Copyright 2015 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 "blimp/client/support/compositor/blimp_layer_tree_settings.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/sys_info.h"
 #include "blimp/client/support/compositor/blimp_gpu_memory_buffer_manager.h"
 #include "cc/base/switches.h"
 #include "cc/trees/layer_tree_settings.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/buffer_types.h"
 #include "ui/gl/gl_switches.h"
 
-#if defined(OS_ANDROID)
-#include "ui/gfx/android/device_display_info.h"
-#endif
-
 namespace blimp {
 namespace client {
 
 // TODO(dtrainor): This is temporary to get the compositor up and running.
 // Much of this will either have to be pulled from the server or refactored to
 // share the settings from render_widget_compositor.cc.
 void PopulateCommonLayerTreeSettings(cc::LayerTreeSettings* settings) {
   // For web contents, layer transforms should scale up the contents of layers
   // to keep content always crisp when possible.
   settings->layer_transforms_should_scale_layer_contents = true;
@@ skipping 130 matching lines @@
       gpu::MemoryAllocation::CUTOFF_ALLOW_EVERYTHING;
 #else
   // Ignore what the system said and give all clients the same maximum
   // allocation on desktop platforms.
   memory_policy.bytes_limit_when_visible = 512 * 1024 * 1024;
   memory_policy.priority_cutoff_when_visible =
       gpu::MemoryAllocation::CUTOFF_ALLOW_NICE_TO_HAVE;
 #endif
 
   int default_tile_size = 256;
-#if defined(OS_ANDROID)
-  gfx::DeviceDisplayInfo info;
-  bool real_size_supported = true;
-  int display_width = info.GetPhysicalDisplayWidth();
-  int display_height = info.GetPhysicalDisplayHeight();
-  if (display_width == 0 || display_height == 0) {
-    real_size_supported = false;
-    display_width = info.GetDisplayWidth();
-    display_height = info.GetDisplayHeight();
-  }
-
-  int portrait_width = std::min(display_width, display_height);
-  int landscape_width = std::max(display_width, display_height);
-
-  if (real_size_supported) {
-    // Maximum HD dimensions should be 768x1280
-    // Maximum FHD dimensions should be 1200x1920
-    if (portrait_width > 768 || landscape_width > 1280)
-      default_tile_size = 384;
-    if (portrait_width > 1200 || landscape_width > 1920)
-      default_tile_size = 512;
-
-    // Adjust for some resolutions that barely straddle an extra
-    // tile when in portrait mode. This helps worst case scroll/raster
-    // by not needing a full extra tile for each row.
-    if (default_tile_size == 256 && portrait_width == 768)
-      default_tile_size += 32;
-    if (default_tile_size == 384 && portrait_width == 1200)
-      default_tile_size += 32;
-  } else {
-    // We don't know the exact resolution due to screen controls etc.
-    // So this just estimates the values above using tile counts.
-    int numTiles = (display_width * display_height) / (256 * 256);
-    if (numTiles > 16)
-      default_tile_size = 384;
-    if (numTiles >= 40)
-      default_tile_size = 512;
-  }
-#endif
   settings->default_tile_size.SetSize(default_tile_size, default_tile_size);
 
   settings->renderer_settings.buffer_to_texture_target_map =
       BlimpGpuMemoryBufferManager::GetDefaultBufferToTextureTargetMap();
 }
 
 }  // namespace client
 }  // namespace blimp