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

Side by Side Diff: Source/core/css/RuleFeature.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
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 Apple Inc. All r ights reserved. 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All r ights 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 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 } 241 }
242 242
243 void RuleFeatureSet::add(const RuleFeatureSet& other) 243 void RuleFeatureSet::add(const RuleFeatureSet& other)
244 { 244 {
245 for (InvalidationSetMap::const_iterator it = other.m_classInvalidationSets.b egin(); it != other.m_classInvalidationSets.end(); ++it) { 245 for (InvalidationSetMap::const_iterator it = other.m_classInvalidationSets.b egin(); it != other.m_classInvalidationSets.end(); ++it) {
246 ensureClassInvalidationSet(it->key).combine(*it->value); 246 ensureClassInvalidationSet(it->key).combine(*it->value);
247 } 247 }
248 248
249 m_metadata.add(other.m_metadata); 249 m_metadata.add(other.m_metadata);
250 250
251 siblingRules.append(other.siblingRules); 251 siblingRules.appendVector(other.siblingRules);
252 uncommonAttributeRules.append(other.uncommonAttributeRules); 252 uncommonAttributeRules.appendVector(other.uncommonAttributeRules);
253 } 253 }
254 254
255 void RuleFeatureSet::clear() 255 void RuleFeatureSet::clear()
256 { 256 {
257 m_metadata.clear(); 257 m_metadata.clear();
258 siblingRules.clear(); 258 siblingRules.clear();
259 uncommonAttributeRules.clear(); 259 uncommonAttributeRules.clear();
260 } 260 }
261 261
262 void RuleFeatureSet::scheduleStyleInvalidationForClassChange(const SpaceSplitStr ing& changedClasses, Element* element) 262 void RuleFeatureSet::scheduleStyleInvalidationForClassChange(const SpaceSplitStr ing& changedClasses, Element* element)
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
424 element->setNeedsStyleRecalc(LocalStyleChange); 424 element->setNeedsStyleRecalc(LocalStyleChange);
425 425
426 invalidationClasses.remove(oldSize, invalidationClasses.size() - oldSize); 426 invalidationClasses.remove(oldSize, invalidationClasses.size() - oldSize);
427 element->clearChildNeedsStyleInvalidation(); 427 element->clearChildNeedsStyleInvalidation();
428 element->clearNeedsStyleInvalidation(); 428 element->clearNeedsStyleInvalidation();
429 429
430 return thisElementNeedsStyleRecalc; 430 return thisElementNeedsStyleRecalc;
431 } 431 }
432 432
433 } // namespace WebCore 433 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/accessibility/AXTable.cpp ('k') | Source/core/css/resolver/MatchedPropertiesCache.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698