173304 2017-06-12 23:55:37 -0700 [GTK] Use API::InjectedBundle::PageLoaderClient in WebKitWebPage 2017-06-13 03:30:36 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned achristensen bugs-noreply zan oldest_to_newest 1318577 0 cgarcia 2017-06-12 23:55:37 -0700 Instead of the C API. 1318578 1 312754 cgarcia 2017-06-12 23:57:10 -0700 Created attachment 312754 Patch 1318621 2 cgarcia 2017-06-13 03:30:36 -0700 Committed r218171: <http://trac.webkit.org/changeset/218171> 312754 2017-06-12 23:57:10 -0700 2017-06-13 00:30:37 -0700 Patch wk2-injected-loader-client-gtk.diff text/plain 9100 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBhNGEwZGQ0NzRiMS4uY2FjMGZhOTY1MGUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEs NSArMSwyMiBAQAogMjAxNy0wNi0xMiAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGln YWxpYS5jb20+CiAKKyAgICAgICAgW0dUS10gVXNlIEFQSTo6SW5qZWN0ZWRCdW5kbGU6OlBhZ2VM b2FkZXJDbGllbnQgaW4gV2ViS2l0V2ViUGFnZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTczMzA0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9ndGsv V2ViS2l0V2ViUGFnZS5jcHA6CisgICAgICAgICh3ZWJraXRXZWJQYWdlQ3JlYXRlKToKKyAgICAg ICAgKGdldERvY3VtZW50TG9hZGVyVVJMKTogRGVsZXRlZC4KKyAgICAgICAgKGRpZFN0YXJ0UHJv dmlzaW9uYWxMb2FkRm9yRnJhbWUpOiBEZWxldGVkLgorICAgICAgICAoZGlkUmVjZWl2ZVNlcnZl clJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUpOiBEZWxldGVkLgorICAgICAgICAo ZGlkU2FtZURvY3VtZW50TmF2aWdhdGlvbkZvckZyYW1lKTogRGVsZXRlZC4KKyAgICAgICAgKGRp ZENvbW1pdExvYWRGb3JGcmFtZSk6IERlbGV0ZWQuCisgICAgICAgIChkaWRGaW5pc2hEb2N1bWVu dExvYWRGb3JGcmFtZSk6IERlbGV0ZWQuCisgICAgICAgIChkaWRDbGVhcldpbmRvd09iamVjdEZv ckZyYW1lKTogRGVsZXRlZC4KKworMjAxNy0wNi0xMiAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxj Z2FyY2lhQGlnYWxpYS5jb20+CisKICAgICAgICAgQWRkIEFQSTo6SW5qZWN0ZWRCdW5kbGU6OlBh Z2VMb2FkZXJDbGllbnQKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE3MzI2NQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0lu amVjdGVkQnVuZGxlL0FQSS9ndGsvV2ViS2l0V2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9ndGsvV2ViS2l0V2ViUGFnZS5jcHAKaW5kZXgg ZWQ0OGFmMDEyMWIuLjNlMzhmY2UxODFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9ndGsvV2ViS2l0V2ViUGFnZS5jcHAKKysrIGIvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvZ3RrL1dlYktpdFdlYlBh Z2UuY3BwCkBAIC0xMzAsMTUgKzEzMCw2IEBAIHN0YXRpYyB2b2lkIHdlYkZyYW1lRGVzdHJveWVk KFdlYkZyYW1lKiB3ZWJGcmFtZSkKICAgICB3ZWJGcmFtZU1hcCgpLnJlbW92ZSh3ZWJGcmFtZSk7 CiB9CiAKLXN0YXRpYyBDU3RyaW5nIGdldERvY3VtZW50TG9hZGVyVVJMKERvY3VtZW50TG9hZGVy KiBkb2N1bWVudExvYWRlcikKLXsKLSAgICBBU1NFUlQoZG9jdW1lbnRMb2FkZXIpOwotICAgIGlm ICghZG9jdW1lbnRMb2FkZXItPnVucmVhY2hhYmxlVVJMKCkuaXNFbXB0eSgpKQotICAgICAgICBy ZXR1cm4gZG9jdW1lbnRMb2FkZXItPnVucmVhY2hhYmxlVVJMKCkuc3RyaW5nKCkudXRmOCgpOwot Ci0gICAgcmV0dXJuIGRvY3VtZW50TG9hZGVyLT51cmwoKS5zdHJpbmcoKS51dGY4KCk7Ci19Ci0K IHN0YXRpYyB2b2lkIHdlYmtpdFdlYlBhZ2VTZXRVUkkoV2ViS2l0V2ViUGFnZSogd2ViUGFnZSwg Y29uc3QgQ1N0cmluZyYgdXJpKQogewogICAgIGlmICh3ZWJQYWdlLT5wcml2LT51cmkgPT0gdXJp KQpAQCAtMTU0LDUxICsxNDUsNjcgQEAgc3RhdGljIHZvaWQgd2Via2l0V2ViUGFnZURpZFNlbmRD b25zb2xlTWVzc2FnZShXZWJLaXRXZWJQYWdlKiB3ZWJQYWdlLCBNZXNzYWdlU28KICAgICBnX3Np Z25hbF9lbWl0KHdlYlBhZ2UsIHNpZ25hbHNbQ09OU09MRV9NRVNTQUdFX1NFTlRdLCAwLCAmY29u c29sZU1lc3NhZ2UpOwogfQogCi1zdGF0aWMgdm9pZCBkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZv ckZyYW1lKFdLQnVuZGxlUGFnZVJlZiwgV0tCdW5kbGVGcmFtZVJlZiBmcmFtZSwgV0tUeXBlUmVm KiwgY29uc3Qgdm9pZCAqY2xpZW50SW5mbykKLXsKLSAgICBpZiAoIVdLQnVuZGxlRnJhbWVJc01h aW5GcmFtZShmcmFtZSkpCi0gICAgICAgIHJldHVybjsKLQotICAgIHdlYmtpdFdlYlBhZ2VTZXRV UkkoV0VCS0lUX1dFQl9QQUdFKGNsaWVudEluZm8pLCBnZXREb2N1bWVudExvYWRlclVSTCh0b0lt cGwoZnJhbWUpLT5jb3JlRnJhbWUoKS0+bG9hZGVyKCkucHJvdmlzaW9uYWxEb2N1bWVudExvYWRl cigpKSk7Ci19CitjbGFzcyBQYWdlTG9hZGVyQ2xpZW50IGZpbmFsIDogcHVibGljIEFQSTo6SW5q ZWN0ZWRCdW5kbGU6OlBhZ2VMb2FkZXJDbGllbnQgeworcHVibGljOgorICAgIGV4cGxpY2l0IFBh Z2VMb2FkZXJDbGllbnQoV2ViS2l0V2ViUGFnZSogd2ViUGFnZSkKKyAgICAgICAgOiBtX3dlYlBh Z2Uod2ViUGFnZSkKKyAgICB7CisgICAgfQogCi1zdGF0aWMgdm9pZCBkaWRSZWNlaXZlU2VydmVy UmVkaXJlY3RGb3JQcm92aXNpb25hbExvYWRGb3JGcmFtZShXS0J1bmRsZVBhZ2VSZWYsIFdLQnVu ZGxlRnJhbWVSZWYgZnJhbWUsIFdLVHlwZVJlZiogLyogdXNlckRhdGEgKi8sIGNvbnN0IHZvaWQg KmNsaWVudEluZm8pCi17Ci0gICAgaWYgKCFXS0J1bmRsZUZyYW1lSXNNYWluRnJhbWUoZnJhbWUp KQotICAgICAgICByZXR1cm47Citwcml2YXRlOgorICAgIHN0YXRpYyBDU3RyaW5nIGdldERvY3Vt ZW50TG9hZGVyVVJMKERvY3VtZW50TG9hZGVyKiBkb2N1bWVudExvYWRlcikKKyAgICB7CisgICAg ICAgIEFTU0VSVChkb2N1bWVudExvYWRlcik7CisgICAgICAgIGlmICghZG9jdW1lbnRMb2FkZXIt PnVucmVhY2hhYmxlVVJMKCkuaXNFbXB0eSgpKQorICAgICAgICAgICAgcmV0dXJuIGRvY3VtZW50 TG9hZGVyLT51bnJlYWNoYWJsZVVSTCgpLnN0cmluZygpLnV0ZjgoKTsKIAotICAgIHdlYmtpdFdl YlBhZ2VTZXRVUkkoV0VCS0lUX1dFQl9QQUdFKGNsaWVudEluZm8pLCBnZXREb2N1bWVudExvYWRl clVSTCh0b0ltcGwoZnJhbWUpLT5jb3JlRnJhbWUoKS0+bG9hZGVyKCkucHJvdmlzaW9uYWxEb2N1 bWVudExvYWRlcigpKSk7Ci19CisgICAgICAgIHJldHVybiBkb2N1bWVudExvYWRlci0+dXJsKCku c3RyaW5nKCkudXRmOCgpOworICAgIH0KIAotc3RhdGljIHZvaWQgZGlkU2FtZURvY3VtZW50TmF2 aWdhdGlvbkZvckZyYW1lKFdLQnVuZGxlUGFnZVJlZiwgV0tCdW5kbGVGcmFtZVJlZiBmcmFtZSwg V0tTYW1lRG9jdW1lbnROYXZpZ2F0aW9uVHlwZSwgV0tUeXBlUmVmKiAvKiB1c2VyRGF0YSAqLywg Y29uc3Qgdm9pZCAqY2xpZW50SW5mbykKLXsKLSAgICBpZiAoIVdLQnVuZGxlRnJhbWVJc01haW5G cmFtZShmcmFtZSkpCi0gICAgICAgIHJldHVybjsKKyAgICB2b2lkIGRpZFN0YXJ0UHJvdmlzaW9u YWxMb2FkRm9yRnJhbWUoV2ViUGFnZSYsIFdlYkZyYW1lJiBmcmFtZSwgUmVmUHRyPEFQSTo6T2Jq ZWN0PiYpIG92ZXJyaWRlCisgICAgeworICAgICAgICBpZiAoIWZyYW1lLmlzTWFpbkZyYW1lKCkp CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIHdlYmtpdFdlYlBhZ2VTZXRVUkkobV93ZWJQ YWdlLCBnZXREb2N1bWVudExvYWRlclVSTChmcmFtZS5jb3JlRnJhbWUoKS0+bG9hZGVyKCkucHJv dmlzaW9uYWxEb2N1bWVudExvYWRlcigpKSk7CisgICAgfQogCi0gICAgd2Via2l0V2ViUGFnZVNl dFVSSShXRUJLSVRfV0VCX1BBR0UoY2xpZW50SW5mbyksIHRvSW1wbChmcmFtZSktPmNvcmVGcmFt ZSgpLT5kb2N1bWVudCgpLT51cmwoKS5zdHJpbmcoKS51dGY4KCkpOwotfQorICAgIHZvaWQgZGlk UmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUoV2ViUGFnZSYs IFdlYkZyYW1lJiBmcmFtZSwgUmVmUHRyPEFQSTo6T2JqZWN0PiYpIG92ZXJyaWRlCisgICAgewor ICAgICAgICBpZiAoIWZyYW1lLmlzTWFpbkZyYW1lKCkpCisgICAgICAgICAgICByZXR1cm47Cisg ICAgICAgIHdlYmtpdFdlYlBhZ2VTZXRVUkkobV93ZWJQYWdlLCBnZXREb2N1bWVudExvYWRlclVS TChmcmFtZS5jb3JlRnJhbWUoKS0+bG9hZGVyKCkucHJvdmlzaW9uYWxEb2N1bWVudExvYWRlcigp KSk7CisgICAgfQogCi1zdGF0aWMgdm9pZCBkaWRDb21taXRMb2FkRm9yRnJhbWUoV0tCdW5kbGVQ YWdlUmVmLCBXS0J1bmRsZUZyYW1lUmVmIGZyYW1lLCBXS1R5cGVSZWYqIC8qIHVzZXJEYXRhICov LCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKQotewotICAgIGlmICghV0tCdW5kbGVGcmFtZUlzTWFp bkZyYW1lKGZyYW1lKSkKLSAgICAgICAgcmV0dXJuOworICAgIHZvaWQgZGlkU2FtZURvY3VtZW50 TmF2aWdhdGlvbkZvckZyYW1lKFdlYlBhZ2UmLCBXZWJGcmFtZSYgZnJhbWUsIFNhbWVEb2N1bWVu dE5hdmlnYXRpb25UeXBlLCBSZWZQdHI8QVBJOjpPYmplY3Q+Jikgb3ZlcnJpZGUKKyAgICB7Cisg ICAgICAgIGlmICghZnJhbWUuaXNNYWluRnJhbWUoKSkKKyAgICAgICAgICAgIHJldHVybjsKKyAg ICAgICAgd2Via2l0V2ViUGFnZVNldFVSSShtX3dlYlBhZ2UsIGZyYW1lLmNvcmVGcmFtZSgpLT5k b2N1bWVudCgpLT51cmwoKS5zdHJpbmcoKS51dGY4KCkpOworICAgIH0KIAotICAgIHdlYmtpdFdl YlBhZ2VTZXRVUkkoV0VCS0lUX1dFQl9QQUdFKGNsaWVudEluZm8pLCBnZXREb2N1bWVudExvYWRl clVSTCh0b0ltcGwoZnJhbWUpLT5jb3JlRnJhbWUoKS0+bG9hZGVyKCkuZG9jdW1lbnRMb2FkZXIo KSkpOwotfQorICAgIHZvaWQgZGlkQ29tbWl0TG9hZEZvckZyYW1lKFdlYlBhZ2UmLCBXZWJGcmFt ZSYgZnJhbWUsIFJlZlB0cjxBUEk6Ok9iamVjdD4mKSBvdmVycmlkZQorICAgIHsKKyAgICAgICAg aWYgKCFmcmFtZS5pc01haW5GcmFtZSgpKQorICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB3 ZWJraXRXZWJQYWdlU2V0VVJJKG1fd2ViUGFnZSwgZ2V0RG9jdW1lbnRMb2FkZXJVUkwoZnJhbWUu Y29yZUZyYW1lKCktPmxvYWRlcigpLmRvY3VtZW50TG9hZGVyKCkpKTsKKyAgICB9CiAKLXN0YXRp YyB2b2lkIGRpZEZpbmlzaERvY3VtZW50TG9hZEZvckZyYW1lKFdLQnVuZGxlUGFnZVJlZiwgV0tC dW5kbGVGcmFtZVJlZiBmcmFtZSwgV0tUeXBlUmVmKiwgY29uc3Qgdm9pZCAqY2xpZW50SW5mbykK LXsKLSAgICBpZiAoIVdLQnVuZGxlRnJhbWVJc01haW5GcmFtZShmcmFtZSkpCi0gICAgICAgIHJl dHVybjsKKyAgICB2b2lkIGRpZEZpbmlzaERvY3VtZW50TG9hZEZvckZyYW1lKFdlYlBhZ2UmLCBX ZWJGcmFtZSYgZnJhbWUsIFJlZlB0cjxBUEk6Ok9iamVjdD4mKSBvdmVycmlkZQorICAgIHsKKyAg ICAgICAgaWYgKCFmcmFtZS5pc01haW5GcmFtZSgpKQorICAgICAgICAgICAgcmV0dXJuOworICAg ICAgICBnX3NpZ25hbF9lbWl0KG1fd2ViUGFnZSwgc2lnbmFsc1tET0NVTUVOVF9MT0FERURdLCAw KTsKKyAgICB9CiAKLSAgICBnX3NpZ25hbF9lbWl0KFdFQktJVF9XRUJfUEFHRShjbGllbnRJbmZv KSwgc2lnbmFsc1tET0NVTUVOVF9MT0FERURdLCAwKTsKLX0KKyAgICB2b2lkIGRpZENsZWFyV2lu ZG93T2JqZWN0Rm9yRnJhbWUoV2ViUGFnZSYsIFdlYkZyYW1lJiBmcmFtZSwgRE9NV3JhcHBlcldv cmxkJiB3b3JsZCkgb3ZlcnJpZGUKKyAgICB7CisgICAgICAgIGF1dG8gaW5qZWN0ZWRXb3JsZCA9 IEluamVjdGVkQnVuZGxlU2NyaXB0V29ybGQ6OmdldE9yQ3JlYXRlKHdvcmxkKTsKKyAgICAgICAg aWYgKGF1dG8qIHdrV29ybGQgPSB3ZWJraXRTY3JpcHRXb3JsZEdldChpbmplY3RlZFdvcmxkLnB0 cigpKSkKKyAgICAgICAgICAgIHdlYmtpdFNjcmlwdFdvcmxkV2luZG93T2JqZWN0Q2xlYXJlZCh3 a1dvcmxkLCBtX3dlYlBhZ2UsIHdlYmtpdEZyYW1lR2V0T3JDcmVhdGUoJmZyYW1lKSk7CisgICAg fQogCi1zdGF0aWMgdm9pZCBkaWRDbGVhcldpbmRvd09iamVjdEZvckZyYW1lKFdLQnVuZGxlUGFn ZVJlZiwgV0tCdW5kbGVGcmFtZVJlZiBmcmFtZSwgV0tCdW5kbGVTY3JpcHRXb3JsZFJlZiB3a1dv cmxkLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKQotewotICAgIGlmIChXZWJLaXRTY3JpcHRXb3Js ZCogd29ybGQgPSB3ZWJraXRTY3JpcHRXb3JsZEdldCh0b0ltcGwod2tXb3JsZCkpKQotICAgICAg ICB3ZWJraXRTY3JpcHRXb3JsZFdpbmRvd09iamVjdENsZWFyZWQod29ybGQsIFdFQktJVF9XRUJf UEFHRShjbGllbnRJbmZvKSwgd2Via2l0RnJhbWVHZXRPckNyZWF0ZSh0b0ltcGwoZnJhbWUpKSk7 Ci19CisgICAgV2ViS2l0V2ViUGFnZSogbV93ZWJQYWdlOworfTsKIAogc3RhdGljIHZvaWQgZGlk SW5pdGlhdGVMb2FkRm9yUmVzb3VyY2UoV0tCdW5kbGVQYWdlUmVmIHBhZ2UsIFdLQnVuZGxlRnJh bWVSZWYgZnJhbWUsIHVpbnQ2NF90IGlkZW50aWZpZXIsIFdLVVJMUmVxdWVzdFJlZiByZXF1ZXN0 LCBib29sIC8qIHBhZ2VMb2FkSXNQcm92aXNpb25hbCAqLywgY29uc3Qgdm9pZCopCiB7CkBAIC01 MzUsNDggKzU0Miw2IEBAIFdlYktpdFdlYlBhZ2UqIHdlYmtpdFdlYlBhZ2VDcmVhdGUoV2ViUGFn ZSogd2ViUGFnZSkKICAgICBXZWJLaXRXZWJQYWdlKiBwYWdlID0gV0VCS0lUX1dFQl9QQUdFKGdf b2JqZWN0X25ldyhXRUJLSVRfVFlQRV9XRUJfUEFHRSwgTlVMTCkpOwogICAgIHBhZ2UtPnByaXYt PndlYlBhZ2UgPSB3ZWJQYWdlOwogCi0gICAgV0tCdW5kbGVQYWdlTG9hZGVyQ2xpZW50VjYgbG9h ZGVyQ2xpZW50ID0gewotICAgICAgICB7Ci0gICAgICAgICAgICA2LCAvLyB2ZXJzaW9uCi0gICAg ICAgICAgICBwYWdlLCAvLyBjbGllbnRJbmZvCi0gICAgICAgIH0sCi0gICAgICAgIGRpZFN0YXJ0 UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUsCi0gICAgICAgIGRpZFJlY2VpdmVTZXJ2ZXJSZWRpcmVj dEZvclByb3Zpc2lvbmFsTG9hZEZvckZyYW1lLAotICAgICAgICAwLCAvLyBkaWRGYWlsUHJvdmlz aW9uYWxMb2FkV2l0aEVycm9yRm9yRnJhbWUKLSAgICAgICAgZGlkQ29tbWl0TG9hZEZvckZyYW1l LAotICAgICAgICBkaWRGaW5pc2hEb2N1bWVudExvYWRGb3JGcmFtZSwKLSAgICAgICAgMCwgLy8g ZGlkRmluaXNoTG9hZEZvckZyYW1lCi0gICAgICAgIDAsIC8vIGRpZEZhaWxMb2FkV2l0aEVycm9y Rm9yRnJhbWUKLSAgICAgICAgZGlkU2FtZURvY3VtZW50TmF2aWdhdGlvbkZvckZyYW1lLAotICAg ICAgICAwLCAvLyBkaWRSZWNlaXZlVGl0bGVGb3JGcmFtZQotICAgICAgICAwLCAvLyBkaWRGaXJz dExheW91dEZvckZyYW1lCi0gICAgICAgIDAsIC8vIGRpZEZpcnN0VmlzdWFsbHlOb25FbXB0eUxh eW91dEZvckZyYW1lCi0gICAgICAgIDAsIC8vIGRpZFJlbW92ZUZyYW1lRnJvbUhpZXJhcmNoeSwK LSAgICAgICAgMCwgLy8gZGlkRGlzcGxheUluc2VjdXJlQ29udGVudEZvckZyYW1lCi0gICAgICAg IDAsIC8vIGRpZFJ1bkluc2VjdXJlQ29udGVudEZvckZyYW1lCi0gICAgICAgIGRpZENsZWFyV2lu ZG93T2JqZWN0Rm9yRnJhbWUsCi0gICAgICAgIDAsIC8vIGRpZENhbmNlbENsaWVudFJlZGlyZWN0 Rm9yRnJhbWUKLSAgICAgICAgMCwgLy8gd2lsbFBlcmZvcm1DbGllbnRSZWRpcmVjdEZvckZyYW1l Ci0gICAgICAgIDAsIC8vIGRpZEhhbmRsZU9ubG9hZEV2ZW50c0ZvckZyYW1lCi0gICAgICAgIDAs IC8vIGRpZExheW91dEZvckZyYW1lCi0gICAgICAgIDAsIC8vIGRpZE5ld0ZpcnN0VmlzdWFsbHlO b25FbXB0eUxheW91dAotICAgICAgICAwLCAvLyBkaWREZXRlY3RYU1NGb3JGcmFtZQotICAgICAg ICAwLCAvLyBzaG91bGRHb1RvQmFja0ZvcndhcmRMaXN0SXRlbQotICAgICAgICAwLCAvLyBnbG9i YWxPYmplY3RJc0F2YWlsYWJsZUZvckZyYW1lCi0gICAgICAgIDAsIC8vIHdpbGxEaXNjb25uZWN0 RE9NV2luZG93RXh0ZW5zaW9uRnJvbUdsb2JhbE9iamVjdAotICAgICAgICAwLCAvLyBkaWRSZWNv bm5lY3RET01XaW5kb3dFeHRlbnNpb25Ub0dsb2JhbE9iamVjdAotICAgICAgICAwLCAvLyB3aWxs RGVzdHJveUdsb2JhbE9iamVjdEZvckRPTVdpbmRvd0V4dGVuc2lvbgotICAgICAgICAwLCAvLyBk aWRGaW5pc2hQcm9ncmVzcwotICAgICAgICAwLCAvLyBzaG91bGRGb3JjZVVuaXZlcnNhbEFjY2Vz c0Zyb21Mb2NhbFVSTAotICAgICAgICAwLCAvLyBkaWRSZWNlaXZlSW50ZW50Rm9yRnJhbWVfdW5h dmFpbGFibGUKLSAgICAgICAgMCwgLy8gcmVnaXN0ZXJJbnRlbnRTZXJ2aWNlRm9yRnJhbWVfdW5h dmFpbGFibGUKLSAgICAgICAgMCwgLy8gZGlkTGF5b3V0Ci0gICAgICAgIDAsIC8vIGZlYXR1cmVz VXNlZEluUGFnZQotICAgICAgICAwLCAvLyB3aWxsTG9hZFVSTFJlcXVlc3QKLSAgICAgICAgMCwg Ly8gd2lsbExvYWREYXRhUmVxdWVzdAotICAgIH07Ci0gICAgV0tCdW5kbGVQYWdlU2V0UGFnZUxv YWRlckNsaWVudCh0b0FQSSh3ZWJQYWdlKSwgJmxvYWRlckNsaWVudC5iYXNlKTsKLQogICAgIFdL QnVuZGxlUGFnZVJlc291cmNlTG9hZENsaWVudFYxIHJlc291cmNlTG9hZENsaWVudCA9IHsKICAg ICAgICAgewogICAgICAgICAgICAgMSwgLy8gdmVyc2lvbgpAQCAtNTkzLDYgKzU1OCw3IEBAIFdl YktpdFdlYlBhZ2UqIHdlYmtpdFdlYlBhZ2VDcmVhdGUoV2ViUGFnZSogd2ViUGFnZSkKICAgICB9 OwogICAgIFdLQnVuZGxlUGFnZVNldFJlc291cmNlTG9hZENsaWVudCh0b0FQSSh3ZWJQYWdlKSwg JnJlc291cmNlTG9hZENsaWVudC5iYXNlKTsKIAorICAgIHdlYlBhZ2UtPnNldEluamVjdGVkQnVu ZGxlUGFnZUxvYWRlckNsaWVudChzdGQ6Om1ha2VfdW5pcXVlPFBhZ2VMb2FkZXJDbGllbnQ+KHBh Z2UpKTsKICAgICB3ZWJQYWdlLT5zZXRJbmplY3RlZEJ1bmRsZUNvbnRleHRNZW51Q2xpZW50KHN0 ZDo6bWFrZV91bmlxdWU8UGFnZUNvbnRleHRNZW51Q2xpZW50PihwYWdlKSk7CiAgICAgd2ViUGFn ZS0+c2V0SW5qZWN0ZWRCdW5kbGVVSUNsaWVudChzdGQ6Om1ha2VfdW5pcXVlPFBhZ2VVSUNsaWVu dD4ocGFnZSkpOwogICAgIHdlYlBhZ2UtPnNldEluamVjdGVkQnVuZGxlRm9ybUNsaWVudChzdGQ6 Om1ha2VfdW5pcXVlPFBhZ2VGb3JtQ2xpZW50PihwYWdlKSk7Cg==