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

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

Issue 1314353002: Inline CSSCounterValue::listStyle() (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@clean_up_get_string_value
Patch Set: Created 5 years, 3 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 694 matching lines...) Expand 10 before | Expand all | Expand 10 after
705 705
706 if (item->isImageValue()) { 706 if (item->isImageValue()) {
707 state.style()->setContent(state.elementStyleResources().cachedOrPend ingFromValue(state.document(), CSSPropertyContent, toCSSImageValue(item.get())), didSet); 707 state.style()->setContent(state.elementStyleResources().cachedOrPend ingFromValue(state.document(), CSSPropertyContent, toCSSImageValue(item.get())), didSet);
708 didSet = true; 708 didSet = true;
709 continue; 709 continue;
710 } 710 }
711 711
712 if (item->isCounterValue()) { 712 if (item->isCounterValue()) {
713 CSSCounterValue* counterValue = toCSSCounterValue(item.get()); 713 CSSCounterValue* counterValue = toCSSCounterValue(item.get());
714 EListStyleType listStyleType = NoneListStyle; 714 EListStyleType listStyleType = NoneListStyle;
715 CSSValueID listStyleIdent = counterValue->listStyleIdent(); 715 CSSValueID listStyleIdent = counterValue->listStyle();
716 if (listStyleIdent != CSSValueNone) 716 if (listStyleIdent != CSSValueNone)
717 listStyleType = static_cast<EListStyleType>(listStyleIdent - CSS ValueDisc); 717 listStyleType = static_cast<EListStyleType>(listStyleIdent - CSS ValueDisc);
718 OwnPtr<CounterContent> counter = adoptPtr(new CounterContent(AtomicS tring(counterValue->identifier()), listStyleType, AtomicString(counterValue->sep arator()))); 718 OwnPtr<CounterContent> counter = adoptPtr(new CounterContent(AtomicS tring(counterValue->identifier()), listStyleType, AtomicString(counterValue->sep arator())));
719 state.style()->setContent(counter.release(), didSet); 719 state.style()->setContent(counter.release(), didSet);
720 didSet = true; 720 didSet = true;
721 } 721 }
722 722
723 if (!item->isPrimitiveValue()) 723 if (!item->isPrimitiveValue())
724 continue; 724 continue;
725 725
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
832 return; 832 return;
833 case CSSValueSuper: 833 case CSSValueSuper:
834 svgStyle.setBaselineShift(BS_SUPER); 834 svgStyle.setBaselineShift(BS_SUPER);
835 return; 835 return;
836 default: 836 default:
837 ASSERT_NOT_REACHED(); 837 ASSERT_NOT_REACHED();
838 } 838 }
839 } 839 }
840 840
841 } // namespace blink 841 } // namespace blink
OLDNEW
« Source/core/css/CSSCounterValue.cpp ('K') | « Source/core/css/CSSCounterValue.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698