| 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 1484 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1495 renderer->setAnimatableStyle(newStyle.get()); | 1495 renderer->setAnimatableStyle(newStyle.get()); |
| 1496 } else if (needsStyleRecalc()) { | 1496 } else if (needsStyleRecalc()) { |
| 1497 // Although no change occurred, we use the new style so that the cou
sin style sharing code won't get | 1497 // Although no change occurred, we use the new style so that the cou
sin style sharing code won't get |
| 1498 // fooled into believing this style is the same. | 1498 // fooled into believing this style is the same. |
| 1499 renderer->setStyleInternal(newStyle.get()); | 1499 renderer->setStyleInternal(newStyle.get()); |
| 1500 } | 1500 } |
| 1501 } | 1501 } |
| 1502 | 1502 |
| 1503 // 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 | 1503 // 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 |
| 1504 // 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). | 1504 // 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). |
| 1505 if (document().styleSheetCollections()->usesRemUnits() && document().documen
tElement() == this && oldStyle && newStyle && oldStyle->fontSize() != newStyle->
fontSize()) { | 1505 if (document().styleEngine()->usesRemUnits() && document().documentElement()
== this && oldStyle && newStyle && oldStyle->fontSize() != newStyle->fontSize()
) { |
| 1506 // Cached RenderStyles may depend on the re units. | 1506 // Cached RenderStyles may depend on the re units. |
| 1507 document().styleResolver()->invalidateMatchedPropertiesCache(); | 1507 document().styleResolver()->invalidateMatchedPropertiesCache(); |
| 1508 return Force; | 1508 return Force; |
| 1509 } | 1509 } |
| 1510 | 1510 |
| 1511 if (styleChangeType() >= SubtreeStyleChange) | 1511 if (styleChangeType() >= SubtreeStyleChange) |
| 1512 return Force; | 1512 return Force; |
| 1513 | 1513 |
| 1514 return max(localChange, change); | 1514 return max(localChange, change); |
| 1515 } | 1515 } |
| (...skipping 2117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3633 return 0; | 3633 return 0; |
| 3634 } | 3634 } |
| 3635 | 3635 |
| 3636 Attribute* UniqueElementData::attributeItem(unsigned index) | 3636 Attribute* UniqueElementData::attributeItem(unsigned index) |
| 3637 { | 3637 { |
| 3638 ASSERT_WITH_SECURITY_IMPLICATION(index < length()); | 3638 ASSERT_WITH_SECURITY_IMPLICATION(index < length()); |
| 3639 return &m_attributeVector.at(index); | 3639 return &m_attributeVector.at(index); |
| 3640 } | 3640 } |
| 3641 | 3641 |
| 3642 } // namespace WebCore | 3642 } // namespace WebCore |
| OLD | NEW |