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

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

Issue 1977323002: Revert of Pseudo and non pseudo elements should return correct computed content value (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased manually Created 4 years, 7 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. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
4 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 4 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> 5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
6 * Copyright (C) 2011 Sencha, Inc. All rights reserved. 6 * Copyright (C) 2011 Sencha, Inc. All rights reserved.
7 * Copyright (C) 2015 Google Inc. All rights reserved. 7 * Copyright (C) 2015 Google Inc. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Lesser General Public 10 * modify it under the terms of the GNU Lesser General Public
(...skipping 2509 matching lines...) Expand 10 before | Expand all | Expand 10 after
2520 if (style.getTextCombine() == TextCombineAll) 2520 if (style.getTextCombine() == TextCombineAll)
2521 return CSSPrimitiveValue::createIdentifier(CSSValueHorizontal); 2521 return CSSPrimitiveValue::createIdentifier(CSSValueHorizontal);
2522 case CSSPropertyTextCombineUpright: 2522 case CSSPropertyTextCombineUpright:
2523 return cssValuePool().createValue(style.getTextCombine()); 2523 return cssValuePool().createValue(style.getTextCombine());
2524 case CSSPropertyWebkitTextOrientation: 2524 case CSSPropertyWebkitTextOrientation:
2525 if (style.getTextOrientation() == TextOrientationMixed) 2525 if (style.getTextOrientation() == TextOrientationMixed)
2526 return CSSPrimitiveValue::createIdentifier(CSSValueVerticalRight); 2526 return CSSPrimitiveValue::createIdentifier(CSSValueVerticalRight);
2527 case CSSPropertyTextOrientation: 2527 case CSSPropertyTextOrientation:
2528 return CSSPrimitiveValue::create(style.getTextOrientation()); 2528 return CSSPrimitiveValue::create(style.getTextOrientation());
2529 case CSSPropertyContent: 2529 case CSSPropertyContent:
2530 if (style.styleType() == PseudoIdNone)
2531 return cssValuePool().createIdentifierValue(CSSValueNormal);
2532 if (!style.hasContent() && (style.styleType() == PseudoIdBefore || style .styleType() == PseudoIdAfter))
2533 return cssValuePool().createIdentifierValue(CSSValueNone);
2534 return valueForContentData(style); 2530 return valueForContentData(style);
2535 case CSSPropertyCounterIncrement: 2531 case CSSPropertyCounterIncrement:
2536 return valueForCounterDirectives(style, propertyID); 2532 return valueForCounterDirectives(style, propertyID);
2537 case CSSPropertyCounterReset: 2533 case CSSPropertyCounterReset:
2538 return valueForCounterDirectives(style, propertyID); 2534 return valueForCounterDirectives(style, propertyID);
2539 case CSSPropertyWebkitClipPath: 2535 case CSSPropertyWebkitClipPath:
2540 if (ClipPathOperation* operation = style.clipPath()) { 2536 if (ClipPathOperation* operation = style.clipPath()) {
2541 if (operation->type() == ClipPathOperation::SHAPE) 2537 if (operation->type() == ClipPathOperation::SHAPE)
2542 return valueForBasicShape(style, toShapeClipPathOperation(operat ion)->basicShape()); 2538 return valueForBasicShape(style, toShapeClipPathOperation(operat ion)->basicShape());
2543 if (operation->type() == ClipPathOperation::REFERENCE) 2539 if (operation->type() == ClipPathOperation::REFERENCE)
(...skipping 366 matching lines...) Expand 10 before | Expand all | Expand 10 after
2910 case CSSPropertyAll: 2906 case CSSPropertyAll:
2911 return nullptr; 2907 return nullptr;
2912 default: 2908 default:
2913 break; 2909 break;
2914 } 2910 }
2915 ASSERT_NOT_REACHED(); 2911 ASSERT_NOT_REACHED();
2916 return nullptr; 2912 return nullptr;
2917 } 2913 }
2918 2914
2919 } // namespace blink 2915 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698