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

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

Issue 2796183002: Introduce the nested namespace ::blink::cssvalue, start with CSSColorValue. (Closed)
Patch Set: Use the least possible namespace scoping when aliasing. Created 3 years, 8 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
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 17 matching lines...) Expand all
28 #include "core/css/CSSValueList.h" 28 #include "core/css/CSSValueList.h"
29 #include "core/css/CSSValuePool.h" 29 #include "core/css/CSSValuePool.h"
30 #include "core/css/StylePropertySet.h" 30 #include "core/css/StylePropertySet.h"
31 #include "core/css/parser/CSSParser.h" 31 #include "core/css/parser/CSSParser.h"
32 #include "core/html/parser/HTMLParserIdioms.h" 32 #include "core/html/parser/HTMLParserIdioms.h"
33 #include "wtf/text/StringBuilder.h" 33 #include "wtf/text/StringBuilder.h"
34 #include "wtf/text/StringToNumber.h" 34 #include "wtf/text/StringToNumber.h"
35 35
36 namespace blink { 36 namespace blink {
37 37
38 using namespace cssvalue;
38 using namespace HTMLNames; 39 using namespace HTMLNames;
39 40
40 inline HTMLFontElement::HTMLFontElement(Document& document) 41 inline HTMLFontElement::HTMLFontElement(Document& document)
41 : HTMLElement(fontTag, document) {} 42 : HTMLElement(fontTag, document) {}
42 43
43 DEFINE_NODE_FACTORY(HTMLFontElement) 44 DEFINE_NODE_FACTORY(HTMLFontElement)
44 45
45 // http://www.whatwg.org/specs/web-apps/current-work/multipage/rendering.html#fo nts-and-colors 46 // http://www.whatwg.org/specs/web-apps/current-work/multipage/rendering.html#fo nts-and-colors
46 template <typename CharacterType> 47 template <typename CharacterType>
47 static bool parseFontSize(const CharacterType* characters, 48 static bool parseFontSize(const CharacterType* characters,
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 addHTMLColorToStyle(style, CSSPropertyColor, value); 197 addHTMLColorToStyle(style, CSSPropertyColor, value);
197 } else if (name == faceAttr && !value.isEmpty()) { 198 } else if (name == faceAttr && !value.isEmpty()) {
198 if (const CSSValueList* fontFaceValue = createFontFaceValueWithPool(value)) 199 if (const CSSValueList* fontFaceValue = createFontFaceValueWithPool(value))
199 style->setProperty(CSSProperty(CSSPropertyFontFamily, *fontFaceValue)); 200 style->setProperty(CSSProperty(CSSPropertyFontFamily, *fontFaceValue));
200 } else { 201 } else {
201 HTMLElement::collectStyleForPresentationAttribute(name, value, style); 202 HTMLElement::collectStyleForPresentationAttribute(name, value, style);
202 } 203 }
203 } 204 }
204 205
205 } // namespace blink 206 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/html/HTMLElement.cpp ('k') | third_party/WebKit/Source/core/html/HTMLHRElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698