*** empty log message ***

10 files changed, 769 insertions, 2 deletions

diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.carbon.OS.properties b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.carbon.OS.properties
index fcb8645132..2aa07c6965 100644
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.carbon.OS.properties
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.carbon.OS.properties
@@ -12,6 +12,12 @@ org_eclipse_swt_internal_carbon_AEDesc=
 AEDesc_descriptorType=cast=(DescType)
 AEDesc_dataHandle=cast=(AEDataStorage)
 
+org_eclipse_swt_internal_carbon_ATSLayoutRecord=
+ATSLayoutRecord_glyphID=
+ATSLayoutRecord_flags=
+ATSLayoutRecord_originalOffset=
+ATSLayoutRecord_realPos=
+
 org_eclipse_swt_internal_carbon_ATSTrapezoid=
 ATSTrapezoid_upperLeft_x=accessor=upperLeft.x
 ATSTrapezoid_upperLeft_y=accessor=upperLeft.y
@@ -355,6 +361,18 @@ OS_ATSUCreateTextLayoutWithTextPtr_5=cast=(const UniCharCount *)
 OS_ATSUCreateTextLayoutWithTextPtr_6=cast=(ATSUStyle *)
 OS_ATSUCreateTextLayoutWithTextPtr_7=cast=(ATSUTextLayout *)
 
+OS_ATSUDirectGetLayoutDataArrayPtrFromTextLayout=
+OS_ATSUDirectGetLayoutDataArrayPtrFromTextLayout_0=cast=ATSUTextLayout
+OS_ATSUDirectGetLayoutDataArrayPtrFromTextLayout_1=cast=UniCharArrayOffset
+OS_ATSUDirectGetLayoutDataArrayPtrFromTextLayout_2=cast=ATSUDirectDataSelector
+OS_ATSUDirectGetLayoutDataArrayPtrFromTextLayout_3=cast=void *
+OS_ATSUDirectGetLayoutDataArrayPtrFromTextLayout_4=cast=ItemCount *
+
+OS_ATSUDirectReleaseLayoutDataArrayPtr=
+OS_ATSUDirectReleaseLayoutDataArrayPtr_0=cast=ATSULineRef
+OS_ATSUDirectReleaseLayoutDataArrayPtr_1=cast=ATSUDirectDataSelector
+OS_ATSUDirectReleaseLayoutDataArrayPtr_2=cast=void *
+
 OS_ATSUDisposeStyle=
 OS_ATSUDisposeStyle_0=cast=(ATSUStyle)
 
@@ -455,6 +473,16 @@ OS_ATSUGetUnjustifiedBounds_4=cast=ATSUTextMeasurement *
 OS_ATSUGetUnjustifiedBounds_5=cast=ATSUTextMeasurement *
 OS_ATSUGetUnjustifiedBounds_6=cast=ATSUTextMeasurement *
 
+OS_ATSUGlyphGetQuadraticPaths=
+OS_ATSUGlyphGetQuadraticPaths_0=cast=ATSUStyle
+OS_ATSUGlyphGetQuadraticPaths_1=cast=GlyphID
+OS_ATSUGlyphGetQuadraticPaths_2=cast=ATSQuadraticNewPathUPP
+OS_ATSUGlyphGetQuadraticPaths_3=cast=ATSQuadraticLineUPP
+OS_ATSUGlyphGetQuadraticPaths_4=cast=ATSQuadraticCurveUPP
+OS_ATSUGlyphGetQuadraticPaths_5=cast=ATSQuadraticClosePathUPP
+OS_ATSUGlyphGetQuadraticPaths_6=cast=void *
+OS_ATSUGlyphGetQuadraticPaths_7=cast=OSStatus *
+
 OS_ATSUHighlightText=
 OS_ATSUHighlightText_0=cast=ATSUTextLayout
 OS_ATSUHighlightText_1=cast=ATSUTextMeasurement
@@ -679,6 +707,41 @@ OS_CFURLGetFSRef=
 OS_CFURLGetFSRef_0=cast=(CFURLRef)
 OS_CFURLGetFSRef_1=cast=(struct FSRef *)
 
+OS_CGAffineTransformConcat=flags=no_gen
+OS_CGAffineTransformConcat_0=
+OS_CGAffineTransformConcat_1=
+OS_CGAffineTransformConcat_2=
+
+OS_CGAffineTransformInvert=flags=no_gen
+OS_CGAffineTransformInvert_0=
+OS_CGAffineTransformInvert_1=
+
+OS_CGAffineTransformMake=flags=no_gen
+OS_CGAffineTransformMake_0=
+OS_CGAffineTransformMake_1=
+OS_CGAffineTransformMake_2=
+OS_CGAffineTransformMake_3=
+OS_CGAffineTransformMake_4=
+OS_CGAffineTransformMake_5=
+OS_CGAffineTransformMake_6=
+
+OS_CGAffineTransformRotate=flags=no_gen
+OS_CGAffineTransformRotate_0=
+OS_CGAffineTransformRotate_1=
+OS_CGAffineTransformRotate_2=
+
+OS_CGAffineTransformScale=flags=no_gen
+OS_CGAffineTransformScale_0=
+OS_CGAffineTransformScale_1=
+OS_CGAffineTransformScale_2=
+OS_CGAffineTransformScale_3=
+
+OS_CGAffineTransformTranslate=flags=no_gen
+OS_CGAffineTransformTranslate_0=
+OS_CGAffineTransformTranslate_1=
+OS_CGAffineTransformTranslate_2=
+OS_CGAffineTransformTranslate_3=
+
 OS_CGBitmapContextCreate=
 OS_CGBitmapContextCreate_0=cast=(void *)
 OS_CGBitmapContextCreate_1=cast=(size_t)
@@ -720,6 +783,10 @@ OS_CGContextAddLines_0=cast=(CGContextRef)
 OS_CGContextAddLines_1=cast=(const CGPoint *)
 OS_CGContextAddLines_2=cast=(size_t)
 
+OS_CGContextAddPath=
+OS_CGContextAddPath_0=cast=(CGContextRef)
+OS_CGContextAddPath_1=cast=CGPathRef
+
 OS_CGContextBeginPath=
 OS_CGContextBeginPath_0=cast=(CGContextRef)
 
@@ -733,6 +800,10 @@ OS_CGContextClip_0=cast=(CGContextRef)
 OS_CGContextClosePath=
 OS_CGContextClosePath_0=cast=(CGContextRef)
 
+OS_CGContextConcatCTM=
+OS_CGContextConcatCTM_0=cast=(CGContextRef)
+OS_CGContextConcatCTM_1=cast=(CGAffineTransform *),flags=struct
+
 OS_CGContextDrawImage=
 OS_CGContextDrawImage_0=cast=(CGContextRef)
 OS_CGContextDrawImage_1=cast=(CGRect *),flags=struct
@@ -780,6 +851,10 @@ OS_CGContextSelectFont_1=cast=(const char *)
 OS_CGContextSelectFont_2=cast=(float)
 OS_CGContextSelectFont_3=cast=(CGTextEncoding)
 
+OS_CGContextSetAlpha=
+OS_CGContextSetAlpha_0=cast=(CGContextRef)
+OS_CGContextSetAlpha_1=
+
 OS_CGContextSetFillColor=
 OS_CGContextSetFillColor_0=cast=(CGContextRef)
 OS_CGContextSetFillColor_1=cast=(const float *)
@@ -960,6 +1035,80 @@ OS_CGImageGetWidth_0=cast=(CGImageRef)
 OS_CGImageRelease=
 OS_CGImageRelease_0=cast=(CGImageRef)
 
