Retry "Changes for webkit roll 148757-149482"

tools/dom/scripts/idlparser.py

 #!/usr/bin/python
 # Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
 import re
 import subprocess
 import tempfile
 
 from pegparser import *
@@ skipping 72 matching lines @@
         # Web IDL:
         [MAYBE(ExtAttrs), 'module', Id, '{', _Definitions, '}',
          MAYBE(';')],
         # WebKit:
         ['module', MAYBE(ExtAttrs), Id, '{', _Definitions, '}',
          MAYBE(';')],
         # FremontCut:
         [MAYBE(_Annotations), MAYBE(ExtAttrs), 'module', Id,
          '{', _Definitions, '}', MAYBE(';')])
 
+    def Callback():
+      return ['callback']
+
+    def Partial():
+      return ['partial']
+
     def Interface():
       return syntax_switch(
         # Web IDL:
-        [MAYBE(ExtAttrs), 'interface', Id, MAYBE(_ParentInterfaces),
+        [MAYBE(ExtAttrs), MAYBE(Partial), MAYBE(Callback), 'interface', Id, MAYBE(_ParentInterfaces),
          MAYBE(['{', MAYBE(MANY(_Member)), '}']), ';'],
         # WebKit:
-        [MAYBE(ExtAttrs), OR('interface', 'exception'), MAYBE(ExtAttrs), Id, MAYBE(_ParentInterfaces),
+        [MAYBE(ExtAttrs), MAYBE(Partial), MAYBE(Callback), OR('interface', 'exception'), MAYBE(ExtAttrs), Id, MAYBE(_ParentInterfaces),
          MAYBE(['{', MAYBE(MANY(_Member)), '}']), MAYBE(';')],
         # FremontCut:
         [MAYBE(_Annotations), MAYBE(ExtAttrs), 'interface',
          Id, MAYBE(_ParentInterfaces), MAYBE(['{', MAYBE(MANY(_Member)),
          '}']), ';'])
 
     def _Member():
       return syntax_switch(
         # Web IDL:
         OR(Const, Attribute, Operation, ExtAttrs),
@@ skipping 89 matching lines @@
     def ReadOnly():
       return 'readonly'
 
     # Operation:
     def Operation():
       return syntax_switch(
         # Web IDL:
         [MAYBE(ExtAttrs), MAYBE(Static), MAYBE(Stringifier), MAYBE(_Specials),
          ReturnType, MAYBE(Id), '(', _Arguments, ')', ';'],
         # WebKit:
-        [MAYBE(ExtAttrs), MAYBE(Static),
+        [MAYBE(ExtAttrs), MAYBE(Static), MAYBE(_AttrGetterSetter),
          ReturnType, MAYBE(Id), '(', _Arguments, ')', ';'],
         # FremontCut:
         [MAYBE(_Annotations), MAYBE(ExtAttrs), MAYBE(Static), MAYBE(Stringifier),
          MAYBE(_Specials), ReturnType, MAYBE(Id), '(', _Arguments, ')', ';'])
 
     def Static():
       return 'static'
 
     def _Specials():
       return MANY(Special)
@@ skipping 190 matching lines @@
     Args:
       content -- text to parse.
       defines -- an array of pre-processor defines.
       includePaths -- an array of path strings used by the
         gcc pre-processor.
     """
     if self._syntax == WEBKIT_SYNTAX:
       content = self._pre_process(content, defines, includePaths)
 
     return self._pegparser.parse(content)