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

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: 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
« no previous file with comments | « third_party/WebKit/LayoutTests/svg/css/getComputedStyle-listing-expected.txt ('k') | 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) 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 2599 matching lines...) Expand 10 before | Expand all | Expand 10 after
2610 if (style.getTextCombine() == TextCombineAll) 2610 if (style.getTextCombine() == TextCombineAll)
2611 return CSSPrimitiveValue::createIdentifier(CSSValueHorizontal); 2611 return CSSPrimitiveValue::createIdentifier(CSSValueHorizontal);
2612 case CSSPropertyTextCombineUpright: 2612 case CSSPropertyTextCombineUpright:
2613 return cssValuePool().createValue(style.getTextCombine()); 2613 return cssValuePool().createValue(style.getTextCombine());
2614 case CSSPropertyWebkitTextOrientation: 2614 case CSSPropertyWebkitTextOrientation:
2615 if (style.getTextOrientation() == TextOrientationMixed) 2615 if (style.getTextOrientation() == TextOrientationMixed)
2616 return CSSPrimitiveValue::createIdentifier(CSSValueVerticalRight); 2616 return CSSPrimitiveValue::createIdentifier(CSSValueVerticalRight);
2617 case CSSPropertyTextOrientation: 2617 case CSSPropertyTextOrientation:
2618 return CSSPrimitiveValue::create(style.getTextOrientation()); 2618 return CSSPrimitiveValue::create(style.getTextOrientation());
2619 case CSSPropertyContent: 2619 case CSSPropertyContent:
2620 if (style.styleType() == PseudoIdNone)
2621 return cssValuePool().createIdentifierValue(CSSValueNormal);
2622 if (!style.hasContent() && (style.styleType() == PseudoIdBefore || style .styleType() == PseudoIdAfter))
2623 return cssValuePool().createIdentifierValue(CSSValueNone);
2624 return valueForContentData(style); 2620 return valueForContentData(style);
2625 case CSSPropertyCounterIncrement: 2621 case CSSPropertyCounterIncrement:
2626 return valueForCounterDirectives(style, propertyID); 2622 return valueForCounterDirectives(style, propertyID);
2627 case CSSPropertyCounterReset: 2623 case CSSPropertyCounterReset:
2628 return valueForCounterDirectives(style, propertyID); 2624 return valueForCounterDirectives(style, propertyID);
2629 case CSSPropertyWebkitClipPath: 2625 case CSSPropertyWebkitClipPath:
2630 if (ClipPathOperation* operation = style.clipPath()) { 2626 if (ClipPathOperation* operation = style.clipPath()) {
2631 if (operation->type() == ClipPathOperation::SHAPE) 2627 if (operation->type() == ClipPathOperation::SHAPE)
2632 return valueForBasicShape(style, toShapeClipPathOperation(operat ion)->basicShape()); 2628 return valueForBasicShape(style, toShapeClipPathOperation(operat ion)->basicShape());
2633 if (operation->type() == ClipPathOperation::REFERENCE) 2629 if (operation->type() == ClipPathOperation::REFERENCE)
(...skipping 366 matching lines...) Expand 10 before | Expand all | Expand 10 after
3000 case CSSPropertyAll: 2996 case CSSPropertyAll:
3001 return nullptr; 2997 return nullptr;
3002 default: 2998 default:
3003 break; 2999 break;
3004 } 3000 }
3005 ASSERT_NOT_REACHED(); 3001 ASSERT_NOT_REACHED();
3006 return nullptr; 3002 return nullptr;
3007 } 3003 }
3008 3004
3009 } // namespace blink 3005 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/svg/css/getComputedStyle-listing-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698