commit 00e8c7a88a5b9c4104a71013a713acd3e4d3b77b
author Mathias Agopian <mathias@google.com> Tue Sep 04 19:30:46 2012 -0700
committer Mathias Agopian <mathias@google.com> Tue Sep 04 19:30:46 2012 -0700
tree 71fd225e0f7f8dd1a909c64c97718989aa8f06c2
parent da8d0a5c0cf9d41915d3b106cad4aaec3e767c11

display projection API now has a single function instead of 3

Change-Id: I9bf46d372b77d547486d4bbe6f1953ec8c65e98f

services/surfaceflinger/DisplayDevice.cpp

diff --git a/services/surfaceflinger/DisplayDevice.cpp b/services/surfaceflinger/DisplayDevice.cpp
index cf781d3..01ae1c2 100644
--- a/services/surfaceflinger/DisplayDevice.cpp
+++ b/services/surfaceflinger/DisplayDevice.cpp
@@ -150,7 +150,7 @@
     mHwcDisplayId = mFlinger->allocateHwcDisplayId(mType);
 
     // initialize the display orientation transform.
-    DisplayDevice::setOrientation(DisplayState::eOrientationDefault);
+    setProjection(DisplayState::eOrientationDefault, mViewport, mFrame);
 }
 
 uint32_t DisplayDevice::getPageFlipCount() const {
@@ -298,25 +298,14 @@
     return NO_ERROR;
 }
 
-void DisplayDevice::setOrientation(int orientation) {
+void DisplayDevice::setProjection(int orientation,
+        const Rect& viewport, const Rect& frame) {
     mOrientation = orientation;
+    mViewport = viewport;
+    mFrame = frame;
     updateGeometryTransform();
 }
 
-void DisplayDevice::setViewport(const Rect& viewport) {
-    if (viewport.isValid()) {
-        mViewport = viewport;
-        updateGeometryTransform();
-    }
-}
-
-void DisplayDevice::setFrame(const Rect& frame) {
-    if (frame.isValid()) {
-        mFrame = frame;
-        updateGeometryTransform();
-    }
-}
-
 void DisplayDevice::updateGeometryTransform() {
     int w = mDisplayWidth;
     int h = mDisplayHeight;