+OS_CGPathAddArc=
+OS_CGPathAddArc_0=cast=CGMutablePathRef
+OS_CGPathAddArc_1=cast=(const CGAffineTransform *)
+OS_CGPathAddArc_2=
+OS_CGPathAddArc_3=
+OS_CGPathAddArc_4=
+OS_CGPathAddArc_5=
+OS_CGPathAddArc_6=
+OS_CGPathAddArc_7=
+
+OS_CGPathAddCurveToPoint=
+OS_CGPathAddCurveToPoint_0=cast=(CGMutablePathRef)
+OS_CGPathAddCurveToPoint_1=cast=(const CGAffineTransform *)
+OS_CGPathAddCurveToPoint_2=
+OS_CGPathAddCurveToPoint_3=
+OS_CGPathAddCurveToPoint_4=
+OS_CGPathAddCurveToPoint_5=
+OS_CGPathAddCurveToPoint_6=
+OS_CGPathAddCurveToPoint_7=
+
+OS_CGPathAddLineToPoint=
+OS_CGPathAddLineToPoint_0=cast=CGMutablePathRef
+OS_CGPathAddLineToPoint_1=cast=const CGAffineTransform *
+OS_CGPathAddLineToPoint_2=
+OS_CGPathAddLineToPoint_3=
+
+OS_CGPathAddPath=
+OS_CGPathAddPath_0=cast=(CGMutablePathRef)
+OS_CGPathAddPath_1=cast=const CGAffineTransform *
+OS_CGPathAddPath_2=cast=CGPathRef
+
+OS_CGPathAddQuadCurveToPoint=
+OS_CGPathAddQuadCurveToPoint_0=cast=(CGMutablePathRef)
+OS_CGPathAddQuadCurveToPoint_1=cast=(const CGAffineTransform *)
+OS_CGPathAddQuadCurveToPoint_2=
+OS_CGPathAddQuadCurveToPoint_3=
+OS_CGPathAddQuadCurveToPoint_4=
+OS_CGPathAddQuadCurveToPoint_5=
+
+OS_CGPathAddRect=
+OS_CGPathAddRect_0=cast=(CGMutablePathRef)
+OS_CGPathAddRect_1=cast=const CGAffineTransform *
+OS_CGPathAddRect_2=flags=struct
+
+OS_CGPathCloseSubpath=
+OS_CGPathCloseSubpath_0=cast=(CGMutablePathRef)
+
+OS_CGPathCreateMutable=
+
+OS_CGPathGetBoundingBox=flags=no_gen
+OS_CGPathGetBoundingBox_0=cast=CGPathRef
+OS_CGPathGetBoundingBox_1=
+
+OS_CGPathGetCurrentPoint=flags=no_gen
+OS_CGPathGetCurrentPoint_0=cast=CGPathRef
+OS_CGPathGetCurrentPoint_1=
+
+OS_CGPathIsEmpty=
+OS_CGPathIsEmpty_0=cast=CGPathRef
+
+OS_CGPathMoveToPoint=
+OS_CGPathMoveToPoint_0=cast=CGMutablePathRef
+OS_CGPathMoveToPoint_1=cast=const CGAffineTransform *
+OS_CGPathMoveToPoint_2=
+OS_CGPathMoveToPoint_3=
+
+OS_CGPathRelease=
+OS_CGPathRelease_0=cast=CGPathRef
+
+OS_CGPointApplyAffineTransform=flags=no_gen
+OS_CGPointApplyAffineTransform_0=
+OS_CGPointApplyAffineTransform_1=
+OS_CGPointApplyAffineTransform_2=
+
 OS_CGPostKeyboardEvent=
 OS_CGPostKeyboardEvent_0=cast=(CGCharCode)
 OS_CGPostKeyboardEvent_1=cast=CGKeyCode
@@ -1512,6 +1661,9 @@ OS_FindWindow_1=cast=(WindowRef *)
 OS_Fix2Long=
 OS_Fix2Long_0=
 
+OS_Fix2X=
+OS_Fix2X_0=cast=Fixed
+
 OS_FrameOval=
 OS_FrameOval_0=cast=(const Rect *)
 
@@ -2859,6 +3011,12 @@ OS_QDLocalToGlobalPoint=
 OS_QDLocalToGlobalPoint_0=cast=(CGrafPtr)
 OS_QDLocalToGlobalPoint_1=cast=(Point *)
 
+OS_QDRegionToRects=
+OS_QDRegionToRects_0=cast=RgnHandle
+OS_QDRegionToRects_1=cast=QDRegionParseDirection
+OS_QDRegionToRects_2=cast=RegionToRectsUPP
+OS_QDRegionToRects_3=cast=void *
+
 OS_QDSetDirtyRegion=
 OS_QDSetDirtyRegion_0=cast=(CGrafPtr)
 OS_QDSetDirtyRegion_1=cast=(RgnHandle)
@@ -3757,6 +3915,11 @@ OS_memcpy__I_3II_0=cast=(void *)
 OS_memcpy__I_3II_1=cast=(const void *),flags=critical no_out
 OS_memcpy__I_3II_2=cast=(size_t)
 
+OS_memcpy__Lorg_eclipse_swt_internal_carbon_ATSLayoutRecord_2II=
+OS_memcpy__Lorg_eclipse_swt_internal_carbon_ATSLayoutRecord_2II_0=cast=(void *),flags=no_in
+OS_memcpy__Lorg_eclipse_swt_internal_carbon_ATSLayoutRecord_2II_1=cast=(const void *)
+OS_memcpy__Lorg_eclipse_swt_internal_carbon_ATSLayoutRecord_2II_2=cast=(size_t)
+
 OS_memcpy__Lorg_eclipse_swt_internal_carbon_ATSTrapezoid_2II=
 OS_memcpy__Lorg_eclipse_swt_internal_carbon_ATSTrapezoid_2II_0=cast=(void *),flags=no_in
 OS_memcpy__Lorg_eclipse_swt_internal_carbon_ATSTrapezoid_2II_1=cast=(const void *)
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.win32.OS.properties b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.win32.OS.properties
index 754b67b854..5c0908b7a5 100644
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.win32.OS.properties
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.win32.OS.properties
@@ -1171,6 +1171,11 @@ OS_ExtCreatePen_2=cast=CONST LOGBRUSH *
 OS_ExtCreatePen_3=
 OS_ExtCreatePen_4=cast=CONST DWORD *
 
+OS_ExtCreateRegion=
+OS_ExtCreateRegion_0=cast=XFORM *
+OS_ExtCreateRegion_1=
+OS_ExtCreateRegion_2=cast=CONST RGNDATA *
+
 OS_ExtTextOutA=
 OS_ExtTextOutA_0=cast=(HDC)
 OS_ExtTextOutA_1=
@@ -1765,6 +1770,10 @@ OS_GetWindowThreadProcessId=
 OS_GetWindowThreadProcessId_0=cast=(HWND)
 OS_GetWindowThreadProcessId_1=cast=(LPDWORD)
 
+OS_GetWorldTransform=
+OS_GetWorldTransform_0=cast=HDC
+OS_GetWorldTransform_1=cast=LPXFORM
+
 OS_GlobalAlloc=
 OS_GlobalAlloc_0=
 OS_GlobalAlloc_1=
@@ -3180,6 +3189,10 @@ OS_SetFocus_0=cast=(HWND)
 OS_SetForegroundWindow=
 OS_SetForegroundWindow_0=cast=(HWND)
 
+OS_SetGraphicsMode=
+OS_SetGraphicsMode_0=cast=HDC
+OS_SetGraphicsMode_1=
+
 OS_SetLayout=flags=dynamic
 OS_SetLayout_0=cast=(HDC)
 OS_SetLayout_1=cast=(DWORD)
@@ -3315,6 +3328,10 @@ OS_SetWindowsHookExW_1=cast=(HOOKPROC)
 OS_SetWindowsHookExW_2=cast=(HINSTANCE)
 OS_SetWindowsHookExW_3=
 
+OS_SetWorldTransform=
+OS_SetWorldTransform_0=cast=HDC
+OS_SetWorldTransform_1=cast=XFORM *
+
 OS_ShellExecuteExA=
 OS_ShellExecuteExA_0=
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.c
index 89d692cfec..794015af1c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.c
@@ -161,6 +161,37 @@ fail:
 }
 #endif
 
+#ifndef NO_ATSUDirectGetLayoutDataArrayPtrFromTextLayout
+JNIEXPORT jint JNICALL OS_NATIVE(ATSUDirectGetLayoutDataArrayPtrFromTextLayout)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3, jintArray arg4)
+{
+	jint *lparg3=NULL;
+	jint *lparg4=NULL;
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, ATSUDirectGetLayoutDataArrayPtrFromTextLayout_FUNC);
+	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
+	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
+	rc = (jint)ATSUDirectGetLayoutDataArrayPtrFromTextLayout((ATSUTextLayout)arg0, (UniCharArrayOffset)arg1, (ATSUDirectDataSelector)arg2, (void *)lparg3, (ItemCount *)lparg4);
+fail:
+	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
+	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
+	OS_NATIVE_EXIT(env, that, ATSUDirectGetLayoutDataArrayPtrFromTextLayout_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_ATSUDirectReleaseLayoutDataArrayPtr
+JNIEXPORT jint JNICALL OS_NATIVE(ATSUDirectReleaseLayoutDataArrayPtr)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, ATSUDirectReleaseLayoutDataArrayPtr_FUNC);
+	rc = (jint)ATSUDirectReleaseLayoutDataArrayPtr((ATSULineRef)arg0, (ATSUDirectDataSelector)arg1, (void *)arg2);
+	OS_NATIVE_EXIT(env, that, ATSUDirectReleaseLayoutDataArrayPtr_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_ATSUDisposeStyle
 JNIEXPORT jint JNICALL OS_NATIVE(ATSUDisposeStyle)
 	(JNIEnv *env, jclass that, jint arg0)
@@ -386,6 +417,22 @@ fail:
 }
 #endif
 
