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

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

Issue 2065593002: Unprefix the CSS 'filter' property (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove disabler. Try different DCHECK expressions. 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
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 2625 matching lines...) Expand 10 before | Expand all | Expand 10 after
2636 if (operation->type() == ClipPathOperation::REFERENCE) 2636 if (operation->type() == ClipPathOperation::REFERENCE)
2637 return CSSURIValue::create(toReferenceClipPathOperation(operatio n)->url()); 2637 return CSSURIValue::create(toReferenceClipPathOperation(operatio n)->url());
2638 } 2638 }
2639 return CSSPrimitiveValue::createIdentifier(CSSValueNone); 2639 return CSSPrimitiveValue::createIdentifier(CSSValueNone);
2640 case CSSPropertyShapeMargin: 2640 case CSSPropertyShapeMargin:
2641 return CSSPrimitiveValue::create(style.shapeMargin(), style); 2641 return CSSPrimitiveValue::create(style.shapeMargin(), style);
2642 case CSSPropertyShapeImageThreshold: 2642 case CSSPropertyShapeImageThreshold:
2643 return CSSPrimitiveValue::create(style.shapeImageThreshold(), CSSPrimiti veValue::UnitType::Number); 2643 return CSSPrimitiveValue::create(style.shapeImageThreshold(), CSSPrimiti veValue::UnitType::Number);
2644 case CSSPropertyShapeOutside: 2644 case CSSPropertyShapeOutside:
2645 return valueForShape(style, style.shapeOutside()); 2645 return valueForShape(style, style.shapeOutside());
2646 case CSSPropertyWebkitFilter: 2646 case CSSPropertyFilter:
2647 return valueForFilter(style, style.filter()); 2647 return valueForFilter(style, style.filter());
2648 case CSSPropertyBackdropFilter: 2648 case CSSPropertyBackdropFilter:
2649 return valueForFilter(style, style.backdropFilter()); 2649 return valueForFilter(style, style.backdropFilter());
2650 case CSSPropertyMixBlendMode: 2650 case CSSPropertyMixBlendMode:
2651 return CSSPrimitiveValue::create(style.blendMode()); 2651 return CSSPrimitiveValue::create(style.blendMode());
2652 2652
2653 case CSSPropertyBackgroundBlendMode: { 2653 case CSSPropertyBackgroundBlendMode: {
2654 CSSValueList* list = CSSValueList::createCommaSeparated(); 2654 CSSValueList* list = CSSValueList::createCommaSeparated();
2655 for (const FillLayer* currLayer = &style.backgroundLayers(); currLayer; currLayer = currLayer->next()) 2655 for (const FillLayer* currLayer = &style.backgroundLayers(); currLayer; currLayer = currLayer->next())
2656 list->append(*CSSPrimitiveValue::create(currLayer->blendMode())); 2656 list->append(*CSSPrimitiveValue::create(currLayer->blendMode()));
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
2827 case CSSPropertyTextAnchor: 2827 case CSSPropertyTextAnchor:
2828 return CSSPrimitiveValue::create(svgStyle.textAnchor()); 2828 return CSSPrimitiveValue::create(svgStyle.textAnchor());
2829 case CSSPropertyClipPath: 2829 case CSSPropertyClipPath:
2830 if (!svgStyle.clipperResource().isEmpty()) 2830 if (!svgStyle.clipperResource().isEmpty())
2831 return CSSURIValue::create(serializeAsFragmentIdentifier(svgStyle.cl ipperResource())); 2831 return CSSURIValue::create(serializeAsFragmentIdentifier(svgStyle.cl ipperResource()));
2832 return CSSPrimitiveValue::createIdentifier(CSSValueNone); 2832 return CSSPrimitiveValue::createIdentifier(CSSValueNone);
2833 case CSSPropertyMask: 2833 case CSSPropertyMask:
2834 if (!svgStyle.maskerResource().isEmpty()) 2834 if (!svgStyle.maskerResource().isEmpty())
2835 return CSSURIValue::create(serializeAsFragmentIdentifier(svgStyle.ma skerResource())); 2835 return CSSURIValue::create(serializeAsFragmentIdentifier(svgStyle.ma skerResource()));
2836 return CSSPrimitiveValue::createIdentifier(CSSValueNone); 2836 return CSSPrimitiveValue::createIdentifier(CSSValueNone);
2837 case CSSPropertyFilter:
2838 if (!svgStyle.filterResource().isEmpty())
2839 return CSSURIValue::create(serializeAsFragmentIdentifier(svgStyle.fi lterResource()));
2840 return CSSPrimitiveValue::createIdentifier(CSSValueNone);
2841 case CSSPropertyFloodColor: 2837 case CSSPropertyFloodColor:
2842 return currentColorOrValidColor(style, svgStyle.floodColor()); 2838 return currentColorOrValidColor(style, svgStyle.floodColor());
2843 case CSSPropertyLightingColor: 2839 case CSSPropertyLightingColor:
2844 return currentColorOrValidColor(style, svgStyle.lightingColor()); 2840 return currentColorOrValidColor(style, svgStyle.lightingColor());
2845 case CSSPropertyStopColor: 2841 case CSSPropertyStopColor:
2846 return currentColorOrValidColor(style, svgStyle.stopColor()); 2842 return currentColorOrValidColor(style, svgStyle.stopColor());
2847 case CSSPropertyFill: 2843 case CSSPropertyFill:
2848 return adjustSVGPaintForCurrentColor(svgStyle.fillPaintType(), svgStyle. fillPaintUri(), svgStyle.fillPaintColor(), style.color()); 2844 return adjustSVGPaintForCurrentColor(svgStyle.fillPaintType(), svgStyle. fillPaintUri(), svgStyle.fillPaintColor(), style.color());
2849 case CSSPropertyMarkerEnd: 2845 case CSSPropertyMarkerEnd:
2850 if (!svgStyle.markerEndResource().isEmpty()) 2846 if (!svgStyle.markerEndResource().isEmpty())
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
3003 case CSSPropertyAll: 2999 case CSSPropertyAll:
3004 return nullptr; 3000 return nullptr;
3005 default: 3001 default:
3006 break; 3002 break;
3007 } 3003 }
3008 ASSERT_NOT_REACHED(); 3004 ASSERT_NOT_REACHED();
3009 return nullptr; 3005 return nullptr;
3010 } 3006 }
3011 3007
3012 } // namespace blink 3008 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698