| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) | 3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) |
| 4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) | 4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) |
| 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc.
All rights reserved. | 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc.
All rights reserved. |
| 6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> | 6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> |
| 7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> | 7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> |
| 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t
orchmobile.com/) | 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t
orchmobile.com/) |
| 9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. | 9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. |
| 10 * Copyright (C) Research In Motion Limited 2011. All rights reserved. | 10 * Copyright (C) Research In Motion Limited 2011. All rights reserved. |
| (...skipping 1340 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1351 if (property == CSSPropertyAll) { | 1351 if (property == CSSPropertyAll) { |
| 1352 applyAllProperty<pass>(state, current.value()); | 1352 applyAllProperty<pass>(state, current.value()); |
| 1353 continue; | 1353 continue; |
| 1354 } | 1354 } |
| 1355 | 1355 |
| 1356 if (inheritedOnly && !current.isInherited()) { | 1356 if (inheritedOnly && !current.isInherited()) { |
| 1357 // If the property value is explicitly inherited, we need to apply f
urther non-inherited properties | 1357 // If the property value is explicitly inherited, we need to apply f
urther non-inherited properties |
| 1358 // as they might override the value inherited here. For this reason
we don't allow declarations with | 1358 // as they might override the value inherited here. For this reason
we don't allow declarations with |
| 1359 // explicitly inherited properties to be cached. | 1359 // explicitly inherited properties to be cached. |
| 1360 ASSERT(!current.value()->isInheritedValue()); | 1360 ASSERT(!current.value()->isInheritedValue()); |
| 1361 TrackExceptionState es; |
| 1362 if (current.value()->isInheritedValue()) |
| 1363 state.element()->setAttribute("badThings", "haveHappened", es); |
| 1361 continue; | 1364 continue; |
| 1362 } | 1365 } |
| 1363 | 1366 |
| 1364 if (propertyWhitelistType == PropertyWhitelistCue && !isValidCueStylePro
perty(property)) | 1367 if (propertyWhitelistType == PropertyWhitelistCue && !isValidCueStylePro
perty(property)) |
| 1365 continue; | 1368 continue; |
| 1366 if (propertyWhitelistType == PropertyWhitelistFirstLetter && !isValidFir
stLetterStyleProperty(property)) | 1369 if (propertyWhitelistType == PropertyWhitelistFirstLetter && !isValidFir
stLetterStyleProperty(property)) |
| 1367 continue; | 1370 continue; |
| 1368 if (!isPropertyForPass<pass>(property)) | 1371 if (!isPropertyForPass<pass>(property)) |
| 1369 continue; | 1372 continue; |
| 1370 if (pass == HighPriorityProperties && property == CSSPropertyLineHeight) | 1373 if (pass == HighPriorityProperties && property == CSSPropertyLineHeight) |
| (...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1596 visitor->trace(m_viewportStyleResolver); | 1599 visitor->trace(m_viewportStyleResolver); |
| 1597 visitor->trace(m_features); | 1600 visitor->trace(m_features); |
| 1598 visitor->trace(m_siblingRuleSet); | 1601 visitor->trace(m_siblingRuleSet); |
| 1599 visitor->trace(m_uncommonAttributeRuleSet); | 1602 visitor->trace(m_uncommonAttributeRuleSet); |
| 1600 visitor->trace(m_watchedSelectorsRules); | 1603 visitor->trace(m_watchedSelectorsRules); |
| 1601 visitor->trace(m_treeBoundaryCrossingRules); | 1604 visitor->trace(m_treeBoundaryCrossingRules); |
| 1602 visitor->trace(m_pendingStyleSheets); | 1605 visitor->trace(m_pendingStyleSheets); |
| 1603 } | 1606 } |
| 1604 | 1607 |
| 1605 } // namespace WebCore | 1608 } // namespace WebCore |
| OLD | NEW |