| commit | cb769ae92396a50eb1a0c019d113a9e53842bbab | [log] [tgz] |
|---|---|---|
| author | Leon Scroggins <scroggo@google.com> | Tue Mar 30 16:09:42 2021 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Mar 30 16:09:42 2021 +0000 |
| tree | 6c959cdff51b1c2be326407c23ee1d02cb09edd3 | |
| parent | 6f85afe78cdd9cc46ec61cffa4572c759702c9b2 [diff] | |
| parent | eed02732fe78d998fc1d6ceda4d6a06f4af03267 [diff] |
Merge "Remove Flattener::reset" into sc-dev
diff --git a/services/surfaceflinger/CompositionEngine/include/compositionengine/impl/planner/Flattener.h b/services/surfaceflinger/CompositionEngine/include/compositionengine/impl/planner/Flattener.h index 5b9a9f0..2bd3249 100644 --- a/services/surfaceflinger/CompositionEngine/include/compositionengine/impl/planner/Flattener.h +++ b/services/surfaceflinger/CompositionEngine/include/compositionengine/impl/planner/Flattener.h
@@ -45,8 +45,6 @@ // Renders the newest cached sets with the supplied output dataspace void renderCachedSets(renderengine::RenderEngine&, ui::Dataspace outputDataspace); - void reset(); - void dump(std::string& result) const; private:
diff --git a/services/surfaceflinger/CompositionEngine/src/planner/Flattener.cpp b/services/surfaceflinger/CompositionEngine/src/planner/Flattener.cpp index a87bc37..60ebbb2 100644 --- a/services/surfaceflinger/CompositionEngine/src/planner/Flattener.cpp +++ b/services/surfaceflinger/CompositionEngine/src/planner/Flattener.cpp
@@ -60,18 +60,6 @@ mNewCachedSet->render(renderEngine, outputDataspace); } -void Flattener::reset() { - resetActivities(0, std::chrono::steady_clock::now()); - - mUnflattenedDisplayCost = 0; - mFlattenedDisplayCost = 0; - mInitialLayerCounts.clear(); - mFinalLayerCounts.clear(); - mCachedSetCreationCount = 0; - mCachedSetCreationCost = 0; - mInvalidatedCachedSetAges.clear(); -} - void Flattener::dump(std::string& result) const { const auto now = std::chrono::steady_clock::now();