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

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

Issue 1328673003: Remove -webkit-line-box-contain implementation. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix up a few more tests. Created 5 years, 3 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 | « Source/core/css/CSSValueKeywords.in ('k') | Source/core/css/parser/CSSPropertyParser.h » ('j') | 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 940 matching lines...) Expand 10 before | Expand all | Expand 10 after
951 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createCommaSeparated() ; 951 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createCommaSeparated() ;
952 if (transitionData) { 952 if (transitionData) {
953 for (size_t i = 0; i < transitionData->propertyList().size(); ++i) 953 for (size_t i = 0; i < transitionData->propertyList().size(); ++i)
954 list->append(createTransitionPropertyValue(transitionData->propertyL ist()[i])); 954 list->append(createTransitionPropertyValue(transitionData->propertyL ist()[i]));
955 } else { 955 } else {
956 list->append(cssValuePool().createIdentifierValue(CSSValueAll)); 956 list->append(cssValuePool().createIdentifierValue(CSSValueAll));
957 } 957 }
958 return list.release(); 958 return list.release();
959 } 959 }
960 960
961 static PassRefPtrWillBeRawPtr<CSSValue> createLineBoxContainValue(unsigned lineB oxContain)
962 {
963 if (!lineBoxContain)
964 return cssValuePool().createIdentifierValue(CSSValueNone);
965 return CSSLineBoxContainValue::create(lineBoxContain);
966 }
967
968 CSSValueID valueForQuoteType(const QuoteType quoteType) 961 CSSValueID valueForQuoteType(const QuoteType quoteType)
969 { 962 {
970 switch (quoteType) { 963 switch (quoteType) {
971 case NO_OPEN_QUOTE: 964 case NO_OPEN_QUOTE:
972 return CSSValueNoOpenQuote; 965 return CSSValueNoOpenQuote;
973 case NO_CLOSE_QUOTE: 966 case NO_CLOSE_QUOTE:
974 return CSSValueNoCloseQuote; 967 return CSSValueNoCloseQuote;
975 case CLOSE_QUOTE: 968 case CLOSE_QUOTE:
976 return CSSValueCloseQuote; 969 return CSSValueCloseQuote;
977 case OPEN_QUOTE: 970 case OPEN_QUOTE:
(...skipping 1326 matching lines...) Expand 10 before | Expand all | Expand 10 after
2304 return list.release(); 2297 return list.release();
2305 } 2298 }
2306 case CSSPropertyPointerEvents: 2299 case CSSPropertyPointerEvents:
2307 return cssValuePool().createValue(style.pointerEvents()); 2300 return cssValuePool().createValue(style.pointerEvents());
2308 case CSSPropertyWebkitWritingMode: 2301 case CSSPropertyWebkitWritingMode:
2309 return cssValuePool().createValue(style.writingMode()); 2302 return cssValuePool().createValue(style.writingMode());
2310 case CSSPropertyWebkitTextCombine: 2303 case CSSPropertyWebkitTextCombine:
2311 return cssValuePool().createValue(style.textCombine()); 2304 return cssValuePool().createValue(style.textCombine());
2312 case CSSPropertyWebkitTextOrientation: 2305 case CSSPropertyWebkitTextOrientation:
2313 return CSSPrimitiveValue::create(style.textOrientation()); 2306 return CSSPrimitiveValue::create(style.textOrientation());
2314 case CSSPropertyWebkitLineBoxContain:
2315 return createLineBoxContainValue(style.lineBoxContain());
2316 case CSSPropertyContent: 2307 case CSSPropertyContent:
2317 return valueForContentData(style); 2308 return valueForContentData(style);
2318 case CSSPropertyCounterIncrement: 2309 case CSSPropertyCounterIncrement:
2319 return valueForCounterDirectives(style, propertyID); 2310 return valueForCounterDirectives(style, propertyID);
2320 case CSSPropertyCounterReset: 2311 case CSSPropertyCounterReset:
2321 return valueForCounterDirectives(style, propertyID); 2312 return valueForCounterDirectives(style, propertyID);
2322 case CSSPropertyWebkitClipPath: 2313 case CSSPropertyWebkitClipPath:
2323 if (ClipPathOperation* operation = style.clipPath()) { 2314 if (ClipPathOperation* operation = style.clipPath()) {
2324 if (operation->type() == ClipPathOperation::SHAPE) 2315 if (operation->type() == ClipPathOperation::SHAPE)
2325 return valueForBasicShape(style, toShapeClipPathOperation(operat ion)->basicShape()); 2316 return valueForBasicShape(style, toShapeClipPathOperation(operat ion)->basicShape());
(...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after
2675 case CSSPropertyAll: 2666 case CSSPropertyAll:
2676 return nullptr; 2667 return nullptr;
2677 default: 2668 default:
2678 break; 2669 break;
2679 } 2670 }
2680 ASSERT_NOT_REACHED(); 2671 ASSERT_NOT_REACHED();
2681 return nullptr; 2672 return nullptr;
2682 } 2673 }
2683 2674
2684 } 2675 }
OLDNEW
« no previous file with comments | « Source/core/css/CSSValueKeywords.in ('k') | Source/core/css/parser/CSSPropertyParser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698