135148 2014-07-21 22:37:14 -0700 [Cocoa] WKScriptMessageHandlers don't seem to function properly after navigating 2014-07-22 12:49:42 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sam sam oldest_to_newest 1023886 0 sam 2014-07-21 22:37:14 -0700 [Cocoa] WKScriptMessageHandlers don't seem to function properly after navigating 1023888 1 235269 sam 2014-07-21 22:43:15 -0700 Created attachment 235269 Patch 1024000 2 235269 ggaren 2014-07-22 11:13:42 -0700 Comment on attachment 235269 Patch r=me 1024038 3 sam 2014-07-22 12:49:28 -0700 Fixed in r171355. 1024039 4 sam 2014-07-22 12:49:42 -0700 <rdar://problem/17735912> 235269 2014-07-21 22:43:15 -0700 2014-07-22 11:13:41 -0700 Patch bug-135148-20140721224300.patch text/plain 15276 sam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTcxMzM3KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBA CisyMDE0LTA3LTIxICBTYW0gV2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgW0Nv Y29hXSBXS1NjcmlwdE1lc3NhZ2VIYW5kbGVycyBkb24ndCBzZWVtIHRvIGZ1bmN0aW9uIHByb3Bl cmx5IGFmdGVyIG5hdmlnYXRpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEzNTE0OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogcnVudGltZS9Db21tb25JZGVudGlmaWVycy5oOgorICAgICAgICBBZGQg YSBjb21tb24gaWRlbnRpZmllciBmb3IgdGhlIHN0cmluZyAid2Via2l0Ii4KKwogMjAxNC0wNy0y MSAgTWFyayBMYW0gIDxtYXJrLmxhbUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVmYWN0b3IgQXJy YXlQcm90b3R5cGUgdG8gdXNlIGdldExlbmd0aCgpIGFuZCBwdXRMZW5ndGgoKSB1dGlsaXR5IGZ1 bmN0aW9ucy4KSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0NvbW1vbklkZW50 aWZpZXJzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvQ29t bW9uSWRlbnRpZmllcnMuaAkocmV2aXNpb24gMTcxMzM3KQorKysgU291cmNlL0phdmFTY3JpcHRD b3JlL3J1bnRpbWUvQ29tbW9uSWRlbnRpZmllcnMuaAkod29ya2luZyBjb3B5KQpAQCAtMTY2LDYg KzE2Niw3IEBACiAgICAgbWFjcm8odmFsdWUpIFwKICAgICBtYWNybyh2YWx1ZU9mKSBcCiAgICAg bWFjcm8odmFsdWVzKSBcCisgICAgbWFjcm8od2Via2l0KSBcCiAgICAgbWFjcm8od2luZG93KSBc CiAgICAgbWFjcm8od3JpdGFibGUpCiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3MTMzNykK KysrIFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2 IEBACisyMDE0LTA3LTIxICBTYW0gV2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAg W0NvY29hXSBXS1NjcmlwdE1lc3NhZ2VIYW5kbGVycyBkb24ndCBzZWVtIHRvIGZ1bmN0aW9uIHBy b3Blcmx5IGFmdGVyIG5hdmlnYXRpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTEzNTE0OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFRoZSAid2Via2l0IiBwcm9wZXJ0eSBvbiB0aGUgd2luZG93IHdhcyBu b3QgZ2V0dGluZyBpbnN0YWxsZWQgZm9yIHN1YnNlcXVlbnQKKyAgICAgICAgbG9hZHMgZHVlIHRv IGludHJpY2F0ZSBkYW5jZSBwbGF5aW5nIHNldHRpbmcgdGhlIEpTRE9NV2luZG93IHdoZXJlIHRo ZSBET01XaW5kb3cKKyAgICAgICAgb2JqZWN0IGlzIG5vdCB5ZXQgaW4gYSBGcmFtZSB3aGVuIHRo ZSBKU0RPTVdpbmRvdyBpcyBjcmVhdGVkLiBTaW5jZSB3ZSB3ZXJlCisgICAgICAgIGFkZGluZyB0 aGUgIndlYmtpdCIgcHJvcGVydHkgb24gY29uc3RydWN0aW9uLCB0aGUgcHJvcGVydHkgd2FzIHJl dHVybmluZyBudWxsCisgICAgICAgIHRoaW5raW5nIGl0IGhhZCBubyBGcmFtZSBhbmQgd2FzIGlu IGEgYmFkIHN0YXRlLiBXZSBjYW4gZml4IHRoaXMgYnkgbWFraW5nIHRoZQorICAgICAgICAid2Vi a2l0IiBwcm9wZXJ0eSBiZWhhdmUgbGlrZSBhbGwgdGhlIG90aGVyIHdpbmRvdyBwcm9wZXJ0aWVz IG1vdmluZyBpdHMgZ2V0dGluZworICAgICAgICB0byBKU0RPTVdpbmRvdzo6Z2V0T3duUHJvcGVy dHlTbG90LgorCisgICAgICAgIEFkZGVkIEFQSSB0ZXN0IChXZWJLaXQyQ29jb2EvVXNlckNvbnRl bnRDb250cm9sbGVyKS4KKworICAgICAgICAqIGJpbmRpbmdzL2pzL0pTRE9NV2luZG93QmFzZS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpKU0RPTVdpbmRvd0Jhc2U6OmZpbmlzaENyZWF0aW9uKToK KyAgICAgICAgKiBiaW5kaW5ncy9qcy9KU0RPTVdpbmRvd0N1c3RvbS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpqc0RPTVdpbmRvd1dlYktpdCk6CisgICAgICAgIChXZWJDb3JlOjpKU0RPTVdpbmRv dzo6Z2V0T3duUHJvcGVydHlTbG90KToKKwogMjAxNC0wNy0yMSAgQmVuamFtaW4gUG91bGFpbiAg PGJwb3VsYWluQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXVtXSzJdIEltcHJvdmUgZXZlbnQg dGhyb3R0bGluZyBmb3IgU2Nyb2xsIEV2ZW50cwpJbmRleDogU291cmNlL1dlYkNvcmUvYmluZGlu Z3MvanMvSlNET01XaW5kb3dCYXNlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy9qcy9KU0RPTVdpbmRvd0Jhc2UuY3BwCShyZXZpc2lvbiAxNzEzMzcpCisrKyBTb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTVdpbmRvd0Jhc2UuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0zOSwxMCArMzksNiBAQAogI2luY2x1ZGUgPHJ1bnRpbWUvTWljcm90YXNrLmg+CiAjaW5j bHVkZSA8d3RmL01haW5UaHJlYWQuaD4KIAotI2lmIEVOQUJMRShVU0VSX01FU1NBR0VfSEFORExF UlMpCi0jaW5jbHVkZSAiSlNXZWJLaXROYW1lc3BhY2UuaCIKLSNlbmRpZgotCiAjaWYgUExBVEZP Uk0oSU9TKQogI2luY2x1ZGUgIkNocm9tZUNsaWVudC5oIgogI2luY2x1ZGUgIldlYlNhZmVHQ0Fj dGl2aXR5Q2FsbGJhY2tJT1MuaCIKQEAgLTgxLDExICs3Nyw2IEBAIHZvaWQgSlNET01XaW5kb3dC YXNlOjpmaW5pc2hDcmVhdGlvbihWTSYKICAgICB9OwogICAgIAogICAgIGFkZFN0YXRpY0dsb2Jh bHMoc3RhdGljR2xvYmFscywgV1RGX0FSUkFZX0xFTkdUSChzdGF0aWNHbG9iYWxzKSk7Ci0KLSNp ZiBFTkFCTEUoVVNFUl9NRVNTQUdFX0hBTkRMRVJTKQotICAgIGlmIChtX2ltcGwtPnNob3VsZEhh dmVXZWJLaXROYW1lc3BhY2VGb3JXb3JsZCh3b3JsZCgpKSkKLSAgICAgICAgcHV0RGlyZWN0KHZt LCBJZGVudGlmaWVyKCZ2bSwgIndlYmtpdCIpLCB0b0pTKGdsb2JhbEV4ZWMoKSwgdGhpcywgbV9p bXBsLT53ZWJraXROYW1lc3BhY2UoKSksIERvbnREZWxldGUgfCBSZWFkT25seSk7Ci0jZW5kaWYK IH0KIAogdm9pZCBKU0RPTVdpbmRvd0Jhc2U6OmRlc3Ryb3koSlNDZWxsKiBjZWxsKQpJbmRleDog U291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNET01XaW5kb3dDdXN0b20uY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NV2luZG93Q3VzdG9tLmNwcAko cmV2aXNpb24gMTcxMzM3KQorKysgU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNET01XaW5k b3dDdXN0b20uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01NCw2ICs1NCwxMCBAQAogI2luY2x1ZGUg IkpTV2ViU29ja2V0LmgiCiAjZW5kaWYKIAorI2lmIEVOQUJMRShVU0VSX01FU1NBR0VfSEFORExF UlMpCisjaW5jbHVkZSAiSlNXZWJLaXROYW1lc3BhY2UuaCIKKyNlbmRpZgorCiB1c2luZyBuYW1l c3BhY2UgSlNDOwogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CkBAIC05MSw2ICs5NSwxNiBAQCBzdGF0 aWMgRW5jb2RlZEpTVmFsdWUgbmFtZWRJdGVtR2V0dGVyKEV4CiAgICAgcmV0dXJuIEpTVmFsdWU6 OmVuY29kZSh0b0pTKGV4ZWMsIHRoaXNPYmotPmdsb2JhbE9iamVjdCgpLCB0b0hUTUxEb2N1bWVu dChkb2N1bWVudCktPndpbmRvd05hbWVkSXRlbSgqYXRvbWljUHJvcGVydHlOYW1lKSkpOwogfQog CisjaWYgRU5BQkxFKFVTRVJfTUVTU0FHRV9IQU5ETEVSUykKK3N0YXRpYyBFbmNvZGVkSlNWYWx1 ZSBqc0RPTVdpbmRvd1dlYktpdChFeGVjU3RhdGUqIGV4ZWMsIEpTT2JqZWN0KiwgRW5jb2RlZEpT VmFsdWUgdGhpc1ZhbHVlLCBQcm9wZXJ0eU5hbWUpCit7CisgICAgSlNET01XaW5kb3cqIGNhc3Rl ZFRoaXMgPSB0b0pTRE9NV2luZG93KEpTVmFsdWU6OmRlY29kZSh0aGlzVmFsdWUpKTsKKyAgICBp ZiAoIUJpbmRpbmdTZWN1cml0eTo6c2hvdWxkQWxsb3dBY2Nlc3NUb0RPTVdpbmRvdyhleGVjLCBj YXN0ZWRUaGlzLT5pbXBsKCkpKQorICAgICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGpzVW5k ZWZpbmVkKCkpOworICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUodG9KUyhleGVjLCBjYXN0ZWRU aGlzLT5nbG9iYWxPYmplY3QoKSwgY2FzdGVkVGhpcy0+aW1wbCgpLndlYmtpdE5hbWVzcGFjZSgp KSk7Cit9CisjZW5kaWYKKwogYm9vbCBKU0RPTVdpbmRvdzo6Z2V0T3duUHJvcGVydHlTbG90KEpT T2JqZWN0KiBvYmplY3QsIEV4ZWNTdGF0ZSogZXhlYywgUHJvcGVydHlOYW1lIHByb3BlcnR5TmFt ZSwgUHJvcGVydHlTbG90JiBzbG90KQogewogICAgIEpTRE9NV2luZG93KiB0aGlzT2JqZWN0ID0g anNDYXN0PEpTRE9NV2luZG93Kj4ob2JqZWN0KTsKQEAgLTE3NCw2ICsxODgsMTMgQEAgYm9vbCBK U0RPTVdpbmRvdzo6Z2V0T3duUHJvcGVydHlTbG90KEpTTwogICAgICAgICByZXR1cm4gdHJ1ZTsK ICAgICB9CiAKKyNpZiBFTkFCTEUoVVNFUl9NRVNTQUdFX0hBTkRMRVJTKQorICAgIGlmIChwcm9w ZXJ0eU5hbWUgPT0gZXhlYy0+cHJvcGVydHlOYW1lcygpLndlYmtpdCAmJiB0aGlzT2JqZWN0LT5p bXBsKCkuc2hvdWxkSGF2ZVdlYktpdE5hbWVzcGFjZUZvcldvcmxkKHRoaXNPYmplY3QtPndvcmxk KCkpKSB7CisgICAgICAgIHNsb3Quc2V0Q2FjaGVhYmxlQ3VzdG9tKHRoaXNPYmplY3QsIGFsbG93 c0FjY2VzcyA/IERvbnREZWxldGUgfCBSZWFkT25seSA6IFJlYWRPbmx5IHwgRG9udERlbGV0ZSB8 IERvbnRFbnVtLCBqc0RPTVdpbmRvd1dlYktpdCk7CisgICAgICAgIHJldHVybiB0cnVlOworICAg IH0KKyNlbmRpZgorCiAgICAgLy8gRG8gcHJvdG90eXBlIGxvb2t1cCBlYXJseSBzbyB0aGF0IGZ1 bmN0aW9ucyBhbmQgYXR0cmlidXRlcyBpbiB0aGUgcHJvdG90eXBlIGNhbiBoYXZlCiAgICAgLy8g cHJlY2VkZW5jZSBvdmVyIHRoZSBpbmRleCBhbmQgbmFtZSBnZXR0ZXJzLiAgCiAgICAgSlNWYWx1 ZSBwcm90byA9IHRoaXNPYmplY3QtPnByb3RvdHlwZSgpOwpJbmRleDogVG9vbHMvQ2hhbmdlTG9n Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFRvb2xzL0NoYW5nZUxvZwkocmV2aXNpb24gMTcxMzM3KQorKysgVG9v bHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTQtMDctMjEg IFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KKworICAgICAgICBbQ29jb2FdIFdLU2NyaXB0 TWVzc2FnZUhhbmRsZXJzIGRvbid0IHNlZW0gdG8gZnVuY3Rpb24gcHJvcGVybHkgYWZ0ZXIgbmF2 aWdhdGluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTM1MTQ4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBUZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoK KyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJDb2NvYS9Vc2VyQ29udGVudENv bnRyb2xsZXIubW06IEFkZGVkLgorICAgICAgICAoLVtTaW1wbGVOYXZpZ2F0aW9uRGVsZWdhdGUg d2ViVmlldzpkaWRGaW5pc2hOYXZpZ2F0aW9uOl0pOgorICAgICAgICAoLVtTY3JpcHRNZXNzYWdl SGFuZGxlciB1c2VyQ29udGVudENvbnRyb2xsZXI6ZGlkUmVjZWl2ZVNjcmlwdE1lc3NhZ2U6XSk6 CisKIDIwMTQtMDctMjEgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CiAKICAg ICAgICAgVW5yZXZpZXdlZCB0ZXN0IGZpeC4KSW5kZXg6IFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVz dFdlYktpdEFQSS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xz L1Rlc3RXZWJLaXRBUEkvVGVzdFdlYktpdEFQSS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCShy ZXZpc2lvbiAxNzEzMzcpCisrKyBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNv ZGVwcm9qL3Byb2plY3QucGJ4cHJvagkod29ya2luZyBjb3B5KQpAQCAtMTIyLDYgKzEyMiw3IEBA CiAJCTdDNzRENDJGMTg4MjI4RjMwMEU1RUQ1NyAvKiBTdHJpbmdWaWV3LmNwcCBpbiBTb3VyY2Vz ICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDdDNzRENDJEMTg4MjI4RjMwMEU1 RUQ1NyAvKiBTdHJpbmdWaWV3LmNwcCAqLzsgfTsKIAkJN0M4RERBQUIxNzM1REVFRTAwRUE1QUMw IC8qIENsb3NlVGhlblRlcm1pbmF0ZS5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWls ZEZpbGU7IGZpbGVSZWYgPSA3QzhEREFBOTE3MzVERTFEMDBFQTVBQzAgLyogQ2xvc2VUaGVuVGVy bWluYXRlLmNwcCAqLzsgfTsKIAkJN0M5RUQ5OEIxN0ExOUY0QjAwRTREQzMzIC8qIGF0dHJpYnV0 ZWRTdHJpbmdTdHJpa2V0aHJvdWdoLmh0bWwgaW4gQ29weSBSZXNvdXJjZXMgKi8gPSB7aXNhID0g UEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gN0M5RUQ5OEExN0ExOUQwNjAwRTREQzMzIC8qIGF0dHJp YnV0ZWRTdHJpbmdTdHJpa2V0aHJvdWdoLmh0bWwgKi87IH07CisJCTdDQzNFMUZDMTk3RTIzNDEw MEJFNjI1MiAvKiBVc2VyQ29udGVudENvbnRyb2xsZXIubW0gaW4gU291cmNlcyAqLyA9IHtpc2Eg PSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA3Q0MzRTFGQTE5N0UyMzQxMDBCRTYyNTIgLyogVXNl ckNvbnRlbnRDb250cm9sbGVyLm1tICovOyB9OwogCQk3Q0ZCQ0FERjE3NDMyMzRGMDBCMkJGQ0Yg LyogV2lsbExvYWQuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxl UmVmID0gN0NGQkNBREQxNzQzMjM0RjAwQjJCRkNGIC8qIFdpbGxMb2FkLmNwcCAqLzsgfTsKIAkJ N0NGQkNBRTUxNzQzMjM4RjAwQjJCRkNGIC8qIFdpbGxMb2FkX0J1bmRsZS5jcHAgaW4gU291cmNl cyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA3Q0ZCQ0FFMzE3NDMyMzhFMDBC MkJGQ0YgLyogV2lsbExvYWRfQnVuZGxlLmNwcCAqLzsgfTsKIAkJODFCNTAxOTMxNDBGMjMyMzAw RDlFQjU4IC8qIFN0cmluZ0J1aWxkZXIuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVp bGRGaWxlOyBmaWxlUmVmID0gODFCNTAxOTIxNDBGMjMyMzAwRDlFQjU4IC8qIFN0cmluZ0J1aWxk ZXIuY3BwICovOyB9OwpAQCAtNDYyLDYgKzQ2Myw3IEBACiAJCTdDNzRENDJEMTg4MjI4RjMwMEU1 RUQ1NyAvKiBTdHJpbmdWaWV3LmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxl RW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0 aCA9IFN0cmluZ1ZpZXcuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk3QzhEREFB OTE3MzVERTFEMDBFQTVBQzAgLyogQ2xvc2VUaGVuVGVybWluYXRlLmNwcCAqLyA9IHtpc2EgPSBQ QlhGaWxlUmVmZXJlbmNlOyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsg cGF0aCA9IENsb3NlVGhlblRlcm1pbmF0ZS5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07 CiAJCTdDOUVEOThBMTdBMTlEMDYwMEU0REMzMyAvKiBhdHRyaWJ1dGVkU3RyaW5nU3RyaWtldGhy b3VnaC5odG1sICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGxhc3RLbm93bkZpbGVUeXBl ID0gdGV4dC5odG1sOyBwYXRoID0gYXR0cmlidXRlZFN0cmluZ1N0cmlrZXRocm91Z2guaHRtbDsg c291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJN0NDM0UxRkExOTdFMjM0MTAwQkU2MjUyIC8q IFVzZXJDb250ZW50Q29udHJvbGxlci5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBm aWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNw cDsgcGF0aCA9IFVzZXJDb250ZW50Q29udHJvbGxlci5tbTsgc291cmNlVHJlZSA9ICI8Z3JvdXA+ IjsgfTsKIAkJN0NGQkNBREQxNzQzMjM0RjAwQjJCRkNGIC8qIFdpbGxMb2FkLmNwcCAqLyA9IHtp c2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlw ZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFdpbGxMb2FkLmNwcDsgc291cmNlVHJlZSA9 ICI8Z3JvdXA+IjsgfTsKIAkJN0NGQkNBRTMxNzQzMjM4RTAwQjJCRkNGIC8qIFdpbGxMb2FkX0J1 bmRsZS5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsg bGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBXaWxsTG9hZF9C dW5kbGUuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk4MUI1MDE5MjE0MEYyMzIz MDBEOUVCNTggLyogU3RyaW5nQnVpbGRlci5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5j ZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5j cHA7IHBhdGggPSBTdHJpbmdCdWlsZGVyLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsK QEAgLTcwMiw2ICs3MDQsNyBAQAogCQkJY2hpbGRyZW4gPSAoCiAJCQkJQTFBNEZFNUQxOEREM0RC NzAwQjVFQThBIC8qIERvd25sb2FkLm1tICovLAogCQkJCTFBQkMzREVEMTg5OUJFNkQwMDRGMDYy NiAvKiBOYXZpZ2F0aW9uLm1tICovLAorCQkJCTdDQzNFMUZBMTk3RTIzNDEwMEJFNjI1MiAvKiBV c2VyQ29udGVudENvbnRyb2xsZXIubW0gKi8sCiAJCQkpOwogCQkJbmFtZSA9ICJXZWJLaXQyIENv Y29hIjsKIAkJCXBhdGggPSBXZWJLaXQyQ29jb2E7CkBAIC0xMjQ1LDYgKzEyNDgsNyBAQAogCQkJ CTI5MEY0MjdCMTcyQTIzQTUwMDkzOUZGMCAvKiBUZXN0UHJvdG9jb2wubW0gaW4gU291cmNlcyAq LywKIAkJCQkxQUE5RTU1OTE0OTgwQTk5MDAwMDFBOEEgLyogRnVuY3Rpb25hbC5jcHAgaW4gU291 cmNlcyAqLywKIAkJCQlDMEM1RDNCRTE0NTk4QjZGMDBBODAyQTYgLyogR2V0QmFja2luZ1NjYWxl RmFjdG9yLm1tIGluIFNvdXJjZXMgKi8sCisJCQkJN0NDM0UxRkMxOTdFMjM0MTAwQkU2MjUyIC8q IFVzZXJDb250ZW50Q29udHJvbGxlci5tbSBpbiBTb3VyY2VzICovLAogCQkJCUY2NjBBQTBEMTVB NUYwNjEwMDNBMTI0MyAvKiBHZXRJbmplY3RlZEJ1bmRsZUluaXRpYWxpemF0aW9uVXNlckRhdGFD YWxsYmFjay5jcHAgaW4gU291cmNlcyAqLywKIAkJCQkwQkNEODMzNTE0ODU3Q0U0MDBFQTIwMDMg LyogSGFzaE1hcC5jcHAgaW4gU291cmNlcyAqLywKIAkJCQkyREQ3RDNBQTE3ODIwNUQwMDAyNkUx RTMgLyogUmVzaXplUmV2ZXJzZVBhZ2luYXRlZFdlYlZpZXcuY3BwIGluIFNvdXJjZXMgKi8sCklu ZGV4OiBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJDb2NvYS9Vc2VyQ29udGVudENv bnRyb2xsZXIubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJL aXQyQ29jb2EvVXNlckNvbnRlbnRDb250cm9sbGVyLm1tCShyZXZpc2lvbiAwKQorKysgVG9vbHMv VGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyQ29jb2EvVXNlckNvbnRlbnRDb250cm9sbGVyLm1t CSh3b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEsMTI5IEBACisvKgorICogQ29weXJpZ2h0IChDKSAy MDE0IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlv biBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAq IG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcg Y29uZGl0aW9ucworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2Ug Y29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMg bGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiBS ZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNv cHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZv bGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3Ro ZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElT IFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMg YGBBUyBJUycnCisgKiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNM VURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyAqIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0Yg TUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0Ug QVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRS SUJVVE9SUworICogQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRB TCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgorICogQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNM VURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YKKyAqIFNVQlNUSVRVVEUg R09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJ TkVTUworICogSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBP RiBMSUFCSUxJVFksIFdIRVRIRVIgSU4KKyAqIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBP UiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpCisgKiBBUklTSU5HIElO IEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VE IE9GCisgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworI2ltcG9ydCAi Y29uZmlnLmgiCisKKyNpbXBvcnQgIlBsYXRmb3JtVXRpbGl0aWVzLmgiCisjaW1wb3J0ICJUZXN0 LmgiCisjaW1wb3J0IDxXZWJLaXQvV2ViS2l0Lmg+CisjaW1wb3J0IDx3dGYvUmV0YWluUHRyLmg+ CisKKyNpZiBXS19BUElfRU5BQkxFRAorCisKK3N0YXRpYyBib29sIGlzRG9uZVdpdGhOYXZpZ2F0 aW9uOworCitAaW50ZXJmYWNlIFNpbXBsZU5hdmlnYXRpb25EZWxlZ2F0ZSA6IE5TT2JqZWN0IDxX S05hdmlnYXRpb25EZWxlZ2F0ZT4KK0BlbmQKKworQGltcGxlbWVudGF0aW9uIFNpbXBsZU5hdmln YXRpb25EZWxlZ2F0ZQorCistICh2b2lkKXdlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgZGlk RmluaXNoTmF2aWdhdGlvbjooV0tOYXZpZ2F0aW9uICopbmF2aWdhdGlvbgoreworICAgIGlzRG9u ZVdpdGhOYXZpZ2F0aW9uID0gdHJ1ZTsKK30KKworQGVuZAorCitzdGF0aWMgYm9vbCByZWNlaXZl ZFNjcmlwdE1lc3NhZ2U7CitzdGF0aWMgUmV0YWluUHRyPFdLU2NyaXB0TWVzc2FnZT4gbGFzdFNj cmlwdE1lc3NhZ2U7CisKK0BpbnRlcmZhY2UgU2NyaXB0TWVzc2FnZUhhbmRsZXIgOiBOU09iamVj dCA8V0tTY3JpcHRNZXNzYWdlSGFuZGxlcj4KK0BlbmQKKworQGltcGxlbWVudGF0aW9uIFNjcmlw dE1lc3NhZ2VIYW5kbGVyCisKKy0gKHZvaWQpdXNlckNvbnRlbnRDb250cm9sbGVyOihXS1VzZXJD b250ZW50Q29udHJvbGxlciAqKXVzZXJDb250ZW50Q29udHJvbGxlciBkaWRSZWNlaXZlU2NyaXB0 TWVzc2FnZTooV0tTY3JpcHRNZXNzYWdlICopbWVzc2FnZQoreworICAgIHJlY2VpdmVkU2NyaXB0 TWVzc2FnZSA9IHRydWU7CisgICAgbGFzdFNjcmlwdE1lc3NhZ2UgPSBtZXNzYWdlOworfQorCitA ZW5kCisKK1RFU1QoV0tVc2VyQ29udGVudENvbnRyb2xsZXIsIFNjcmlwdE1lc3NhZ2VIYW5kbGVy U2ltcGxlKQoreworICAgIFJldGFpblB0cjxTY3JpcHRNZXNzYWdlSGFuZGxlcj4gaGFuZGxlciA9 IGFkb3B0TlMoW1tTY3JpcHRNZXNzYWdlSGFuZGxlciBhbGxvY10gaW5pdF0pOworICAgIFJldGFp blB0cjxXS1dlYlZpZXdDb25maWd1cmF0aW9uPiBjb25maWd1cmF0aW9uID0gYWRvcHROUyhbW1dL V2ViVmlld0NvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRdKTsKKyAgICBbW2NvbmZpZ3VyYXRpb24g dXNlckNvbnRlbnRDb250cm9sbGVyXSBhZGRTY3JpcHRNZXNzYWdlSGFuZGxlcjpoYW5kbGVyLmdl dCgpIG5hbWU6QCJ0ZXN0SGFuZGxlciJdOworCisgICAgUmV0YWluUHRyPFdLV2ViVmlldz4gd2Vi VmlldyA9IGFkb3B0TlMoW1tXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6TlNNYWtlUmVj dCgwLCAwLCA4MDAsIDYwMCkgY29uZmlndXJhdGlvbjpjb25maWd1cmF0aW9uLmdldCgpXSk7CisK KyAgICBSZXRhaW5QdHI8U2ltcGxlTmF2aWdhdGlvbkRlbGVnYXRlPiBkZWxlZ2F0ZSA9IGFkb3B0 TlMoW1tTaW1wbGVOYXZpZ2F0aW9uRGVsZWdhdGUgYWxsb2NdIGluaXRdKTsKKyAgICBbd2ViVmll dyBzZXROYXZpZ2F0aW9uRGVsZWdhdGU6ZGVsZWdhdGUuZ2V0KCldOworCisgICAgTlNVUkxSZXF1 ZXN0ICpyZXF1ZXN0ID0gW05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpbW05TQnVuZGxlIG1h aW5CdW5kbGVdIFVSTEZvclJlc291cmNlOkAic2ltcGxlIiB3aXRoRXh0ZW5zaW9uOkAiaHRtbCIg c3ViZGlyZWN0b3J5OkAiVGVzdFdlYktpdEFQSS5yZXNvdXJjZXMiXV07CisKKyAgICBbd2ViVmll dyBsb2FkUmVxdWVzdDpyZXF1ZXN0XTsKKworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigm aXNEb25lV2l0aE5hdmlnYXRpb24pOworCisgICAgW3dlYlZpZXcgZXZhbHVhdGVKYXZhU2NyaXB0 OkAid2luZG93LndlYmtpdC5tZXNzYWdlSGFuZGxlcnMudGVzdEhhbmRsZXIucG9zdE1lc3NhZ2Uo J0hlbGxvJykiIGNvbXBsZXRpb25IYW5kbGVyOm5pbF07CisKKyAgICBUZXN0V2ViS2l0QVBJOjpV dGlsOjpydW4oJnJlY2VpdmVkU2NyaXB0TWVzc2FnZSk7CisgICAgcmVjZWl2ZWRTY3JpcHRNZXNz YWdlID0gZmFsc2U7CisKKyAgICBFWFBFQ1RfV0tfU1RSRVEoQCJIZWxsbyIsIChOU1N0cmluZyAq KVtsYXN0U2NyaXB0TWVzc2FnZSBib2R5XSk7Cit9CisKK1RFU1QoV0tVc2VyQ29udGVudENvbnRy b2xsZXIsIFNjcmlwdE1lc3NhZ2VIYW5kbGVyV2l0aE5hdmlnYXRpb24pCit7CisgICAgUmV0YWlu UHRyPFNjcmlwdE1lc3NhZ2VIYW5kbGVyPiBoYW5kbGVyID0gYWRvcHROUyhbW1NjcmlwdE1lc3Nh Z2VIYW5kbGVyIGFsbG9jXSBpbml0XSk7CisgICAgUmV0YWluUHRyPFdLV2ViVmlld0NvbmZpZ3Vy YXRpb24+IGNvbmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtbV0tXZWJWaWV3Q29uZmlndXJhdGlvbiBh bGxvY10gaW5pdF0pOworICAgIFtbY29uZmlndXJhdGlvbiB1c2VyQ29udGVudENvbnRyb2xsZXJd IGFkZFNjcmlwdE1lc3NhZ2VIYW5kbGVyOmhhbmRsZXIuZ2V0KCkgbmFtZTpAInRlc3RIYW5kbGVy Il07CisKKyAgICBSZXRhaW5QdHI8V0tXZWJWaWV3PiB3ZWJWaWV3ID0gYWRvcHROUyhbW1dLV2Vi VmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpOU01ha2VSZWN0KDAsIDAsIDgwMCwgNjAwKSBjb25m aWd1cmF0aW9uOmNvbmZpZ3VyYXRpb24uZ2V0KCldKTsKKworICAgIFJldGFpblB0cjxTaW1wbGVO YXZpZ2F0aW9uRGVsZWdhdGU+IGRlbGVnYXRlID0gYWRvcHROUyhbW1NpbXBsZU5hdmlnYXRpb25E ZWxlZ2F0ZSBhbGxvY10gaW5pdF0pOworICAgIFt3ZWJWaWV3IHNldE5hdmlnYXRpb25EZWxlZ2F0 ZTpkZWxlZ2F0ZS5nZXQoKV07CisKKyAgICBOU1VSTFJlcXVlc3QgKnJlcXVlc3QgPSBbTlNVUkxS ZXF1ZXN0IHJlcXVlc3RXaXRoVVJMOltbTlNCdW5kbGUgbWFpbkJ1bmRsZV0gVVJMRm9yUmVzb3Vy Y2U6QCJzaW1wbGUiIHdpdGhFeHRlbnNpb246QCJodG1sIiBzdWJkaXJlY3Rvcnk6QCJUZXN0V2Vi S2l0QVBJLnJlc291cmNlcyJdXTsKKyAgICBbd2ViVmlldyBsb2FkUmVxdWVzdDpyZXF1ZXN0XTsK KworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmaXNEb25lV2l0aE5hdmlnYXRpb24pOwor ICAgIGlzRG9uZVdpdGhOYXZpZ2F0aW9uID0gZmFsc2U7CisKKyAgICBbd2ViVmlldyBldmFsdWF0 ZUphdmFTY3JpcHQ6QCJ3aW5kb3cud2Via2l0Lm1lc3NhZ2VIYW5kbGVycy50ZXN0SGFuZGxlci5w b3N0TWVzc2FnZSgnRmlyc3QgTWVzc2FnZScpIiBjb21wbGV0aW9uSGFuZGxlcjpuaWxdOworCisg ICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZyZWNlaXZlZFNjcmlwdE1lc3NhZ2UpOworCisg ICAgRVhQRUNUX1dLX1NUUkVRKEAiRmlyc3QgTWVzc2FnZSIsIChOU1N0cmluZyAqKVtsYXN0U2Ny aXB0TWVzc2FnZSBib2R5XSk7CisgICAgCisgICAgcmVjZWl2ZWRTY3JpcHRNZXNzYWdlID0gZmFs c2U7CisgICAgbGFzdFNjcmlwdE1lc3NhZ2UgPSBudWxscHRyOworCisKKyAgICBbd2ViVmlldyBs b2FkUmVxdWVzdDpyZXF1ZXN0XTsKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmlzRG9u ZVdpdGhOYXZpZ2F0aW9uKTsKKyAgICBpc0RvbmVXaXRoTmF2aWdhdGlvbiA9IGZhbHNlOworCisg ICAgW3dlYlZpZXcgZXZhbHVhdGVKYXZhU2NyaXB0OkAid2luZG93LndlYmtpdC5tZXNzYWdlSGFu ZGxlcnMudGVzdEhhbmRsZXIucG9zdE1lc3NhZ2UoJ1NlY29uZCBNZXNzYWdlJykiIGNvbXBsZXRp b25IYW5kbGVyOm5pbF07CisKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJnJlY2VpdmVk U2NyaXB0TWVzc2FnZSk7CisKKyAgICBFWFBFQ1RfV0tfU1RSRVEoQCJTZWNvbmQgTWVzc2FnZSIs IChOU1N0cmluZyAqKVtsYXN0U2NyaXB0TWVzc2FnZSBib2R5XSk7ICAgIAorfQorCisjZW5kaWYK