commit f6b5d187b9a0520284f35a00eaf16335222a036a
author Marin Shalamanov <shalamanov@google.com> Fri Jun 12 02:08:51 2020 +0200
committer Marin Shalamanov <shalamanov@google.com> Tue Jun 30 13:40:16 2020 +0200
tree e77304ee6d4c0780ad0ccebc47e197057f66873d
parent 40270c68ae95e5bd7338893dccf7dcd64c529445

[SF] Extract {Display|Layer}RenderArea to separate files

This CL also fixes incorrect sampling bounds in RegionSamplingThread,
caused by ag/11837111.

Bug: 158599281
Test: atest libsurfaceflinger_unittest
Test: take a screenshot from launcher
Test: take a screenshot from YouTube while playing a video
Change-Id: I7e7777071e91a833a7bad4bd77e9d0c989fea9b7

services/surfaceflinger/RegionSamplingThread.cpp

diff --git a/services/surfaceflinger/RegionSamplingThread.cpp b/services/surfaceflinger/RegionSamplingThread.cpp
index 398fd40..899d1fa 100644
--- a/services/surfaceflinger/RegionSamplingThread.cpp
+++ b/services/surfaceflinger/RegionSamplingThread.cpp
@@ -35,6 +35,7 @@
 #include <string>
 
 #include "DisplayDevice.h"
+#include "DisplayRenderArea.h"
 #include "Layer.h"
 #include "Promise.h"
 #include "Scheduler/DispSync.h"
@@ -383,8 +384,9 @@
     const Rect sampledBounds = sampleRegion.bounds();
 
     SurfaceFlinger::RenderAreaFuture renderAreaFuture = promise::defer([=] {
-        return DisplayRenderArea::create(displayWeak, sampledBounds, sampledBounds.getSize(),
-                                         ui::Dataspace::V0_SRGB, orientation);
+        return DisplayRenderArea::create(displayWeak, screencapRegion.bounds(),
+                                         sampledBounds.getSize(), ui::Dataspace::V0_SRGB,
+                                         orientation);
     });
 
     std::unordered_set<sp<IRegionSamplingListener>, SpHash<IRegionSamplingListener>> listeners;