Use correct favicon scale factor on Android.

- Splits and moves Android's display DeviceInfo from content to gfx;
- Uses DeviceInfo for Android's Screen implementation;
- Uses PrimaryDisplay's scale to figure out favicon scale factor.

BUG=168319
BUG=117839
TEST=manual as in 168319; AwSettingsTest#testUseWideViewportLayoutWidth

Review URL: https://chromiumcodereview.appspot.com/11886074

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178472 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 146 insertions, 4 deletions

diff --git a/ui/android/java/src/org/chromium/ui/gfx/DeviceDisplayInfo.java b/ui/android/java/src/org/chromium/ui/gfx/DeviceDisplayInfo.java
new file mode 100644
index 0000000..61fc018
--- /dev/null
+++ b/ui/android/java/src/org/chromium/ui/gfx/DeviceDisplayInfo.java
@@ -0,0 +1,134 @@
+// Copyright (c) 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.
+
+package org.chromium.ui.gfx;
+
+import android.content.Context;
+import android.graphics.PixelFormat;
+import android.telephony.TelephonyManager;
+import android.util.DisplayMetrics;
+import android.view.Display;
+import android.view.WindowManager;
+
+import org.chromium.base.CalledByNative;
+import org.chromium.base.JNINamespace;
+
+/**
+ * This class facilitates access to android information typically only
+ * available using the Java SDK, including {@link Display} properties.
+ *
+ * Currently the information consists of very raw display information (height, width, DPI scale)
+ * regarding the main display.
+ */
+@JNINamespace("gfx")
+public class DeviceDisplayInfo {
+
+  private WindowManager mWinManager;
+
+  private DeviceDisplayInfo(Context context) {
+      Context appContext = context.getApplicationContext();
+      mWinManager = (WindowManager) appContext.getSystemService(Context.WINDOW_SERVICE);
+  }
+
+  /**
+   * @return Display height in physical pixels.
+   */
+  @CalledByNative
+  public int getDisplayHeight() {
+      return getMetrics().heightPixels;
+  }
+
+  /**
+   * @return Display width in physical pixels.
+   */
+  @CalledByNative
+  public int getDisplayWidth() {
+      return getMetrics().widthPixels;
+  }
+
+  /**
+   * @return Bits per pixel.
+   */
+  @CalledByNative
+  public int getBitsPerPixel() {
+      PixelFormat info = new PixelFormat();
+      PixelFormat.getPixelFormatInfo(getDisplay().getPixelFormat(), info);
+      return info.bitsPerPixel;
+  }
+
+  /**
+   * @return Bits per component.
+   */
+  @CalledByNative
+  public int getBitsPerComponent() {
+      int format = getDisplay().getPixelFormat();
+      switch (format) {
+      case PixelFormat.RGBA_4444:
+          return 4;
+
+      case PixelFormat.RGBA_5551:
+          return 5;
+
+      case PixelFormat.RGBA_8888:
+      case PixelFormat.RGBX_8888:
+      case PixelFormat.RGB_888:
+          return 8;
+
+      case PixelFormat.RGB_332:
+          return 2;
+
+      case PixelFormat.RGB_565:
+          return 5;
+
+      // Non-RGB formats.
+      case PixelFormat.A_8:
+      case PixelFormat.LA_88:
+      case PixelFormat.L_8:
+          return 0;
+
+      // Unknown format. Use 8 as a sensible default.
+      default:
+          return 8;
+      }
+  }
+
+  /**
+   * @return A scaling factor for the Density Independent Pixel unit.
+   *         1.0 is 160dpi, 0.75 is 120dpi, 2.0 is 320dpi.
+   */
+  @CalledByNative
+  public double getDIPScale() {
+      return getMetrics().density;
+  }
+
+  /**
+   * @return Display refresh rate in frames per second.
+   */
+  @CalledByNative
+  public double getRefreshRate() {
+      double result = getDisplay().getRefreshRate();
+      // Sanity check.
+      return (result >= 61 || result < 30) ? 0 : result;
+  }
+
+  private Display getDisplay() {
+      return mWinManager.getDefaultDisplay();
+  }
+
+  private DisplayMetrics getMetrics() {
+      DisplayMetrics metrics = new DisplayMetrics();
+      getDisplay().getMetrics(metrics);
+      return metrics;
+  }
+
+  /**
+   * Creates DeviceDisplayInfo for a given Context.
+   * @param context A context to use.
+   * @return DeviceDisplayInfo associated with a given Context.
+   */
+  @CalledByNative
+  public static DeviceDisplayInfo create(Context context) {
+      return new DeviceDisplayInfo(context);
+  }
+}
diff --git a/ui/android/ui_jni_registrar.cc b/ui/android/ui_jni_registrar.cc
index 9ea0ef4..11daf36 100644
--- a/ui/android/ui_jni_registrar.cc
+++ b/ui/android/ui_jni_registrar.cc
@@ -6,14 +6,19 @@
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_registrar.h"
+#include "ui/gfx/android/device_display_info.h"
+#include "ui/gfx/android/java_bitmap.h"
 #include "ui/gfx/android/window_android.h"
 #include "ui/shell_dialogs/select_file_dialog_android.h"
 
 namespace ui {
+namespace android {
 
 static base::android::RegistrationMethod kUiRegisteredMethods[] = {
-  { "NativeWindow", WindowAndroid::RegisterWindowAndroid },
-  { "SelectFileDialog", SelectFileDialogImpl::RegisterSelectFileDialog },
+  { "DeviceDisplayInfo", gfx::DeviceDisplayInfo::RegisterDeviceDisplayInfo },
+  { "JavaBitmap", gfx::JavaBitmap::RegisterJavaBitmap },
+  { "NativeWindow", ui::WindowAndroid::RegisterWindowAndroid },
+  { "SelectFileDialog", ui::SelectFileDialogImpl::RegisterSelectFileDialog },
 };
 
 bool RegisterJni(JNIEnv* env) {
@@ -21,4 +26,5 @@ bool RegisterJni(JNIEnv* env) {
                                arraysize(kUiRegisteredMethods));
 }
 
-} // namespace ui
+}  // namespace android
+}  // namespace ui
diff --git a/ui/android/ui_jni_registrar.h b/ui/android/ui_jni_registrar.h
index d0778c4..f40ed40 100644
--- a/ui/android/ui_jni_registrar.h
+++ b/ui/android/ui_jni_registrar.h
@@ -10,10 +10,12 @@
 #include "ui/base/ui_export.h"
 
 namespace ui {
+namespace android {
 
 // Register all JNI bindings necessary for chrome.
 UI_EXPORT bool RegisterJni(JNIEnv* env);
 
-} // namespace ui
+}  // namespace android
+}  // namespace ui
 
 #endif  // UI_ANDROID_UI_JNI_REGISTRAR_H_