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

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

Issue 2577633002: [css-ui] Update resolved value of caret-color property (Closed)
Patch Set: Rebased test Created 3 years, 12 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) 2004 Zack Rusin <zack@kde.org> 2 * Copyright (C) 2004 Zack Rusin <zack@kde.org>
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc.
4 * All rights reserved. 4 * All rights reserved.
5 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 5 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
6 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> 6 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
7 * Copyright (C) 2011 Sencha, Inc. All rights reserved. 7 * Copyright (C) 2011 Sencha, Inc. All rights reserved.
8 * Copyright (C) 2015 Google Inc. All rights reserved. 8 * Copyright (C) 2015 Google Inc. All rights reserved.
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 2189 matching lines...) Expand 10 before | Expand all | Expand 10 after
2200 return CSSIdentifierValue::create(style.boxOrient()); 2200 return CSSIdentifierValue::create(style.boxOrient());
2201 case CSSPropertyWebkitBoxPack: 2201 case CSSPropertyWebkitBoxPack:
2202 return CSSIdentifierValue::create(style.boxPack()); 2202 return CSSIdentifierValue::create(style.boxPack());
2203 case CSSPropertyWebkitBoxReflect: 2203 case CSSPropertyWebkitBoxReflect:
2204 return valueForReflection(style.boxReflect(), style); 2204 return valueForReflection(style.boxReflect(), style);
2205 case CSSPropertyBoxShadow: 2205 case CSSPropertyBoxShadow:
2206 return valueForShadowList(style.boxShadow(), style, true); 2206 return valueForShadowList(style.boxShadow(), style, true);
2207 case CSSPropertyCaptionSide: 2207 case CSSPropertyCaptionSide:
2208 return CSSIdentifierValue::create(style.captionSide()); 2208 return CSSIdentifierValue::create(style.captionSide());
2209 case CSSPropertyCaretColor: 2209 case CSSPropertyCaretColor:
2210 if (style.caretColor().isCurrentColor()) 2210 return allowVisitedStyle
2211 return CSSIdentifierValue::create(CSSValueCurrentcolor); 2211 ? CSSColorValue::create(
2212 if (style.caretColor().isAutoColor()) 2212 style.visitedDependentColor(CSSPropertyCaretColor).rgb())
2213 return CSSIdentifierValue::create(CSSValueAuto); 2213 : currentColorOrValidColor(
2214 return CSSColorValue::create(style.caretColor().color().rgb()); 2214 style, style.caretColor().isAutoColor()
2215 ? StyleColor::currentColor()
2216 : style.caretColor().toStyleColor());
2215 case CSSPropertyClear: 2217 case CSSPropertyClear:
2216 return CSSIdentifierValue::create(style.clear()); 2218 return CSSIdentifierValue::create(style.clear());
2217 case CSSPropertyColor: 2219 case CSSPropertyColor:
2218 return CSSColorValue::create( 2220 return CSSColorValue::create(
2219 allowVisitedStyle 2221 allowVisitedStyle
2220 ? style.visitedDependentColor(CSSPropertyColor).rgb() 2222 ? style.visitedDependentColor(CSSPropertyColor).rgb()
2221 : style.color().rgb()); 2223 : style.color().rgb());
2222 case CSSPropertyWebkitPrintColorAdjust: 2224 case CSSPropertyWebkitPrintColorAdjust:
2223 return CSSIdentifierValue::create(style.printColorAdjust()); 2225 return CSSIdentifierValue::create(style.printColorAdjust());
2224 case CSSPropertyColumnCount: 2226 case CSSPropertyColumnCount:
(...skipping 1420 matching lines...) Expand 10 before | Expand all | Expand 10 after
3645 case CSSPropertyAll: 3647 case CSSPropertyAll:
3646 return nullptr; 3648 return nullptr;
3647 default: 3649 default:
3648 break; 3650 break;
3649 } 3651 }
3650 ASSERT_NOT_REACHED(); 3652 ASSERT_NOT_REACHED();
3651 return nullptr; 3653 return nullptr;
3652 } 3654 }
3653 3655
3654 } // namespace blink 3656 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698