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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
56 | 56 |
57 private: | 57 private: |
58 FontBuilder* m_fontBuilder; | 58 FontBuilder* m_fontBuilder; |
59 FontDescription m_fontDescription; | 59 FontDescription m_fontDescription; |
60 }; | 60 }; |
61 | 61 |
62 FontBuilder::FontBuilder() | 62 FontBuilder::FontBuilder() |
63 : m_document(0) | 63 : m_document(0) |
64 , m_useSVGZoomRules(false) | 64 , m_useSVGZoomRules(false) |
65 , m_fontSizehasViewportUnits(false) | 65 , m_fontSizehasViewportUnits(false) |
| 66 , m_style(0) |
66 , m_fontDirty(false) | 67 , m_fontDirty(false) |
67 { | 68 { |
68 } | 69 } |
69 | 70 |
70 void FontBuilder::initForStyleResolve(const Document& document, RenderStyle* sty
le, bool useSVGZoomRules) | 71 void FontBuilder::initForStyleResolve(const Document& document, RenderStyle* sty
le, bool useSVGZoomRules) |
71 { | 72 { |
72 // All documents need to be in a frame (and thus have access to Settings) | 73 // All documents need to be in a frame (and thus have access to Settings) |
73 // for style-resolution to make sense. | 74 // for style-resolution to make sense. |
74 // Unfortunately SVG Animations currently violate this: crbug.com/260966 | 75 // Unfortunately SVG Animations currently violate this: crbug.com/260966 |
75 // ASSERT(m_document->frame()); | 76 // ASSERT(m_document->frame()); |
(...skipping 599 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
675 FontOrientation fontOrientation; | 676 FontOrientation fontOrientation; |
676 NonCJKGlyphOrientation glyphOrientation; | 677 NonCJKGlyphOrientation glyphOrientation; |
677 getFontAndGlyphOrientation(documentStyle, fontOrientation, glyphOrientation)
; | 678 getFontAndGlyphOrientation(documentStyle, fontOrientation, glyphOrientation)
; |
678 fontDescription.setOrientation(fontOrientation); | 679 fontDescription.setOrientation(fontOrientation); |
679 fontDescription.setNonCJKGlyphOrientation(glyphOrientation); | 680 fontDescription.setNonCJKGlyphOrientation(glyphOrientation); |
680 documentStyle->setFontDescription(fontDescription); | 681 documentStyle->setFontDescription(fontDescription); |
681 documentStyle->font().update(fontSelector); | 682 documentStyle->font().update(fontSelector); |
682 } | 683 } |
683 | 684 |
684 } | 685 } |
OLD | NEW |