1.1 --- a/javaquery/canvas/src/main/java/net/java/html/canvas/GraphicsContext.java	Thu May 23 09:56:49 2013 +0200
     1.2 +++ b/javaquery/canvas/src/main/java/net/java/html/canvas/GraphicsContext.java	Thu May 23 15:36:42 2013 +0200
     1.3 @@ -17,6 +17,7 @@
     1.4   */
     1.5  package net.java.html.canvas;
     1.6  
     1.7 +import net.java.html.canvas.spi.GraphicsEnvironment;
     1.8  import java.awt.Dimension;
     1.9  
    1.10  /**
    1.11 @@ -132,15 +133,15 @@
    1.12          graphicsEnvironmentImpl.scale(x, y);
    1.13      }
    1.14  
    1.15 -    public void drawImage(Image image, double x, double y){
    1.16 +    public void drawImage(ImageData image, double x, double y){
    1.17          graphicsEnvironmentImpl.drawImage(image, x, y);
    1.18      }
    1.19  
    1.20 -    public void drawImage(Image image, double x, double y, double width, double height){
    1.21 +    public void drawImage(ImageData image, double x, double y, double width, double height){
    1.22          graphicsEnvironmentImpl.drawImage(image, x, y, width, height);
    1.23      }
    1.24  
    1.25 -    public void drawImage(Image image, double sx, double sy, double sWidth, double sHeight, double x, double y, double width, double height){
    1.26 +    public void drawImage(ImageData image, double sx, double sy, double sWidth, double sHeight, double x, double y, double width, double height){
    1.27          graphicsEnvironmentImpl.drawImage(image, sx, sy, sWidth, sHeight, x, y, width, height);
    1.28      }
    1.29  
    1.30 @@ -272,7 +273,7 @@
    1.31  //        return graphicsEnvironmentImpl.createImageData(x, y);
    1.32  //    }
    1.33  //
    1.34 -//    public ImageData createImageData(Image imageData){
    1.35 +//    public ImageData createImageData(ImageData imageData){
    1.36  //        return graphicsEnvironmentImpl.createImageData(imageData);
    1.37  //    }
    1.38  //
    1.39 @@ -308,7 +309,7 @@
    1.40          return new LinearGradient(x0, y0, x1, y1);
    1.41      }
    1.42  
    1.43 -    public Pattern createPattern(Image image, String repeat){
    1.44 +    public Pattern createPattern(ImageData image, String repeat){
    1.45          return new Pattern(image, repeat);
    1.46      }
    1.47  
    1.48 @@ -316,9 +317,9 @@
    1.49          return new RadialGradient(x0, y0, r0, x1, y1, r1);
    1.50      }
    1.51  
    1.52 -    public Image getImageDataForPath(String path){
    1.53 -        return graphicsEnvironmentImpl.getImageForPath(path);
    1.54 -    }
    1.55 +//    public ImageData getImageDataForPath(String path){
    1.56 +//        return graphicsEnvironmentImpl.getImageForPath(path);
    1.57 +//    }
    1.58  
    1.59      public int getHeight(){
    1.60          return graphicsEnvironmentImpl.getHeight();