Title: [147272] branches/chromium/1453
- Revision
- 147272
- Author
- [email protected]
- Date
- 2013-03-29 22:12:00 -0700 (Fri, 29 Mar 2013)
Log Message
Merge 147028 "REGRESSION (r146588): Cannot correctly display Chi..."
BUG=223503
> REGRESSION (r146588): Cannot correctly display Chinese SNS Renren
> https://bugs.webkit.org/show_bug.cgi?id=113142
>
> Patch by Sergey Ryazanov <[email protected]> on 2013-03-27
> Reviewed by Pavel Feldman.
>
> Source/WebCore:
>
> Changed CSS grammar to be equivalent to pre-r146588.
> CSS error reporting disabled to prevent message overflow.
>
> * css/CSSGrammar.y.in:
> * css/CSSParser.cpp:
> (WebCore::CSSParser::isLoggingErrors):
>
> LayoutTests:
>
> * TestExpectations:
> * fast/css/parsing-error-recovery.html:
[email protected]
Review URL: https://codereview.chromium.org/13382002
Modified Paths
Diff
Modified: branches/chromium/1453/LayoutTests/TestExpectations (147271 => 147272)
--- branches/chromium/1453/LayoutTests/TestExpectations 2013-03-30 04:51:31 UTC (rev 147271)
+++ branches/chromium/1453/LayoutTests/TestExpectations 2013-03-30 05:12:00 UTC (rev 147272)
@@ -7,3 +7,6 @@
# pending implementation completion and feature enabling
webkit.org/b/109570 media/track/regions-webvtt [ Skip ]
+
+# pending CSS grammar refactoring
+webkit.org/b/113401 inspector/console/console-css-warnings.html [ Skip ]
Modified: branches/chromium/1453/LayoutTests/fast/css/parsing-error-recovery.html (147271 => 147272)
--- branches/chromium/1453/LayoutTests/fast/css/parsing-error-recovery.html 2013-03-30 04:51:31 UTC (rev 147271)
+++ branches/chromium/1453/LayoutTests/fast/css/parsing-error-recovery.html 2013-03-30 05:12:00 UTC (rev 147272)
@@ -41,6 +41,13 @@
display:none;
}
+ .malformed3 {
+ ;*display:_expression_(function(){})
+ }
+ #test5 {
+ display:none;
+ }
+
/* Successfully parsed */
#last {
display:block;
@@ -52,6 +59,7 @@
<div class="to_be_hidden" id="test2">FAIL: Test 2</div>
<div class="to_be_hidden" id="test3">FAIL: Test 3</div>
<div class="to_be_hidden" id="test4">FAIL: Test 4</div>
+ <div class="to_be_hidden" id="test5">FAIL: Test 5</div>
<div class="to_be_shown" id="last">PASS</div>
</body>
</html>
Modified: branches/chromium/1453/Source/WebCore/css/CSSGrammar.y.in (147271 => 147272)
--- branches/chromium/1453/Source/WebCore/css/CSSGrammar.y.in 2013-03-30 04:51:31 UTC (rev 147271)
+++ branches/chromium/1453/Source/WebCore/css/CSSGrammar.y.in 2013-03-30 05:12:00 UTC (rev 147272)
@@ -2033,12 +2033,9 @@
;
errors:
- error {
- $$ = parser->currentLocation();
+ error error_location {
+ $$ = $2;
}
- | errors error {
- $$ = $1;
- }
;
error_location: {
Modified: branches/chromium/1453/Source/WebCore/css/CSSParser.cpp (147271 => 147272)
--- branches/chromium/1453/Source/WebCore/css/CSSParser.cpp 2013-03-30 04:51:31 UTC (rev 147271)
+++ branches/chromium/1453/Source/WebCore/css/CSSParser.cpp 2013-03-30 05:12:00 UTC (rev 147272)
@@ -11298,7 +11298,8 @@
bool CSSParser::isLoggingErrors()
{
- return m_logErrors;
+ // FIXME: return logging back (https://bugs.webkit.org/show_bug.cgi?id=113401).
+ return false;
}
void CSSParser::logError(const String& message, int lineNumber)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
