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

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

Issue 708843002: Remove -webkit-auto, -webkit-center, -webkit-left, -webkit-right. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: merge to ToT 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
« no previous file with comments | « sky/engine/core/css/CSSValueKeywords.in ('k') | sky/engine/core/editing/EditingStyle.cpp » ('j') | 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 503 matching lines...) Expand 10 before | Expand all | Expand 10 after
514 // paged-x or paged-y, then overflow-x and overflow-y should have the sa me value. 514 // paged-x or paged-y, then overflow-x and overflow-y should have the sa me value.
515 if (id == CSSValueWebkitPagedX || id == CSSValueWebkitPagedY) 515 if (id == CSSValueWebkitPagedX || id == CSSValueWebkitPagedY)
516 overflowXValue = cssValuePool().createIdentifierValue(CSSValueAuto); 516 overflowXValue = cssValuePool().createIdentifierValue(CSSValueAuto);
517 else 517 else
518 overflowXValue = m_parsedProperties.last().value(); 518 overflowXValue = m_parsedProperties.last().value();
519 addProperty(CSSPropertyOverflowX, overflowXValue.release(), important); 519 addProperty(CSSPropertyOverflowX, overflowXValue.release(), important);
520 return true; 520 return true;
521 } 521 }
522 522
523 case CSSPropertyTextAlign: 523 case CSSPropertyTextAlign:
524 // left | right | center | justify | -webkit-left | -webkit-right | -web kit-center | -webkit-match-parent 524 // left | right | center | justify | -webkit-match-parent
525 // | start | end | <string> | inherit | -webkit-auto (converted to start ) 525 // | start | end | <string> | inherit
526 if ((id >= CSSValueWebkitAuto && id <= CSSValueWebkitMatchParent) || id == CSSValueStart || id == CSSValueEnd 526 if ((id >= CSSValueLeft && id <= CSSValueWebkitMatchParent) || id == CSS ValueStart || id == CSSValueEnd
527 || value->unit == CSSPrimitiveValue::CSS_STRING) 527 || value->unit == CSSPrimitiveValue::CSS_STRING)
528 validPrimitive = true; 528 validPrimitive = true;
529 break; 529 break;
530 530
531 case CSSPropertyFontWeight: { // normal | bold | bolder | lighter | 100 | 2 00 | 300 | 400 | 500 | 600 | 700 | 800 | 900 | inherit 531 case CSSPropertyFontWeight: { // normal | bold | bolder | lighter | 100 | 2 00 | 300 | 400 | 500 | 600 | 700 | 800 | 900 | inherit
532 if (m_valueList->size() != 1) 532 if (m_valueList->size() != 1)
533 return false; 533 return false;
534 return parseFontWeight(important); 534 return parseFontWeight(important);
535 } 535 }
536 536
(...skipping 5782 matching lines...) Expand 10 before | Expand all | Expand 10 after
6319 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n"); 6319 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n");
6320 } 6320 }
6321 6321
6322 bool CSSPropertyParser::isSystemColor(int id) 6322 bool CSSPropertyParser::isSystemColor(int id)
6323 { 6323 {
6324 // FIXME(sky): remove 6324 // FIXME(sky): remove
6325 return false; 6325 return false;
6326 } 6326 }
6327 6327
6328 } // namespace blink 6328 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/css/CSSValueKeywords.in ('k') | sky/engine/core/editing/EditingStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698