Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(811)

Side by Side Diff: Source/core/css/resolver/MatchedPropertiesCache.cpp

Issue 150653006: Remove the Vector::append overload that takes a Vector (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebase Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/core/css/RuleFeature.cpp ('k') | Source/core/dom/DocumentStyleSheetCollector.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 19 matching lines...) Expand all
30 #include "core/css/resolver/MatchedPropertiesCache.h" 30 #include "core/css/resolver/MatchedPropertiesCache.h"
31 31
32 #include "core/css/StylePropertySet.h" 32 #include "core/css/StylePropertySet.h"
33 #include "core/css/resolver/StyleResolverState.h" 33 #include "core/css/resolver/StyleResolverState.h"
34 #include "core/rendering/style/RenderStyle.h" 34 #include "core/rendering/style/RenderStyle.h"
35 35
36 namespace WebCore { 36 namespace WebCore {
37 37
38 void CachedMatchedProperties::set(const RenderStyle* style, const RenderStyle* p arentStyle, const MatchResult& matchResult) 38 void CachedMatchedProperties::set(const RenderStyle* style, const RenderStyle* p arentStyle, const MatchResult& matchResult)
39 { 39 {
40 matchedProperties.append(matchResult.matchedProperties); 40 matchedProperties.appendVector(matchResult.matchedProperties);
41 ranges = matchResult.ranges; 41 ranges = matchResult.ranges;
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 {
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 }
OLDNEW
« no previous file with comments | « Source/core/css/RuleFeature.cpp ('k') | Source/core/dom/DocumentStyleSheetCollector.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698