22388 2008-11-20 15:57:26 -0800 Add JSInterfaceName to the .in files 2008-11-21 11:33:09 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 jchaffraix webkit-unassigned oldest_to_newest 99555 0 jchaffraix 2008-11-20 15:57:26 -0800 Currently some of the information used to generate the JS*ElementWrapperFactory is in make_names.pl. We should move it into the .in file and this can be done by adding a JSInterfaceName. 99556 1 25324 jchaffraix 2008-11-20 16:11:01 -0800 Created attachment 25324 Proposed fix 99562 2 25324 darin 2008-11-20 16:36:38 -0800 Comment on attachment 25324 Proposed fix r=me 99674 3 jchaffraix 2008-11-21 11:33:09 -0800 Landed in r38670. 25324 2008-11-20 16:11:01 -0800 2008-11-20 16:36:38 -0800 Proposed fix JSInterfaceName-1.diff text/plain 13214 jchaffraix SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzODYyNSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMDgtMTEtMjAgIEp1bGllbiBDaGFmZnJhaXggIDxqY2hhZmZyYWl4 QHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgQnVnIDIyMzg4OiBBZGQgSlNJbnRlcmZhY2VOYW1lIHRvIHRoZSAuaW4gZmlsZXMKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMzg4ICAgICAg ICAKKworICAgICAgICBBZGQgSlNJbnRlcmZhY2VOYW1lIHRoYXQgaXMgc2ltaWxhciB0byBpbnRl cmZhY2VOYW1lIGJ1dAorICAgICAgICBmb3IgdGhlIEpTIHdyYXBwZXJzLiBKU0ludGVyZmFjZU5h bWUgaXMgYWx3YXlzIGVxdWFsIGludGVyZmFjZU5hbWUKKyAgICAgICAgdW5sZXNzIGV4cGxpY2l0 bHkgc2V0LgorICAgICAgICAKKyAgICAgICAgKiBkb20vbWFrZV9uYW1lcy5wbDoKKyAgICAgICAg KiBodG1sL0hUTUxUYWdOYW1lcy5pbjoKKyAgICAgICAgKiBzdmcvc3ZndGFncy5pbjoKKwogMjAw OC0xMS0xOSAgSnVsaWVuIENoYWZmcmFpeCAgPGpjaGFmZnJhaXhAd2Via2l0Lm9yZz4KIAogICAg ICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KSW5kZXg6IFdlYkNvcmUvZG9tL21ha2VfbmFt ZXMucGwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9kb20vbWFrZV9uYW1lcy5wbAkocmV2aXNpb24g Mzg2MjUpCisrKyBXZWJDb3JlL2RvbS9tYWtlX25hbWVzLnBsCSh3b3JraW5nIGNvcHkpCkBAIC00 NSw4ICs0NSw2IEBAIG15ICVhdHRycyA9ICgpOwogbXkgJXBhcmFtZXRlcnMgPSAoKTsKIG15ICRl eHRyYURlZmluZXMgPSAwOwogbXkgJHByZXByb2Nlc3NvciA9ICIvdXNyL2Jpbi9nY2MgLUUgLVAg LXggYysrIjsKLW15ICVzdmdDdXN0b21NYXBwaW5ncyA9ICgpOwotbXkgJWh0bWxDdXN0b21NYXBw aW5ncyA9ICgpOwogCiBHZXRPcHRpb25zKCd0YWdzPXMnID0+IFwkdGFnc0ZpbGUsIAogICAgICdh dHRycz1zJyA9PiBcJGF0dHJzRmlsZSwKQEAgLTkwLDYgKzg4LDggQEAgc3ViIGluaXRpYWxpemVU YWdQcm9wZXJ0eUhhc2gKIHsKICAgICByZXR1cm4gKCdleHBvcnRTdHJpbmcnID0+IDAsCiAgICAg ICAgICAgICAnaW50ZXJmYWNlTmFtZScgPT4gZGVmYXVsdEludGVyZmFjZU5hbWUoJF9bMF0pLAor ICAgICAgICAgICAgIyBCeSBkZWZhdWx0LCB0aGUgSlNJbnRlcmZhY2VOYW1lIGlzIHRoZSBzYW1l IGFzIHRoZSBpbnRlcmZhY2VOYW1lLgorICAgICAgICAgICAgJ0pTSW50ZXJmYWNlTmFtZScgPT4g ZGVmYXVsdEludGVyZmFjZU5hbWUoJF9bMF0pLAogICAgICAgICAgICAgJ3dyYXBwZXJPbmx5SWZN ZWRpYUlzQXZhaWxhYmxlJyA9PiAwKTsKIH0KIApAQCAtMTIyLDYgKzEyMiwxMSBAQCBzdWIgdGFn c0hhbmRsZXIKIAogICAgIGlmICgkcHJvcGVydHkpIHsKICAgICAgICAgZGllICJVbmtub3duIHBy b3BlcnR5ICRwcm9wZXJ0eSBmb3IgdGFnICR0YWdcbiIgaWYgIWRlZmluZWQoJHRhZ3N7JHRhZ317 JHByb3BlcnR5fSk7CisgICAgICAgICMgVGhlIGNvZGUgcmVseSBvbiBKU0ludGVyZmFjZU5hbWUg ZGVyaXZpbmcgZnJvbSBpbnRlcmZhY2VOYW1lIHRvIGNoZWNrIGZvciBjdXN0b20gSlNJbnRlcmZh Y2VOYW1lLgorICAgICAgICAjIFNvIGp1c3Qgb3ZlcnJpZGUgSlNJbnRlcmZhY2VOYW1lIGlmIGl0 IHdhcyBub3QgYWxyZWFkeSBzZXQuCisgICAgICAgIGlmICgkcHJvcGVydHkgZXEgImludGVyZmFj ZU5hbWUiICYmICR0YWdzeyR0YWd9eydKU0ludGVyZmFjZU5hbWUnfSBlcSAkdGFnc3skdGFnfXsn aW50ZXJmYWNlTmFtZSd9KSB7CisgICAgICAgICAgICAgICAgJHRhZ3N7JHRhZ317J0pTSW50ZXJm YWNlTmFtZSd9ID0gJHZhbHVlOworICAgICAgICB9CiAgICAgICAgICR0YWdzeyR0YWd9eyRwcm9w ZXJ0eX0gPSAkdmFsdWU7CiAgICAgfQogfQpAQCAtNDI3LDkgKzQzMiw5IEBAIHN1YiBwcmludEpT RWxlbWVudEluY2x1ZGVzCiB7CiAgICAgbXkgJEYgPSBzaGlmdDsKICAgICBmb3IgbXkgJG5hbWUg KHNvcnQga2V5cyAldGFncykgewotICAgICAgICBuZXh0IGlmIChoYXNDdXN0b21NYXBwaW5nKCRu YW1lKSk7CisgICAgICAgIG5leHQgaWYgaGFzQ3VzdG9tSlNJbnRlcmZhY2VOYW1lKCRuYW1lKTsK IAotICAgICAgICBteSAkdWNOYW1lID0gJHRhZ3N7JG5hbWV9eyJpbnRlcmZhY2VOYW1lIn07Cisg ICAgICAgIG15ICR1Y05hbWUgPSAkdGFnc3skbmFtZX17IkpTSW50ZXJmYWNlTmFtZSJ9OwogICAg ICAgICBwcmludCBGICIjaW5jbHVkZSBcIkpTJHt1Y05hbWV9LmhcIlxuIjsKICAgICB9CiB9CkBA IC00MzksNyArNDQ0LDcgQEAgc3ViIHByaW50RWxlbWVudEluY2x1ZGVzCiAgICAgbXkgKCRGLCAk c2hvdWxkU2tpcEN1c3RvbU1hcHBpbmdzKSA9IEBfOwogCiAgICAgZm9yIG15ICRuYW1lIChzb3J0 IGtleXMgJXRhZ3MpIHsKLSAgICAgICAgbmV4dCBpZiAoJHNob3VsZFNraXBDdXN0b21NYXBwaW5n cyAmJiBoYXNDdXN0b21NYXBwaW5nKCRuYW1lKSk7CisgICAgICAgIG5leHQgaWYgKCRzaG91bGRT a2lwQ3VzdG9tTWFwcGluZ3MgJiYgaGFzQ3VzdG9tSlNJbnRlcmZhY2VOYW1lKCRuYW1lKSk7CiAK ICAgICAgICAgbXkgJHVjTmFtZSA9ICR0YWdzeyRuYW1lfXsiaW50ZXJmYWNlTmFtZSJ9OwogICAg ICAgICBwcmludCBGICIjaW5jbHVkZSBcIiR7dWNOYW1lfS5oXCJcbiI7CkBAIC02NTAsODYgKzY1 NSwzNSBAQCBzdWIgZGVmYXVsdEludGVyZmFjZU5hbWUKICAgICByZXR1cm4gJHBhcmFtZXRlcnN7 J25hbWVzcGFjZSd9IC4gdXBwZXJDYXNlTmFtZSgkX1swXSkgLiAiRWxlbWVudCIKIH0KIAotc3Vi IGluaXRpYWxpemVDdXN0b21NYXBwaW5ncworc3ViIGhhc0N1c3RvbUpTSW50ZXJmYWNlTmFtZQog ewotICAgIGlmICgha2V5cyAlc3ZnQ3VzdG9tTWFwcGluZ3MpIHsKLSAgICAgICAgIyBUaGVzZSBh cmUgdXNlZCB0byBtYXAgYSB0YWcgdG8gYW5vdGhlciBvbmUgaW4gV3JhcHBlckZhY3RvcnkKLSAg ICAgICAgIyAoZm9yIGV4YW1wbGUsICJoMiIgaXMgbWFwcGVkIHRvICJoMSIgc28gdGhhdCB0aGV5 IHVzZSB0aGUgc2FtZSBKUyBXcmFwcGVyICgiaDEiIHdyYXBwZXIpKQotICAgICAgICAjIE1hcHBp bmcgdG8gYW4gZW1wdHkgc3RyaW5nIHdpbGwgbm90IGdlbmVyYXRlIGEgd3JhcHBlcgotICAgICAg ICAlc3ZnQ3VzdG9tTWFwcGluZ3MgPSAoJ2FuaW1hdGVNb3Rpb24nID0+ICcnLAotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgJ2hrZXJuJyA9PiAnJywKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICdtcGF0aCcgPT4gJycpOwotICAgICAgICAlaHRtbEN1c3RvbU1hcHBpbmdzID0g KCdhYmJyJyA9PiAnJywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnYWNyb255bScg PT4gJycsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ2FkZHJlc3MnID0+ICcnLAot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICdiJyA9PiAnJywKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAnYmRvJyA9PiAnJywKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAnYmlnJyA9PiAnJywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnY2VudGVy JyA9PiAnJywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnY2l0ZScgPT4gJycsCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ2NvZGUnID0+ICcnLAotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICdjb2xncm91cCcgPT4gJ2NvbCcsCi0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgJ2RkJyA9PiAnJywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAnZGZuJyA9PiAnJywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnZHQnID0+ICcn LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICdlbScgPT4gJycsCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgJ2gyJyA9PiAnaDEnLAotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICdoMycgPT4gJ2gxJywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAn aDQnID0+ICdoMScsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ2g1JyA9PiAnaDEn LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICdoNicgPT4gJ2gxJywKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAnaScgPT4gJycsCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgJ2ltYWdlJyA9PiAnaW1nJywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAnaW5zJyA9PiAnZGVsJywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAna2JkJyA9 PiAnJywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAna2V5Z2VuJyA9PiAnc2VsZWN0 JywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnbGlzdGluZycgPT4gJ3ByZScsCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ2xheWVyJyA9PiAnJywKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAnbm9icicgPT4gJycsCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgJ25vZW1iZWQnID0+ICcnLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICdub2ZyYW1lcycgPT4gJycsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ25vbGF5 ZXInID0+ICcnLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICdub3NjcmlwdCcgPT4g JycsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ3BsYWludGV4dCcgPT4gJycsCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ3MnID0+ICcnLAotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICdzYW1wJyA9PiAnJywKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAnc21hbGwnID0+ICcnLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICdzcGFu JyA9PiAnJywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnc3RyaWtlJyA9PiAnJywK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnc3Ryb25nJyA9PiAnJywKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAnc3ViJyA9PiAnJywKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAnc3VwJyA9PiAnJywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAn dGZvb3QnID0+ICd0Ym9keScsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ3RoJyA9 PiAndGQnLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICd0aGVhZCcgPT4gJ3Rib2R5 JywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAndHQnID0+ICcnLAotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICd1JyA9PiAnJywKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAndmFyJyA9PiAnJywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnd2Jy JyA9PiAnJywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAneG1wJyA9PiAncHJlJyk7 Ci0gICAgfQorICAgIG15ICR0YWcgPSBzaGlmdDsKKworICAgICMgV2UgaGF2ZSBhIGN1c3RvbSBK U0ludGVyZmFjZSBpZiB0aGUgSlNJbnRlcmZhY2VOYW1lIGlzIG5vdCB0aGUgc2FtZSBhcyB0aGUg aW50ZXJmYWNlTmFtZS4KKyAgICAjIEZJWE1FOiBUaGUgJ2ltZycgdGFnIG1hdGNoZXMgY29tcGxl dGVseSB0aGUgJ2ltYWdlJyB0YWcgYW5kIGNhbm5vdCBiZSBkaXN0aW5ndWlzaGVkCisgICAgIyBz byB3ZSBoYXZlIHRvIGNoZWNrIGZvciBpdC4KKyAgICByZXR1cm4gISgkdGFnc3skdGFnfXsnSlNJ bnRlcmZhY2VOYW1lJ30gZXEgJHRhZ3N7JHRhZ317J2ludGVyZmFjZU5hbWUnfSkgfHwgJHRhZyBl cSAiaW1nIjsKIH0KIAotc3ViIGhhc0N1c3RvbU1hcHBpbmcKK3N1YiB1c2VzRGVmYXVsdFdyYXBw ZXIKIHsKICAgICBteSAkbmFtZSA9IHNoaWZ0OwotICAgIGluaXRpYWxpemVDdXN0b21NYXBwaW5n cygpOwotICAgIHJldHVybiAxIGlmICRwYXJhbWV0ZXJzeyduYW1lc3BhY2UnfSBlcSAiSFRNTCIg JiYgZXhpc3RzKCRodG1sQ3VzdG9tTWFwcGluZ3N7JG5hbWV9KTsKLSAgICByZXR1cm4gMSBpZiAk cGFyYW1ldGVyc3snbmFtZXNwYWNlJ30gZXEgIlNWRyIgJiYgZXhpc3RzKCRzdmdDdXN0b21NYXBw aW5nc3skbmFtZX0pOwotICAgIHJldHVybiAwOworCisgICAgIyBBIHRhZyByZXVzZXMgdGhlIGRl ZmF1bHQgd3JhcHBlciBpZiBpdHMgSlNJbnRlcmZhY2VOYW1lIG1hdGNoZXMgdGhlIGRlZmF1bHQg bmFtZXNwYWNlIEVsZW1lbnQuCisgICAgcmV0dXJuICR0YWdzeyRuYW1lfXsnSlNJbnRlcmZhY2VO YW1lJ30gZXEgJHBhcmFtZXRlcnN7Im5hbWVzcGFjZSJ9IC4gIkVsZW1lbnQiOwogfQogCiBzdWIg cHJpbnRXcmFwcGVyRnVuY3Rpb25zCiB7Ci0gICAgbXkgKCRGLCAkbmFtZXNSZWYpID0gQF87Ci0g ICAgbXkgJW5hbWVzID0gJSRuYW1lc1JlZjsKLSAgICBmb3IgbXkgJG5hbWUgKHNvcnQga2V5cyAl bmFtZXMpIHsKLSAgICAgICAgIyBDdXN0b20gbWFwcGluZyBkbyBub3QgbmVlZCBhIEpTIHdyYXBw ZXIKLSAgICAgICAgbmV4dCBpZiAoaGFzQ3VzdG9tTWFwcGluZygkbmFtZSkpOworICAgIG15ICRG ID0gc2hpZnQ7CiAKLSAgICAgICAgbXkgJHVjTmFtZSA9ICRuYW1lc3skbmFtZX17ImludGVyZmFj ZU5hbWUifTsKKyAgICBmb3IgbXkgJG5hbWUgKHNvcnQga2V5cyAldGFncykgeworICAgICAgICAj IEEgY3VzdG9tIEpTSW50ZXJmYWNlIG1lYW5zIHRoYXQgd2UgcmV1c2UgYW5vdGhlciB0YWcncyBj b25zdHJ1Y3Rvci4KKyAgICAgICAgbmV4dCBpZiBoYXNDdXN0b21KU0ludGVyZmFjZU5hbWUoJG5h bWUpIHx8IHVzZXNEZWZhdWx0V3JhcHBlcigkbmFtZSk7CisKKyAgICAgICAgbXkgJHVjTmFtZSA9 ICR0YWdzeyRuYW1lfXsiSlNJbnRlcmZhY2VOYW1lIn07CiAgICAgICAgICMgSGFjayBmb3IgdGhl IG1lZGlhIHRhZ3MKLSAgICAgICAgaWYgKCRuYW1lc3skbmFtZX17IndyYXBwZXJPbmx5SWZNZWRp YUlzQXZhaWxhYmxlIn0pIHsKKyAgICAgICAgaWYgKCR0YWdzeyRuYW1lfXsid3JhcHBlck9ubHlJ Zk1lZGlhSXNBdmFpbGFibGUifSkgewogICAgICAgICAgICAgcHJpbnQgRiA8PEVORAogc3RhdGlj IEpTTm9kZSogY3JlYXRlJHt1Y05hbWV9V3JhcHBlcihFeGVjU3RhdGUqIGV4ZWMsIFBhc3NSZWZQ dHI8JHBhcmFtZXRlcnN7J25hbWVzcGFjZSd9RWxlbWVudD4gZWxlbWVudCkKIHsKQEAgLTc4Nyw3 ICs3NDEsNyBAQCB0eXBlZGVmIEpTTm9kZSogKCpDcmVhdGUkcGFyYW1ldGVyc3snbmFtCiBFTkQK IDsKIAotICAgIHByaW50V3JhcHBlckZ1bmN0aW9ucygkRiwgXCV0YWdzKTsKKyAgICBwcmludFdy YXBwZXJGdW5jdGlvbnMoJEYpOwogCiAgICAgcHJpbnQgRiA8PEVORAogSlNOb2RlKiBjcmVhdGVK UyRwYXJhbWV0ZXJzeyduYW1lc3BhY2UnfVdyYXBwZXIoRXhlY1N0YXRlKiBleGVjLCBQYXNzUmVm UHRyPCRwYXJhbWV0ZXJzeyduYW1lc3BhY2UnfUVsZW1lbnQ+IGVsZW1lbnQpCkBAIC03OTksMjMg Kzc1MywxMyBAQCBFTkQKIDsKIAogICAgIGZvciBteSAkdGFnIChzb3J0IGtleXMgJXRhZ3MpIHsK LSAgICAgICAgbmV4dCBpZiAoaGFzQ3VzdG9tTWFwcGluZygkdGFnKSk7CisgICAgICAgICMgRG8g bm90IGFkZCB0aGUgbmFtZSB0byB0aGUgbWFwIGlmIGl0IGRvZXMgbm90IGhhdmUgYSBKUyB3cmFw cGVyIGNvbnN0cnVjdG9yIG9yIHVzZXMgdGhlIGRlZmF1bHQgd3JhcHBlci4KKyAgICAgICAgbmV4 dCBpZiB1c2VzRGVmYXVsdFdyYXBwZXIoJHRhZywgXCV0YWdzKTsKIAotICAgICAgICBteSAkdWNU YWcgPSAkdGFnc3skdGFnfXsiaW50ZXJmYWNlTmFtZSJ9OworICAgICAgICBteSAkdWNUYWcgPSAk dGFnc3skdGFnfXsiSlNJbnRlcmZhY2VOYW1lIn07CiAgICAgICAgIHByaW50IEYgIiAgICAgICBt YXAuc2V0KCR7dGFnfVRhZy5sb2NhbE5hbWUoKS5pbXBsKCksIGNyZWF0ZSR7dWNUYWd9V3JhcHBl cik7XG4iOwogICAgIH0KIAotICAgIGlmICgkcGFyYW1ldGVyc3snbmFtZXNwYWNlJ30gZXEgIkhU TUwiKSB7Ci0gICAgICAgIGZvciBteSAkdGFnIChzb3J0IGtleXMgJWh0bWxDdXN0b21NYXBwaW5n cykgewotICAgICAgICAgICAgbmV4dCBpZiAhJGh0bWxDdXN0b21NYXBwaW5nc3skdGFnfTsKLQot ICAgICAgICAgICAgbXkgJHVjQ3VzdG9tVGFnID0gJHRhZ3N7JGh0bWxDdXN0b21NYXBwaW5nc3sk dGFnfX17ImludGVyZmFjZU5hbWUifTsKLSAgICAgICAgICAgIHByaW50IEYgIiAgICAgICBtYXAu c2V0KCR7dGFnfVRhZy5sb2NhbE5hbWUoKS5pbXBsKCksIGNyZWF0ZSR7dWNDdXN0b21UYWd9V3Jh cHBlcik7XG4iOwotICAgICAgICB9Ci0gICAgfQotCi0gICAgIyBDdXJyZW50bHkgU1ZHIGhhcyBu byBuZWVkIHRvIGFkZCBjdXN0b20gbWFwLnNldCBhcyBpdCBvbmx5IGhhcyBlbXB0eSBlbGVtZW50 cwotCiAgICAgcHJpbnQgRiA8PEVORAogICAgIH0KICAgICBDcmVhdGUkcGFyYW1ldGVyc3snbmFt ZXNwYWNlJ31FbGVtZW50V3JhcHBlckZ1bmN0aW9uIGNyZWF0ZVdyYXBwZXJGdW5jdGlvbiA9IG1h cC5nZXQoZWxlbWVudC0+bG9jYWxOYW1lKCkuaW1wbCgpKTsKSW5kZXg6IFdlYkNvcmUvaHRtbC9I VE1MVGFnTmFtZXMuaW4KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9odG1sL0hUTUxUYWdOYW1lcy5p bgkocmV2aXNpb24gMzg2MjUpCisrKyBXZWJDb3JlL2h0bWwvSFRNTFRhZ05hbWVzLmluCSh3b3Jr aW5nIGNvcHkpCkBAIC0zLDM4ICszLDM4IEBAIG5hbWVzcGFjZVByZWZpeD0ieGh0bWwiCiBuYW1l c3BhY2VVUkk9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGh0bWwiCiAKIGEgaW50ZXJmYWNlTmFt ZT1IVE1MQW5jaG9yRWxlbWVudAotYWJicgotYWNyb255bQotYWRkcmVzcworYWJiciBKU0ludGVy ZmFjZU5hbWU9SFRNTEVsZW1lbnQKK2Fjcm9ueW0gSlNJbnRlcmZhY2VOYW1lPUhUTUxFbGVtZW50 CithZGRyZXNzIEpTSW50ZXJmYWNlTmFtZT1IVE1MRWxlbWVudAogYXBwbGV0CiBhcmVhCiAjaWYg RU5BQkxFX1ZJREVPCiBhdWRpbyB3cmFwcGVyT25seUlmTWVkaWFJc0F2YWlsYWJsZT0xCiAjZW5k aWYKLWIKK2IgSlNJbnRlcmZhY2VOYW1lPUhUTUxFbGVtZW50CiBiYXNlCiBiYXNlZm9udCBpbnRl cmZhY2VOYW1lPUhUTUxCYXNlRm9udEVsZW1lbnQKLWJkbwotYmlnCitiZG8gSlNJbnRlcmZhY2VO YW1lPUhUTUxFbGVtZW50CitiaWcgSlNJbnRlcmZhY2VOYW1lPUhUTUxFbGVtZW50CiBibG9ja3F1 b3RlCiBib2R5CiBiciBpbnRlcmZhY2VOYW1lPUhUTUxCUkVsZW1lbnQKIGJ1dHRvbgogY2FudmFz CiBjYXB0aW9uIGludGVyZmFjZU5hbWU9SFRNTFRhYmxlQ2FwdGlvbkVsZW1lbnQKLWNlbnRlcgot Y2l0ZQotY29kZQorY2VudGVyIEpTSW50ZXJmYWNlTmFtZT1IVE1MRWxlbWVudAorY2l0ZSBKU0lu dGVyZmFjZU5hbWU9SFRNTEVsZW1lbnQKK2NvZGUgSlNJbnRlcmZhY2VOYW1lPUhUTUxFbGVtZW50 CiBjb2wgaW50ZXJmYWNlTmFtZT1IVE1MVGFibGVDb2xFbGVtZW50Ci1jb2xncm91cAotZGQKK2Nv bGdyb3VwIEpTSW50ZXJmYWNlTmFtZT1IVE1MVGFibGVDb2xFbGVtZW50CitkZCBKU0ludGVyZmFj ZU5hbWU9SFRNTEVsZW1lbnQKIGRlbCBpbnRlcmZhY2VOYW1lPUhUTUxNb2RFbGVtZW50Ci1kZm4K K2RmbiBKU0ludGVyZmFjZU5hbWU9SFRNTEVsZW1lbnQKIGRpciBpbnRlcmZhY2VOYW1lPUhUTUxE aXJlY3RvcnlFbGVtZW50CiBkaXYKIGRsIGludGVyZmFjZU5hbWU9SFRNTERMaXN0RWxlbWVudAot ZHQKLWVtCitkdCBKU0ludGVyZmFjZU5hbWU9SFRNTEVsZW1lbnQKK2VtIEpTSW50ZXJmYWNlTmFt ZT1IVE1MRWxlbWVudAogZW1iZWQKIGZpZWxkc2V0IGludGVyZmFjZU5hbWU9SFRNTEZpZWxkU2V0 RWxlbWVudAogZm9udApAQCAtNDMsNzUgKzQzLDc1IEBAIGZyYW1lCiBmcmFtZXNldCBpbnRlcmZh Y2VOYW1lPUhUTUxGcmFtZVNldEVsZW1lbnQKIGhlYWQKIGgxIGludGVyZmFjZU5hbWU9SFRNTEhl YWRpbmdFbGVtZW50Ci1oMgotaDMKLWg0Ci1oNQotaDYKK2gyIEpTSW50ZXJmYWNlTmFtZT1IVE1M SGVhZGluZ0VsZW1lbnQKK2gzIEpTSW50ZXJmYWNlTmFtZT1IVE1MSGVhZGluZ0VsZW1lbnQKK2g0 IEpTSW50ZXJmYWNlTmFtZT1IVE1MSGVhZGluZ0VsZW1lbnQKK2g1IEpTSW50ZXJmYWNlTmFtZT1I VE1MSGVhZGluZ0VsZW1lbnQKK2g2IEpTSW50ZXJmYWNlTmFtZT1IVE1MSGVhZGluZ0VsZW1lbnQK IGhyIGludGVyZmFjZU5hbWU9SFRNTEhSRWxlbWVudAogaHRtbAotaQoraSBKU0ludGVyZmFjZU5h bWU9SFRNTEVsZW1lbnQKIGlmcmFtZSBpbnRlcmZhY2VOYW1lPUhUTUxJRnJhbWVFbGVtZW50CiBp bWFnZQogaW1nIGludGVyZmFjZU5hbWU9SFRNTEltYWdlRWxlbWVudAogaW5wdXQKLWlucworaW5z IEpTSW50ZXJmYWNlTmFtZT1IVE1MTW9kRWxlbWVudAogaXNpbmRleCBpbnRlcmZhY2VOYW1lPUhU TUxJc0luZGV4RWxlbWVudAota2JkCi1rZXlnZW4KK2tiZCBKU0ludGVyZmFjZU5hbWU9SFRNTEVs ZW1lbnQKK2tleWdlbiBKU0ludGVyZmFjZU5hbWU9SFRNTFNlbGVjdEVsZW1lbnQKIGxhYmVsCi1s YXllcgorbGF5ZXIgSlNJbnRlcmZhY2VOYW1lPUhUTUxFbGVtZW50CiBsZWdlbmQKIGxpIGludGVy ZmFjZU5hbWU9SFRNTExJRWxlbWVudAogbGluawotbGlzdGluZworbGlzdGluZyBKU0ludGVyZmFj ZU5hbWU9SFRNTFByZUVsZW1lbnQKIG1hcAogbWFycXVlZQogbWVudQogbWV0YQotbm9icgotbm9l bWJlZAotbm9mcmFtZXMKLW5vbGF5ZXIKLW5vc2NyaXB0Citub2JyIEpTSW50ZXJmYWNlTmFtZT1I VE1MRWxlbWVudAorbm9lbWJlZCBKU0ludGVyZmFjZU5hbWU9SFRNTEVsZW1lbnQKK25vZnJhbWVz IEpTSW50ZXJmYWNlTmFtZT1IVE1MRWxlbWVudAorbm9sYXllciBKU0ludGVyZmFjZU5hbWU9SFRN TEVsZW1lbnQKK25vc2NyaXB0IEpTSW50ZXJmYWNlTmFtZT1IVE1MRWxlbWVudAogb2JqZWN0CiBv bCBpbnRlcmZhY2VOYW1lPUhUTUxPTGlzdEVsZW1lbnQKIG9wdGdyb3VwIGludGVyZmFjZU5hbWU9 SFRNTE9wdEdyb3VwRWxlbWVudAogb3B0aW9uCiBwIGludGVyZmFjZU5hbWU9SFRNTFBhcmFncmFw aEVsZW1lbnQKIHBhcmFtCi1wbGFpbnRleHQKK3BsYWludGV4dCBKU0ludGVyZmFjZU5hbWU9SFRN TEVsZW1lbnQKIHByZQogcSBpbnRlcmZhY2VOYW1lPUhUTUxRdW90ZUVsZW1lbnQKLXMKLXNhbXAK K3MgSlNJbnRlcmZhY2VOYW1lPUhUTUxFbGVtZW50CitzYW1wIEpTSW50ZXJmYWNlTmFtZT1IVE1M RWxlbWVudAogc2NyaXB0CiBzZWxlY3QKLXNtYWxsCitzbWFsbCBKU0ludGVyZmFjZU5hbWU9SFRN TEVsZW1lbnQKICNpZiBFTkFCTEVfVklERU8KIHNvdXJjZSB3cmFwcGVyT25seUlmTWVkaWFJc0F2 YWlsYWJsZT0xCiAjZW5kaWYKLXNwYW4KLXN0cmlrZQotc3Ryb25nCitzcGFuIEpTSW50ZXJmYWNl TmFtZT1IVE1MRWxlbWVudAorc3RyaWtlIEpTSW50ZXJmYWNlTmFtZT1IVE1MRWxlbWVudAorc3Ry b25nIEpTSW50ZXJmYWNlTmFtZT1IVE1MRWxlbWVudAogc3R5bGUKLXN1Ygotc3VwCitzdWIgSlNJ bnRlcmZhY2VOYW1lPUhUTUxFbGVtZW50CitzdXAgSlNJbnRlcmZhY2VOYW1lPUhUTUxFbGVtZW50 CiB0YWJsZQogdGJvZHkgaW50ZXJmYWNlTmFtZT1IVE1MVGFibGVTZWN0aW9uRWxlbWVudAogdGQg aW50ZXJmYWNlTmFtZT1IVE1MVGFibGVDZWxsRWxlbWVudAogdGV4dGFyZWEgaW50ZXJmYWNlTmFt ZT1IVE1MVGV4dEFyZWFFbGVtZW50Ci10Zm9vdAotdGgKLXRoZWFkCit0Zm9vdCBKU0ludGVyZmFj ZU5hbWU9SFRNTFRhYmxlU2VjdGlvbkVsZW1lbnQKK3RoIEpTSW50ZXJmYWNlTmFtZT1IVE1MVGFi bGVDZWxsRWxlbWVudAordGhlYWQgSlNJbnRlcmZhY2VOYW1lPUhUTUxUYWJsZVNlY3Rpb25FbGVt ZW50CiB0aXRsZQogdHIgaW50ZXJmYWNlTmFtZT1IVE1MVGFibGVSb3dFbGVtZW50Ci10dAotdQor dHQgSlNJbnRlcmZhY2VOYW1lPUhUTUxFbGVtZW50Cit1IEpTSW50ZXJmYWNlTmFtZT1IVE1MRWxl bWVudAogdWwgaW50ZXJmYWNlTmFtZT1IVE1MVUxpc3RFbGVtZW50Ci12YXIKK3ZhciBKU0ludGVy ZmFjZU5hbWU9SFRNTEVsZW1lbnQKICNpZiBFTkFCTEVfVklERU8KIHZpZGVvIHdyYXBwZXJPbmx5 SWZNZWRpYUlzQXZhaWxhYmxlPTEKICNlbmRpZgotd2JyCi14bXAKK3diciBKU0ludGVyZmFjZU5h bWU9SFRNTEVsZW1lbnQKK3htcCBKU0ludGVyZmFjZU5hbWU9SFRNTFByZUVsZW1lbnQKSW5kZXg6 IFdlYkNvcmUvc3ZnL3N2Z3RhZ3MuaW4KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9zdmcvc3ZndGFn cy5pbgkocmV2aXNpb24gMzg2MjQpCisrKyBXZWJDb3JlL3N2Zy9zdmd0YWdzLmluCSh3b3JraW5n IGNvcHkpCkBAIC0xNCw3ICsxNCw3IEBAIGFsdEdseXBoSXRlbQogI2lmIEVOQUJMRV9TVkdfQU5J TUFUSU9OCiBhbmltYXRlCiBhbmltYXRlQ29sb3IKLWFuaW1hdGVNb3Rpb24KK2FuaW1hdGVNb3Rp b24gSlNJbnRlcmZhY2VOYW1lPVNWR0VsZW1lbnQKIGFuaW1hdGVUcmFuc2Zvcm0KIHNldAogI2Vu ZGlmCkBAIC04MCw3ICs4MCw3IEBAIGdseXBoCiBnbHlwaFJlZgogI2VuZGlmCiAjaWYgRU5BQkxF X1NWR19GT05UUwotaGtlcm4gaW50ZXJmYWNlTmFtZT1TVkdIS2VybkVsZW1lbnQKK2hrZXJuIGlu dGVyZmFjZU5hbWU9U1ZHSEtlcm5FbGVtZW50LCBKU0ludGVyZmFjZU5hbWU9U1ZHRWxlbWVudAog I2VuZGlmCiBpbWFnZQogbGluZQpAQCAtOTEsNyArOTEsNyBAQCBtZXRhZGF0YQogI2lmIEVOQUJM RV9TVkdfRk9OVFMKIG1pc3NpbmdfZ2x5cGgKICNlbmRpZgotbXBhdGggaW50ZXJmYWNlTmFtZT1T VkdNUGF0aEVsZW1lbnQKK21wYXRoIGludGVyZmFjZU5hbWU9U1ZHTVBhdGhFbGVtZW50LCBKU0lu dGVyZmFjZU5hbWU9U1ZHRWxlbWVudAogcGF0aAogcGF0dGVybgogcG9seWdvbgo=