| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 23 matching lines...) Expand all Loading... |
| 34 #include "platform/fonts/FontDescription.h" | 34 #include "platform/fonts/FontDescription.h" |
| 35 #include "platform/fonts/SmallCapsIterator.h" | 35 #include "platform/fonts/SmallCapsIterator.h" |
| 36 #include "platform/fonts/shaping/ShapeResult.h" | 36 #include "platform/fonts/shaping/ShapeResult.h" |
| 37 #include "platform/fonts/shaping/Shaper.h" | 37 #include "platform/fonts/shaping/Shaper.h" |
| 38 #include "platform/geometry/FloatPoint.h" | 38 #include "platform/geometry/FloatPoint.h" |
| 39 #include "platform/geometry/FloatRect.h" | 39 #include "platform/geometry/FloatRect.h" |
| 40 #include "platform/text/TextRun.h" | 40 #include "platform/text/TextRun.h" |
| 41 #include "wtf/Allocator.h" | 41 #include "wtf/Allocator.h" |
| 42 #include "wtf/Deque.h" | 42 #include "wtf/Deque.h" |
| 43 #include "wtf/HashSet.h" | 43 #include "wtf/HashSet.h" |
| 44 #include "wtf/OwnPtr.h" | |
| 45 #include "wtf/PassOwnPtr.h" | |
| 46 #include "wtf/Vector.h" | 44 #include "wtf/Vector.h" |
| 47 #include "wtf/text/CharacterNames.h" | 45 #include "wtf/text/CharacterNames.h" |
| 48 | |
| 49 #include <hb.h> | 46 #include <hb.h> |
| 47 #include <memory> |
| 50 #include <unicode/uscript.h> | 48 #include <unicode/uscript.h> |
| 51 | 49 |
| 52 namespace blink { | 50 namespace blink { |
| 53 | 51 |
| 54 class Font; | 52 class Font; |
| 55 class GlyphBuffer; | 53 class GlyphBuffer; |
| 56 class SimpleFontData; | 54 class SimpleFontData; |
| 57 class HarfBuzzShaper; | 55 class HarfBuzzShaper; |
| 58 class UnicodeRangeSet; | 56 class UnicodeRangeSet; |
| 59 | 57 |
| (...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 197 hb_language_t); | 195 hb_language_t); |
| 198 bool extractShapeResults(hb_buffer_t* harfBuzzBuffer, | 196 bool extractShapeResults(hb_buffer_t* harfBuzzBuffer, |
| 199 ShapeResult*, | 197 ShapeResult*, |
| 200 bool& fontCycleQueued, | 198 bool& fontCycleQueued, |
| 201 const HolesQueueItem& currentQueueItem, | 199 const HolesQueueItem& currentQueueItem, |
| 202 const SimpleFontData* currentFont, | 200 const SimpleFontData* currentFont, |
| 203 UScriptCode currentRunScript, | 201 UScriptCode currentRunScript, |
| 204 bool isLastResort); | 202 bool isLastResort); |
| 205 bool collectFallbackHintChars(Vector<UChar32>& hint, bool needsList); | 203 bool collectFallbackHintChars(Vector<UChar32>& hint, bool needsList); |
| 206 | 204 |
| 207 void insertRunIntoShapeResult(ShapeResult*, PassOwnPtr<ShapeResult::RunInfo>
runToInsert, unsigned startGlyph, unsigned numGlyphs, hb_buffer_t*); | 205 void insertRunIntoShapeResult(ShapeResult*, std::unique_ptr<ShapeResult::Run
Info> runToInsert, unsigned startGlyph, unsigned numGlyphs, hb_buffer_t*); |
| 208 | 206 |
| 209 OwnPtr<UChar[]> m_normalizedBuffer; | 207 std::unique_ptr<UChar[]> m_normalizedBuffer; |
| 210 unsigned m_normalizedBufferLength; | 208 unsigned m_normalizedBufferLength; |
| 211 | 209 |
| 212 FeaturesVector m_features; | 210 FeaturesVector m_features; |
| 213 Deque<HolesQueueItem> m_holesQueue; | 211 Deque<HolesQueueItem> m_holesQueue; |
| 214 }; | 212 }; |
| 215 | 213 |
| 216 | 214 |
| 217 } // namespace blink | 215 } // namespace blink |
| 218 | 216 |
| 219 #endif // HarfBuzzShaper_h | 217 #endif // HarfBuzzShaper_h |
| OLD | NEW |