src/java.desktop/macosx/native/libawt_lwawt/awt/QuartzSurfaceData.m

@@ -266,13 +266,60 @@
 {
 PRINT("    gradientPaintReleaseFunction")
     free(info);
 }
 
+static inline void contextQuartzGradientPath(QuartzSDOps* qsdo)
+{
+
+PRINT("    contextQuartzGradientPath");
+
+    CGContextRef cgRef = qsdo->cgRef;
+    StateGradientInfo *gradientInfo = qsdo->gradientInfo;
+   
+    CGColorSpaceRef colorspace = CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB);
+    size_t num_locations = gradientInfo->fractionsLength;
+    CGFloat *locations = (CGFloat *) malloc(sizeof(CGFloat) * num_locations);
+    int i = 0;
+    size_t component_size = num_locations * 4;
+    CGFloat components[component_size];
+    CGGradientRef gradient = NULL;
+
+    for (int i = 0; i < num_locations; i++) {
+        locations[i] = gradientInfo->fractionsdata[i];
+//fprintf(stderr, "locations[%d] %f\n", i, locations[i]);
+    }
+    for (i = 0; i < component_size; i++) {
+        components[i] = gradientInfo->colordata[i];
+//fprintf(stderr, "components[%d] %f, gradientInfo->colordata[%d] %f\n",
+//                  i, components[i], i, gradientInfo->colordata[i]);
+    } 
+    CGContextSaveGState(cgRef);
+    gradient = CGGradientCreateWithColorComponents(colorspace, components, locations, num_locations);
+//fprintf(stderr, "gradientInfo->start.x %f, gradientInfo->start.y %f\n", 
+//                 gradientInfo->start.x, gradientInfo->start.y);
+//fprintf(stderr, "gradientInfo->end.x %f, gradientInfo->end.y %f\n", 
+//                 gradientInfo->end.x, gradientInfo->end.y);
+    if (qsdo->isEvenOddFill) {
+        CGContextEOClip(cgRef);
+    } else {
+        CGContextClip(cgRef);
+    }
+    CGContextDrawLinearGradient(cgRef, gradient, gradientInfo->start, gradientInfo->end, 0);    
+    
+    CGContextRestoreGState(cgRef);
+    CGColorSpaceRelease(colorspace);
+    CGGradientRelease(gradient);
+    free(locations);
+    free(gradientInfo->colordata);
+    free(gradientInfo->fractionsdata);
+}
+
 static inline void contextGradientPath(QuartzSDOps* qsdo)
 {
 PRINT("    ContextGradientPath")
+ 
     CGContextRef cgRef = qsdo->cgRef;
     StateShadingInfo* shadingInfo = qsdo->shadingInfo;
 
     CGRect bounds = CGContextGetClipBoundingBox(cgRef);
 

@@ -896,10 +943,86 @@
             qsdo->shadingInfo->colors[7] = ((c2>>24)&0xff)*kColorConversionMultiplier;
             qsdo->shadingInfo->cyclic    = (javaGraphicsStates[sun_java2d_OSXSurfaceData_kColorIsCyclicIndex] == sun_java2d_OSXSurfaceData_kColorCyclic);
 
             break;
         }
