Merge 147028 "REGRESSION (r146588): Cannot correctly display Chi..."

Source/WebCore/css/CSSGrammar.y.in

 /*
  *  Copyright (C) 2002-2003 Lars Knoll (knoll@kde.org)
  *  Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
  *  Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  *  Copyright (C) 2008 Eric Seidel <eric@webkit.org>
  *  Copyright (C) 2012 Intel Corporation. All rights reserved.
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
  *  License as published by the Free Software Foundation; either
@@ skipping 2015 matching lines @@
         parser->invalidBlockHit();
     }
     ;
 
 invalid_block_list:
     invalid_block
   | invalid_block_list error invalid_block
 ;
 
 errors:
-    error {
-        $$ = parser->currentLocation();
-    }
-  | errors error {
-        $$ = $1;
+    error error_location {
+        $$ = $2;
     }
     ;
 
 error_location: {
         $$ = parser->currentLocation();
     }
     ;
 
 %%