Chromium Code Reviews| 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 673 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 684 // FIXME: The CSSWG wants to specify that the effects of animations are appl ied before | 684 // FIXME: The CSSWG wants to specify that the effects of animations are appl ied before |
| 685 // important rules, but this currently happens here as we require adjustment to have happened | 685 // important rules, but this currently happens here as we require adjustment to have happened |
| 686 // before deciding which properties to transition. | 686 // before deciding which properties to transition. |
| 687 if (applyAnimatedProperties(state, element)) | 687 if (applyAnimatedProperties(state, element)) |
| 688 adjustRenderStyle(state, element); | 688 adjustRenderStyle(state, element); |
| 689 | 689 |
| 690 // FIXME: Shouldn't this be on RenderBody::styleDidChange? | 690 // FIXME: Shouldn't this be on RenderBody::styleDidChange? |
| 691 if (isHTMLBodyElement(*element)) | 691 if (isHTMLBodyElement(*element)) |
| 692 document().textLinkColors().setTextColor(state.style()->color()); | 692 document().textLinkColors().setTextColor(state.style()->color()); |
| 693 | 693 |
| 694 if (UNLIKELY(isSVGForeignObjectElement(*element))) { | |
|
fs
2014/06/02 16:07:10
Maybe add a (brief) comment about why this is done
| |
| 695 state.fontBuilder().setFontDirty(true); | |
| 696 updateFont(state); | |
| 697 } | |
| 698 | |
| 694 setAnimationUpdateIfNeeded(state, *element); | 699 setAnimationUpdateIfNeeded(state, *element); |
| 695 | 700 |
| 696 if (state.style()->hasViewportUnits()) | 701 if (state.style()->hasViewportUnits()) |
| 697 document().setHasViewportUnits(); | 702 document().setHasViewportUnits(); |
| 698 | 703 |
| 699 // Now return the style. | 704 // Now return the style. |
| 700 return state.takeStyle(); | 705 return state.takeStyle(); |
| 701 } | 706 } |
| 702 | 707 |
| 703 PassRefPtr<RenderStyle> StyleResolver::styleForKeyframe(Element* element, const RenderStyle& elementStyle, RenderStyle* parentStyle, const StyleKeyframe* keyfra me, const AtomicString& animationName) | 708 PassRefPtr<RenderStyle> StyleResolver::styleForKeyframe(Element* element, const RenderStyle& elementStyle, RenderStyle* parentStyle, const StyleKeyframe* keyfra me, const AtomicString& animationName) |
| (...skipping 799 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1503 visitor->trace(m_features); | 1508 visitor->trace(m_features); |
| 1504 visitor->trace(m_siblingRuleSet); | 1509 visitor->trace(m_siblingRuleSet); |
| 1505 visitor->trace(m_uncommonAttributeRuleSet); | 1510 visitor->trace(m_uncommonAttributeRuleSet); |
| 1506 visitor->trace(m_watchedSelectorsRules); | 1511 visitor->trace(m_watchedSelectorsRules); |
| 1507 visitor->trace(m_treeBoundaryCrossingRules); | 1512 visitor->trace(m_treeBoundaryCrossingRules); |
| 1508 visitor->trace(m_pendingStyleSheets); | 1513 visitor->trace(m_pendingStyleSheets); |
| 1509 CSSFontSelectorClient::trace(visitor); | 1514 CSSFontSelectorClient::trace(visitor); |
| 1510 } | 1515 } |
| 1511 | 1516 |
| 1512 } // namespace WebCore | 1517 } // namespace WebCore |
| OLD | NEW |