commit 600a73b6110d6fdcebe072a9d8e2dbbe6de1c6b7
author Marissa Wall <marissaw@google.com> Thu Dec 15 12:30:39 2016 -0800
committer Marissa Wall <marissaw@google.com> Wed Mar 08 13:36:36 2017 -0800
tree 3aa8cd084702866d2ac3ab1fb87ebbba9410f21d
parent 273b1dfa05287a0016ae1fc230cd3a5b1b7433fa

test-hwc2: set layer display frame

Test: Add "#define HAVE_NO_SURFACE_FLINGER" to
          frameworks/native/libs/gui/BufferQueueCore.cpp.
      Recompile and flash.
      Run "mm" in frameworks/native/services/surfaceflinger/tests/hwc2.
      Push test-hwc2 to device.
      Run "adb root && adb shell stop".
      Run test case. Ex: "./test-hwc2"

Change-Id: I4431ad0d207924b9fcde2c4c2f34382ec8ddc4d8

services/surfaceflinger/tests/hwc2/Hwc2TestLayer.h

diff --git a/services/surfaceflinger/tests/hwc2/Hwc2TestLayer.h b/services/surfaceflinger/tests/hwc2/Hwc2TestLayer.h
index 855f7bb..e24ff77 100644
--- a/services/surfaceflinger/tests/hwc2/Hwc2TestLayer.h
+++ b/services/surfaceflinger/tests/hwc2/Hwc2TestLayer.h
@@ -27,7 +27,8 @@
 
 class Hwc2TestLayer {
 public:
-    Hwc2TestLayer(Hwc2TestCoverage coverage, uint32_t zOrder = 0);
+    Hwc2TestLayer(Hwc2TestCoverage coverage, const Area& displayArea,
+            uint32_t zOrder = 0);
 
     std::string dump() const;
 
@@ -36,6 +37,7 @@
     hwc2_blend_mode_t      getBlendMode() const;
     hwc2_composition_t     getComposition() const;
     android_dataspace_t    getDataspace() const;
+    hwc_rect_t             getDisplayFrame() const;
     float                  getPlaneAlpha() const;
     hwc_transform_t        getTransform() const;
     uint32_t               getZOrder() const;
@@ -43,17 +45,20 @@
     bool advanceBlendMode();
     bool advanceComposition();
     bool advanceDataspace();
+    bool advanceDisplayFrame();
     bool advancePlaneAlpha();
     bool advanceTransform();
 
 private:
-    std::array<Hwc2TestContainer*, 5> mProperties = {{
-        &mBlendMode, &mComposition, &mDataspace, &mPlaneAlpha, &mTransform
+    std::array<Hwc2TestContainer*, 6> mProperties = {{
+        &mBlendMode, &mComposition, &mDataspace,  &mDisplayFrame, &mPlaneAlpha,
+        &mTransform
     }};
 
     Hwc2TestBlendMode mBlendMode;
     Hwc2TestComposition mComposition;
     Hwc2TestDataspace mDataspace;
+    Hwc2TestDisplayFrame mDisplayFrame;
     Hwc2TestPlaneAlpha mPlaneAlpha;
     Hwc2TestTransform mTransform;