--- a/jdk/src/share/native/sun/font/layout/GXLayoutEngine.cpp Tue Feb 26 10:07:26 2013 -0800
+++ b/jdk/src/share/native/sun/font/layout/GXLayoutEngine.cpp Thu Mar 07 10:02:20 2013 -0800
@@ -41,9 +41,10 @@
UOBJECT_DEFINE_RTTI_IMPLEMENTATION(GXLayoutEngine)
-GXLayoutEngine::GXLayoutEngine(const LEFontInstance *fontInstance, le_int32 scriptCode, le_int32 languageCode, const MorphTableHeader *morphTable, LEErrorCode &success)
+ GXLayoutEngine::GXLayoutEngine(const LEFontInstance *fontInstance, le_int32 scriptCode, le_int32 languageCode, const LEReferenceTo<MorphTableHeader> &morphTable, LEErrorCode &success)
: LayoutEngine(fontInstance, scriptCode, languageCode, 0, success), fMorphTable(morphTable)
{
+ fMorphTable.orphan();
// nothing else to do?
}
@@ -70,7 +71,7 @@
return 0;
}
- fMorphTable->process(glyphStorage);
+ fMorphTable->process(fMorphTable, glyphStorage, success);
return count;
}