Commit 956bb716 authored by hyatt@apple.com's avatar hyatt@apple.com

https://bugs.webkit.org/show_bug.cgi?id=56329

Reviewed by Dave Levin.

Fix FontCache problems on Linux.  Make sure not to mutate the platform data passed in to SimpleFontData's
constructor.  Change this code to match Mac and to set the new m_hasVerticalGlyphs boolean instead of
mutating orientation.

* platform/graphics/chromium/SimpleFontDataLinux.cpp:
(WebCore::SimpleFontData::platformInit):



git-svn-id: svn://svn.chromium.org/blink/trunk@81162 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 9eb61a0b
2011-03-15 David Hyatt <hyatt@apple.com>
Reviewed by Dave Levin.
https://bugs.webkit.org/show_bug.cgi?id=56329
Fix FontCache problems on Linux. Make sure not to mutate the platform data passed in to SimpleFontData's
constructor. Change this code to match Mac and to set the new m_hasVerticalGlyphs boolean instead of
mutating orientation.
* platform/graphics/chromium/SimpleFontDataLinux.cpp:
(WebCore::SimpleFontData::platformInit):
2011-03-15 Simon Fraser <simon.fraser@apple.com> 2011-03-15 Simon Fraser <simon.fraser@apple.com>
Reviewed by Dan Bernstein. Reviewed by Dan Bernstein.
......
...@@ -118,8 +118,8 @@ void SimpleFontData::platformInit() ...@@ -118,8 +118,8 @@ void SimpleFontData::platformInit()
static const uint32_t vorgTag = SkSetFourByteTag('V', 'O', 'R', 'G'); static const uint32_t vorgTag = SkSetFourByteTag('V', 'O', 'R', 'G');
size_t vheaSize = SkFontHost::GetTableSize(fontID, vheaTag); size_t vheaSize = SkFontHost::GetTableSize(fontID, vheaTag);
size_t vorgSize = SkFontHost::GetTableSize(fontID, vorgTag); size_t vorgSize = SkFontHost::GetTableSize(fontID, vorgTag);
if ((vheaSize <= 0) && (vorgSize <= 0)) if ((vheaSize > 0) || (vorgSize > 0))
m_platformData.setOrientation(Horizontal); m_hasVerticalGlyphs = true;
} }
// In WebKit/WebCore/platform/graphics/SimpleFontData.cpp, m_spaceWidth is // In WebKit/WebCore/platform/graphics/SimpleFontData.cpp, m_spaceWidth is
......
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