| 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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 42 | 42 |
| 43 // Note that we don't cache the original RenderStyle instance. It may be fur
ther modified. | 43 // Note that we don't cache the original RenderStyle instance. It may be fur
ther modified. |
| 44 // The RenderStyle in the cache is really just a holder for the substructure
s and never used as-is. | 44 // The RenderStyle in the cache is really just a holder for the substructure
s and never used as-is. |
| 45 this->renderStyle = RenderStyle::clone(style); | 45 this->renderStyle = RenderStyle::clone(style); |
| 46 this->parentRenderStyle = RenderStyle::clone(parentStyle); | 46 this->parentRenderStyle = RenderStyle::clone(parentStyle); |
| 47 } | 47 } |
| 48 | 48 |
| 49 void CachedMatchedProperties::clear() | 49 void CachedMatchedProperties::clear() |
| 50 { | 50 { |
| 51 matchedProperties.clear(); | 51 matchedProperties.clear(); |
| 52 renderStyle = 0; | 52 renderStyle = nullptr; |
| 53 parentRenderStyle = 0; | 53 parentRenderStyle = nullptr; |
| 54 } | 54 } |
| 55 | 55 |
| 56 MatchedPropertiesCache::MatchedPropertiesCache() | 56 MatchedPropertiesCache::MatchedPropertiesCache() |
| 57 : m_additionsSinceLastSweep(0) | 57 : m_additionsSinceLastSweep(0) |
| 58 , m_sweepTimer(this, &MatchedPropertiesCache::sweep) | 58 , m_sweepTimer(this, &MatchedPropertiesCache::sweep) |
| 59 { | 59 { |
| 60 } | 60 } |
| 61 | 61 |
| 62 const CachedMatchedProperties* MatchedPropertiesCache::find(unsigned hash, const
StyleResolverState& styleResolverState, const MatchResult& matchResult) | 62 const CachedMatchedProperties* MatchedPropertiesCache::find(unsigned hash, const
StyleResolverState& styleResolverState, const MatchResult& matchResult) |
| 63 { | 63 { |
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 163 // CSSPropertyInternalCallback sets the rule's selector name into the Render
Style, and that's not recalculated if the RenderStyle is loaded from the cache,
so don't cache it. | 163 // CSSPropertyInternalCallback sets the rule's selector name into the Render
Style, and that's not recalculated if the RenderStyle is loaded from the cache,
so don't cache it. |
| 164 if (!style->callbackSelectors().isEmpty()) | 164 if (!style->callbackSelectors().isEmpty()) |
| 165 return false; | 165 return false; |
| 166 // The cache assumes static knowledge about which properties are inherited. | 166 // The cache assumes static knowledge about which properties are inherited. |
| 167 if (parentStyle->hasExplicitlyInheritedProperties()) | 167 if (parentStyle->hasExplicitlyInheritedProperties()) |
| 168 return false; | 168 return false; |
| 169 return true; | 169 return true; |
| 170 } | 170 } |
| 171 | 171 |
| 172 } | 172 } |
| OLD | NEW |