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

Side by Side Diff: Source/WebCore/css/CSSParser.cpp

Issue 13382002: Merge 147028 "REGRESSION (r146588): Cannot correctly display Chi..." (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1453/
Patch Set: Created 7 years, 8 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
« no previous file with comments | « Source/WebCore/css/CSSGrammar.y.in ('k') | no next file » | 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 11280 matching lines...) Expand 10 before | Expand all | Expand 10 after
11291 if (location.token.is8Bit()) 11291 if (location.token.is8Bit())
11292 builder.append(location.token.characters8(), location.token.length()); 11292 builder.append(location.token.characters8(), location.token.length());
11293 else 11293 else
11294 builder.append(location.token.characters16(), location.token.length()); 11294 builder.append(location.token.characters16(), location.token.length());
11295 11295
11296 logError(builder.toString(), location.lineNumber); 11296 logError(builder.toString(), location.lineNumber);
11297 } 11297 }
11298 11298
11299 bool CSSParser::isLoggingErrors() 11299 bool CSSParser::isLoggingErrors()
11300 { 11300 {
11301 return m_logErrors; 11301 // FIXME: return logging back (https://bugs.webkit.org/show_bug.cgi?id=11340 1).
11302 return false;
11302 } 11303 }
11303 11304
11304 void CSSParser::logError(const String& message, int lineNumber) 11305 void CSSParser::logError(const String& message, int lineNumber)
11305 { 11306 {
11306 PageConsole* console = m_styleSheet->singleOwnerDocument()->page()->console( ); 11307 PageConsole* console = m_styleSheet->singleOwnerDocument()->page()->console( );
11307 console->addMessage(CSSMessageSource, WarningMessageLevel, message, m_styleS heet->baseURL().string(), lineNumber + 1); 11308 console->addMessage(CSSMessageSource, WarningMessageLevel, message, m_styleS heet->baseURL().string(), lineNumber + 1);
11308 } 11309 }
11309 11310
11310 StyleRuleKeyframes* CSSParser::createKeyframesRule(const String& name, PassOwnPt r<Vector<RefPtr<StyleKeyframe> > > popKeyframes) 11311 StyleRuleKeyframes* CSSParser::createKeyframesRule(const String& name, PassOwnPt r<Vector<RefPtr<StyleKeyframe> > > popKeyframes)
11311 { 11312 {
(...skipping 865 matching lines...) Expand 10 before | Expand all | Expand 10 after
12177 { 12178 {
12178 // The tokenizer checks for the construct of an+b. 12179 // The tokenizer checks for the construct of an+b.
12179 // However, since the {ident} rule precedes the {nth} rule, some of those 12180 // However, since the {ident} rule precedes the {nth} rule, some of those
12180 // tokens are identified as string literal. Furthermore we need to accept 12181 // tokens are identified as string literal. Furthermore we need to accept
12181 // "odd" and "even" which does not match to an+b. 12182 // "odd" and "even" which does not match to an+b.
12182 return equalIgnoringCase(token, "odd") || equalIgnoringCase(token, "even") 12183 return equalIgnoringCase(token, "odd") || equalIgnoringCase(token, "even")
12183 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n"); 12184 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n");
12184 } 12185 }
12185 12186
12186 } 12187 }
OLDNEW
« no previous file with comments | « Source/WebCore/css/CSSGrammar.y.in ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698