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

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

Issue 359023002: Remove CSS Exclusions leftovers (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase against ToT Created 6 years, 5 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 * 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 312 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 CSSPropertyWebkitTransformStyle, 323 CSSPropertyWebkitTransformStyle,
324 CSSPropertyWebkitTransitionDelay, 324 CSSPropertyWebkitTransitionDelay,
325 CSSPropertyWebkitTransitionDuration, 325 CSSPropertyWebkitTransitionDuration,
326 CSSPropertyWebkitTransitionProperty, 326 CSSPropertyWebkitTransitionProperty,
327 CSSPropertyWebkitTransitionTimingFunction, 327 CSSPropertyWebkitTransitionTimingFunction,
328 CSSPropertyWebkitUserDrag, 328 CSSPropertyWebkitUserDrag,
329 CSSPropertyWebkitUserModify, 329 CSSPropertyWebkitUserModify,
330 CSSPropertyWebkitUserSelect, 330 CSSPropertyWebkitUserSelect,
331 CSSPropertyWebkitWritingMode, 331 CSSPropertyWebkitWritingMode,
332 CSSPropertyWebkitAppRegion, 332 CSSPropertyWebkitAppRegion,
333 CSSPropertyWebkitWrapFlow,
334 CSSPropertyWebkitWrapThrough,
335 CSSPropertyBufferedRendering, 333 CSSPropertyBufferedRendering,
336 CSSPropertyClipPath, 334 CSSPropertyClipPath,
337 CSSPropertyClipRule, 335 CSSPropertyClipRule,
338 CSSPropertyMask, 336 CSSPropertyMask,
339 CSSPropertyFilter, 337 CSSPropertyFilter,
340 CSSPropertyFloodColor, 338 CSSPropertyFloodColor,
341 CSSPropertyFloodOpacity, 339 CSSPropertyFloodOpacity,
342 CSSPropertyLightingColor, 340 CSSPropertyLightingColor,
343 CSSPropertyStopColor, 341 CSSPropertyStopColor,
344 CSSPropertyStopOpacity, 342 CSSPropertyStopOpacity,
(...skipping 2303 matching lines...) Expand 10 before | Expand all | Expand 10 after
2648 case CSSPropertyCounterReset: 2646 case CSSPropertyCounterReset:
2649 return valueForCounterDirectives(*style, propertyID); 2647 return valueForCounterDirectives(*style, propertyID);
2650 case CSSPropertyWebkitClipPath: 2648 case CSSPropertyWebkitClipPath:
2651 if (ClipPathOperation* operation = style->clipPath()) { 2649 if (ClipPathOperation* operation = style->clipPath()) {
2652 if (operation->type() == ClipPathOperation::SHAPE) 2650 if (operation->type() == ClipPathOperation::SHAPE)
2653 return valueForBasicShape(*style, toShapeClipPathOperation(o peration)->basicShape()); 2651 return valueForBasicShape(*style, toShapeClipPathOperation(o peration)->basicShape());
2654 if (operation->type() == ClipPathOperation::REFERENCE) 2652 if (operation->type() == ClipPathOperation::REFERENCE)
2655 return CSSPrimitiveValue::create(toReferenceClipPathOperatio n(operation)->url(), CSSPrimitiveValue::CSS_URI); 2653 return CSSPrimitiveValue::create(toReferenceClipPathOperatio n(operation)->url(), CSSPrimitiveValue::CSS_URI);
2656 } 2654 }
2657 return cssValuePool().createIdentifierValue(CSSValueNone); 2655 return cssValuePool().createIdentifierValue(CSSValueNone);
2658 case CSSPropertyWebkitWrapFlow:
2659 return cssValuePool().createValue(style->wrapFlow());
2660 case CSSPropertyShapeMargin: 2656 case CSSPropertyShapeMargin:
2661 return cssValuePool().createValue(style->shapeMargin(), *style); 2657 return cssValuePool().createValue(style->shapeMargin(), *style);
2662 case CSSPropertyShapeImageThreshold: 2658 case CSSPropertyShapeImageThreshold:
2663 return cssValuePool().createValue(style->shapeImageThreshold(), CSSP rimitiveValue::CSS_NUMBER); 2659 return cssValuePool().createValue(style->shapeImageThreshold(), CSSP rimitiveValue::CSS_NUMBER);
2664 case CSSPropertyShapeOutside: 2660 case CSSPropertyShapeOutside:
2665 return valueForShape(*style, style->shapeOutside()); 2661 return valueForShape(*style, style->shapeOutside());
2666 case CSSPropertyWebkitWrapThrough:
2667 return cssValuePool().createValue(style->wrapThrough());
2668 case CSSPropertyWebkitFilter: 2662 case CSSPropertyWebkitFilter:
2669 return valueForFilter(renderer, *style); 2663 return valueForFilter(renderer, *style);
2670 case CSSPropertyMixBlendMode: 2664 case CSSPropertyMixBlendMode:
2671 return cssValuePool().createValue(style->blendMode()); 2665 return cssValuePool().createValue(style->blendMode());
2672 2666
2673 case CSSPropertyBackgroundBlendMode: { 2667 case CSSPropertyBackgroundBlendMode: {
2674 const FillLayer* layers = style->backgroundLayers(); 2668 const FillLayer* layers = style->backgroundLayers();
2675 if (!layers->next()) 2669 if (!layers->next())
2676 return cssValuePool().createValue(layers->blendMode()); 2670 return cssValuePool().createValue(layers->blendMode());
2677 2671
(...skipping 384 matching lines...) Expand 10 before | Expand all | Expand 10 after
3062 return list.release(); 3056 return list.release();
3063 } 3057 }
3064 3058
3065 void CSSComputedStyleDeclaration::trace(Visitor* visitor) 3059 void CSSComputedStyleDeclaration::trace(Visitor* visitor)
3066 { 3060 {
3067 visitor->trace(m_node); 3061 visitor->trace(m_node);
3068 CSSStyleDeclaration::trace(visitor); 3062 CSSStyleDeclaration::trace(visitor);
3069 } 3063 }
3070 3064
3071 } // namespace WebCore 3065 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/webexposed/nonstable-css-properties-expected.txt ('k') | Source/core/css/CSSPrimitiveValueMappings.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698