+        case sun_java2d_OSXSurfaceData_kColorLinearOrRadialGradient:
+        {
+            qsdo->gradientInfo = (StateGradientInfo*)malloc(sizeof(StateGradientInfo));
+            if (qsdo->gradientInfo == NULL)
+            {
+                [JNFException raise:env as:kOutOfMemoryError reason:"Failed to malloc memory for gradient paint"];
+            }
+
+            qsdo->graphicsStateInfo.simpleStroke = NO;
+            qsdo->graphicsStateInfo.simpleColor = NO;
+
+            renderType = SD_Gradient;
+
+            qsdo->gradientInfo->start.x    = javaFloatGraphicsStates[sun_java2d_OSXSurfaceData_kColorx1Index];
+            qsdo->gradientInfo->start.y    = javaFloatGraphicsStates[sun_java2d_OSXSurfaceData_kColory1Index];
+            qsdo->gradientInfo->end.x    = javaFloatGraphicsStates[sun_java2d_OSXSurfaceData_kColorx2Index];
+            qsdo->gradientInfo->end.y    = javaFloatGraphicsStates[sun_java2d_OSXSurfaceData_kColory2Index];
+
+            jobject colorArray  = ((*env)->GetObjectArrayElement(env, qsdo->javaGraphicsStatesObjects, sun_java2d_OSXSurfaceData_kColorArrayIndex)); 
+            if (colorArray != NULL)
+            {
+                jint length = (*env)->GetArrayLength(env, colorArray);
+//fprintf(stderr, "length %d\n", length);
+
+                jint* jcolorData = (jint*)(*env)->GetPrimitiveArrayCritical(env, colorArray, NULL);
+                CGFloat* colors= (CGFloat*)calloc(0, sizeof(CGFloat)*length);
+                if (jcolorData != NULL)
+                {
+                    jint i;
+                    for (i=0; i<length; i++)
+                    {
+                        colors[i] = (CGFloat)jcolorData[i];
+                    }
+                }
+                for (int i = 0; i < length; i++) 
+                {
+                    jint c1 = colors[i];
+//fprintf(stderr, "c1 %x\n", c1);
+                    qsdo->gradientInfo->colordata = (CGFloat*)calloc(0, sizeof(CGFloat)*4*length);
+                    qsdo->gradientInfo->colordata[i*4] = ((c1>>16)&0xff)*kColorConversionMultiplier;
+//fprintf(stderr, "qsdo->gradientInfo->colordata[%d] %f\n", i*4, qsdo->gradientInfo->colordata[i*4]);
+
+                    qsdo->gradientInfo->colordata[i*4+1] = ((c1>>8)&0xff)*kColorConversionMultiplier;
+//fprintf(stderr, "qsdo->gradientInfo->colordata[%d] %f\n", i*4+1, qsdo->gradientInfo->colordata[i*4+1]);
+
+                    qsdo->gradientInfo->colordata[i*4+2] = ((c1>>0)&0xff)*kColorConversionMultiplier;
+//fprintf(stderr, "qsdo->gradientInfo->colordata[%d] %f\n", i*4+2, qsdo->gradientInfo->colordata[i*4+2]);
+
+                    qsdo->gradientInfo->colordata[i*4+3] = ((c1>>24)&0xff)*kColorConversionMultiplier;
+//fprintf(stderr, "qsdo->gradientInfo->colordata[%d] %f\n", i*4+3, qsdo->gradientInfo->colordata[i*4+3]);
+                }
+                (*env)->ReleasePrimitiveArrayCritical(env, colorArray, jcolorData, 0);
+                free(colors);
+            }
+            jobject fractionsArray  = ((*env)->GetObjectArrayElement(env, qsdo->javaGraphicsStatesObjects, sun_java2d_OSXSurfaceData_kFractionsArrayIndex)); 
+            if (fractionsArray != NULL)
+            {
+                jint length = (*env)->GetArrayLength(env, fractionsArray);
+//fprintf(stderr, "fractions length %d\n", length);
+                qsdo->gradientInfo->fractionsLength = length;
+
+                jfloat* jfractionsData = (jfloat*)(*env)->GetPrimitiveArrayCritical(env, fractionsArray, NULL);
+                if (jfractionsData != NULL)
+                {
+                    qsdo->gradientInfo->fractionsdata = (CGFloat *)malloc(sizeof(CGFloat) *length);
+                    jint i;
+                    for (i=0; i<length; i++)
+                    {
+                        qsdo->gradientInfo->fractionsdata[i] = jfractionsData[i];
+//fprintf(stderr, "jfrationsData[%d] %f, qsdo->gradientInfo->fractionsdata[%d] = %f\n", i, jfractionsData[i], i, qsdo->gradientInfo->fractionsdata[i]);
+                    }
+                    (*env)->ReleasePrimitiveArrayCritical(env, fractionsArray, jfractionsData, 0);
+                }
+            }    
+            break;
+        }
         case sun_java2d_OSXSurfaceData_kColorTexture:
         {
             qsdo->patternInfo = (StatePatternInfo*)malloc(sizeof(StatePatternInfo));
             if (qsdo->patternInfo == NULL)
             {

@@ -1068,17 +1191,27 @@
                 CGContextFillPath(qsdo->cgRef);
             }
             break;
 
         case SD_Shade:
+fprintf(stderr, "SD_Shade\n");
             if (CGContextIsPathEmpty(qsdo->cgRef) == 0)
             {
                 contextGradientPath(qsdo);
             }
             break;
 
+        case SD_Gradient:
+fprintf(stderr, "SD_Gradient\n");
+            if (CGContextIsPathEmpty(qsdo->cgRef) == 0)
+            {
+                contextQuartzGradientPath(qsdo);
+            }
+            break;
+
         case SD_Pattern:
+fprintf(stderr, "SD_Pattern\n");
             if (CGContextIsPathEmpty(qsdo->cgRef) == 0)
             {
                 //TODO:BG
                 //contextTexturePath(env, qsdo);
             }

@@ -1109,6 +1242,10 @@
 
     if (qsdo->shadingInfo != NULL) {
         gradientPaintReleaseFunction(qsdo->shadingInfo);
         qsdo->shadingInfo = NULL;
     }
+    if (qsdo->gradientInfo != NULL) {
+        gradientPaintReleaseFunction(qsdo->gradientInfo);
+        qsdo->gradientInfo = NULL;
+    }
 }