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

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

Issue 1516863004: Revert of Remove clearing of pending invalidation sets. (patchset #2 id:20001 of https://codereview… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2587
Patch Set: Created 5 years 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 | « third_party/WebKit/Source/core/css/invalidation/StyleInvalidator.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, 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 1530 matching lines...) Expand 10 before | Expand all | Expand 10 after
1541 clearElementFlag(IsInCanvasSubtree); 1541 clearElementFlag(IsInCanvasSubtree);
1542 1542
1543 if (hasRareData()) { 1543 if (hasRareData()) {
1544 ElementRareData* data = elementRareData(); 1544 ElementRareData* data = elementRareData();
1545 1545
1546 data->clearRestyleFlags(); 1546 data->clearRestyleFlags();
1547 1547
1548 if (ElementAnimations* elementAnimations = data->elementAnimations()) 1548 if (ElementAnimations* elementAnimations = data->elementAnimations())
1549 elementAnimations->cssAnimations().cancel(); 1549 elementAnimations->cssAnimations().cancel();
1550 } 1550 }
1551
1552 document().styleEngine().styleInvalidator().clearInvalidation(*this);
1553 } 1551 }
1554 1552
1555 void Element::attach(const AttachContext& context) 1553 void Element::attach(const AttachContext& context)
1556 { 1554 {
1557 ASSERT(document().inStyleRecalc()); 1555 ASSERT(document().inStyleRecalc());
1558 1556
1559 // We've already been through detach when doing an attach, but we might 1557 // We've already been through detach when doing an attach, but we might
1560 // need to clear any state that's been added since then. 1558 // need to clear any state that's been added since then.
1561 if (hasRareData() && styleChangeType() == NeedsReattachStyleChange) { 1559 if (hasRareData() && styleChangeType() == NeedsReattachStyleChange) {
1562 ElementRareData* data = elementRareData(); 1560 ElementRareData* data = elementRareData();
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
1629 ContainerNode::detach(context); 1627 ContainerNode::detach(context);
1630 1628
1631 if (!context.performingReattach && isUserActionElement()) { 1629 if (!context.performingReattach && isUserActionElement()) {
1632 if (hovered()) 1630 if (hovered())
1633 document().hoveredNodeDetached(*this); 1631 document().hoveredNodeDetached(*this);
1634 if (inActiveChain()) 1632 if (inActiveChain())
1635 document().activeChainNodeDetached(*this); 1633 document().activeChainNodeDetached(*this);
1636 document().userActionElements().didDetach(*this); 1634 document().userActionElements().didDetach(*this);
1637 } 1635 }
1638 1636
1637 document().styleEngine().styleInvalidator().clearInvalidation(*this);
1638
1639 if (svgFilterNeedsLayerUpdate()) 1639 if (svgFilterNeedsLayerUpdate())
1640 document().unscheduleSVGFilterLayerUpdateHack(*this); 1640 document().unscheduleSVGFilterLayerUpdateHack(*this);
1641 1641
1642 ASSERT(needsAttach()); 1642 ASSERT(needsAttach());
1643 } 1643 }
1644 1644
1645 bool Element::pseudoStyleCacheIsInvalid(const ComputedStyle* currentStyle, Compu tedStyle* newStyle) 1645 bool Element::pseudoStyleCacheIsInvalid(const ComputedStyle* currentStyle, Compu tedStyle* newStyle)
1646 { 1646 {
1647 ASSERT(currentStyle == computedStyle()); 1647 ASSERT(currentStyle == computedStyle());
1648 ASSERT(layoutObject()); 1648 ASSERT(layoutObject());
(...skipping 1995 matching lines...) Expand 10 before | Expand all | Expand 10 after
3644 { 3644 {
3645 #if ENABLE(OILPAN) 3645 #if ENABLE(OILPAN)
3646 if (hasRareData()) 3646 if (hasRareData())
3647 visitor->trace(elementRareData()); 3647 visitor->trace(elementRareData());
3648 visitor->trace(m_elementData); 3648 visitor->trace(m_elementData);
3649 #endif 3649 #endif
3650 ContainerNode::trace(visitor); 3650 ContainerNode::trace(visitor);
3651 } 3651 }
3652 3652
3653 } // namespace blink 3653 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/invalidation/StyleInvalidator.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698