Disable AA for ovals and roundrects if MSAA is enabled

include/gpu/GrOvalRenderer.h

Index: include/gpu/GrOvalRenderer.h
===================================================================
--- include/gpu/GrOvalRenderer.h	(revision 8926)
+++ include/gpu/GrOvalRenderer.h	(working copy)
@@ -29,16 +29,16 @@
     GrOvalRenderer() : fRRectIndexBuffer(NULL) {}
     ~GrOvalRenderer() {}
 
-    bool drawOval(GrDrawTarget* target, const GrContext* context, const GrPaint& paint,
+    bool drawOval(GrDrawTarget* target, const GrContext* context, bool useAA,
                   const GrRect& oval, const SkStrokeRec& stroke);
-    bool drawSimpleRRect(GrDrawTarget* target, GrContext* context, const GrPaint& paint,
+    bool drawSimpleRRect(GrDrawTarget* target, GrContext* context, bool useAA,
                          const SkRRect& rrect, const SkStrokeRec& stroke);
 
 private:
-    bool drawEllipse(GrDrawTarget* target, const GrPaint& paint,
+    bool drawEllipse(GrDrawTarget* target, bool useAA,
                      const GrRect& ellipse,
                      const SkStrokeRec& stroke);
-    void drawCircle(GrDrawTarget* target, const GrPaint& paint,
+    void drawCircle(GrDrawTarget* target, bool useAA,
                     const GrRect& circle,
                     const SkStrokeRec& stroke);