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 1603 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1614 | 1614 |
| 1615 // If "rem" units are used anywhere in the document, and if the document ele ment's font size changes, then go ahead and force font updating | 1615 // If "rem" units are used anywhere in the document, and if the document ele ment's font size changes, then go ahead and force font updating |
| 1616 // all the way down the tree. This is simpler than having to maintain a cach e of objects (and such font size changes should be rare anyway). | 1616 // all the way down the tree. This is simpler than having to maintain a cach e of objects (and such font size changes should be rare anyway). |
| 1617 if (document().styleEngine()->usesRemUnits() && document().documentElement() == this && oldStyle->fontSize() != newStyle->fontSize()) { | 1617 if (document().styleEngine()->usesRemUnits() && document().documentElement() == this && oldStyle->fontSize() != newStyle->fontSize()) { |
| 1618 // Cached RenderStyles may depend on the re units. | 1618 // Cached RenderStyles may depend on the re units. |
| 1619 document().ensureStyleResolver().invalidateMatchedPropertiesCache(); | 1619 document().ensureStyleResolver().invalidateMatchedPropertiesCache(); |
| 1620 return Force; | 1620 return Force; |
| 1621 } | 1621 } |
| 1622 | 1622 |
| 1623 if (styleChangeType() >= SubtreeStyleChange) | 1623 if (styleChangeType() >= SubtreeStyleChange) |
| 1624 return Force; | 1624 return document().ensureStyleResolver().treeBoundaryCrossingRules().isEm pty() ? Inherit : Force; |
|
esprehn
2013/12/20 19:11:43
I'm not sure if this will work with adding <style>
| |
| 1625 | 1625 |
| 1626 return max(localChange, change); | 1626 return max(localChange, change); |
| 1627 } | 1627 } |
| 1628 | 1628 |
| 1629 void Element::recalcChildStyle(StyleRecalcChange change) | 1629 void Element::recalcChildStyle(StyleRecalcChange change) |
| 1630 { | 1630 { |
| 1631 ASSERT(document().inStyleRecalc()); | 1631 ASSERT(document().inStyleRecalc()); |
| 1632 ASSERT(change >= Inherit || childNeedsStyleRecalc()); | 1632 ASSERT(change >= Inherit || childNeedsStyleRecalc()); |
| 1633 ASSERT(!needsStyleRecalc()); | 1633 ASSERT(!needsStyleRecalc()); |
| 1634 | 1634 |
| (...skipping 2014 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3649 // Before doing so, we need to resolve issues in HTMLSelectElement::recalcLi stItems | 3649 // Before doing so, we need to resolve issues in HTMLSelectElement::recalcLi stItems |
| 3650 // and RenderMenuList::setText. See also https://bugs.webkit.org/show_bug.cg i?id=88405 | 3650 // and RenderMenuList::setText. See also https://bugs.webkit.org/show_bug.cg i?id=88405 |
| 3651 if (hasTagName(optionTag) || hasTagName(optgroupTag)) | 3651 if (hasTagName(optionTag) || hasTagName(optgroupTag)) |
| 3652 return false; | 3652 return false; |
| 3653 if (FullscreenElementStack::isActiveFullScreenElement(this)) | 3653 if (FullscreenElementStack::isActiveFullScreenElement(this)) |
| 3654 return false; | 3654 return false; |
| 3655 return true; | 3655 return true; |
| 3656 } | 3656 } |
| 3657 | 3657 |
| 3658 } // namespace WebCore | 3658 } // namespace WebCore |
| OLD | NEW |