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

Side by Side Diff: sky/engine/core/css/CSSComputedStyleDeclaration.cpp

Issue 677843004: Remove text-combine. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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 | « sky/engine/core/core.gni ('k') | sky/engine/core/css/CSSPrimitiveValueMappings.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 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Lesser General Public 9 * modify it under the terms of the GNU Lesser General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 CSSPropertyPerspective, 274 CSSPropertyPerspective,
275 CSSPropertyWebkitPerspective, 275 CSSPropertyWebkitPerspective,
276 CSSPropertyPerspectiveOrigin, 276 CSSPropertyPerspectiveOrigin,
277 CSSPropertyWebkitPerspectiveOrigin, 277 CSSPropertyWebkitPerspectiveOrigin,
278 CSSPropertyWebkitPrintColorAdjust, 278 CSSPropertyWebkitPrintColorAdjust,
279 CSSPropertyWebkitRtlOrdering, 279 CSSPropertyWebkitRtlOrdering,
280 CSSPropertyShapeOutside, 280 CSSPropertyShapeOutside,
281 CSSPropertyShapeImageThreshold, 281 CSSPropertyShapeImageThreshold,
282 CSSPropertyShapeMargin, 282 CSSPropertyShapeMargin,
283 CSSPropertyWebkitTapHighlightColor, 283 CSSPropertyWebkitTapHighlightColor,
284 CSSPropertyWebkitTextCombine,
285 CSSPropertyWebkitTextDecorationsInEffect, 284 CSSPropertyWebkitTextDecorationsInEffect,
286 CSSPropertyWebkitTextEmphasisColor, 285 CSSPropertyWebkitTextEmphasisColor,
287 CSSPropertyWebkitTextEmphasisPosition, 286 CSSPropertyWebkitTextEmphasisPosition,
288 CSSPropertyWebkitTextEmphasisStyle, 287 CSSPropertyWebkitTextEmphasisStyle,
289 CSSPropertyWebkitTextFillColor, 288 CSSPropertyWebkitTextFillColor,
290 CSSPropertyWebkitTextOrientation, 289 CSSPropertyWebkitTextOrientation,
291 CSSPropertyWebkitTextStrokeColor, 290 CSSPropertyWebkitTextStrokeColor,
292 CSSPropertyWebkitTextStrokeWidth, 291 CSSPropertyWebkitTextStrokeWidth,
293 CSSPropertyTransform, 292 CSSPropertyTransform,
294 CSSPropertyWebkitTransform, 293 CSSPropertyWebkitTransform,
(...skipping 2106 matching lines...) Expand 10 before | Expand all | Expand 10 after
2401 RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated(); 2400 RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
2402 // transition-property default value. 2401 // transition-property default value.
2403 list->append(cssValuePool().createIdentifierValue(CSSValueAll)); 2402 list->append(cssValuePool().createIdentifierValue(CSSValueAll));
2404 list->append(cssValuePool().createValue(CSSTransitionData::initialDu ration(), CSSPrimitiveValue::CSS_S)); 2403 list->append(cssValuePool().createValue(CSSTransitionData::initialDu ration(), CSSPrimitiveValue::CSS_S));
2405 list->append(createTimingFunctionValue(CSSTransitionData::initialTim ingFunction().get())); 2404 list->append(createTimingFunctionValue(CSSTransitionData::initialTim ingFunction().get()));
2406 list->append(cssValuePool().createValue(CSSTransitionData::initialDe lay(), CSSPrimitiveValue::CSS_S)); 2405 list->append(cssValuePool().createValue(CSSTransitionData::initialDe lay(), CSSPrimitiveValue::CSS_S));
2407 return list.release(); 2406 return list.release();
2408 } 2407 }
2409 case CSSPropertyPointerEvents: 2408 case CSSPropertyPointerEvents:
2410 return cssValuePool().createValue(style->pointerEvents()); 2409 return cssValuePool().createValue(style->pointerEvents());
2411 case CSSPropertyWebkitTextCombine:
2412 return cssValuePool().createValue(style->textCombine());
2413 case CSSPropertyWebkitTextOrientation: 2410 case CSSPropertyWebkitTextOrientation:
2414 return CSSPrimitiveValue::create(style->textOrientation()); 2411 return CSSPrimitiveValue::create(style->textOrientation());
2415 case CSSPropertyWebkitLineBoxContain: 2412 case CSSPropertyWebkitLineBoxContain:
2416 return createLineBoxContainValue(style->lineBoxContain()); 2413 return createLineBoxContainValue(style->lineBoxContain());
2417 case CSSPropertyContent: 2414 case CSSPropertyContent:
2418 return valueForContentData(*style); 2415 return valueForContentData(*style);
2419 case CSSPropertyWebkitClipPath: 2416 case CSSPropertyWebkitClipPath:
2420 if (ClipPathOperation* operation = style->clipPath()) { 2417 if (ClipPathOperation* operation = style->clipPath()) {
2421 if (operation->type() == ClipPathOperation::SHAPE) 2418 if (operation->type() == ClipPathOperation::SHAPE)
2422 return valueForBasicShape(*style, toShapeClipPathOperation(o peration)->basicShape()); 2419 return valueForBasicShape(*style, toShapeClipPathOperation(o peration)->basicShape());
(...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after
2750 return list.release(); 2747 return list.release();
2751 } 2748 }
2752 2749
2753 void CSSComputedStyleDeclaration::trace(Visitor* visitor) 2750 void CSSComputedStyleDeclaration::trace(Visitor* visitor)
2754 { 2751 {
2755 visitor->trace(m_node); 2752 visitor->trace(m_node);
2756 CSSStyleDeclaration::trace(visitor); 2753 CSSStyleDeclaration::trace(visitor);
2757 } 2754 }
2758 2755
2759 } // namespace blink 2756 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/core.gni ('k') | sky/engine/core/css/CSSPrimitiveValueMappings.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698