173351 2017-06-14 00:39:01 -0700 [GTK] Use API::InjectedBundleClient in WebKitInjectedBundleClient 2017-06-14 09:24:42 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 173350 1 cgarcia webkit-unassigned aperez berto bugs-noreply buildbot gustavo mcatanzaro zan oldest_to_newest 1319033 0 cgarcia 2017-06-14 00:39:01 -0700 Instead of the C API. 1319035 1 312867 cgarcia 2017-06-14 00:42:31 -0700 Created attachment 312867 Patch 1319039 2 buildbot 2017-06-14 00:45:19 -0700 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1319046 3 312867 aperez 2017-06-14 01:16:23 -0700 Comment on attachment 312867 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=312867&action=review Informally reviewing... r+, but let's make sure the EWS is happy and can find the header before landing :-) > Source/WebKit2/UIProcess/API/gtk/WebKitInjectedBundleClient.cpp:23 > +#include "APIInjectedBundleClient.h" According to the EWS this header cannot be found. Please double-check that. 1319047 4 cgarcia 2017-06-14 01:18:47 -0700 Because it depends on #173350 1319154 5 cgarcia 2017-06-14 09:24:42 -0700 Committed r218262: <http://trac.webkit.org/changeset/218262> 312867 2017-06-14 00:42:31 -0700 2017-06-14 08:32:38 -0700 Patch wk2-gtk-injected-bundle.diff text/plain 15045 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBmMGZjYmM2Zjg0OC4uZmQwMzQ4ODZkNGEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEs NSArMSwyMCBAQAogMjAxNy0wNi0xNCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGln YWxpYS5jb20+CiAKKyAgICAgICAgW0dUS10gVXNlIEFQSTo6SW5qZWN0ZWRCdW5kbGVDbGllbnQg aW4gV2ViS2l0SW5qZWN0ZWRCdW5kbGVDbGllbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MzM1MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEluc3RlYWQgb2YgdGhlIEMgQVBJLgorCisgICAgICAgICog VUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0SW5qZWN0ZWRCdW5kbGVDbGllbnQuY3BwOgorICAgICAg ICAoYXR0YWNoSW5qZWN0ZWRCdW5kbGVDbGllbnRUb0NvbnRleHQpOgorICAgICAgICAoZGlkUmVj ZWl2ZVdlYlZpZXdNZXNzYWdlRnJvbUluamVjdGVkQnVuZGxlKTogRGVsZXRlZC4KKyAgICAgICAg KGRpZFJlY2VpdmVNZXNzYWdlRnJvbUluamVjdGVkQnVuZGxlKTogRGVsZXRlZC4KKyAgICAgICAg KGdldEluamVjdGVkQnVuZGxlSW5pdGlhbGl6YXRpb25Vc2VyRGF0YSk6IERlbGV0ZWQuCisKKzIw MTctMDYtMTQgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCiAg ICAgICAgIEFkZCBBUEk6OkluamVjdGVkQnVuZGxlQ2xpZW50CiAgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzMzNTAKIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0SW5qZWN0ZWRCdW5kbGVDbGllbnQuY3Bw IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0SW5qZWN0ZWRCdW5kbGVD bGllbnQuY3BwCmluZGV4IDBlYzQ0ZDQ2M2ZlLi4yNDA2NTIwYTRjMSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0SW5qZWN0ZWRCdW5kbGVDbGllbnQu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEluamVjdGVk QnVuZGxlQ2xpZW50LmNwcApAQCAtMjAsNiArMjAsNyBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgog I2luY2x1ZGUgIldlYktpdEluamVjdGVkQnVuZGxlQ2xpZW50LmgiCiAKKyNpbmNsdWRlICJBUElJ bmplY3RlZEJ1bmRsZUNsaWVudC5oIgogI2luY2x1ZGUgIldlYkltYWdlLmgiCiAjaW5jbHVkZSAi V2ViS2l0UHJpdmF0ZS5oIgogI2luY2x1ZGUgIldlYktpdFVSSVJlcXVlc3RQcml2YXRlLmgiCkBA IC0zMiwxMTMgKzMzLDExMyBAQAogdXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKIHVzaW5nIG5hbWVz cGFjZSBXZWJDb3JlOwogCi1zdGF0aWMgdm9pZCBkaWRSZWNlaXZlV2ViVmlld01lc3NhZ2VGcm9t SW5qZWN0ZWRCdW5kbGUoV2ViS2l0V2ViVmlldyogd2ViVmlldywgY29uc3QgY2hhciogbWVzc2Fn ZU5hbWUsIEFQSTo6RGljdGlvbmFyeSYgbWVzc2FnZSkKLXsKLSAgICBpZiAoZ19zdHJfZXF1YWwo bWVzc2FnZU5hbWUsICJEaWRJbml0aWF0ZUxvYWRGb3JSZXNvdXJjZSIpKSB7Ci0gICAgICAgIFdl YkZyYW1lUHJveHkqIGZyYW1lID0gc3RhdGljX2Nhc3Q8V2ViRnJhbWVQcm94eSo+KG1lc3NhZ2Uu Z2V0KFN0cmluZzo6ZnJvbVVURjgoIkZyYW1lIikpKTsKLSAgICAgICAgQVBJOjpVSW50NjQqIHJl c291cmNlSWRlbnRpZmllciA9IHN0YXRpY19jYXN0PEFQSTo6VUludDY0Kj4obWVzc2FnZS5nZXQo U3RyaW5nOjpmcm9tVVRGOCgiSWRlbnRpZmllciIpKSk7Ci0gICAgICAgIEFQSTo6VVJMUmVxdWVz dCogd2ViUmVxdWVzdCA9IHN0YXRpY19jYXN0PEFQSTo6VVJMUmVxdWVzdCo+KG1lc3NhZ2UuZ2V0 KFN0cmluZzo6ZnJvbVVURjgoIlJlcXVlc3QiKSkpOwotICAgICAgICBHUmVmUHRyPFdlYktpdFVS SVJlcXVlc3Q+IHJlcXVlc3QgPSBhZG9wdEdSZWYod2Via2l0VVJJUmVxdWVzdENyZWF0ZUZvclJl c291cmNlUmVxdWVzdCh3ZWJSZXF1ZXN0LT5yZXNvdXJjZVJlcXVlc3QoKSkpOwotCi0gICAgICAg IHdlYmtpdFdlYlZpZXdSZXNvdXJjZUxvYWRTdGFydGVkKHdlYlZpZXcsIGZyYW1lLCByZXNvdXJj ZUlkZW50aWZpZXItPnZhbHVlKCksIHJlcXVlc3QuZ2V0KCkpOwotICAgIH0gZWxzZSBpZiAoZ19z dHJfZXF1YWwobWVzc2FnZU5hbWUsICJEaWRTZW5kUmVxdWVzdEZvclJlc291cmNlIikpIHsKLSAg ICAgICAgQVBJOjpVSW50NjQqIHJlc291cmNlSWRlbnRpZmllciA9IHN0YXRpY19jYXN0PEFQSTo6 VUludDY0Kj4obWVzc2FnZS5nZXQoU3RyaW5nOjpmcm9tVVRGOCgiSWRlbnRpZmllciIpKSk7Ci0g ICAgICAgIEdSZWZQdHI8V2ViS2l0V2ViUmVzb3VyY2U+IHJlc291cmNlID0gd2Via2l0V2ViVmll d0dldExvYWRpbmdXZWJSZXNvdXJjZSh3ZWJWaWV3LCByZXNvdXJjZUlkZW50aWZpZXItPnZhbHVl KCkpOwotICAgICAgICBpZiAoIXJlc291cmNlKQotICAgICAgICAgICAgcmV0dXJuOwotCi0gICAg ICAgIEFQSTo6VVJMUmVxdWVzdCogd2ViUmVxdWVzdCA9IHN0YXRpY19jYXN0PEFQSTo6VVJMUmVx dWVzdCo+KG1lc3NhZ2UuZ2V0KFN0cmluZzo6ZnJvbVVURjgoIlJlcXVlc3QiKSkpOwotICAgICAg ICBHUmVmUHRyPFdlYktpdFVSSVJlcXVlc3Q+IHJlcXVlc3QgPSBhZG9wdEdSZWYod2Via2l0VVJJ UmVxdWVzdENyZWF0ZUZvclJlc291cmNlUmVxdWVzdCh3ZWJSZXF1ZXN0LT5yZXNvdXJjZVJlcXVl c3QoKSkpOwotICAgICAgICBBUEk6OlVSTFJlc3BvbnNlKiB3ZWJSZWRpcmVjdFJlc3BvbnNlID0g c3RhdGljX2Nhc3Q8QVBJOjpVUkxSZXNwb25zZSo+KG1lc3NhZ2UuZ2V0KFN0cmluZzo6ZnJvbVVU RjgoIlJlZGlyZWN0UmVzcG9uc2UiKSkpOwotICAgICAgICBHUmVmUHRyPFdlYktpdFVSSVJlc3Bv bnNlPiByZWRpcmVjdFJlc3BvbnNlID0gd2ViUmVkaXJlY3RSZXNwb25zZSA/IGFkb3B0R1JlZih3 ZWJraXRVUklSZXNwb25zZUNyZWF0ZUZvclJlc291cmNlUmVzcG9uc2Uod2ViUmVkaXJlY3RSZXNw b25zZS0+cmVzb3VyY2VSZXNwb25zZSgpKSkgOiAwOwotCi0gICAgICAgIHdlYmtpdFdlYlJlc291 cmNlU2VudFJlcXVlc3QocmVzb3VyY2UuZ2V0KCksIHJlcXVlc3QuZ2V0KCksIHJlZGlyZWN0UmVz cG9uc2UuZ2V0KCkpOwotICAgIH0gZWxzZSBpZiAoZ19zdHJfZXF1YWwobWVzc2FnZU5hbWUsICJE aWRSZWNlaXZlUmVzcG9uc2VGb3JSZXNvdXJjZSIpKSB7Ci0gICAgICAgIEFQSTo6VUludDY0KiBy ZXNvdXJjZUlkZW50aWZpZXIgPSBzdGF0aWNfY2FzdDxBUEk6OlVJbnQ2NCo+KG1lc3NhZ2UuZ2V0 KFN0cmluZzo6ZnJvbVVURjgoIklkZW50aWZpZXIiKSkpOwotICAgICAgICBHUmVmUHRyPFdlYktp dFdlYlJlc291cmNlPiByZXNvdXJjZSA9IHdlYmtpdFdlYlZpZXdHZXRMb2FkaW5nV2ViUmVzb3Vy Y2Uod2ViVmlldywgcmVzb3VyY2VJZGVudGlmaWVyLT52YWx1ZSgpKTsKLSAgICAgICAgaWYgKCFy ZXNvdXJjZSkKLSAgICAgICAgICAgIHJldHVybjsKLQotICAgICAgICBBUEk6OlVSTFJlc3BvbnNl KiB3ZWJSZXNwb25zZSA9IHN0YXRpY19jYXN0PEFQSTo6VVJMUmVzcG9uc2UqPihtZXNzYWdlLmdl dChTdHJpbmc6OmZyb21VVEY4KCJSZXNwb25zZSIpKSk7Ci0gICAgICAgIEdSZWZQdHI8V2ViS2l0 VVJJUmVzcG9uc2U+IHJlc3BvbnNlID0gYWRvcHRHUmVmKHdlYmtpdFVSSVJlc3BvbnNlQ3JlYXRl Rm9yUmVzb3VyY2VSZXNwb25zZSh3ZWJSZXNwb25zZS0+cmVzb3VyY2VSZXNwb25zZSgpKSk7Ci0K LSAgICAgICAgd2Via2l0V2ViUmVzb3VyY2VTZXRSZXNwb25zZShyZXNvdXJjZS5nZXQoKSwgcmVz cG9uc2UuZ2V0KCkpOwotICAgIH0gZWxzZSBpZiAoZ19zdHJfZXF1YWwobWVzc2FnZU5hbWUsICJE aWRSZWNlaXZlQ29udGVudExlbmd0aEZvclJlc291cmNlIikpIHsKLSAgICAgICAgQVBJOjpVSW50 NjQqIHJlc291cmNlSWRlbnRpZmllciA9IHN0YXRpY19jYXN0PEFQSTo6VUludDY0Kj4obWVzc2Fn ZS5nZXQoU3RyaW5nOjpmcm9tVVRGOCgiSWRlbnRpZmllciIpKSk7Ci0gICAgICAgIEdSZWZQdHI8 V2ViS2l0V2ViUmVzb3VyY2U+IHJlc291cmNlID0gd2Via2l0V2ViVmlld0dldExvYWRpbmdXZWJS ZXNvdXJjZSh3ZWJWaWV3LCByZXNvdXJjZUlkZW50aWZpZXItPnZhbHVlKCkpOwotICAgICAgICBp ZiAoIXJlc291cmNlKQotICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAgIEFQSTo6VUludDY0 KiBjb250ZW50TGVuZ3RoID0gc3RhdGljX2Nhc3Q8QVBJOjpVSW50NjQqPihtZXNzYWdlLmdldChT dHJpbmc6OmZyb21VVEY4KCJDb250ZW50TGVuZ3RoIikpKTsKLSAgICAgICAgd2Via2l0V2ViUmVz b3VyY2VOb3RpZnlQcm9ncmVzcyhyZXNvdXJjZS5nZXQoKSwgY29udGVudExlbmd0aC0+dmFsdWUo KSk7Ci0gICAgfSBlbHNlIGlmIChnX3N0cl9lcXVhbChtZXNzYWdlTmFtZSwgIkRpZEZpbmlzaExv YWRGb3JSZXNvdXJjZSIpKSB7Ci0gICAgICAgIEFQSTo6VUludDY0KiByZXNvdXJjZUlkZW50aWZp ZXIgPSBzdGF0aWNfY2FzdDxBUEk6OlVJbnQ2NCo+KG1lc3NhZ2UuZ2V0KFN0cmluZzo6ZnJvbVVU RjgoIklkZW50aWZpZXIiKSkpOwotICAgICAgICBHUmVmUHRyPFdlYktpdFdlYlJlc291cmNlPiBy ZXNvdXJjZSA9IHdlYmtpdFdlYlZpZXdHZXRMb2FkaW5nV2ViUmVzb3VyY2Uod2ViVmlldywgcmVz b3VyY2VJZGVudGlmaWVyLT52YWx1ZSgpKTsKLSAgICAgICAgaWYgKCFyZXNvdXJjZSkKLSAgICAg ICAgICAgIHJldHVybjsKLQotICAgICAgICB3ZWJraXRXZWJSZXNvdXJjZUZpbmlzaGVkKHJlc291 cmNlLmdldCgpKTsKLSAgICAgICAgd2Via2l0V2ViVmlld1JlbW92ZUxvYWRpbmdXZWJSZXNvdXJj ZSh3ZWJWaWV3LCByZXNvdXJjZUlkZW50aWZpZXItPnZhbHVlKCkpOwotICAgIH0gZWxzZSBpZiAo Z19zdHJfZXF1YWwobWVzc2FnZU5hbWUsICJEaWRGYWlsTG9hZEZvclJlc291cmNlIikpIHsKLSAg ICAgICAgQVBJOjpVSW50NjQqIHJlc291cmNlSWRlbnRpZmllciA9IHN0YXRpY19jYXN0PEFQSTo6 VUludDY0Kj4obWVzc2FnZS5nZXQoU3RyaW5nOjpmcm9tVVRGOCgiSWRlbnRpZmllciIpKSk7Ci0g ICAgICAgIEdSZWZQdHI8V2ViS2l0V2ViUmVzb3VyY2U+IHJlc291cmNlID0gd2Via2l0V2ViVmll d0dldExvYWRpbmdXZWJSZXNvdXJjZSh3ZWJWaWV3LCByZXNvdXJjZUlkZW50aWZpZXItPnZhbHVl KCkpOwotICAgICAgICBpZiAoIXJlc291cmNlKQotICAgICAgICAgICAgcmV0dXJuOwotCi0gICAg ICAgIEFQSTo6RXJyb3IqIHdlYkVycm9yID0gc3RhdGljX2Nhc3Q8QVBJOjpFcnJvcio+KG1lc3Nh Z2UuZ2V0KFN0cmluZzo6ZnJvbVVURjgoIkVycm9yIikpKTsKLSAgICAgICAgY29uc3QgUmVzb3Vy Y2VFcnJvciYgcGxhdGZvcm1FcnJvciA9IHdlYkVycm9yLT5wbGF0Zm9ybUVycm9yKCk7Ci0gICAg ICAgIEdVbmlxdWVQdHI8R0Vycm9yPiByZXNvdXJjZUVycm9yKGdfZXJyb3JfbmV3X2xpdGVyYWwo Z19xdWFya19mcm9tX3N0cmluZyhwbGF0Zm9ybUVycm9yLmRvbWFpbigpLnV0ZjgoKS5kYXRhKCkp LAotICAgICAgICAgICAgdG9XZWJLaXRFcnJvcihwbGF0Zm9ybUVycm9yLmVycm9yQ29kZSgpKSwg cGxhdGZvcm1FcnJvci5sb2NhbGl6ZWREZXNjcmlwdGlvbigpLnV0ZjgoKS5kYXRhKCkpKTsKLSAg ICAgICAgaWYgKHBsYXRmb3JtRXJyb3IudGxzRXJyb3JzKCkpCi0gICAgICAgICAgICB3ZWJraXRX ZWJSZXNvdXJjZUZhaWxlZFdpdGhUTFNFcnJvcnMocmVzb3VyY2UuZ2V0KCksIHN0YXRpY19jYXN0 PEdUbHNDZXJ0aWZpY2F0ZUZsYWdzPihwbGF0Zm9ybUVycm9yLnRsc0Vycm9ycygpKSwgcGxhdGZv cm1FcnJvci5jZXJ0aWZpY2F0ZSgpKTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgd2Via2l0 V2ViUmVzb3VyY2VGYWlsZWQocmVzb3VyY2UuZ2V0KCksIHJlc291cmNlRXJyb3IuZ2V0KCkpOwot Ci0gICAgICAgIHdlYmtpdFdlYlZpZXdSZW1vdmVMb2FkaW5nV2ViUmVzb3VyY2Uod2ViVmlldywg cmVzb3VyY2VJZGVudGlmaWVyLT52YWx1ZSgpKTsKLSAgICB9IGVsc2UgaWYgKGdfc3RyX2VxdWFs KG1lc3NhZ2VOYW1lLCAiRGlkR2V0U25hcHNob3QiKSkgewotICAgICAgICBBUEk6OlVJbnQ2NCog Y2FsbGJhY2tJRCA9IHN0YXRpY19jYXN0PEFQSTo6VUludDY0Kj4obWVzc2FnZS5nZXQoIkNhbGxi YWNrSUQiKSk7Ci0gICAgICAgIFdlYkltYWdlKiBpbWFnZSA9IHN0YXRpY19jYXN0PFdlYkltYWdl Kj4obWVzc2FnZS5nZXQoIlNuYXBzaG90IikpOwotICAgICAgICB3ZWJLaXRXZWJWaWV3RGlkUmVj ZWl2ZVNuYXBzaG90KHdlYlZpZXcsIGNhbGxiYWNrSUQtPnZhbHVlKCksIGltYWdlKTsKLSAgICB9 IGVsc2UKLSAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Ci19Ci0KLXN0YXRpYyB2b2lkIGRp ZFJlY2VpdmVNZXNzYWdlRnJvbUluamVjdGVkQnVuZGxlKFdLQ29udGV4dFJlZiwgV0tTdHJpbmdS ZWYgbWVzc2FnZU5hbWUsIFdLVHlwZVJlZiBtZXNzYWdlQm9keSwgY29uc3Qgdm9pZCogY2xpZW50 SW5mbykKLXsKLSAgICBBU1NFUlQoV0tHZXRUeXBlSUQobWVzc2FnZUJvZHkpID09IFdLRGljdGlv bmFyeUdldFR5cGVJRCgpKTsKLSAgICBBUEk6OkRpY3Rpb25hcnkmIG1lc3NhZ2UgPSAqdG9JbXBs KHN0YXRpY19jYXN0PFdLRGljdGlvbmFyeVJlZj4obWVzc2FnZUJvZHkpKTsKLQotICAgIENTdHJp bmcgbWVzc2FnZU5hbWVDU3RyaW5nID0gdG9JbXBsKG1lc3NhZ2VOYW1lKS0+c3RyaW5nKCkudXRm OCgpOwotICAgIGNvbnN0IGNoYXIqIG1lc3NhZ2VOYW1lVVRGOCA9IG1lc3NhZ2VOYW1lQ1N0cmlu Zy5kYXRhKCk7Ci0KLSAgICBpZiAoZ19zdHJfaGFzX3ByZWZpeChtZXNzYWdlTmFtZVVURjgsICJX ZWJQYWdlLiIpKSB7Ci0gICAgICAgIFdlYlBhZ2VQcm94eSogcGFnZSA9IHN0YXRpY19jYXN0PFdl YlBhZ2VQcm94eSo+KG1lc3NhZ2UuZ2V0KFN0cmluZzo6ZnJvbVVURjgoIlBhZ2UiKSkpOwotICAg ICAgICBXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3ID0gd2Via2l0V2ViQ29udGV4dEdldFdlYlZpZXdG b3JQYWdlKFdFQktJVF9XRUJfQ09OVEVYVChjbGllbnRJbmZvKSwgcGFnZSk7Ci0gICAgICAgIGlm ICghd2ViVmlldykKLSAgICAgICAgICAgIHJldHVybjsKLQotICAgICAgICBkaWRSZWNlaXZlV2Vi Vmlld01lc3NhZ2VGcm9tSW5qZWN0ZWRCdW5kbGUod2ViVmlldywgbWVzc2FnZU5hbWVVVEY4ICsg c3RybGVuKCJXZWJQYWdlLiIpLCBtZXNzYWdlKTsKLSAgICB9IGVsc2UKLSAgICAgICAgQVNTRVJU X05PVF9SRUFDSEVEKCk7Ci19Ci0KLXN0YXRpYyBXS1R5cGVSZWYgZ2V0SW5qZWN0ZWRCdW5kbGVJ bml0aWFsaXphdGlvblVzZXJEYXRhKFdLQ29udGV4dFJlZiwgY29uc3Qgdm9pZCogY2xpZW50SW5m bykKLXsKLSAgICBHUmVmUHRyPEdWYXJpYW50PiBkYXRhID0gd2Via2l0V2ViQ29udGV4dEluaXRp YWxpemVXZWJFeHRlbnNpb25zKFdFQktJVF9XRUJfQ09OVEVYVChjbGllbnRJbmZvKSk7Ci0gICAg R1VuaXF1ZVB0cjxnY2hhcj4gZGF0YVN0cmluZyhnX3ZhcmlhbnRfcHJpbnQoZGF0YS5nZXQoKSwg VFJVRSkpOwotICAgIHJldHVybiBzdGF0aWNfY2FzdDxXS1R5cGVSZWY+KFdLU3RyaW5nQ3JlYXRl V2l0aFVURjhDU3RyaW5nKGRhdGFTdHJpbmcuZ2V0KCkpKTsKLX0KK2NsYXNzIFdlYktpdEluamVj dGVkQnVuZGxlQ2xpZW50IGZpbmFsIDogcHVibGljIEFQSTo6SW5qZWN0ZWRCdW5kbGVDbGllbnQg eworcHVibGljOgorICAgIGV4cGxpY2l0IFdlYktpdEluamVjdGVkQnVuZGxlQ2xpZW50KFdlYktp dFdlYkNvbnRleHQqIHdlYkNvbnRleHQpCisgICAgICAgIDogbV93ZWJDb250ZXh0KHdlYkNvbnRl eHQpCisgICAgeworICAgIH0KKworcHJpdmF0ZToKKyAgICBzdGF0aWMgdm9pZCBkaWRSZWNlaXZl V2ViVmlld01lc3NhZ2VGcm9tSW5qZWN0ZWRCdW5kbGUoV2ViS2l0V2ViVmlldyogd2ViVmlldywg Y29uc3QgY2hhciogbWVzc2FnZU5hbWUsIEFQSTo6RGljdGlvbmFyeSYgbWVzc2FnZSkKKyAgICB7 CisgICAgICAgIGlmIChnX3N0cl9lcXVhbChtZXNzYWdlTmFtZSwgIkRpZEluaXRpYXRlTG9hZEZv clJlc291cmNlIikpIHsKKyAgICAgICAgICAgIFdlYkZyYW1lUHJveHkqIGZyYW1lID0gc3RhdGlj X2Nhc3Q8V2ViRnJhbWVQcm94eSo+KG1lc3NhZ2UuZ2V0KFN0cmluZzo6ZnJvbVVURjgoIkZyYW1l IikpKTsKKyAgICAgICAgICAgIEFQSTo6VUludDY0KiByZXNvdXJjZUlkZW50aWZpZXIgPSBzdGF0 aWNfY2FzdDxBUEk6OlVJbnQ2NCo+KG1lc3NhZ2UuZ2V0KFN0cmluZzo6ZnJvbVVURjgoIklkZW50 aWZpZXIiKSkpOworICAgICAgICAgICAgQVBJOjpVUkxSZXF1ZXN0KiB3ZWJSZXF1ZXN0ID0gc3Rh dGljX2Nhc3Q8QVBJOjpVUkxSZXF1ZXN0Kj4obWVzc2FnZS5nZXQoU3RyaW5nOjpmcm9tVVRGOCgi UmVxdWVzdCIpKSk7CisgICAgICAgICAgICBHUmVmUHRyPFdlYktpdFVSSVJlcXVlc3Q+IHJlcXVl c3QgPSBhZG9wdEdSZWYod2Via2l0VVJJUmVxdWVzdENyZWF0ZUZvclJlc291cmNlUmVxdWVzdCh3 ZWJSZXF1ZXN0LT5yZXNvdXJjZVJlcXVlc3QoKSkpOworCisgICAgICAgICAgICB3ZWJraXRXZWJW aWV3UmVzb3VyY2VMb2FkU3RhcnRlZCh3ZWJWaWV3LCBmcmFtZSwgcmVzb3VyY2VJZGVudGlmaWVy LT52YWx1ZSgpLCByZXF1ZXN0LmdldCgpKTsKKyAgICAgICAgfSBlbHNlIGlmIChnX3N0cl9lcXVh bChtZXNzYWdlTmFtZSwgIkRpZFNlbmRSZXF1ZXN0Rm9yUmVzb3VyY2UiKSkgeworICAgICAgICAg ICAgQVBJOjpVSW50NjQqIHJlc291cmNlSWRlbnRpZmllciA9IHN0YXRpY19jYXN0PEFQSTo6VUlu dDY0Kj4obWVzc2FnZS5nZXQoU3RyaW5nOjpmcm9tVVRGOCgiSWRlbnRpZmllciIpKSk7CisgICAg ICAgICAgICBHUmVmUHRyPFdlYktpdFdlYlJlc291cmNlPiByZXNvdXJjZSA9IHdlYmtpdFdlYlZp ZXdHZXRMb2FkaW5nV2ViUmVzb3VyY2Uod2ViVmlldywgcmVzb3VyY2VJZGVudGlmaWVyLT52YWx1 ZSgpKTsKKyAgICAgICAgICAgIGlmICghcmVzb3VyY2UpCisgICAgICAgICAgICAgICAgcmV0dXJu OworCisgICAgICAgICAgICBBUEk6OlVSTFJlcXVlc3QqIHdlYlJlcXVlc3QgPSBzdGF0aWNfY2Fz dDxBUEk6OlVSTFJlcXVlc3QqPihtZXNzYWdlLmdldChTdHJpbmc6OmZyb21VVEY4KCJSZXF1ZXN0 IikpKTsKKyAgICAgICAgICAgIEdSZWZQdHI8V2ViS2l0VVJJUmVxdWVzdD4gcmVxdWVzdCA9IGFk b3B0R1JlZih3ZWJraXRVUklSZXF1ZXN0Q3JlYXRlRm9yUmVzb3VyY2VSZXF1ZXN0KHdlYlJlcXVl c3QtPnJlc291cmNlUmVxdWVzdCgpKSk7CisgICAgICAgICAgICBBUEk6OlVSTFJlc3BvbnNlKiB3 ZWJSZWRpcmVjdFJlc3BvbnNlID0gc3RhdGljX2Nhc3Q8QVBJOjpVUkxSZXNwb25zZSo+KG1lc3Nh Z2UuZ2V0KFN0cmluZzo6ZnJvbVVURjgoIlJlZGlyZWN0UmVzcG9uc2UiKSkpOworICAgICAgICAg ICAgR1JlZlB0cjxXZWJLaXRVUklSZXNwb25zZT4gcmVkaXJlY3RSZXNwb25zZSA9IHdlYlJlZGly ZWN0UmVzcG9uc2UgPyBhZG9wdEdSZWYod2Via2l0VVJJUmVzcG9uc2VDcmVhdGVGb3JSZXNvdXJj ZVJlc3BvbnNlKHdlYlJlZGlyZWN0UmVzcG9uc2UtPnJlc291cmNlUmVzcG9uc2UoKSkpIDogMDsK KworICAgICAgICAgICAgd2Via2l0V2ViUmVzb3VyY2VTZW50UmVxdWVzdChyZXNvdXJjZS5nZXQo KSwgcmVxdWVzdC5nZXQoKSwgcmVkaXJlY3RSZXNwb25zZS5nZXQoKSk7CisgICAgICAgIH0gZWxz ZSBpZiAoZ19zdHJfZXF1YWwobWVzc2FnZU5hbWUsICJEaWRSZWNlaXZlUmVzcG9uc2VGb3JSZXNv dXJjZSIpKSB7CisgICAgICAgICAgICBBUEk6OlVJbnQ2NCogcmVzb3VyY2VJZGVudGlmaWVyID0g c3RhdGljX2Nhc3Q8QVBJOjpVSW50NjQqPihtZXNzYWdlLmdldChTdHJpbmc6OmZyb21VVEY4KCJJ ZGVudGlmaWVyIikpKTsKKyAgICAgICAgICAgIEdSZWZQdHI8V2ViS2l0V2ViUmVzb3VyY2U+IHJl c291cmNlID0gd2Via2l0V2ViVmlld0dldExvYWRpbmdXZWJSZXNvdXJjZSh3ZWJWaWV3LCByZXNv dXJjZUlkZW50aWZpZXItPnZhbHVlKCkpOworICAgICAgICAgICAgaWYgKCFyZXNvdXJjZSkKKyAg ICAgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgICAgIEFQSTo6VVJMUmVzcG9uc2UqIHdl YlJlc3BvbnNlID0gc3RhdGljX2Nhc3Q8QVBJOjpVUkxSZXNwb25zZSo+KG1lc3NhZ2UuZ2V0KFN0 cmluZzo6ZnJvbVVURjgoIlJlc3BvbnNlIikpKTsKKyAgICAgICAgICAgIEdSZWZQdHI8V2ViS2l0 VVJJUmVzcG9uc2U+IHJlc3BvbnNlID0gYWRvcHRHUmVmKHdlYmtpdFVSSVJlc3BvbnNlQ3JlYXRl Rm9yUmVzb3VyY2VSZXNwb25zZSh3ZWJSZXNwb25zZS0+cmVzb3VyY2VSZXNwb25zZSgpKSk7CisK KyAgICAgICAgICAgIHdlYmtpdFdlYlJlc291cmNlU2V0UmVzcG9uc2UocmVzb3VyY2UuZ2V0KCks IHJlc3BvbnNlLmdldCgpKTsKKyAgICAgICAgfSBlbHNlIGlmIChnX3N0cl9lcXVhbChtZXNzYWdl TmFtZSwgIkRpZFJlY2VpdmVDb250ZW50TGVuZ3RoRm9yUmVzb3VyY2UiKSkgeworICAgICAgICAg ICAgQVBJOjpVSW50NjQqIHJlc291cmNlSWRlbnRpZmllciA9IHN0YXRpY19jYXN0PEFQSTo6VUlu dDY0Kj4obWVzc2FnZS5nZXQoU3RyaW5nOjpmcm9tVVRGOCgiSWRlbnRpZmllciIpKSk7CisgICAg ICAgICAgICBHUmVmUHRyPFdlYktpdFdlYlJlc291cmNlPiByZXNvdXJjZSA9IHdlYmtpdFdlYlZp ZXdHZXRMb2FkaW5nV2ViUmVzb3VyY2Uod2ViVmlldywgcmVzb3VyY2VJZGVudGlmaWVyLT52YWx1 ZSgpKTsKKyAgICAgICAgICAgIGlmICghcmVzb3VyY2UpCisgICAgICAgICAgICAgICAgcmV0dXJu OworCisgICAgICAgICAgICBBUEk6OlVJbnQ2NCogY29udGVudExlbmd0aCA9IHN0YXRpY19jYXN0 PEFQSTo6VUludDY0Kj4obWVzc2FnZS5nZXQoU3RyaW5nOjpmcm9tVVRGOCgiQ29udGVudExlbmd0 aCIpKSk7CisgICAgICAgICAgICB3ZWJraXRXZWJSZXNvdXJjZU5vdGlmeVByb2dyZXNzKHJlc291 cmNlLmdldCgpLCBjb250ZW50TGVuZ3RoLT52YWx1ZSgpKTsKKyAgICAgICAgfSBlbHNlIGlmIChn X3N0cl9lcXVhbChtZXNzYWdlTmFtZSwgIkRpZEZpbmlzaExvYWRGb3JSZXNvdXJjZSIpKSB7Cisg ICAgICAgICAgICBBUEk6OlVJbnQ2NCogcmVzb3VyY2VJZGVudGlmaWVyID0gc3RhdGljX2Nhc3Q8 QVBJOjpVSW50NjQqPihtZXNzYWdlLmdldChTdHJpbmc6OmZyb21VVEY4KCJJZGVudGlmaWVyIikp KTsKKyAgICAgICAgICAgIEdSZWZQdHI8V2ViS2l0V2ViUmVzb3VyY2U+IHJlc291cmNlID0gd2Vi a2l0V2ViVmlld0dldExvYWRpbmdXZWJSZXNvdXJjZSh3ZWJWaWV3LCByZXNvdXJjZUlkZW50aWZp ZXItPnZhbHVlKCkpOworICAgICAgICAgICAgaWYgKCFyZXNvdXJjZSkKKyAgICAgICAgICAgICAg ICByZXR1cm47CisKKyAgICAgICAgICAgIHdlYmtpdFdlYlJlc291cmNlRmluaXNoZWQocmVzb3Vy Y2UuZ2V0KCkpOworICAgICAgICAgICAgd2Via2l0V2ViVmlld1JlbW92ZUxvYWRpbmdXZWJSZXNv dXJjZSh3ZWJWaWV3LCByZXNvdXJjZUlkZW50aWZpZXItPnZhbHVlKCkpOworICAgICAgICB9IGVs c2UgaWYgKGdfc3RyX2VxdWFsKG1lc3NhZ2VOYW1lLCAiRGlkRmFpbExvYWRGb3JSZXNvdXJjZSIp KSB7CisgICAgICAgICAgICBBUEk6OlVJbnQ2NCogcmVzb3VyY2VJZGVudGlmaWVyID0gc3RhdGlj X2Nhc3Q8QVBJOjpVSW50NjQqPihtZXNzYWdlLmdldChTdHJpbmc6OmZyb21VVEY4KCJJZGVudGlm aWVyIikpKTsKKyAgICAgICAgICAgIEdSZWZQdHI8V2ViS2l0V2ViUmVzb3VyY2U+IHJlc291cmNl ID0gd2Via2l0V2ViVmlld0dldExvYWRpbmdXZWJSZXNvdXJjZSh3ZWJWaWV3LCByZXNvdXJjZUlk ZW50aWZpZXItPnZhbHVlKCkpOworICAgICAgICAgICAgaWYgKCFyZXNvdXJjZSkKKyAgICAgICAg ICAgICAgICByZXR1cm47CisKKyAgICAgICAgICAgIEFQSTo6RXJyb3IqIHdlYkVycm9yID0gc3Rh dGljX2Nhc3Q8QVBJOjpFcnJvcio+KG1lc3NhZ2UuZ2V0KFN0cmluZzo6ZnJvbVVURjgoIkVycm9y IikpKTsKKyAgICAgICAgICAgIGNvbnN0IFJlc291cmNlRXJyb3ImIHBsYXRmb3JtRXJyb3IgPSB3 ZWJFcnJvci0+cGxhdGZvcm1FcnJvcigpOworICAgICAgICAgICAgR1VuaXF1ZVB0cjxHRXJyb3I+ IHJlc291cmNlRXJyb3IoZ19lcnJvcl9uZXdfbGl0ZXJhbChnX3F1YXJrX2Zyb21fc3RyaW5nKHBs YXRmb3JtRXJyb3IuZG9tYWluKCkudXRmOCgpLmRhdGEoKSksCisgICAgICAgICAgICAgICAgdG9X ZWJLaXRFcnJvcihwbGF0Zm9ybUVycm9yLmVycm9yQ29kZSgpKSwgcGxhdGZvcm1FcnJvci5sb2Nh bGl6ZWREZXNjcmlwdGlvbigpLnV0ZjgoKS5kYXRhKCkpKTsKKyAgICAgICAgICAgIGlmIChwbGF0 Zm9ybUVycm9yLnRsc0Vycm9ycygpKQorICAgICAgICAgICAgICAgIHdlYmtpdFdlYlJlc291cmNl RmFpbGVkV2l0aFRMU0Vycm9ycyhyZXNvdXJjZS5nZXQoKSwgc3RhdGljX2Nhc3Q8R1Rsc0NlcnRp ZmljYXRlRmxhZ3M+KHBsYXRmb3JtRXJyb3IudGxzRXJyb3JzKCkpLCBwbGF0Zm9ybUVycm9yLmNl cnRpZmljYXRlKCkpOworICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgIHdlYmtpdFdl YlJlc291cmNlRmFpbGVkKHJlc291cmNlLmdldCgpLCByZXNvdXJjZUVycm9yLmdldCgpKTsKKwor ICAgICAgICAgICAgd2Via2l0V2ViVmlld1JlbW92ZUxvYWRpbmdXZWJSZXNvdXJjZSh3ZWJWaWV3 LCByZXNvdXJjZUlkZW50aWZpZXItPnZhbHVlKCkpOworICAgICAgICB9IGVsc2UgaWYgKGdfc3Ry X2VxdWFsKG1lc3NhZ2VOYW1lLCAiRGlkR2V0U25hcHNob3QiKSkgeworICAgICAgICAgICAgQVBJ OjpVSW50NjQqIGNhbGxiYWNrSUQgPSBzdGF0aWNfY2FzdDxBUEk6OlVJbnQ2NCo+KG1lc3NhZ2Uu Z2V0KCJDYWxsYmFja0lEIikpOworICAgICAgICAgICAgV2ViSW1hZ2UqIGltYWdlID0gc3RhdGlj X2Nhc3Q8V2ViSW1hZ2UqPihtZXNzYWdlLmdldCgiU25hcHNob3QiKSk7CisgICAgICAgICAgICB3 ZWJLaXRXZWJWaWV3RGlkUmVjZWl2ZVNuYXBzaG90KHdlYlZpZXcsIGNhbGxiYWNrSUQtPnZhbHVl KCksIGltYWdlKTsKKyAgICAgICAgfSBlbHNlCisgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNI RUQoKTsKKyAgICB9CisKKyAgICB2b2lkIGRpZFJlY2VpdmVNZXNzYWdlRnJvbUluamVjdGVkQnVu ZGxlKFdlYlByb2Nlc3NQb29sJiwgY29uc3QgU3RyaW5nJiBtZXNzYWdlTmFtZSwgQVBJOjpPYmpl Y3QqIG1lc3NhZ2VCb2R5KSBvdmVycmlkZQorICAgIHsKKyAgICAgICAgQVNTRVJUKG1lc3NhZ2VC b2R5LT50eXBlKCkgPT0gQVBJOjpPYmplY3Q6OlR5cGU6OkRpY3Rpb25hcnkpOworICAgICAgICBB UEk6OkRpY3Rpb25hcnkmIG1lc3NhZ2UgPSAqc3RhdGljX2Nhc3Q8QVBJOjpEaWN0aW9uYXJ5Kj4o bWVzc2FnZUJvZHkpOworCisgICAgICAgIENTdHJpbmcgbWVzc2FnZU5hbWVVVEY4ID0gbWVzc2Fn ZU5hbWUudXRmOCgpOworICAgICAgICBpZiAoZ19zdHJfaGFzX3ByZWZpeChtZXNzYWdlTmFtZVVU RjguZGF0YSgpLCAiV2ViUGFnZS4iKSkgeworICAgICAgICAgICAgV2ViUGFnZVByb3h5KiBwYWdl ID0gc3RhdGljX2Nhc3Q8V2ViUGFnZVByb3h5Kj4obWVzc2FnZS5nZXQoU3RyaW5nOjpmcm9tVVRG OCgiUGFnZSIpKSk7CisgICAgICAgICAgICBXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3ID0gd2Via2l0 V2ViQ29udGV4dEdldFdlYlZpZXdGb3JQYWdlKG1fd2ViQ29udGV4dCwgcGFnZSk7CisgICAgICAg ICAgICBpZiAoIXdlYlZpZXcpCisgICAgICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgICAg ICBkaWRSZWNlaXZlV2ViVmlld01lc3NhZ2VGcm9tSW5qZWN0ZWRCdW5kbGUod2ViVmlldywgbWVz c2FnZU5hbWVVVEY4LmRhdGEoKSArIHN0cmxlbigiV2ViUGFnZS4iKSwgbWVzc2FnZSk7CisgICAg ICAgIH0gZWxzZQorICAgICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgfQorCisg ICAgUmVmUHRyPEFQSTo6T2JqZWN0PiBnZXRJbmplY3RlZEJ1bmRsZUluaXRpYWxpemF0aW9uVXNl ckRhdGEoV2ViUHJvY2Vzc1Bvb2wmKQorICAgIHsKKyAgICAgICAgR1JlZlB0cjxHVmFyaWFudD4g ZGF0YSA9IHdlYmtpdFdlYkNvbnRleHRJbml0aWFsaXplV2ViRXh0ZW5zaW9ucyhtX3dlYkNvbnRl eHQpOworICAgICAgICBHVW5pcXVlUHRyPGdjaGFyPiBkYXRhU3RyaW5nKGdfdmFyaWFudF9wcmlu dChkYXRhLmdldCgpLCBUUlVFKSk7CisgICAgICAgIHJldHVybiBBUEk6OlN0cmluZzo6Y3JlYXRl KFN0cmluZzo6ZnJvbVVURjgoZGF0YVN0cmluZy5nZXQoKSkpOworICAgIH0KKworICAgIFdlYktp dFdlYkNvbnRleHQqIG1fd2ViQ29udGV4dDsKK307CiAKIHZvaWQgYXR0YWNoSW5qZWN0ZWRCdW5k bGVDbGllbnRUb0NvbnRleHQoV2ViS2l0V2ViQ29udGV4dCogd2ViQ29udGV4dCkKIHsKLSAgICBX S0NvbnRleHRJbmplY3RlZEJ1bmRsZUNsaWVudFYxIHdrSW5qZWN0ZWRCdW5kbGVDbGllbnQgPSB7 Ci0gICAgICAgIHsKLSAgICAgICAgICAgIDEsIC8vIHZlcnNpb24KLSAgICAgICAgICAgIHdlYkNv bnRleHQsIC8vIGNsaWVudEluZm8KLSAgICAgICAgfSwKLSAgICAgICAgZGlkUmVjZWl2ZU1lc3Nh Z2VGcm9tSW5qZWN0ZWRCdW5kbGUsCi0gICAgICAgIDAsIC8vIGRpZFJlY2VpdmVTeW5jaHJvbm91 c01lc3NhZ2VGcm9tSW5qZWN0ZWRCdW5kbGUKLSAgICAgICAgZ2V0SW5qZWN0ZWRCdW5kbGVJbml0 aWFsaXphdGlvblVzZXJEYXRhCi0gICAgfTsKLSAgICBXS0NvbnRleHRTZXRJbmplY3RlZEJ1bmRs ZUNsaWVudCh0b0FQSSgmd2Via2l0V2ViQ29udGV4dEdldFByb2Nlc3NQb29sKHdlYkNvbnRleHQp KSwgJndrSW5qZWN0ZWRCdW5kbGVDbGllbnQuYmFzZSk7CisgICAgd2Via2l0V2ViQ29udGV4dEdl dFByb2Nlc3NQb29sKHdlYkNvbnRleHQpLnNldEluamVjdGVkQnVuZGxlQ2xpZW50KHN0ZDo6bWFr ZV91bmlxdWU8V2ViS2l0SW5qZWN0ZWRCdW5kbGVDbGllbnQ+KHdlYkNvbnRleHQpKTsKIH0K