diff options
| author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
| commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
| tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Source/WebCore/platform/graphics/Font.h | |
| parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
| download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 | |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Source/WebCore/platform/graphics/Font.h')
| -rw-r--r-- | Source/WebCore/platform/graphics/Font.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/Source/WebCore/platform/graphics/Font.h b/Source/WebCore/platform/graphics/Font.h index ce03aed..554f8a0 100644 --- a/Source/WebCore/platform/graphics/Font.h +++ b/Source/WebCore/platform/graphics/Font.h @@ -61,6 +61,7 @@ struct GlyphOverflow { , right(0) , top(0) , bottom(0) + , computeBounds(false) { } @@ -68,8 +69,10 @@ struct GlyphOverflow { int right; int top; int bottom; + bool computeBounds; }; + class Font { public: Font(); @@ -138,8 +141,6 @@ public: const FontData* fontDataAt(unsigned) const; GlyphData glyphDataForCharacter(UChar32, bool mirror, FontDataVariant = AutoVariant) const; bool primaryFontHasGlyphForCharacter(UChar32) const; - // Used for complex text, and does not utilize the glyph map cache. - const FontData* fontDataForCharacters(const UChar*, int length) const; static bool isCJKIdeograph(UChar32); static bool isCJKIdeographOrSymbol(UChar32); @@ -255,12 +256,6 @@ inline const FontData* Font::fontDataAt(unsigned index) const return m_fontList->fontDataAt(this, index); } -inline const FontData* Font::fontDataForCharacters(const UChar* characters, int length) const -{ - ASSERT(m_fontList); - return m_fontList->fontDataForCharacters(this, characters, length); -} - inline bool Font::isFixedPitch() const { ASSERT(m_fontList); |