diff options
| author | Feng Qian <> | 2009-04-10 18:11:29 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-04-10 18:11:29 -0700 |
| commit | 8f72e70a9fd78eec56623b3a62e68f16b7b27e28 (patch) | |
| tree | 181bf9a400c30a1bf34ea6d72560e8d00111d549 /WebCore/platform/graphics/GlyphPageTreeNode.cpp | |
| parent | 7ed56f225e0ade046e1c2178977f72b2d896f196 (diff) | |
| download | external_webkit-8f72e70a9fd78eec56623b3a62e68f16b7b27e28.zip external_webkit-8f72e70a9fd78eec56623b3a62e68f16b7b27e28.tar.gz external_webkit-8f72e70a9fd78eec56623b3a62e68f16b7b27e28.tar.bz2 | |
AI 145796: Land the WebKit merge @r42026.
Automated import of CL 145796
Diffstat (limited to 'WebCore/platform/graphics/GlyphPageTreeNode.cpp')
| -rw-r--r-- | WebCore/platform/graphics/GlyphPageTreeNode.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/WebCore/platform/graphics/GlyphPageTreeNode.cpp b/WebCore/platform/graphics/GlyphPageTreeNode.cpp index 6b9d23d..bd838de 100644 --- a/WebCore/platform/graphics/GlyphPageTreeNode.cpp +++ b/WebCore/platform/graphics/GlyphPageTreeNode.cpp @@ -218,6 +218,7 @@ void GlyphPageTreeNode::initializePage(const FontData* fontData, unsigned pageNu } haveGlyphs |= pageToFill->fill(from, to - from, buffer + from * (start < 0x10000 ? 1 : 2), (to - from) * (start < 0x10000 ? 1 : 2), range.fontData()); if (scratchPage) { + ASSERT(to <= static_cast<int>(GlyphPage::size)); for (int j = from; j < to; j++) { if (!m_page->m_glyphs[j].glyph && pageToFill->m_glyphs[j].glyph) m_page->m_glyphs[j] = pageToFill->m_glyphs[j]; |