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

Side by Side Diff: Source/core/html/HTMLOptionElement.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/HTMLOptionElement.h ('k') | Source/core/html/HTMLOutputElement.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) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) 5 * (C) 2006 Alexey Proskuryakov (ap@nypop.com)
6 * Copyright (C) 2004, 2005, 2006, 2010 Apple Inc. All rights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2010 Apple Inc. All rights reserved.
7 * Copyright (C) 2010 Google Inc. All rights reserved. 7 * Copyright (C) 2010 Google Inc. All rights reserved.
8 * Copyright (C) 2011 Motorola Mobility, Inc. All rights reserved. 8 * Copyright (C) 2011 Motorola Mobility, Inc. All rights reserved.
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 28 matching lines...) Expand all
39 #include "core/html/HTMLSelectElement.h" 39 #include "core/html/HTMLSelectElement.h"
40 #include "core/html/parser/HTMLParserIdioms.h" 40 #include "core/html/parser/HTMLParserIdioms.h"
41 #include "core/rendering/RenderTheme.h" 41 #include "core/rendering/RenderTheme.h"
42 #include "wtf/Vector.h" 42 #include "wtf/Vector.h"
43 #include "wtf/text/StringBuilder.h" 43 #include "wtf/text/StringBuilder.h"
44 44
45 namespace WebCore { 45 namespace WebCore {
46 46
47 using namespace HTMLNames; 47 using namespace HTMLNames;
48 48
49 HTMLOptionElement::HTMLOptionElement(const QualifiedName& tagName, Document* doc ument) 49 HTMLOptionElement::HTMLOptionElement(const QualifiedName& tagName, Document& doc ument)
50 : HTMLElement(tagName, document) 50 : HTMLElement(tagName, document)
51 , m_disabled(false) 51 , m_disabled(false)
52 , m_isSelected(false) 52 , m_isSelected(false)
53 { 53 {
54 ASSERT(hasTagName(optionTag)); 54 ASSERT(hasTagName(optionTag));
55 setHasCustomStyleCallbacks(); 55 setHasCustomStyleCallbacks();
56 ScriptWrappable::init(this); 56 ScriptWrappable::init(this);
57 } 57 }
58 58
59 PassRefPtr<HTMLOptionElement> HTMLOptionElement::create(Document* document) 59 PassRefPtr<HTMLOptionElement> HTMLOptionElement::create(Document& document)
60 { 60 {
61 return adoptRef(new HTMLOptionElement(optionTag, document)); 61 return adoptRef(new HTMLOptionElement(optionTag, document));
62 } 62 }
63 63
64 PassRefPtr<HTMLOptionElement> HTMLOptionElement::create(const QualifiedName& tag Name, Document* document) 64 PassRefPtr<HTMLOptionElement> HTMLOptionElement::create(const QualifiedName& tag Name, Document& document)
65 { 65 {
66 return adoptRef(new HTMLOptionElement(tagName, document)); 66 return adoptRef(new HTMLOptionElement(tagName, document));
67 } 67 }
68 68
69 PassRefPtr<HTMLOptionElement> HTMLOptionElement::createForJSConstructor(Document * document, const String& data, const String& value, 69 PassRefPtr<HTMLOptionElement> HTMLOptionElement::createForJSConstructor(Document & document, const String& data, const String& value,
70 bool defaultSelected, bool selected, ExceptionState& es) 70 bool defaultSelected, bool selected, ExceptionState& es)
71 { 71 {
72 RefPtr<HTMLOptionElement> element = adoptRef(new HTMLOptionElement(optionTag , document)); 72 RefPtr<HTMLOptionElement> element = adoptRef(new HTMLOptionElement(optionTag , document));
73 73
74 RefPtr<Text> text = Text::create(document, data.isNull() ? "" : data); 74 RefPtr<Text> text = Text::create(&document, data.isNull() ? "" : data);
75 75
76 element->appendChild(text.release(), es); 76 element->appendChild(text.release(), es);
77 if (es.hadException()) 77 if (es.hadException())
78 return 0; 78 return 0;
79 79
80 if (!value.isNull()) 80 if (!value.isNull())
81 element->setValue(value); 81 element->setValue(value);
82 if (defaultSelected) 82 if (defaultSelected)
83 element->setAttribute(selectedAttr, emptyAtom); 83 element->setAttribute(selectedAttr, emptyAtom);
84 element->setSelected(selected); 84 element->setSelected(selected);
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after
368 // Text nodes inside script elements are not part of the option text. 368 // Text nodes inside script elements are not part of the option text.
369 if (node->isElementNode() && toScriptLoaderIfPossible(toElement(node))) 369 if (node->isElementNode() && toScriptLoaderIfPossible(toElement(node)))
370 node = NodeTraversal::nextSkippingChildren(node, this); 370 node = NodeTraversal::nextSkippingChildren(node, this);
371 else 371 else
372 node = NodeTraversal::next(node, this); 372 node = NodeTraversal::next(node, this);
373 } 373 }
374 return text.toString(); 374 return text.toString();
375 } 375 }
376 376
377 } // namespace WebCore 377 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/html/HTMLOptionElement.h ('k') | Source/core/html/HTMLOutputElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698