Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(135)

Unified Diff: Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaper.cpp

Issue 12919016: Merge 142928 "Crash when selecting a HarfBuzz text run with SVG ..." (Closed) Base URL: https://svn.webkit.org/repository/webkit/branches/chromium/1410/
Patch Set: Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/WebCore/platform/graphics/SimpleFontData.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaper.cpp
===================================================================
--- Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaper.cpp (revision 146110)
+++ Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaper.cpp (working copy)
@@ -323,6 +323,8 @@
unsigned runIndex = m_run.rtl() ? m_harfBuzzRuns.size() - i - 1 : i;
HarfBuzzRun* currentRun = m_harfBuzzRuns[runIndex].get();
const SimpleFontData* currentFontData = currentRun->fontData();
+ if (currentFontData->isSVGFont())
+ return false;
hb_buffer_set_script(harfBuzzBuffer.get(), currentRun->script());
if (shouldSetDirection)
« no previous file with comments | « Source/WebCore/platform/graphics/SimpleFontData.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698