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

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

Issue 1602143002: Move two more <image> related properties into CSSPropertyParser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
« no previous file with comments | « third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 341 matching lines...) Expand 10 before | Expand all | Expand 10 after
352 case CSSPropertyWebkitMaskRepeatX: 352 case CSSPropertyWebkitMaskRepeatX:
353 case CSSPropertyWebkitMaskRepeatY: 353 case CSSPropertyWebkitMaskRepeatY:
354 { 354 {
355 RefPtrWillBeRawPtr<CSSValue> dummyValue = nullptr; 355 RefPtrWillBeRawPtr<CSSValue> dummyValue = nullptr;
356 CSSPropertyID propId1, propId2; 356 CSSPropertyID propId1, propId2;
357 if (!parseFillProperty(unresolvedProperty, propId1, propId2, parsedValue , dummyValue)) 357 if (!parseFillProperty(unresolvedProperty, propId1, propId2, parsedValue , dummyValue))
358 return nullptr; 358 return nullptr;
359 ASSERT(!dummyValue); 359 ASSERT(!dummyValue);
360 break; 360 break;
361 } 361 }
362 case CSSPropertyBorderImageSource: // <uri> | none | inherit
363 case CSSPropertyWebkitMaskBoxImageSource:
364 if (parseFillImage(m_valueList, parsedValue))
365 m_valueList->next();
366 break;
367
368 case CSSPropertyBottom: // <length> | <percentage> | auto | in herit 362 case CSSPropertyBottom: // <length> | <percentage> | auto | in herit
369 case CSSPropertyLeft: // <length> | <percentage> | auto | in herit 363 case CSSPropertyLeft: // <length> | <percentage> | auto | in herit
370 case CSSPropertyRight: // <length> | <percentage> | auto | in herit 364 case CSSPropertyRight: // <length> | <percentage> | auto | in herit
371 case CSSPropertyTop: // <length> | <percentage> | auto | in herit 365 case CSSPropertyTop: // <length> | <percentage> | auto | in herit
372 if (id == CSSValueAuto) 366 if (id == CSSValueAuto)
373 validPrimitive = true; 367 validPrimitive = true;
374 else 368 else
375 validPrimitive = validUnit(value, FLength | FPercent | FUnitlessQuir k); 369 validPrimitive = validUnit(value, FLength | FPercent | FUnitlessQuir k);
376 break; 370 break;
377 371
(...skipping 3809 matching lines...) Expand 10 before | Expand all | Expand 10 after
4187 ASSERT(!m_parsedCalculation); 4181 ASSERT(!m_parsedCalculation);
4188 m_parsedCalculation = CSSCalcValue::create(args, range); 4182 m_parsedCalculation = CSSCalcValue::create(args, range);
4189 4183
4190 if (!m_parsedCalculation) 4184 if (!m_parsedCalculation)
4191 return false; 4185 return false;
4192 4186
4193 return true; 4187 return true;
4194 } 4188 }
4195 4189
4196 } // namespace blink 4190 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698