Always include the default path renderer in the chain

This (plus SW) ensures that we can always draw any path. Changed the path
renderer command line flags so that 'default' means everything but CCPR,
and 'All' really means 'every path renderer'.

Bug: skia:
Change-Id: I2801d1c50ab939f23efb4600e0f90e6add2891b7
Reviewed-on: https://skia-review.googlesource.com/40221
Reviewed-by: Chris Dalton <csmartdalton@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

1 files changed, 5 insertions, 4 deletions

diff --git a/include/gpu/GrContextOptions.h b/include/gpu/GrContextOptions.h
index 65db523f7b..b94b5cee5f 100644
--- a/include/gpu/GrContextOptions.h
+++ b/include/gpu/GrContextOptions.h
@@ -89,7 +89,7 @@ struct GrContextOptions {
      * Allows the client to include or exclude specific GPU path renderers.
      */
     enum class GpuPathRenderers {
-        kNone              = 0, // Always use sofware masks.
+        kNone              = 0, // Always use sofware masks and/or GrDefaultPathRenderer.
         kDashLine          = 1 << 0,
         kStencilAndCover   = 1 << 1,
         kMSAA              = 1 << 2,
@@ -99,16 +99,17 @@ struct GrContextOptions {
         kSmall             = 1 << 6,
         kCoverageCounting  = 1 << 7,
         kTessellating      = 1 << 8,
-        kDefault           = 1 << 9,
+
+        kAll               = (kTessellating | (kTessellating - 1)),
 
         // Temporarily disabling CCPR by default until it has had a time to soak.
-        kAll               = (kDefault | (kDefault - 1)) & ~kCoverageCounting,
+        kDefault           = kAll & ~kCoverageCounting,
 
         // For legacy. To be removed when updated in Android.
         kDistanceField     = kSmall
     };
 
-    GpuPathRenderers fGpuPathRenderers = GpuPathRenderers::kAll;
+    GpuPathRenderers fGpuPathRenderers = GpuPathRenderers::kDefault;
 
     /**
      * The maximum size of cache textures used for Skia's Glyph cache.