201032 2019-08-22 02:00:37 -0700 [Win][MiniBrowser] URL bar should be updated for in-page navigations 2019-08-22 19:00:32 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 fujii fujii achristensen bfulgham darin don.olmstead pvollan ross.kirsling webkit-bug-importer oldest_to_newest 1563994 0 fujii 2019-08-22 02:00:37 -0700 [Win][MiniBrowser] URL bar should be updated for in-page navigations You can test in-page navigations in the following page: https://trac.webkit.org/wiki/BuildingCairoOnWindows 1563995 1 376998 fujii 2019-08-22 02:06:37 -0700 Created attachment 376998 Patch 1564351 2 376998 fujii 2019-08-22 18:59:54 -0700 Comment on attachment 376998 Patch Clearing flags on attachment: 376998 Committed r249039: <https://trac.webkit.org/changeset/249039> 1564352 3 fujii 2019-08-22 18:59:57 -0700 All reviewed patches have been landed. Closing bug. 1564353 4 webkit-bug-importer 2019-08-22 19:00:32 -0700 <rdar://problem/54625025> 376998 2019-08-22 02:06:37 -0700 2019-08-22 18:59:54 -0700 Patch bug-201032-20190822180636.patch text/plain 22761 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ4OTk3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNmUxZGJkMjFhMjRiNmY4ZmFhYjlhYWY2NGVmZjhkMTIz ZjU2YzViMC4uNDk1ZDFjNjYwNzNhY2Q0ZWMxMzZjOWQxYmM5MmMyZDc3NDQ3YjdiNCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQw IEBACisyMDE5LTA4LTIyICBGdWppaSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29t PgorCisgICAgICAgIFtXaW5dW01pbmlCcm93c2VyXSBVUkwgYmFyIHNob3VsZCBiZSB1cGRhdGVk IGZvciBpbi1wYWdlIG5hdmlnYXRpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMDEwMzIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIE1pbmlCcm93c2VyL3dpbi9Ccm93c2VyV2luZG93Lmg6IEFkZGVk IGFjdGl2ZVVSTENoYW5nZWQgdG8gQnJvd3NlcldpbmRvd0NsaWVudCBpbnRlcmZhY2UuCisgICAg ICAgICogTWluaUJyb3dzZXIvd2luL01haW5XaW5kb3cuY3BwOgorICAgICAgICAoTWFpbldpbmRv dzo6aW5pdCk6CisgICAgICAgIChNYWluV2luZG93OjphY3RpdmVVUkxDaGFuZ2VkKTogQWRkZWQu CisgICAgICAgICogTWluaUJyb3dzZXIvd2luL01haW5XaW5kb3cuaDoKKyAgICAgICAgKiBNaW5p QnJvd3Nlci93aW4vTWluaUJyb3dzZXJXZWJIb3N0LmNwcDoKKyAgICAgICAgKE1pbmlCcm93c2Vy V2ViSG9zdDo6ZGlkQ29tbWl0TG9hZEZvckZyYW1lKToKKyAgICAgICAgKE1pbmlCcm93c2VyV2Vi SG9zdDo6ZGlkQ2hhbmdlTG9jYXRpb25XaXRoaW5QYWdlRm9yRnJhbWUpOiBBZGRlZC4KKyAgICAg ICAgKE1pbmlCcm93c2VyV2ViSG9zdDo6dXBkYXRlQWRkcmVzc0Jhcik6IERlbGV0ZWQuCisgICAg ICAgIChNaW5pQnJvd3NlcldlYkhvc3Q6OmxvYWRVUkwpOiBEZWxldGVkLgorICAgICAgICAqIE1p bmlCcm93c2VyL3dpbi9NaW5pQnJvd3NlcldlYkhvc3QuaDoKKyAgICAgICAgKE1pbmlCcm93c2Vy V2ViSG9zdDo6TWluaUJyb3dzZXJXZWJIb3N0KToKKyAgICAgICAgKE1pbmlCcm93c2VyV2ViSG9z dDo6ZGlkQ29tbWl0TG9hZEZvckZyYW1lKTogRGVsZXRlZC4KKyAgICAgICAgKE1pbmlCcm93c2Vy V2ViSG9zdDo6ZGlkQ2hhbmdlTG9jYXRpb25XaXRoaW5QYWdlRm9yRnJhbWUpOiBEZWxldGVkLgor ICAgICAgICAqIE1pbmlCcm93c2VyL3dpbi9QcmludFdlYlVJRGVsZWdhdGUuY3BwOgorICAgICAg ICAqIE1pbmlCcm93c2VyL3dpbi9XZWJLaXRCcm93c2VyV2luZG93LmNwcDoKKyAgICAgICAgKFdl YktpdEJyb3dzZXJXaW5kb3c6OmNyZWF0ZSk6CisgICAgICAgIChXZWJLaXRCcm93c2VyV2luZG93 OjpXZWJLaXRCcm93c2VyV2luZG93KToKKyAgICAgICAgKFdlYktpdEJyb3dzZXJXaW5kb3c6OmRp ZENoYW5nZUlzTG9hZGluZyk6IFJlbW92ZWQgYW4gdW51c2VkIHZhcmlhYmxlLgorICAgICAgICAo V2ViS2l0QnJvd3NlcldpbmRvdzo6ZGlkQ2hhbmdlQWN0aXZlVVJMKTogQWRkZWQuCisgICAgICAg IChXZWJLaXRCcm93c2VyV2luZG93OjpjcmVhdGVOZXdQYWdlKToKKyAgICAgICAgKFdlYktpdEJy b3dzZXJXaW5kb3c6OmRpZENvbW1pdE5hdmlnYXRpb24pOiBEZWxldGVkLgorICAgICAgICAqIE1p bmlCcm93c2VyL3dpbi9XZWJLaXRCcm93c2VyV2luZG93Lmg6IFJlbW92ZWQgbV91cmxCYXJXbmQu CisgICAgICAgICogTWluaUJyb3dzZXIvd2luL1dlYktpdExlZ2FjeUJyb3dzZXJXaW5kb3cuY3Bw OgorICAgICAgICAoV2ViS2l0TGVnYWN5QnJvd3NlcldpbmRvdzo6Y3JlYXRlKToKKyAgICAgICAg KFdlYktpdExlZ2FjeUJyb3dzZXJXaW5kb3c6OldlYktpdExlZ2FjeUJyb3dzZXJXaW5kb3cpOgor ICAgICAgICAoV2ViS2l0TGVnYWN5QnJvd3NlcldpbmRvdzo6aW5pdCk6CisgICAgICAgIChXZWJL aXRMZWdhY3lCcm93c2VyV2luZG93OjpuYXZpZ2F0ZVRvSGlzdG9yeSk6CisgICAgICAgICogTWlu aUJyb3dzZXIvd2luL1dlYktpdExlZ2FjeUJyb3dzZXJXaW5kb3cuaDogUmVtb3ZlZCBtX3VybEJh clduZC4KKwogMjAxOS0wOC0yMSAgSm9uYXRoYW4gQmVkYXJkICA8amJlZGFyZEBhcHBsZS5jb20+ CiAKICAgICAgICAgcmVzdWx0cy53ZWJraXQub3JnOiBGaXggZHJhd2VyIHN0eWxlCmRpZmYgLS1n aXQgYS9Ub29scy9NaW5pQnJvd3Nlci93aW4vQnJvd3NlcldpbmRvdy5oIGIvVG9vbHMvTWluaUJy b3dzZXIvd2luL0Jyb3dzZXJXaW5kb3cuaAppbmRleCA4ODdkNDY5YjZhNGFjZGMwNzVjZWZjYmNi YzQ0OWZmZTQ3YzYxMTJjLi41NjRkZDZjMjliOTUwYTIxM2Q4M2EzOTdjZjVlZGMxOGFmMTcwZjI5 IDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci93aW4vQnJvd3NlcldpbmRvdy5oCisrKyBi L1Rvb2xzL01pbmlCcm93c2VyL3dpbi9Ccm93c2VyV2luZG93LmgKQEAgLTMyLDYgKzMyLDcgQEAg Y2xhc3MgQnJvd3NlcldpbmRvd0NsaWVudCB7CiBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHBy b2dyZXNzQ2hhbmdlZChkb3VibGUpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgcHJvZ3Jlc3NGaW5p c2hlZCgpID0gMDsKKyAgICB2aXJ0dWFsIHZvaWQgYWN0aXZlVVJMQ2hhbmdlZChzdGQ6OndzdHJp bmcpID0gMDsKIH07CiAKIGNsYXNzIEJyb3dzZXJXaW5kb3cgOiBwdWJsaWMgUmVmQ291bnRlZDxC cm93c2VyV2luZG93PiB7CmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci93aW4vTWFpbldp bmRvdy5jcHAgYi9Ub29scy9NaW5pQnJvd3Nlci93aW4vTWFpbldpbmRvdy5jcHAKaW5kZXggZjg1 ZWRlZWZlZWM5YjQyOGZkMjgwMzAyYWQ2NTg1ZjQyZWE5NGM2Mi4uZmNlNTQ2Mzg5NDU2OTg0YmE2 NzEyNmRkNWZiZjY1MmJhODMzZjc2ZiAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvd2lu L01haW5XaW5kb3cuY3BwCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9NYWluV2luZG93LmNw cApAQCAtMTI1LDcgKzEyNSw3IEBAIGJvb2wgTWFpbldpbmRvdzo6aW5pdChCcm93c2VyV2luZG93 RmFjdG9yeSBmYWN0b3J5LCBISU5TVEFOQ0UgaEluc3RhbmNlLCBib29sIHVzCiAgICAgRGVmRWRp dFByb2MgPSByZWludGVycHJldF9jYXN0PFdORFBST0M+KEdldFdpbmRvd0xvbmdQdHIobV9oVVJM QmFyV25kLCBHV0xQX1dORFBST0MpKTsKICAgICBTZXRXaW5kb3dMb25nUHRyKG1faFVSTEJhcldu ZCwgR1dMUF9XTkRQUk9DLCByZWludGVycHJldF9jYXN0PExPTkdfUFRSPihFZGl0UHJvYykpOwog Ci0gICAgbV9icm93c2VyV2luZG93ID0gZmFjdG9yeSgqdGhpcywgbV9oTWFpblduZCwgbV9oVVJM QmFyV25kLCB1c2VzTGF5ZXJlZFdlYlZpZXcpOworICAgIG1fYnJvd3NlcldpbmRvdyA9IGZhY3Rv cnkoKnRoaXMsIG1faE1haW5XbmQsIHVzZXNMYXllcmVkV2ViVmlldyk7CiAgICAgaWYgKCFtX2Jy b3dzZXJXaW5kb3cpCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICBIUkVTVUxUIGhyID0gbV9i cm93c2VyV2luZG93LT5pbml0KCk7CkBAIC00ODcsMyArNDg3LDggQEAgdm9pZCBNYWluV2luZG93 Ojpwcm9ncmVzc0ZpbmlzaGVkKCkKIHsKICAgICBTZXRXaW5kb3dUZXh0KG1faFByb2dyZXNzSW5k aWNhdG9yLCBMIiIpOwogfQorCit2b2lkIE1haW5XaW5kb3c6OmFjdGl2ZVVSTENoYW5nZWQoc3Rk Ojp3c3RyaW5nIHVybCkKK3sKKyAgICBTZXRXaW5kb3dUZXh0KG1faFVSTEJhclduZCwgdXJsLmNf c3RyKCkpOworfQpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvd2luL01haW5XaW5kb3cu aCBiL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9NYWluV2luZG93LmgKaW5kZXggNjhjOWZlYWEwNzFm ZTY3YmRmNWQzYzJhZGY4MTI4ODgwMjEwZmQ5Yy4uZmJhN2Y2NzBmODk1MzU2M2Q4ZDBkMmI4ZDQy YTYzNmM2NTNmOWQ1ZiAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvd2luL01haW5XaW5k b3cuaAorKysgYi9Ub29scy9NaW5pQnJvd3Nlci93aW4vTWFpbldpbmRvdy5oCkBAIC0zMyw3ICsz Myw3IEBACiAKIGNsYXNzIE1haW5XaW5kb3cgZmluYWwgOiBwdWJsaWMgUmVmQ291bnRlZDxNYWlu V2luZG93PiwgcHVibGljIEJyb3dzZXJXaW5kb3dDbGllbnQgewogcHVibGljOgotICAgIHVzaW5n IEJyb3dzZXJXaW5kb3dGYWN0b3J5ID0gc3RkOjpmdW5jdGlvbjxSZWY8QnJvd3NlcldpbmRvdz4o QnJvd3NlcldpbmRvd0NsaWVudCYsIEhXTkQgbWFpblduZCwgSFdORCB1cmxCYXJXbmQsIGJvb2wg dXNlc0xheWVyZWRXZWJWaWV3KT47CisgICAgdXNpbmcgQnJvd3NlcldpbmRvd0ZhY3RvcnkgPSBz dGQ6OmZ1bmN0aW9uPFJlZjxCcm93c2VyV2luZG93PihCcm93c2VyV2luZG93Q2xpZW50JiwgSFdO RCBtYWluV25kLCBib29sIHVzZXNMYXllcmVkV2ViVmlldyk+OwogCiAgICAgc3RhdGljIFJlZjxN YWluV2luZG93PiBjcmVhdGUoKTsKIApAQCAtNjIsNiArNjIsNyBAQCBwcml2YXRlOgogICAgIC8v IEJyb3dzZXJXaW5kb3dDbGllbnQKICAgICB2b2lkIHByb2dyZXNzQ2hhbmdlZChkb3VibGUpIGZp bmFsOwogICAgIHZvaWQgcHJvZ3Jlc3NGaW5pc2hlZCgpIGZpbmFsOworICAgIHZvaWQgYWN0aXZl VVJMQ2hhbmdlZChzdGQ6OndzdHJpbmcpIGZpbmFsOwogCiAgICAgSFdORCBtX2hNYWluV25kIHsg bnVsbHB0ciB9OwogICAgIEhXTkQgbV9oVVJMQmFyV25kIHsgbnVsbHB0ciB9OwpkaWZmIC0tZ2l0 IGEvVG9vbHMvTWluaUJyb3dzZXIvd2luL01pbmlCcm93c2VyV2ViSG9zdC5jcHAgYi9Ub29scy9N aW5pQnJvd3Nlci93aW4vTWluaUJyb3dzZXJXZWJIb3N0LmNwcAppbmRleCBmNjBiZTU1NTUyNDM0 Zjk1MDg5ZDA0NzkzMmFlYzNiNWZhNTlhMzExLi40YTMyNGZmMTdkZWI4ZGUwNDU5NjhjY2U5YWNm OWMwZWY1ZWUxZGQyIDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci93aW4vTWluaUJyb3dz ZXJXZWJIb3N0LmNwcAorKysgYi9Ub29scy9NaW5pQnJvd3Nlci93aW4vTWluaUJyb3dzZXJXZWJI b3N0LmNwcApAQCAtMzMsNDAgKzMzLDEwIEBACiAjaW5jbHVkZSA8V2ViS2l0TGVnYWN5L1dlYktp dC5oPgogCiB0eXBlZGVmIF9jb21fcHRyX3Q8X2NvbV9JSUlEPElXZWJEYXRhU291cmNlLCAmX191 dWlkb2YoSVdlYkRhdGFTb3VyY2UpPj4gSVdlYkRhdGFTb3VyY2VQdHI7Ci10eXBlZGVmIF9jb21f cHRyX3Q8X2NvbV9JSUlEPElXZWJNdXRhYmxlVVJMUmVxdWVzdCwgJl9fdXVpZG9mKElXZWJNdXRh YmxlVVJMUmVxdWVzdCk+PiBJV2ViTXV0YWJsZVVSTFJlcXVlc3RQdHI7CiAKLUhSRVNVTFQgTWlu aUJyb3dzZXJXZWJIb3N0Ojp1cGRhdGVBZGRyZXNzQmFyKElXZWJWaWV3JiB3ZWJWaWV3KQorSFJF U1VMVCBNaW5pQnJvd3NlcldlYkhvc3Q6OmRpZENvbW1pdExvYWRGb3JGcmFtZShfSW5fb3B0XyBJ V2ViVmlldyogd2ViVmlldywgX0luX29wdF8gSVdlYkZyYW1lKiBmcmFtZSkKIHsKLSAgICBJV2Vi RnJhbWVQdHIgbWFpbkZyYW1lOwotICAgIEhSRVNVTFQgaHIgPSB3ZWJWaWV3Lm1haW5GcmFtZSgm bWFpbkZyYW1lLkdldEludGVyZmFjZVB0cigpKTsKLSAgICBpZiAoRkFJTEVEKGhyKSkKLSAgICAg ICAgcmV0dXJuIGhyOwotCi0gICAgSVdlYkRhdGFTb3VyY2VQdHIgZGF0YVNvdXJjZTsKLSAgICBo ciA9IG1haW5GcmFtZS0+ZGF0YVNvdXJjZSgmZGF0YVNvdXJjZS5HZXRJbnRlcmZhY2VQdHIoKSk7 Ci0gICAgaWYgKEZBSUxFRChocikgfHwgIWRhdGFTb3VyY2UpCi0gICAgICAgIGhyID0gbWFpbkZy YW1lLT5wcm92aXNpb25hbERhdGFTb3VyY2UoJmRhdGFTb3VyY2UuR2V0SW50ZXJmYWNlUHRyKCkp OwotICAgIGlmIChGQUlMRUQoaHIpIHx8ICFkYXRhU291cmNlKQotICAgICAgICByZXR1cm4gaHI7 Ci0KLSAgICBJV2ViTXV0YWJsZVVSTFJlcXVlc3RQdHIgcmVxdWVzdDsKLSAgICBociA9IGRhdGFT b3VyY2UtPnJlcXVlc3QoJnJlcXVlc3QuR2V0SW50ZXJmYWNlUHRyKCkpOwotICAgIGlmIChGQUlM RUQoaHIpIHx8ICFyZXF1ZXN0KQotICAgICAgICByZXR1cm4gaHI7Ci0KLSAgICBfYnN0cl90IGZy YW1lVVJMOwotICAgIGhyID0gcmVxdWVzdC0+bWFpbkRvY3VtZW50VVJMKGZyYW1lVVJMLkdldEFk ZHJlc3MoKSk7Ci0gICAgaWYgKEZBSUxFRChocikpCi0gICAgICAgIHJldHVybiBocjsKLQotICAg IGxvYWRVUkwoZnJhbWVVUkwpOwotCi0gICAgcmV0dXJuIFNfT0s7Ci19Ci0KLXZvaWQgTWluaUJy b3dzZXJXZWJIb3N0Ojpsb2FkVVJMKF9ic3RyX3QmIHVybCkKLXsKLSAgICA6OlNlbmRNZXNzYWdl KG1faFVSTEJhclduZCwgc3RhdGljX2Nhc3Q8VUlOVD4oV01fU0VUVEVYVCksIDAsIHJlaW50ZXJw cmV0X2Nhc3Q8TFBBUkFNPih1cmwuR2V0QlNUUigpKSk7CisgICAgcmV0dXJuIGRpZENoYW5nZUxv Y2F0aW9uV2l0aGluUGFnZUZvckZyYW1lKHdlYlZpZXcsIGZyYW1lKTsKIH0KIAogSFJFU1VMVCBN aW5pQnJvd3NlcldlYkhvc3Q6OmRpZEZhaWxQcm92aXNpb25hbExvYWRXaXRoRXJyb3IoX0luX29w dF8gSVdlYlZpZXcqLCBfSW5fb3B0XyBJV2ViRXJyb3IgKmVycm9yLCBfSW5fb3B0XyBJV2ViRnJh bWUqKQpAQCAtODQsNiArNTQsMjUgQEAgSFJFU1VMVCBNaW5pQnJvd3NlcldlYkhvc3Q6OmRpZEZh aWxQcm92aXNpb25hbExvYWRXaXRoRXJyb3IoX0luX29wdF8gSVdlYlZpZXcqLAogICAgIHJldHVy biBTX09LOwogfQogCitIUkVTVUxUIE1pbmlCcm93c2VyV2ViSG9zdDo6ZGlkQ2hhbmdlTG9jYXRp b25XaXRoaW5QYWdlRm9yRnJhbWUoX0luX29wdF8gSVdlYlZpZXcqIHdlYlZpZXcsIF9Jbl9vcHRf IElXZWJGcmFtZSogZnJhbWUpCit7CisgICAgSVdlYkZyYW1lMlB0ciBmcmFtZTIoZnJhbWUpOwor ICAgIGlmICghZnJhbWUyKQorICAgICAgICByZXR1cm4gRV9OT0lOVEVSRkFDRTsKKyAgICBCT09M IGlzTWFpbkZyYW1lOworICAgIEhSRVNVTFQgaHIgPSBmcmFtZTItPmlzTWFpbkZyYW1lKCZpc01h aW5GcmFtZSk7CisgICAgaWYgKEZBSUxFRChocikpCisgICAgICAgIHJldHVybiBocjsKKyAgICBp ZiAoIWlzTWFpbkZyYW1lKQorICAgICAgICByZXR1cm4gU19PSzsKKyAgICBfYnN0cl90IHVybDsK KyAgICBociA9IHdlYlZpZXctPm1haW5GcmFtZVVSTCh1cmwuR2V0QWRkcmVzcygpKTsKKyAgICBp ZiAoRkFJTEVEKGhyKSkKKyAgICAgICAgcmV0dXJuIGhyOworICAgIG1fY2xpZW50LT5tX2NsaWVu dC5hY3RpdmVVUkxDaGFuZ2VkKHVybC5HZXRCU1RSKCkpOworICAgIHJldHVybiBTX09LOworfQor CiBIUkVTVUxUIE1pbmlCcm93c2VyV2ViSG9zdDo6UXVlcnlJbnRlcmZhY2UoX0luXyBSRUZJSUQg cmlpZCwgX0NPTV9PdXRwdHJfIHZvaWQqKiBwcHZPYmplY3QpCiB7CiAgICAgaWYgKCFwcHZPYmpl Y3QpCkBAIC0xMTAsOCArOTksNiBAQCBVTE9ORyBNaW5pQnJvd3NlcldlYkhvc3Q6OlJlbGVhc2Uo KQogICAgIHJldHVybiBtX2NsaWVudC0+UmVsZWFzZSgpOwogfQogCi10eXBlZGVmIF9jb21fcHRy X3Q8X2NvbV9JSUlEPElXZWJGcmFtZTIsICZfX3V1aWRvZihJV2ViRnJhbWUyKT4+IElXZWJGcmFt ZTJQdHI7Ci0KIEhSRVNVTFQgTWluaUJyb3dzZXJXZWJIb3N0OjpkaWRGaW5pc2hMb2FkRm9yRnJh bWUoX0luX29wdF8gSVdlYlZpZXcqIHdlYlZpZXcsIF9Jbl9vcHRfIElXZWJGcmFtZSogZnJhbWUp CiB7CiAgICAgaWYgKCFmcmFtZSB8fCAhd2ViVmlldykKZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlC cm93c2VyL3dpbi9NaW5pQnJvd3NlcldlYkhvc3QuaCBiL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9N aW5pQnJvd3NlcldlYkhvc3QuaAppbmRleCBlZDJlNDc4YmU0MTNhODgzMjA5NTg1NmZlYTIyNDY0 YWI4ZWQ4ZTUwLi43MmU5OWRlYzNmMjNlOTdkNDc1Y2NjZmEwYjcwMzgyNmFmMWRiOWU0IDEwMDY0 NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci93aW4vTWluaUJyb3dzZXJXZWJIb3N0LmgKKysrIGIv VG9vbHMvTWluaUJyb3dzZXIvd2luL01pbmlCcm93c2VyV2ViSG9zdC5oCkBAIC0zMyw4ICszMyw4 IEBAIGNsYXNzIFdlYktpdExlZ2FjeUJyb3dzZXJXaW5kb3c7CiAKIGNsYXNzIE1pbmlCcm93c2Vy V2ViSG9zdCA6IHB1YmxpYyBJV2ViRnJhbWVMb2FkRGVsZWdhdGUsIHB1YmxpYyBJV2ViRnJhbWVM b2FkRGVsZWdhdGVQcml2YXRlLCBwdWJsaWMgSVdlYk5vdGlmaWNhdGlvbk9ic2VydmVyIHsKIHB1 YmxpYzoKLSAgICBNaW5pQnJvd3NlcldlYkhvc3QoV2ViS2l0TGVnYWN5QnJvd3NlcldpbmRvdyog Y2xpZW50LCBIV05EIHVybEJhcikKLSAgICAgICAgOiBtX2NsaWVudChjbGllbnQpLCBtX2hVUkxC YXJXbmQodXJsQmFyKSB7IH0KKyAgICBNaW5pQnJvd3NlcldlYkhvc3QoV2ViS2l0TGVnYWN5QnJv d3NlcldpbmRvdyogY2xpZW50KQorICAgICAgICA6IG1fY2xpZW50KGNsaWVudCkgeyB9CiAKICAg ICAvLyBJVW5rbm93bgogICAgIHZpcnR1YWwgSFJFU1VMVCBTVERNRVRIT0RDQUxMVFlQRSBRdWVy eUludGVyZmFjZShfSW5fIFJFRklJRCByaWlkLCBfQ09NX091dHB0cl8gdm9pZCoqIHBwdk9iamVj dCk7CkBAIC00NSwyMCArNDUsMTMgQEAgcHVibGljOgogICAgIHZpcnR1YWwgSFJFU1VMVCBTVERN RVRIT0RDQUxMVFlQRSBkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKF9Jbl9vcHRfIElX ZWJWaWV3KiwgX0luX29wdF8gSVdlYkZyYW1lKik7CiAgICAgdmlydHVhbCBIUkVTVUxUIFNURE1F VEhPRENBTExUWVBFIGRpZFJlY2VpdmVTZXJ2ZXJSZWRpcmVjdEZvclByb3Zpc2lvbmFsTG9hZEZv ckZyYW1lKF9Jbl9vcHRfIElXZWJWaWV3KiwgX0luX29wdF8gSVdlYkZyYW1lKikgeyByZXR1cm4g U19PSzsgfQogICAgIHZpcnR1YWwgSFJFU1VMVCBTVERNRVRIT0RDQUxMVFlQRSBkaWRGYWlsUHJv dmlzaW9uYWxMb2FkV2l0aEVycm9yKF9Jbl9vcHRfIElXZWJWaWV3KiwgX0luX29wdF8gSVdlYkVy cm9yKiwgX0luX29wdF8gSVdlYkZyYW1lKik7Ci0gICAgdmlydHVhbCBIUkVTVUxUIFNURE1FVEhP RENBTExUWVBFIGRpZENvbW1pdExvYWRGb3JGcmFtZShfSW5fb3B0XyBJV2ViVmlldyogd2ViVmll dywgX0luX29wdF8gSVdlYkZyYW1lKikKLSAgICB7Ci0gICAgICAgIGlmICghd2ViVmlldykKLSAg ICAgICAgICAgIHJldHVybiBFX1BPSU5URVI7Ci0KLSAgICAgICAgcmV0dXJuIHVwZGF0ZUFkZHJl c3NCYXIoKndlYlZpZXcpOwotICAgIH0KLSAgICAKKyAgICB2aXJ0dWFsIEhSRVNVTFQgU1RETUVU SE9EQ0FMTFRZUEUgZGlkQ29tbWl0TG9hZEZvckZyYW1lKF9Jbl9vcHRfIElXZWJWaWV3KiwgX0lu X29wdF8gSVdlYkZyYW1lKik7CiAgICAgdmlydHVhbCBIUkVTVUxUIFNURE1FVEhPRENBTExUWVBF IGRpZFJlY2VpdmVUaXRsZShfSW5fb3B0XyBJV2ViVmlldyosIF9Jbl8gQlNUUiB0aXRsZSwgX0lu X29wdF8gSVdlYkZyYW1lKikgeyByZXR1cm4gU19PSzsgfQogICAgIHZpcnR1YWwgSFJFU1VMVCBT VERNRVRIT0RDQUxMVFlQRSBkaWRDaGFuZ2VJY29ucyhfSW5fb3B0XyBJV2ViVmlldyosIF9Jbl9v cHRfIElXZWJGcmFtZSopIHsgcmV0dXJuIFNfT0s7IH0KICAgICB2aXJ0dWFsIEhSRVNVTFQgU1RE TUVUSE9EQ0FMTFRZUEUgZGlkUmVjZWl2ZUljb24oX0luX29wdF8gSVdlYlZpZXcqLCBfSW5fIEhC SVRNQVAsIF9Jbl9vcHRfIElXZWJGcmFtZSopIHsgcmV0dXJuIFNfT0s7IH0KICAgICB2aXJ0dWFs IEhSRVNVTFQgU1RETUVUSE9EQ0FMTFRZUEUgZGlkRmluaXNoTG9hZEZvckZyYW1lKF9Jbl9vcHRf IElXZWJWaWV3KiwgX0luX29wdF8gSVdlYkZyYW1lKik7CiAgICAgdmlydHVhbCBIUkVTVUxUIFNU RE1FVEhPRENBTExUWVBFIGRpZEZhaWxMb2FkV2l0aEVycm9yKF9Jbl9vcHRfIElXZWJWaWV3Kiwg X0luX29wdF8gSVdlYkVycm9yKiwgX0luX29wdF8gSVdlYkZyYW1lKik7Ci0gICAgdmlydHVhbCBI UkVTVUxUIFNURE1FVEhPRENBTExUWVBFIGRpZENoYW5nZUxvY2F0aW9uV2l0aGluUGFnZUZvckZy YW1lKF9Jbl9vcHRfIElXZWJWaWV3KiwgX0luX29wdF8gSVdlYkZyYW1lKikgeyByZXR1cm4gU19P SzsgfQorICAgIHZpcnR1YWwgSFJFU1VMVCBTVERNRVRIT0RDQUxMVFlQRSBkaWRDaGFuZ2VMb2Nh dGlvbldpdGhpblBhZ2VGb3JGcmFtZShfSW5fb3B0XyBJV2ViVmlldyosIF9Jbl9vcHRfIElXZWJG cmFtZSopOwogICAgIHZpcnR1YWwgSFJFU1VMVCBTVERNRVRIT0RDQUxMVFlQRSB3aWxsUGVyZm9y bUNsaWVudFJlZGlyZWN0VG9VUkwoX0luX29wdF8gSVdlYlZpZXcqLCBfSW5fIEJTVFIgdXJsLCBk b3VibGUgZGVsYXlTZWNvbmRzLCBEQVRFIGZpcmVEYXRlLCBfSW5fb3B0XyBJV2ViRnJhbWUqKSB7 IHJldHVybiBTX09LOyB9CiAgICAgdmlydHVhbCBIUkVTVUxUIFNURE1FVEhPRENBTExUWVBFIGRp ZENhbmNlbENsaWVudFJlZGlyZWN0Rm9yRnJhbWUoX0luX29wdF8gSVdlYlZpZXcqLCBfSW5fb3B0 XyBJV2ViRnJhbWUqKSB7IHJldHVybiBTX09LOyB9CiAgICAgdmlydHVhbCBIUkVTVUxUIFNURE1F VEhPRENBTExUWVBFIHdpbGxDbG9zZUZyYW1lKF9Jbl9vcHRfIElXZWJWaWV3KiwgX0luX29wdF8g SVdlYkZyYW1lKikgeyByZXR1cm4gU19PSzsgfQpAQCAtNzQsMTIgKzY3LDYgQEAgcHVibGljOgog ICAgIC8vIElXZWJOb3RpZmljYXRpb25PYnNlcnZlcgogICAgIHZpcnR1YWwgSFJFU1VMVCBTVERN RVRIT0RDQUxMVFlQRSBvbk5vdGlmeShfSW5fb3B0XyBJV2ViTm90aWZpY2F0aW9uKik7CiAKLSAg ICB2b2lkIGxvYWRVUkwoX2JzdHJfdCYpOwotCi1wcm90ZWN0ZWQ6Ci0gICAgSFJFU1VMVCB1cGRh dGVBZGRyZXNzQmFyKElXZWJWaWV3Jik7Ci0KIHByaXZhdGU6CiAgICAgV2ViS2l0TGVnYWN5QnJv d3NlcldpbmRvdyogbV9jbGllbnQgeyBudWxscHRyIH07Ci0gICAgSFdORCBtX2hVUkxCYXJXbmQg eyAwIH07CiB9OwpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvd2luL1ByaW50V2ViVUlE ZWxlZ2F0ZS5jcHAgYi9Ub29scy9NaW5pQnJvd3Nlci93aW4vUHJpbnRXZWJVSURlbGVnYXRlLmNw cAppbmRleCBjZWQyNTE0OTdiOGQ4NDAzNzYxNWRmOThhYzZhMTNhMGFkNmYxNTQ5Li5jNzg2ZGI1 YjkwMDhkOWQ2NDgxNjhhODAxOGViMGZjOThlMGRjMWQ5IDEwMDY0NAotLS0gYS9Ub29scy9NaW5p QnJvd3Nlci93aW4vUHJpbnRXZWJVSURlbGVnYXRlLmNwcAorKysgYi9Ub29scy9NaW5pQnJvd3Nl ci93aW4vUHJpbnRXZWJVSURlbGVnYXRlLmNwcApAQCAtMTU5LDkgKzE1OSw2IEBAIFVMT05HIFBy aW50V2ViVUlEZWxlZ2F0ZTo6UmVsZWFzZSgpCiAgICAgcmV0dXJuIG1fY2xpZW50LlJlbGVhc2Uo KTsKIH0KIAotdHlwZWRlZiBfY29tX3B0cl90PF9jb21fSUlJRDxJV2ViRnJhbWUsICZfX3V1aWRv ZihJV2ViRnJhbWUpPj4gSVdlYkZyYW1lUHRyOwotdHlwZWRlZiBfY29tX3B0cl90PF9jb21fSUlJ RDxJV2ViRnJhbWVQcml2YXRlLCAmX191dWlkb2YoSVdlYkZyYW1lUHJpdmF0ZSk+PiBJV2ViRnJh bWVQcml2YXRlUHRyOwotCiBIUkVTVUxUIFByaW50V2ViVUlEZWxlZ2F0ZTo6d2ViVmlld1ByaW50 aW5nTWFyZ2luUmVjdChfSW5fb3B0XyBJV2ViVmlldyogdmlldywgX091dF8gUkVDVCogcmVjdCkK IHsKICAgICBpZiAoIXZpZXcgfHwgIXJlY3QpCmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nl ci93aW4vV2ViS2l0QnJvd3NlcldpbmRvdy5jcHAgYi9Ub29scy9NaW5pQnJvd3Nlci93aW4vV2Vi S2l0QnJvd3NlcldpbmRvdy5jcHAKaW5kZXggZTQxYWQ3NjU3Y2E4NmQ1MGJmYWJiZTliYjE3NGMz OTY1ZmNlN2ZjNC4uMmRlNzY2ZDNhMmIyYjQyZjY1NGU3ZGIyMTAzOGUzM2EyYmY0YjFiNiAxMDA2 NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvd2luL1dlYktpdEJyb3dzZXJXaW5kb3cuY3BwCisr KyBiL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9XZWJLaXRCcm93c2VyV2luZG93LmNwcApAQCAtMTA0 LDcgKzEwNCw3IEBAIFdLUmV0YWluUHRyPFdLVVJMUmVmPiBjcmVhdGVXS1VSTChjb25zdCBzdGQ6 OndzdHJpbmcmIHN0cikKICAgICByZXR1cm4gYWRvcHRXSyhXS1VSTENyZWF0ZVdpdGhVVEY4Q1N0 cmluZyh1dGY4LmRhdGEoKSkpOwogfQogCi1SZWY8QnJvd3NlcldpbmRvdz4gV2ViS2l0QnJvd3Nl cldpbmRvdzo6Y3JlYXRlKEJyb3dzZXJXaW5kb3dDbGllbnQmIGNsaWVudCwgSFdORCBtYWluV25k LCBIV05EIHVybEJhclduZCwgYm9vbCkKK1JlZjxCcm93c2VyV2luZG93PiBXZWJLaXRCcm93c2Vy V2luZG93OjpjcmVhdGUoQnJvd3NlcldpbmRvd0NsaWVudCYgY2xpZW50LCBIV05EIG1haW5XbmQs IGJvb2wpCiB7CiAgICAgYXV0byBjb25mID0gYWRvcHRXSyhXS1BhZ2VDb25maWd1cmF0aW9uQ3Jl YXRlKCkpOwogCkBAIC0xMjEsMTMgKzEyMSwxMiBAQCBSZWY8QnJvd3NlcldpbmRvdz4gV2ViS2l0 QnJvd3NlcldpbmRvdzo6Y3JlYXRlKEJyb3dzZXJXaW5kb3dDbGllbnQmIGNsaWVudCwgSFdORAog ICAgIGF1dG8gY29udGV4dCA9YWRvcHRXSyhXS0NvbnRleHRDcmVhdGVXaXRoQ29uZmlndXJhdGlv bihudWxscHRyKSk7CiAgICAgV0tQYWdlQ29uZmlndXJhdGlvblNldENvbnRleHQoY29uZi5nZXQo KSwgY29udGV4dC5nZXQoKSk7CiAKLSAgICByZXR1cm4gYWRvcHRSZWYoKm5ldyBXZWJLaXRCcm93 c2VyV2luZG93KGNsaWVudCwgY29uZi5nZXQoKSwgbWFpblduZCwgdXJsQmFyV25kKSk7CisgICAg cmV0dXJuIGFkb3B0UmVmKCpuZXcgV2ViS2l0QnJvd3NlcldpbmRvdyhjbGllbnQsIGNvbmYuZ2V0 KCksIG1haW5XbmQpKTsKIH0KIAotV2ViS2l0QnJvd3NlcldpbmRvdzo6V2ViS2l0QnJvd3Nlcldp bmRvdyhCcm93c2VyV2luZG93Q2xpZW50JiBjbGllbnQsIFdLUGFnZUNvbmZpZ3VyYXRpb25SZWYg Y29uZiwgSFdORCBtYWluV25kLCBIV05EIHVybEJhclduZCkKK1dlYktpdEJyb3dzZXJXaW5kb3c6 OldlYktpdEJyb3dzZXJXaW5kb3coQnJvd3NlcldpbmRvd0NsaWVudCYgY2xpZW50LCBXS1BhZ2VD b25maWd1cmF0aW9uUmVmIGNvbmYsIEhXTkQgbWFpblduZCkKICAgICA6IG1fY2xpZW50KGNsaWVu dCkKICAgICAsIG1faE1haW5XbmQobWFpblduZCkKLSAgICAsIG1fdXJsQmFyV25kKHVybEJhcldu ZCkKIHsKICAgICBSRUNUIHJlY3QgPSB7IH07CiAgICAgbV92aWV3ID0gYWRvcHRXSyhXS1ZpZXdD cmVhdGUocmVjdCwgY29uZiwgbWFpblduZCkpOwpAQCAtMTM4LDcgKzEzNyw2IEBAIFdlYktpdEJy b3dzZXJXaW5kb3c6OldlYktpdEJyb3dzZXJXaW5kb3coQnJvd3NlcldpbmRvd0NsaWVudCYgY2xp ZW50LCBXS1BhZ2VDb25mCiAgICAgV0tQYWdlTmF2aWdhdGlvbkNsaWVudFYwIG5hdmlnYXRpb25D bGllbnQgPSB7IH07CiAgICAgbmF2aWdhdGlvbkNsaWVudC5iYXNlLnZlcnNpb24gPSAwOwogICAg IG5hdmlnYXRpb25DbGllbnQuYmFzZS5jbGllbnRJbmZvID0gdGhpczsKLSAgICBuYXZpZ2F0aW9u Q2xpZW50LmRpZENvbW1pdE5hdmlnYXRpb24gPSBkaWRDb21taXROYXZpZ2F0aW9uOwogICAgIG5h dmlnYXRpb25DbGllbnQuZGlkUmVjZWl2ZUF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlID0gZGlkUmVj ZWl2ZUF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlOwogICAgIFdLUGFnZVNldFBhZ2VOYXZpZ2F0aW9u Q2xpZW50KHBhZ2UsICZuYXZpZ2F0aW9uQ2xpZW50LmJhc2UpOwogCkBAIC0xNTUsNiArMTUzLDcg QEAgV2ViS2l0QnJvd3NlcldpbmRvdzo6V2ViS2l0QnJvd3NlcldpbmRvdyhCcm93c2VyV2luZG93 Q2xpZW50JiBjbGllbnQsIFdLUGFnZUNvbmYKICAgICBzdGF0ZUNsaWVudC5kaWRDaGFuZ2VUaXRs ZSA9IGRpZENoYW5nZVRpdGxlOwogICAgIHN0YXRlQ2xpZW50LmRpZENoYW5nZUlzTG9hZGluZyA9 IGRpZENoYW5nZUlzTG9hZGluZzsKICAgICBzdGF0ZUNsaWVudC5kaWRDaGFuZ2VFc3RpbWF0ZWRQ cm9ncmVzcyA9IGRpZENoYW5nZUVzdGltYXRlZFByb2dyZXNzOworICAgIHN0YXRlQ2xpZW50LmRp ZENoYW5nZUFjdGl2ZVVSTCA9IGRpZENoYW5nZUFjdGl2ZVVSTDsKICAgICBXS1BhZ2VTZXRQYWdl U3RhdGVDbGllbnQocGFnZSwgJnN0YXRlQ2xpZW50LmJhc2UpOwogCiAgICAgdXBkYXRlUHJveHlT ZXR0aW5ncygpOwpAQCAtMzE0LDcgKzMxMyw2IEBAIHZvaWQgV2ViS2l0QnJvd3NlcldpbmRvdzo6 ZGlkQ2hhbmdlVGl0bGUoY29uc3Qgdm9pZCogY2xpZW50SW5mbykKIHZvaWQgV2ViS2l0QnJvd3Nl cldpbmRvdzo6ZGlkQ2hhbmdlSXNMb2FkaW5nKGNvbnN0IHZvaWQqIGNsaWVudEluZm8pCiB7CiAg ICAgYXV0byYgdGhpc1dpbmRvdyA9IHRvV2ViS2l0QnJvd3NlcldpbmRvdyhjbGllbnRJbmZvKTsK LSAgICBhdXRvIHBhZ2UgPSBXS1ZpZXdHZXRQYWdlKHRoaXNXaW5kb3cubV92aWV3LmdldCgpKTsK ICAgICB0aGlzV2luZG93Lm1fY2xpZW50LnByb2dyZXNzRmluaXNoZWQoKTsKIH0KIApAQCAtMzI1 LDEzICszMjMsMTIgQEAgdm9pZCBXZWJLaXRCcm93c2VyV2luZG93OjpkaWRDaGFuZ2VFc3RpbWF0 ZWRQcm9ncmVzcyhjb25zdCB2b2lkKiBjbGllbnRJbmZvKQogICAgIHRoaXNXaW5kb3cubV9jbGll bnQucHJvZ3Jlc3NDaGFuZ2VkKFdLUGFnZUdldEVzdGltYXRlZFByb2dyZXNzKHBhZ2UpKTsKIH0K IAotdm9pZCBXZWJLaXRCcm93c2VyV2luZG93OjpkaWRDb21taXROYXZpZ2F0aW9uKFdLUGFnZVJl ZiBwYWdlLCBXS05hdmlnYXRpb25SZWYgbmF2aWdhdGlvbiwgV0tUeXBlUmVmIHVzZXJEYXRhLCBj b25zdCB2b2lkKiBjbGllbnRJbmZvKQordm9pZCBXZWJLaXRCcm93c2VyV2luZG93OjpkaWRDaGFu Z2VBY3RpdmVVUkwoY29uc3Qgdm9pZCogY2xpZW50SW5mbykKIHsKICAgICBhdXRvJiB0aGlzV2lu ZG93ID0gdG9XZWJLaXRCcm93c2VyV2luZG93KGNsaWVudEluZm8pOwotCi0gICAgV0tSZXRhaW5Q dHI8V0tVUkxSZWY+IHdrdXJsID0gYWRvcHRXSyhXS1BhZ2VDb3B5Q29tbWl0dGVkVVJMKHBhZ2Up KTsKLSAgICBzdGQ6OndzdHJpbmcgdXJsU3RyaW5nID0gY3JlYXRlU3RyaW5nKHdrdXJsLmdldCgp KTsKLSAgICBTZXRXaW5kb3dUZXh0KHRoaXNXaW5kb3cubV91cmxCYXJXbmQsIHVybFN0cmluZy5j X3N0cigpKTsKKyAgICBhdXRvIHBhZ2UgPSBXS1ZpZXdHZXRQYWdlKHRoaXNXaW5kb3cubV92aWV3 LmdldCgpKTsKKyAgICBXS1JldGFpblB0cjxXS1VSTFJlZj4gdXJsID0gYWRvcHRXSyhXS1BhZ2VD b3B5QWN0aXZlVVJMKHBhZ2UpKTsKKyAgICB0aGlzV2luZG93Lm1fY2xpZW50LmFjdGl2ZVVSTENo YW5nZWQoY3JlYXRlU3RyaW5nKHVybC5nZXQoKSkpOwogfQogCiB2b2lkIFdlYktpdEJyb3dzZXJX aW5kb3c6OmRpZFJlY2VpdmVBdXRoZW50aWNhdGlvbkNoYWxsZW5nZShXS1BhZ2VSZWYgcGFnZSwg V0tBdXRoZW50aWNhdGlvbkNoYWxsZW5nZVJlZiBjaGFsbGVuZ2UsIGNvbnN0IHZvaWQqIGNsaWVu dEluZm8pCkBAIC0zODQsOCArMzgxLDggQEAgYm9vbCBXZWJLaXRCcm93c2VyV2luZG93OjpjYW5U cnVzdFNlcnZlckNlcnRpZmljYXRlKFdLUHJvdGVjdGlvblNwYWNlUmVmIHByb3RlY3QKIFdLUGFn ZVJlZiBXZWJLaXRCcm93c2VyV2luZG93OjpjcmVhdGVOZXdQYWdlKFdLUGFnZVJlZiBwYWdlLCBX S1BhZ2VDb25maWd1cmF0aW9uUmVmIGNvbmZpZ3VyYXRpb24sIFdLTmF2aWdhdGlvbkFjdGlvblJl ZiBuYXZpZ2F0aW9uQWN0aW9uLCBXS1dpbmRvd0ZlYXR1cmVzUmVmIHdpbmRvd0ZlYXR1cmVzLCBj b25zdCB2b2lkICpjbGllbnRJbmZvKQogewogICAgIGF1dG8mIG5ld1dpbmRvdyA9IE1haW5XaW5k b3c6OmNyZWF0ZSgpLmxlYWtSZWYoKTsKLSAgICBhdXRvIGZhY3RvcnkgPSBbY29uZmlndXJhdGlv bl0oQnJvd3NlcldpbmRvd0NsaWVudCYgY2xpZW50LCBIV05EIG1haW5XbmQsIEhXTkQgdXJsQmFy V25kLCBib29sKSAtPiBhdXRvIHsKLSAgICAgICAgcmV0dXJuIGFkb3B0UmVmKCpuZXcgV2ViS2l0 QnJvd3NlcldpbmRvdyhjbGllbnQsIGNvbmZpZ3VyYXRpb24sIG1haW5XbmQsIHVybEJhclduZCkp OworICAgIGF1dG8gZmFjdG9yeSA9IFtjb25maWd1cmF0aW9uXShCcm93c2VyV2luZG93Q2xpZW50 JiBjbGllbnQsIEhXTkQgbWFpblduZCwgYm9vbCkgLT4gYXV0byB7CisgICAgICAgIHJldHVybiBh ZG9wdFJlZigqbmV3IFdlYktpdEJyb3dzZXJXaW5kb3coY2xpZW50LCBjb25maWd1cmF0aW9uLCBt YWluV25kKSk7CiAgICAgfTsKICAgICBib29sIG9rID0gbmV3V2luZG93LmluaXQoZmFjdG9yeSwg aEluc3QpOwogICAgIGlmICghb2spCmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci93aW4v V2ViS2l0QnJvd3NlcldpbmRvdy5oIGIvVG9vbHMvTWluaUJyb3dzZXIvd2luL1dlYktpdEJyb3dz ZXJXaW5kb3cuaAppbmRleCAwYzk1MWE1NDFlYTAzNDYxZTlmMDRiYjhlODgzZGJkNTFmZDViYjMy Li5lOGVmZTNjMjgzOGE5YmI1NTNhMWM1OWZmNmMxZmIyNWQyZjk2NTAwIDEwMDY0NAotLS0gYS9U b29scy9NaW5pQnJvd3Nlci93aW4vV2ViS2l0QnJvd3NlcldpbmRvdy5oCisrKyBiL1Rvb2xzL01p bmlCcm93c2VyL3dpbi9XZWJLaXRCcm93c2VyV2luZG93LmgKQEAgLTMzLDEwICszMywxMCBAQAog CiBjbGFzcyBXZWJLaXRCcm93c2VyV2luZG93IDogcHVibGljIEJyb3dzZXJXaW5kb3cgewogcHVi bGljOgotICAgIHN0YXRpYyBSZWY8QnJvd3NlcldpbmRvdz4gY3JlYXRlKEJyb3dzZXJXaW5kb3dD bGllbnQmLCBIV05EIG1haW5XbmQsIEhXTkQgdXJsQmFyV25kLCBib29sIHVzZUxheWVyZWRXZWJW aWV3ID0gZmFsc2UpOworICAgIHN0YXRpYyBSZWY8QnJvd3NlcldpbmRvdz4gY3JlYXRlKEJyb3dz ZXJXaW5kb3dDbGllbnQmLCBIV05EIG1haW5XbmQsIGJvb2wgdXNlTGF5ZXJlZFdlYlZpZXcgPSBm YWxzZSk7CiAKIHByaXZhdGU6Ci0gICAgV2ViS2l0QnJvd3NlcldpbmRvdyhCcm93c2VyV2luZG93 Q2xpZW50JiwgV0tQYWdlQ29uZmlndXJhdGlvblJlZiwgSFdORCBtYWluV25kLCBIV05EIHVybEJh clduZCk7CisgICAgV2ViS2l0QnJvd3NlcldpbmRvdyhCcm93c2VyV2luZG93Q2xpZW50JiwgV0tQ YWdlQ29uZmlndXJhdGlvblJlZiwgSFdORCBtYWluV25kKTsKIAogICAgIEhSRVNVTFQgaW5pdCgp IG92ZXJyaWRlOwogICAgIEhXTkQgaHduZCgpIG92ZXJyaWRlOwpAQCAtNjgsNyArNjgsNyBAQCBw cml2YXRlOgogICAgIHN0YXRpYyB2b2lkIGRpZENoYW5nZVRpdGxlKGNvbnN0IHZvaWQqKTsKICAg ICBzdGF0aWMgdm9pZCBkaWRDaGFuZ2VJc0xvYWRpbmcoY29uc3Qgdm9pZCopOwogICAgIHN0YXRp YyB2b2lkIGRpZENoYW5nZUVzdGltYXRlZFByb2dyZXNzKGNvbnN0IHZvaWQqKTsKLSAgICBzdGF0 aWMgdm9pZCBkaWRDb21taXROYXZpZ2F0aW9uKFdLUGFnZVJlZiwgV0tOYXZpZ2F0aW9uUmVmLCBX S1R5cGVSZWYsIGNvbnN0IHZvaWQqKTsKKyAgICBzdGF0aWMgdm9pZCBkaWRDaGFuZ2VBY3RpdmVV UkwoY29uc3Qgdm9pZCopOwogICAgIHN0YXRpYyB2b2lkIGRpZFJlY2VpdmVBdXRoZW50aWNhdGlv bkNoYWxsZW5nZShXS1BhZ2VSZWYsIFdLQXV0aGVudGljYXRpb25DaGFsbGVuZ2VSZWYsIGNvbnN0 IHZvaWQqKTsKICAgICBzdGF0aWMgV0tQYWdlUmVmIGNyZWF0ZU5ld1BhZ2UoV0tQYWdlUmVmLCBX S1BhZ2VDb25maWd1cmF0aW9uUmVmLCBXS05hdmlnYXRpb25BY3Rpb25SZWYsIFdLV2luZG93RmVh dHVyZXNSZWYsIGNvbnN0IHZvaWQgKik7CiAgICAgc3RhdGljIHZvaWQgZGlkTm90SGFuZGxlS2V5 RXZlbnQoV0tQYWdlUmVmLCBXS05hdGl2ZUV2ZW50UHRyLCBjb25zdCB2b2lkKik7CkBAIC03Niw3 ICs3Niw2IEBAIHByaXZhdGU6CiAgICAgQnJvd3NlcldpbmRvd0NsaWVudCYgbV9jbGllbnQ7CiAg ICAgV0tSZXRhaW5QdHI8V0tWaWV3UmVmPiBtX3ZpZXc7CiAgICAgSFdORCBtX2hNYWluV25kIHsg bnVsbHB0ciB9OwotICAgIEhXTkQgbV91cmxCYXJXbmQgeyBudWxscHRyIH07CiAgICAgUHJveHlT ZXR0aW5ncyBtX3Byb3h5IHsgfTsKICAgICBzdGQ6OnVub3JkZXJlZF9tYXA8c3RkOjp3c3RyaW5n LCBzdGQ6OndzdHJpbmc+IG1fYWNjZXB0ZWRTZXJ2ZXJUcnVzdENlcnRzOwogfTsKZGlmZiAtLWdp dCBhL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9XZWJLaXRMZWdhY3lCcm93c2VyV2luZG93LmNwcCBi L1Rvb2xzL01pbmlCcm93c2VyL3dpbi9XZWJLaXRMZWdhY3lCcm93c2VyV2luZG93LmNwcAppbmRl eCBhNDk4YThjNTVlNmIzYjdjMjQzNTVmNGU1ZDI0YmY2ZGJhZmMyYjUzLi4zMDkwYmRiZTNiODZi ODhlNTVjN2NjNzM0Y2Q1ZmVkZjg4YmMxY2QzIDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nl ci93aW4vV2ViS2l0TGVnYWN5QnJvd3NlcldpbmRvdy5jcHAKKysrIGIvVG9vbHMvTWluaUJyb3dz ZXIvd2luL1dlYktpdExlZ2FjeUJyb3dzZXJXaW5kb3cuY3BwCkBAIC01NywyMCArNTcsMTQgQEAg ZmxvYXQgZGV2aWNlU2NhbGVGYWN0b3JGb3JXaW5kb3coSFdORCk7CiAKIHN0YXRpYyBjb25zdCBp bnQgbWF4SGlzdG9yeVNpemUgPSAxMDsKIAotdHlwZWRlZiBfY29tX3B0cl90PF9jb21fSUlJRDxJ V2ViTXV0YWJsZVVSTFJlcXVlc3QsICZfX3V1aWRvZihJV2ViTXV0YWJsZVVSTFJlcXVlc3QpPj4g SVdlYk11dGFibGVVUkxSZXF1ZXN0UHRyOwotdHlwZWRlZiBfY29tX3B0cl90PF9jb21fSUlJRDxJ V2ViTm90aWZpY2F0aW9uT2JzZXJ2ZXIsICZfX3V1aWRvZihJV2ViTm90aWZpY2F0aW9uT2JzZXJ2 ZXIpPj4gSVdlYk5vdGlmaWNhdGlvbk9ic2VydmVyUHRyOwotdHlwZWRlZiBfY29tX3B0cl90PF9j b21fSUlJRDxJV2ViTm90aWZpY2F0aW9uQ2VudGVyLCAmX191dWlkb2YoSVdlYk5vdGlmaWNhdGlv bkNlbnRlcik+PiBJV2ViTm90aWZpY2F0aW9uQ2VudGVyUHRyOwotCi0KLVJlZjxCcm93c2VyV2lu ZG93PiBXZWJLaXRMZWdhY3lCcm93c2VyV2luZG93OjpjcmVhdGUoQnJvd3NlcldpbmRvd0NsaWVu dCYgY2xpZW50LCBIV05EIG1haW5XbmQsIEhXTkQgdXJsQmFyV25kLCBib29sIHVzZUxheWVyZWRX ZWJWaWV3KQorUmVmPEJyb3dzZXJXaW5kb3c+IFdlYktpdExlZ2FjeUJyb3dzZXJXaW5kb3c6OmNy ZWF0ZShCcm93c2VyV2luZG93Q2xpZW50JiBjbGllbnQsIEhXTkQgbWFpblduZCwgYm9vbCB1c2VM YXllcmVkV2ViVmlldykKIHsKLSAgICByZXR1cm4gYWRvcHRSZWYoKm5ldyBXZWJLaXRMZWdhY3lC cm93c2VyV2luZG93KGNsaWVudCwgbWFpblduZCwgdXJsQmFyV25kLCB1c2VMYXllcmVkV2ViVmll dykpOworICAgIHJldHVybiBhZG9wdFJlZigqbmV3IFdlYktpdExlZ2FjeUJyb3dzZXJXaW5kb3co Y2xpZW50LCBtYWluV25kLCB1c2VMYXllcmVkV2ViVmlldykpOwogfQogCi1XZWJLaXRMZWdhY3lC cm93c2VyV2luZG93OjpXZWJLaXRMZWdhY3lCcm93c2VyV2luZG93KEJyb3dzZXJXaW5kb3dDbGll bnQmIGNsaWVudCwgSFdORCBtYWluV25kLCBIV05EIHVybEJhclduZCwgYm9vbCB1c2VMYXllcmVk V2ViVmlldykKK1dlYktpdExlZ2FjeUJyb3dzZXJXaW5kb3c6OldlYktpdExlZ2FjeUJyb3dzZXJX aW5kb3coQnJvd3NlcldpbmRvd0NsaWVudCYgY2xpZW50LCBIV05EIG1haW5XbmQsIGJvb2wgdXNl TGF5ZXJlZFdlYlZpZXcpCiAgICAgOiBtX2NsaWVudChjbGllbnQpCiAgICAgLCBtX2hNYWluV25k KG1haW5XbmQpCi0gICAgLCBtX2hVUkxCYXJXbmQodXJsQmFyV25kKQogICAgICwgbV91c2VMYXll cmVkV2ViVmlldyh1c2VMYXllcmVkV2ViVmlldykKIHsKIH0KQEAgLTEyOSw3ICsxMjMsNyBAQCBI UkVTVUxUIFdlYktpdExlZ2FjeUJyb3dzZXJXaW5kb3c6OmluaXQoKQogICAgIGlmICghc2V0Q2Fj aGVGb2xkZXIoKSkKICAgICAgICAgcmV0dXJuIEVfRkFJTDsKIAotICAgIGF1dG8gd2ViSG9zdCA9 IG5ldyBNaW5pQnJvd3NlcldlYkhvc3QodGhpcywgbV9oVVJMQmFyV25kKTsKKyAgICBhdXRvIHdl Ykhvc3QgPSBuZXcgTWluaUJyb3dzZXJXZWJIb3N0KHRoaXMpOwogCiAgICAgaHIgPSBzZXRGcmFt ZUxvYWREZWxlZ2F0ZSh3ZWJIb3N0KTsKICAgICBpZiAoRkFJTEVEKGhyKSkKQEAgLTQ3NCw3ICs0 NjgsNyBAQCB2b2lkIFdlYktpdExlZ2FjeUJyb3dzZXJXaW5kb3c6Om5hdmlnYXRlVG9IaXN0b3J5 KFVJTlQgbWVudUlEKQogICAgIF9ic3RyX3QgZnJhbWVVUkw7CiAgICAgZGVzaXJlZEhpc3RvcnlJ dGVtLT5VUkxTdHJpbmcoZnJhbWVVUkwuR2V0QWRkcmVzcygpKTsKIAotICAgIDo6U2VuZE1lc3Nh Z2UobV9oVVJMQmFyV25kLCAoVUlOVClXTV9TRVRURVhULCAwLCAoTFBBUkFNKWZyYW1lVVJMLkdl dEJTVFIoKSk7CisgICAgbV9jbGllbnQuYWN0aXZlVVJMQ2hhbmdlZChmcmFtZVVSTC5HZXRCU1RS KCkpOwogfQogCiBib29sIFdlYktpdExlZ2FjeUJyb3dzZXJXaW5kb3c6OmdvQmFjaygpCmRpZmYg LS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci93aW4vV2ViS2l0TGVnYWN5QnJvd3NlcldpbmRvdy5o IGIvVG9vbHMvTWluaUJyb3dzZXIvd2luL1dlYktpdExlZ2FjeUJyb3dzZXJXaW5kb3cuaAppbmRl eCAzNjBhOTBiNDI5OGQzZTY0NzgyMGMwMDYzMjA2ZTY3NTI4MDI4NDYzLi42Njg4ZWFiZTYyMjg2 ZWMzYTY0ZDVjZDM5NTcwZTc0YjY3YWU0Yzk2IDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nl ci93aW4vV2ViS2l0TGVnYWN5QnJvd3NlcldpbmRvdy5oCisrKyBiL1Rvb2xzL01pbmlCcm93c2Vy L3dpbi9XZWJLaXRMZWdhY3lCcm93c2VyV2luZG93LmgKQEAgLTMzLDYgKzMzLDcgQEAKIAogdHlw ZWRlZiBfY29tX3B0cl90PF9jb21fSUlJRDxJVW5rbm93biwgJl9fdXVpZG9mKElVbmtub3duKT4+ IElVbmtub3duUHRyOwogdHlwZWRlZiBfY29tX3B0cl90PF9jb21fSUlJRDxJV2ViRnJhbWUsICZf X3V1aWRvZihJV2ViRnJhbWUpPj4gSVdlYkZyYW1lUHRyOwordHlwZWRlZiBfY29tX3B0cl90PF9j b21fSUlJRDxJV2ViRnJhbWUyLCAmX191dWlkb2YoSVdlYkZyYW1lMik+PiBJV2ViRnJhbWUyUHRy OwogdHlwZWRlZiBfY29tX3B0cl90PF9jb21fSUlJRDxJV2ViVmlldywgJl9fdXVpZG9mKElXZWJW aWV3KT4+IElXZWJWaWV3UHRyOwogdHlwZWRlZiBfY29tX3B0cl90PF9jb21fSUlJRDxJV2ViVmll d1ByaXZhdGUyLCAmX191dWlkb2YoSVdlYlZpZXdQcml2YXRlMik+PiBJV2ViVmlld1ByaXZhdGVQ dHI7CiB0eXBlZGVmIF9jb21fcHRyX3Q8X2NvbV9JSUlEPElXZWJGcmFtZUxvYWREZWxlZ2F0ZSwg Jl9fdXVpZG9mKElXZWJGcmFtZUxvYWREZWxlZ2F0ZSk+PiBJV2ViRnJhbWVMb2FkRGVsZWdhdGVQ dHI7CkBAIC00OCwxMCArNDksMTMgQEAgdHlwZWRlZiBfY29tX3B0cl90PF9jb21fSUlJRDxJV2Vi Q2FjaGUsICZfX3V1aWRvZihJV2ViQ2FjaGUpPj4gSVdlYkNhY2hlUHRyOwogdHlwZWRlZiBfY29t X3B0cl90PF9jb21fSUlJRDxJV2ViUmVzb3VyY2VMb2FkRGVsZWdhdGUsICZfX3V1aWRvZihJV2Vi UmVzb3VyY2VMb2FkRGVsZWdhdGUpPj4gSVdlYlJlc291cmNlTG9hZERlbGVnYXRlUHRyOwogdHlw ZWRlZiBfY29tX3B0cl90PF9jb21fSUlJRDxJV2ViRG93bmxvYWREZWxlZ2F0ZSwgJl9fdXVpZG9m KElXZWJEb3dubG9hZERlbGVnYXRlKT4+IElXZWJEb3dubG9hZERlbGVnYXRlUHRyOwogdHlwZWRl ZiBfY29tX3B0cl90PF9jb21fSUlJRDxJV2ViRnJhbWVQcml2YXRlLCAmX191dWlkb2YoSVdlYkZy YW1lUHJpdmF0ZSk+PiBJV2ViRnJhbWVQcml2YXRlUHRyOwordHlwZWRlZiBfY29tX3B0cl90PF9j b21fSUlJRDxJV2ViTXV0YWJsZVVSTFJlcXVlc3QsICZfX3V1aWRvZihJV2ViTXV0YWJsZVVSTFJl cXVlc3QpPj4gSVdlYk11dGFibGVVUkxSZXF1ZXN0UHRyOwordHlwZWRlZiBfY29tX3B0cl90PF9j b21fSUlJRDxJV2ViTm90aWZpY2F0aW9uT2JzZXJ2ZXIsICZfX3V1aWRvZihJV2ViTm90aWZpY2F0 aW9uT2JzZXJ2ZXIpPj4gSVdlYk5vdGlmaWNhdGlvbk9ic2VydmVyUHRyOwordHlwZWRlZiBfY29t X3B0cl90PF9jb21fSUlJRDxJV2ViTm90aWZpY2F0aW9uQ2VudGVyLCAmX191dWlkb2YoSVdlYk5v dGlmaWNhdGlvbkNlbnRlcik+PiBJV2ViTm90aWZpY2F0aW9uQ2VudGVyUHRyOwogCiBjbGFzcyBX ZWJLaXRMZWdhY3lCcm93c2VyV2luZG93IDogcHVibGljIEJyb3dzZXJXaW5kb3cgewogcHVibGlj OgotICAgIHN0YXRpYyBSZWY8QnJvd3NlcldpbmRvdz4gY3JlYXRlKEJyb3dzZXJXaW5kb3dDbGll bnQmLCBIV05EIG1haW5XbmQsIEhXTkQgdXJsQmFyV25kLCBib29sIHVzZUxheWVyZWRXZWJWaWV3 ID0gZmFsc2UpOworICAgIHN0YXRpYyBSZWY8QnJvd3NlcldpbmRvdz4gY3JlYXRlKEJyb3dzZXJX aW5kb3dDbGllbnQmLCBIV05EIG1haW5XbmQsIGJvb2wgdXNlTGF5ZXJlZFdlYlZpZXcgPSBmYWxz ZSk7CiAKIHByaXZhdGU6CiAgICAgZnJpZW5kIGNsYXNzIEFjY2Vzc2liaWxpdHlEZWxlZ2F0ZTsK QEAgLTExMSw3ICsxMTUsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgdXBkYXRlU3RhdGlzdGljcyhI V05EIGRpYWxvZyk7CiAgICAgdm9pZCBzZXRQcmVmZXJlbmNlKFVJTlQgbWVudUlELCBib29sIGVu YWJsZSk7CiAKLSAgICBXZWJLaXRMZWdhY3lCcm93c2VyV2luZG93KEJyb3dzZXJXaW5kb3dDbGll bnQmLCBIV05EIG1haW5XbmQsIEhXTkQgdXJsQmFyV25kLCBib29sIHVzZUxheWVyZWRXZWJWaWV3 KTsKKyAgICBXZWJLaXRMZWdhY3lCcm93c2VyV2luZG93KEJyb3dzZXJXaW5kb3dDbGllbnQmLCBI V05EIG1haW5XbmQsIGJvb2wgdXNlTGF5ZXJlZFdlYlZpZXcpOwogICAgIHZvaWQgc3ViY2xhc3NG b3JMYXllcmVkV2luZG93KCk7CiAgICAgYm9vbCBzZXRDYWNoZUZvbGRlcigpOwogCkBAIC0xMzYs NyArMTQwLDYgQEAgcHJpdmF0ZToKICAgICBJV2ViQ2FjaGVQdHIgbV93ZWJDYWNoZTsKIAogICAg IEhXTkQgbV9oTWFpblduZCB7IG51bGxwdHIgfTsKLSAgICBIV05EIG1faFVSTEJhclduZCB7IG51 bGxwdHIgfTsKICAgICBIV05EIG1fdmlld1duZCB7IG51bGxwdHIgfTsKIAogICAgIGJvb2wgbV91 c2VMYXllcmVkV2ViVmlldzsK