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. | 7 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. |
8 * All rights reserved. | 8 * All rights reserved. |
9 * (C) 2007 Eric Seidel (eric@webkit.org) | 9 * (C) 2007 Eric Seidel (eric@webkit.org) |
10 * | 10 * |
(...skipping 1864 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1875 !parentComputedStyle()) { | 1875 !parentComputedStyle()) { |
1876 data->clearComputedStyle(); | 1876 data->clearComputedStyle(); |
1877 } | 1877 } |
1878 } | 1878 } |
1879 | 1879 |
1880 if (change >= IndependentInherit) { | 1880 if (change >= IndependentInherit) { |
1881 if (ElementAnimations* elementAnimations = data->elementAnimations()) | 1881 if (ElementAnimations* elementAnimations = data->elementAnimations()) |
1882 elementAnimations->setAnimationStyleChange(false); | 1882 elementAnimations->setAnimationStyleChange(false); |
1883 } | 1883 } |
1884 } | 1884 } |
1885 if (parentComputedStyle()) | 1885 if (parentComputedStyle()) { |
1886 change = recalcOwnStyle(change); | 1886 change = recalcOwnStyle(change); |
| 1887 } else if (needsAttach()) { |
| 1888 setNeedsReattachLayoutTree(); |
| 1889 change = Reattach; |
| 1890 } |
| 1891 |
1887 // Needed because the rebuildLayoutTree code needs to see what the | 1892 // Needed because the rebuildLayoutTree code needs to see what the |
1888 // styleChangeType() was on reattach roots. See Node::reattachLayoutTree() | 1893 // styleChangeType() was on reattach roots. See Node::reattachLayoutTree() |
1889 // for an example. | 1894 // for an example. |
1890 if (change != Reattach) | 1895 if (change != Reattach) |
1891 clearNeedsStyleRecalc(); | 1896 clearNeedsStyleRecalc(); |
1892 } | 1897 } |
1893 | 1898 |
1894 // If we are going to reattach we don't need to recalc the style of | 1899 // If we are going to reattach we don't need to recalc the style of |
1895 // our descendants anymore. | 1900 // our descendants anymore. |
1896 if (change < Reattach && | 1901 if (change < Reattach && |
(...skipping 2269 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4166 } | 4171 } |
4167 | 4172 |
4168 DEFINE_TRACE_WRAPPERS(Element) { | 4173 DEFINE_TRACE_WRAPPERS(Element) { |
4169 if (hasRareData()) { | 4174 if (hasRareData()) { |
4170 visitor->traceWrappers(elementRareData()); | 4175 visitor->traceWrappers(elementRareData()); |
4171 } | 4176 } |
4172 ContainerNode::traceWrappers(visitor); | 4177 ContainerNode::traceWrappers(visitor); |
4173 } | 4178 } |
4174 | 4179 |
4175 } // namespace blink | 4180 } // namespace blink |
OLD | NEW |