Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(57)

Side by Side Diff: sky/engine/core/css/resolver/FontBuilder.cpp

Issue 746023002: Make absolute and sort all Sky headers (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 *
11 * This library is distributed in the hope that it will be useful, 11 * This library is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
14 * Library General Public License for more details. 14 * Library General Public License for more details.
15 * 15 *
16 * You should have received a copy of the GNU Library General Public License 16 * You should have received a copy of the GNU Library General Public License
17 * along with this library; see the file COPYING.LIB. If not, write to 17 * along with this library; see the file COPYING.LIB. If not, write to
18 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 18 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
19 * Boston, MA 02110-1301, USA. 19 * Boston, MA 02110-1301, USA.
20 * 20 *
21 */ 21 */
22 22
23 #include "config.h" 23 #include "sky/engine/config.h"
24 #include "core/css/resolver/FontBuilder.h" 24 #include "sky/engine/core/css/resolver/FontBuilder.h"
25 25
26 #include "core/css/CSSCalculationValue.h" 26 #include "sky/engine/core/css/CSSCalculationValue.h"
27 #include "core/css/CSSToLengthConversionData.h" 27 #include "sky/engine/core/css/CSSToLengthConversionData.h"
28 #include "core/css/FontSize.h" 28 #include "sky/engine/core/css/FontSize.h"
29 #include "core/frame/LocalFrame.h" 29 #include "sky/engine/core/frame/LocalFrame.h"
30 #include "core/frame/Settings.h" 30 #include "sky/engine/core/frame/Settings.h"
31 #include "core/rendering/RenderTheme.h" 31 #include "sky/engine/core/rendering/RenderTheme.h"
32 #include "core/rendering/RenderView.h" 32 #include "sky/engine/core/rendering/RenderView.h"
33 #include "platform/fonts/FontDescription.h" 33 #include "sky/engine/platform/fonts/FontDescription.h"
34 #include "platform/text/LocaleToScriptMapping.h" 34 #include "sky/engine/platform/text/LocaleToScriptMapping.h"
35 35
36 namespace blink { 36 namespace blink {
37 37
38 // FIXME: This scoping class is a short-term fix to minimize the changes in 38 // FIXME: This scoping class is a short-term fix to minimize the changes in
39 // Font-constructing logic. 39 // Font-constructing logic.
40 class FontDescriptionChangeScope { 40 class FontDescriptionChangeScope {
41 STACK_ALLOCATED(); 41 STACK_ALLOCATED();
42 public: 42 public:
43 FontDescriptionChangeScope(FontBuilder* fontBuilder) 43 FontDescriptionChangeScope(FontBuilder* fontBuilder)
44 : m_fontBuilder(fontBuilder) 44 : m_fontBuilder(fontBuilder)
(...skipping 481 matching lines...) Expand 10 before | Expand all | Expand 10 after
526 FontOrientation fontOrientation; 526 FontOrientation fontOrientation;
527 NonCJKGlyphOrientation glyphOrientation; 527 NonCJKGlyphOrientation glyphOrientation;
528 getFontAndGlyphOrientation(documentStyle, fontOrientation, glyphOrientation) ; 528 getFontAndGlyphOrientation(documentStyle, fontOrientation, glyphOrientation) ;
529 fontDescription.setOrientation(fontOrientation); 529 fontDescription.setOrientation(fontOrientation);
530 fontDescription.setNonCJKGlyphOrientation(glyphOrientation); 530 fontDescription.setNonCJKGlyphOrientation(glyphOrientation);
531 documentStyle->setFontDescription(fontDescription); 531 documentStyle->setFontDescription(fontDescription);
532 documentStyle->font().update(fontSelector); 532 documentStyle->font().update(fontSelector);
533 } 533 }
534 534
535 } 535 }
OLDNEW
« no previous file with comments | « sky/engine/core/css/resolver/FontBuilder.h ('k') | sky/engine/core/css/resolver/FontBuilderTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698