| 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. | 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. |
| 6 * All rights reserved. | 6 * All rights reserved. |
| 7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> | 7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> |
| 8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> | 8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> |
| 9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. | 9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. |
| 10 * (http://www.torchmobile.com/) | 10 * (http://www.torchmobile.com/) |
| (...skipping 1783 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1794 // If our font got dirtied, go ahead and update it now. | 1794 // If our font got dirtied, go ahead and update it now. |
| 1795 updateFont(state); | 1795 updateFont(state); |
| 1796 | 1796 |
| 1797 // Many properties depend on the font. If it changes we just apply all | 1797 // Many properties depend on the font. If it changes we just apply all |
| 1798 // properties. | 1798 // properties. |
| 1799 if (cachedMatchedProperties && | 1799 if (cachedMatchedProperties && |
| 1800 cachedMatchedProperties->computedStyle->getFontDescription() != | 1800 cachedMatchedProperties->computedStyle->getFontDescription() != |
| 1801 state.style()->getFontDescription()) | 1801 state.style()->getFontDescription()) |
| 1802 applyInheritedOnly = false; | 1802 applyInheritedOnly = false; |
| 1803 | 1803 |
| 1804 // Registered custom properties are computed after high priority properties. |
| 1805 CSSVariableResolver::computeRegisteredVariables(state); |
| 1806 |
| 1804 // Now do the normal priority UA properties. | 1807 // Now do the normal priority UA properties. |
| 1805 applyMatchedProperties<LowPropertyPriority>(state, matchResult.uaRules(), | 1808 applyMatchedProperties<LowPropertyPriority>(state, matchResult.uaRules(), |
| 1806 false, applyInheritedOnly); | 1809 false, applyInheritedOnly); |
| 1807 | 1810 |
| 1808 // Cache the UA properties to pass them to LayoutTheme in adjustComputedStyle. | 1811 // Cache the UA properties to pass them to LayoutTheme in adjustComputedStyle. |
| 1809 state.cacheUserAgentBorderAndBackground(); | 1812 state.cacheUserAgentBorderAndBackground(); |
| 1810 | 1813 |
| 1811 // Now do the author and user normal priority properties and all the | 1814 // Now do the author and user normal priority properties and all the |
| 1812 // !important properties. | 1815 // !important properties. |
| 1813 applyMatchedProperties<LowPropertyPriority>(state, matchResult.authorRules(), | 1816 applyMatchedProperties<LowPropertyPriority>(state, matchResult.authorRules(), |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1946 visitor->trace(m_siblingRuleSet); | 1949 visitor->trace(m_siblingRuleSet); |
| 1947 visitor->trace(m_uncommonAttributeRuleSet); | 1950 visitor->trace(m_uncommonAttributeRuleSet); |
| 1948 visitor->trace(m_watchedSelectorsRules); | 1951 visitor->trace(m_watchedSelectorsRules); |
| 1949 visitor->trace(m_treeBoundaryCrossingScopes); | 1952 visitor->trace(m_treeBoundaryCrossingScopes); |
| 1950 visitor->trace(m_styleSharingLists); | 1953 visitor->trace(m_styleSharingLists); |
| 1951 visitor->trace(m_pendingStyleSheets); | 1954 visitor->trace(m_pendingStyleSheets); |
| 1952 visitor->trace(m_document); | 1955 visitor->trace(m_document); |
| 1953 } | 1956 } |
| 1954 | 1957 |
| 1955 } // namespace blink | 1958 } // namespace blink |
| OLD | NEW |