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

Side by Side Diff: third_party/WebKit/Source/core/css/SelectorChecker.cpp

Issue 2151933003: Change WTF::TemporaryChange to be an alias for AutoReset (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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, 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 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 } 212 }
213 213
214 Match match; 214 Match match;
215 if (context.selector->relation() != CSSSelector::SubSelector) { 215 if (context.selector->relation() != CSSSelector::SubSelector) {
216 if (nextSelectorExceedsScope(context)) 216 if (nextSelectorExceedsScope(context))
217 return SelectorFailsCompletely; 217 return SelectorFailsCompletely;
218 218
219 if (context.pseudoId != PseudoIdNone && context.pseudoId != result.dynam icPseudo) 219 if (context.pseudoId != PseudoIdNone && context.pseudoId != result.dynam icPseudo)
220 return SelectorFailsCompletely; 220 return SelectorFailsCompletely;
221 221
222 TemporaryChange<PseudoId> dynamicPseudoScope(result.dynamicPseudo, Pseud oIdNone); 222 TemporaryChange<PseudoId> dynamicPseudoScope(&result.dynamicPseudo, Pseu doIdNone);
223 match = matchForRelation(context, result); 223 match = matchForRelation(context, result);
224 } else { 224 } else {
225 match = matchForSubSelector(context, result); 225 match = matchForSubSelector(context, result);
226 } 226 }
227 if (match == SelectorMatches) 227 if (match == SelectorMatches)
228 result.specificity += subResult.specificity; 228 result.specificity += subResult.specificity;
229 return match; 229 return match;
230 } 230 }
231 231
232 static inline SelectorChecker::SelectorCheckingContext prepareNextContextForRela tion(const SelectorChecker::SelectorCheckingContext& context) 232 static inline SelectorChecker::SelectorCheckingContext prepareNextContextForRela tion(const SelectorChecker::SelectorCheckingContext& context)
(...skipping 910 matching lines...) Expand 10 before | Expand all | Expand 10 after
1143 } 1143 }
1144 1144
1145 bool SelectorChecker::matchesFocusPseudoClass(const Element& element) 1145 bool SelectorChecker::matchesFocusPseudoClass(const Element& element)
1146 { 1146 {
1147 if (InspectorInstrumentation::forcePseudoState(const_cast<Element*>(&element ), CSSSelector::PseudoFocus)) 1147 if (InspectorInstrumentation::forcePseudoState(const_cast<Element*>(&element ), CSSSelector::PseudoFocus))
1148 return true; 1148 return true;
1149 return element.focused() && isFrameFocused(element); 1149 return element.focused() && isFrameFocused(element);
1150 } 1150 }
1151 1151
1152 } // namespace blink 1152 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698