| Index: content/renderer/render_widget.cc
|
| diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
|
| index dd278d60f679d2ef3d9a7e87294bdc4729a4b99d..25efc3d1a5720612e7a12287ba1ca8fa490b5d07 100644
|
| --- a/content/renderer/render_widget.cc
|
| +++ b/content/renderer/render_widget.cc
|
| @@ -16,6 +16,7 @@
|
| #include "base/metrics/histogram.h"
|
| #include "base/stl_util.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| +#include "base/sys_info.h"
|
| #include "build/build_config.h"
|
| #include "cc/base/switches.h"
|
| #include "cc/debug/benchmark_instrumentation.h"
|
| @@ -72,7 +73,6 @@
|
|
|
| #if defined(OS_ANDROID)
|
| #include <android/keycodes.h>
|
| -#include "base/android/sys_utils.h"
|
| #include "content/renderer/android/synchronous_compositor_factory.h"
|
| #endif
|
|
|
| @@ -859,10 +859,8 @@ scoped_ptr<cc::OutputSurface> RenderWidget::CreateOutputSurface(bool fallback) {
|
| DCHECK(is_threaded_compositing_enabled_ ||
|
| RenderThreadImpl::current()->layout_test_mode());
|
| cc::ResourceFormat format = cc::RGBA_8888;
|
| -#if defined(OS_ANDROID)
|
| - if (base::android::SysUtils::IsLowEndDevice())
|
| + if (base::SysInfo::IsLowEndDevice())
|
| format = cc::RGB_565;
|
| -#endif
|
| return scoped_ptr<cc::OutputSurface>(
|
| new MailboxOutputSurface(
|
| routing_id(),
|
| @@ -2023,7 +2021,7 @@ RenderWidget::CreateGraphicsContext3D() {
|
| // uploads, after which we are just wasting memory. Since we don't
|
| // know our upload throughput yet, this just caps our memory usage.
|
| size_t divider = 1;
|
| - if (base::android::SysUtils::IsLowEndDevice())
|
| + if (base::SysInfo::IsLowEndDevice())
|
| divider = 6;
|
| // For reference Nexus10 can upload 1MB in about 2.5ms.
|
| const double max_mb_uploaded_per_ms = 2.0 / (5 * divider);
|
|
|