| 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 979 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 990 return; | 990 return; |
| 991 const Vector<Animation*>& animations = animationStack->activeAnimations(targ
et); | 991 const Vector<Animation*>& animations = animationStack->activeAnimations(targ
et); |
| 992 | 992 |
| 993 for (size_t i = 0; i < animations.size(); ++i) { | 993 for (size_t i = 0; i < animations.size(); ++i) { |
| 994 RefPtr<Animation> animation = animations.at(i); | 994 RefPtr<Animation> animation = animations.at(i); |
| 995 const AnimationEffect::CompositableValueMap* compositableValues = animat
ion->compositableValues(); | 995 const AnimationEffect::CompositableValueMap* compositableValues = animat
ion->compositableValues(); |
| 996 for (AnimationEffect::CompositableValueMap::const_iterator iter = compos
itableValues->begin(); iter != compositableValues->end(); ++iter) { | 996 for (AnimationEffect::CompositableValueMap::const_iterator iter = compos
itableValues->begin(); iter != compositableValues->end(); ++iter) { |
| 997 CSSPropertyID property = iter->key; | 997 CSSPropertyID property = iter->key; |
| 998 if (!isPropertyForPass<pass>(property)) | 998 if (!isPropertyForPass<pass>(property)) |
| 999 continue; | 999 continue; |
| 1000 RefPtr<CSSValue> value = iter->value->compositeOnto(AnimatableValue:
:neutralValue())->toCSSValue(); | 1000 RefPtr<AnimatableValue> animatableValue = iter->value->compositeOnto
(AnimatableValue::neutralValue()); |
| 1001 if (animatableValue->isDeferredSnapshot()) |
| 1002 continue; |
| 1003 RefPtr<CSSValue> cssValue = animatableValue->toCSSValue(); |
| 1001 if (pass == HighPriorityProperties && property == CSSPropertyLineHei
ght) | 1004 if (pass == HighPriorityProperties && property == CSSPropertyLineHei
ght) |
| 1002 state.setLineHeightValue(value.get()); | 1005 state.setLineHeightValue(cssValue.get()); |
| 1003 else | 1006 else |
| 1004 applyProperty(state, property, value.get()); | 1007 applyProperty(state, property, cssValue.get()); |
| 1005 } | 1008 } |
| 1006 } | 1009 } |
| 1007 } | 1010 } |
| 1008 | 1011 |
| 1009 static inline bool isValidVisitedLinkProperty(CSSPropertyID id) | 1012 static inline bool isValidVisitedLinkProperty(CSSPropertyID id) |
| 1010 { | 1013 { |
| 1011 switch (id) { | 1014 switch (id) { |
| 1012 case CSSPropertyBackgroundColor: | 1015 case CSSPropertyBackgroundColor: |
| 1013 case CSSPropertyBorderLeftColor: | 1016 case CSSPropertyBorderLeftColor: |
| 1014 case CSSPropertyBorderRightColor: | 1017 case CSSPropertyBorderRightColor: |
| (...skipping 429 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1444 fprintf(stderr, "This recalc style:\n"); | 1447 fprintf(stderr, "This recalc style:\n"); |
| 1445 printStyleStats(m_searches, m_elementsEligibleForSharing, m_stylesShared, m_
searchFoundSiblingForSharing, m_searchesMissedSharing); | 1448 printStyleStats(m_searches, m_elementsEligibleForSharing, m_stylesShared, m_
searchFoundSiblingForSharing, m_searchesMissedSharing); |
| 1446 | 1449 |
| 1447 fprintf(stderr, "Total:\n"); | 1450 fprintf(stderr, "Total:\n"); |
| 1448 printStyleStats(m_totalSearches, m_totalElementsEligibleForSharing, m_totalS
tylesShared, m_totalSearchFoundSiblingForSharing, m_totalSearchesMissedSharing); | 1451 printStyleStats(m_totalSearches, m_totalElementsEligibleForSharing, m_totalS
tylesShared, m_totalSearchFoundSiblingForSharing, m_totalSearchesMissedSharing); |
| 1449 fprintf(stderr, "-----------------------------------------------------------
---------------------\n"); | 1452 fprintf(stderr, "-----------------------------------------------------------
---------------------\n"); |
| 1450 } | 1453 } |
| 1451 #endif | 1454 #endif |
| 1452 | 1455 |
| 1453 } // namespace WebCore | 1456 } // namespace WebCore |
| OLD | NEW |