commit f9ecb4e67e4cf9d9d50e6551a27d1a2fcfb6fcf8
author Mike Reed <reed@google.com> Wed Aug 08 15:14:28 2018 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Aug 08 15:14:37 2018 +0000
tree 2c621c19d0c1644b2cdab214b92ff68667ef3659
parent 79884be809e8041baf294137bd2018f2d6fe0f10

Revert "migrating SkTDArray towards std::vector api"

This reverts commit 79884be809e8041baf294137bd2018f2d6fe0f10.

Reason for revert: broke flutter build -- initializer_list?

Original change's description:
> migrating SkTDArray towards std::vector api
> 
> push -> push_back
> add some aliases to match std::vector: count, reserve, ...
> 
> Bug: skia:
> Change-Id: I1921c31d0d6e5ed3d622a0def6054c697be2d02f
> Reviewed-on: https://skia-review.googlesource.com/145884
> Reviewed-by: Mike Klein <mtklein@google.com>
> Reviewed-by: Florin Malita <fmalita@chromium.org>
> Commit-Queue: Mike Reed <reed@google.com>

TBR=mtklein@google.com,fmalita@chromium.org,reed@google.com

Change-Id: Ib6132b725aaed7c01287e3e8c2b5a14da3d3d7e9
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/146140
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>

tools/skdiff/skdiff_main.cpp

diff --git a/tools/skdiff/skdiff_main.cpp b/tools/skdiff/skdiff_main.cpp
index b4fdaad..56aebe7 100644
--- a/tools/skdiff/skdiff_main.cpp
+++ b/tools/skdiff/skdiff_main.cpp
@@ -183,14 +183,14 @@
         uint32_t mismatchValue;
 
         if (drp->fBase.fFilename.equals(drp->fComparison.fFilename)) {
-            fResultsOfType[drp->fResult].push_back(new SkString(drp->fBase.fFilename));
+            fResultsOfType[drp->fResult].push(new SkString(drp->fBase.fFilename));
         } else {
             SkString* blame = new SkString("(");
             blame->append(drp->fBase.fFilename);
             blame->append(", ");
             blame->append(drp->fComparison.fFilename);
             blame->append(")");
-            fResultsOfType[drp->fResult].push_back(blame);
+            fResultsOfType[drp->fResult].push(blame);
         }
         switch (drp->fResult) {
           case DiffRecord::kEqualBits_Result:
@@ -215,7 +215,7 @@
             break;
           case DiffRecord::kCouldNotCompare_Result:
             fNumMismatches++;
-            fStatusOfType[drp->fBase.fStatus][drp->fComparison.fStatus].push_back(
+            fStatusOfType[drp->fBase.fStatus][drp->fComparison.fStatus].push(
                     new SkString(drp->fBase.fFilename));
             break;
           case DiffRecord::kUnknown_Result:
@@ -274,7 +274,7 @@
         pathRelativeToRootDir.append(fileName);
         if (string_contains_any_of(pathRelativeToRootDir, matchSubstrings) &&
             !string_contains_any_of(pathRelativeToRootDir, nomatchSubstrings)) {
-            files->push_back(new SkString(pathRelativeToRootDir));
+            files->push(new SkString(pathRelativeToRootDir));
         }
     }
 
@@ -516,7 +516,7 @@
             get_bounds(*drp);
         }
         SkASSERT(DiffRecord::kUnknown_Result != drp->fResult);
-        differences->push_back(drp);
+        differences->push(drp);
         summary->add(drp);
     }
 
@@ -537,7 +537,7 @@
         if (getBounds) {
             get_bounds(*drp);
         }
-        differences->push_back(drp);
+        differences->push(drp);
         summary->add(drp);
     }
 
@@ -558,7 +558,7 @@
         if (getBounds) {
             get_bounds(*drp);
         }
-        differences->push_back(drp);
+        differences->push(drp);
         summary->add(drp);
     }
 
@@ -705,7 +705,7 @@
             continue;
         }
         if (!strcmp(argv[i], "--match")) {
-            matchSubstrings.push_back(new SkString(argv[++i]));
+            matchSubstrings.push(new SkString(argv[++i]));
             continue;
         }
         if (!strcmp(argv[i], "--nocolorspace")) {
@@ -717,7 +717,7 @@
             continue;
         }
         if (!strcmp(argv[i], "--nomatch")) {
-            nomatchSubstrings.push_back(new SkString(argv[++i]));
+            nomatchSubstrings.push(new SkString(argv[++i]));
             continue;
         }
         if (!strcmp(argv[i], "--noprintdirs")) {
@@ -809,7 +809,7 @@
     // If no matchSubstrings were specified, match ALL strings
     // (except for whatever nomatchSubstrings were specified, if any).
     if (matchSubstrings.isEmpty()) {
-        matchSubstrings.push_back(new SkString(""));
+        matchSubstrings.push(new SkString(""));
     }
 
     create_diff_images(diffProc, colorThreshold, ignoreColorSpace, &differences,