Changeset 80610 in webkit

Timestamp:

Mar 8, 2011 5:39:46 PM (13 years ago)

Author:

rniwa@webkit.org

Message:

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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/chromium/FontLinux.cpp (modified) (1 diff)
• platform/graphics/chromium/SimpleFontDataLinux.cpp (modified) (1 diff)
• platform/graphics/skia/GlyphPageTreeNodeSkia.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebCore/platform/graphics/chromium/FontLinux.cpp

@@ -99 +99 @@
     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());

trunk/Source/WebCore/platform/graphics/chromium/SimpleFontDataLinux.cpp

@@ -114 +114 @@
     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');

trunk/Source/WebCore/platform/graphics/skia/GlyphPageTreeNodeSkia.cpp

@@ -92 +92 @@
     }
 
-    if ((fontData->orientation() == Vertical) && (!fontData->isBrokenIdeographFont())) {
+    if (fontData->hasVerticalGlyphs()) {
         bool lookVariants = false;
         for (unsigned i = 0; i < bufferLength; ++i) {