| 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 735 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 746 ElementAnimations* elementAnimations = element->elementAnimations(); | 746 ElementAnimations* elementAnimations = element->elementAnimations(); |
| 747 const ComputedStyle* baseComputedStyle = elementAnimations ? elementAnimatio
ns->baseComputedStyle() : nullptr; | 747 const ComputedStyle* baseComputedStyle = elementAnimations ? elementAnimatio
ns->baseComputedStyle() : nullptr; |
| 748 | 748 |
| 749 if (baseComputedStyle) { | 749 if (baseComputedStyle) { |
| 750 state.setStyle(ComputedStyle::clone(*baseComputedStyle)); | 750 state.setStyle(ComputedStyle::clone(*baseComputedStyle)); |
| 751 if (!state.parentStyle()) | 751 if (!state.parentStyle()) |
| 752 state.setParentStyle(initialStyleForElement()); | 752 state.setParentStyle(initialStyleForElement()); |
| 753 } else { | 753 } else { |
| 754 if (state.parentStyle()) { | 754 if (state.parentStyle()) { |
| 755 RefPtr<ComputedStyle> style = ComputedStyle::create(); | 755 RefPtr<ComputedStyle> style = ComputedStyle::create(); |
| 756 style->inheritFrom(*state.parentStyle(), isAtShadowBoundary(element)
? ComputedStyle::AtShadowBoundary : ComputedStyle::NotAtShadowBoundary); | 756 style->inheritFrom(*state.parentStyle(), isAtShadowBoundary(element)
? ComputedStyleBase::AtShadowBoundary : ComputedStyleBase::NotAtShadowBoundary)
; |
| 757 state.setStyle(style.release()); | 757 state.setStyle(style.release()); |
| 758 } else { | 758 } else { |
| 759 state.setStyle(initialStyleForElement()); | 759 state.setStyle(initialStyleForElement()); |
| 760 state.setParentStyle(ComputedStyle::clone(*state.style())); | 760 state.setParentStyle(ComputedStyle::clone(*state.style())); |
| 761 } | 761 } |
| 762 } | 762 } |
| 763 | 763 |
| 764 // contenteditable attribute (implemented by -webkit-user-modify) should | 764 // contenteditable attribute (implemented by -webkit-user-modify) should |
| 765 // be propagated from shadow host to distributed node. | 765 // be propagated from shadow host to distributed node. |
| 766 if (state.distributedToInsertionPoint()) { | 766 if (state.distributedToInsertionPoint()) { |
| (...skipping 976 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1743 visitor->trace(m_siblingRuleSet); | 1743 visitor->trace(m_siblingRuleSet); |
| 1744 visitor->trace(m_uncommonAttributeRuleSet); | 1744 visitor->trace(m_uncommonAttributeRuleSet); |
| 1745 visitor->trace(m_watchedSelectorsRules); | 1745 visitor->trace(m_watchedSelectorsRules); |
| 1746 visitor->trace(m_treeBoundaryCrossingScopes); | 1746 visitor->trace(m_treeBoundaryCrossingScopes); |
| 1747 visitor->trace(m_styleSharingLists); | 1747 visitor->trace(m_styleSharingLists); |
| 1748 visitor->trace(m_pendingStyleSheets); | 1748 visitor->trace(m_pendingStyleSheets); |
| 1749 visitor->trace(m_document); | 1749 visitor->trace(m_document); |
| 1750 } | 1750 } |
| 1751 | 1751 |
| 1752 } // namespace blink | 1752 } // namespace blink |
| OLD | NEW |