Skip to content
Permalink
Browse files
2011-03-08 Ryosuke Niwa <rniwa@webkit.org>
        Chromium Linux build fix attempt after r80582.

        * platform/graphics/chromium/FontLinux.cpp:
        (WebCore::Font::drawGlyphs):
        * platform/graphics/chromium/SimpleFontDataLinux.cpp:
        (WebCore::SimpleFontData::platformInit):
        * platform/graphics/skia/GlyphPageTreeNodeSkia.cpp:
        (WebCore::GlyphPage::fill):


Canonical link: https://commits.webkit.org/70501@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@80610 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
rniwa committed Mar 9, 2011
1 parent 3e03e73 commit d5e76a7eeacc9ac78152ae84957acbbc6e80df73
Showing 4 changed files with 14 additions and 3 deletions.
@@ -1,3 +1,14 @@
2011-03-08 Ryosuke Niwa <rniwa@webkit.org>

Chromium Linux build fix attempt after r80582.

* platform/graphics/chromium/FontLinux.cpp:
(WebCore::Font::drawGlyphs):
* platform/graphics/chromium/SimpleFontDataLinux.cpp:
(WebCore::SimpleFontData::platformInit):
* platform/graphics/skia/GlyphPageTreeNodeSkia.cpp:
(WebCore::GlyphPage::fill):

2011-03-08 Ryosuke Niwa <rniwa@webkit.org>

Mac build fix attempt for r80582.
@@ -98,7 +98,7 @@ void Font::drawGlyphs(GraphicsContext* gc, const SimpleFontData* font,
SkPoint* vPosBegin = storage2.get();
SkPoint* vPosEnd = storage3.get();

bool isVertical = font->orientation() == Vertical;
bool isVertical = font->platformData().orientation() == Vertical;
for (int i = 0; i < numGlyphs; i++) {
SkScalar myWidth = SkFloatToScalar(adv[i].width());
pos[i].set(x, y);
@@ -113,7 +113,7 @@ void SimpleFontData::platformInit()
m_fontMetrics.setXHeight(xHeight);
m_fontMetrics.setLineSpacing(lroundf(ascent) + lroundf(descent) + lroundf(lineGap));

if (m_orientation == Vertical) {
if (platformData().orientation() == Vertical && !isTextOrientationFallback()) {
static const uint32_t vheaTag = SkSetFourByteTag('v', 'h', 'e', 'a');
static const uint32_t vorgTag = SkSetFourByteTag('V', 'O', 'R', 'G');
size_t vheaSize = SkFontHost::GetTableSize(fontID, vheaTag);
@@ -91,7 +91,7 @@ bool GlyphPage::fill(unsigned offset, unsigned length, UChar* buffer, unsigned b
return false;
}

if ((fontData->orientation() == Vertical) && (!fontData->isBrokenIdeographFont())) {
if (fontData->hasVerticalGlyphs()) {
bool lookVariants = false;
for (unsigned i = 0; i < bufferLength; ++i) {
if (!Font::isCJKIdeograph(buffer[i])) {

0 comments on commit d5e76a7

Please sign in to comment.