| 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 10 matching lines...) Expand all Loading... |
| 21 */ | 21 */ |
| 22 | 22 |
| 23 #include "config.h" | 23 #include "config.h" |
| 24 #include "core/css/resolver/FontBuilder.h" | 24 #include "core/css/resolver/FontBuilder.h" |
| 25 | 25 |
| 26 #include "core/css/CSSCalculationValue.h" | 26 #include "core/css/CSSCalculationValue.h" |
| 27 #include "core/css/FontFeatureValue.h" | 27 #include "core/css/FontFeatureValue.h" |
| 28 #include "core/css/FontSize.h" | 28 #include "core/css/FontSize.h" |
| 29 #include "core/page/Frame.h" | 29 #include "core/page/Frame.h" |
| 30 #include "core/page/Settings.h" | 30 #include "core/page/Settings.h" |
| 31 #include "core/platform/text/LocaleToScriptMapping.h" | |
| 32 #include "core/rendering/RenderTheme.h" | 31 #include "core/rendering/RenderTheme.h" |
| 33 #include "core/rendering/RenderView.h" | 32 #include "core/rendering/RenderView.h" |
| 33 #include "platform/text/LocaleToScriptMapping.h" |
| 34 | 34 |
| 35 namespace WebCore { | 35 namespace WebCore { |
| 36 | 36 |
| 37 // FIXME: This scoping class is a short-term fix to minimize the changes in | 37 // FIXME: This scoping class is a short-term fix to minimize the changes in |
| 38 // Font-constructing logic. | 38 // Font-constructing logic. |
| 39 class FontDescriptionChangeScope { | 39 class FontDescriptionChangeScope { |
| 40 public: | 40 public: |
| 41 FontDescriptionChangeScope(FontBuilder* fontBuilder) | 41 FontDescriptionChangeScope(FontBuilder* fontBuilder) |
| 42 : m_fontBuilder(fontBuilder) | 42 : m_fontBuilder(fontBuilder) |
| 43 , m_fontDescription(fontBuilder->m_style->fontDescription()) | 43 , m_fontDescription(fontBuilder->m_style->fontDescription()) |
| (...skipping 622 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 666 FontOrientation fontOrientation; | 666 FontOrientation fontOrientation; |
| 667 NonCJKGlyphOrientation glyphOrientation; | 667 NonCJKGlyphOrientation glyphOrientation; |
| 668 getFontAndGlyphOrientation(documentStyle, fontOrientation, glyphOrientation)
; | 668 getFontAndGlyphOrientation(documentStyle, fontOrientation, glyphOrientation)
; |
| 669 fontDescription.setOrientation(fontOrientation); | 669 fontDescription.setOrientation(fontOrientation); |
| 670 fontDescription.setNonCJKGlyphOrientation(glyphOrientation); | 670 fontDescription.setNonCJKGlyphOrientation(glyphOrientation); |
| 671 documentStyle->setFontDescription(fontDescription); | 671 documentStyle->setFontDescription(fontDescription); |
| 672 documentStyle->font().update(fontSelector); | 672 documentStyle->font().update(fontSelector); |
| 673 } | 673 } |
| 674 | 674 |
| 675 } | 675 } |
| OLD | NEW |