| 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 616 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 627 adjustComputedStyle(state, element); | 627 adjustComputedStyle(state, element); |
| 628 | 628 |
| 629 if (isHTMLBodyElement(*element)) | 629 if (isHTMLBodyElement(*element)) |
| 630 document().textLinkColors().setTextColor(state.style()->color()); | 630 document().textLinkColors().setTextColor(state.style()->color()); |
| 631 | 631 |
| 632 setAnimationUpdateIfNeeded(state, *element); | 632 setAnimationUpdateIfNeeded(state, *element); |
| 633 | 633 |
| 634 if (state.style()->hasViewportUnits()) | 634 if (state.style()->hasViewportUnits()) |
| 635 document().setHasViewportUnits(); | 635 document().setHasViewportUnits(); |
| 636 | 636 |
| 637 if (state.style()->hasRemUnits()) |
| 638 document().styleEngine().setUsesRemUnit(true); |
| 639 |
| 637 // Now return the style. | 640 // Now return the style. |
| 638 return state.takeStyle(); | 641 return state.takeStyle(); |
| 639 } | 642 } |
| 640 | 643 |
| 641 // This function is used by the WebAnimations JavaScript API method animate(). | 644 // This function is used by the WebAnimations JavaScript API method animate(). |
| 642 // FIXME: Remove this when animate() switches away from resolution-dependent par
sing. | 645 // FIXME: Remove this when animate() switches away from resolution-dependent par
sing. |
| 643 PassRefPtrWillBeRawPtr<AnimatableValue> StyleResolver::createAnimatableValueSnap
shot(Element& element, const ComputedStyle* baseStyle, CSSPropertyID property, C
SSValue* value) | 646 PassRefPtrWillBeRawPtr<AnimatableValue> StyleResolver::createAnimatableValueSnap
shot(Element& element, const ComputedStyle* baseStyle, CSSPropertyID property, C
SSValue* value) |
| 644 { | 647 { |
| 645 StyleResolverState state(element.document(), &element); | 648 StyleResolverState state(element.document(), &element); |
| 646 state.setStyle(baseStyle ? ComputedStyle::clone(*baseStyle) : ComputedStyle:
:create()); | 649 state.setStyle(baseStyle ? ComputedStyle::clone(*baseStyle) : ComputedStyle:
:create()); |
| (...skipping 789 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1436 visitor->trace(m_watchedSelectorsRules); | 1439 visitor->trace(m_watchedSelectorsRules); |
| 1437 visitor->trace(m_treeBoundaryCrossingRules); | 1440 visitor->trace(m_treeBoundaryCrossingRules); |
| 1438 visitor->trace(m_styleResourceLoader); | 1441 visitor->trace(m_styleResourceLoader); |
| 1439 visitor->trace(m_styleSharingLists); | 1442 visitor->trace(m_styleSharingLists); |
| 1440 visitor->trace(m_pendingStyleSheets); | 1443 visitor->trace(m_pendingStyleSheets); |
| 1441 visitor->trace(m_document); | 1444 visitor->trace(m_document); |
| 1442 #endif | 1445 #endif |
| 1443 } | 1446 } |
| 1444 | 1447 |
| 1445 } // namespace blink | 1448 } // namespace blink |
| OLD | NEW |