OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
All rights reserved. | 3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
All rights reserved. |
4 * Copyright (C) 2013 Google Inc. All rights reserved. | 4 * Copyright (C) 2013 Google Inc. All rights reserved. |
5 * | 5 * |
6 * This library is free software; you can redistribute it and/or | 6 * This library is free software; you can redistribute it and/or |
7 * modify it under the terms of the GNU Library General Public | 7 * modify it under the terms of the GNU Library General Public |
8 * License as published by the Free Software Foundation; either | 8 * License as published by the Free Software Foundation; either |
9 * version 2 of the License, or (at your option) any later version. | 9 * version 2 of the License, or (at your option) any later version. |
10 * | 10 * |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
53 ~FontDescriptionChangeScope() | 53 ~FontDescriptionChangeScope() |
54 { | 54 { |
55 m_fontBuilder->didChangeFontParameters(m_fontBuilder->m_style->setFontDe
scription(m_fontDescription)); | 55 m_fontBuilder->didChangeFontParameters(m_fontBuilder->m_style->setFontDe
scription(m_fontDescription)); |
56 } | 56 } |
57 | 57 |
58 private: | 58 private: |
59 RawPtrWillBeMember<FontBuilder> m_fontBuilder; | 59 RawPtrWillBeMember<FontBuilder> m_fontBuilder; |
60 FontDescription m_fontDescription; | 60 FontDescription m_fontDescription; |
61 }; | 61 }; |
62 | 62 |
63 FontBuilder::FontBuilder(const Document& document) | 63 FontBuilder::FontBuilder(const Document& document, RenderStyle* style) |
64 : m_document(document) | 64 : m_document(document) |
65 , m_style(nullptr) | 65 , m_style(style) |
66 , m_fontDirty(false) | 66 , m_fontDirty(false) |
67 { | 67 { |
68 ASSERT(document.frame()); | 68 ASSERT(document.frame()); |
69 } | 69 } |
70 | 70 |
71 void FontBuilder::setInitial(float effectiveZoom) | 71 void FontBuilder::setInitial(float effectiveZoom) |
72 { | 72 { |
73 ASSERT(m_document.settings()); | 73 ASSERT(m_document.settings()); |
74 if (!m_document.settings()) | 74 if (!m_document.settings()) |
75 return; | 75 return; |
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
391 FontOrientation fontOrientation; | 391 FontOrientation fontOrientation; |
392 NonCJKGlyphOrientation glyphOrientation; | 392 NonCJKGlyphOrientation glyphOrientation; |
393 getFontAndGlyphOrientation(documentStyle, fontOrientation, glyphOrientation)
; | 393 getFontAndGlyphOrientation(documentStyle, fontOrientation, glyphOrientation)
; |
394 fontDescription.setOrientation(fontOrientation); | 394 fontDescription.setOrientation(fontOrientation); |
395 fontDescription.setNonCJKGlyphOrientation(glyphOrientation); | 395 fontDescription.setNonCJKGlyphOrientation(glyphOrientation); |
396 documentStyle->setFontDescription(fontDescription); | 396 documentStyle->setFontDescription(fontDescription); |
397 documentStyle->font().update(fontSelector); | 397 documentStyle->font().update(fontSelector); |
398 } | 398 } |
399 | 399 |
400 } | 400 } |
OLD | NEW |