138411 2014-11-05 00:44:27 -0800 [GTK] Expose user script messages to GObject DOM bindings 2014-11-12 04:30:54 -0800 1 1 1 Unclassified WebKit Bindings 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 138409 125775 1 cgarcia webkit-unassigned aperez gustavo pnormand oldest_to_newest 1046403 0 cgarcia 2014-11-05 00:44:27 -0800 ssia 1046407 1 241009 cgarcia 2014-11-05 01:00:57 -0800 Created attachment 241009 Patch The "raw" API is not very convenient to use, we should add custom API to make it easier to use. 1047792 2 241009 pnormand 2014-11-11 00:30:23 -0800 Comment on attachment 241009 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=241009&action=review > Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm:1586 > + return scalar(grep {$_ eq $domClassName} qw(WebKitDOMDOMWindow WebKitDOMUserMessageHandlersNamespace)); Kind of sad to hardcode this here :( Is this the only way? 1047798 3 cgarcia 2014-11-11 01:02:47 -0800 (In reply to comment #2) > Comment on attachment 241009 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=241009&action=review > > > Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm:1586 > > + return scalar(grep {$_ eq $domClassName} qw(WebKitDOMDOMWindow WebKitDOMUserMessageHandlersNamespace)); > > Kind of sad to hardcode this here :( Is this the only way? Not easily. When generating code, we know which symbols are not stable (the ones not in the stable symbols list), but custom symbols are not generated but manually implemented. The code generator knows which symbols require a custom implementation, but it doesn't know which custom symbols are actually implemented manually (most of them are simply not implemented). 1047817 4 241009 pnormand 2014-11-11 02:39:22 -0800 Comment on attachment 241009 Patch Ok then. 1048136 5 cgarcia 2014-11-12 04:30:54 -0800 Committed r176018: <http://trac.webkit.org/changeset/176018> 241009 2014-11-05 01:00:57 -0800 2014-11-11 02:39:22 -0800 Patch wkdom-user-script-messages.diff text/plain 14901 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBiNzMwNTI3Li45N2U5YjI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjQg QEAKIDIwMTQtMTEtMDUgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCisgICAgICAgIFtHVEtdIEV4cG9zZSB1c2VyIHNjcmlwdCBtZXNzYWdlcyB0byBHT2JqZWN0 IERPTSBiaW5kaW5ncworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTM4NDExCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBQbGF0Zm9ybUdUSy5jbWFrZTogQWRkIFdlYktpdERPTUN1c3RvbVVuc3RhYmxlLmgg dG8gdGhlIGxpc3Qgb2YKKyAgICAgICAgaW5zdGFsbGVkIGhlYWRlcnMgYW5kIG1ha2UgYSBzeW1s aW5rIGZvciBpdCBpbiB0aGUgRGVyaXZlZFNvdXJjZXMgZGlyLgorICAgICAgICAqIGJpbmRpbmdz L2dvYmplY3QvV2ViS2l0RE9NQ3VzdG9tVW5zdGFibGUuaDogQWRkZWQuCisgICAgICAgICogYmlu ZGluZ3MvZ29iamVjdC9XZWJLaXRET01DdXN0b20uY3BwOgorICAgICAgICAod2Via2l0X2RvbV9k b21fd2luZG93X2dldF93ZWJraXRfbmFtZXNwYWNlKToKKyAgICAgICAgKHdlYmtpdF9kb21fdXNl cl9tZXNzYWdlX2hhbmRsZXJzX25hbWVzcGFjZV9nZXRfaGFuZGxlcik6CisgICAgICAgICogYmlu ZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yR09iamVjdC5wbToKKyAgICAgICAgKEhhc1Vuc3Rh YmxlQ3VzdG9tQVBJKTogSGVscGVyIGZ1bmN0aW9uIHRvIGNoZWNrIGlmIHRoZSBnaXZlbgorICAg ICAgICBjbGFzcyBoYXMgY3VzdG9tIHVuc3RhYmxlIEFQSS4KKyAgICAgICAgKFdyaXRlRGF0YSk6 IEluY2x1ZGUgV2ViS2l0RE9NQ3VzdG9tVW5zdGFibGUuaCBoZWFkZXIgaWYgdGhlIGNsYXNzCisg ICAgICAgIGhhcyBBUEkgZGVmaW5lZCB0aGVyZS4KKworMjAxNC0xMS0wNSAgQ2FybG9zIEdhcmNp YSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CisKICAgICAgICAgW0dUS10gRml4IGhvdyBT ZXJpYWxpemVkU2NyaXB0VmFsdWUgaXMgZXhwb3NlZCB0byBHT2JqZWN0IERPTSBiaW5kaW5ncwog ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM4NDA5CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1BsYXRmb3JtR1RLLmNtYWtlIGIvU291cmNlL1dl YkNvcmUvUGxhdGZvcm1HVEsuY21ha2UKaW5kZXggY2Y5NTMxZi4uNTJkYjVmYiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvUGxhdGZvcm1HVEsuY21ha2UKKysrIGIvU291cmNlL1dlYkNvcmUv UGxhdGZvcm1HVEsuY21ha2UKQEAgLTYzNiw3ICs2MzYsMTAgQEAgbGlzdChBUFBFTkQgR09iamVj dERPTUJpbmRpbmdzVW5zdGFibGVfSURMX0ZJTEVTCiAgICAgcGFnZS9QZXJmb3JtYW5jZU5hdmln YXRpb24uaWRsCiAgICAgcGFnZS9QZXJmb3JtYW5jZVRpbWluZy5pZGwKICAgICBwYWdlL1NjcmVl bi5pZGwKKyAgICBwYWdlL1VzZXJNZXNzYWdlSGFuZGxlci5pZGwKKyAgICBwYWdlL1VzZXJNZXNz YWdlSGFuZGxlcnNOYW1lc3BhY2UuaWRsCiAgICAgcGFnZS9XZWJLaXRQb2ludC5pZGwKKyAgICBw YWdlL1dlYktpdE5hbWVzcGFjZS5pZGwKIAogICAgIHBsdWdpbnMvRE9NTWltZVR5cGUuaWRsCiAg ICAgcGx1Z2lucy9ET01NaW1lVHlwZUFycmF5LmlkbApAQCAtNjkzLDYgKzY5Niw3IEBAIHNldChH T2JqZWN0RE9NQmluZGluZ3NTdGFibGVfSU5TVEFMTEVEX0hFQURFUlMKIAogc2V0KEdPYmplY3RE T01CaW5kaW5nc1Vuc3RhYmxlX0lOU1RBTExFRF9IRUFERVJTCiAgICAgICR7REVSSVZFRF9TT1VS Q0VTX0dPQkpFQ1RfRE9NX0JJTkRJTkdTX0RJUn0vd2Via2l0ZG9tZGVmaW5lcy11bnN0YWJsZS5o CisgICAgICR7V0VCQ09SRV9ESVJ9L2JpbmRpbmdzL2dvYmplY3QvV2ViS2l0RE9NQ3VzdG9tVW5z dGFibGUuaAogKQogCiBmb3JlYWNoIChmaWxlICR7R09iamVjdERPTUJpbmRpbmdzU3RhYmxlX0lE TF9GSUxFU30pCkBAIC03MzQsNyArNzM4LDggQEAgYWRkX2N1c3RvbV9jb21tYW5kKAogCiAjIFNv bWUgb2YgdGhlIHN0YXRpYyBoZWFkZXJzIGFyZSBpbmNsdWRlZCBieSBnZW5lcmF0ZWQgcHVibGlj IGhlYWRlcnMgd2l0aCBpbmNsdWRlIDx3ZWJraXRkb20vV2ViS2l0RE9NRm9vLmg+LgogIyBXZSBu ZWVkIHRob3NlIGhlYWRlcnMgaW4gdGhlIGRlcml2ZWQgc291cmNlcyB0byBiZSBpbiB3ZWJraXRk b20gZGlyZWN0b3J5LgotZm9yZWFjaCAoY2xhc3NuYW1lICR7R09iamVjdERPTUJpbmRpbmdzX1NU QVRJQ19DTEFTU19MSVNUfSkKK3NldChHT2JqZWN0RE9NQmluZGluZ3NfU1RBVElDX0hFQURFUl9O QU1FUyAke0dPYmplY3RET01CaW5kaW5nc19TVEFUSUNfQ0xBU1NfTElTVH0gQ3VzdG9tVW5zdGFi bGUpCitmb3JlYWNoIChjbGFzc25hbWUgJHtHT2JqZWN0RE9NQmluZGluZ3NfU1RBVElDX0hFQURF Ul9OQU1FU30pCiAgICAgYWRkX2N1c3RvbV9jb21tYW5kKAogICAgICAgICBPVVRQVVQgJHtERVJJ VkVEX1NPVVJDRVNfR09CSkVDVF9ET01fQklORElOR1NfRElSfS9XZWJLaXRET00ke2NsYXNzbmFt ZX0uaAogICAgICAgICBERVBFTkRTICR7V0VCQ09SRV9ESVJ9L2JpbmRpbmdzL2dvYmplY3QvV2Vi S2l0RE9NJHtjbGFzc25hbWV9LmgKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L2dvYmplY3QvV2ViS2l0RE9NQ3VzdG9tLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2dv YmplY3QvV2ViS2l0RE9NQ3VzdG9tLmNwcAppbmRleCAwZjA3OTRjLi5jNzcxOTBkIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9nb2JqZWN0L1dlYktpdERPTUN1c3RvbS5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvZ29iamVjdC9XZWJLaXRET01DdXN0b20uY3Bw CkBAIC0yMCwxOCArMjAsMTUgQEAKICNpbmNsdWRlICJXZWJLaXRET01DdXN0b20uaCIKIAogI2lu Y2x1ZGUgIkpTTWFpblRocmVhZEV4ZWNTdGF0ZS5oIgorI2luY2x1ZGUgIldlYktpdERPTURPTVdp bmRvd1ByaXZhdGUuaCIKICNpbmNsdWRlICJXZWJLaXRET01IVE1MSW5wdXRFbGVtZW50LmgiCiAj aW5jbHVkZSAiV2ViS2l0RE9NSFRNTElucHV0RWxlbWVudFByaXZhdGUuaCIKLSNpbmNsdWRlICJX ZWJLaXRET01IVE1MTWVkaWFFbGVtZW50UHJpdmF0ZS5oIgogI2luY2x1ZGUgIldlYktpdERPTUhU TUxUZXh0QXJlYUVsZW1lbnQuaCIKICNpbmNsdWRlICJXZWJLaXRET01IVE1MVGV4dEFyZWFFbGVt ZW50UHJpdmF0ZS5oIgogI2luY2x1ZGUgIldlYktpdERPTVByaXZhdGUuaCIKLSNpbmNsdWRlICJn b2JqZWN0L0NvbnZlcnRUb1VURjhTdHJpbmcuaCIKLQotI2lmIEVOQUJMRShWSURFTykKLSNpbmNs dWRlICJUZXh0VHJhY2suaCIKLSNpbmNsdWRlICJXZWJLaXRET01UZXh0VHJhY2tQcml2YXRlLmgi Ci0jZW5kaWYKKyNpbmNsdWRlICJXZWJLaXRET01Vc2VyTWVzc2FnZUhhbmRsZXJQcml2YXRlLmgi CisjaW5jbHVkZSAiV2ViS2l0RE9NVXNlck1lc3NhZ2VIYW5kbGVyc05hbWVzcGFjZVByaXZhdGUu aCIKKyNpbmNsdWRlICJXZWJLaXRET01XZWJLaXROYW1lc3BhY2VQcml2YXRlLmgiCiAKIHVzaW5n IG5hbWVzcGFjZSBXZWJLaXQ7CiAKQEAgLTQ5LDQgKzQ2LDIxIEBAIGdib29sZWFuIHdlYmtpdF9k b21faHRtbF9pbnB1dF9lbGVtZW50X2lzX2VkaXRlZChXZWJLaXRET01IVE1MSW5wdXRFbGVtZW50 KiBpbnB1CiAgICAgcmV0dXJuIGNvcmUoaW5wdXQpLT5sYXN0Q2hhbmdlV2FzVXNlckVkaXQoKTsK IH0KIAorV2ViS2l0RE9NV2ViS2l0TmFtZXNwYWNlKiB3ZWJraXRfZG9tX2RvbV93aW5kb3dfZ2V0 X3dlYmtpdF9uYW1lc3BhY2UoV2ViS2l0RE9NRE9NV2luZG93KiB3aW5kb3cpCit7CisgICAgZ19y ZXR1cm5fdmFsX2lmX2ZhaWwoV0VCS0lUX0RPTV9JU19ET01fV0lORE9XKHdpbmRvdyksIG51bGxw dHIpOworCisgICAgV2ViQ29yZTo6RE9NV2luZG93KiBkb21XaW5kb3cgPSBjb3JlKHdpbmRvdyk7 CisgICAgaWYgKCFkb21XaW5kb3ctPnNob3VsZEhhdmVXZWJLaXROYW1lc3BhY2VGb3JXb3JsZChX ZWJDb3JlOjptYWluVGhyZWFkTm9ybWFsV29ybGQoKSkpCisgICAgICAgIHJldHVybiBudWxscHRy OworICAgIHJldHVybiBraXQoZG9tV2luZG93LT53ZWJraXROYW1lc3BhY2UoKSk7Cit9CisKK1dl YktpdERPTVVzZXJNZXNzYWdlSGFuZGxlciogd2Via2l0X2RvbV91c2VyX21lc3NhZ2VfaGFuZGxl cnNfbmFtZXNwYWNlX2dldF9oYW5kbGVyKFdlYktpdERPTVVzZXJNZXNzYWdlSGFuZGxlcnNOYW1l c3BhY2UqIGhhbmRsZXJzTmFtZXNwYWNlLCBjb25zdCBnY2hhciogbmFtZSkKK3sKKyAgICBnX3Jl dHVybl92YWxfaWZfZmFpbChXRUJLSVRfRE9NX0lTX1VTRVJfTUVTU0FHRV9IQU5ETEVSU19OQU1F U1BBQ0UoaGFuZGxlcnNOYW1lc3BhY2UpLCBudWxscHRyKTsKKyAgICBnX3JldHVybl92YWxfaWZf ZmFpbChuYW1lLCBudWxscHRyKTsKKworICAgIHJldHVybiBraXQoY29yZShoYW5kbGVyc05hbWVz cGFjZSktPmhhbmRsZXIoU3RyaW5nOjpmcm9tVVRGOChuYW1lKSwgV2ViQ29yZTo6bWFpblRocmVh ZE5vcm1hbFdvcmxkKCkpKTsKK30KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGlu Z3MvZ29iamVjdC9XZWJLaXRET01DdXN0b21VbnN0YWJsZS5oIGIvU291cmNlL1dlYkNvcmUvYmlu ZGluZ3MvZ29iamVjdC9XZWJLaXRET01DdXN0b21VbnN0YWJsZS5oCm5ldyBmaWxlIG1vZGUgMTAw NjQ0CmluZGV4IDAwMDAwMDAuLjc5ZDBmNTYKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy9nb2JqZWN0L1dlYktpdERPTUN1c3RvbVVuc3RhYmxlLmgKQEAgLTAsMCAr MSw1NyBAQAorLyoKKyAqICBDb3B5cmlnaHQgKEMpIDIwMTQgSWdhbGlhIFMuTC4KKyAqCisgKiAg VGhpcyBsaWJyYXJ5IGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFu ZC9vcgorICogIG1vZGlmeSBpdCB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEdOVSBMZXNzZXIgR2Vu ZXJhbCBQdWJsaWMKKyAqICBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBieSB0aGUgRnJlZSBTb2Z0d2Fy ZSBGb3VuZGF0aW9uOyBlaXRoZXIKKyAqICB2ZXJzaW9uIDIgb2YgdGhlIExpY2Vuc2UsIG9yIChh dCB5b3VyIG9wdGlvbikgYW55IGxhdGVyIHZlcnNpb24uCisgKgorICogIFRoaXMgbGlicmFyeSBp cyBkaXN0cmlidXRlZCBpbiB0aGUgaG9wZSB0aGF0IGl0IHdpbGwgYmUgdXNlZnVsLAorICogIGJ1 dCBXSVRIT1VUIEFOWSBXQVJSQU5UWTsgd2l0aG91dCBldmVuIHRoZSBpbXBsaWVkIHdhcnJhbnR5 IG9mCisgKiAgTUVSQ0hBTlRBQklMSVRZIG9yIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQ T1NFLiAgU2VlIHRoZSBHTlUKKyAqICBMZXNzZXIgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBmb3Ig bW9yZSBkZXRhaWxzLgorICoKKyAqICBZb3Ugc2hvdWxkIGhhdmUgcmVjZWl2ZWQgYSBjb3B5IG9m IHRoZSBHTlUgTGVzc2VyIEdlbmVyYWwgUHVibGljCisgKiAgTGljZW5zZSBhbG9uZyB3aXRoIHRo aXMgbGlicmFyeTsgaWYgbm90LCB3cml0ZSB0byB0aGUgRnJlZSBTb2Z0d2FyZQorICogIEZvdW5k YXRpb24sIEluYy4sIDUxIEZyYW5rbGluIFN0cmVldCwgRmlmdGggRmxvb3IsIEJvc3RvbiwgTUEg IDAyMTEwLTEzMDEgIFVTQQorICovCisKKyNpZm5kZWYgV2ViS2l0RE9NQ3VzdG9tVW5zdGFibGVf aAorI2RlZmluZSBXZWJLaXRET01DdXN0b21VbnN0YWJsZV9oCisKKyNpZmRlZiBXRUJLSVRfRE9N X1VTRV9VTlNUQUJMRV9BUEkKKworI2luY2x1ZGUgPHdlYmtpdGRvbS93ZWJraXRkb21kZWZpbmVz LXVuc3RhYmxlLmg+CisKK0dfQkVHSU5fREVDTFMKKworLyoqCisgKiB3ZWJraXRfZG9tX2RvbV93 aW5kb3dfZ2V0X3dlYmtpdF9uYW1lc3BhY2U6CisgKiBAc2VsZjogQSAjV2ViS2l0RE9NRE9NV2lu ZG93CisgKgorICogUmV0dXJuczogKHRyYW5zZmVyIG5vbmUpOiBBICNXZWJLaXRET01XZWJLaXRO YW1lc3BhY2UKKyAqCisgKiBTdGFiaWxpdHk6IFVuc3RhYmxlCisgKiBTaW5jZTogMi44CisgKi8K K1dFQktJVF9BUEkgV2ViS2l0RE9NV2ViS2l0TmFtZXNwYWNlICoKK3dlYmtpdF9kb21fZG9tX3dp bmRvd19nZXRfd2Via2l0X25hbWVzcGFjZShXZWJLaXRET01ET01XaW5kb3cqIHNlbGYpOworCisv KioKKyAqIHdlYmtpdF9kb21fdXNlcl9tZXNzYWdlX2hhbmRsZXJzX25hbWVzcGFjZV9nZXRfaGFu ZGxlcjoKKyAqIEBzZWxmOiBBICNXZWJLaXRET01Vc2VyTWVzc2FnZUhhbmRsZXJzTmFtZXNwYWNl CisgKiBAbmFtZTogYSAjZ2NoYXIKKyAqCisgKiBSZXR1cm5zOiAodHJhbnNmZXIgbm9uZSk6IEEg I1dlYktpdERPTVVzZXJNZXNzYWdlSGFuZGxlcgorICoKKyAqIFN0YWJpbGl0eTogVW5zdGFibGUK KyAqIFNpbmNlOiAyLjgKKyAqLworV0VCS0lUX0FQSSBXZWJLaXRET01Vc2VyTWVzc2FnZUhhbmRs ZXIgKgord2Via2l0X2RvbV91c2VyX21lc3NhZ2VfaGFuZGxlcnNfbmFtZXNwYWNlX2dldF9oYW5k bGVyKFdlYktpdERPTVVzZXJNZXNzYWdlSGFuZGxlcnNOYW1lc3BhY2UqIHNlbGYsIGNvbnN0IGdj aGFyKiBuYW1lKTsKKworR19FTkRfREVDTFMKKworI2VuZGlmIC8qIFdFQktJVF9ET01fVVNFX1VO U1RBQkxFX0FQSSAqLworCisjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckdPYmplY3QucG0gYi9Tb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JHT2JqZWN0LnBtCmluZGV4IDVkZGYxMDIuLmQ1NzBh OTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVy YXRvckdPYmplY3QucG0KKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2Rl R2VuZXJhdG9yR09iamVjdC5wbQpAQCAtMTU4MCw2ICsxNTgwLDEyIEBAIHN1YiBHZW5lcmF0ZSB7 CiAgICAgJG9iamVjdC0+R2VuZXJhdGVFbmRIZWFkZXIoKTsKIH0KIAorc3ViIEhhc1Vuc3RhYmxl Q3VzdG9tQVBJIHsKKyAgICBteSAkZG9tQ2xhc3NOYW1lID0gc2hpZnQ7CisKKyAgICByZXR1cm4g c2NhbGFyKGdyZXAgeyRfIGVxICRkb21DbGFzc05hbWV9IHF3KFdlYktpdERPTURPTVdpbmRvdyBX ZWJLaXRET01Vc2VyTWVzc2FnZUhhbmRsZXJzTmFtZXNwYWNlKSk7Cit9CisKIHN1YiBXcml0ZURh dGEgewogICAgIG15ICRvYmplY3QgPSBzaGlmdDsKICAgICBteSAkaW50ZXJmYWNlID0gc2hpZnQ7 CkBAIC0xNjQ3LDYgKzE2NTMsOSBAQCBFT0YKICAgICBpZiAoJGlzU3RhYmxlQ2xhc3MpIHsKICAg ICAgICAgcHJpbnQgSEVBREVSICIjaW5jbHVkZSA8d2Via2l0ZG9tL3dlYmtpdGRvbWRlZmluZXMu aD5cblxuIjsKICAgICB9IGVsc2UgeworICAgICAgICBpZiAoSGFzVW5zdGFibGVDdXN0b21BUEko JGNsYXNzTmFtZSkpIHsKKyAgICAgICAgICAgIHByaW50IEhFQURFUiAiI2luY2x1ZGUgPHdlYmtp dGRvbS9XZWJLaXRET01DdXN0b21VbnN0YWJsZS5oPlxuIjsKKyAgICAgICAgfQogICAgICAgICBw cmludCBIRUFERVIgIiNpbmNsdWRlIDx3ZWJraXRkb20vd2Via2l0ZG9tZGVmaW5lcy11bnN0YWJs ZS5oPlxuXG4iOwogICAgIH0KICAgICBwcmludCBIRUFERVIgQGhCb2R5UHJlOwpAQCAtMTY3MCwx MSArMTY3OSwxMyBAQCBFT0YKIAogI2lmZGVmIFdFQktJVF9ET01fVVNFX1VOU1RBQkxFX0FQSQog Ci0jaW5jbHVkZSA8d2Via2l0ZG9tL3dlYmtpdGRvbWRlZmluZXMtdW5zdGFibGUuaD4KIEVPRgot CiAgICAgICAgIHByaW50IFVOU1RBQkxFICR0ZXh0OwotICAgICAgICBwcmludCBVTlNUQUJMRSAi XG4iOworICAgICAgICBpZiAoSGFzVW5zdGFibGVDdXN0b21BUEkoJGNsYXNzTmFtZSkpIHsKKyAg ICAgICAgICAgIHByaW50IFVOU1RBQkxFICIjaW5jbHVkZSA8d2Via2l0ZG9tL1dlYktpdERPTUN1 c3RvbVVuc3RhYmxlLmg+XG4iOworICAgICAgICB9CisgICAgICAgIHByaW50IFVOU1RBQkxFICIj aW5jbHVkZSA8d2Via2l0ZG9tL3dlYmtpdGRvbWRlZmluZXMtdW5zdGFibGUuaD5cblxuIjsKKwog ICAgICAgICBwcmludCBVTlNUQUJMRSAiI2lmICR7Y29uZGl0aW9uYWxTdHJpbmd9XG5cbiIgaWYg JGNvbmRpdGlvbmFsU3RyaW5nOwogICAgICAgICBwcmludCBVTlNUQUJMRSAiR19CRUdJTl9ERUNM U1xuIjsKICAgICAgICAgcHJpbnQgVU5TVEFCTEUgIlxuIjsKZGlmZiAtLWdpdCBhL1Rvb2xzL0No YW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA3NmFmMDU4Li4wNjUxZjg3IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTQtMTEtMDUgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIEV4cG9zZSB1c2VyIHNjcmlwdCBtZXNzYWdlcyB0byBHT2JqZWN0 IERPTSBiaW5kaW5ncworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTM4NDExCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgQWRkIGEgdGVzdCBjYXNlIHRvIGNoZWNrIHRoYXQgdXNlciBzY3JpcHQgbWVzc2FnZXMg c2VudCB1c2luZyB0aGUKKyAgICAgICAgRE9NIGJpbmRpbmdzIEFQSSBhcmUgYWxzbyByZWNlaXZl ZCBpbiB0aGUgVUkgcHJvY2Vzcy4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2Vi S2l0Mkd0ay9UZXN0V2ViS2l0VXNlckNvbnRlbnRNYW5hZ2VyLmNwcDoKKyAgICAgICAgKFVzZXJT Y3JpcHRNZXNzYWdlVGVzdDo6d2FpdFVudGlsTWVzc2FnZVJlY2VpdmVkKToKKyAgICAgICAgKFVz ZXJTY3JpcHRNZXNzYWdlVGVzdDo6cG9zdE1lc3NhZ2VBbmRXYWl0VW50aWxSZWNlaXZlZCk6Cisg ICAgICAgICh0ZXN0VXNlckNvbnRlbnRNYW5hZ2VyU2NyaXB0TWVzc2FnZUZyb21ET01CaW5kaW5n cyk6CisgICAgICAgIChiZWZvcmVBbGwpOgorICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMv V2ViS2l0Mkd0ay9XZWJFeHRlbnNpb25UZXN0LmNwcDoKKyAgICAgICAgKGRvY3VtZW50TG9hZGVk Q2FsbGJhY2spOgorCiAyMDE0LTExLTAzICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBw bGUuY29tPgogCiAgICAgICAgIEFkZCBwYWdlIG92ZXJsYXlzIHRoYXQgc2hvdyByZWdpb25zIHdp dGggbW91c2VXaGVlbCBldmVudCBoYW5kbGVycywgYW5kIHRoZSBub24tZmFzdC1zY3JvbGxhYmxl IHJlZ2lvbiwgYW5kIGNvZGUgdG8gdG9nZ2xlIHRoZW0gaW4gTWluaUJyb3dzZXIgV0syCmRpZmYg LS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJHdGsvVGVzdFdlYktpdFVz ZXJDb250ZW50TWFuYWdlci5jcHAgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJH dGsvVGVzdFdlYktpdFVzZXJDb250ZW50TWFuYWdlci5jcHAKaW5kZXggYTMxZjNjYS4uMWNlZTlh ZCAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyR3RrL1Rlc3RX ZWJLaXRVc2VyQ29udGVudE1hbmFnZXIuY3BwCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVz dHMvV2ViS2l0Mkd0ay9UZXN0V2ViS2l0VXNlckNvbnRlbnRNYW5hZ2VyLmNwcApAQCAtMjQ4LDcg KzI0OCw3IEBAIHB1YmxpYzoKICAgICAgICAgdGVzdC0+bV91c2VyU2NyaXB0TWVzc2FnZSA9IHdl YmtpdF9qYXZhc2NyaXB0X3Jlc3VsdF9yZWYoanNSZXN1bHQpOwogICAgIH0KIAotICAgIFdlYktp dEphdmFzY3JpcHRSZXN1bHQqIHBvc3RNZXNzYWdlQW5kV2FpdFVudGlsUmVjZWl2ZWQoY29uc3Qg Y2hhciogaGFuZGxlck5hbWUsIGNvbnN0IGNoYXIqIGphdmFzY3JpcHRWYWx1ZUFzVGV4dCkKKyAg ICBXZWJLaXRKYXZhc2NyaXB0UmVzdWx0KiB3YWl0VW50aWxNZXNzYWdlUmVjZWl2ZWQoY29uc3Qg Y2hhciogaGFuZGxlck5hbWUpCiAgICAgewogICAgICAgICBpZiAobV91c2VyU2NyaXB0TWVzc2Fn ZSkgewogICAgICAgICAgICAgd2Via2l0X2phdmFzY3JpcHRfcmVzdWx0X3VucmVmKG1fdXNlclNj cmlwdE1lc3NhZ2UpOwpAQCAtMjU4LDE0ICsyNTgsMTggQEAgcHVibGljOgogICAgICAgICBHVW5p cXVlUHRyPGNoYXI+IHNpZ25hbE5hbWUoZ19zdHJkdXBfcHJpbnRmKCJzY3JpcHQtbWVzc2FnZS1y ZWNlaXZlZDo6JXMiLCBoYW5kbGVyTmFtZSkpOwogICAgICAgICBnX3NpZ25hbF9jb25uZWN0KG1f dXNlckNvbnRlbnRNYW5hZ2VyLmdldCgpLCBzaWduYWxOYW1lLmdldCgpLCBHX0NBTExCQUNLKHNj cmlwdE1lc3NhZ2VSZWNlaXZlZCksIHRoaXMpOwogCi0gICAgICAgIEdVbmlxdWVQdHI8Y2hhcj4g amF2YXNjcmlwdFNuaXBwZXQoZ19zdHJkdXBfcHJpbnRmKCJ3aW5kb3cud2Via2l0Lm1lc3NhZ2VI YW5kbGVycy4lcy5wb3N0TWVzc2FnZSglcyk7IiwgaGFuZGxlck5hbWUsIGphdmFzY3JpcHRWYWx1 ZUFzVGV4dCkpOwotICAgICAgICB3ZWJraXRfd2ViX3ZpZXdfcnVuX2phdmFzY3JpcHQobV93ZWJW aWV3LCBqYXZhc2NyaXB0U25pcHBldC5nZXQoKSwgbnVsbHB0ciwgbnVsbHB0ciwgbnVsbHB0cik7 CiAgICAgICAgIGdfbWFpbl9sb29wX3J1bihtX21haW5Mb29wKTsKLQogICAgICAgICBnX2Fzc2Vy dChtX3VzZXJTY3JpcHRNZXNzYWdlKTsKICAgICAgICAgcmV0dXJuIG1fdXNlclNjcmlwdE1lc3Nh Z2U7CiAgICAgfQogCisgICAgV2ViS2l0SmF2YXNjcmlwdFJlc3VsdCogcG9zdE1lc3NhZ2VBbmRX YWl0VW50aWxSZWNlaXZlZChjb25zdCBjaGFyKiBoYW5kbGVyTmFtZSwgY29uc3QgY2hhciogamF2 YXNjcmlwdFZhbHVlQXNUZXh0KQorICAgIHsKKyAgICAgICAgR1VuaXF1ZVB0cjxjaGFyPiBqYXZh c2NyaXB0U25pcHBldChnX3N0cmR1cF9wcmludGYoIndpbmRvdy53ZWJraXQubWVzc2FnZUhhbmRs ZXJzLiVzLnBvc3RNZXNzYWdlKCVzKTsiLCBoYW5kbGVyTmFtZSwgamF2YXNjcmlwdFZhbHVlQXNU ZXh0KSk7CisgICAgICAgIHdlYmtpdF93ZWJfdmlld19ydW5famF2YXNjcmlwdChtX3dlYlZpZXcs IGphdmFzY3JpcHRTbmlwcGV0LmdldCgpLCBudWxscHRyLCBudWxscHRyLCBudWxscHRyKTsKKyAg ICAgICAgcmV0dXJuIHdhaXRVbnRpbE1lc3NhZ2VSZWNlaXZlZChoYW5kbGVyTmFtZSk7CisgICAg fQorCiBwcml2YXRlOgogICAgIFdlYktpdEphdmFzY3JpcHRSZXN1bHQqIG1fdXNlclNjcmlwdE1l c3NhZ2U7CiB9OwpAQCAtMzQxLDYgKzM0NSwxOSBAQCBzdGF0aWMgdm9pZCB0ZXN0VXNlckNvbnRl bnRNYW5hZ2VyU2NyaXB0TWVzc2FnZVJlY2VpdmVkKFVzZXJTY3JpcHRNZXNzYWdlVGVzdCogdAog ICAgIHRlc3QtPnVucmVnaXN0ZXJIYW5kbGVyKCJhbm90aGVySGFuZGxlciIpOwogfQogCitzdGF0 aWMgdm9pZCB0ZXN0VXNlckNvbnRlbnRNYW5hZ2VyU2NyaXB0TWVzc2FnZUZyb21ET01CaW5kaW5n cyhVc2VyU2NyaXB0TWVzc2FnZVRlc3QqIHRlc3QsIGdjb25zdHBvaW50ZXIpCit7CisgICAgZ19h c3NlcnQodGVzdC0+cmVnaXN0ZXJIYW5kbGVyKCJkb20iKSk7CisKKyAgICB0ZXN0LT5sb2FkSHRt bCgiPGh0bWw+PC9odG1sPiIsIG51bGxwdHIpOworICAgIFdlYktpdEphdmFzY3JpcHRSZXN1bHQq IGphdmFzY3JpcHRSZXN1bHQgPSB0ZXN0LT53YWl0VW50aWxNZXNzYWdlUmVjZWl2ZWQoImRvbSIp OworICAgIGdfYXNzZXJ0KGphdmFzY3JpcHRSZXN1bHQpOworICAgIEdVbmlxdWVQdHI8Y2hhcj4g dmFsdWVTdHJpbmcoV2ViVmlld1Rlc3Q6OmphdmFzY3JpcHRSZXN1bHRUb0NTdHJpbmcoamF2YXNj cmlwdFJlc3VsdCkpOworICAgIGdfYXNzZXJ0X2NtcHN0cih2YWx1ZVN0cmluZy5nZXQoKSwgPT0s ICJEb2N1bWVudExvYWRlZCIpOworCisgICAgdGVzdC0+dW5yZWdpc3RlckhhbmRsZXIoImRvbSIp OworfQorCiBzdGF0aWMgdm9pZCBzZXJ2ZXJDYWxsYmFjayhTb3VwU2VydmVyKiBzZXJ2ZXIsIFNv dXBNZXNzYWdlKiBtZXNzYWdlLCBjb25zdCBjaGFyKiBwYXRoLCBHSGFzaFRhYmxlKiwgU291cENs aWVudENvbnRleHQqLCBncG9pbnRlcikKIHsKICAgICBzb3VwX21lc3NhZ2Vfc2V0X3N0YXR1cyht ZXNzYWdlLCBTT1VQX1NUQVRVU19PSyk7CkBAIC0zNTAsNiArMzY3LDcgQEAgc3RhdGljIHZvaWQg c2VydmVyQ2FsbGJhY2soU291cFNlcnZlciogc2VydmVyLCBTb3VwTWVzc2FnZSogbWVzc2FnZSwg Y29uc3QgY2hhcioKIAogdm9pZCBiZWZvcmVBbGwoKQogeworICAgIHdlYmtpdF93ZWJfY29udGV4 dF9zZXRfd2ViX2V4dGVuc2lvbnNfZGlyZWN0b3J5KHdlYmtpdF93ZWJfY29udGV4dF9nZXRfZGVm YXVsdCgpLCBXRUJLSVRfVEVTVF9XRUJfRVhURU5TSU9OU19ESVIpOwogICAgIGtTZXJ2ZXIgPSBu ZXcgV2ViS2l0VGVzdFNlcnZlcigpOwogICAgIGtTZXJ2ZXItPnJ1bihzZXJ2ZXJDYWxsYmFjayk7 CiAKQEAgLTM1Nyw2ICszNzUsNyBAQCB2b2lkIGJlZm9yZUFsbCgpCiAgICAgVXNlckNvbnRlbnRN YW5hZ2VyVGVzdDo6YWRkKCJXZWJLaXRVc2VyQ29udGVudE1hbmFnZXIiLCAiaW5qZWN0ZWQtc3R5 bGUtc2hlZXQiLCB0ZXN0VXNlckNvbnRlbnRNYW5hZ2VySW5qZWN0ZWRTdHlsZVNoZWV0KTsKICAg ICBVc2VyQ29udGVudE1hbmFnZXJUZXN0OjphZGQoIldlYktpdFVzZXJDb250ZW50TWFuYWdlciIs ICJpbmplY3RlZC1zY3JpcHQiLCB0ZXN0VXNlckNvbnRlbnRNYW5hZ2VySW5qZWN0ZWRTY3JpcHQp OwogICAgIFVzZXJTY3JpcHRNZXNzYWdlVGVzdDo6YWRkKCJXZWJLaXRVc2VyQ29udGVudE1hbmFn ZXIiLCAic2NyaXB0LW1lc3NhZ2UtcmVjZWl2ZWQiLCB0ZXN0VXNlckNvbnRlbnRNYW5hZ2VyU2Ny aXB0TWVzc2FnZVJlY2VpdmVkKTsKKyAgICBVc2VyU2NyaXB0TWVzc2FnZVRlc3Q6OmFkZCgiV2Vi S2l0VXNlckNvbnRlbnRNYW5hZ2VyIiwgInNjcmlwdC1tZXNzYWdlLWZyb20tZG9tLWJpbmRpbmdz IiwgdGVzdFVzZXJDb250ZW50TWFuYWdlclNjcmlwdE1lc3NhZ2VGcm9tRE9NQmluZGluZ3MpOwog fQogCiB2b2lkIGFmdGVyQWxsKCkKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVz dHMvV2ViS2l0Mkd0ay9XZWJFeHRlbnNpb25UZXN0LmNwcCBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkv VGVzdHMvV2ViS2l0Mkd0ay9XZWJFeHRlbnNpb25UZXN0LmNwcAppbmRleCA3NTc1MzJmLi45N2U5 MjllIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJHdGsvV2Vi RXh0ZW5zaW9uVGVzdC5jcHAKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQy R3RrL1dlYkV4dGVuc2lvblRlc3QuY3BwCkBAIC0zMyw2ICszMywxMSBAQAogI2luY2x1ZGUgPHd0 Zi9nb2JqZWN0L0dVbmlxdWVQdHIuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9DU3RyaW5nLmg+CiAK KyNkZWZpbmUgV0VCS0lUX0RPTV9VU0VfVU5TVEFCTEVfQVBJCisjaW5jbHVkZSA8d2Via2l0ZG9t L1dlYktpdERPTVdlYktpdE5hbWVzcGFjZS5oPgorI2luY2x1ZGUgPHdlYmtpdGRvbS9XZWJLaXRE T01Vc2VyTWVzc2FnZUhhbmRsZXJzTmFtZXNwYWNlLmg+CisjaW5jbHVkZSA8d2Via2l0ZG9tL1dl YktpdERPTVVzZXJNZXNzYWdlSGFuZGxlci5oPgorCiBzdGF0aWMgY29uc3QgY2hhciBpbnRyb3Nw ZWN0aW9uWE1MW10gPQogICAgICI8bm9kZT4iCiAgICAgIiA8aW50ZXJmYWNlIG5hbWU9J29yZy53 ZWJraXQuZ3RrLldlYkV4dGVuc2lvblRlc3QnPiIKQEAgLTk4LDggKzEwMywxOCBAQCBzdGF0aWMg dm9pZCBlbWl0RG9jdW1lbnRMb2FkZWQoR0RCdXNDb25uZWN0aW9uKiBjb25uZWN0aW9uKQogICAg IGdfYXNzZXJ0KG9rKTsKIH0KIAotc3RhdGljIHZvaWQgZG9jdW1lbnRMb2FkZWRDYWxsYmFjayhX ZWJLaXRXZWJQYWdlKiwgV2ViS2l0V2ViRXh0ZW5zaW9uKiBleHRlbnNpb24pCitzdGF0aWMgdm9p ZCBkb2N1bWVudExvYWRlZENhbGxiYWNrKFdlYktpdFdlYlBhZ2UqIHdlYlBhZ2UsIFdlYktpdFdl YkV4dGVuc2lvbiogZXh0ZW5zaW9uKQogeworICAgIC8vIEZJWE1FOiBUb28gbXVjaCBjb2RlIGp1 c3QgdG8gc2VuZCBhIG1lc3NhZ2UsIHdlIG5lZWQgY29udmVuaWVudCBjdXN0b20gQVBJIGZvciB0 aGlzLgorICAgIFdlYktpdERPTURvY3VtZW50KiBkb2N1bWVudCA9IHdlYmtpdF93ZWJfcGFnZV9n ZXRfZG9tX2RvY3VtZW50KHdlYlBhZ2UpOworICAgIFdlYktpdERPTURPTVdpbmRvdyogd2luZG93 ID0gd2Via2l0X2RvbV9kb2N1bWVudF9nZXRfZGVmYXVsdF92aWV3KGRvY3VtZW50KTsKKyAgICBp ZiAoV2ViS2l0RE9NV2ViS2l0TmFtZXNwYWNlKiB3ZWJraXQgPSB3ZWJraXRfZG9tX2RvbV93aW5k b3dfZ2V0X3dlYmtpdF9uYW1lc3BhY2Uod2luZG93KSkgeworICAgICAgICBXZWJLaXRET01Vc2Vy TWVzc2FnZUhhbmRsZXJzTmFtZXNwYWNlKiBtZXNzYWdlSGFuZGxlcnMgPSB3ZWJraXRfZG9tX3dl YmtpdF9uYW1lc3BhY2VfZ2V0X21lc3NhZ2VfaGFuZGxlcnMod2Via2l0KTsKKyAgICAgICAgaWYg KFdlYktpdERPTVVzZXJNZXNzYWdlSGFuZGxlciogaGFuZGxlciA9IHdlYmtpdF9kb21fdXNlcl9t ZXNzYWdlX2hhbmRsZXJzX25hbWVzcGFjZV9nZXRfaGFuZGxlcihtZXNzYWdlSGFuZGxlcnMsICJk b20iKSkKKyAgICAgICAgICAgIHdlYmtpdF9kb21fdXNlcl9tZXNzYWdlX2hhbmRsZXJfcG9zdF9t ZXNzYWdlKGhhbmRsZXIsICJEb2N1bWVudExvYWRlZCIpOworICAgIH0KKworCiAgICAgZ3BvaW50 ZXIgZGF0YSA9IGdfb2JqZWN0X2dldF9kYXRhKEdfT0JKRUNUKGV4dGVuc2lvbiksICJkYnVzLWNv bm5lY3Rpb24iKTsKICAgICBpZiAoZGF0YSkKICAgICAgICAgZW1pdERvY3VtZW50TG9hZGVkKEdf REJVU19DT05ORUNUSU9OKGRhdGEpKTsK