Retry "Changes for webkit roll 148757-149482"

tools/dom/scripts/idlparser.py

Index: tools/dom/scripts/idlparser.py
diff --git a/tools/dom/scripts/idlparser.py b/tools/dom/scripts/idlparser.py
index 194bf4a4702ded5a1cd3a1f879f48cf827c7f6e5..6583444c93fef32c096d2ffe2c75d74567e5acd0 100755
--- a/tools/dom/scripts/idlparser.py
+++ b/tools/dom/scripts/idlparser.py
@@ -90,13 +90,19 @@ class IDLParser(object):
         [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',
@@ -206,7 +212,7 @@ class IDLParser(object):
         [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),