commit 9099aa5e280c094154fd312f415336c1aabb4b8e
author Sean Paul <seanpaul@chromium.org> Thu Jul 09 17:51:50 2015 -0400
committer Sean Paul <seanpaul@chromium.org> Mon Jul 13 11:57:56 2015 -0400
tree 3cd74297a1bc64dc42ec1d8fc4128a31877b3146
parent db7a17d28ca48f81be3091e99564e47fa0503e9e

drm_hwcomposer: Use vector for overlay planes

For two reasons:
1- Because we don't need to use deque
2- Because we'll need to erase from the middle in the future,
   and deque makes that difficult while iterating

BUG=chrome-os-parter:42311
TEST=Tested on smaug, turned on/off bunch of times, no dup icons

Change-Id: I306bdea15d7165f63afeb3b1e06774e2e9a1785f
Signed-off-by: Sean Paul <seanpaul@chromium.org>

drmcomposition.cpp

diff --git a/drmcomposition.cpp b/drmcomposition.cpp
index 7a50601..3f5f356 100644
--- a/drmcomposition.cpp
+++ b/drmcomposition.cpp
@@ -77,7 +77,7 @@
     if ((*iter)->GetCrtcSupported(*crtc))
       ++num_planes;
   }
-  for (std::deque<DrmPlane *>::const_iterator iter = overlay_planes_.begin();
+  for (std::vector<DrmPlane *>::const_iterator iter = overlay_planes_.begin();
        iter != overlay_planes_.end(); ++iter) {
     if ((*iter)->GetCrtcSupported(*crtc))
       ++num_planes;
@@ -103,7 +103,7 @@
       break;
     }
   }
-  for (std::deque<DrmPlane *>::iterator iter = overlay_planes_.begin();
+  for (std::vector<DrmPlane *>::iterator iter = overlay_planes_.begin();
        !plane && iter != overlay_planes_.end(); ++iter) {
     if ((*iter)->GetCrtcSupported(*crtc)) {
       plane = *iter;

drmcomposition.h

diff --git a/drmcomposition.h b/drmcomposition.h
index e490811..902d7c7 100644
--- a/drmcomposition.h
+++ b/drmcomposition.h
@@ -52,7 +52,7 @@
   Importer *importer_;
 
   std::vector<DrmPlane *> primary_planes_;
-  std::deque<DrmPlane *> overlay_planes_;
+  std::vector<DrmPlane *> overlay_planes_;
 
   /*
    * This _must_ be read-only after it's passed to QueueComposition. Otherwise