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

Remove conditional flavor text on blend GM.

Browse Source 
This was breaking replay modes for no good reason.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1864253002

Review URL: https://codereview.chromium.org/1864253002
This commit is contained in:
mtklein 2016-04-06 12:42:48 -07:00 committed by Commit bot
parent 083b869f50
commit 3d72c099c7
3 changed files with 1 additions and 256 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gm/blend.cpp
View File

@ -33,17 +33,4 @@ DEF_SIMPLE_GM(blend, canvas, 300, 100) {
canvas->drawRect(SkRect::MakeXYWH(2,0,1,1), p);
canvas->restore();
canvas->restore();
// Print out the colors in each block (if we're looking at 8888 raster).
if (canvas->imageInfo().colorType() == kN32_SkColorType) {
SkPixmap pmap;
if (const SkPMColor* px = canvas->peekPixels(&pmap) ? pmap.addr32() : nullptr) {
p.setColor(SK_ColorWHITE);
for (int i = 0; i < 3; i++) {
SkPMColor c = px[i * 100];
SkString text = SkStringPrintf("0x%08x", c);
canvas->drawText(text.c_str(), text.size(), i * 100.0f + 20.0f, 50.0f, p);
}
}
}
}

240
tools/dm_flags.json
View File

@ -93,10 +93,6 @@
"serialize-8888",
"gm",
"_",
"blend",
"serialize-8888",
"gm",
"_",
"c_gms",
"serialize-8888",
"gm",
@ -157,18 +153,6 @@
"sp-8888",
"gm",
"_",
"blend",
"pic-8888",
"gm",
"_",
"blend",
"2ndpic-8888",
"gm",
"_",
"blend",
"sp-8888",
"gm",
"_",
"drawfilter",
"pic-8888",
"gm",
@ -305,10 +289,6 @@
"serialize-8888",
"gm",
"_",
"blend",
"serialize-8888",
"gm",
"_",
"c_gms",
"serialize-8888",
"gm",
@ -369,18 +349,6 @@
"sp-8888",
"gm",
"_",
"blend",
"pic-8888",
"gm",
"_",
"blend",
"2ndpic-8888",
"gm",
"_",
"blend",
"sp-8888",
"gm",
"_",
"drawfilter",
"pic-8888",
"gm",
@ -614,10 +582,6 @@
"serialize-8888",
"gm",
"_",
"blend",
"serialize-8888",
"gm",
"_",
"c_gms",
"serialize-8888",
"gm",
@ -678,18 +642,6 @@
"sp-8888",
"gm",
"_",
"blend",
"pic-8888",
"gm",
"_",
"blend",
"2ndpic-8888",
"gm",
"_",
"blend",
"sp-8888",
"gm",
"_",
"drawfilter",
"pic-8888",
"gm",
@ -921,10 +873,6 @@
"serialize-8888",
"gm",
"_",
"blend",
"serialize-8888",
"gm",
"_",
"c_gms",
"serialize-8888",
"gm",
@ -985,18 +933,6 @@
"sp-8888",
"gm",
"_",
"blend",
"pic-8888",
"gm",
"_",
"blend",
"2ndpic-8888",
"gm",
"_",
"blend",
"sp-8888",
"gm",
"_",
"drawfilter",
"pic-8888",
"gm",
@ -1231,10 +1167,6 @@
"serialize-8888",
"gm",
"_",
"blend",
"serialize-8888",
"gm",
"_",
"c_gms",
"serialize-8888",
"gm",
@ -1295,18 +1227,6 @@
"sp-8888",
"gm",
"_",
"blend",
"pic-8888",
"gm",
"_",
"blend",
"2ndpic-8888",
"gm",
"_",
"blend",
"sp-8888",
"gm",
"_",
"drawfilter",
"pic-8888",
"gm",
@ -1534,10 +1454,6 @@
"serialize-8888",
"gm",
"_",
"blend",
"serialize-8888",
"gm",
"_",
"c_gms",
"serialize-8888",
"gm",
@ -1598,18 +1514,6 @@
"sp-8888",
"gm",
"_",
"blend",
"pic-8888",
"gm",
"_",
"blend",
"2ndpic-8888",
"gm",
"_",
"blend",
"sp-8888",
"gm",
"_",
"drawfilter",
"pic-8888",
"gm",
@ -1839,10 +1743,6 @@
"serialize-8888",
"gm",
"_",
"blend",
"serialize-8888",
"gm",
"_",
"c_gms",
"serialize-8888",
"gm",
@ -1903,18 +1803,6 @@
"sp-8888",
"gm",
"_",
"blend",
"pic-8888",
"gm",
"_",
"blend",
"2ndpic-8888",
"gm",
"_",
"blend",
"sp-8888",
"gm",
"_",
"drawfilter",
"pic-8888",
"gm",
@ -2140,10 +2028,6 @@
"serialize-8888",
"gm",
"_",
"blend",
"serialize-8888",
"gm",
"_",
"c_gms",
"serialize-8888",
"gm",
@ -2204,18 +2088,6 @@
"sp-8888",
"gm",
"_",
"blend",
"pic-8888",
"gm",
"_",
"blend",
"2ndpic-8888",
"gm",
"_",
"blend",
"sp-8888",
"gm",
"_",
"drawfilter",
"pic-8888",
"gm",
@ -2388,10 +2260,6 @@
"serialize-8888",
"gm",
"_",
"blend",
"serialize-8888",
"gm",
"_",
"c_gms",
"serialize-8888",
"gm",
@ -2452,18 +2320,6 @@
"sp-8888",
"gm",
"_",
"blend",
"pic-8888",
"gm",
"_",
"blend",
"2ndpic-8888",
"gm",
"_",
"blend",
"sp-8888",
"gm",
"_",
"drawfilter",
"pic-8888",
"gm",
@ -2729,10 +2585,6 @@
"serialize-8888",
"gm",
"_",
"blend",
"serialize-8888",
"gm",
"_",
"c_gms",
"serialize-8888",
"gm",
@ -2793,18 +2645,6 @@
"sp-8888",
"gm",
"_",
"blend",
"pic-8888",
"gm",
"_",
"blend",
"2ndpic-8888",
"gm",
"_",
"blend",
"sp-8888",
"gm",
"_",
"drawfilter",
"pic-8888",
"gm",
@ -2946,10 +2786,6 @@
"serialize-8888",
"gm",
"_",
"blend",
"serialize-8888",
"gm",
"_",
"c_gms",
"serialize-8888",
"gm",
@ -3010,18 +2846,6 @@
"sp-8888",
"gm",
"_",
"blend",
"pic-8888",
"gm",
"_",
"blend",
"2ndpic-8888",
"gm",
"_",
"blend",
"sp-8888",
"gm",
"_",
"drawfilter",
"pic-8888",
"gm",
@ -3166,10 +2990,6 @@
"serialize-8888",
"gm",
"_",
"blend",
"serialize-8888",
"gm",
"_",
"c_gms",
"serialize-8888",
"gm",
@ -3230,18 +3050,6 @@
"sp-8888",
"gm",
"_",
"blend",
"pic-8888",
"gm",
"_",
"blend",
"2ndpic-8888",
"gm",
"_",
"blend",
"sp-8888",
"gm",
"_",
"drawfilter",
"pic-8888",
"gm",
@ -3403,10 +3211,6 @@
"serialize-8888",
"gm",
"_",
"blend",
"serialize-8888",
"gm",
"_",
"c_gms",
"serialize-8888",
"gm",
@ -3467,18 +3271,6 @@
"sp-8888",
"gm",
"_",
"blend",
"pic-8888",
"gm",
"_",
"blend",
"2ndpic-8888",
"gm",
"_",
"blend",
"sp-8888",
"gm",
"_",
"drawfilter",
"pic-8888",
"gm",
@ -3639,10 +3431,6 @@
"serialize-8888",
"gm",
"_",
"blend",
"serialize-8888",
"gm",
"_",
"c_gms",
"serialize-8888",
"gm",
@ -3703,18 +3491,6 @@
"sp-8888",
"gm",
"_",
"blend",
"pic-8888",
"gm",
"_",
"blend",
"2ndpic-8888",
"gm",
"_",
"blend",
"sp-8888",
"gm",
"_",
"drawfilter",
"pic-8888",
"gm",
@ -4001,10 +3777,6 @@
"serialize-8888",
"gm",
"_",
"blend",
"serialize-8888",
"gm",
"_",
"c_gms",
"serialize-8888",
"gm",
@ -4065,18 +3837,6 @@
"sp-8888",
"gm",
"_",
"blend",
"pic-8888",
"gm",
"_",
"blend",
"2ndpic-8888",
"gm",
"_",
"blend",
"sp-8888",
"gm",
"_",
"drawfilter",
"pic-8888",
"gm",

4
tools/dm_flags.py
View File

@ -157,7 +157,6 @@ def get_args(bot):
'bleed_image',
'bleed_alpha_image',
'bleed_alpha_image_shader',
'blend',
'c_gms',
'colortype',
'colortype_xfermodes',
@ -175,8 +174,7 @@ def get_args(bot):
'verylarge_picture_image']: # Windows only.
blacklist.extend(['serialize-8888', 'gm', '_', test])
# skia:4769
for test in ['blend',
'drawfilter',
for test in ['drawfilter',
'path_stroke_with_zero_length',
'textblobgeometrychange']:
blacklist.extend([ 'sp-8888', 'gm', '_', test])