OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef UI_GFX_ANDROID_SHARED_DEVICE_DISPLAY_INFO_H_ | 5 #ifndef UI_GFX_ANDROID_SHARED_DEVICE_DISPLAY_INFO_H_ |
6 #define UI_GFX_ANDROID_SHARED_DEVICE_DISPLAY_INFO_H_ | 6 #define UI_GFX_ANDROID_SHARED_DEVICE_DISPLAY_INFO_H_ |
7 | 7 |
8 #include "base/android/scoped_java_ref.h" | 8 #include "base/android/scoped_java_ref.h" |
9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
10 #include "base/memory/singleton.h" | 10 #include "base/memory/singleton.h" |
11 #include "base/synchronization/lock.h" | 11 #include "base/synchronization/lock.h" |
12 | 12 |
13 namespace gfx { | 13 namespace gfx { |
14 | 14 |
15 // Facilitates access to device information typically only | 15 // Facilitates access to device information typically only |
16 // available using the Android SDK, including Display properties. | 16 // available using the Android SDK, including Display properties. |
17 class SharedDeviceDisplayInfo { | 17 class SharedDeviceDisplayInfo { |
18 public: | 18 public: |
19 static SharedDeviceDisplayInfo* GetInstance(); | 19 static SharedDeviceDisplayInfo* GetInstance(); |
20 | 20 |
| 21 // See documentation in DeviceDisplayInfo.java |
21 int GetDisplayHeight(); | 22 int GetDisplayHeight(); |
22 int GetDisplayWidth(); | 23 int GetDisplayWidth(); |
| 24 int GetPhysicalDisplayHeight(); |
| 25 int GetPhysicalDisplayWidth(); |
23 int GetBitsPerPixel(); | 26 int GetBitsPerPixel(); |
24 int GetBitsPerComponent(); | 27 int GetBitsPerComponent(); |
25 double GetDIPScale(); | 28 double GetDIPScale(); |
26 int GetSmallestDIPWidth(); | 29 int GetSmallestDIPWidth(); |
27 | 30 |
28 // Registers methods with JNI and returns true if succeeded. | 31 // Registers methods with JNI and returns true if succeeded. |
29 static bool RegisterSharedDeviceDisplayInfo(JNIEnv* env); | 32 static bool RegisterSharedDeviceDisplayInfo(JNIEnv* env); |
30 | 33 |
31 void InvokeUpdate(JNIEnv* env, | 34 void InvokeUpdate(JNIEnv* env, |
32 jobject jobj, | 35 jobject jobj, |
33 jint display_height, | 36 jint display_height, |
34 jint display_width, | 37 jint display_width, |
| 38 jint physical_display_height, |
| 39 jint physical_display_width, |
35 jint bits_per_pixel, | 40 jint bits_per_pixel, |
36 jint bits_per_component, | 41 jint bits_per_component, |
37 jdouble dip_scale, | 42 jdouble dip_scale, |
38 jint smallest_dip_width); | 43 jint smallest_dip_width); |
39 private: | 44 private: |
40 friend struct DefaultSingletonTraits<SharedDeviceDisplayInfo>; | 45 friend struct DefaultSingletonTraits<SharedDeviceDisplayInfo>; |
41 | 46 |
42 SharedDeviceDisplayInfo(); | 47 SharedDeviceDisplayInfo(); |
43 ~SharedDeviceDisplayInfo(); | 48 ~SharedDeviceDisplayInfo(); |
44 void UpdateDisplayInfo(JNIEnv* env, | 49 void UpdateDisplayInfo(JNIEnv* env, |
45 jobject jobj, | 50 jobject jobj, |
46 jint display_height, | 51 jint display_height, |
47 jint display_width, | 52 jint display_width, |
| 53 jint physical_display_height, |
| 54 jint physical_display_width, |
48 jint bits_per_pixel, | 55 jint bits_per_pixel, |
49 jint bits_per_component, | 56 jint bits_per_component, |
50 jdouble dip_scale, | 57 jdouble dip_scale, |
51 jint smallest_dip_width); | 58 jint smallest_dip_width); |
52 | 59 |
53 base::Lock lock_; | 60 base::Lock lock_; |
54 base::android::ScopedJavaGlobalRef<jobject> j_device_info_; | 61 base::android::ScopedJavaGlobalRef<jobject> j_device_info_; |
55 | 62 |
56 int display_height_; | 63 int display_height_; |
57 int display_width_; | 64 int display_width_; |
| 65 int physical_display_height_; |
| 66 int physical_display_width_; |
58 int bits_per_pixel_; | 67 int bits_per_pixel_; |
59 int bits_per_component_; | 68 int bits_per_component_; |
60 double dip_scale_; | 69 double dip_scale_; |
61 int smallest_dip_width_; | 70 int smallest_dip_width_; |
62 | 71 |
63 DISALLOW_COPY_AND_ASSIGN(SharedDeviceDisplayInfo); | 72 DISALLOW_COPY_AND_ASSIGN(SharedDeviceDisplayInfo); |
64 }; | 73 }; |
65 | 74 |
66 } // namespace gfx | 75 } // namespace gfx |
67 | 76 |
68 #endif // UI_GFX_ANDROID_SHARED_DEVICE_DISPLAY_INFO_H_ | 77 #endif // UI_GFX_ANDROID_SHARED_DEVICE_DISPLAY_INFO_H_ |
OLD | NEW |