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 936 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
947 state.setLineHeightValue(0); | 947 state.setLineHeightValue(0); |
948 state.fontBuilder().setInitial(state.style()->effectiveZoom()); | 948 state.fontBuilder().setInitial(state.style()->effectiveZoom()); |
949 state.style()->font().update(document().styleEngine()->fontSelector()); | 949 state.style()->font().update(document().styleEngine()->fontSelector()); |
950 return state.takeStyle(); | 950 return state.takeStyle(); |
951 } | 951 } |
952 | 952 |
953 PassRefPtr<RenderStyle> StyleResolver::styleForText(Text* textNode) | 953 PassRefPtr<RenderStyle> StyleResolver::styleForText(Text* textNode) |
954 { | 954 { |
955 ASSERT(textNode); | 955 ASSERT(textNode); |
956 | 956 |
957 NodeRenderingTraversal::ParentDetails parentDetails; | 957 Node* parentNode = NodeRenderingTraversal::parent(textNode); |
958 Node* parentNode = NodeRenderingTraversal::parent(textNode, &parentDetails); | |
959 if (!parentNode || !parentNode->renderStyle()) | 958 if (!parentNode || !parentNode->renderStyle()) |
960 return defaultStyleForElement(); | 959 return defaultStyleForElement(); |
961 return parentNode->renderStyle(); | 960 return parentNode->renderStyle(); |
962 } | 961 } |
963 | 962 |
964 void StyleResolver::updateFont(StyleResolverState& state) | 963 void StyleResolver::updateFont(StyleResolverState& state) |
965 { | 964 { |
966 state.fontBuilder().createFont(document().styleEngine()->fontSelector(), sta
te.parentStyle(), state.style()); | 965 state.fontBuilder().createFont(document().styleEngine()->fontSelector(), sta
te.parentStyle(), state.style()); |
967 if (state.fontBuilder().fontSizeHasViewportUnits()) | 966 if (state.fontBuilder().fontSizeHasViewportUnits()) |
968 state.style()->setHasViewportUnits(); | 967 state.style()->setHasViewportUnits(); |
(...skipping 596 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1565 visitor->trace(m_features); | 1564 visitor->trace(m_features); |
1566 visitor->trace(m_siblingRuleSet); | 1565 visitor->trace(m_siblingRuleSet); |
1567 visitor->trace(m_uncommonAttributeRuleSet); | 1566 visitor->trace(m_uncommonAttributeRuleSet); |
1568 visitor->trace(m_watchedSelectorsRules); | 1567 visitor->trace(m_watchedSelectorsRules); |
1569 visitor->trace(m_treeBoundaryCrossingRules); | 1568 visitor->trace(m_treeBoundaryCrossingRules); |
1570 visitor->trace(m_pendingStyleSheets); | 1569 visitor->trace(m_pendingStyleSheets); |
1571 #endif | 1570 #endif |
1572 } | 1571 } |
1573 | 1572 |
1574 } // namespace blink | 1573 } // namespace blink |
OLD | NEW |