migrating SkTDArray towards std::vector api
fix for https://skia-review.googlesource.com/c/skia/+/146140
Change from original was to include <initializer_list>
Bug: skia:
Change-Id: Ie36426fcf7ce778a95e2b656ce80a9a394a8307c
Reviewed-on: https://skia-review.googlesource.com/146160
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Mike Reed <reed@google.com>
diff --git a/tools/debugger/SkDebugCanvas.cpp b/tools/debugger/SkDebugCanvas.cpp
index 537bcb1..19b88e9 100644
--- a/tools/debugger/SkDebugCanvas.cpp
+++ b/tools/debugger/SkDebugCanvas.cpp
@@ -84,7 +84,7 @@
}
void SkDebugCanvas::addDrawCommand(SkDrawCommand* command) {
- fCommandVector.push(command);
+ fCommandVector.push_back(command);
}
void SkDebugCanvas::draw(SkCanvas* canvas) {
diff --git a/tools/flags/SkCommandLineFlags.cpp b/tools/flags/SkCommandLineFlags.cpp
index 8e38c52..3924812 100644
--- a/tools/flags/SkCommandLineFlags.cpp
+++ b/tools/flags/SkCommandLineFlags.cpp
@@ -253,7 +253,7 @@
SkTDArray<SkFlagInfo*> allFlags;
for (SkFlagInfo* flag = SkCommandLineFlags::gHead; flag;
flag = flag->next()) {
- allFlags.push(flag);
+ allFlags.push_back(flag);
}
SkTQSort(&allFlags[0], &allFlags[allFlags.count() - 1],
CompareFlagsByName());
diff --git a/tools/sk_app/Window.h b/tools/sk_app/Window.h
index 8a71f35..be4da9a 100644
--- a/tools/sk_app/Window.h
+++ b/tools/sk_app/Window.h
@@ -158,7 +158,7 @@
void pushLayer(Layer* layer) {
layer->onAttach(this);
- fLayers.push(layer);
+ fLayers.push_back(layer);
}
void onBackendCreated();
diff --git a/tools/skdiff/skdiff_main.cpp b/tools/skdiff/skdiff_main.cpp
index 56aebe7..b4fdaad 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(new SkString(drp->fBase.fFilename));
+ fResultsOfType[drp->fResult].push_back(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(blame);
+ fResultsOfType[drp->fResult].push_back(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(
+ fStatusOfType[drp->fBase.fStatus][drp->fComparison.fStatus].push_back(
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(new SkString(pathRelativeToRootDir));
+ files->push_back(new SkString(pathRelativeToRootDir));
}
}
@@ -516,7 +516,7 @@
get_bounds(*drp);
}
SkASSERT(DiffRecord::kUnknown_Result != drp->fResult);
- differences->push(drp);
+ differences->push_back(drp);
summary->add(drp);
}
@@ -537,7 +537,7 @@
if (getBounds) {
get_bounds(*drp);
}
- differences->push(drp);
+ differences->push_back(drp);
summary->add(drp);
}
@@ -558,7 +558,7 @@
if (getBounds) {
get_bounds(*drp);
}
- differences->push(drp);
+ differences->push_back(drp);
summary->add(drp);
}
@@ -705,7 +705,7 @@
continue;
}
if (!strcmp(argv[i], "--match")) {
- matchSubstrings.push(new SkString(argv[++i]));
+ matchSubstrings.push_back(new SkString(argv[++i]));
continue;
}
if (!strcmp(argv[i], "--nocolorspace")) {
@@ -717,7 +717,7 @@
continue;
}
if (!strcmp(argv[i], "--nomatch")) {
- nomatchSubstrings.push(new SkString(argv[++i]));
+ nomatchSubstrings.push_back(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(new SkString(""));
+ matchSubstrings.push_back(new SkString(""));
}
create_diff_images(diffProc, colorThreshold, ignoreColorSpace, &differences,
diff --git a/tools/viewer/ImGuiLayer.cpp b/tools/viewer/ImGuiLayer.cpp
index fe55a61..3ed94a0 100644
--- a/tools/viewer/ImGuiLayer.cpp
+++ b/tools/viewer/ImGuiLayer.cpp
@@ -124,9 +124,9 @@
pos.rewind(); uv.rewind(); color.rewind();
for (int i = 0; i < drawList->VtxBuffer.size(); ++i) {
const ImDrawVert& vert = drawList->VtxBuffer[i];
- pos.push(SkPoint::Make(vert.pos.x, vert.pos.y));
- uv.push(SkPoint::Make(vert.uv.x, vert.uv.y));
- color.push(vert.col);
+ pos.push_back(SkPoint::Make(vert.pos.x, vert.pos.y));
+ uv.push_back(SkPoint::Make(vert.uv.x, vert.uv.y));
+ color.push_back(vert.col);
}
// ImGui colors are RGBA
SkSwapRB(color.begin(), color.begin(), color.count());