Update chromium to branch 1599.

Change-Id: I04e775a946a208bb4500d3b722bcb05c82b9d7cb
Reviewed-by: Andras Becsi <andras.becsi@digia.com>

1 files changed, 14 insertions, 14 deletions

diff --git a/chromium/tools/idl_parser/idl_ppapi_parser.py b/chromium/tools/idl_parser/idl_ppapi_parser.py
index c02e42c818f..33eb5037bcc 100755
--- a/chromium/tools/idl_parser/idl_ppapi_parser.py
+++ b/chromium/tools/idl_parser/idl_ppapi_parser.py
@@ -29,11 +29,13 @@
 # pylint: disable=R0201
 # pylint: disable=C0301
 
+import os.path
 import sys
+import time
 
 from idl_ppapi_lexer import IDLPPAPILexer
 from idl_parser import IDLParser, ListFromConcat, ParseFile
-from idl_node import IDLNode
+from idl_node import IDLAttribute, IDLNode
 
 class IDLPPAPIParser(IDLParser):
 #
@@ -102,8 +104,7 @@ class IDLPPAPIParser(IDLParser):
   def p_LabelCont(self, p):
     """LabelCont : ',' LabelList
                  |"""
-    if len(p) > 1:
-      p[0] = p[2]
+    if len(p) > 1: p[0] = p[2]
 
   def p_LabelContError(self, p):
     """LabelCont : error LabelCont"""
@@ -259,21 +260,20 @@ class IDLPPAPIParser(IDLParser):
     arguments = self.BuildProduction('Values', p, 2, p[3])
     p[0] = self.BuildNamed('ExtAttribute', p, 1, arguments)
 
-  def p_ValueList(self, p):
-    """ValueList : ConstValue ValueListCont"""
-    p[0] = ListFromConcat(p[1], p[2])
-
-  def p_ValueListCont(self, p):
-    """ValueListCont : ValueList
-                     |"""
-    if len(p) > 1:
-      p[0] = p[1]
-
   # [76]
   def p_ExtendedAttributeIdentConst(self, p):
     """ExtendedAttributeIdentConst : identifier '=' ConstValue"""
     p[0] = self.BuildNamed('ExtAttribute', p, 1, p[3])
 
+  def p_ValueListCont(self, p):
+    """ValueListCont : ConstValue ValueListCont
+                     |"""
+    if len(p) > 1:
+      p[0] = ListFromConcat(p[1], p[2])
+
+  def p_ValueList(self, p):
+    """ValueList : ConstValue ValueListCont"""
+    values = self.BuildProduction('Values', p, 2, ListFromConcat(p[1], p[2]))
 
   def __init__(self, lexer, verbose=False, debug=False, mute_error=False):
     IDLParser.__init__(self, lexer, verbose, debug, mute_error)
@@ -301,4 +301,4 @@ def main(argv):
 
 
 if __name__ == '__main__':
-  sys.exit(main(sys.argv[1:]))
+  sys.exit(main(sys.argv[1:]))
\ No newline at end of file