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

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

Issue 731863003: Remove CSSCompositing (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: preland Created 6 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) 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 637 matching lines...) Expand 10 before | Expand all | Expand 10 after
648 validPrimitive = true; 648 validPrimitive = true;
649 } else if ((value->id >= CSSValueAuto && value->id <= CSSValueWebkit ZoomOut) || value->id == CSSValueCopy || value->id == CSSValueNone) 649 } else if ((value->id >= CSSValueAuto && value->id <= CSSValueWebkit ZoomOut) || value->id == CSSValueCopy || value->id == CSSValueNone)
650 validPrimitive = true; 650 validPrimitive = true;
651 } else { 651 } else {
652 ASSERT_NOT_REACHED(); 652 ASSERT_NOT_REACHED();
653 return false; 653 return false;
654 } 654 }
655 break; 655 break;
656 } 656 }
657 657
658 case CSSPropertyBackgroundBlendMode:
659 case CSSPropertyBackgroundAttachment: 658 case CSSPropertyBackgroundAttachment:
660 case CSSPropertyBackgroundClip: 659 case CSSPropertyBackgroundClip:
661 case CSSPropertyWebkitBackgroundClip: 660 case CSSPropertyWebkitBackgroundClip:
662 case CSSPropertyWebkitBackgroundComposite: 661 case CSSPropertyWebkitBackgroundComposite:
663 case CSSPropertyBackgroundImage: 662 case CSSPropertyBackgroundImage:
664 case CSSPropertyBackgroundOrigin: 663 case CSSPropertyBackgroundOrigin:
665 case CSSPropertyMaskSourceType: 664 case CSSPropertyMaskSourceType:
666 case CSSPropertyWebkitBackgroundOrigin: 665 case CSSPropertyWebkitBackgroundOrigin:
667 case CSSPropertyBackgroundPosition: 666 case CSSPropertyBackgroundPosition:
668 case CSSPropertyBackgroundPositionX: 667 case CSSPropertyBackgroundPositionX:
(...skipping 1786 matching lines...) Expand 10 before | Expand all | Expand 10 after
2455 m_valueList->next(); 2454 m_valueList->next();
2456 break; 2455 break;
2457 } 2456 }
2458 case CSSPropertyWebkitBackgroundComposite: 2457 case CSSPropertyWebkitBackgroundComposite:
2459 case CSSPropertyWebkitMaskComposite: 2458 case CSSPropertyWebkitMaskComposite:
2460 if (val->id >= CSSValueClear && val->id <= CSSValuePlusLight er) { 2459 if (val->id >= CSSValueClear && val->id <= CSSValuePlusLight er) {
2461 currValue = cssValuePool().createIdentifierValue(val->id ); 2460 currValue = cssValuePool().createIdentifierValue(val->id );
2462 m_valueList->next(); 2461 m_valueList->next();
2463 } 2462 }
2464 break; 2463 break;
2465 case CSSPropertyBackgroundBlendMode:
2466 if (val->id == CSSValueNormal || val->id == CSSValueMultiply
2467 || val->id == CSSValueScreen || val->id == CSSValueOverl ay || val->id == CSSValueDarken
2468 || val->id == CSSValueLighten || val->id == CSSValueCol orDodge || val->id == CSSValueColorBurn
2469 || val->id == CSSValueHardLight || val->id == CSSValueSo ftLight || val->id == CSSValueDifference
2470 || val->id == CSSValueExclusion || val->id == CSSValueHu e || val->id == CSSValueSaturation
2471 || val->id == CSSValueColor || val->id == CSSValueLumino sity) {
2472 currValue = cssValuePool().createIdentifierValue(val->id );
2473 m_valueList->next();
2474 }
2475 break;
2476 case CSSPropertyBackgroundRepeat: 2464 case CSSPropertyBackgroundRepeat:
2477 case CSSPropertyWebkitMaskRepeat: 2465 case CSSPropertyWebkitMaskRepeat:
2478 parseFillRepeat(currValue, currValue2); 2466 parseFillRepeat(currValue, currValue2);
2479 // parseFillRepeat advances the m_valueList pointer 2467 // parseFillRepeat advances the m_valueList pointer
2480 break; 2468 break;
2481 case CSSPropertyBackgroundSize: 2469 case CSSPropertyBackgroundSize:
2482 case CSSPropertyWebkitBackgroundSize: 2470 case CSSPropertyWebkitBackgroundSize:
2483 case CSSPropertyWebkitMaskSize: { 2471 case CSSPropertyWebkitMaskSize: {
2484 currValue = parseFillSize(propId, allowComma); 2472 currValue = parseFillSize(propId, allowComma);
2485 if (currValue) 2473 if (currValue)
(...skipping 3747 matching lines...) Expand 10 before | Expand all | Expand 10 after
6233 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n"); 6221 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n");
6234 } 6222 }
6235 6223
6236 bool CSSPropertyParser::isSystemColor(int id) 6224 bool CSSPropertyParser::isSystemColor(int id)
6237 { 6225 {
6238 // FIXME(sky): remove 6226 // FIXME(sky): remove
6239 return false; 6227 return false;
6240 } 6228 }
6241 6229
6242 } // namespace blink 6230 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/css/parser/BisonCSSParser-in.cpp ('k') | sky/engine/core/css/resolver/StyleAdjuster.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698