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

Side by Side Diff: third_party/WebKit/WebCore/css/CSSParser.cpp

Issue 39293: WebKit merge 41447:41498 [third_party/WebKit] (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: remove CRLF Created 11 years, 9 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 | Annotate | Revision Log
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 Apple Inc. All rights reserved. 4 * Copyright (C) 2004, 2005, 2006, 2007, 2008 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 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 748 matching lines...) Expand 10 before | Expand all | Expand 10 after
759 if (!parseValue(properties[0], important) || !parseValue(properties[ 1], important)) 759 if (!parseValue(properties[0], important) || !parseValue(properties[ 1], important))
760 return false; 760 return false;
761 return true; 761 return true;
762 } 762 }
763 return false; 763 return false;
764 } 764 }
765 case CSSPropertyWebkitBorderHorizontalSpacing: 765 case CSSPropertyWebkitBorderHorizontalSpacing:
766 case CSSPropertyWebkitBorderVerticalSpacing: 766 case CSSPropertyWebkitBorderVerticalSpacing:
767 valid_primitive = validUnit(value, FLength|FNonNeg, m_strict); 767 valid_primitive = validUnit(value, FLength|FNonNeg, m_strict);
768 break; 768 break;
769 case CSSPropertyScrollbarFaceColor: // IE5.5
770 case CSSPropertyScrollbarShadowColor: // IE5.5
771 case CSSPropertyScrollbarHighlightColor: // IE5.5
772 case CSSPropertyScrollbar3dlightColor: // IE5.5
773 case CSSPropertyScrollbarDarkshadowColor: // IE5.5
774 case CSSPropertyScrollbarTrackColor: // IE5.5
775 case CSSPropertyScrollbarArrowColor: // IE5.5
776 if (m_strict)
777 break;
778 /* nobreak */
779 case CSSPropertyOutlineColor: // <color> | invert | inherit 769 case CSSPropertyOutlineColor: // <color> | invert | inherit
780 // Outline color has "invert" as additional keyword. 770 // Outline color has "invert" as additional keyword.
781 // Also, we want to allow the special focus color even in strict parsing mode. 771 // Also, we want to allow the special focus color even in strict parsing mode.
782 if (propId == CSSPropertyOutlineColor && (id == CSSValueInvert || id == CSSValueWebkitFocusRingColor)) { 772 if (propId == CSSPropertyOutlineColor && (id == CSSValueInvert || id == CSSValueWebkitFocusRingColor)) {
783 valid_primitive = true; 773 valid_primitive = true;
784 break; 774 break;
785 } 775 }
786 /* nobreak */ 776 /* nobreak */
787 case CSSPropertyBackgroundColor: // <color> | inherit 777 case CSSPropertyBackgroundColor: // <color> | inherit
788 case CSSPropertyBorderTopColor: // <color> | inherit 778 case CSSPropertyBorderTopColor: // <color> | inherit
(...skipping 4170 matching lines...) Expand 10 before | Expand all | Expand 10 after
4959 // BEGIN(mediaqueries) and BEGIN(initial). yy_start acts as index to 4949 // BEGIN(mediaqueries) and BEGIN(initial). yy_start acts as index to
4960 // tokenizer transition table, and 'mediaqueries' and 'initial' are 4950 // tokenizer transition table, and 'mediaqueries' and 'initial' are
4961 // offset multipliers that specify which transitions are active 4951 // offset multipliers that specify which transitions are active
4962 // in the tokenizer during in each condition (tokenizer state). 4952 // in the tokenizer during in each condition (tokenizer state).
4963 #define BEGIN yy_start = 1 + 2 * 4953 #define BEGIN yy_start = 1 + 2 *
4964 4954
4965 #include "tokenizer.cpp" 4955 #include "tokenizer.cpp"
4966 4956
4967 } 4957 }
4968 4958
OLDNEW
« no previous file with comments | « third_party/WebKit/WebCore/css/CSSComputedStyleDeclaration.cpp ('k') | third_party/WebKit/WebCore/css/CSSPropertyNames.in » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698