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

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

Issue 1307673003: Made CSSPrimitiveValue::getString() only work for String types (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@split_out_pair
Patch Set: Review feedback 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 751 matching lines...) Expand 10 before | Expand all | Expand 10 after
762 } 762 }
763 } 763 }
764 } 764 }
765 if (!didSet) 765 if (!didSet)
766 state.style()->clearContent(); 766 state.style()->clearContent();
767 } 767 }
768 768
769 void StyleBuilderFunctions::applyValueCSSPropertyWebkitLocale(StyleResolverState & state, CSSValue* value) 769 void StyleBuilderFunctions::applyValueCSSPropertyWebkitLocale(StyleResolverState & state, CSSValue* value)
770 { 770 {
771 const CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value); 771 const CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
772 if (primitiveValue->getValueID() == CSSValueAuto) 772 if (primitiveValue->getValueID() == CSSValueAuto) {
773 state.style()->setLocale(nullAtom); 773 state.style()->setLocale(nullAtom);
774 else 774 } else {
775 ASSERT(primitiveValue->isString());
775 state.style()->setLocale(AtomicString(primitiveValue->getStringValue())) ; 776 state.style()->setLocale(AtomicString(primitiveValue->getStringValue())) ;
777 }
776 state.fontBuilder().setScript(state.style()->locale()); 778 state.fontBuilder().setScript(state.style()->locale());
777 } 779 }
778 780
779 void StyleBuilderFunctions::applyInitialCSSPropertyWebkitAppRegion(StyleResolver State&) 781 void StyleBuilderFunctions::applyInitialCSSPropertyWebkitAppRegion(StyleResolver State&)
780 { 782 {
781 } 783 }
782 784
783 void StyleBuilderFunctions::applyInheritCSSPropertyWebkitAppRegion(StyleResolver State&) 785 void StyleBuilderFunctions::applyInheritCSSPropertyWebkitAppRegion(StyleResolver State&)
784 { 786 {
785 } 787 }
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
830 return; 832 return;
831 case CSSValueSuper: 833 case CSSValueSuper:
832 svgStyle.setBaselineShift(BS_SUPER); 834 svgStyle.setBaselineShift(BS_SUPER);
833 return; 835 return;
834 default: 836 default:
835 ASSERT_NOT_REACHED(); 837 ASSERT_NOT_REACHED();
836 } 838 }
837 } 839 }
838 840
839 } // namespace blink 841 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698