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

Side by Side Diff: Source/core/css/resolver/FontBuilder.cpp

Issue 924903002: Don't allocate Strings in FontDescription(). (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 10 months 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
« no previous file with comments | « Source/core/css/resolver/FontBuilder.h ('k') | Source/platform/fonts/FontDescription.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 *
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 setSize(m_fontDescription, size); 123 setSize(m_fontDescription, size);
124 } 124 }
125 125
126 void FontBuilder::setStretch(FontStretch fontStretch) 126 void FontBuilder::setStretch(FontStretch fontStretch)
127 { 127 {
128 set(PropertySetFlag::Stretch); 128 set(PropertySetFlag::Stretch);
129 129
130 m_fontDescription.setStretch(fontStretch); 130 m_fontDescription.setStretch(fontStretch);
131 } 131 }
132 132
133 void FontBuilder::setScript(const String& locale) 133 void FontBuilder::setScript(const AtomicString& locale)
134 { 134 {
135 set(PropertySetFlag::Script); 135 set(PropertySetFlag::Script);
136 136
137 m_fontDescription.setLocale(locale); 137 m_fontDescription.setLocale(locale);
138 m_fontDescription.setScript(localeToScriptCodeForFontSelection(locale)); 138 m_fontDescription.setScript(localeToScriptCodeForFontSelection(locale));
139 } 139 }
140 140
141 void FontBuilder::setStyle(FontStyle italic) 141 void FontBuilder::setStyle(FontStyle italic)
142 { 142 {
143 set(PropertySetFlag::Style); 143 set(PropertySetFlag::Style);
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 }
OLDNEW
« no previous file with comments | « Source/core/css/resolver/FontBuilder.h ('k') | Source/platform/fonts/FontDescription.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698