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

Side by Side Diff: sky/engine/core/css/parser/CSSPropertyParser.cpp

Issue 850103003: Unprefix -webkit-filter and add a pixel test for it. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 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) 2003 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2003 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved. 4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> 5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
6 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> 6 * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
8 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved. 8 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved.
9 * Copyright (C) 2012 Intel Corporation. All rights reserved. 9 * Copyright (C) 2012 Intel Corporation. All rights reserved.
10 * 10 *
(...skipping 936 matching lines...) Expand 10 before | Expand all | Expand 10 after
947 addProperty(propId, shadowValueList.release(), important); 947 addProperty(propId, shadowValueList.release(), important);
948 m_valueList->next(); 948 m_valueList->next();
949 return true; 949 return true;
950 } 950 }
951 return false; 951 return false;
952 } 952 }
953 break; 953 break;
954 case CSSPropertyOpacity: 954 case CSSPropertyOpacity:
955 validPrimitive = validUnit(value, FNumber); 955 validPrimitive = validUnit(value, FNumber);
956 break; 956 break;
957 case CSSPropertyWebkitFilter: 957 case CSSPropertyFilter:
958 if (id == CSSValueNone) 958 if (id == CSSValueNone)
959 validPrimitive = true; 959 validPrimitive = true;
960 else { 960 else {
961 RefPtr<CSSValue> val = parseFilter(); 961 RefPtr<CSSValue> val = parseFilter();
962 if (val) { 962 if (val) {
963 addProperty(propId, val, important); 963 addProperty(propId, val, important);
964 return true; 964 return true;
965 } 965 }
966 return false; 966 return false;
967 } 967 }
(...skipping 4542 matching lines...) Expand 10 before | Expand all | Expand 10 after
5510 CSSParserValue* argument = args->current(); 5510 CSSParserValue* argument = args->current();
5511 if (!validUnit(argument, FLength | FNonNeg, HTMLStandardMode)) 5511 if (!validUnit(argument, FLength | FNonNeg, HTMLStandardMode))
5512 return nullptr; 5512 return nullptr;
5513 5513
5514 filterValue->append(createPrimitiveNumericValue(argument)); 5514 filterValue->append(createPrimitiveNumericValue(argument));
5515 } 5515 }
5516 break; 5516 break;
5517 } 5517 }
5518 case CSSFilterValue::DropShadowFilterOperation: { 5518 case CSSFilterValue::DropShadowFilterOperation: {
5519 // drop-shadow() takes a single shadow. 5519 // drop-shadow() takes a single shadow.
5520 RefPtr<CSSValueList> shadowValueList = parseShadow(args, CSSPropertyWebk itFilter); 5520 RefPtr<CSSValueList> shadowValueList = parseShadow(args, CSSPropertyFilt er);
5521 if (!shadowValueList || shadowValueList->length() != 1) 5521 if (!shadowValueList || shadowValueList->length() != 1)
5522 return nullptr; 5522 return nullptr;
5523 5523
5524 filterValue->append((shadowValueList.release())->item(0)); 5524 filterValue->append((shadowValueList.release())->item(0));
5525 break; 5525 break;
5526 } 5526 }
5527 default: 5527 default:
5528 ASSERT_NOT_REACHED(); 5528 ASSERT_NOT_REACHED();
5529 } 5529 }
5530 return filterValue.release(); 5530 return filterValue.release();
(...skipping 612 matching lines...) Expand 10 before | Expand all | Expand 10 after
6143 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n"); 6143 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n");
6144 } 6144 }
6145 6145
6146 bool CSSPropertyParser::isSystemColor(int id) 6146 bool CSSPropertyParser::isSystemColor(int id)
6147 { 6147 {
6148 // FIXME(sky): remove 6148 // FIXME(sky): remove
6149 return false; 6149 return false;
6150 } 6150 }
6151 6151
6152 } // namespace blink 6152 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/css/CSSProperties.in ('k') | sky/engine/core/css/resolver/AnimatedStyleBuilder.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698