# HG changeset patch
# User Jaroslav Tulach <jaroslav.tulach@apidesign.org>
# Date 1360840004 -3600
# Node ID 6ba6b23c1b881b5d6ee0c3567e200c0f42b64d66
# Parent  c6db7a7322abfd7a16c9ddf3399e78ed4fd491a9# Parent  e8283f10a12729ff862ff65f66a671fcf3cd2695
Merging David's fix to canvas API to default branch

diff -r c6db7a7322ab -r 6ba6b23c1b88 javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/api/GraphicsContext.java
--- a/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/api/GraphicsContext.java	Wed Feb 13 18:46:55 2013 +0100
+++ b/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/api/GraphicsContext.java	Thu Feb 14 12:06:44 2013 +0100
@@ -307,10 +307,10 @@
     public native double getGlobalAlpha();
 
     @JavaScriptBody(args = {"operation"}, body = "this._context().globalCompositeOperation=operation;")
-    public native void setGlobalCompositeOperation(double alpha);
+    public native void setGlobalCompositeOperation(String operation);
 
     @JavaScriptBody(args = {}, body = "return this._context().globalCompositeOperation;")
-    public native double getGlobalCompositeOperation();
+    public native String getGlobalCompositeOperation();
 
     public LinearGradient createLinearGradient(double x0, double y0, double x1, double y1) {
         return new LinearGradient(createLinearGradientImpl(context, x0, y0, x1, y1));