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

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

Issue 20672003: Avoid reaching for StyleResolver::m_features from StyleBuilder. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | Source/core/css/resolver/StyleResolver.h » ('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) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 3 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
4 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) 4 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
5 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) 5 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
10 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. 10 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
(...skipping 1096 matching lines...) Expand 10 before | Expand all | Expand 10 after
1107 // FIXME: Can a namespace be specified for an attr(foo)? 1107 // FIXME: Can a namespace be specified for an attr(foo)?
1108 if (state.style()->styleType() == NOPSEUDO) 1108 if (state.style()->styleType() == NOPSEUDO)
1109 state.style()->setUnique(); 1109 state.style()->setUnique();
1110 else 1110 else
1111 state.parentStyle()->setUnique(); 1111 state.parentStyle()->setUnique();
1112 QualifiedName attr(nullAtom, contentValue->getStringValue(). impl(), nullAtom); 1112 QualifiedName attr(nullAtom, contentValue->getStringValue(). impl(), nullAtom);
1113 const AtomicString& value = state.element()->getAttribute(at tr); 1113 const AtomicString& value = state.element()->getAttribute(at tr);
1114 state.style()->setContent(value.isNull() ? emptyAtom : value .impl(), didSet); 1114 state.style()->setContent(value.isNull() ? emptyAtom : value .impl(), didSet);
1115 didSet = true; 1115 didSet = true;
1116 // register the fact that the attribute value affects the st yle 1116 // register the fact that the attribute value affects the st yle
1117 styleResolver->m_features.attrsInRules.add(attr.localName(). impl()); 1117 state.contentAttrValues().append(attr.localName());
1118 } else if (contentValue->isCounter()) { 1118 } else if (contentValue->isCounter()) {
1119 Counter* counterValue = contentValue->getCounterValue(); 1119 Counter* counterValue = contentValue->getCounterValue();
1120 EListStyleType listStyleType = NoneListStyle; 1120 EListStyleType listStyleType = NoneListStyle;
1121 CSSValueID listStyleIdent = counterValue->listStyleIdent(); 1121 CSSValueID listStyleIdent = counterValue->listStyleIdent();
1122 if (listStyleIdent != CSSValueNone) 1122 if (listStyleIdent != CSSValueNone)
1123 listStyleType = static_cast<EListStyleType>(listStyleIde nt - CSSValueDisc); 1123 listStyleType = static_cast<EListStyleType>(listStyleIde nt - CSSValueDisc);
1124 OwnPtr<CounterContent> counter = adoptPtr(new CounterContent (counterValue->identifier(), listStyleType, counterValue->separator())); 1124 OwnPtr<CounterContent> counter = adoptPtr(new CounterContent (counterValue->identifier(), listStyleType, counterValue->separator()));
1125 state.style()->setContent(counter.release(), didSet); 1125 state.style()->setContent(counter.release(), didSet);
1126 didSet = true; 1126 didSet = true;
1127 } else { 1127 } else {
(...skipping 995 matching lines...) Expand 10 before | Expand all | Expand 10 after
2123 break; 2123 break;
2124 } 2124 }
2125 case CSSPropertyEnableBackground: 2125 case CSSPropertyEnableBackground:
2126 // Silently ignoring this property for now 2126 // Silently ignoring this property for now
2127 // http://bugs.webkit.org/show_bug.cgi?id=6022 2127 // http://bugs.webkit.org/show_bug.cgi?id=6022
2128 break; 2128 break;
2129 } 2129 }
2130 } 2130 }
2131 2131
2132 } // namespace WebCore 2132 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | Source/core/css/resolver/StyleResolver.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698