Commit abb96c39 authored by eae@chromium.org's avatar eae@chromium.org

Don't call hb_buffer_set_unicode_funcs in HarfBuzzShaper

Harfbuzz-ng 0.9.27 introduced a HAVE_ICU_BUILTIN define which makes the
hb_buffer_set_unicode_funcs call redundant. Also call
hb_buffer_clear_content instead of hb_buffer_reset which is faster now
that we no longer explicitly set the unicode functions.

BUG=354117
R=dglazkov@chromium.org

Review URL: https://codereview.chromium.org/197213032

git-svn-id: svn://svn.chromium.org/blink/trunk@169604 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent e1c20efe
...@@ -778,7 +778,6 @@ bool HarfBuzzShaper::shapeHarfBuzzRuns() ...@@ -778,7 +778,6 @@ bool HarfBuzzShaper::shapeHarfBuzzRuns()
{ {
HarfBuzzScopedPtr<hb_buffer_t> harfBuzzBuffer(hb_buffer_create(), hb_buffer_destroy); HarfBuzzScopedPtr<hb_buffer_t> harfBuzzBuffer(hb_buffer_create(), hb_buffer_destroy);
hb_buffer_set_unicode_funcs(harfBuzzBuffer.get(), hb_icu_get_unicode_funcs());
HarfBuzzRunCache& runCache = harfBuzzRunCache(); HarfBuzzRunCache& runCache = harfBuzzRunCache();
for (unsigned i = 0; i < m_harfBuzzRuns.size(); ++i) { for (unsigned i = 0; i < m_harfBuzzRuns.size(); ++i) {
...@@ -808,7 +807,7 @@ bool HarfBuzzShaper::shapeHarfBuzzRuns() ...@@ -808,7 +807,7 @@ bool HarfBuzzShaper::shapeHarfBuzzRuns()
currentRun->applyShapeResult(cachedResults->buffer); currentRun->applyShapeResult(cachedResults->buffer);
setGlyphPositionsForHarfBuzzRun(currentRun, cachedResults->buffer); setGlyphPositionsForHarfBuzzRun(currentRun, cachedResults->buffer);
hb_buffer_reset(harfBuzzBuffer.get()); hb_buffer_clear_contents(harfBuzzBuffer.get());
runCache.moveToBack(cachedResults); runCache.moveToBack(cachedResults);
...@@ -844,7 +843,6 @@ bool HarfBuzzShaper::shapeHarfBuzzRuns() ...@@ -844,7 +843,6 @@ bool HarfBuzzShaper::shapeHarfBuzzRuns()
runCache.insert(key, new CachedShapingResults(harfBuzzBuffer.get(), m_font, props.direction)); runCache.insert(key, new CachedShapingResults(harfBuzzBuffer.get(), m_font, props.direction));
harfBuzzBuffer.set(hb_buffer_create()); harfBuzzBuffer.set(hb_buffer_create());
hb_buffer_set_unicode_funcs(harfBuzzBuffer.get(), hb_icu_get_unicode_funcs());
} }
return true; return true;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment