2 files changed, 14 insertions, 1 deletions

diff --git a/libjava/gnu/java/awt/java2d/AbstractGraphics2D.h b/libjava/gnu/java/awt/java2d/AbstractGraphics2D.h
index 92f78733b29..8effd32a584 100644
--- a/libjava/gnu/java/awt/java2d/AbstractGraphics2D.h
+++ b/libjava/gnu/java/awt/java2d/AbstractGraphics2D.h
@@ -168,7 +168,7 @@ public:
 public: // actually protected
   virtual void fillShape(::java::awt::Shape *, jboolean);
   virtual ::java::awt::image::ColorModel * getColorModel() = 0;
-  virtual ::java::awt::Rectangle * getDeviceBounds();
+  virtual ::java::awt::Rectangle * getDeviceBounds() = 0;
   virtual void rawDrawLine(jint, jint, jint, jint);
   virtual void rawDrawRect(jint, jint, jint, jint);
   virtual void rawClearRect(jint, jint, jint, jint);
@@ -189,6 +189,12 @@ private:
   void updateClip(::java::awt::geom::AffineTransform *);
   ::gnu::java::awt::java2d::ScanlineConverter * getScanlineConverter();
   void freeScanlineConverter(::gnu::java::awt::java2d::ScanlineConverter *);
+  ::java::awt::PaintContext * getPaintContext();
+public:
+  static ::java::awt::Image * prepareImage(::java::awt::Image *, jint, jint);
+public: // actually protected
+  static ::java::util::WeakHashMap * imageCache;
+private:
   static jboolean DEFAULT_TEXT_AA;
   static ::java::awt::Font * FONT;
   static const jint GV_CACHE_SIZE = 50;
@@ -202,6 +208,8 @@ private:
   ::java::awt::Paint * paint;
   ::java::awt::PaintContext * paintContext;
   ::java::awt::Color * background;
+  ::java::awt::Color * foreground;
+  jboolean isForegroundColorNull;
   ::java::awt::Font * font;
   ::java::awt::Composite * composite;
   ::java::awt::Stroke * stroke;
diff --git a/libjava/gnu/java/awt/java2d/RasterGraphics.h b/libjava/gnu/java/awt/java2d/RasterGraphics.h
index 41ab8d7dceb..37baf269c3a 100644
--- a/libjava/gnu/java/awt/java2d/RasterGraphics.h
+++ b/libjava/gnu/java/awt/java2d/RasterGraphics.h
@@ -18,6 +18,7 @@ extern "Java"
         namespace java2d
         {
             class RasterGraphics;
+            class ScanlineCoverage;
         }
       }
     }
@@ -27,6 +28,7 @@ extern "Java"
     namespace awt
     {
         class GraphicsConfiguration;
+        class Rectangle;
       namespace image
       {
           class ColorModel;
@@ -41,11 +43,14 @@ class gnu::java::awt::java2d::RasterGraphics : public ::gnu::java::awt::java2d::
 
 public:
   RasterGraphics(::java::awt::image::WritableRaster *, ::java::awt::image::ColorModel *);
+  virtual void renderScanline(jint, ::gnu::java::awt::java2d::ScanlineCoverage *);
 public: // actually protected
   virtual ::java::awt::image::ColorModel * getColorModel();
   virtual ::java::awt::image::WritableRaster * getDestinationRaster();
 public:
   virtual ::java::awt::GraphicsConfiguration * getDeviceConfiguration();
+public: // actually protected
+  virtual ::java::awt::Rectangle * getDeviceBounds();
 private:
   ::java::awt::image::WritableRaster * __attribute__((aligned(__alignof__( ::gnu::java::awt::java2d::AbstractGraphics2D)))) raster;
   ::java::awt::image::ColorModel * colorModel;