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

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

Issue 860423004: Remove css !important (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 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
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 1092 matching lines...) Expand 10 before | Expand all | Expand 10 after
1103 break; 1103 break;
1104 1104
1105 case CharacterQuote: 1105 case CharacterQuote:
1106 if (checkAndSkipString(currentCharacter<SrcCharacterType>(), m_token, Ab ortIfInvalid)) { 1106 if (checkAndSkipString(currentCharacter<SrcCharacterType>(), m_token, Ab ortIfInvalid)) {
1107 ++result; 1107 ++result;
1108 parseString<SrcCharacterType>(result, yylval->string, m_token); 1108 parseString<SrcCharacterType>(result, yylval->string, m_token);
1109 m_token = STRING; 1109 m_token = STRING;
1110 } 1110 }
1111 break; 1111 break;
1112 1112
1113 case CharacterExclamationMark: { 1113 case CharacterExclamationMark:
1114 SrcCharacterType* start = skipWhiteSpace(currentCharacter<SrcCharacterTy pe>());
1115 if (isEqualToCSSIdentifier(start, "important")) {
1116 m_token = IMPORTANT_SYM;
1117 currentCharacter<SrcCharacterType>() = start + 9;
1118 }
1119 break; 1114 break;
1120 }
1121 1115
1122 case CharacterHashmark: { 1116 case CharacterHashmark: {
1123 SrcCharacterType* start = currentCharacter<SrcCharacterType>(); 1117 SrcCharacterType* start = currentCharacter<SrcCharacterType>();
1124 result = currentCharacter<SrcCharacterType>(); 1118 result = currentCharacter<SrcCharacterType>();
1125 1119
1126 if (isASCIIDigit(*currentCharacter<SrcCharacterType>())) { 1120 if (isASCIIDigit(*currentCharacter<SrcCharacterType>())) {
1127 // This must be a valid hex number token. 1121 // This must be a valid hex number token.
1128 do { 1122 do {
1129 ++currentCharacter<SrcCharacterType>(); 1123 ++currentCharacter<SrcCharacterType>();
1130 } while (isASCIIHexDigit(*currentCharacter<SrcCharacterType>())); 1124 } while (isASCIIHexDigit(*currentCharacter<SrcCharacterType>()));
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
1281 m_dataStart16[length - 1] = 0; 1275 m_dataStart16[length - 1] = 0;
1282 1276
1283 m_is8BitSource = false; 1277 m_is8BitSource = false;
1284 m_currentCharacter8 = 0; 1278 m_currentCharacter8 = 0;
1285 m_currentCharacter16 = m_dataStart16.get(); 1279 m_currentCharacter16 = m_dataStart16.get();
1286 setTokenStart<UChar>(m_currentCharacter16); 1280 setTokenStart<UChar>(m_currentCharacter16);
1287 m_lexFunc = &CSSTokenizer::realLex<UChar>; 1281 m_lexFunc = &CSSTokenizer::realLex<UChar>;
1288 } 1282 }
1289 1283
1290 } // namespace blink 1284 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/css/parser/CSSPropertyParser.cpp ('k') | sky/engine/core/css/resolver/StyleResolver.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698