| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2015 Google Inc. All rights reserved. | 2 * Copyright (c) 2015 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 14 matching lines...) Expand all Loading... |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "platform/fonts/shaping/Shaper.h" | 31 #include "platform/fonts/shaping/Shaper.h" |
| 32 | 32 |
| 33 #include "platform/fonts/Font.h" | 33 #include "platform/fonts/Font.h" |
| 34 #include "platform/fonts/GlyphBuffer.h" | 34 #include "platform/fonts/GlyphBuffer.h" |
| 35 #include "platform/fonts/GlyphPage.h" | |
| 36 #include "platform/text/TextRun.h" | 35 #include "platform/text/TextRun.h" |
| 37 | 36 |
| 38 namespace blink { | 37 namespace blink { |
| 39 | 38 |
| 40 Shaper::Shaper(const Font* font, | 39 Shaper::Shaper(const Font* font, |
| 41 const TextRun& run, | 40 const TextRun& run, |
| 42 const GlyphData* emphasisData, | 41 const GlyphData* emphasisData, |
| 43 HashSet<const SimpleFontData*>* fallbackFonts, | 42 HashSet<const SimpleFontData*>* fallbackFonts, |
| 44 FloatRect* bounds) | 43 FloatRect* bounds) |
| 45 : m_font(font), | 44 : m_font(font), |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 80 void Shaper::trackNonPrimaryFallbackFont(const SimpleFontData* fontData) { | 79 void Shaper::trackNonPrimaryFallbackFont(const SimpleFontData* fontData) { |
| 81 ASSERT(m_fallbackFonts); | 80 ASSERT(m_fallbackFonts); |
| 82 | 81 |
| 83 if (fontData == m_font->primaryFont()) | 82 if (fontData == m_font->primaryFont()) |
| 84 return; | 83 return; |
| 85 | 84 |
| 86 m_fallbackFonts->add(fontData); | 85 m_fallbackFonts->add(fontData); |
| 87 } | 86 } |
| 88 | 87 |
| 89 } // namespace blink | 88 } // namespace blink |
| OLD | NEW |