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

Side by Side Diff: Source/core/html/HTMLFontElement.cpp

Issue 949233002: Do not propagate empty value for face attribute (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Add test 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 | « LayoutTests/fast/css/font-face-attribute-remove-expected.html ('k') | no next file » | 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 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Simon Hausmann <hausmann@kde.org> 4 * (C) 2000 Simon Hausmann <hausmann@kde.org>
5 * Copyright (C) 2003, 2006, 2008, 2010 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2006, 2008, 2010 Apple Inc. All rights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 } 181 }
182 182
183 void HTMLFontElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet* style) 183 void HTMLFontElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet* style)
184 { 184 {
185 if (name == sizeAttr) { 185 if (name == sizeAttr) {
186 CSSValueID size = CSSValueInvalid; 186 CSSValueID size = CSSValueInvalid;
187 if (cssValueFromFontSizeNumber(value, size)) 187 if (cssValueFromFontSizeNumber(value, size))
188 addPropertyToPresentationAttributeStyle(style, CSSPropertyFontSize, size); 188 addPropertyToPresentationAttributeStyle(style, CSSPropertyFontSize, size);
189 } else if (name == colorAttr) 189 } else if (name == colorAttr)
190 addHTMLColorToStyle(style, CSSPropertyColor, value); 190 addHTMLColorToStyle(style, CSSPropertyColor, value);
191 else if (name == faceAttr) { 191 else if (name == faceAttr && !value.isEmpty()) {
192 if (RefPtrWillBeRawPtr<CSSValueList> fontFaceValue = cssValuePool().crea teFontFaceValue(value)) 192 if (RefPtrWillBeRawPtr<CSSValueList> fontFaceValue = cssValuePool().crea teFontFaceValue(value))
193 style->setProperty(CSSProperty(CSSPropertyFontFamily, fontFaceValue. release())); 193 style->setProperty(CSSProperty(CSSPropertyFontFamily, fontFaceValue. release()));
194 } else 194 } else
195 HTMLElement::collectStyleForPresentationAttribute(name, value, style); 195 HTMLElement::collectStyleForPresentationAttribute(name, value, style);
196 } 196 }
197 197
198 } 198 }
OLDNEW
« no previous file with comments | « LayoutTests/fast/css/font-face-attribute-remove-expected.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698