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

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

Issue 27139002: Fix build error when enable the CSS3_TEXT flag (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 2 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
« no previous file with comments | « no previous file | no next file » | 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 782 matching lines...) Expand 10 before | Expand all | Expand 10 after
793 if (primitiveValue->getValueID() == CSSValueFilled || primitiveValue->getVal ueID() == CSSValueOpen) { 793 if (primitiveValue->getValueID() == CSSValueFilled || primitiveValue->getVal ueID() == CSSValueOpen) {
794 state.style()->setTextEmphasisFill(*primitiveValue); 794 state.style()->setTextEmphasisFill(*primitiveValue);
795 state.style()->setTextEmphasisMark(TextEmphasisMarkAuto); 795 state.style()->setTextEmphasisMark(TextEmphasisMarkAuto);
796 } else { 796 } else {
797 state.style()->setTextEmphasisFill(TextEmphasisFillFilled); 797 state.style()->setTextEmphasisFill(TextEmphasisFillFilled);
798 state.style()->setTextEmphasisMark(*primitiveValue); 798 state.style()->setTextEmphasisMark(*primitiveValue);
799 } 799 }
800 } 800 }
801 801
802 #if ENABLE(CSS3_TEXT) 802 #if ENABLE(CSS3_TEXT)
803 void StyleBuilderFunctions::applyValueCSSPropetyWebkitTextUnderlinePosition(Styl eResolverState& state, CSSValue* value) 803 void StyleBuilderFunctions::applyValueCSSPropertyWebkitTextUnderlinePosition(Sty leResolverState& state, CSSValue* value)
804 { 804 {
805 // This is true if value is 'auto' or 'alphabetic'. 805 // This is true if value is 'auto' or 'alphabetic'.
806 if (value->isPrimitiveValue()) { 806 if (value->isPrimitiveValue()) {
807 TextUnderlinePosition t = *toCSSPrimitiveValue(value); 807 TextUnderlinePosition t = *toCSSPrimitiveValue(value);
808 state.style()->setTextUnderlinePosition(t); 808 state.style()->setTextUnderlinePosition(t);
809 return; 809 return;
810 } 810 }
811 811
812 unsigned t = 0; 812 unsigned t = 0;
813 for (CSSValueListIterator i(value); i.hasMore(); i.advance()) { 813 for (CSSValueListIterator i(value); i.hasMore(); i.advance()) {
(...skipping 1593 matching lines...) Expand 10 before | Expand all | Expand 10 after
2407 break; 2407 break;
2408 } 2408 }
2409 case CSSPropertyEnableBackground: 2409 case CSSPropertyEnableBackground:
2410 // Silently ignoring this property for now 2410 // Silently ignoring this property for now
2411 // http://bugs.webkit.org/show_bug.cgi?id=6022 2411 // http://bugs.webkit.org/show_bug.cgi?id=6022
2412 break; 2412 break;
2413 } 2413 }
2414 } 2414 }
2415 2415
2416 } // namespace WebCore 2416 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698