[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
hyatt at apple.com
hyatt at apple.com
Wed Dec 22 15:50:03 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 6efdf0d43749858651d0e5525871949b319ee3f8
Author: hyatt at apple.com <hyatt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Nov 13 20:46:42 2010 +0000
Another attempt to fix layout tests.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71973 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/platform/graphics/SimpleFontData.h b/WebCore/platform/graphics/SimpleFontData.h
index 6e06a70..24e2c4c 100644
--- a/WebCore/platform/graphics/SimpleFontData.h
+++ b/WebCore/platform/graphics/SimpleFontData.h
@@ -120,6 +120,8 @@ public:
virtual bool isLoading() const { return m_isLoading; }
virtual bool isSegmented() const;
+ bool isBrokenIdeographFont() const { return m_isBrokenIdeographFont; }
+
const GlyphData& missingGlyphData() const { return m_missingGlyphData; }
#ifndef NDEBUG
diff --git a/WebCore/platform/graphics/mac/GlyphPageTreeNodeMac.cpp b/WebCore/platform/graphics/mac/GlyphPageTreeNodeMac.cpp
index 48ad1c0..9524cd2 100644
--- a/WebCore/platform/graphics/mac/GlyphPageTreeNodeMac.cpp
+++ b/WebCore/platform/graphics/mac/GlyphPageTreeNodeMac.cpp
@@ -40,7 +40,7 @@ bool GlyphPage::fill(unsigned offset, unsigned length, UChar* buffer, unsigned b
bool haveGlyphs = false;
#ifndef BUILDING_ON_TIGER
- if (fontData->platformData().orientation() == Horizontal) {
+ if (fontData->orientation() == Horizontal || fontData->isBrokenIdeographFont()) {
Vector<CGGlyph, 512> glyphs(bufferLength);
wkGetGlyphsForCharacters(fontData->platformData().cgFont(), buffer, glyphs.data(), bufferLength);
for (unsigned i = 0; i < length; ++i) {
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list