Revert of For comparison, add std::vector.

bench/StackBench.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBenchmark.h"
 #include "SkRandom.h"
 
 #include "SkChunkAlloc.h"
 #include "SkDeque.h"
 #include "SkTArray.h"
 #include "SkTDArray.h"
-#include <vector>
 
 // This file has several benchmarks using various data structures to do stack-like things:
 //   - push
 //   - push, immediately pop
 //   - push many, pop all of them
 //   - serial access
 //   - random access
 // When a data structure doesn't suppport an operation efficiently, we leave that combination out.
 // Where possible we hint to the data structure to allocate in 4K pages.
 //
@@ skipping 46 matching lines @@
 BENCH(TDArray_Serial) {
     SkTDArray<int> s;
     for (int i = 0; i < K; i++) s.push(i);
 
     volatile int junk = 0;
     for (int j = 0; j < loops; j++) {
         for (int i = 0; i < s.count(); i++) junk += s[i];
     }
 }
 
-BENCH(vector_Serial) {
-    std::vector<int> s;
-    for (int i = 0; i < K; i++) s.push_back(i);
-
-    volatile int junk = 0;
-    for (int j = 0; j < loops; j++) {
-        for (size_t i = 0; i < s.size(); i++) junk += s[i];
-    }
-}
-
 // Add K items, then randomly access them many times.
 
 BENCH(TArray_RandomAccess) {
     SkTArray<int, true> s;
     for (int i = 0; i < K; i++) s.push_back(i);
 
     SkRandom rand;
     volatile int junk = 0;
     for (int i = 0; i < K*loops; i++) {
         junk += s[rand.nextULessThan(K)];
     }
 }
 
 BENCH(TDArray_RandomAccess) {
     SkTDArray<int> s;
     for (int i = 0; i < K; i++) s.push(i);
 
     SkRandom rand;
     volatile int junk = 0;
-    for (int i = 0; i < K*loops; i++) {
-        junk += s[rand.nextULessThan(K)];
-    }
-}
-
-BENCH(vector_RandomAccess) {
-    std::vector<int> s;
-    for (int i = 0; i < K; i++) s.push_back(i);
-
-    SkRandom rand;
-    volatile int junk = 0;
     for (int i = 0; i < K*loops; i++) {
         junk += s[rand.nextULessThan(K)];
     }
 }
 
 // Push many times.
 
 BENCH(ChunkAlloc_Push) {
     SkChunkAlloc s(4096);
     for (int i = 0; i < K*loops; i++) s.allocThrow(sizeof(int));
 }
 
 BENCH(Deque_Push) {
     SkDeque s(sizeof(int), 1024);
     for (int i = 0; i < K*loops; i++) *(int*)s.push_back() = i;
 }
 
 BENCH(TArray_Push) {
     SkTArray<int, true> s;
     for (int i = 0; i < K*loops; i++) s.push_back(i);
 }
 
 BENCH(TDArray_Push) {
     SkTDArray<int> s;
     for (int i = 0; i < K*loops; i++) s.push(i);
 }
 
-BENCH(vector_Push) {
-    std::vector<int> s;
-    for (int i = 0; i < K*loops; i++) s.push_back(i);
-}
-
 // Push then immediately pop many times.
 
 BENCH(ChunkAlloc_PushPop) {
     SkChunkAlloc s(4096);
     for (int i = 0; i < K*loops; i++) {
         void* p = s.allocThrow(sizeof(int));
         s.unalloc(p);
     }
 }
 
@@ skipping 14 matching lines @@
 }
 
 BENCH(TDArray_PushPop) {
     SkTDArray<int> s;
     for (int i = 0; i < K*loops; i++) {
         s.push(i);
         s.pop();
     }
 }
 
-BENCH(vector_PushPop) {
-    std::vector<int> s;
-    for (int i = 0; i < K*loops; i++) {
-        s.push_back(i);
-        s.pop_back();
-    }
-}
-
 // Push many items, then pop them all.
 
 BENCH(Deque_PushAllPopAll) {
     SkDeque s(sizeof(int), 1024);
     for (int i = 0; i < K*loops; i++) *(int*)s.push_back() = i;
     for (int i = 0; i < K*loops; i++) s.pop_back();
 }
 
 BENCH(TArray_PushAllPopAll) {
     SkTArray<int, true> s;
     for (int i = 0; i < K*loops; i++) s.push_back(i);
     for (int i = 0; i < K*loops; i++) s.pop_back();
 }
 
 BENCH(TDArray_PushAllPopAll) {
     SkTDArray<int> s;
     for (int i = 0; i < K*loops; i++) s.push(i);
     for (int i = 0; i < K*loops; i++) s.pop();
 }
-
-BENCH(vector_PushAllPopAll) {
-    std::vector<int> s;
-    for (int i = 0; i < K*loops; i++) s.push_back(i);
-    for (int i = 0; i < K*loops; i++) s.pop_back();
-}