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

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

Issue 23886003: Have HTMLElements / SVGElements constructors take a Document reference in argument (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Another Android build fix Created 7 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/html/HTMLFontElement.h ('k') | Source/core/html/HTMLFormControlElement.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 * (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 20 matching lines...) Expand all
31 #include "core/css/StylePropertySet.h" 31 #include "core/css/StylePropertySet.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 34
35 using namespace WTF; 35 using namespace WTF;
36 36
37 namespace WebCore { 37 namespace WebCore {
38 38
39 using namespace HTMLNames; 39 using namespace HTMLNames;
40 40
41 HTMLFontElement::HTMLFontElement(const QualifiedName& tagName, Document* documen t) 41 HTMLFontElement::HTMLFontElement(const QualifiedName& tagName, Document& documen t)
42 : HTMLElement(tagName, document) 42 : HTMLElement(tagName, document)
43 { 43 {
44 ASSERT(hasTagName(fontTag)); 44 ASSERT(hasTagName(fontTag));
45 ScriptWrappable::init(this); 45 ScriptWrappable::init(this);
46 } 46 }
47 47
48 PassRefPtr<HTMLFontElement> HTMLFontElement::create(const QualifiedName& tagName , Document* document) 48 PassRefPtr<HTMLFontElement> HTMLFontElement::create(const QualifiedName& tagName , Document& document)
49 { 49 {
50 return adoptRef(new HTMLFontElement(tagName, document)); 50 return adoptRef(new HTMLFontElement(tagName, document));
51 } 51 }
52 52
53 // http://www.whatwg.org/specs/web-apps/current-work/multipage/rendering.html#fo nts-and-colors 53 // http://www.whatwg.org/specs/web-apps/current-work/multipage/rendering.html#fo nts-and-colors
54 template <typename CharacterType> 54 template <typename CharacterType>
55 static bool parseFontSize(const CharacterType* characters, unsigned length, int& size) 55 static bool parseFontSize(const CharacterType* characters, unsigned length, int& size)
56 { 56 {
57 57
58 // Step 1 58 // Step 1
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 } else if (name == colorAttr) 194 } else if (name == colorAttr)
195 addHTMLColorToStyle(style, CSSPropertyColor, value); 195 addHTMLColorToStyle(style, CSSPropertyColor, value);
196 else if (name == faceAttr) { 196 else if (name == faceAttr) {
197 if (RefPtr<CSSValueList> fontFaceValue = cssValuePool().createFontFaceVa lue(value)) 197 if (RefPtr<CSSValueList> fontFaceValue = cssValuePool().createFontFaceVa lue(value))
198 style->setProperty(CSSProperty(CSSPropertyFontFamily, fontFaceValue. release())); 198 style->setProperty(CSSProperty(CSSPropertyFontFamily, fontFaceValue. release()));
199 } else 199 } else
200 HTMLElement::collectStyleForPresentationAttribute(name, value, style); 200 HTMLElement::collectStyleForPresentationAttribute(name, value, style);
201 } 201 }
202 202
203 } 203 }
OLDNEW
« no previous file with comments | « Source/core/html/HTMLFontElement.h ('k') | Source/core/html/HTMLFormControlElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698