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

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

Issue 1835773002: Rename AtomicString::string() to AtomicString::getString(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Windows Created 4 years, 8 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) 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 678 matching lines...) Expand 10 before | Expand all | Expand 10 after
689 if (item->isFunctionValue()) { 689 if (item->isFunctionValue()) {
690 CSSFunctionValue* functionValue = toCSSFunctionValue(item.get()); 690 CSSFunctionValue* functionValue = toCSSFunctionValue(item.get());
691 ASSERT(functionValue->functionType() == CSSValueAttr); 691 ASSERT(functionValue->functionType() == CSSValueAttr);
692 // FIXME: Can a namespace be specified for an attr(foo)? 692 // FIXME: Can a namespace be specified for an attr(foo)?
693 if (state.style()->styleType() == PseudoIdNone) 693 if (state.style()->styleType() == PseudoIdNone)
694 state.style()->setUnique(); 694 state.style()->setUnique();
695 else 695 else
696 state.parentStyle()->setUnique(); 696 state.parentStyle()->setUnique();
697 QualifiedName attr(nullAtom, AtomicString(toCSSCustomIdentValue(func tionValue->item(0))->value()), nullAtom); 697 QualifiedName attr(nullAtom, AtomicString(toCSSCustomIdentValue(func tionValue->item(0))->value()), nullAtom);
698 const AtomicString& value = state.element()->getAttribute(attr); 698 const AtomicString& value = state.element()->getAttribute(attr);
699 state.style()->setContent(value.isNull() ? emptyString() : value.str ing(), didSet); 699 state.style()->setContent(value.isNull() ? emptyString() : value.get String(), didSet);
700 didSet = true; 700 didSet = true;
701 } 701 }
702 702
703 if (!item->isPrimitiveValue() && !item->isStringValue()) 703 if (!item->isPrimitiveValue() && !item->isStringValue())
704 continue; 704 continue;
705 705
706 if (item->isStringValue()) { 706 if (item->isStringValue()) {
707 state.style()->setContent(toCSSStringValue(*item).value().impl(), di dSet); 707 state.style()->setContent(toCSSStringValue(*item).value().impl(), di dSet);
708 didSet = true; 708 didSet = true;
709 } else { 709 } else {
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
842 } 842 }
843 } 843 }
844 844
845 void StyleBuilderFunctions::applyInheritCSSPropertyPosition(StyleResolverState& state) 845 void StyleBuilderFunctions::applyInheritCSSPropertyPosition(StyleResolverState& state)
846 { 846 {
847 if (!state.parentNode()->isDocumentNode()) 847 if (!state.parentNode()->isDocumentNode())
848 state.style()->setPosition(state.parentStyle()->position()); 848 state.style()->setPosition(state.parentStyle()->position());
849 } 849 }
850 850
851 } // namespace blink 851 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698