| Index: ui/android/java/src/org/chromium/ui/display/PhysicalDisplayAndroid.java
|
| diff --git a/ui/android/java/src/org/chromium/ui/display/PhysicalDisplayAndroid.java b/ui/android/java/src/org/chromium/ui/display/PhysicalDisplayAndroid.java
|
| index 964ef6fa99124e1507cab8c48e3537ab1c1664ec..5ec3205091acc2bc8e79df8ec9d5ba0b2a6a88bd 100644
|
| --- a/ui/android/java/src/org/chromium/ui/display/PhysicalDisplayAndroid.java
|
| +++ b/ui/android/java/src/org/chromium/ui/display/PhysicalDisplayAndroid.java
|
| @@ -91,23 +91,23 @@ import org.chromium.base.Log;
|
| @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
|
| /* package */ void updateFromDisplay(Display display) {
|
| Point size = new Point();
|
| - Point physicalSize = new Point();
|
| DisplayMetrics displayMetrics = new DisplayMetrics();
|
| PixelFormat pixelFormat = new PixelFormat();
|
| - display.getSize(size);
|
| - display.getMetrics(displayMetrics);
|
| - if (hasForcedDIPScale()) displayMetrics.density = sForcedDIPScale.floatValue();
|
| -
|
| if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
|
| - display.getRealSize(physicalSize);
|
| + display.getRealSize(size);
|
| + display.getRealMetrics(displayMetrics);
|
| + } else {
|
| + display.getSize(size);
|
| + display.getMetrics(displayMetrics);
|
| }
|
| + if (hasForcedDIPScale()) displayMetrics.density = sForcedDIPScale.floatValue();
|
|
|
| // JellyBean MR1 and later always uses RGBA_8888.
|
| int pixelFormatId = (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR1)
|
| ? display.getPixelFormat()
|
| : PixelFormat.RGBA_8888;
|
| PixelFormat.getPixelFormatInfo(pixelFormatId, pixelFormat);
|
| - super.update(size, physicalSize, displayMetrics.density, pixelFormat.bitsPerPixel,
|
| + super.update(size, displayMetrics.density, pixelFormat.bitsPerPixel,
|
| bitsPerComponent(pixelFormatId), display.getRotation());
|
| }
|
| }
|
|
|