Cleanup includes in compositor/ per IWYU style

Change-Id: I4362a5ff4228b1a30812ec564f6a0c81e1f5cf08

compositor/CompositionPlanner.cpp

@@ -16,6 +16,7 @@
 
 #include "CompositionPlanner.h"
 
+#include "compositor/LayerData.h"
 #include "hwc/HwcLayer.h"
 
 namespace android::drm_hwcomposer {

compositor/CompositionPlanner.h

@@ -21,13 +21,12 @@
 #include <optional>
 #include <vector>
 
-#include "compositor/LayerData.h"
-
 namespace android::drm_hwcomposer {
 
-struct LayerToPlaneJoiningPlan;
+enum class CompositionType;
 class HwcDisplay;
 class HwcLayer;
+struct LayerToPlaneJoiningPlan;
 
 // CompositionPlanner is responsible for determining the mapping between
 // HwcLayer and drm planes. This includes deciding which HwcLayers should be

compositor/DisplayInfo.h

@@ -82,7 +82,7 @@ enum class Colorspace : int32_t {
 /**
  * Display panel orientation property values.
  */
-enum PanelOrientation {
+enum class PanelOrientation {
   kModePanelOrientationNormal = 0,
   kModePanelOrientationBottomUp,
   kModePanelOrientationLeftUp,

compositor/GenericCompositionPlanner.cpp

@@ -20,11 +20,12 @@
 #include <tuple>
 #include <vector>
 
-#include "backend/BackendManager.h"
 #include "compositor/FlatteningController.h"
 #include "compositor/LayerData.h"
+#include "drm/DrmPlane.h"
 #include "hwc/HwcDisplay.h"
 #include "hwc/HwcLayer.h"
+#include "utils/log.h"
 
 namespace android::drm_hwcomposer {
 

compositor/GenericCompositionPlanner.h

@@ -16,11 +16,11 @@
 
 #pragma once
 
-#include "CompositionPlanner.h"
+#include "compositor/CompositionPlanner.h"
 
 namespace android::drm_hwcomposer {
 
-struct LayerToPlaneJoiningPlan;
+enum class CompositionType;
 class HwcDisplay;
 class HwcLayer;
 

compositor/LayerData.h

@@ -23,7 +23,6 @@
 #include <vector>
 
 #include "bufferinfo/BufferInfo.h"
-#include "drm/DrmFbImporter.h"
 #include "utils/fd.h"
 
 namespace android::drm_hwcomposer {

compositor/LayerToPlaneJoiningPlan.cpp

@@ -18,9 +18,9 @@
 
 #include "LayerToPlaneJoiningPlan.h"
 
-#include "drm/DrmDevice.h"
+#include "compositor/LayerData.h"
+#include "drm/DrmDisplayPipeline.h"
 #include "drm/DrmPlane.h"
-#include "utils/log.h"
 
 namespace android::drm_hwcomposer {
 

compositor/LayerToPlaneJoiningPlan.h

@@ -23,7 +23,10 @@
 
 namespace android::drm_hwcomposer {
 
-class DrmDevice;
+class DrmPlane;
+struct DrmDisplayPipeline;
+template <typename T>
+class BindingOwner;
 
 struct LayerToPlaneJoiningPlan {
   struct LayerToPlaneJoining {

drm/DrmPlane.cpp

@@ -26,6 +26,7 @@
 #include "DrmDevice.h"
 #include "bufferinfo/BufferInfoGetter.h"
 #include "compositor/LayerData.h"
+#include "drm/DrmFbImporter.h"
 #include "utils/log.h"
 
 namespace android::drm_hwcomposer {

hwc/HwcLayer.h

@@ -16,6 +16,7 @@
 
 #pragma once
 
+#include <map>
 #include <memory>
 
 #include "bufferinfo/BufferInfo.h"

hwc3/ComposerClient.cpp

@@ -1091,7 +1091,8 @@ ndk::ScopedAStatus ComposerClient::getDisplayPhysicalOrientation(
       *orientation = common::Transform::ROT_90;
       break;
     default:
-      ALOGE("Unknown panel orientation value: %d", drm_orientation);
+      ALOGE("Unknown panel orientation value: %d",
+            static_cast<int>(drm_orientation));
       return ToBinderStatus(hwc3::Error::kBadDisplay);
   }