1 files changed, 9 insertions, 5 deletions
diff --git a/libjava/gnu/java/awt/java2d/AbstractGraphics2D.h b/libjava/gnu/java/awt/java2d/AbstractGraphics2D.h
index b8933b32db9..48d474bf2a6 100644
--- a/libjava/gnu/java/awt/java2d/AbstractGraphics2D.h
+++ b/libjava/gnu/java/awt/java2d/AbstractGraphics2D.h
@@ -20,6 +20,7 @@ extern "Java"
         namespace java2d
         {
             class AbstractGraphics2D;
+            class ScanlineConverter;
             class ShapeCache;
         }
       }
@@ -29,6 +30,7 @@ extern "Java"
   {
     namespace awt
     {
+        class BasicStroke;
         class Color;
         class Composite;
         class Font;
@@ -50,7 +52,6 @@ extern "Java"
       namespace geom
       {
           class AffineTransform;
-          class Rectangle2D;
       }
       namespace image
       {
@@ -175,11 +176,9 @@ public: // actually protected
   virtual void rawCopyArea(jint, jint, jint, jint, jint, jint);
 private:
   void copyAreaImpl(jint, jint, jint, jint, jint, jint);
-  void fillShapeImpl(::java::util::ArrayList *, ::java::awt::geom::Rectangle2D *, ::java::awt::geom::Rectangle2D *, ::java::awt::geom::Rectangle2D *);
 public: // actually protected
-  virtual void fillScanline(::java::awt::PaintContext *, jint, jint, jint);
+  virtual void fillScanline(jint, jint, jint);
 private:
-  void fillShapeAntialias(::java::util::ArrayList *, ::java::awt::geom::Rectangle2D *, ::java::awt::geom::Rectangle2D *, ::java::awt::geom::Rectangle2D *);
   void fillScanlineAA(JArray< jint > *, jint, jint, jint, ::java::awt::PaintContext *, jint);
 public: // actually protected
   virtual void init();
@@ -189,14 +188,17 @@ private:
   void updateOptimization();
   static ::java::awt::Rectangle * computeIntersection(jint, jint, jint, jint, ::java::awt::Rectangle *);
   void updateClip(::java::awt::geom::AffineTransform *);
-  ::java::util::ArrayList * getSegments(::java::awt::Shape *, ::java::awt::geom::AffineTransform *, ::java::awt::geom::Rectangle2D *, jboolean);
   ::gnu::java::awt::java2d::ShapeCache * getShapeCache();
+  ::gnu::java::awt::java2d::ScanlineConverter * getScanlineConverter();
+  static ::java::awt::Font * FONT;
   static const jint AA_SAMPLING = 8;
   static ::java::lang::ThreadLocal * shapeCache;
+  static ::java::lang::ThreadLocal * scanlineConverters;
 public: // actually protected
   ::java::awt::geom::AffineTransform * __attribute__((aligned(__alignof__( ::java::awt::Graphics2D)))) transform__;
 private:
   ::java::awt::Paint * paint;
+  ::java::awt::PaintContext * paintContext;
   ::java::awt::Color * background;
   ::java::awt::Font * font;
   ::java::awt::Composite * composite;
@@ -207,6 +209,8 @@ private:
   JArray< jint > * alpha;
   JArray< ::java::util::ArrayList * > * edgeTable;
   jboolean isOptimized;
+  static ::java::awt::BasicStroke * STANDARD_STROKE;
+  static ::java::util::HashMap * STANDARD_HINTS;
 public:
   static ::java::lang::Class class$;
 };