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

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

Issue 2021163002: Revert of Pseudo and non pseudo elements should return correct computed content value (patchset #14… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2704
Patch Set: Created 4 years, 6 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 2415 matching lines...) Expand 10 before | Expand all | Expand 10 after
2426 if (style.getTextCombine() == TextCombineAll) 2426 if (style.getTextCombine() == TextCombineAll)
2427 return CSSPrimitiveValue::createIdentifier(CSSValueHorizontal); 2427 return CSSPrimitiveValue::createIdentifier(CSSValueHorizontal);
2428 case CSSPropertyTextCombineUpright: 2428 case CSSPropertyTextCombineUpright:
2429 return cssValuePool().createValue(style.getTextCombine()); 2429 return cssValuePool().createValue(style.getTextCombine());
2430 case CSSPropertyWebkitTextOrientation: 2430 case CSSPropertyWebkitTextOrientation:
2431 if (style.getTextOrientation() == TextOrientationMixed) 2431 if (style.getTextOrientation() == TextOrientationMixed)
2432 return CSSPrimitiveValue::createIdentifier(CSSValueVerticalRight); 2432 return CSSPrimitiveValue::createIdentifier(CSSValueVerticalRight);
2433 case CSSPropertyTextOrientation: 2433 case CSSPropertyTextOrientation:
2434 return CSSPrimitiveValue::create(style.getTextOrientation()); 2434 return CSSPrimitiveValue::create(style.getTextOrientation());
2435 case CSSPropertyContent: 2435 case CSSPropertyContent:
2436 if (style.styleType() == PseudoIdNone)
2437 return cssValuePool().createIdentifierValue(CSSValueNormal);
2438 if (!style.hasContent() && (style.styleType() == PseudoIdBefore || style .styleType() == PseudoIdAfter))
2439 return cssValuePool().createIdentifierValue(CSSValueNone);
2440 return valueForContentData(style); 2436 return valueForContentData(style);
2441 case CSSPropertyCounterIncrement: 2437 case CSSPropertyCounterIncrement:
2442 return valueForCounterDirectives(style, propertyID); 2438 return valueForCounterDirectives(style, propertyID);
2443 case CSSPropertyCounterReset: 2439 case CSSPropertyCounterReset:
2444 return valueForCounterDirectives(style, propertyID); 2440 return valueForCounterDirectives(style, propertyID);
2445 case CSSPropertyWebkitClipPath: 2441 case CSSPropertyWebkitClipPath:
2446 if (ClipPathOperation* operation = style.clipPath()) { 2442 if (ClipPathOperation* operation = style.clipPath()) {
2447 if (operation->type() == ClipPathOperation::SHAPE) 2443 if (operation->type() == ClipPathOperation::SHAPE)
2448 return valueForBasicShape(style, toShapeClipPathOperation(operat ion)->basicShape()); 2444 return valueForBasicShape(style, toShapeClipPathOperation(operat ion)->basicShape());
2449 if (operation->type() == ClipPathOperation::REFERENCE) 2445 if (operation->type() == ClipPathOperation::REFERENCE)
(...skipping 362 matching lines...) Expand 10 before | Expand all | Expand 10 after
2812 case CSSPropertyAll: 2808 case CSSPropertyAll:
2813 return nullptr; 2809 return nullptr;
2814 default: 2810 default:
2815 break; 2811 break;
2816 } 2812 }
2817 ASSERT_NOT_REACHED(); 2813 ASSERT_NOT_REACHED();
2818 return nullptr; 2814 return nullptr;
2819 } 2815 }
2820 2816
2821 } // namespace blink 2817 } // 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