Source/core/css/resolver/FilterOperationResolver.cpp - Issue 71253002: Eliminate "FractionConversion" from CSSPrimitiveValue::convertToLength

Side by Side Diff: Source/core/css/resolver/FilterOperationResolver.cpp

Issue 71253002: Eliminate "FractionConversion" from CSSPrimitiveValue::convertToLength (Closed) Base URL: https://chromium.googlesource.com/chromium/blink@master

Patch Set: Created 7 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 | « Source/core/css/CSSPrimitiveValueMappings.h ('k') | Source/core/css/resolver/StyleBuilderCustom.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)	2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)

3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)	3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)

4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)	4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)

5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.	5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.

6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>	6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>

7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>	7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>

8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)	8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)

9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.	9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.

10 * Copyright (C) Research In Motion Limited 2011. All rights reserved.	10 * Copyright (C) Research In Motion Limited 2011. All rights reserved.

(...skipping 33 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
44 #include "platform/graphics/filters/custom/CustomFilterConstants.h"	44 #include "platform/graphics/filters/custom/CustomFilterConstants.h"

45 #include "platform/graphics/filters/custom/CustomFilterNumberParameter.h"	45 #include "platform/graphics/filters/custom/CustomFilterNumberParameter.h"

46 #include "platform/graphics/filters/custom/CustomFilterParameter.h"	46 #include "platform/graphics/filters/custom/CustomFilterParameter.h"

47 #include "platform/graphics/filters/custom/CustomFilterProgramInfo.h"	47 #include "platform/graphics/filters/custom/CustomFilterProgramInfo.h"

48 #include "platform/graphics/filters/custom/CustomFilterTransformParameter.h"	48 #include "platform/graphics/filters/custom/CustomFilterTransformParameter.h"

49	49

50 namespace WebCore {	50 namespace WebCore {

51	51

52 static Length convertToFloatLength(CSSPrimitiveValue* primitiveValue, const Rend erStyle* style, const RenderStyle* rootStyle, double multiplier)	52 static Length convertToFloatLength(CSSPrimitiveValue* primitiveValue, const Rend erStyle* style, const RenderStyle* rootStyle, double multiplier)

53 {	53 {

54 return primitiveValue ? primitiveValue->convertToLength<FixedFloatConversion \| PercentConversion \| FractionConversion>(style, rootStyle, multiplier) : Lengt h(Undefined);	54 return primitiveValue ? primitiveValue->convertToLength<FixedFloatConversion \| PercentConversion>(style, rootStyle, multiplier) : Length(Undefined);

55 }	55 }

56	56

57 static FilterOperation::OperationType filterOperationForType(CSSFilterValue::Fil terOperationType type)	57 static FilterOperation::OperationType filterOperationForType(CSSFilterValue::Fil terOperationType type)

58 {	58 {

59 switch (type) {	59 switch (type) {

60 case CSSFilterValue::ReferenceFilterOperation:	60 case CSSFilterValue::ReferenceFilterOperation:

61 return FilterOperation::REFERENCE;	61 return FilterOperation::REFERENCE;

62 case CSSFilterValue::GrayscaleFilterOperation:	62 case CSSFilterValue::GrayscaleFilterOperation:

63 return FilterOperation::GRAYSCALE;	63 return FilterOperation::GRAYSCALE;

64 case CSSFilterValue::SepiaFilterOperation:	64 case CSSFilterValue::SepiaFilterOperation:

(...skipping 431 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
496 ASSERT_NOT_REACHED();	496 ASSERT_NOT_REACHED();

497 break;	497 break;

498 }	498 }

499 }	499 }

500	500

501 outOperations = operations;	501 outOperations = operations;

502 return true;	502 return true;

503 }	503 }

504	504

505 } // namespace WebCore	505 } // namespace WebCore

OLD	NEW