Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(87)

Side by Side Diff: Source/WebCore/platform/graphics/SimpleFontData.h

Issue 12919016: Merge 142928 "Crash when selecting a HarfBuzz text run with SVG ..." (Closed) Base URL: https://svn.webkit.org/repository/webkit/branches/chromium/1410/
Patch Set: Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * This file is part of the internal font implementation. 2 * This file is part of the internal font implementation.
3 * 3 *
4 * Copyright (C) 2006, 2008, 2010 Apple Inc. All rights reserved. 4 * Copyright (C) 2006, 2008, 2010 Apple Inc. All rights reserved.
5 * Copyright (C) 2007-2008 Torch Mobile, Inc. 5 * Copyright (C) 2007-2008 Torch Mobile, Inc.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 bool canRenderCombiningCharacterSequence(const UChar*, size_t) const; 199 bool canRenderCombiningCharacterSequence(const UChar*, size_t) const;
200 #endif 200 #endif
201 201
202 bool applyTransforms(GlyphBufferGlyph* glyphs, GlyphBufferAdvance* advances, size_t glyphCount, TypesettingFeatures typesettingFeatures) const 202 bool applyTransforms(GlyphBufferGlyph* glyphs, GlyphBufferAdvance* advances, size_t glyphCount, TypesettingFeatures typesettingFeatures) const
203 { 203 {
204 #if !PLATFORM(MAC) || __MAC_OS_X_VERSION_MIN_REQUIRED <= 1080 204 #if !PLATFORM(MAC) || __MAC_OS_X_VERSION_MIN_REQUIRED <= 1080
205 UNUSED_PARAM(glyphs); 205 UNUSED_PARAM(glyphs);
206 UNUSED_PARAM(advances); 206 UNUSED_PARAM(advances);
207 UNUSED_PARAM(glyphCount); 207 UNUSED_PARAM(glyphCount);
208 UNUSED_PARAM(typesettingFeatures); 208 UNUSED_PARAM(typesettingFeatures);
209 ASSERT_NOT_REACHED();
210 return false; 209 return false;
211 #else 210 #else
212 wkCTFontTransformOptions options = (typesettingFeatures & Kerning ? wkCTFont TransformApplyPositioning : 0) | (typesettingFeatures & Ligatures ? wkCTFontTran sformApplyShaping : 0); 211 wkCTFontTransformOptions options = (typesettingFeatures & Kerning ? wkCTFont TransformApplyPositioning : 0) | (typesettingFeatures & Ligatures ? wkCTFontTran sformApplyShaping : 0);
213 return wkCTFontTransformGlyphs(m_platformData.ctFont(), glyphs, reinterpret_ cast<CGSize*>(advances), glyphCount, options); 212 return wkCTFontTransformGlyphs(m_platformData.ctFont(), glyphs, reinterpret_ cast<CGSize*>(advances), glyphCount, options);
214 #endif 213 #endif
215 } 214 }
216 215
217 #if PLATFORM(QT) 216 #if PLATFORM(QT)
218 QRawFont getQtRawFont() const { return m_platformData.rawFont(); } 217 QRawFont getQtRawFont() const { return m_platformData.rawFont(); }
219 #endif 218 #endif
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
370 #endif 369 #endif
371 else 370 else
372 width = platformWidthForGlyph(glyph); 371 width = platformWidthForGlyph(glyph);
373 372
374 m_glyphToWidthMap.setMetricsForGlyph(glyph, width); 373 m_glyphToWidthMap.setMetricsForGlyph(glyph, width);
375 return width; 374 return width;
376 } 375 }
377 376
378 } // namespace WebCore 377 } // namespace WebCore
379 #endif // SimpleFontData_h 378 #endif // SimpleFontData_h
OLDNEW
« no previous file with comments | « LayoutTests/svg/css/font-face-crash-expected.txt ('k') | Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaper.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698