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

Revert of use conics for ovals and roundrects (patchset #1 id:1 of https://codereview.chromium.org/817283005/)

Browse Source 
Reason for revert:
need fix in edgebuilder+aa

Original issue's description:
> use conics for ovals and roundrects
>
> adapted from https://codereview.chromium.org/831313002/
>
> BUG=skia:
> TBR=
>
> Committed: https://skia.googlesource.com/skia/+/2bf1c4d58b84c73c6421edcb25e3afb4971da200

TBR=reed@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Review URL: https://codereview.chromium.org/840573002
This commit is contained in:
reed 2015-01-06 07:17:49 -08:00 committed by Commit bot
parent 1b74730c6b
commit e3b61eb799
5 changed files with 7 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
expectations/gm/ignored-tests.txt
View File

@ -39,87 +39,3 @@ blurrects
# sugoi https://codereview.chromium.org/646213004/
# New shadow only option in SkDropShadowImageFilter
dropshadowimagefilter
# reed/egdaniel -- new conic code
bigmatrix
bitmaprect_i
bitmaprect_s
bitmapshaders
blurcircles
blurroundrect-WH-100x100-unevenCorners
blurs
c_gms
circles
circular-clips
complexclip2_path_aa
complexclip2_rrect_aa
complexclip3_complex
complexclip3_simple
convexpaths
dashing2
drrect
emboss
extractbitmap
fatpathfill
filltypes
filltypespersp
gpusamplerstress
hairlines
image-surface
imagefiltersclipped
imagefiltersscaled
lerpmode
lumafilter
mixed_xfermodes
nested_aa
nested_bw
ninepatch-stretch
ovals
patheffect
pathfill
pathinterior
pathinvfill
pathopsskpclip
peekpixels
pictureshader
pictureshadertile
points
radial_gradient2
rects
roundrects
rrect
rrect_clip_aa
rrect_clip_bw
rrect_draw_aa
rrect_draw_bw
simpleaaclip_aaclip
simpleaaclip_path
simpleblurroundrect
spritebitmap
srcmode
stroke-fill
strokerect
strokes_round
tablecolorfilter
testimagefilters
texteffects
tiledscaledbitmap
twopointconical
verttext
bezier_conic_effects
bezier_cubic_effects
bezier_quad_effects
dcshader
drawlooper
filterfastbounds
path-reverse
strokes3
texture_domain_effect
inverse_paths
complexclip2_rrect_bw
multipicturedraw_rrectclip_tiled
imagefiltersbase
hairmodes
imagefilterscropped
multipicturedraw_rrectclip_simple
aarectmodes

2
gyp/skia_for_android_framework_defines.gypi
View File

@ -22,8 +22,6 @@
'SK_SUPPORT_LEGACY_PORTER_DUFF',
'SK_SUPPORT_LEGACY_DRAWDATA',
'SK_SUPPORT_LEGACY_CANVAS_VIRTUAL',
'SK_SUPPORT_LEGACY_ADDOVAL',
'SK_SUPPORT_LEGACY_ADDRRECT',
],
},
}

2
gyp/skia_for_chromium_defines.gypi
View File

@ -15,8 +15,6 @@
'skia_for_chromium_defines': [
'SK_SUPPORT_LEGACY_DRAWDATA',
'SK_SUPPORT_LEGACY_CANVAS_VIRTUAL',
'SK_SUPPORT_LEGACY_ADDOVAL',
'SK_SUPPORT_LEGACY_ADDRRECT',
],
},
}

5
src/core/SkPath.cpp
View File

@ -14,6 +14,11 @@
#include "SkRRect.h"
#include "SkThread.h"
// These two should be removed once we fix any gpu bugs, and then
// just move them into skia_for_chromium_defines.gypi
#define SK_SUPPORT_LEGACY_ADDOVAL
#define SK_SUPPORT_LEGACY_ADDRRECT
////////////////////////////////////////////////////////////////////////////
/**

4
src/pathops/SkOpEdgeBuilder.cpp
View File

@ -111,8 +111,8 @@ int SkOpEdgeBuilder::preFetch() {
for (int i = 0; i < nQuads; ++i) {
fPathVerbs.push_back(SkPath::kQuad_Verb);
}
fPathPts.push_back_n(nQuads * 2, &quadPts[1]);
curve[0] = pts[2];
fPathPts.push_back_n(nQuads * 2, quadPts);
curve[0] = quadPts[nQuads * 2 - 1];
lastCurve = true;
}
continue;