| 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 1613 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1624 | 1624 |
| 1625 ASSERT(oldStyle); | 1625 ASSERT(oldStyle); |
| 1626 | 1626 |
| 1627 InspectorInstrumentation::didRecalculateStyleForElement(this); | 1627 InspectorInstrumentation::didRecalculateStyleForElement(this); |
| 1628 | 1628 |
| 1629 if (localChange != NoChange) | 1629 if (localChange != NoChange) |
| 1630 updateCallbackSelectors(oldStyle.get(), newStyle.get()); | 1630 updateCallbackSelectors(oldStyle.get(), newStyle.get()); |
| 1631 | 1631 |
| 1632 if (RenderObject* renderer = this->renderer()) { | 1632 if (RenderObject* renderer = this->renderer()) { |
| 1633 if (localChange != NoChange || pseudoStyleCacheIsInvalid(oldStyle.get(),
newStyle.get()) || shouldNotifyRendererWithIdenticalStyles()) { | 1633 if (localChange != NoChange || pseudoStyleCacheIsInvalid(oldStyle.get(),
newStyle.get()) || shouldNotifyRendererWithIdenticalStyles()) { |
| 1634 renderer->setAnimatableStyle(newStyle.get()); | 1634 renderer->setStyle(newStyle.get()); |
| 1635 } else { | 1635 } else { |
| 1636 // Although no change occurred, we use the new style so that the cou
sin style sharing code won't get | 1636 // Although no change occurred, we use the new style so that the cou
sin style sharing code won't get |
| 1637 // fooled into believing this style is the same. | 1637 // fooled into believing this style is the same. |
| 1638 // FIXME: We may be able to remove this hack, see discussion in | 1638 // FIXME: We may be able to remove this hack, see discussion in |
| 1639 // https://codereview.chromium.org/30453002/ | 1639 // https://codereview.chromium.org/30453002/ |
| 1640 renderer->setStyleInternal(newStyle.get()); | 1640 renderer->setStyleInternal(newStyle.get()); |
| 1641 } | 1641 } |
| 1642 } | 1642 } |
| 1643 | 1643 |
| 1644 if (styleChangeType() >= SubtreeStyleChange) | 1644 if (styleChangeType() >= SubtreeStyleChange) |
| (...skipping 1981 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3626 // Before doing so, we need to resolve issues in HTMLSelectElement::recalcLi
stItems | 3626 // Before doing so, we need to resolve issues in HTMLSelectElement::recalcLi
stItems |
| 3627 // and RenderMenuList::setText. See also https://bugs.webkit.org/show_bug.cg
i?id=88405 | 3627 // and RenderMenuList::setText. See also https://bugs.webkit.org/show_bug.cg
i?id=88405 |
| 3628 if (hasTagName(optionTag) || hasTagName(optgroupTag)) | 3628 if (hasTagName(optionTag) || hasTagName(optgroupTag)) |
| 3629 return false; | 3629 return false; |
| 3630 if (FullscreenElementStack::isActiveFullScreenElement(this)) | 3630 if (FullscreenElementStack::isActiveFullScreenElement(this)) |
| 3631 return false; | 3631 return false; |
| 3632 return true; | 3632 return true; |
| 3633 } | 3633 } |
| 3634 | 3634 |
| 3635 } // namespace WebCore | 3635 } // namespace WebCore |
| OLD | NEW |