+#ifndef NO_ATSUGlyphGetQuadraticPaths
+JNIEXPORT jint JNICALL OS_NATIVE(ATSUGlyphGetQuadraticPaths)
+	(JNIEnv *env, jclass that, jint arg0, jshort arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jintArray arg7)
+{
+	jint *lparg7=NULL;
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, ATSUGlyphGetQuadraticPaths_FUNC);
+	if (arg7) if ((lparg7 = (*env)->GetIntArrayElements(env, arg7, NULL)) == NULL) goto fail;
+	rc = (jint)ATSUGlyphGetQuadraticPaths((ATSUStyle)arg0, (GlyphID)arg1, (ATSQuadraticNewPathUPP)arg2, (ATSQuadraticLineUPP)arg3, (ATSQuadraticCurveUPP)arg4, (ATSQuadraticClosePathUPP)arg5, (void *)arg6, (OSStatus *)lparg7);
+fail:
+	if (arg7 && lparg7) (*env)->ReleaseIntArrayElements(env, arg7, lparg7, 0);
+	OS_NATIVE_EXIT(env, that, ATSUGlyphGetQuadraticPaths_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_ATSUHighlightText
 JNIEXPORT jint JNICALL OS_NATIVE(ATSUHighlightText)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
@@ -1088,6 +1135,16 @@ fail:
 }
 #endif
 
+#ifndef NO_CGContextAddPath
+JNIEXPORT void JNICALL OS_NATIVE(CGContextAddPath)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+{
+	OS_NATIVE_ENTER(env, that, CGContextAddPath_FUNC);
+	CGContextAddPath((CGContextRef)arg0, (CGPathRef)arg1);
+	OS_NATIVE_EXIT(env, that, CGContextAddPath_FUNC);
+}
+#endif
+
 #ifndef NO_CGContextBeginPath
 JNIEXPORT void JNICALL OS_NATIVE(CGContextBeginPath)
 	(JNIEnv *env, jclass that, jint arg0)
@@ -1132,6 +1189,20 @@ JNIEXPORT void JNICALL OS_NATIVE(CGContextClosePath)
 }
 #endif
 
+#ifndef NO_CGContextConcatCTM
+JNIEXPORT void JNICALL OS_NATIVE(CGContextConcatCTM)
+	(JNIEnv *env, jclass that, jint arg0, jfloatArray arg1)
+{
+	jfloat *lparg1=NULL;
+	OS_NATIVE_ENTER(env, that, CGContextConcatCTM_FUNC);
+	if (arg1) if ((lparg1 = (*env)->GetFloatArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	CGContextConcatCTM((CGContextRef)arg0, *(CGAffineTransform *)lparg1);
+fail:
+	if (arg1 && lparg1) (*env)->ReleaseFloatArrayElements(env, arg1, lparg1, 0);
+	OS_NATIVE_EXIT(env, that, CGContextConcatCTM_FUNC);
+}
+#endif
+
 #ifndef NO_CGContextDrawImage
 JNIEXPORT void JNICALL OS_NATIVE(CGContextDrawImage)
 	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
@@ -1254,6 +1325,16 @@ fail:
 }
 #endif
 
+#ifndef NO_CGContextSetAlpha
+JNIEXPORT void JNICALL OS_NATIVE(CGContextSetAlpha)
+	(JNIEnv *env, jclass that, jint arg0, jfloat arg1)
+{
+	OS_NATIVE_ENTER(env, that, CGContextSetAlpha_FUNC);
+	CGContextSetAlpha((CGContextRef)arg0, arg1);
+	OS_NATIVE_EXIT(env, that, CGContextSetAlpha_FUNC);
+}
+#endif
+
 #ifndef NO_CGContextSetFillColor
 JNIEXPORT void JNICALL OS_NATIVE(CGContextSetFillColor)
 	(JNIEnv *env, jclass that, jint arg0, jfloatArray arg1)
@@ -1764,6 +1845,151 @@ JNIEXPORT void JNICALL OS_NATIVE(CGImageRelease)
 }
 #endif
 
