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

Side by Side Diff: Source/WebCore/html/HTMLFormControlElement.cpp

Issue 6476015: Merge 77114 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/648/
Patch Set: Created 9 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/WebCore/html/HTMLFormControlElement.h ('k') | Source/WebCore/html/HTMLObjectElement.cpp » ('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 * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved. 5 * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
6 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) 6 * (C) 2006 Alexey Proskuryakov (ap@nypop.com)
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 158
159 HTMLElement::insertedIntoTree(deep); 159 HTMLElement::insertedIntoTree(deep);
160 } 160 }
161 161
162 void HTMLFormControlElement::removedFromTree(bool deep) 162 void HTMLFormControlElement::removedFromTree(bool deep)
163 { 163 {
164 FormAssociatedElement::removedFromTree(); 164 FormAssociatedElement::removedFromTree();
165 HTMLElement::removedFromTree(deep); 165 HTMLElement::removedFromTree(deep);
166 } 166 }
167 167
168 void HTMLFormControlElement::insertedIntoDocument()
169 {
170 HTMLElement::insertedIntoDocument();
171 FormAssociatedElement::insertedIntoDocument();
172 }
173
174 void HTMLFormControlElement::removedFromDocument()
175 {
176 HTMLElement::removedFromDocument();
177 FormAssociatedElement::removedFromDocument();
178 }
179
168 const AtomicString& HTMLFormControlElement::formControlName() const 180 const AtomicString& HTMLFormControlElement::formControlName() const
169 { 181 {
170 const AtomicString& name = fastGetAttribute(nameAttr); 182 const AtomicString& name = fastGetAttribute(nameAttr);
171 return name.isNull() ? emptyAtom : name; 183 return name.isNull() ? emptyAtom : name;
172 } 184 }
173 185
174 void HTMLFormControlElement::setName(const AtomicString& value) 186 void HTMLFormControlElement::setName(const AtomicString& value)
175 { 187 {
176 setAttribute(nameAttr, value); 188 setAttribute(nameAttr, value);
177 } 189 }
(...skipping 465 matching lines...) Expand 10 before | Expand all | Expand 10 after
643 updatePlaceholderVisibility(true); 655 updatePlaceholderVisibility(true);
644 else if (attr->name() == onselectAttr) 656 else if (attr->name() == onselectAttr)
645 setAttributeEventListener(eventNames().selectEvent, createAttributeEvent Listener(this, attr)); 657 setAttributeEventListener(eventNames().selectEvent, createAttributeEvent Listener(this, attr));
646 else if (attr->name() == onchangeAttr) 658 else if (attr->name() == onchangeAttr)
647 setAttributeEventListener(eventNames().changeEvent, createAttributeEvent Listener(this, attr)); 659 setAttributeEventListener(eventNames().changeEvent, createAttributeEvent Listener(this, attr));
648 else 660 else
649 HTMLFormControlElementWithState::parseMappedAttribute(attr); 661 HTMLFormControlElementWithState::parseMappedAttribute(attr);
650 } 662 }
651 663
652 } // namespace Webcore 664 } // namespace Webcore
OLDNEW
« no previous file with comments | « Source/WebCore/html/HTMLFormControlElement.h ('k') | Source/WebCore/html/HTMLObjectElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698