diff options
author | Ben Murdoch <benm@google.com> | 2011-06-02 12:07:03 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-06-10 10:47:21 +0100 |
commit | 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 (patch) | |
tree | e4964fbd1cb70599f7718ff03e50ea1dab33890b /Source/WebCore/platform/graphics/chromium/UniscribeHelper.h | |
parent | 87bdf0060a247bfbe668342b87e0874182e0ffa9 (diff) | |
download | external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.zip external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.gz external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.bz2 |
Merge WebKit at r84325: Initial merge by git.
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
Diffstat (limited to 'Source/WebCore/platform/graphics/chromium/UniscribeHelper.h')
-rw-r--r-- | Source/WebCore/platform/graphics/chromium/UniscribeHelper.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/Source/WebCore/platform/graphics/chromium/UniscribeHelper.h b/Source/WebCore/platform/graphics/chromium/UniscribeHelper.h index ffd57db..4bcdbd6 100644 --- a/Source/WebCore/platform/graphics/chromium/UniscribeHelper.h +++ b/Source/WebCore/platform/graphics/chromium/UniscribeHelper.h @@ -76,7 +76,8 @@ public: bool isRtl, HFONT, SCRIPT_CACHE*, - SCRIPT_FONTPROPERTIES*); + SCRIPT_FONTPROPERTIES*, + WORD); virtual ~UniscribeHelper(); @@ -225,7 +226,9 @@ private: : m_prePadding(0) , m_hfont(NULL) , m_scriptCache(NULL) - , m_ascentOffset(0) { + , m_ascentOffset(0) + , m_spaceGlyph(0) + { m_abc.abcA = 0; m_abc.abcB = 0; m_abc.abcC = 0; @@ -319,6 +322,8 @@ private: // when drawing a string, to align multiple runs rendered with // different fonts. int m_ascentOffset; + + WORD m_spaceGlyph; }; // Computes the runs_ array from the text run. @@ -343,6 +348,10 @@ private: // Returns the total width of a single item. int advanceForItem(int) const; + bool containsMissingGlyphs(const Shaping&, + const SCRIPT_ITEM&, + const SCRIPT_FONTPROPERTIES*) const; + // Shapes a run (pointed to by |input|) using |hfont| first. // Tries a series of fonts specified retrieved with NextWinFontData // and finally a font covering characters in |*input|. A string pointed @@ -384,6 +393,7 @@ private: int m_ascent; LOGFONT m_logfont; int m_style; + WORD m_spaceGlyph; // Options, see the getters/setters above. bool m_directionalOverride; |