switch SkTDArray from push to push_back
Bug: skia:
Change-Id: I5d7252cf67a201612813597047f1ea3584c57854
Reviewed-on: https://skia-review.googlesource.com/146386
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Mike Reed <reed@google.com>
diff --git a/include/private/SkTDArray.h b/include/private/SkTDArray.h
index c48da42..56a2165 100644
--- a/include/private/SkTDArray.h
+++ b/include/private/SkTDArray.h
@@ -280,9 +280,6 @@
void pop(T* elem) { SkASSERT(fCount > 0); if (elem) *elem = (*this)[fCount - 1]; --fCount; }
void pop() { SkASSERT(fCount > 0); --fCount; }
- // DEPRECATED -- update call-sites to remove
- void push(const T& v) { this->push_back(v); }
-
void deleteAll() {
T* iter = fArray;
T* stop = fArray + fCount;
diff --git a/src/gpu/mtl/GrMtlCaps.mm b/src/gpu/mtl/GrMtlCaps.mm
index dc7de61..110985f 100644
--- a/src/gpu/mtl/GrMtlCaps.mm
+++ b/src/gpu/mtl/GrMtlCaps.mm
@@ -204,10 +204,10 @@
fMaxTextureSize = fMaxRenderTargetSize;
// Init sample counts. All devices support 1 (i.e. 0 in skia).
- fSampleCounts.push(1);
+ fSampleCounts.push_back(1);
for (auto sampleCnt : {2, 4, 8}) {
if ([device supportsTextureSampleCount:sampleCnt]) {
- fSampleCounts.push(sampleCnt);
+ fSampleCounts.push_back(sampleCnt);
}
}
diff --git a/src/gpu/vk/GrVkCaps.cpp b/src/gpu/vk/GrVkCaps.cpp
index 28440b1..95b5712 100644
--- a/src/gpu/vk/GrVkCaps.cpp
+++ b/src/gpu/vk/GrVkCaps.cpp
@@ -583,29 +583,29 @@
&properties));
VkSampleCountFlags flags = properties.sampleCounts;
if (flags & VK_SAMPLE_COUNT_1_BIT) {
- fColorSampleCounts.push(1);
+ fColorSampleCounts.push_back(1);
}
if (kImagination_VkVendor == physProps.vendorID) {
// MSAA does not work on imagination
return;
}
if (flags & VK_SAMPLE_COUNT_2_BIT) {
- fColorSampleCounts.push(2);
+ fColorSampleCounts.push_back(2);
}
if (flags & VK_SAMPLE_COUNT_4_BIT) {
- fColorSampleCounts.push(4);
+ fColorSampleCounts.push_back(4);
}
if (flags & VK_SAMPLE_COUNT_8_BIT) {
- fColorSampleCounts.push(8);
+ fColorSampleCounts.push_back(8);
}
if (flags & VK_SAMPLE_COUNT_16_BIT) {
- fColorSampleCounts.push(16);
+ fColorSampleCounts.push_back(16);
}
if (flags & VK_SAMPLE_COUNT_32_BIT) {
- fColorSampleCounts.push(32);
+ fColorSampleCounts.push_back(32);
}
if (flags & VK_SAMPLE_COUNT_64_BIT) {
- fColorSampleCounts.push(64);
+ fColorSampleCounts.push_back(64);
}
}
diff --git a/src/pathops/SkPathOpsDebug.cpp b/src/pathops/SkPathOpsDebug.cpp
index 45314de..8010ab7 100644
--- a/src/pathops/SkPathOpsDebug.cpp
+++ b/src/pathops/SkPathOpsDebug.cpp
@@ -100,7 +100,7 @@
}
SpanGlitch* recordCommon(GlitchType type) {
- SpanGlitch* glitch = fGlitches.push();
+ SpanGlitch* glitch = fGlitches.push_back();
glitch->fBase = nullptr;
glitch->fSuspect = nullptr;
glitch->fSegment = nullptr;
@@ -1394,7 +1394,7 @@
SkTDArray<const SkOpAngle*>(angles);
do {
// SkASSERT_RELEASE(next->fSegment->debugContains(next));
- angles.push(next);
+ angles.push_back(next);
next = next->next();
if (next == first) {
break;
diff --git a/src/utils/win/SkWGL_win.cpp b/src/utils/win/SkWGL_win.cpp
index 90b683e..1360a01 100644
--- a/src/utils/win/SkWGL_win.cpp
+++ b/src/utils/win/SkWGL_win.cpp
@@ -304,8 +304,8 @@
bool doubleBuffered, int msaaSampleCount, bool deepColor,
int formatsToTry[2]) {
auto appendAttr = [](SkTDArray<int>& attrs, int attr, int value) {
- attrs.push(attr);
- attrs.push(value);
+ attrs.push_back(attr);
+ attrs.push_back(value);
};
SkTDArray<int> iAttrs;
diff --git a/src/xps/SkXPSDevice.cpp b/src/xps/SkXPSDevice.cpp
index c2b5e66..ee8e072 100644
--- a/src/xps/SkXPSDevice.cpp
+++ b/src/xps/SkXPSDevice.cpp
@@ -1328,28 +1328,28 @@
}
case SkPath::kLine_Verb:
if (iter.isCloseLine()) break; //ignore the line, auto-closed
- segmentTypes.push(XPS_SEGMENT_TYPE_LINE);
- segmentStrokes.push(stroke);
- segmentData.push(SkScalarToFLOAT(points[1].fX));
- segmentData.push(SkScalarToFLOAT(points[1].fY));
+ segmentTypes.push_back(XPS_SEGMENT_TYPE_LINE);
+ segmentStrokes.push_back(stroke);
+ segmentData.push_back(SkScalarToFLOAT(points[1].fX));
+ segmentData.push_back(SkScalarToFLOAT(points[1].fY));
break;
case SkPath::kQuad_Verb:
- segmentTypes.push(XPS_SEGMENT_TYPE_QUADRATIC_BEZIER);
- segmentStrokes.push(stroke);
- segmentData.push(SkScalarToFLOAT(points[1].fX));
- segmentData.push(SkScalarToFLOAT(points[1].fY));
- segmentData.push(SkScalarToFLOAT(points[2].fX));
- segmentData.push(SkScalarToFLOAT(points[2].fY));
+ segmentTypes.push_back(XPS_SEGMENT_TYPE_QUADRATIC_BEZIER);
+ segmentStrokes.push_back(stroke);
+ segmentData.push_back(SkScalarToFLOAT(points[1].fX));
+ segmentData.push_back(SkScalarToFLOAT(points[1].fY));
+ segmentData.push_back(SkScalarToFLOAT(points[2].fX));
+ segmentData.push_back(SkScalarToFLOAT(points[2].fY));
break;
case SkPath::kCubic_Verb:
- segmentTypes.push(XPS_SEGMENT_TYPE_BEZIER);
- segmentStrokes.push(stroke);
- segmentData.push(SkScalarToFLOAT(points[1].fX));
- segmentData.push(SkScalarToFLOAT(points[1].fY));
- segmentData.push(SkScalarToFLOAT(points[2].fX));
- segmentData.push(SkScalarToFLOAT(points[2].fY));
- segmentData.push(SkScalarToFLOAT(points[3].fX));
- segmentData.push(SkScalarToFLOAT(points[3].fY));
+ segmentTypes.push_back(XPS_SEGMENT_TYPE_BEZIER);
+ segmentStrokes.push_back(stroke);
+ segmentData.push_back(SkScalarToFLOAT(points[1].fX));
+ segmentData.push_back(SkScalarToFLOAT(points[1].fY));
+ segmentData.push_back(SkScalarToFLOAT(points[2].fX));
+ segmentData.push_back(SkScalarToFLOAT(points[2].fY));
+ segmentData.push_back(SkScalarToFLOAT(points[3].fX));
+ segmentData.push_back(SkScalarToFLOAT(points[3].fY));
break;
case SkPath::kConic_Verb: {
const SkScalar tol = SK_Scalar1 / 4;
@@ -1357,12 +1357,12 @@
const SkPoint* quads =
converter.computeQuads(points, iter.conicWeight(), tol);
for (int i = 0; i < converter.countQuads(); ++i) {
- segmentTypes.push(XPS_SEGMENT_TYPE_QUADRATIC_BEZIER);
- segmentStrokes.push(stroke);
- segmentData.push(SkScalarToFLOAT(quads[2 * i + 1].fX));
- segmentData.push(SkScalarToFLOAT(quads[2 * i + 1].fY));
- segmentData.push(SkScalarToFLOAT(quads[2 * i + 2].fX));
- segmentData.push(SkScalarToFLOAT(quads[2 * i + 2].fY));
+ segmentTypes.push_back(XPS_SEGMENT_TYPE_QUADRATIC_BEZIER);
+ segmentStrokes.push_back(stroke);
+ segmentData.push_back(SkScalarToFLOAT(quads[2 * i + 1].fX));
+ segmentData.push_back(SkScalarToFLOAT(quads[2 * i + 1].fY));
+ segmentData.push_back(SkScalarToFLOAT(quads[2 * i + 2].fX));
+ segmentData.push_back(SkScalarToFLOAT(quads[2 * i + 2].fY));
}
break;
}
diff --git a/tests/IncrTopoSortTest.cpp b/tests/IncrTopoSortTest.cpp
index 24cc59b..849c20a 100644
--- a/tests/IncrTopoSortTest.cpp
+++ b/tests/IncrTopoSortTest.cpp
@@ -65,12 +65,12 @@
void setIndexInSort(int indexInSort) { fIndexInSort = indexInSort; }
void setVisited(bool visited) { fVisited = visited; }
void addDependency(Node* dependedOn) {
- fNodesIDependOn.push(dependedOn);
+ fNodesIDependOn.push_back(dependedOn);
dependedOn->addDependent(this);
}
void addDependent(Node* dependent) {
- fNodesThatDependOnMe.push(dependent);
+ fNodesThatDependOnMe.push_back(dependent);
}
char fID;
@@ -424,8 +424,8 @@
{
SkTDArray<Node*> dependedOn;
- dependedOn.push(nodeB);
- dependedOn.push(nodeC);
+ dependedOn.push_back(nodeB);
+ dependedOn.push_back(nodeC);
g.addEdges(&dependedOn, nodeD); // nodes B and C must come before node D
}