+#ifndef NO_CGPathAddArc
+JNIEXPORT void JNICALL OS_NATIVE(CGPathAddArc)
+	(JNIEnv *env, jclass that, jint arg0, jfloatArray arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5, jfloat arg6, jboolean arg7)
+{
+	jfloat *lparg1=NULL;
+	OS_NATIVE_ENTER(env, that, CGPathAddArc_FUNC);
+	if (arg1) if ((lparg1 = (*env)->GetFloatArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	CGPathAddArc((CGMutablePathRef)arg0, (const CGAffineTransform *)lparg1, arg2, arg3, arg4, arg5, arg6, arg7);
+fail:
+	if (arg1 && lparg1) (*env)->ReleaseFloatArrayElements(env, arg1, lparg1, 0);
+	OS_NATIVE_EXIT(env, that, CGPathAddArc_FUNC);
+}
+#endif
+
+#ifndef NO_CGPathAddCurveToPoint
+JNIEXPORT void JNICALL OS_NATIVE(CGPathAddCurveToPoint)
+	(JNIEnv *env, jclass that, jint arg0, jfloatArray arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5, jfloat arg6, jfloat arg7)
+{
+	jfloat *lparg1=NULL;
+	OS_NATIVE_ENTER(env, that, CGPathAddCurveToPoint_FUNC);
+	if (arg1) if ((lparg1 = (*env)->GetFloatArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	CGPathAddCurveToPoint((CGMutablePathRef)arg0, (const CGAffineTransform *)lparg1, arg2, arg3, arg4, arg5, arg6, arg7);
+fail:
+	if (arg1 && lparg1) (*env)->ReleaseFloatArrayElements(env, arg1, lparg1, 0);
+	OS_NATIVE_EXIT(env, that, CGPathAddCurveToPoint_FUNC);
+}
+#endif
+
+#ifndef NO_CGPathAddLineToPoint
+JNIEXPORT void JNICALL OS_NATIVE(CGPathAddLineToPoint)
+	(JNIEnv *env, jclass that, jint arg0, jfloatArray arg1, jfloat arg2, jfloat arg3)
+{
+	jfloat *lparg1=NULL;
+	OS_NATIVE_ENTER(env, that, CGPathAddLineToPoint_FUNC);
+	if (arg1) if ((lparg1 = (*env)->GetFloatArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	CGPathAddLineToPoint((CGMutablePathRef)arg0, (const CGAffineTransform *)lparg1, arg2, arg3);
+fail:
+	if (arg1 && lparg1) (*env)->ReleaseFloatArrayElements(env, arg1, lparg1, 0);
+	OS_NATIVE_EXIT(env, that, CGPathAddLineToPoint_FUNC);
+}
+#endif
+
+#ifndef NO_CGPathAddPath
+JNIEXPORT void JNICALL OS_NATIVE(CGPathAddPath)
+	(JNIEnv *env, jclass that, jint arg0, jfloatArray arg1, jint arg2)
+{
+	jfloat *lparg1=NULL;
+	OS_NATIVE_ENTER(env, that, CGPathAddPath_FUNC);
+	if (arg1) if ((lparg1 = (*env)->GetFloatArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	CGPathAddPath((CGMutablePathRef)arg0, (const CGAffineTransform *)lparg1, (CGPathRef)arg2);
+fail:
+	if (arg1 && lparg1) (*env)->ReleaseFloatArrayElements(env, arg1, lparg1, 0);
+	OS_NATIVE_EXIT(env, that, CGPathAddPath_FUNC);
+}
+#endif
+
+#ifndef NO_CGPathAddQuadCurveToPoint
+JNIEXPORT void JNICALL OS_NATIVE(CGPathAddQuadCurveToPoint)
+	(JNIEnv *env, jclass that, jint arg0, jfloatArray arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5)
+{
+	jfloat *lparg1=NULL;
+	OS_NATIVE_ENTER(env, that, CGPathAddQuadCurveToPoint_FUNC);
+	if (arg1) if ((lparg1 = (*env)->GetFloatArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	CGPathAddQuadCurveToPoint((CGMutablePathRef)arg0, (const CGAffineTransform *)lparg1, arg2, arg3, arg4, arg5);
+fail:
+	if (arg1 && lparg1) (*env)->ReleaseFloatArrayElements(env, arg1, lparg1, 0);
+	OS_NATIVE_EXIT(env, that, CGPathAddQuadCurveToPoint_FUNC);
+}
+#endif
+
+#ifndef NO_CGPathAddRect
+JNIEXPORT void JNICALL OS_NATIVE(CGPathAddRect)
+	(JNIEnv *env, jclass that, jint arg0, jfloatArray arg1, jobject arg2)
+{
+	jfloat *lparg1=NULL;
+	CGRect _arg2, *lparg2=NULL;
+	OS_NATIVE_ENTER(env, that, CGPathAddRect_FUNC);
+	if (arg1) if ((lparg1 = (*env)->GetFloatArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = getCGRectFields(env, arg2, &_arg2)) == NULL) goto fail;
+	CGPathAddRect((CGMutablePathRef)arg0, (const CGAffineTransform *)lparg1, *lparg2);
+fail:
+	if (arg2 && lparg2) setCGRectFields(env, arg2, lparg2);
+	if (arg1 && lparg1) (*env)->ReleaseFloatArrayElements(env, arg1, lparg1, 0);
+	OS_NATIVE_EXIT(env, that, CGPathAddRect_FUNC);
+}
+#endif
+
+#ifndef NO_CGPathCloseSubpath
+JNIEXPORT void JNICALL OS_NATIVE(CGPathCloseSubpath)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	OS_NATIVE_ENTER(env, that, CGPathCloseSubpath_FUNC);
+	CGPathCloseSubpath((CGMutablePathRef)arg0);
+	OS_NATIVE_EXIT(env, that, CGPathCloseSubpath_FUNC);
+}
+#endif
+
+#ifndef NO_CGPathCreateMutable
+JNIEXPORT jint JNICALL OS_NATIVE(CGPathCreateMutable)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, CGPathCreateMutable_FUNC);
+	rc = (jint)CGPathCreateMutable();
+	OS_NATIVE_EXIT(env, that, CGPathCreateMutable_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_CGPathIsEmpty
+JNIEXPORT jboolean JNICALL OS_NATIVE(CGPathIsEmpty)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jboolean rc = 0;
+	OS_NATIVE_ENTER(env, that, CGPathIsEmpty_FUNC);
+	rc = (jboolean)CGPathIsEmpty((CGPathRef)arg0);
+	OS_NATIVE_EXIT(env, that, CGPathIsEmpty_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_CGPathMoveToPoint
+JNIEXPORT void JNICALL OS_NATIVE(CGPathMoveToPoint)
+	(JNIEnv *env, jclass that, jint arg0, jfloatArray arg1, jfloat arg2, jfloat arg3)
+{
+	jfloat *lparg1=NULL;
+	OS_NATIVE_ENTER(env, that, CGPathMoveToPoint_FUNC);
+	if (arg1) if ((lparg1 = (*env)->GetFloatArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	CGPathMoveToPoint((CGMutablePathRef)arg0, (const CGAffineTransform *)lparg1, arg2, arg3);
+fail:
+	if (arg1 && lparg1) (*env)->ReleaseFloatArrayElements(env, arg1, lparg1, 0);
+	OS_NATIVE_EXIT(env, that, CGPathMoveToPoint_FUNC);
+}
+#endif
+
+#ifndef NO_CGPathRelease
+JNIEXPORT void JNICALL OS_NATIVE(CGPathRelease)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	OS_NATIVE_ENTER(env, that, CGPathRelease_FUNC);
+	CGPathRelease((CGPathRef)arg0);
+	OS_NATIVE_EXIT(env, that, CGPathRelease_FUNC);
+}
+#endif
+
 #ifndef NO_CGPostKeyboardEvent
 JNIEXPORT jint JNICALL OS_NATIVE(CGPostKeyboardEvent)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2)
@@ -3458,6 +3684,18 @@ JNIEXPORT jint JNICALL OS_NATIVE(Fix2Long)
 }
 #endif
 
+#ifndef NO_Fix2X
+JNIEXPORT jdouble JNICALL OS_NATIVE(Fix2X)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jdouble rc = 0;
+	OS_NATIVE_ENTER(env, that, Fix2X_FUNC);
+	rc = (jdouble)Fix2X((Fixed)arg0);
+	OS_NATIVE_EXIT(env, that, Fix2X_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_FrameOval
 JNIEXPORT void JNICALL OS_NATIVE(FrameOval)
 	(JNIEnv *env, jclass that, jobject arg0)
@@ -7936,6 +8174,18 @@ fail:
 }
 #endif
 
+#ifndef NO_QDRegionToRects
+JNIEXPORT jint JNICALL OS_NATIVE(QDRegionToRects)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, QDRegionToRects_FUNC);
+	rc = (jint)QDRegionToRects((RgnHandle)arg0, (QDRegionParseDirection)arg1, (RegionToRectsUPP)arg2, (void *)arg3);
+	OS_NATIVE_EXIT(env, that, QDRegionToRects_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_QDSetDirtyRegion
 JNIEXPORT jint JNICALL OS_NATIVE(QDSetDirtyRegion)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1)
@@ -10534,6 +10784,20 @@ fail:
 }
 #endif
 
+#ifndef NO_memcpy__Lorg_eclipse_swt_internal_carbon_ATSLayoutRecord_2II
+JNIEXPORT void JNICALL OS_NATIVE(memcpy__Lorg_eclipse_swt_internal_carbon_ATSLayoutRecord_2II)
+	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+{
+	ATSLayoutRecord _arg0, *lparg0=NULL;
+	OS_NATIVE_ENTER(env, that, memcpy__Lorg_eclipse_swt_internal_carbon_ATSLayoutRecord_2II_FUNC);
+	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
+	memcpy((void *)lparg0, (const void *)arg1, (size_t)arg2);
+fail:
+	if (arg0 && lparg0) setATSLayoutRecordFields(env, arg0, lparg0);
+	OS_NATIVE_EXIT(env, that, memcpy__Lorg_eclipse_swt_internal_carbon_ATSLayoutRecord_2II_FUNC);
+}
+#endif
+
 #ifndef NO_memcpy__Lorg_eclipse_swt_internal_carbon_ATSTrapezoid_2II
 JNIEXPORT void JNICALL OS_NATIVE(memcpy__Lorg_eclipse_swt_internal_carbon_ATSTrapezoid_2II)
 	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_custom.c b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_custom.c
index b939d12c36..de6918b312 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_custom.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_custom.c
@@ -15,6 +15,109 @@
 
 #define OS_NATIVE(func) Java_org_eclipse_swt_internal_carbon_OS_##func
 
+
+#ifndef NO_CGAffineTransformConcat
+JNIEXPORT void JNICALL OS_NATIVE(CGAffineTransformConcat)
+	(JNIEnv *env, jclass that, jfloatArray arg0, jfloatArray arg1, jfloatArray arg2)
+{
+	jfloat *lparg0=NULL;
+	jfloat *lparg1=NULL;
+	jfloat *lparg2=NULL;
+	OS_NATIVE_ENTER(env, that, CGAffineTransformConcat_FUNC);
+	if (arg0) if ((lparg0 = (*env)->GetFloatArrayElements(env, arg0, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = (*env)->GetFloatArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = (*env)->GetFloatArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	*(CGAffineTransform *)lparg2 = CGAffineTransformConcat(*(CGAffineTransform *)lparg0, *(CGAffineTransform *)lparg1);
+fail:
+	if (arg2 && lparg2) (*env)->ReleaseFloatArrayElements(env, arg2, lparg2, 0);
+	if (arg1 && lparg1) (*env)->ReleaseFloatArrayElements(env, arg1, lparg1, JNI_ABORT);
+	if (arg0 && lparg0) (*env)->ReleaseFloatArrayElements(env, arg0, lparg0, JNI_ABORT);
+	OS_NATIVE_EXIT(env, that, CGAffineTransformConcat_FUNC);
+}
+#endif
+
+#ifndef NO_CGAffineTransformInvert
+JNIEXPORT void JNICALL OS_NATIVE(CGAffineTransformInvert)
+	(JNIEnv *env, jclass that, jfloatArray arg0, jfloatArray arg1)
+{
+	jfloat *lparg0=NULL;
+	jfloat *lparg1=NULL;
+	OS_NATIVE_ENTER(env, that, CGAffineTransformInvert_FUNC);
+	if (arg0) if ((lparg0 = (*env)->GetFloatArrayElements(env, arg0, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = (*env)->GetFloatArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	*(CGAffineTransform *)lparg1 = CGAffineTransformInvert(*(CGAffineTransform *)lparg0);
+fail:
+	if (arg1 && lparg1) (*env)->ReleaseFloatArrayElements(env, arg1, lparg1, 0);
+	if (arg0 && lparg0) (*env)->ReleaseFloatArrayElements(env, arg0, lparg0, JNI_ABORT);
+	OS_NATIVE_EXIT(env, that, CGAffineTransformInvert_FUNC);
+}
+#endif
+
+#ifndef NO_CGAffineTransformMake
+JNIEXPORT void JNICALL OS_NATIVE(CGAffineTransformMake)
+	(JNIEnv *env, jclass that, jfloat arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5, jfloatArray arg6)
+{
+	jfloat *lparg6=NULL;
+	OS_NATIVE_ENTER(env, that, CGAffineTransformMake_FUNC);
+	if (arg6) if ((lparg6 = (*env)->GetFloatArrayElements(env, arg6, NULL)) == NULL) goto fail;
+	*(CGAffineTransform *)lparg6 = CGAffineTransformMake(arg0, arg1, arg2, arg3, arg4, arg5);
+fail:
+	if (arg6 && lparg6) (*env)->ReleaseFloatArrayElements(env, arg6, lparg6, 0);
+	OS_NATIVE_EXIT(env, that, CGAffineTransformMake_FUNC);
+}
+#endif
+
+#ifndef NO_CGAffineTransformRotate
+JNIEXPORT void JNICALL OS_NATIVE(CGAffineTransformRotate)
+	(JNIEnv *env, jclass that, jfloatArray arg0, jfloat arg1, jfloatArray arg2)
+{
+	jfloat *lparg0=NULL;
+	jfloat *lparg2=NULL;
+	OS_NATIVE_ENTER(env, that, CGAffineTransformRotate_FUNC);
+	if (arg0) if ((lparg0 = (*env)->GetFloatArrayElements(env, arg0, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = (*env)->GetFloatArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	*(CGAffineTransform *)lparg2 = CGAffineTransformRotate(*(CGAffineTransform *)lparg0, arg1);
+fail:
+	if (arg2 && lparg2) (*env)->ReleaseFloatArrayElements(env, arg2, lparg2, 0);
+	if (arg0 && lparg0) (*env)->ReleaseFloatArrayElements(env, arg0, lparg0, JNI_ABORT);
+	OS_NATIVE_EXIT(env, that, CGAffineTransformRotate_FUNC);
+}
+#endif
+
+#ifndef NO_CGAffineTransformScale
+JNIEXPORT void JNICALL OS_NATIVE(CGAffineTransformScale)
+	(JNIEnv *env, jclass that, jfloatArray arg0, jfloat arg1, jfloat arg2, jfloatArray arg3)
+{
+	jfloat *lparg0=NULL;
+	jfloat *lparg3=NULL;
+	OS_NATIVE_ENTER(env, that, CGAffineTransformScale_FUNC);
+	if (arg0) if ((lparg0 = (*env)->GetFloatArrayElements(env, arg0, NULL)) == NULL) goto fail;
+	if (arg3) if ((lparg3 = (*env)->GetFloatArrayElements(env, arg3, NULL)) == NULL) goto fail;
+	*(CGAffineTransform *)lparg3 = CGAffineTransformScale(*(CGAffineTransform *)lparg0, arg1, arg2);
+fail:
+	if (arg3 && lparg3) (*env)->ReleaseFloatArrayElements(env, arg3, lparg3, 0);
+	if (arg0 && lparg0) (*env)->ReleaseFloatArrayElements(env, arg0, lparg0, JNI_ABORT);
+	OS_NATIVE_EXIT(env, that, CGAffineTransformScale_FUNC);
+}
+#endif
+
+#ifndef NO_CGAffineTransformTranslate
+JNIEXPORT void JNICALL OS_NATIVE(CGAffineTransformTranslate)
+	(JNIEnv *env, jclass that, jfloatArray arg0, jfloat arg1, jfloat arg2, jfloatArray arg3)
+{
+	jfloat *lparg0=NULL;
+	jfloat *lparg3=NULL;
+	OS_NATIVE_ENTER(env, that, CGAffineTransformTranslate_FUNC);
+	if (arg0) if ((lparg0 = (*env)->GetFloatArrayElements(env, arg0, NULL)) == NULL) goto fail;
+	if (arg3) if ((lparg3 = (*env)->GetFloatArrayElements(env, arg3, NULL)) == NULL) goto fail;
+	*(CGAffineTransform *)lparg3 = CGAffineTransformTranslate(*(CGAffineTransform *)lparg0, arg1, arg2);
+fail:
+	if (arg3 && lparg3) (*env)->ReleaseFloatArrayElements(env, arg3, lparg3, 0);
+	if (arg0 && lparg0) (*env)->ReleaseFloatArrayElements(env, arg0, lparg0, JNI_ABORT);
+	OS_NATIVE_EXIT(env, that, CGAffineTransformTranslate_FUNC);
+}
+#endif
+
 #ifndef NO_CGContextGetTextPosition
 JNIEXPORT void JNICALL OS_NATIVE(CGContextGetTextPosition)
 	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
@@ -28,3 +131,50 @@ failTag:
 	OS_NATIVE_EXIT(env, that, CGContextGetTextPosition_FUNC)
 }
 #endif
+
+#ifndef NO_CGPathGetBoundingBox
+JNIEXPORT void JNICALL OS_NATIVE(CGPathGetBoundingBox)
+	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+{
+	CGRect _arg1, *lparg1=NULL;
+	OS_NATIVE_ENTER(env, that, CGPathGetBoundingBox_FUNC);
+	if (arg1) if ((lparg1 = getCGRectFields(env, arg1, &_arg1)) == NULL) goto fail;
+	*lparg1 = CGPathGetBoundingBox((CGPathRef)arg0);
+fail:
+	if (arg1 && lparg1) setCGRectFields(env, arg1, lparg1);
+	OS_NATIVE_EXIT(env, that, CGPathGetBoundingBox_FUNC);
+}
+#endif
+
+#ifndef NO_CGPathGetCurrentPoint
+JNIEXPORT void JNICALL OS_NATIVE(CGPathGetCurrentPoint)
+	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+{
+	CGPoint _arg1, *lparg1=NULL;
+	OS_NATIVE_ENTER(env, that, CGPathGetCurrentPoint_FUNC);
+	if (arg1) if ((lparg1 = getCGPointFields(env, arg1, &_arg1)) == NULL) goto fail;
+	*lparg1 = CGPathGetCurrentPoint((CGPathRef)arg0);
+fail:
+	if (arg1 && lparg1) setCGPointFields(env, arg1, lparg1);
+	OS_NATIVE_EXIT(env, that, CGPathGetCurrentPoint_FUNC);
+}
+#endif
+
+#ifndef NO_CGPointApplyAffineTransform
+JNIEXPORT void JNICALL OS_NATIVE(CGPointApplyAffineTransform)
+	(JNIEnv *env, jclass that, jobject arg0, jfloatArray arg1, jobject arg2)
+{
+	CGPoint _arg0, *lparg0=NULL;
+	jfloat *lparg1=NULL;
+	CGPoint _arg2, *lparg2=NULL;
+	OS_NATIVE_ENTER(env, that, CGPointApplyAffineTransform_FUNC);
+	if (arg0) if ((lparg0 = getCGPointFields(env, arg0, &_arg0)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = (*env)->GetFloatArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = getCGPointFields(env, arg2, &_arg2)) == NULL) goto fail;
+	*(CGPoint *)lparg2 = CGPointApplyAffineTransform(*(CGPoint *)lparg0, *(CGAffineTransform *)lparg1);
+fail:
+	if (arg2 && lparg2) setCGPointFields(env, arg2, lparg2);
+	if (arg1 && lparg1) (*env)->ReleaseFloatArrayElements(env, arg1, lparg1, JNI_ABORT);
+	OS_NATIVE_EXIT(env, that, CGPointApplyAffineTransform_FUNC);
+}
+#endif
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_stats.c
index 4a388c5a07..9f768551ad 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_stats.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_stats.c
@@ -14,8 +14,8 @@
 
 #ifdef NATIVE_STATS
 
-int OS_nativeFunctionCount = 762;
-int OS_nativeFunctionCallCount[762];
+int OS_nativeFunctionCount = 791;
+int OS_nativeFunctionCallCount[791];
 char * OS_nativeFunctionNames[] = {
 	"AECountItems",
 	"AEGetNthPtr",
@@ -25,6 +25,8 @@ char * OS_nativeFunctionNames[] = {
 	"ATSUCreateStyle",
 	"ATSUCreateTextLayout",
 	"ATSUCreateTextLayoutWithTextPtr",
+	"ATSUDirectGetLayoutDataArrayPtrFromTextLayout",
+	"ATSUDirectReleaseLayoutDataArrayPtr",
 	"ATSUDisposeStyle",
 	"ATSUDisposeTextLayout",
 	"ATSUDrawText",
@@ -38,6 +40,7 @@ char * OS_nativeFunctionNames[] = {
 	"ATSUGetSoftLineBreaks",
 	"ATSUGetTextHighlight",
 	"ATSUGetUnjustifiedBounds",
+	"ATSUGlyphGetQuadraticPaths",
 	"ATSUHighlightText",
 	"ATSUNextCursorPosition",
 	"ATSUOffsetToPosition",
@@ -81,6 +84,12 @@ char * OS_nativeFunctionNames[] = {
 	"CFURLCreateFromFSRef",
 	"CFURLCreateWithFileSystemPath",
 	"CFURLGetFSRef",
+	"CGAffineTransformConcat",
+	"CGAffineTransformInvert",
+	"CGAffineTransformMake",
+	"CGAffineTransformRotate",
+	"CGAffineTransformScale",
+	"CGAffineTransformTranslate",
 	"CGBitmapContextCreate",
 	"CGColorSpaceCreateDeviceRGB",
 	"CGColorSpaceRelease",
@@ -88,10 +97,12 @@ char * OS_nativeFunctionNames[] = {
 	"CGContextAddArcToPoint",
 	"CGContextAddLineToPoint",
 	"CGContextAddLines",
+	"CGContextAddPath",
 	"CGContextBeginPath",
 	"CGContextClearRect",
 	"CGContextClip",
 	"CGContextClosePath",
+	"CGContextConcatCTM",
 	"CGContextDrawImage",
 	"CGContextEOFillPath",
 	"CGContextFillPath",
@@ -104,6 +115,7 @@ char * OS_nativeFunctionNames[] = {
 	"CGContextSaveGState",
 	"CGContextScaleCTM",
 	"CGContextSelectFont",
+	"CGContextSetAlpha",
 	"CGContextSetFillColor",
 	"CGContextSetFillColorSpace",
 	"CGContextSetFont",
@@ -147,6 +159,20 @@ char * OS_nativeFunctionNames[] = {
 	"CGImageGetHeight",
 	"CGImageGetWidth",
 	"CGImageRelease",
+	"CGPathAddArc",
+	"CGPathAddCurveToPoint",
+	"CGPathAddLineToPoint",
+	"CGPathAddPath",
+	"CGPathAddQuadCurveToPoint",
+	"CGPathAddRect",
+	"CGPathCloseSubpath",
+	"CGPathCreateMutable",
+	"CGPathGetBoundingBox",
+	"CGPathGetCurrentPoint",
+	"CGPathIsEmpty",
+	"CGPathMoveToPoint",
+	"CGPathRelease",
+	"CGPointApplyAffineTransform",
 	"CGPostKeyboardEvent",
 	"CGPostMouseEvent",
 	"CGWarpMouseCursorPosition",
@@ -259,6 +285,7 @@ char * OS_nativeFunctionNames[] = {
 	"FetchFontInfo",
 	"FindWindow",
 	"Fix2Long",
+	"Fix2X",
 	"FrameOval",
 	"FramePoly",
 	"FrameRect",
@@ -569,6 +596,7 @@ char * OS_nativeFunctionNames[] = {
 	"QDFlushPortBuffer",
 	"QDGlobalToLocalPoint",
 	"QDLocalToGlobalPoint",
+	"QDRegionToRects",
 	"QDSetDirtyRegion",
 	"QDSetPatternOrigin",
 	"QDSwapTextFlags",
@@ -766,6 +794,7 @@ char * OS_nativeFunctionNames[] = {
 	"memcpy__I_3BI",
 	"memcpy__I_3CI",
 	"memcpy__I_3II",
+	"memcpy__Lorg_eclipse_swt_internal_carbon_ATSLayoutRecord_2II",
 	"memcpy__Lorg_eclipse_swt_internal_carbon_ATSTrapezoid_2II",
 	"memcpy__Lorg_eclipse_swt_internal_carbon_FontSelectionQDStyle_2II",
 	"memcpy__Lorg_eclipse_swt_internal_carbon_GDevice_2II",
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_stats.h
index fe978dd83a..aaa8f28838 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_stats.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_stats.h
@@ -29,6 +29,8 @@ typedef enum {
 	ATSUCreateStyle_FUNC,
 	ATSUCreateTextLayout_FUNC,
 	ATSUCreateTextLayoutWithTextPtr_FUNC,
+	ATSUDirectGetLayoutDataArrayPtrFromTextLayout_FUNC,
+	ATSUDirectReleaseLayoutDataArrayPtr_FUNC,
 	ATSUDisposeStyle_FUNC,
 	ATSUDisposeTextLayout_FUNC,
 	ATSUDrawText_FUNC,
@@ -42,6 +44,7 @@ typedef enum {
 	ATSUGetSoftLineBreaks_FUNC,
 	ATSUGetTextHighlight_FUNC,
 	ATSUGetUnjustifiedBounds_FUNC,
+	ATSUGlyphGetQuadraticPaths_FUNC,
 	ATSUHighlightText_FUNC,
 	ATSUNextCursorPosition_FUNC,
 	ATSUOffsetToPosition_FUNC,
@@ -85,6 +88,12 @@ typedef enum {
 	CFURLCreateFromFSRef_FUNC,
 	CFURLCreateWithFileSystemPath_FUNC,
 	CFURLGetFSRef_FUNC,
+	CGAffineTransformConcat_FUNC,
+	CGAffineTransformInvert_FUNC,
+	CGAffineTransformMake_FUNC,
+	CGAffineTransformRotate_FUNC,
+	CGAffineTransformScale_FUNC,
+	CGAffineTransformTranslate_FUNC,
 	CGBitmapContextCreate_FUNC,
 	CGColorSpaceCreateDeviceRGB_FUNC,
 	CGColorSpaceRelease_FUNC,
@@ -92,10 +101,12 @@ typedef enum {
 	CGContextAddArcToPoint_FUNC,
 	CGContextAddLineToPoint_FUNC,
 	CGContextAddLines_FUNC,
+	CGContextAddPath_FUNC,
 	CGContextBeginPath_FUNC,
 	CGContextClearRect_FUNC,
 	CGContextClip_FUNC,
 	CGContextClosePath_FUNC,
+	CGContextConcatCTM_FUNC,
 	CGContextDrawImage_FUNC,
 	CGContextEOFillPath_FUNC,
 	CGContextFillPath_FUNC,
@@ -108,6 +119,7 @@ typedef enum {
 	CGContextSaveGState_FUNC,
 	CGContextScaleCTM_FUNC,
 	CGContextSelectFont_FUNC,
+	CGContextSetAlpha_FUNC,
 	CGContextSetFillColor_FUNC,
 	CGContextSetFillColorSpace_FUNC,
 	CGContextSetFont_FUNC,
@@ -151,6 +163,20 @@ typedef enum {
 	CGImageGetHeight_FUNC,
 	CGImageGetWidth_FUNC,
 	CGImageRelease_FUNC,
+	CGPathAddArc_FUNC,
+	CGPathAddCurveToPoint_FUNC,
+	CGPathAddLineToPoint_FUNC,
+	CGPathAddPath_FUNC,
+	CGPathAddQuadCurveToPoint_FUNC,
+	CGPathAddRect_FUNC,
+	CGPathCloseSubpath_FUNC,
+	CGPathCreateMutable_FUNC,
+	CGPathGetBoundingBox_FUNC,
+	CGPathGetCurrentPoint_FUNC,
+	CGPathIsEmpty_FUNC,
+	CGPathMoveToPoint_FUNC,
+	CGPathRelease_FUNC,
+	CGPointApplyAffineTransform_FUNC,
 	CGPostKeyboardEvent_FUNC,
 	CGPostMouseEvent_FUNC,
 	CGWarpMouseCursorPosition_FUNC,
@@ -263,6 +289,7 @@ typedef enum {
 	FetchFontInfo_FUNC,
 	FindWindow_FUNC,
 	Fix2Long_FUNC,
+	Fix2X_FUNC,
 	FrameOval_FUNC,
 	FramePoly_FUNC,
 	FrameRect_FUNC,
@@ -573,6 +600,7 @@ typedef enum {
 	QDFlushPortBuffer_FUNC,
 	QDGlobalToLocalPoint_FUNC,
 	QDLocalToGlobalPoint_FUNC,
+	QDRegionToRects_FUNC,
 	QDSetDirtyRegion_FUNC,
 	QDSetPatternOrigin_FUNC,
 	QDSwapTextFlags_FUNC,
@@ -770,6 +798,7 @@ typedef enum {
 	memcpy__I_3BI_FUNC,
 	memcpy__I_3CI_FUNC,
 	memcpy__I_3II_FUNC,
+	memcpy__Lorg_eclipse_swt_internal_carbon_ATSLayoutRecord_2II_FUNC,
 	memcpy__Lorg_eclipse_swt_internal_carbon_ATSTrapezoid_2II_FUNC,
 	memcpy__Lorg_eclipse_swt_internal_carbon_FontSelectionQDStyle_2II_FUNC,
 	memcpy__Lorg_eclipse_swt_internal_carbon_GDevice_2II_FUNC,
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_structs.c b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_structs.c
index c9a801eaf5..698e27dc13 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_structs.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_structs.c
@@ -46,6 +46,46 @@ void setAEDescFields(JNIEnv *env, jobject lpObject, AEDesc *lpStruct)
 }
 #endif
 
+#ifndef NO_ATSLayoutRecord
+typedef struct ATSLayoutRecord_FID_CACHE {
+	int cached;
+	jclass clazz;
+	jfieldID glyphID, flags, originalOffset, realPos;
+} ATSLayoutRecord_FID_CACHE;
+
+ATSLayoutRecord_FID_CACHE ATSLayoutRecordFc;
+
+void cacheATSLayoutRecordFields(JNIEnv *env, jobject lpObject)
+{
+	if (ATSLayoutRecordFc.cached) return;
+	ATSLayoutRecordFc.clazz = (*env)->GetObjectClass(env, lpObject);
+	ATSLayoutRecordFc.glyphID = (*env)->GetFieldID(env, ATSLayoutRecordFc.clazz, "glyphID", "S");
+	ATSLayoutRecordFc.flags = (*env)->GetFieldID(env, ATSLayoutRecordFc.clazz, "flags", "I");
+	ATSLayoutRecordFc.originalOffset = (*env)->GetFieldID(env, ATSLayoutRecordFc.clazz, "originalOffset", "I");
+	ATSLayoutRecordFc.realPos = (*env)->GetFieldID(env, ATSLayoutRecordFc.clazz, "realPos", "I");
+	ATSLayoutRecordFc.cached = 1;
+}
+
+ATSLayoutRecord *getATSLayoutRecordFields(JNIEnv *env, jobject lpObject, ATSLayoutRecord *lpStruct)
+{
+	if (!ATSLayoutRecordFc.cached) cacheATSLayoutRecordFields(env, lpObject);
+	lpStruct->glyphID = (*env)->GetShortField(env, lpObject, ATSLayoutRecordFc.glyphID);
+	lpStruct->flags = (*env)->GetIntField(env, lpObject, ATSLayoutRecordFc.flags);
+	lpStruct->originalOffset = (*env)->GetIntField(env, lpObject, ATSLayoutRecordFc.originalOffset);
+	lpStruct->realPos = (*env)->GetIntField(env, lpObject, ATSLayoutRecordFc.realPos);
+	return lpStruct;
+}
+
+void setATSLayoutRecordFields(JNIEnv *env, jobject lpObject, ATSLayoutRecord *lpStruct)
+{
+	if (!ATSLayoutRecordFc.cached) cacheATSLayoutRecordFields(env, lpObject);
+	(*env)->SetShortField(env, lpObject, ATSLayoutRecordFc.glyphID, (jshort)lpStruct->glyphID);
+	(*env)->SetIntField(env, lpObject, ATSLayoutRecordFc.flags, (jint)lpStruct->flags);
+	(*env)->SetIntField(env, lpObject, ATSLayoutRecordFc.originalOffset, (jint)lpStruct->originalOffset);
+	(*env)->SetIntField(env, lpObject, ATSLayoutRecordFc.realPos, (jint)lpStruct->realPos);
+}
+#endif
+
 #ifndef NO_ATSTrapezoid
 typedef struct ATSTrapezoid_FID_CACHE {
 	int cached;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_structs.h b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_structs.h
index 7bee11cc62..96739153e0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_structs.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_structs.h
@@ -23,6 +23,18 @@ void setAEDescFields(JNIEnv *env, jobject lpObject, AEDesc *lpStruct);
 #define AEDesc_sizeof() 0
 #endif
 
+#ifndef NO_ATSLayoutRecord
+void cacheATSLayoutRecordFields(JNIEnv *env, jobject lpObject);
+ATSLayoutRecord *getATSLayoutRecordFields(JNIEnv *env, jobject lpObject, ATSLayoutRecord *lpStruct);
+void setATSLayoutRecordFields(JNIEnv *env, jobject lpObject, ATSLayoutRecord *lpStruct);
+#define ATSLayoutRecord_sizeof() sizeof(ATSLayoutRecord)
+#else
+#define cacheATSLayoutRecordFields(a,b)
+#define getATSLayoutRecordFields(a,b,c) NULL
+#define setATSLayoutRecordFields(a,b,c)
+#define ATSLayoutRecord_sizeof() 0
+#endif
+
 #ifndef NO_ATSTrapezoid
 void cacheATSTrapezoidFields(JNIEnv *env, jobject lpObject);
 ATSTrapezoid *getATSTrapezoidFields(JNIEnv *env, jobject lpObject, ATSTrapezoid *lpStruct);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/ATSLayoutRecord.java b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/ATSLayoutRecord.java
new file mode 100644
index 0000000000..8cf798793e
--- /dev/null
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/ATSLayoutRecord.java
@@ -0,0 +1,22 @@
+/**********************************************************************
+ * Copyright (c) 2003-2004 IBM Corp.
+ * Portions Copyright (c) 1983-2002, Apple Computer, Inc.
+ *
+ * All rights reserved.  This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ **********************************************************************/
+package org.eclipse.swt.internal.carbon;
+
+ 
+public class ATSLayoutRecord {
+	public short glyphID;
+	public int flags;
+	public int originalOffset;
+	public int realPos;
+	public static final int sizeof = 14;
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/OS.java
index 8289f588b7..b93565f957 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/OS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/OS.java
@@ -56,6 +56,10 @@ public class OS extends Platform {
 	public static final int kAlertStdAlertCancelButton    = 2;
 	public static final int kAlertStdAlertOtherButton     = 3;
 	public static final int kAtSpecifiedOrigin = 0;
+	public static final int kATSDeletedGlyphcode = 0xFFFF;
+	public static final int kATSUDirectDataBaselineDeltaFixedArray = 1;
+	public static final int kATSUDirectDataLayoutRecordATSLayoutRecordVersion1 = 100;
+	public static final int kATSUDirectDataLayoutRecordATSLayoutRecordCurrent = kATSUDirectDataLayoutRecordATSLayoutRecordVersion1;
 	public static final int kATSULineAscentTag = 8;
 	public static final int kATSULineDescentTag = 9;
 	public static final int kATSULineDirectionTag = 3;
@@ -385,6 +389,14 @@ public class OS extends Platform {
 	public static final int kLarge32BitData = ('i'<<24) + ('l'<<16) + ('3'<<8) + '2';	
 	public static final int kLarge8BitMask = ('l'<<24) + ('8'<<16) + ('m'<<8) + 'k';
 	public static final int kLigaturesType = 1;
+	public static final int kQDParseRegionFromTop = (1 << 0);
+	public static final int kQDParseRegionFromBottom = (1 << 1);
+	public static final int kQDParseRegionFromLeft = (1 << 2);
+	public static final int kQDParseRegionFromRight = (1 << 3);
+	public static final int kQDParseRegionFromTopLeft = kQDParseRegionFromTop | kQDParseRegionFromLeft;
+	public static final int kQDRegionToRectsMsgInit = 1;
+	public static final int kQDRegionToRectsMsgParse = 2;
+	public static final int kQDRegionToRectsMsgTerminate = 3;
 	public static final int kRequiredLigaturesOffSelector = 1;
 	public static final int kCommonLigaturesOffSelector = 3;
 	public static final int kRareLigaturesOffSelector = 5;
@@ -689,6 +701,8 @@ public static final native int ATSUBatchBreakLines(int iTextLayout, int iRangeSt
 public static final native int ATSUCreateStyle(int[] oStyle);
 public static final native int ATSUCreateTextLayout(int[] oTextLayout);
 public static final native int ATSUCreateTextLayoutWithTextPtr(int iText, int iTextOffset, int iTextLength, int iTextTotalLength, int iNumberOfRuns, int[] iRunLengths, int[] iStyles, int[] oTextLayout);
+public static final native int ATSUDirectGetLayoutDataArrayPtrFromTextLayout(int iTextLayout, int iLineOffset, int iDataSelector, int[] oLayoutDataArrayPtr, int[] oLayoutDataCount);
+public static final native int ATSUDirectReleaseLayoutDataArrayPtr(int iLineRef, int iDataSelector, int iLayoutDataArrayPtr);
 public static final native int ATSUDisposeStyle(int iStyle);
 public static final native int ATSUDisposeTextLayout(int iTextLayout);
 public static final native int ATSUDrawText(int iTextLayout, int iLineOffset, int iLineLength, int iLocationX, int iLocationY);
@@ -699,6 +713,7 @@ public static final native int ATSUGetGlyphBounds(int iTextLayout, int iTextBase
 public static final native int ATSUGetGlyphBounds(int iTextLayout, int iTextBasePointX, int iTextBasePointY, int iBoundsCharStart, int iBoundsCharLength, short iTypeOfBounds, int iMaxNumberOfBounds, ATSTrapezoid oGlyphBounds, int[] oActualNumberOfBounds);
 public static final native int ATSUGetLayoutControl(int iTextLayout, int iTag, int iExpectedValueSize, int[] oValue, int[] oActualValueSize);
 public static final native int ATSUGetLineControl(int iTextLayout, int iLineStart, int iTag, int iExpectedValueSize, int[] oValue, int[] oActualValueSize);
+public static final native int ATSUGlyphGetQuadraticPaths(int iATSUStyle, short iGlyphID, int iNewPathProc, int iLineProc, int iCurveProc, int iClosePathProc, int iCallbackDataPtr, int[] oCallbackResult);
 public static final native int ATSUGetSoftLineBreaks(int iTextLayout, int iRangeStart, int iRangeLength, int iMaximumBreaks, int[] oBreaks, int[] oBreakCount);
 public static final native int ATSUGetTextHighlight (int iTextLayout, int iTextBasePointX, int iTextBasePointY, int iHighlightStart, int iHighlightLength, int oHighlightRegion);
 public static final native int ATSUGetUnjustifiedBounds(int iTextLayout, int iLineStart, int iLineLength,  int[] oTextBefore, int[] oTextAfter, int[] oAscent, int[] oDescent);
@@ -744,6 +759,12 @@ public static final native int CFURLCreateCopyDeletingLastPathComponent(int allo
 public static final native int CFURLCreateFromFSRef(int allocator, byte[] fsRef);
 public static final native int CFURLCreateWithFileSystemPath (int allocator, int filePath, int pathStyle, boolean isDirectory); 
 public static final native boolean CFURLGetFSRef(int url, byte[] fsRef);
+public static final native void CGAffineTransformConcat (float[] t1, float[] t2, float[] result);
+public static final native void CGAffineTransformMake (float a, float b, float c, float d, float tx, float ty, float[] result);
+public static final native void CGAffineTransformTranslate (float[] t, float tx, float ty, float[] result);
+public static final native void CGAffineTransformRotate (float[] t, float angle, float[] result);
+public static final native void CGAffineTransformScale (float[] t, float sx, float sy, float[] result);
+public static final native void CGAffineTransformInvert (float[] t, float[] result);
 public static final native void CGContextScaleCTM(int inContext, float sx, float sy);
 public static final native void CGContextTranslateCTM(int inContext, float tx, float ty);
 public static final native int CGBitmapContextCreate(int data, int width, int height, int bitsPerComponent, int bytesPerRow, int colorspace, int alphaInfo);
@@ -753,10 +774,12 @@ public static final native void CGContextAddArc (int ctx, float x, float y, floa
 public static final native void CGContextAddArcToPoint (int ctx, float x1, float y1, float x2, float y2, float radius);
 public static final native void CGContextAddLineToPoint (int ctx, float x, float y);
 public static final native void CGContextAddLines (int ctx, float[] points, int count);
+public static final native void CGContextAddPath (int context, int path);
 public static final native void CGContextBeginPath (int ctx);
 public static final native void CGContextClip (int ctx);
 public static final native void CGContextClearRect (int ctx, CGRect rect);
 public static final native void CGContextClosePath (int ctx);
+public static final native void CGContextConcatCTM (int context, float[] transform);
 public static final native void CGContextDrawImage (int ctx, CGRect rect, int image);
 public static final native void CGContextFillPath (int ctx);
 public static final native void CGContextEOFillPath (int ctx);
@@ -770,6 +793,7 @@ public static final native void CGContextRestoreGState(int ctx);
 public static final native void CGContextSaveGState(int ctx);
 public static final native void CGContextSelectFont (int ctx, byte[] name, float size, int textEncoding);
 public static final native void CGContextSetFillColorSpace (int ctx, int colorspace);
+public static final native void CGContextSetAlpha (int context, float alpha);
 public static final native void CGContextSetFillColor (int ctx, float[] value);
 public static final native void CGContextSetFont (int ctx, int font);
 public static final native void CGContextSetFontSize (int ctx, float size);
@@ -810,6 +834,20 @@ public static final native int CGImageGetColorSpace (int image);
 public static final native int CGImageGetHeight (int image);
 public static final native int CGImageGetWidth (int image);
 public static final native void CGImageRelease (int image);
+public static final native void CGPathAddArc (int path, float[] m, float x, float y, float r, float startAngle, float endAngle, boolean clockwise);
+public static final native void CGPathAddCurveToPoint (int path, float[] m, float cx1, float cy1, float cx2, float cy2, float x, float y);
+public static final native void CGPathAddLineToPoint (int path, float[] m, float x, float y);
+public static final native void CGPathAddPath (int path1, float[] m, int path2);
+public static final native void CGPathAddQuadCurveToPoint (int path, float[] m, float cx, float cy, float x, float y);
+public static final native void CGPathAddRect (int path, float[] m, CGRect rect);
+public static final native void CGPathCloseSubpath (int path);
+public static final native int CGPathCreateMutable ();
+public static final native void CGPathGetBoundingBox (int path, CGRect rect);
+public static final native void CGPathGetCurrentPoint (int path, CGPoint point);
+public static final native boolean CGPathIsEmpty (int path);
+public static final native void CGPathMoveToPoint (int path, float[] m, float x, float y);
+public static final native void CGPathRelease (int path);
+public static final native void CGPointApplyAffineTransform (CGPoint point, float[] t, CGPoint result);
 public static final native int CGPostMouseEvent(CGPoint mouseCursorPosition, boolean updateMouseCursorPosition, int buttonCount, boolean mouseButtonDown, boolean mouseButtonDown2, boolean mouseButtonDown3);
 public static final native int CGPostKeyboardEvent(int keyChar, int virtualKey, boolean keyDown);
 public static final native int CGWarpMouseCursorPosition (CGPoint newCursorPosition);
@@ -905,6 +943,7 @@ public static final native void EraseRect(Rect bounds);
 public static final native void EraseRgn(int rgnHandle);
 public static final native int FetchFontInfo(short fontID, short fontSize, short fontStyle, FontInfo info); 
 public static final native int Fix2Long(int x);
+public static final native double Fix2X(int x);
 public static final native int FMCreateFontFamilyInstanceIterator(short iFontFamily, int ioIterator);
 public static final native int FMCreateFontFamilyIterator(int iFilter, int iRefCon, int iOptions, int ioIterator);
 public static final native int FMDisposeFontFamilyIterator(int ioIterator);
@@ -1232,6 +1271,7 @@ public static final native int QDEndCGContext(int inPort, int[] inoutContext);
 public static final native void QDFlushPortBuffer(int port, int rgnHandle);
 public static final native void QDGlobalToLocalPoint(int port, Point point);
 public static final native void QDLocalToGlobalPoint(int port, Point point);
+public static final native int QDRegionToRects(int rgn, int dir, int proc, int userData);
 public static final native int QDSetDirtyRegion (int port, int rgn);
 public static final native void QDSetPatternOrigin(Point point);
 public static final native int QDSwapTextFlags(int flags);
@@ -1424,6 +1464,7 @@ public static final native void memcpy(GDevice dest, int src, int n);
 public static final native void memcpy(PixMap dest, int src, int n);
 public static final native void memcpy(FontSelectionQDStyle dest, int src, int n);
 public static final native void memcpy(HMHelpContentRec dest, int src, int n);
+public static final native void memcpy(ATSLayoutRecord dest, int src, int n);
 public static final native void memcpy(int dest, HMHelpContentRec src, int n);
 public static final native void memcpy(int dest, BitMap src, int n);
 public static final native void memcpy(int dest, char[] src, int n);