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

Side by Side Diff: sky/engine/core/css/parser/BisonCSSParser-in.cpp

Issue 673073002: Fix border parsing to work again (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Remove included change 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 | « no previous file | sky/tools/debugger/debugger.cc » ('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 347 matching lines...) Expand 10 before | Expand all | Expand 10 after
358 case CSSPropertyBorderCollapse: // collapse | separate 358 case CSSPropertyBorderCollapse: // collapse | separate
359 return valueID == CSSValueCollapse || valueID == CSSValueSeparate; 359 return valueID == CSSValueCollapse || valueID == CSSValueSeparate;
360 case CSSPropertyBorderTopStyle: // <border-style> 360 case CSSPropertyBorderTopStyle: // <border-style>
361 case CSSPropertyBorderRightStyle: // Defined as: none | hidden | dotted | da shed | 361 case CSSPropertyBorderRightStyle: // Defined as: none | hidden | dotted | da shed |
362 case CSSPropertyBorderBottomStyle: // solid | double | groove | ridge | inse t | outset 362 case CSSPropertyBorderBottomStyle: // solid | double | groove | ridge | inse t | outset
363 case CSSPropertyBorderLeftStyle: 363 case CSSPropertyBorderLeftStyle:
364 case CSSPropertyWebkitBorderAfterStyle: 364 case CSSPropertyWebkitBorderAfterStyle:
365 case CSSPropertyWebkitBorderBeforeStyle: 365 case CSSPropertyWebkitBorderBeforeStyle:
366 case CSSPropertyWebkitBorderEndStyle: 366 case CSSPropertyWebkitBorderEndStyle:
367 case CSSPropertyWebkitBorderStartStyle: 367 case CSSPropertyWebkitBorderStartStyle:
368 return valueID >= CSSValueNone && valueID <= CSSValueDouble;
368 case CSSPropertyBoxSizing: 369 case CSSPropertyBoxSizing:
369 return valueID == CSSValueBorderBox || valueID == CSSValueContentBox; 370 return valueID == CSSValueBorderBox || valueID == CSSValueContentBox;
370 case CSSPropertyCaptionSide: // top | bottom | left | right 371 case CSSPropertyCaptionSide: // top | bottom | left | right
371 return valueID == CSSValueLeft || valueID == CSSValueRight || valueID == CSSValueTop || valueID == CSSValueBottom; 372 return valueID == CSSValueLeft || valueID == CSSValueRight || valueID == CSSValueTop || valueID == CSSValueBottom;
372 case CSSPropertyClear: // none | left | right | both 373 case CSSPropertyClear: // none | left | right | both
373 return valueID == CSSValueNone || valueID == CSSValueLeft || valueID == CSSValueRight || valueID == CSSValueBoth; 374 return valueID == CSSValueNone || valueID == CSSValueLeft || valueID == CSSValueRight || valueID == CSSValueBoth;
374 case CSSPropertyDirection: // ltr | rtl 375 case CSSPropertyDirection: // ltr | rtl
375 return valueID == CSSValueLtr || valueID == CSSValueRtl; 376 return valueID == CSSValueLtr || valueID == CSSValueRtl;
376 case CSSPropertyDisplay: 377 case CSSPropertyDisplay:
377 // inline | block | list-item | inline-block | table | 378 // inline | block | list-item | inline-block | table |
(...skipping 1515 matching lines...) Expand 10 before | Expand all | Expand 10 after
1893 rule->setProperties(createStylePropertySet()); 1894 rule->setProperties(createStylePropertySet());
1894 clearProperties(); 1895 clearProperties();
1895 1896
1896 StyleRuleViewport* result = rule.get(); 1897 StyleRuleViewport* result = rule.get();
1897 m_parsedRules.append(rule.release()); 1898 m_parsedRules.append(rule.release());
1898 1899
1899 return result; 1900 return result;
1900 } 1901 }
1901 1902
1902 } 1903 }
OLDNEW
« no previous file with comments | « no previous file | sky/tools/debugger/debugger.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698