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

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

Issue 11879024: Merge 139100 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/
Patch Set: Created 7 years, 11 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/dom/Document.cpp ('k') | 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, 2012 Apple Inc. All r ights reserved. 7 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All r ights 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 721 matching lines...) Expand 10 before | Expand all | Expand 10 after
732 return; 732 return;
733 } 733 }
734 734
735 if (!inSynchronizationOfLazyAttribute) 735 if (!inSynchronizationOfLazyAttribute)
736 willModifyAttribute(name, attributeItem(index)->value(), newValue); 736 willModifyAttribute(name, attributeItem(index)->value(), newValue);
737 737
738 if (newValue != attributeItem(index)->value()) { 738 if (newValue != attributeItem(index)->value()) {
739 // If there is an Attr node hooked to this attribute, the Attr::setValue () call below 739 // If there is an Attr node hooked to this attribute, the Attr::setValue () call below
740 // will write into the ElementAttributeData. 740 // will write into the ElementAttributeData.
741 // FIXME: Refactor this so it makes some sense. 741 // FIXME: Refactor this so it makes some sense.
742 if (RefPtr<Attr> attrNode = attrIfExists(name)) 742 if (RefPtr<Attr> attrNode = inSynchronizationOfLazyAttribute ? 0 : attrI fExists(name))
743 attrNode->setValue(newValue); 743 attrNode->setValue(newValue);
744 else 744 else
745 mutableAttributeData()->attributeItem(index)->setValue(newValue); 745 mutableAttributeData()->attributeItem(index)->setValue(newValue);
746 } 746 }
747 747
748 if (!inSynchronizationOfLazyAttribute) 748 if (!inSynchronizationOfLazyAttribute)
749 didModifyAttribute(name, newValue); 749 didModifyAttribute(name, newValue);
750 } 750 }
751 751
752 static inline AtomicString makeIdForStyleResolution(const AtomicString& value, b ool inQuirksMode) 752 static inline AtomicString makeIdForStyleResolution(const AtomicString& value, b ool inQuirksMode)
(...skipping 1940 matching lines...) Expand 10 before | Expand all | Expand 10 after
2693 2693
2694 void Element::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const 2694 void Element::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
2695 { 2695 {
2696 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::DOM); 2696 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::DOM);
2697 ContainerNode::reportMemoryUsage(memoryObjectInfo); 2697 ContainerNode::reportMemoryUsage(memoryObjectInfo);
2698 info.addMember(m_tagName); 2698 info.addMember(m_tagName);
2699 info.addMember(m_attributeData); 2699 info.addMember(m_attributeData);
2700 } 2700 }
2701 2701
2702 } // namespace WebCore 2702 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/WebCore/dom/Document.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698