commit 8b66e4ce45d892937346076eb0371e4d924ffec4
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jun 26 11:24:19 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 26 11:24:19 2018 +0000
tree 1cf0232e521208f7da6c780c417b12181397d016
parent d205fc93a51b9b3998bae9cfb94b3096589fae70
parent f6833405315cb679e26eb1c582fe1b73259801cf

Merge "SurfaceFlinger: Remove the duty of ColorLayer in computeCrop"

services/surfaceflinger/ColorLayer.h

diff --git a/services/surfaceflinger/ColorLayer.h b/services/surfaceflinger/ColorLayer.h
index 6a6e7c0..3408045 100644
--- a/services/surfaceflinger/ColorLayer.h
+++ b/services/surfaceflinger/ColorLayer.h
@@ -35,6 +35,9 @@
     bool isVisible() const override;
 
     void setPerFrameData(const sp<const DisplayDevice>& display) override;
+
+protected:
+    FloatRect computeCrop(const sp<const DisplayDevice>& /*display*/) const override { return {}; }
 };
 
 } // namespace android

services/surfaceflinger/Layer.h

diff --git a/services/surfaceflinger/Layer.h b/services/surfaceflinger/Layer.h
index c1f6075..03720a9 100644
--- a/services/surfaceflinger/Layer.h
+++ b/services/surfaceflinger/Layer.h
@@ -561,7 +561,7 @@
 
     uint32_t getEffectiveUsage(uint32_t usage) const;
 
-    FloatRect computeCrop(const sp<const DisplayDevice>& display) const;
+    virtual FloatRect computeCrop(const sp<const DisplayDevice>& display) const;
     // Compute the initial crop as specified by parent layers and the
     // SurfaceControl for this layer. Does not include buffer crop from the
     // IGraphicBufferProducer client, as that should not affect child clipping.