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. | 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 1936 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1947 } | 1947 } |
| 1948 | 1948 |
| 1949 DCHECK(oldStyle); | 1949 DCHECK(oldStyle); |
| 1950 | 1950 |
| 1951 if (localChange != NoChange) | 1951 if (localChange != NoChange) |
| 1952 updateCallbackSelectors(oldStyle.get(), newStyle.get()); | 1952 updateCallbackSelectors(oldStyle.get(), newStyle.get()); |
| 1953 | 1953 |
| 1954 if (LayoutObject* layoutObject = this->layoutObject()) { | 1954 if (LayoutObject* layoutObject = this->layoutObject()) { |
| 1955 if (localChange != NoChange || | 1955 if (localChange != NoChange || |
| 1956 pseudoStyleCacheIsInvalid(oldStyle.get(), newStyle.get()) || | 1956 pseudoStyleCacheIsInvalid(oldStyle.get(), newStyle.get()) || |
| 1957 svgFilterNeedsLayerUpdate()) { | 1957 svgFilterNeedsLayerUpdate() || |
| 1958 (layoutObject->isSVG() && layoutObject->hasClipPath())) { | |
|
fs
2016/11/07 12:03:30
This does not look right.
| |
| 1958 layoutObject->setStyle(newStyle.get()); | 1959 layoutObject->setStyle(newStyle.get()); |
| 1959 } else { | 1960 } else { |
| 1960 // Although no change occurred, we use the new style so that the cousin | 1961 // Although no change occurred, we use the new style so that the cousin |
| 1961 // style sharing code won't get fooled into believing this style is the | 1962 // style sharing code won't get fooled into believing this style is the |
| 1962 // same. | 1963 // same. |
| 1963 // FIXME: We may be able to remove this hack, see discussion in | 1964 // FIXME: We may be able to remove this hack, see discussion in |
| 1964 // https://codereview.chromium.org/30453002/ | 1965 // https://codereview.chromium.org/30453002/ |
| 1965 layoutObject->setStyleInternal(newStyle.get()); | 1966 layoutObject->setStyleInternal(newStyle.get()); |
| 1966 } | 1967 } |
| 1967 } | 1968 } |
| (...skipping 2125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4093 } | 4094 } |
| 4094 | 4095 |
| 4095 DEFINE_TRACE_WRAPPERS(Element) { | 4096 DEFINE_TRACE_WRAPPERS(Element) { |
| 4096 if (hasRareData()) { | 4097 if (hasRareData()) { |
| 4097 visitor->traceWrappers(elementRareData()); | 4098 visitor->traceWrappers(elementRareData()); |
| 4098 } | 4099 } |
| 4099 ContainerNode::traceWrappers(visitor); | 4100 ContainerNode::traceWrappers(visitor); |
| 4100 } | 4101 } |
| 4101 | 4102 |
| 4102 } // namespace blink | 4103 } // namespace blink |
| OLD | NEW |