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/resolver/FilterOperationResolver.cpp

Issue 68203023: Merge FixedIntegerConversion and FixedFloatConversion for 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
OLDNEW
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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 #include "platform/graphics/filters/custom/CustomFilterConstants.h" 45 #include "platform/graphics/filters/custom/CustomFilterConstants.h"
46 #include "platform/graphics/filters/custom/CustomFilterNumberParameter.h" 46 #include "platform/graphics/filters/custom/CustomFilterNumberParameter.h"
47 #include "platform/graphics/filters/custom/CustomFilterParameter.h" 47 #include "platform/graphics/filters/custom/CustomFilterParameter.h"
48 #include "platform/graphics/filters/custom/CustomFilterProgramInfo.h" 48 #include "platform/graphics/filters/custom/CustomFilterProgramInfo.h"
49 #include "platform/graphics/filters/custom/CustomFilterTransformParameter.h" 49 #include "platform/graphics/filters/custom/CustomFilterTransformParameter.h"
50 50
51 namespace WebCore { 51 namespace WebCore {
52 52
53 static Length convertToFloatLength(CSSPrimitiveValue* primitiveValue, const Rend erStyle* style, const RenderStyle* rootStyle, double multiplier) 53 static Length convertToFloatLength(CSSPrimitiveValue* primitiveValue, const Rend erStyle* style, const RenderStyle* rootStyle, double multiplier)
54 { 54 {
55 return primitiveValue ? primitiveValue->convertToLength<FixedFloatConversion | PercentConversion>(style, rootStyle, multiplier) : Length(Undefined); 55 return primitiveValue ? primitiveValue->convertToLength<FixedConversion | Pe rcentConversion>(style, rootStyle, multiplier) : Length(Undefined);
56 } 56 }
57 57
58 static FilterOperation::OperationType filterOperationForType(CSSFilterValue::Fil terOperationType type) 58 static FilterOperation::OperationType filterOperationForType(CSSFilterValue::Fil terOperationType type)
59 { 59 {
60 switch (type) { 60 switch (type) {
61 case CSSFilterValue::ReferenceFilterOperation: 61 case CSSFilterValue::ReferenceFilterOperation:
62 return FilterOperation::REFERENCE; 62 return FilterOperation::REFERENCE;
63 case CSSFilterValue::GrayscaleFilterOperation: 63 case CSSFilterValue::GrayscaleFilterOperation:
64 return FilterOperation::GRAYSCALE; 64 return FilterOperation::GRAYSCALE;
65 case CSSFilterValue::SepiaFilterOperation: 65 case CSSFilterValue::SepiaFilterOperation:
(...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after
497 ASSERT_NOT_REACHED(); 497 ASSERT_NOT_REACHED();
498 break; 498 break;
499 } 499 }
500 } 500 }
501 501
502 outOperations = operations; 502 outOperations = operations;
503 return true; 503 return true;
504 } 504 }
505 505
506 } // namespace WebCore 506 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/css/CSSPrimitiveValueMappings.h ('k') | Source/core/css/resolver/StyleBuilderCustom.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698