AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix cases of variable shadowing in test code.

Browse Source 
If we manage to fix all the existing cases of variable shadowing, we
could enable -Wshadow.

Change-Id: I571931e01b0b95d85a7b566fc785ac219e8e731f
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/438697
Auto-Submit: John Stiles <johnstiles@google.com>
Reviewed-by: Tyler Denniston <tdenniston@google.com>
Commit-Queue: John Stiles <johnstiles@google.com>
This commit is contained in:
John Stiles 2021-08-11 15:42:39 -04:00 committed by SkCQ
parent 8a412325c4
commit b7f2215bbb
6 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dm/DM.cpp
View File

@ -471,8 +471,8 @@ static bool in_shard() {
return N++ % FLAGS_shards == FLAGS_shard;
}
static void push_src(const char* tag, ImplicitString options, Src* s) {
std::unique_ptr<Src> src(s);
static void push_src(const char* tag, ImplicitString options, Src* inSrc) {
std::unique_ptr<Src> src(inSrc);
if (in_shard() && FLAGS_src.contains(tag) &&
!CommandLineFlags::ShouldSkip(FLAGS_match, src->name().c_str())) {
TaggedSrc& s = gSrcs->push_back();

3
gm/tilemodes.cpp
View File

@ -90,7 +90,7 @@ protected:
void onDraw(SkCanvas* canvas) override {
SkPaint textPaint;
SkFont font(ToolUtils::create_portable_typeface(), 12);
SkFont font(ToolUtils::create_portable_typeface());
int size = fPowerOfTwoSize ? kPOTSize : kNPOTSize;
@ -113,7 +113,6 @@ protected:
SkPaint p;
p.setDither(true);
SkString str;
SkFont font(ToolUtils::create_portable_typeface());
str.printf("[%s,%s]", gModeNames[kx], gModeNames[ky]);
SkTextUtils::DrawString(canvas, str.c_str(), x + r.width()/2, y, font, p,

4
gm/xfermodes.cpp
View File

@ -245,7 +245,7 @@ protected:
SkFont font(ToolUtils::create_portable_typeface());
const int W = 5;
const int kWrap = 5;
SkScalar x0 = 0;
SkScalar y0 = 0;
@ -278,7 +278,7 @@ protected:
font, labelP, SkTextUtils::kCenter_Align);
#endif
x += w + SkIntToScalar(10);
if ((i % W) == W - 1) {
if ((i % kWrap) == kWrap - 1) {
x = x0;
y += h + SkIntToScalar(30);
}

6
tests/GrSurfaceTest.cpp
View File

@ -188,11 +188,11 @@ DEF_GPUTEST(InitialTextureClear, reporter, baseOptions) {
static constexpr int kSize = 100;
static constexpr SkColor kClearColor = 0xABABABAB;
const SkImageInfo info = SkImageInfo::Make(kSize, kSize, kRGBA_8888_SkColorType,
kPremul_SkAlphaType);
const SkImageInfo imageInfo = SkImageInfo::Make(kSize, kSize, kRGBA_8888_SkColorType,
kPremul_SkAlphaType);
SkAutoPixmapStorage readback;
readback.alloc(info);
readback.alloc(imageInfo);
SkISize desc;
desc.fWidth = desc.fHeight = kSize;

4
tests/HashTest.cpp
View File

@ -77,7 +77,7 @@ DEF_TEST(HashMap, r) {
SkTHashMap<int, double> clone = map;
for (int i = 0; i < N; i++) {
double* found = map.find(i);
found = map.find(i);
REPORTER_ASSERT(r, found);
REPORTER_ASSERT(r, *found == i*2.0);
@ -97,7 +97,7 @@ DEF_TEST(HashMap, r) {
map.remove(i);
}
for (int i = 0; i < N; i++) {
double* found = map.find(i);
found = map.find(i);
REPORTER_ASSERT(r, (found == nullptr) == (i < N/2));
found = clone.find(i);

36
tests/PathOpsExtendedTest.cpp
View File

@ -110,8 +110,8 @@ void showOp(const SkPathOp op) {
}
}
const int bitWidth = 64;
const int bitHeight = 64;
const int kBitWidth = 64;
const int kBitHeight = 64;
static void scaleMatrix(const SkPath& one, const SkPath& two, SkMatrix& scale) {
SkRect larger = one.getBounds();
@ -124,8 +124,8 @@ static void scaleMatrix(const SkPath& one, const SkPath& two, SkMatrix& scale) {
if (largerHeight < 4) {
largerHeight = 4;
}
SkScalar hScale = (bitWidth - 2) / largerWidth;
SkScalar vScale = (bitHeight - 2) / largerHeight;
SkScalar hScale = (kBitWidth - 2) / largerWidth;
SkScalar vScale = (kBitHeight - 2) / largerHeight;
scale.reset();
scale.preScale(hScale, vScale);
larger.fLeft *= hScale;
@ -142,7 +142,7 @@ static void scaleMatrix(const SkPath& one, const SkPath& two, SkMatrix& scale) {
static int pathsDrawTheSame(SkBitmap& bits, const SkPath& scaledOne, const SkPath& scaledTwo,
int& error2x2) {
if (bits.width() == 0) {
bits.allocN32Pixels(bitWidth * 2, bitHeight);
bits.allocN32Pixels(kBitWidth * 2, kBitHeight);
}
SkCanvas canvas(bits);
canvas.drawColor(SK_ColorWHITE);
@ -153,17 +153,17 @@ static int pathsDrawTheSame(SkBitmap& bits, const SkPath& scaledOne, const SkPat
canvas.drawPath(scaledOne, paint);
canvas.restore();
canvas.save();
canvas.translate(-bounds1.fLeft + 1 + bitWidth, -bounds1.fTop + 1);
canvas.translate(-bounds1.fLeft + 1 + kBitWidth, -bounds1.fTop + 1);
canvas.drawPath(scaledTwo, paint);
canvas.restore();
int errors2 = 0;
int errors = 0;
for (int y = 0; y < bitHeight - 1; ++y) {
for (int y = 0; y < kBitHeight - 1; ++y) {
uint32_t* addr1 = bits.getAddr32(0, y);
uint32_t* addr2 = bits.getAddr32(0, y + 1);
uint32_t* addr3 = bits.getAddr32(bitWidth, y);
uint32_t* addr4 = bits.getAddr32(bitWidth, y + 1);
for (int x = 0; x < bitWidth - 1; ++x) {
uint32_t* addr3 = bits.getAddr32(kBitWidth, y);
uint32_t* addr4 = bits.getAddr32(kBitWidth, y + 1);
for (int x = 0; x < kBitWidth - 1; ++x) {
// count 2x2 blocks
bool err = addr1[x] != addr3[x];
if (err) {
@ -293,13 +293,13 @@ static int comparePaths(skiatest::Reporter* reporter, const char* testName, cons
}
// Default values for when reporter->verbose() is false.
static int testNumber = 55;
static const char* testName = "pathOpTest";
static int sTestNumber = 55;
static const char* sTestName = "pathOpTest";
static void appendTestName(const char* nameSuffix, std::string& out) {
out += testName;
out += std_to_string(testNumber);
++testNumber;
out += sTestName;
out += std_to_string(sTestNumber);
++sTestNumber;
if (nameSuffix) {
out.append(nameSuffix);
}
@ -473,7 +473,7 @@ static bool inner_simplify(skiatest::Reporter* reporter, const SkPath& path, con
}
SkPath out;
if (!SimplifyDebug(path, &out SkDEBUGPARAMS(SkipAssert::kYes == skipAssert)
SkDEBUGPARAMS(testName))) {
SkDEBUGPARAMS(sTestName))) {
if (ExpectSuccess::kYes == expectSuccess) {
SkDebugf("%s did not expect %s failure\n", __FUNCTION__, filename);
REPORTER_ASSERT(reporter, 0);
@ -636,7 +636,7 @@ void initializeTests(skiatest::Reporter* reporter, const char* test) {
static SkMutex& mu = *(new SkMutex);
if (reporter->verbose()) {
SkAutoMutexExclusive lock(mu);
testName = test;
sTestName = test;
size_t testNameSize = strlen(test);
SkFILEStream inFile("../../experimental/Intersection/op.htm");
if (inFile.isValid()) {
@ -649,7 +649,7 @@ void initializeTests(skiatest::Reporter* reporter, const char* test) {
if (insert) {
insert += sizeof(marker) - 1;
const char* numLoc = insert + 4 /* indent spaces */ + testNameSize - 1;
testNumber = atoi(numLoc) + 1;
sTestNumber = atoi(numLoc) + 1;
}
}
}