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

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

Issue 92383002: Mark AtomicString(StringImpl*) constructor as explicit (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years 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) 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 1364 matching lines...) Expand 10 before | Expand all | Expand 10 after
1375 1375
1376 if (contentValue->isString()) { 1376 if (contentValue->isString()) {
1377 state.style()->setContent(contentValue->getStringValue().imp l(), didSet); 1377 state.style()->setContent(contentValue->getStringValue().imp l(), didSet);
1378 didSet = true; 1378 didSet = true;
1379 } else if (contentValue->isAttr()) { 1379 } else if (contentValue->isAttr()) {
1380 // FIXME: Can a namespace be specified for an attr(foo)? 1380 // FIXME: Can a namespace be specified for an attr(foo)?
1381 if (state.style()->styleType() == NOPSEUDO) 1381 if (state.style()->styleType() == NOPSEUDO)
1382 state.style()->setUnique(); 1382 state.style()->setUnique();
1383 else 1383 else
1384 state.parentStyle()->setUnique(); 1384 state.parentStyle()->setUnique();
1385 QualifiedName attr(nullAtom, contentValue->getStringValue(). impl(), nullAtom); 1385 QualifiedName attr(nullAtom, AtomicString(contentValue->getS tringValue()), nullAtom);
1386 const AtomicString& value = state.element()->getAttribute(at tr); 1386 const AtomicString& value = state.element()->getAttribute(at tr);
1387 state.style()->setContent(value.isNull() ? emptyString() : v alue.string(), didSet); 1387 state.style()->setContent(value.isNull() ? emptyString() : v alue.string(), didSet);
1388 didSet = true; 1388 didSet = true;
1389 // register the fact that the attribute value affects the st yle 1389 // register the fact that the attribute value affects the st yle
1390 state.contentAttrValues().append(attr.localName()); 1390 state.contentAttrValues().append(attr.localName());
1391 } else if (contentValue->isCounter()) { 1391 } else if (contentValue->isCounter()) {
1392 Counter* counterValue = contentValue->getCounterValue(); 1392 Counter* counterValue = contentValue->getCounterValue();
1393 EListStyleType listStyleType = NoneListStyle; 1393 EListStyleType listStyleType = NoneListStyle;
1394 CSSValueID listStyleIdent = counterValue->listStyleIdent(); 1394 CSSValueID listStyleIdent = counterValue->listStyleIdent();
1395 if (listStyleIdent != CSSValueNone) 1395 if (listStyleIdent != CSSValueNone)
(...skipping 910 matching lines...) Expand 10 before | Expand all | Expand 10 after
2306 break; 2306 break;
2307 } 2307 }
2308 case CSSPropertyEnableBackground: 2308 case CSSPropertyEnableBackground:
2309 // Silently ignoring this property for now 2309 // Silently ignoring this property for now
2310 // http://bugs.webkit.org/show_bug.cgi?id=6022 2310 // http://bugs.webkit.org/show_bug.cgi?id=6022
2311 break; 2311 break;
2312 } 2312 }
2313 } 2313 }
2314 2314
2315 } // namespace WebCore 2315 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698