use conics for ovals and roundrects

This reverts commit e3b61eb7997d12c5f9b844dd3af1847492d9f411.

BUG=skia:
TBR=

Review URL: https://codereview.chromium.org/834303002

diff --git a/expectations/gm/ignored-tests.txt b/expectations/gm/ignored-tests.txt
index 0c54ce9..4b69bbe 100644 (file)
--- a/expectations/gm/ignored-tests.txt
+++ b/expectations/gm/ignored-tests.txt
@@ -39,3 +39,90 @@ 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
+complexclip2_path_bw
+resizeimagefilter
+shadows

diff --git a/gyp/skia_for_android_framework_defines.gypi b/gyp/skia_for_android_framework_defines.gypi
index 779af88..e793a7e 100644 (file)
--- a/gyp/skia_for_android_framework_defines.gypi
+++ b/gyp/skia_for_android_framework_defines.gypi
@@ -22,6 +22,8 @@
       'SK_SUPPORT_LEGACY_PORTER_DUFF',
       'SK_SUPPORT_LEGACY_DRAWDATA',
       'SK_SUPPORT_LEGACY_CANVAS_VIRTUAL',
+      'SK_SUPPORT_LEGACY_ADDOVAL',
+      'SK_SUPPORT_LEGACY_ADDRRECT',
     ],
   },
 }

diff --git a/src/core/SkPath.cpp b/src/core/SkPath.cpp
index 128a0cf..23c00e0 100644 (file)
--- a/src/core/SkPath.cpp
+++ b/src/core/SkPath.cpp
@@ -14,11 +14,6 @@
 #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
-
 ////////////////////////////////////////////////////////////////////////////
 
 /**