diff options
| author | Mathias Agopian <mathias@google.com> | 2012-07-25 18:56:13 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2012-07-25 21:13:10 -0700 |
| commit | c666cae2d5995097ec49a87e375e2afdd92802b7 (patch) | |
| tree | 235abd54f4c3c6ed2c6b59bbade55a6459f13ed8 /include/ui | |
| parent | 028508cad5ef63ef9fbd42c14e76658e4fd9ebf2 (diff) | |
| download | frameworks_native-c666cae2d5995097ec49a87e375e2afdd92802b7.zip frameworks_native-c666cae2d5995097ec49a87e375e2afdd92802b7.tar.gz frameworks_native-c666cae2d5995097ec49a87e375e2afdd92802b7.tar.bz2 | |
get rid of the shared-memory control block
Change-Id: If814060aca1d2ff2619d4adcd57296983d207f7f
Diffstat (limited to 'include/ui')
| -rw-r--r-- | include/ui/DisplayInfo.h | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/include/ui/DisplayInfo.h b/include/ui/DisplayInfo.h index edd28a6..c7dc354 100644 --- a/include/ui/DisplayInfo.h +++ b/include/ui/DisplayInfo.h @@ -14,7 +14,6 @@ * limitations under the License. */ - #ifndef ANDROID_UI_DISPLAY_INFO_H #define ANDROID_UI_DISPLAY_INFO_H @@ -26,15 +25,16 @@ namespace android { struct DisplayInfo { - uint32_t w; - uint32_t h; - PixelFormatInfo pixelFormatInfo; - uint8_t orientation; - uint8_t reserved[3]; - float fps; - float density; - float xdpi; - float ydpi; + uint32_t w; + uint32_t h; + float xdpi; + float ydpi; + float fps; + float density; + uint8_t orientation; + uint8_t reserved[3]; + // TODO: this needs to go away (currently needed only by webkit) + PixelFormatInfo pixelFormatInfo; }; /* Display orientations as defined in Surface.java and ISurfaceComposer.h. */ @@ -45,8 +45,6 @@ enum { DISPLAY_ORIENTATION_270 = 3 }; - }; // namespace android #endif // ANDROID_COMPOSER_DISPLAY_INFO_H - |