Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 1773 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1784 return Reattach; | 1784 return Reattach; |
| 1785 return ReattachNoLayoutObject; | 1785 return ReattachNoLayoutObject; |
| 1786 } | 1786 } |
| 1787 | 1787 |
| 1788 ASSERT(oldStyle); | 1788 ASSERT(oldStyle); |
| 1789 | 1789 |
| 1790 if (localChange != NoChange) | 1790 if (localChange != NoChange) |
| 1791 updateCallbackSelectors(oldStyle.get(), newStyle.get()); | 1791 updateCallbackSelectors(oldStyle.get(), newStyle.get()); |
| 1792 | 1792 |
| 1793 if (LayoutObject* layoutObject = this->layoutObject()) { | 1793 if (LayoutObject* layoutObject = this->layoutObject()) { |
| 1794 if (localChange != NoChange || pseudoStyleCacheIsInvalid(oldStyle.get(), newStyle.get()) || svgFilterNeedsLayerUpdate()) { | 1794 bool pseudoStyleCacheIsInvalid = this->pseudoStyleCacheIsInvalid(oldStyl e.get(), newStyle.get()); |
| 1795 if (localChange != NoChange || pseudoStyleCacheIsInvalid || svgFilterNee dsLayerUpdate()) { | |
|
rune
2015/12/01 11:09:37
I'm a bit confused about the role of diffPseudoSty
Xianzhu
2015/12/01 20:06:25
I see diffPseudoStyles() compares cached pseudo st
Xianzhu
2015/12/01 20:19:09
I reverted the changes about early returns in the
| |
| 1795 layoutObject->setStyle(newStyle.get()); | 1796 layoutObject->setStyle(newStyle.get()); |
| 1796 } else { | 1797 } else { |
| 1797 // Although no change occurred, we use the new style so that the cou sin style sharing code won't get | 1798 // Although no change occurred, we use the new style so that the cou sin style sharing code won't get |
| 1798 // fooled into believing this style is the same. | 1799 // fooled into believing this style is the same. |
| 1799 // FIXME: We may be able to remove this hack, see discussion in | 1800 // FIXME: We may be able to remove this hack, see discussion in |
| 1800 // https://codereview.chromium.org/30453002/ | 1801 // https://codereview.chromium.org/30453002/ |
| 1801 layoutObject->setStyleInternal(newStyle.get()); | 1802 layoutObject->setStyleInternal(newStyle.get()); |
| 1802 } | 1803 } |
| 1803 } | 1804 } |
| 1804 | 1805 |
| (...skipping 1762 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3567 { | 3568 { |
| 3568 #if ENABLE(OILPAN) | 3569 #if ENABLE(OILPAN) |
| 3569 if (hasRareData()) | 3570 if (hasRareData()) |
| 3570 visitor->trace(elementRareData()); | 3571 visitor->trace(elementRareData()); |
| 3571 visitor->trace(m_elementData); | 3572 visitor->trace(m_elementData); |
| 3572 #endif | 3573 #endif |
| 3573 ContainerNode::trace(visitor); | 3574 ContainerNode::trace(visitor); |
| 3574 } | 3575 } |
| 3575 | 3576 |
| 3576 } // namespace blink | 3577 } // namespace blink |
| OLD | NEW |