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

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

Issue 23549008: Have Node::diff() take a Document reference in argument (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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/dom/Document.cpp ('k') | Source/core/dom/Node.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 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, 2013 Apple Inc. All rights reserved. 7 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 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 1462 matching lines...) Expand 10 before | Expand all | Expand 10 after
1473 return change == Reattach; 1473 return change == Reattach;
1474 } 1474 }
1475 1475
1476 Node::StyleChange Element::recalcOwnStyle(StyleChange change) 1476 Node::StyleChange Element::recalcOwnStyle(StyleChange change)
1477 { 1477 {
1478 ASSERT(document().inStyleRecalc()); 1478 ASSERT(document().inStyleRecalc());
1479 1479
1480 CSSAnimationUpdateScope cssAnimationUpdateScope(this); 1480 CSSAnimationUpdateScope cssAnimationUpdateScope(this);
1481 RefPtr<RenderStyle> oldStyle = renderStyle(); 1481 RefPtr<RenderStyle> oldStyle = renderStyle();
1482 RefPtr<RenderStyle> newStyle = styleForRenderer(); 1482 RefPtr<RenderStyle> newStyle = styleForRenderer();
1483 StyleChange localChange = oldStyle ? Node::diff(oldStyle.get(), newStyle.get (), &document()) : Reattach; 1483 StyleChange localChange = oldStyle ? Node::diff(oldStyle.get(), newStyle.get (), document()) : Reattach;
1484 1484
1485 if (localChange == Reattach) { 1485 if (localChange == Reattach) {
1486 AttachContext reattachContext; 1486 AttachContext reattachContext;
1487 reattachContext.resolvedStyle = newStyle.get(); 1487 reattachContext.resolvedStyle = newStyle.get();
1488 reattach(reattachContext); 1488 reattach(reattachContext);
1489 return Reattach; 1489 return Reattach;
1490 } 1490 }
1491 1491
1492 InspectorInstrumentation::didRecalculateStyleForElement(this); 1492 InspectorInstrumentation::didRecalculateStyleForElement(this);
1493 1493
(...skipping 2140 matching lines...) Expand 10 before | Expand all | Expand 10 after
3634 return 0; 3634 return 0;
3635 } 3635 }
3636 3636
3637 Attribute* UniqueElementData::attributeItem(unsigned index) 3637 Attribute* UniqueElementData::attributeItem(unsigned index)
3638 { 3638 {
3639 ASSERT_WITH_SECURITY_IMPLICATION(index < length()); 3639 ASSERT_WITH_SECURITY_IMPLICATION(index < length());
3640 return &m_attributeVector.at(index); 3640 return &m_attributeVector.at(index);
3641 } 3641 }
3642 3642
3643 } // namespace WebCore 3643 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/dom/Document.cpp ('k') | Source/core/dom/Node.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698