No need to call ParseFeatures in the constructor
Call it once where we will use its results. Change-Id: I63f3ceaf47e68bea9fab29d6836745416cf8ccb8
This commit is contained in:
@@ -184,8 +184,6 @@ CommonSalLayout::CommonSalLayout(HDC hDC, WinFontInstance& rWinFontInstance, con
|
|||||||
|
|
||||||
hb_face_destroy(pHbFace);
|
hb_face_destroy(pHbFace);
|
||||||
}
|
}
|
||||||
|
|
||||||
ParseFeatures(mrFontSelData.maTargetName);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#elif defined(MACOSX) || defined(IOS)
|
#elif defined(MACOSX) || defined(IOS)
|
||||||
@@ -210,8 +208,6 @@ CommonSalLayout::CommonSalLayout(const CoreTextStyle& rCoreTextStyle)
|
|||||||
|
|
||||||
hb_face_destroy(pHbFace);
|
hb_face_destroy(pHbFace);
|
||||||
}
|
}
|
||||||
|
|
||||||
ParseFeatures(mrFontSelData.maTargetName);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#else
|
#else
|
||||||
@@ -229,8 +225,6 @@ CommonSalLayout::CommonSalLayout(FreetypeFont& rFreetypeFont)
|
|||||||
|
|
||||||
hb_face_destroy(pHbFace);
|
hb_face_destroy(pHbFace);
|
||||||
}
|
}
|
||||||
|
|
||||||
ParseFeatures(mrFontSelData.maTargetName);
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -404,6 +398,8 @@ bool CommonSalLayout::LayoutText(ImplLayoutArgs& rArgs)
|
|||||||
hb_buffer_set_unicode_funcs(pHbBuffer, pHbUnicodeFuncs);
|
hb_buffer_set_unicode_funcs(pHbBuffer, pHbUnicodeFuncs);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
ParseFeatures(mrFontSelData.maTargetName);
|
||||||
|
|
||||||
Point aCurrPos(0, 0);
|
Point aCurrPos(0, 0);
|
||||||
while (true)
|
while (true)
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user