58168 2011-04-08 15:28:55 -0700 Parse 'DispatchOnConnectionQueue' in messages.in files 2011-04-08 15:39:05 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 382591 0 andersca 2011-04-08 15:28:55 -0700 Parse 'DispatchOnConnectionQueue' in messages.in files 382595 1 88884 andersca 2011-04-08 15:29:54 -0700 Created attachment 88884 Patch 382599 2 88884 aroben 2011-04-08 15:32:21 -0700 Comment on attachment 88884 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=88884&action=review > Source/WebKit2/Scripts/webkit2/messages.py:84 > - match = re.search(r'([A-Za-z_0-9]+)\((.*?)\)(?:(?:\s+->\s+)\((.*?)\)(?:\s+(delayed))?)?', line) > + match = re.search(r'([A-Za-z_0-9]+)\((.*?)\)(?:(?:\s+->\s+)\((.*?)\)(?:\s+(.*))?)?', line) I think you could simplify this: (?:\s+(.*))? to this: (.*) > Source/WebKit2/Scripts/webkit2/messages_unittest.py:69 > - GetPlugins(bool refresh) -> (Vector<WebCore::PluginInfo> plugins) > - GetPluginProcessConnection(WTF::String pluginPath) -> (CoreIPC::Connection::Handle connectionHandle) delayed > + GetPlugins(bool refresh) -> (Vector<WebCore::PluginInfo> plugins) DispatchOnConnectionQueue > + GetPluginProcessConnection(WTF::String pluginPath) -> (CoreIPC::Connection::Handle connectionHandle) Delayed Would be good to add a test that has more than one attribute. 382605 3 andersca 2011-04-08 15:39:05 -0700 Committed r83350: <http://trac.webkit.org/changeset/83350> 88884 2011-04-08 15:29:54 -0700 2011-04-08 15:32:21 -0700 Patch bug-58168-20110408152953.patch text/plain 4518 andersca SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDgzMzQ3KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMDQtMDggIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBQYXJzZSAnRGlzcGF0Y2hPbkNvbm5lY3Rpb25RdWV1ZScg aW4gbWVzc2FnZXMuaW4gZmlsZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTU4MTY4CisKKyAgICAgICAgSGFuZGxlIHBhcnNpbmcgbXVsdGlwbGUsIHNw YWNlLXNlcGFyYXRlZCBhdHRyaWJ1dGVzIGluIC5tZXNzYWdlcy5pbiBmaWxlcy4gS2VlcCB0cmFj ayBvZgorICAgICAgICAnRGlzcGF0Y2hPbkNvbm5lY3Rpb25RdWV1ZScgYW5kIHJlbmFtZSAnZGVs YXllZCcgdG8gJ0RlbGF5ZWQnLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXQyL21lc3NhZ2Vz LnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0Mi9tZXNzYWdlc191bml0dGVzdC5weToKKwog MjAxMS0wNC0wOCAgQWxwaGEgTGFtICA8aGNsYW1AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFVu cmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHI4MzMzNS4KSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1Njcmlw dHMvd2Via2l0Mi9tZXNzYWdlcy5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9TY3Jp cHRzL3dlYmtpdDIvbWVzc2FnZXMucHkJKHJldmlzaW9uIDgzMzE2KQorKysgU291cmNlL1dlYktp dDIvU2NyaXB0cy93ZWJraXQyL21lc3NhZ2VzLnB5CSh3b3JraW5nIGNvcHkpCkBAIC04MSw5ICs4 MSw5IEBAIGNsYXNzIE1lc3NhZ2VSZWNlaXZlcihvYmplY3QpOgogICAgICAgICAgICAgICAgIGVs aWYgbGluZS5zdGFydHN3aXRoKCcjZW5kaWYnKToKICAgICAgICAgICAgICAgICAgICAgY29uZGl0 aW9uID0gTm9uZQogICAgICAgICAgICAgICAgIGNvbnRpbnVlCi0gICAgICAgICAgICBtYXRjaCA9 IHJlLnNlYXJjaChyJyhbQS1aYS16XzAtOV0rKVwoKC4qPylcKSg/Oig/OlxzKy0+XHMrKVwoKC4q PylcKSg/OlxzKyhkZWxheWVkKSk/KT8nLCBsaW5lKQorICAgICAgICAgICAgbWF0Y2ggPSByZS5z ZWFyY2gocicoW0EtWmEtel8wLTldKylcKCguKj8pXCkoPzooPzpccystPlxzKylcKCguKj8pXCko PzpccysoLiopKT8pPycsIGxpbmUpCiAgICAgICAgICAgICBpZiBtYXRjaDoKLSAgICAgICAgICAg ICAgICBuYW1lLCBwYXJhbWV0ZXJzX3N0cmluZywgcmVwbHlfcGFyYW1ldGVyc19zdHJpbmcsIGRl bGF5ZWRfc3RyaW5nID0gbWF0Y2guZ3JvdXBzKCkKKyAgICAgICAgICAgICAgICBuYW1lLCBwYXJh bWV0ZXJzX3N0cmluZywgcmVwbHlfcGFyYW1ldGVyc19zdHJpbmcsIGF0dHJpYnV0ZXNfc3RyaW5n ID0gbWF0Y2guZ3JvdXBzKCkKICAgICAgICAgICAgICAgICBpZiBwYXJhbWV0ZXJzX3N0cmluZzoK ICAgICAgICAgICAgICAgICAgICAgcGFyYW1ldGVycyA9IHBhcnNlX3BhcmFtZXRlcl9zdHJpbmco cGFyYW1ldGVyc19zdHJpbmcpCiAgICAgICAgICAgICAgICAgZWxzZToKQEAgLTkyLDcgKzkyLDEz IEBAIGNsYXNzIE1lc3NhZ2VSZWNlaXZlcihvYmplY3QpOgogICAgICAgICAgICAgICAgIGZvciBw YXJhbWV0ZXIgaW4gcGFyYW1ldGVyczoKICAgICAgICAgICAgICAgICAgICAgcGFyYW1ldGVyLmNv bmRpdGlvbiA9IGNvbmRpdGlvbgogCi0gICAgICAgICAgICAgICAgZGVsYXllZCA9IGRlbGF5ZWRf c3RyaW5nID09ICdkZWxheWVkJworICAgICAgICAgICAgICAgIGlmIGF0dHJpYnV0ZXNfc3RyaW5n OgorICAgICAgICAgICAgICAgICAgICBhdHRyaWJ1dGVzID0gZnJvemVuc2V0KGF0dHJpYnV0ZXNf c3RyaW5nLnNwbGl0KCkpCisgICAgICAgICAgICAgICAgICAgIGRlbGF5ZWQgPSAiRGVsYXllZCIg aW4gYXR0cmlidXRlcworICAgICAgICAgICAgICAgICAgICBkaXNwYXRjaF9vbl9jb25uZWN0aW9u X3F1ZXVlID0gIkRpc3BhdGNoT25Db25uZWN0aW9uUXVldWUiIGluIGF0dHJpYnV0ZXMKKyAgICAg ICAgICAgICAgICBlbHNlOgorICAgICAgICAgICAgICAgICAgICBkZWxheWVkID0gRmFsc2UKKyAg ICAgICAgICAgICAgICAgICAgZGlzcGF0Y2hfb25fY29ubmVjdGlvbl9xdWV1ZSA9IEZhbHNlCiAK ICAgICAgICAgICAgICAgICBpZiByZXBseV9wYXJhbWV0ZXJzX3N0cmluZzoKICAgICAgICAgICAg ICAgICAgICAgcmVwbHlfcGFyYW1ldGVycyA9IHBhcnNlX3BhcmFtZXRlcl9zdHJpbmcocmVwbHlf cGFyYW1ldGVyc19zdHJpbmcpCkBAIC0xMDEsMTcgKzEwNywxOCBAQCBjbGFzcyBNZXNzYWdlUmVj ZWl2ZXIob2JqZWN0KToKICAgICAgICAgICAgICAgICBlbHNlOgogICAgICAgICAgICAgICAgICAg ICByZXBseV9wYXJhbWV0ZXJzID0gTm9uZQogCi0gICAgICAgICAgICAgICAgbWVzc2FnZXMuYXBw ZW5kKE1lc3NhZ2UobmFtZSwgcGFyYW1ldGVycywgcmVwbHlfcGFyYW1ldGVycywgZGVsYXllZCwg Y29uZGl0aW9uKSkKKyAgICAgICAgICAgICAgICBtZXNzYWdlcy5hcHBlbmQoTWVzc2FnZShuYW1l LCBwYXJhbWV0ZXJzLCByZXBseV9wYXJhbWV0ZXJzLCBkZWxheWVkLCBkaXNwYXRjaF9vbl9jb25u ZWN0aW9uX3F1ZXVlLCBjb25kaXRpb24pKQogICAgICAgICByZXR1cm4gTWVzc2FnZVJlY2VpdmVy KGRlc3RpbmF0aW9uLCBtZXNzYWdlcywgbWFzdGVyX2NvbmRpdGlvbikKIAogCiBjbGFzcyBNZXNz YWdlKG9iamVjdCk6Ci0gICAgZGVmIF9faW5pdF9fKHNlbGYsIG5hbWUsIHBhcmFtZXRlcnMsIHJl cGx5X3BhcmFtZXRlcnMsIGRlbGF5ZWQsIGNvbmRpdGlvbik6CisgICAgZGVmIF9faW5pdF9fKHNl bGYsIG5hbWUsIHBhcmFtZXRlcnMsIHJlcGx5X3BhcmFtZXRlcnMsIGRlbGF5ZWQsIGRpc3BhdGNo X29uX2Nvbm5lY3Rpb25fcXVldWUsIGNvbmRpdGlvbik6CiAgICAgICAgIHNlbGYubmFtZSA9IG5h bWUKICAgICAgICAgc2VsZi5wYXJhbWV0ZXJzID0gcGFyYW1ldGVycwogICAgICAgICBzZWxmLnJl cGx5X3BhcmFtZXRlcnMgPSByZXBseV9wYXJhbWV0ZXJzCiAgICAgICAgIGlmIHNlbGYucmVwbHlf cGFyYW1ldGVycyBpcyBub3QgTm9uZToKICAgICAgICAgICAgIHNlbGYuZGVsYXllZCA9IGRlbGF5 ZWQKKyAgICAgICAgc2VsZi5kaXNwYXRjaF9vbl9jb25uZWN0aW9uX3F1ZXVlID0gZGlzcGF0Y2hf b25fY29ubmVjdGlvbl9xdWV1ZQogICAgICAgICBzZWxmLmNvbmRpdGlvbiA9IGNvbmRpdGlvbgog ICAgICAgICBpZiBsZW4oc2VsZi5wYXJhbWV0ZXJzKSAhPSAwOgogICAgICAgICAgICAgc2VsZi5p c192YXJpYWRpYyA9IHBhcmFtZXRlcl90eXBlX2lzX3ZhcmlhZGljKHNlbGYucGFyYW1ldGVyc1st MV0udHlwZSkKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1NjcmlwdHMvd2Via2l0Mi9tZXNzYWdlc191 bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9TY3JpcHRzL3dlYmtpdDIv bWVzc2FnZXNfdW5pdHRlc3QucHkJKHJldmlzaW9uIDgzMzE2KQorKysgU291cmNlL1dlYktpdDIv U2NyaXB0cy93ZWJraXQyL21lc3NhZ2VzX3VuaXR0ZXN0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC02 NSw4ICs2NSw4IEBAIG1lc3NhZ2VzIC0+IFdlYlBhZ2UgewogCiAgICAgQ3JlYXRlUGx1Z2luKHVp bnQ2NF90IHBsdWdpbkluc3RhbmNlSUQsIFdlYktpdDo6UGx1Z2luOjpQYXJhbWV0ZXJzIHBhcmFt ZXRlcnMpIC0+IChib29sIHJlc3VsdCkKICAgICBSdW5KYXZhU2NyaXB0QWxlcnQodWludDY0X3Qg ZnJhbWVJRCwgV1RGOjpTdHJpbmcgbWVzc2FnZSkgLT4gKCkKLSAgICBHZXRQbHVnaW5zKGJvb2wg cmVmcmVzaCkgLT4gKFZlY3RvcjxXZWJDb3JlOjpQbHVnaW5JbmZvPiBwbHVnaW5zKQotICAgIEdl dFBsdWdpblByb2Nlc3NDb25uZWN0aW9uKFdURjo6U3RyaW5nIHBsdWdpblBhdGgpIC0+IChDb3Jl SVBDOjpDb25uZWN0aW9uOjpIYW5kbGUgY29ubmVjdGlvbkhhbmRsZSkgZGVsYXllZAorICAgIEdl dFBsdWdpbnMoYm9vbCByZWZyZXNoKSAtPiAoVmVjdG9yPFdlYkNvcmU6OlBsdWdpbkluZm8+IHBs dWdpbnMpIERpc3BhdGNoT25Db25uZWN0aW9uUXVldWUKKyAgICBHZXRQbHVnaW5Qcm9jZXNzQ29u bmVjdGlvbihXVEY6OlN0cmluZyBwbHVnaW5QYXRoKSAtPiAoQ29yZUlQQzo6Q29ubmVjdGlvbjo6 SGFuZGxlIGNvbm5lY3Rpb25IYW5kbGUpIERlbGF5ZWQKIAogI2lmIFBMQVRGT1JNKE1BQykKICAg ICBEaWRDcmVhdGVXZWJQcm9jZXNzQ29ubmVjdGlvbihDb3JlSVBDOjpNYWNoUG9ydCBjb25uZWN0 aW9uSWRlbnRpZmllcikK