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

Side by Side Diff: Source/WebCore/dom/Element.cpp

Issue 10783039: Merge 122188 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1180/
Patch Set: Created 8 years, 5 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 | « no previous file | 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) 2001 Peter Kelly (pmk@post.com) 4 * (C) 2001 Peter Kelly (pmk@post.com)
5 * (C) 2001 Dirk Mueller (mueller@kde.org) 5 * (C) 2001 Dirk Mueller (mueller@kde.org)
6 * (C) 2007 David Smith (catfish.man@gmail.com) 6 * (C) 2007 David Smith (catfish.man@gmail.com)
7 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. 7 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
8 * (C) 2007 Eric Seidel (eric@webkit.org) 8 * (C) 2007 Eric Seidel (eric@webkit.org)
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 659 matching lines...) Expand 10 before | Expand all | Expand 10 after
670 670
671 if (inUpdateStyleAttribute == NotInUpdateStyleAttribute) 671 if (inUpdateStyleAttribute == NotInUpdateStyleAttribute)
672 willModifyAttribute(name, old->value(), value); 672 willModifyAttribute(name, old->value(), value);
673 673
674 if (RefPtr<Attr> attrNode = attrIfExists(name)) 674 if (RefPtr<Attr> attrNode = attrIfExists(name))
675 attrNode->setValue(value); 675 attrNode->setValue(value);
676 else 676 else
677 old->setValue(value); 677 old->setValue(value);
678 678
679 if (inUpdateStyleAttribute == NotInUpdateStyleAttribute) 679 if (inUpdateStyleAttribute == NotInUpdateStyleAttribute)
680 didModifyAttribute(*old); 680 didModifyAttribute(Attribute(old->name(), old->value()));
681 } 681 }
682 682
683 void Element::attributeChanged(const Attribute& attribute) 683 void Element::attributeChanged(const Attribute& attribute)
684 { 684 {
685 document()->incDOMTreeVersion(); 685 document()->incDOMTreeVersion();
686 686
687 if (isIdAttributeName(attribute.name())) { 687 if (isIdAttributeName(attribute.name())) {
688 if (attribute.value() != attributeData()->idForStyleResolution()) { 688 if (attribute.value() != attributeData()->idForStyleResolution()) {
689 if (attribute.isNull()) 689 if (attribute.isNull())
690 attributeData()->setIdForStyleResolution(nullAtom); 690 attributeData()->setIdForStyleResolution(nullAtom);
(...skipping 1408 matching lines...) Expand 10 before | Expand all | Expand 10 after
2099 } 2099 }
2100 } 2100 }
2101 2101
2102 void Element::cloneDataFromElement(const Element& other) 2102 void Element::cloneDataFromElement(const Element& other)
2103 { 2103 {
2104 cloneAttributesFromElement(other); 2104 cloneAttributesFromElement(other);
2105 copyNonAttributePropertiesFromElement(other); 2105 copyNonAttributePropertiesFromElement(other);
2106 } 2106 }
2107 2107
2108 } // namespace WebCore 2108 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698