Remove ableist language
Change-Id: Ie9ef50a14906c9350adbe16720291dca944ad7fc
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/418738
Commit-Queue: Kevin Lubick <kjlubick@google.com>
Reviewed-by: John Stiles <johnstiles@google.com>
Reviewed-by: Jorge Betancourt <jmbetancourt@google.com>
diff --git a/tests/CodecTest.cpp b/tests/CodecTest.cpp
index f47011c..96ca821 100644
--- a/tests/CodecTest.cpp
+++ b/tests/CodecTest.cpp
@@ -701,7 +701,7 @@
}
DEF_TEST(Codec_pngChunkReader, r) {
- // Create a dummy bitmap. Use unpremul RGBA for libpng.
+ // Create a bitmap for hashing. Use unpremul RGBA for libpng.
SkBitmap bm;
const int w = 1;
const int h = 1;
diff --git a/tests/DeferredDisplayListTest.cpp b/tests/DeferredDisplayListTest.cpp
index 3eb239f..8f1e5b0 100644
--- a/tests/DeferredDisplayListTest.cpp
+++ b/tests/DeferredDisplayListTest.cpp
@@ -301,7 +301,7 @@
SkImageInfo imageInfo = SkImageInfo::Make({fWidth, fHeight},
{fColorType, kPremul_SkAlphaType, fColorSpace});
GrVkDrawableInfo vkInfo;
- // putting in a bunch of dummy values here
+ // putting in a bunch of placeholder values here
vkInfo.fSecondaryCommandBuffer = (VkCommandBuffer)1;
vkInfo.fColorAttachmentIndex = 0;
vkInfo.fCompatibleRenderPass = (VkRenderPass)1;
@@ -1167,7 +1167,7 @@
#ifdef SK_GL
-static sk_sp<SkPromiseImageTexture> dummy_fulfill_proc(void*) {
+static sk_sp<SkPromiseImageTexture> noop_fulfill_proc(void*) {
SkASSERT(0);
return nullptr;
}
@@ -1199,7 +1199,7 @@
kRGBA_8888_SkColorType,
kPremul_SkAlphaType,
/*color space*/nullptr,
- dummy_fulfill_proc,
+ noop_fulfill_proc,
/*release proc*/ nullptr,
/*context*/nullptr);
if (GR_GL_TEXTURE_2D != target && mipMapped == GrMipmapped::kYes) {
diff --git a/tests/DrawOpAtlasTest.cpp b/tests/DrawOpAtlasTest.cpp
index 5351030..fd4acd6 100644
--- a/tests/DrawOpAtlasTest.cpp
+++ b/tests/DrawOpAtlasTest.cpp
@@ -72,7 +72,7 @@
fMaxPages = maxPages;
}
-class DummyEvict : public GrDrawOpAtlas::EvictionCallback {
+class AssertOnEvict : public GrDrawOpAtlas::EvictionCallback {
public:
void evict(GrDrawOpAtlas::PlotLocator) override {
SkASSERT(0); // The unit test shouldn't exercise this code path
@@ -144,7 +144,7 @@
GrBackendFormat format = caps->getDefaultBackendFormat(GrColorType::kAlpha_8,
GrRenderable::kNo);
- DummyEvict evictor;
+ AssertOnEvict evictor;
GrDrawOpAtlas::GenerationCounter counter;
std::unique_ptr<GrDrawOpAtlas> atlas = GrDrawOpAtlas::Make(
diff --git a/tests/EncodeTest.cpp b/tests/EncodeTest.cpp
index c4a8b42..0d5ea8a 100644
--- a/tests/EncodeTest.cpp
+++ b/tests/EncodeTest.cpp
@@ -167,8 +167,8 @@
SkJpegEncoder::AlphaOption::kBlendOnBlack }) {
SkJpegEncoder::Options opts;
opts.fAlphaOption = alphaOption;
- SkNullWStream dummy;
- if (!SkJpegEncoder::Encode(&dummy, bm.pixmap(), opts)) {
+ SkNullWStream ignored;
+ if (!SkJpegEncoder::Encode(&ignored, bm.pixmap(), opts)) {
REPORTER_ASSERT(r, ct == kARGB_4444_SkColorType
&& alphaOption == SkJpegEncoder::AlphaOption::kBlendOnBlack);
}
diff --git a/tests/GrMeshTest.cpp b/tests/GrMeshTest.cpp
index 27d95fd..818bd2e 100644
--- a/tests/GrMeshTest.cpp
+++ b/tests/GrMeshTest.cpp
@@ -328,22 +328,22 @@
GrDrawIndexedIndirectWriter indexedIndirectWriter;
if (indexed) {
// Make helper->fDrawIndirectBufferOffset nonzero.
- sk_sp<const GrBuffer> dummyBuff;
- size_t dummyOffset;
+ sk_sp<const GrBuffer> ignoredBuff;
+ size_t ignoredOffset;
// Make a superfluous call to makeDrawIndirectSpace in order to test
// "offsetInBytes!=0" for the actual call to makeDrawIndexedIndirectSpace.
- helper->target()->makeDrawIndirectSpace(29, &dummyBuff, &dummyOffset);
+ helper->target()->makeDrawIndirectSpace(29, &ignoredBuff, &ignoredOffset);
indexedIndirectWriter = helper->target()->makeDrawIndexedIndirectSpace(
kBoxCountY, &helper->fDrawIndirectBuffer,
&helper->fDrawIndirectBufferOffset);
} else {
// Make helper->fDrawIndirectBufferOffset nonzero.
- sk_sp<const GrBuffer> dummyBuff;
- size_t dummyOffset;
+ sk_sp<const GrBuffer> ignoredBuff;
+ size_t ignoredOffset;
// Make a superfluous call to makeDrawIndexedIndirectSpace in order to test
// "offsetInBytes!=0" for the actual call to makeDrawIndirectSpace.
- helper->target()->makeDrawIndexedIndirectSpace(7, &dummyBuff,
- &dummyOffset);
+ helper->target()->makeDrawIndexedIndirectSpace(7, &ignoredBuff,
+ &ignoredOffset);
indirectWriter = helper->target()->makeDrawIndirectSpace(
kBoxCountY, &helper->fDrawIndirectBuffer,
&helper->fDrawIndirectBufferOffset);
diff --git a/tests/GrStyledShapeTest.cpp b/tests/GrStyledShapeTest.cpp
index 998703c..895d482 100644
--- a/tests/GrStyledShapeTest.cpp
+++ b/tests/GrStyledShapeTest.cpp
@@ -1741,7 +1741,7 @@
Key exampleInvHairlineCaseKey;
make_key(&exampleInvHairlineCaseKey, exampleInvHairlineCase);
- // These are dummy initializations to suppress warnings.
+ // These initializations suppress warnings.
SkRRect queryRR = SkRRect::MakeEmpty();
SkPathDirection queryDir = SkPathDirection::kCW;
unsigned queryStart = ~0U;
diff --git a/tests/PDFPrimitivesTest.cpp b/tests/PDFPrimitivesTest.cpp
index 6445f44..0321fbc 100644
--- a/tests/PDFPrimitivesTest.cpp
+++ b/tests/PDFPrimitivesTest.cpp
@@ -39,8 +39,6 @@
#include <cmath>
#include <memory>
-#define DUMMY_TEXT "DCT compessed stream."
-
template <typename T>
static SkString emit_to_string(T& obj) {
SkDynamicMemoryWStream buffer;
@@ -254,10 +252,10 @@
namespace {
-class DummyImageFilter : public SkImageFilter_Base {
+class TestImageFilter : public SkImageFilter_Base {
public:
- static sk_sp<DummyImageFilter> Make(bool visited = false) {
- return sk_sp<DummyImageFilter>(new DummyImageFilter(visited));
+ static sk_sp<TestImageFilter> Make(bool visited = false) {
+ return sk_sp<TestImageFilter>(new TestImageFilter(visited));
}
bool visited() const { return fVisited; }
@@ -270,18 +268,18 @@
}
private:
- SK_FLATTENABLE_HOOKS(DummyImageFilter)
- DummyImageFilter(bool visited) : INHERITED(nullptr, 0, nullptr), fVisited(visited) {}
+ SK_FLATTENABLE_HOOKS(TestImageFilter)
+ TestImageFilter(bool visited) : INHERITED(nullptr, 0, nullptr), fVisited(visited) {}
mutable bool fVisited;
using INHERITED = SkImageFilter_Base;
};
-sk_sp<SkFlattenable> DummyImageFilter::CreateProc(SkReadBuffer& buffer) {
+sk_sp<SkFlattenable> TestImageFilter::CreateProc(SkReadBuffer& buffer) {
SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 0);
bool visited = buffer.readBool();
- return DummyImageFilter::Make(visited);
+ return TestImageFilter::Make(visited);
}
} // namespace
@@ -294,7 +292,7 @@
auto doc = SkPDF::MakeDocument(&stream);
SkCanvas* canvas = doc->beginPage(100.0f, 100.0f);
- sk_sp<DummyImageFilter> filter(DummyImageFilter::Make());
+ sk_sp<TestImageFilter> filter(TestImageFilter::Make());
// Filter just created; should be unvisited.
REPORTER_ASSERT(reporter, !filter->visited());
diff --git a/tests/PathOpsOpTest.cpp b/tests/PathOpsOpTest.cpp
index 7c0aa28..9167fb4 100644
--- a/tests/PathOpsOpTest.cpp
+++ b/tests/PathOpsOpTest.cpp
@@ -9615,7 +9615,6 @@
two.moveTo(0, 0);
two.lineTo(0, 50);
two.lineTo(4.29497e+09f, 50);
- SkPath dummy;
testPathOpFuzz(reporter, one, two, kIntersect_SkPathOp, filename);
}
@@ -10081,7 +10080,6 @@
path.cubicTo(SkBits2Float(0x4a4a4a4a), SkBits2Float(0x4a4a4a4a), SkBits2Float(0x2ba1a14a), SkBits2Float(0x4e4a08ff), SkBits2Float(0x4a4a4a4a), SkBits2Float(0xa1a181ff)); // 3.31432e+06f, 3.31432e+06f, 1.14845e-12f, 8.47397e+08f, 3.31432e+06f, -1.09442e-18f
SkPath path2(path);
- SkPath dummy;
testPathOpFuzz(reporter, path1, path2, (SkPathOp)4, filename);
}
diff --git a/tests/PrimitiveProcessorTest.cpp b/tests/PrimitiveProcessorTest.cpp
index 1d75431..5b8d203 100644
--- a/tests/PrimitiveProcessorTest.cpp
+++ b/tests/PrimitiveProcessorTest.cpp
@@ -5,7 +5,7 @@
* found in the LICENSE file.
*/
-// This is a GPU-backend specific test. It relies on static intializers to work
+// This is a GPU-backend specific test. It relies on static initializers to work
#include <memory>
@@ -33,7 +33,7 @@
public:
DEFINE_OP_CLASS_ID
- const char* name() const override { return "Dummy Op"; }
+ const char* name() const override { return "Test Op"; }
static GrOp::Owner Make(GrRecordingContext* rContext, int numAttribs) {
return GrOp::Make<Op>(rContext, numAttribs);
@@ -71,7 +71,7 @@
});
}
- const char* name() const override { return "Dummy GP"; }
+ const char* name() const override { return "Test GP"; }
GrGLSLGeometryProcessor* createGLSLInstance(const GrShaderCaps&) const override {
class GLSLGP : public GrGLSLGeometryProcessor {
diff --git a/tests/ProgramsTest.cpp b/tests/ProgramsTest.cpp
index 8eedfb2..9c86bef 100644
--- a/tests/ProgramsTest.cpp
+++ b/tests/ProgramsTest.cpp
@@ -34,7 +34,7 @@
#endif
/*
- * A dummy processor which just tries to insert a massive key and verify that it can retrieve the
+ * A simple processor which just tries to insert a massive key and verify that it can retrieve the
* whole thing correctly
*/
static const uint32_t kMaxKeySize = 1024;
@@ -249,13 +249,13 @@
GrProcessorTestData::ViewInfo views[2];
- // setup dummy textures
+ // setup arbitrary textures
GrMipmapped mipMapped = GrMipmapped(caps->mipmapSupport());
{
- static constexpr SkISize kDummyDims = {34, 18};
+ static constexpr SkISize kDims = {34, 18};
const GrBackendFormat format = caps->getDefaultBackendFormat(GrColorType::kRGBA_8888,
GrRenderable::kYes);
- auto proxy = proxyProvider->createProxy(format, kDummyDims, GrRenderable::kYes, 1,
+ auto proxy = proxyProvider->createProxy(format, kDims, GrRenderable::kYes, 1,
mipMapped, SkBackingFit::kExact, SkBudgeted::kNo,
GrProtected::kNo, GrInternalSurfaceFlags::kNone);
GrSwizzle swizzle = caps->getReadSwizzle(format, GrColorType::kRGBA_8888);
@@ -263,10 +263,10 @@
GrColorType::kRGBA_8888, kPremul_SkAlphaType};
}
{
- static constexpr SkISize kDummyDims = {16, 22};
+ static constexpr SkISize kDims = {16, 22};
const GrBackendFormat format = caps->getDefaultBackendFormat(GrColorType::kAlpha_8,
GrRenderable::kNo);
- auto proxy = proxyProvider->createProxy(format, kDummyDims, GrRenderable::kNo, 1, mipMapped,
+ auto proxy = proxyProvider->createProxy(format, kDims, GrRenderable::kNo, 1, mipMapped,
SkBackingFit::kExact, SkBudgeted::kNo,
GrProtected::kNo, GrInternalSurfaceFlags::kNone);
GrSwizzle swizzle = caps->getReadSwizzle(format, GrColorType::kAlpha_8);
@@ -275,7 +275,7 @@
}
if (!std::get<0>(views[0]) || !std::get<0>(views[1])) {
- SkDebugf("Could not allocate dummy textures");
+ SkDebugf("Could not allocate textures for test");
return false;
}
diff --git a/tests/RRectInPathTest.cpp b/tests/RRectInPathTest.cpp
index 7eb5459..a89d884 100644
--- a/tests/RRectInPathTest.cpp
+++ b/tests/RRectInPathTest.cpp
@@ -100,14 +100,14 @@
}
static void test_undetected_paths(skiatest::Reporter* reporter) {
- // We use a dummy path to get the exact conic weight used by SkPath for a circular arc. This
+ // We first get the exact conic weight used by SkPath for a circular arc. This
// allows our local, hand-crafted, artisanal round rect paths below to exactly match the
// factory made corporate paths produced by SkPath.
- SkPath dummyPath;
- dummyPath.addCircle(0, 0, 10);
- REPORTER_ASSERT(reporter, SkPath::kMove_Verb == SkPathPriv::VerbData(dummyPath)[0]);
- REPORTER_ASSERT(reporter, SkPath::kConic_Verb == SkPathPriv::VerbData(dummyPath)[1]);
- const SkScalar weight = SkPathPriv::ConicWeightData(dummyPath)[0];
+ SkPath exactPath;
+ exactPath.addCircle(0, 0, 10);
+ REPORTER_ASSERT(reporter, SkPath::kMove_Verb == SkPathPriv::VerbData(exactPath)[0]);
+ REPORTER_ASSERT(reporter, SkPath::kConic_Verb == SkPathPriv::VerbData(exactPath)[1]);
+ const SkScalar weight = SkPathPriv::ConicWeightData(exactPath)[0];
SkPath path;
path.moveTo(0, 62.5f);
diff --git a/tests/SurfaceTest.cpp b/tests/SurfaceTest.cpp
index 3115031..b104ea2 100644
--- a/tests/SurfaceTest.cpp
+++ b/tests/SurfaceTest.cpp
@@ -1165,8 +1165,8 @@
}
REPORTER_ASSERT(reporter, img != nullptr);
- char dummyPixel = 0; // just need a valid address (not a valid size)
- SkPixmap pmap = { info, &dummyPixel, rowBytes };
+ char tempPixel = 0; // just need a valid address (not a valid size)
+ SkPixmap pmap = { info, &tempPixel, rowBytes };
img = SkImage::MakeFromRaster(pmap, nullptr, nullptr);
REPORTER_ASSERT(reporter, img != nullptr);
}
diff --git a/tests/TestUtils.cpp b/tests/TestUtils.cpp
index 86c908a..7a269e9 100644
--- a/tests/TestUtils.cpp
+++ b/tests/TestUtils.cpp
@@ -160,8 +160,8 @@
const float tolRGBA[4],
std::function<ComparePixmapsErrorReporter>& error) {
if (a.dimensions() != b.dimensions()) {
- static constexpr float kDummyDiffs[4] = {};
- error(-1, -1, kDummyDiffs);
+ static constexpr float kEmptyDiffs[4] = {};
+ error(-1, -1, kEmptyDiffs);
return false;
}