commit 003cc3dec8e2a92e51086fbcd5ee1bb236efa701
author Chris Craik <ccraik@google.com> Fri Oct 16 10:24:55 2015 -0700
committer Chris Craik <ccraik@google.com> Fri Oct 16 10:38:34 2015 -0700
tree 8259dbf89955c599183f241268ce7704d6f2fc93
parent e4436e325c7756b162d99b05ece3dd9c38ce3a44

Rename DisplayListData to DisplayList

Change-Id: I25f6bb88ffdf9baf7e8e4e2a294aa8c9d2a4605b

libs/hwui/OpReorderer.cpp

diff --git a/libs/hwui/OpReorderer.cpp b/libs/hwui/OpReorderer.cpp
index 2e02306..7c34992 100644
--- a/libs/hwui/OpReorderer.cpp
+++ b/libs/hwui/OpReorderer.cpp
@@ -224,15 +224,15 @@
         mCanvasState.save(SkCanvas::kClip_SaveFlag | SkCanvas::kMatrix_SaveFlag);
         if (node->applyViewProperties(mCanvasState)) {
             // not rejected do ops...
-            const DisplayListData& data = node->getDisplayListData();
-            deferImpl(data.getChunks(), data.getOps());
+            const DisplayList& displayList = node->getDisplayList();
+            deferImpl(displayList.getChunks(), displayList.getOps());
         }
         mCanvasState.restore();
     }
 }
 
 void OpReorderer::defer(int viewportWidth, int viewportHeight,
-        const std::vector<DisplayListData::Chunk>& chunks, const std::vector<RecordedOp*>& ops) {
+        const std::vector<DisplayList::Chunk>& chunks, const std::vector<RecordedOp*>& ops) {
     ATRACE_NAME("prepare drawing commands");
     mCanvasState.initializeSaveStack(viewportWidth, viewportHeight,
             0, 0, viewportWidth, viewportHeight, Vector3());
@@ -247,12 +247,12 @@
  */
 #define OP_RECIEVER(Type) \
         [](OpReorderer& reorderer, const RecordedOp& op) { reorderer.on##Type(static_cast<const Type&>(op)); },
-void OpReorderer::deferImpl(const std::vector<DisplayListData::Chunk>& chunks,
+void OpReorderer::deferImpl(const std::vector<DisplayList::Chunk>& chunks,
         const std::vector<RecordedOp*>& ops) {
     static std::function<void(OpReorderer& reorderer, const RecordedOp&)> receivers[] = {
         MAP_OPS(OP_RECIEVER)
     };
-    for (const DisplayListData::Chunk& chunk : chunks) {
+    for (const DisplayList::Chunk& chunk : chunks) {
         for (size_t opIndex = chunk.beginOpIndex; opIndex < chunk.endOpIndex; opIndex++) {
             const RecordedOp* op = ops[opIndex];
             receivers[op->opId](*this, *op);
@@ -288,8 +288,8 @@
     // apply RenderProperties state
     if (op.renderNode->applyViewProperties(mCanvasState)) {
         // not rejected do ops...
-        const DisplayListData& data = op.renderNode->getDisplayListData();
-        deferImpl(data.getChunks(), data.getOps());
+        const DisplayList& displayList = op.renderNode->getDisplayList();
+        deferImpl(displayList.getChunks(), displayList.getOps());
     }
     mCanvasState.restore();
 }