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

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

Issue 6993052: Merge 88137 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/782/
Patch Set: Created 9 years, 6 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/ChangeLog ('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 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 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 clone->copyNonAttributeProperties(this); 200 clone->copyNonAttributeProperties(this);
201 201
202 return clone.release(); 202 return clone.release();
203 } 203 }
204 204
205 PassRefPtr<Element> Element::cloneElementWithoutAttributesAndChildren() const 205 PassRefPtr<Element> Element::cloneElementWithoutAttributesAndChildren() const
206 { 206 {
207 return document()->createElement(tagQName(), false); 207 return document()->createElement(tagQName(), false);
208 } 208 }
209 209
210 void Element::copyNonAttributeProperties(const Element* source) 210 void Element::copyNonAttributeProperties(const Element*)
211 { 211 {
212 ShadowRoot* sourceShadow = source->shadowRoot();
213 removeShadowRoot();
214 if (sourceShadow) {
215 ShadowRoot* clonedShadow = ensureShadowRoot();
216 sourceShadow->cloneChildNodes(clonedShadow);
217 }
218 } 212 }
219 213
220 void Element::removeAttribute(const QualifiedName& name, ExceptionCode& ec) 214 void Element::removeAttribute(const QualifiedName& name, ExceptionCode& ec)
221 { 215 {
222 if (m_attributeMap) { 216 if (m_attributeMap) {
223 ec = 0; 217 ec = 0;
224 m_attributeMap->removeNamedItem(name, ec); 218 m_attributeMap->removeNamedItem(name, ec);
225 if (ec == NOT_FOUND_ERR) 219 if (ec == NOT_FOUND_ERR)
226 ec = 0; 220 ec = 0;
227 } 221 }
(...skipping 1743 matching lines...) Expand 10 before | Expand all | Expand 10 after
1971 1965
1972 AnimationController* animController = renderer()->animation(); 1966 AnimationController* animController = renderer()->animation();
1973 1967
1974 if (!animController) 1968 if (!animController)
1975 return 0; 1969 return 0;
1976 1970
1977 return animController->animationsForRenderer(renderer()); 1971 return animController->animationsForRenderer(renderer());
1978 } 1972 }
1979 1973
1980 } // namespace WebCore 1974 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/WebCore/ChangeLog ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698