200970 2019-08-21 01:28:01 -0700 [Win][MiniBrowser] Add a progress indicator to the main window 2019-09-08 23:47:08 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=201541 InRadar P2 Normal --- 1 fujii fujii achristensen bfulgham don.olmstead pvollan ross.kirsling webkit-bug-importer oldest_to_newest 1563414 0 fujii 2019-08-21 01:28:01 -0700 [Win][MiniBrowser] Add a progress indicator to the main window 1563415 1 376854 fujii 2019-08-21 01:30:31 -0700 Created attachment 376854 WIP patch 1563427 2 376857 fujii 2019-08-21 03:03:40 -0700 Created attachment 376857 Patch 1563434 3 fujii 2019-08-21 03:28:36 -0700 screenshot: https://ibb.co/KjRPZ8X 1563887 4 376857 fujii 2019-08-21 18:50:20 -0700 Comment on attachment 376857 Patch Clearing flags on attachment: 376857 Committed r248990: <https://trac.webkit.org/changeset/248990> 1563888 5 fujii 2019-08-21 18:50:23 -0700 All reviewed patches have been landed. Closing bug. 1563889 6 webkit-bug-importer 2019-08-21 18:51:19 -0700 <rdar://problem/54582290> 1569072 7 376857 fujii 2019-09-08 23:47:08 -0700 Comment on attachment 376857 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=376857&action=review > Tools/MiniBrowser/win/WebKitLegacyBrowserWindow.cpp:142 > + hr = defaultNotificationCenter->addObserver(webHost, _bstr_t(WebViewProgressEstimateChangedNotification), nullptr); I should call removeObserver elsewhere to avoid leakage. I'm going to fix it in Bug 201600. 376854 2019-08-21 01:30:31 -0700 2019-08-21 03:03:30 -0700 WIP patch indicator.diff text/plain 12615 fujii ZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9Ccm93c2VyV2luZG93LmggYi9Ub29s cy9NaW5pQnJvd3Nlci93aW4vQnJvd3NlcldpbmRvdy5oCmluZGV4IGZhMDEwYjEzNTRiLi44ODdk NDY5YjZhNCAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvd2luL0Jyb3dzZXJXaW5kb3cu aAorKysgYi9Ub29scy9NaW5pQnJvd3Nlci93aW4vQnJvd3NlcldpbmRvdy5oCkBAIC0yOCw2ICsy OCwxMiBAQAogI2luY2x1ZGUgPHdpbmRvd3MuaD4KICNpbmNsdWRlIDx3dGYvUmVmQ291bnRlZC5o PgogCitjbGFzcyBCcm93c2VyV2luZG93Q2xpZW50IHsKK3B1YmxpYzoKKyAgICB2aXJ0dWFsIHZv aWQgcHJvZ3Jlc3NDaGFuZ2VkKGRvdWJsZSkgPSAwOworICAgIHZpcnR1YWwgdm9pZCBwcm9ncmVz c0ZpbmlzaGVkKCkgPSAwOworfTsKKwogY2xhc3MgQnJvd3NlcldpbmRvdyA6IHB1YmxpYyBSZWZD b3VudGVkPEJyb3dzZXJXaW5kb3c+IHsKIHB1YmxpYzoKICAgICB2aXJ0dWFsIH5Ccm93c2VyV2lu ZG93KCkgeyB9OwpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvd2luL01haW5XaW5kb3cu Y3BwIGIvVG9vbHMvTWluaUJyb3dzZXIvd2luL01haW5XaW5kb3cuY3BwCmluZGV4IDc4MTA1NTM0 NTIyLi5mODVlZGVlZmVlYyAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvd2luL01haW5X aW5kb3cuY3BwCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9NYWluV2luZG93LmNwcApAQCAt MzAsNiArMzAsNyBAQAogI2luY2x1ZGUgIk1pbmlCcm93c2VyTGliUmVzb3VyY2UuaCIKICNpbmNs dWRlICJXZWJLaXRMZWdhY3lCcm93c2VyV2luZG93LmgiCiAjaW5jbHVkZSA8Q29yZUZvdW5kYXRp b24vQ29yZUZvdW5kYXRpb24uaD4KKyNpbmNsdWRlIDxzc3RyZWFtPgogCiAjaWYgRU5BQkxFKFdF QktJVCkKICNpbmNsdWRlICJXZWJLaXRCcm93c2VyV2luZG93LmgiCkBAIC0xMTUsMTYgKzExNiwx NiBAQCBib29sIE1haW5XaW5kb3c6OmluaXQoQnJvd3NlcldpbmRvd0ZhY3RvcnkgZmFjdG9yeSwg SElOU1RBTkNFIGhJbnN0YW5jZSwgYm9vbCB1cwogICAgIEVuYWJsZU1lbnVJdGVtKEdldE1lbnUo bV9oTWFpblduZCksIElETV9ORVdfV0VCS0lUX1dJTkRPVywgTUZfR1JBWUVEKTsKICNlbmRpZgog Ci0gICAgZmxvYXQgc2NhbGVGYWN0b3IgPSBXZWJDb3JlOjpkZXZpY2VTY2FsZUZhY3RvckZvcldp bmRvdyhudWxscHRyKTsKICAgICBtX2hCYWNrQnV0dG9uV25kID0gQ3JlYXRlV2luZG93KEwiQlVU VE9OIiwgTCI8IiwgV1NfQ0hJTEQgfCBXU19WSVNJQkxFICB8IEJTX1RFWFQsIDAsIDAsIDAsIDAs IG1faE1haW5XbmQsIHJlaW50ZXJwcmV0X2Nhc3Q8SE1FTlU+KElETV9ISVNUT1JZX0JBQ0tXQVJE KSwgaEluc3RhbmNlLCAwKTsKICAgICBtX2hGb3J3YXJkQnV0dG9uV25kID0gQ3JlYXRlV2luZG93 KEwiQlVUVE9OIiwgTCI+IiwgV1NfQ0hJTEQgfCBXU19WSVNJQkxFIHwgQlNfVEVYVCwgMCwgMCwg MCwgMCwgbV9oTWFpblduZCwgcmVpbnRlcnByZXRfY2FzdDxITUVOVT4oSURNX0hJU1RPUllfRk9S V0FSRCksIGhJbnN0YW5jZSwgMCk7CiAgICAgbV9oUmVsb2FkQnV0dG9uV25kID0gQ3JlYXRlV2lu ZG93KEwiQlVUVE9OIiwgTCLihroiLCBXU19DSElMRCB8IFdTX1ZJU0lCTEUgfCBCU19URVhULCAw LCAwLCAwLCAwLCBtX2hNYWluV25kLCByZWludGVycHJldF9jYXN0PEhNRU5VPihJRE1fUkVMT0FE KSwgaEluc3RhbmNlLCAwKTsKICAgICBtX2hVUkxCYXJXbmQgPSBDcmVhdGVXaW5kb3coTCJFRElU IiwgMCwgV1NfQ0hJTEQgfCBXU19WSVNJQkxFIHwgV1NfQk9SREVSIHwgRVNfTEVGVCB8IEVTX0FV VE9WU0NST0xMLCAwLCAwLCAwLCAwLCBtX2hNYWluV25kLCAwLCBoSW5zdGFuY2UsIDApOworICAg IG1faFByb2dyZXNzSW5kaWNhdG9yID0gQ3JlYXRlV2luZG93KEwiU1RBVElDIiwgMCwgV1NfQ0hJ TEQgfCBXU19WSVNJQkxFIHwgV1NfQk9SREVSIHwgU1NfQ0VOVEVSIHwgU1NfQ0VOVEVSSU1BR0Us IDAsIDAsIDAsIDAsIG1faE1haW5XbmQsIDAsIGhJbnN0YW5jZSwgMCk7CiAKICAgICBEZWZFZGl0 UHJvYyA9IHJlaW50ZXJwcmV0X2Nhc3Q8V05EUFJPQz4oR2V0V2luZG93TG9uZ1B0cihtX2hVUkxC YXJXbmQsIEdXTFBfV05EUFJPQykpOwogICAgIFNldFdpbmRvd0xvbmdQdHIobV9oVVJMQmFyV25k LCBHV0xQX1dORFBST0MsIHJlaW50ZXJwcmV0X2Nhc3Q8TE9OR19QVFI+KEVkaXRQcm9jKSk7CiAK LSAgICBtX2Jyb3dzZXJXaW5kb3cgPSBmYWN0b3J5KG1faE1haW5XbmQsIG1faFVSTEJhclduZCwg dXNlc0xheWVyZWRXZWJWaWV3KTsKKyAgICBtX2Jyb3dzZXJXaW5kb3cgPSBmYWN0b3J5KCp0aGlz LCBtX2hNYWluV25kLCBtX2hVUkxCYXJXbmQsIHVzZXNMYXllcmVkV2ViVmlldyk7CiAgICAgaWYg KCFtX2Jyb3dzZXJXaW5kb3cpCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICBIUkVTVUxUIGhy ID0gbV9icm93c2VyV2luZG93LT5pbml0KCk7CkBAIC0xNTAsNyArMTUxLDggQEAgdm9pZCBNYWlu V2luZG93OjpyZXNpemVTdWJWaWV3cygpCiAgICAgTW92ZVdpbmRvdyhtX2hCYWNrQnV0dG9uV25k LCAwLCAwLCB3aWR0aCwgaGVpZ2h0LCBUUlVFKTsKICAgICBNb3ZlV2luZG93KG1faEZvcndhcmRC dXR0b25XbmQsIHdpZHRoLCAwLCB3aWR0aCwgaGVpZ2h0LCBUUlVFKTsKICAgICBNb3ZlV2luZG93 KG1faFJlbG9hZEJ1dHRvblduZCwgd2lkdGggKiAyLCAwLCB3aWR0aCwgaGVpZ2h0LCBUUlVFKTsK LSAgICBNb3ZlV2luZG93KG1faFVSTEJhclduZCwgd2lkdGggKiAzLCAwLCByY0NsaWVudC5yaWdo dCAtIHdpZHRoICogMywgaGVpZ2h0LCBUUlVFKTsKKyAgICBNb3ZlV2luZG93KG1faFVSTEJhcldu ZCwgd2lkdGggKiAzLCAwLCByY0NsaWVudC5yaWdodCAtIHdpZHRoICogNSwgaGVpZ2h0LCBUUlVF KTsKKyAgICBNb3ZlV2luZG93KG1faFByb2dyZXNzSW5kaWNhdG9yLCByY0NsaWVudC5yaWdodCAt IHdpZHRoICogMiwgMCwgd2lkdGggKiAyLCBoZWlnaHQsIFRSVUUpOwogCiAgICAgaWYgKG1fYnJv d3NlcldpbmRvdy0+dXNlc0xheWVyZWRXZWJWaWV3KCkgfHwgIW1fYnJvd3NlcldpbmRvdy0+aHdu ZCgpKQogICAgICAgICByZXR1cm47CkBAIC00NzMsMyArNDc1LDE1IEBAIHZvaWQgTWFpbldpbmRv dzo6dXBkYXRlRGV2aWNlU2NhbGVGYWN0b3IoKQogICAgICAgICBPVVRfVFRfT05MWV9QUkVDSVMs IENMSVBfREVGQVVMVF9QUkVDSVMsIENMRUFSVFlQRV9RVUFMSVRZLCBGRl9ET05UQ0FSRSwgTCJU YWhvbWEiKTsKICAgICA6OlNlbmRNZXNzYWdlKG1faFVSTEJhclduZCwgc3RhdGljX2Nhc3Q8VUlO VD4oV01fU0VURk9OVCksIHJlaW50ZXJwcmV0X2Nhc3Q8V1BBUkFNPihtX2hVUkxCYXJGb250KSwg VFJVRSk7CiB9CisKK3ZvaWQgTWFpbldpbmRvdzo6cHJvZ3Jlc3NDaGFuZ2VkKGRvdWJsZSBwcm9n cmVzcykKK3sKKyAgICBzdGQ6Ondvc3RyaW5nc3RyZWFtIHRleHQ7CisgICAgdGV4dCA8PCBzdGF0 aWNfY2FzdDxpbnQ+KHByb2dyZXNzICogMTAwKSA8PCBMJyUnOworICAgIFNldFdpbmRvd1RleHQo bV9oUHJvZ3Jlc3NJbmRpY2F0b3IsIHRleHQuc3RyKCkuY19zdHIoKSk7Cit9CisKK3ZvaWQgTWFp bldpbmRvdzo6cHJvZ3Jlc3NGaW5pc2hlZCgpCit7CisgICAgU2V0V2luZG93VGV4dChtX2hQcm9n cmVzc0luZGljYXRvciwgTCIiKTsKK30KZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL3dp bi9NYWluV2luZG93LmggYi9Ub29scy9NaW5pQnJvd3Nlci93aW4vTWFpbldpbmRvdy5oCmluZGV4 IDBjYjcyYjJlNTI5Li42OGM5ZmVhYTA3MSAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIv d2luL01haW5XaW5kb3cuaAorKysgYi9Ub29scy9NaW5pQnJvd3Nlci93aW4vTWFpbldpbmRvdy5o CkBAIC0zMSw5ICszMSw5IEBACiAjaW5jbHVkZSA8c3RyaW5nPgogI2luY2x1ZGUgPHd0Zi9SZWZQ dHIuaD4KIAotY2xhc3MgTWFpbldpbmRvdyA6IHB1YmxpYyBSZWZDb3VudGVkPE1haW5XaW5kb3c+ IHsKK2NsYXNzIE1haW5XaW5kb3cgZmluYWwgOiBwdWJsaWMgUmVmQ291bnRlZDxNYWluV2luZG93 PiwgcHVibGljIEJyb3dzZXJXaW5kb3dDbGllbnQgewogcHVibGljOgotICAgIHVzaW5nIEJyb3dz ZXJXaW5kb3dGYWN0b3J5ID0gc3RkOjpmdW5jdGlvbjxSZWY8QnJvd3NlcldpbmRvdz4oSFdORCBt YWluV25kLCBIV05EIHVybEJhclduZCwgYm9vbCB1c2VzTGF5ZXJlZFdlYlZpZXcpPjsKKyAgICB1 c2luZyBCcm93c2VyV2luZG93RmFjdG9yeSA9IHN0ZDo6ZnVuY3Rpb248UmVmPEJyb3dzZXJXaW5k b3c+KEJyb3dzZXJXaW5kb3dDbGllbnQmLCBIV05EIG1haW5XbmQsIEhXTkQgdXJsQmFyV25kLCBi b29sIHVzZXNMYXllcmVkV2ViVmlldyk+OwogCiAgICAgc3RhdGljIFJlZjxNYWluV2luZG93PiBj cmVhdGUoKTsKIApAQCAtNTksMTEgKzU5LDE2IEBAIHByaXZhdGU6CiAgICAgdm9pZCBvblVSTEJh ckVudGVyKCk7CiAgICAgdm9pZCB1cGRhdGVEZXZpY2VTY2FsZUZhY3RvcigpOwogCisgICAgLy8g QnJvd3NlcldpbmRvd0NsaWVudAorICAgIHZvaWQgcHJvZ3Jlc3NDaGFuZ2VkKGRvdWJsZSkgZmlu YWw7CisgICAgdm9pZCBwcm9ncmVzc0ZpbmlzaGVkKCkgZmluYWw7CisKICAgICBIV05EIG1faE1h aW5XbmQgeyBudWxscHRyIH07CiAgICAgSFdORCBtX2hVUkxCYXJXbmQgeyBudWxscHRyIH07CiAg ICAgSFdORCBtX2hCYWNrQnV0dG9uV25kIHsgbnVsbHB0ciB9OwogICAgIEhXTkQgbV9oRm9yd2Fy ZEJ1dHRvblduZCB7IG51bGxwdHIgfTsKICAgICBIV05EIG1faFJlbG9hZEJ1dHRvblduZCB7IG51 bGxwdHIgfTsKKyAgICBIV05EIG1faFByb2dyZXNzSW5kaWNhdG9yIHsgbnVsbHB0ciB9OwogICAg IEhXTkQgbV9oQ2FjaGVXbmQgeyBudWxscHRyIH07CiAgICAgSEdESU9CSiBtX2hVUkxCYXJGb250 IHsgbnVsbHB0ciB9OwogICAgIFJlZlB0cjxCcm93c2VyV2luZG93PiBtX2Jyb3dzZXJXaW5kb3c7 CmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci93aW4vV2ViS2l0QnJvd3NlcldpbmRvdy5j cHAgYi9Ub29scy9NaW5pQnJvd3Nlci93aW4vV2ViS2l0QnJvd3NlcldpbmRvdy5jcHAKaW5kZXgg ZjMwZThhZjA3MzEuLmU0MWFkNzY1N2NhIDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci93 aW4vV2ViS2l0QnJvd3NlcldpbmRvdy5jcHAKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvd2luL1dl YktpdEJyb3dzZXJXaW5kb3cuY3BwCkBAIC0xMDQsNyArMTA0LDcgQEAgV0tSZXRhaW5QdHI8V0tV UkxSZWY+IGNyZWF0ZVdLVVJMKGNvbnN0IHN0ZDo6d3N0cmluZyYgc3RyKQogICAgIHJldHVybiBh ZG9wdFdLKFdLVVJMQ3JlYXRlV2l0aFVURjhDU3RyaW5nKHV0ZjguZGF0YSgpKSk7CiB9CiAKLVJl ZjxCcm93c2VyV2luZG93PiBXZWJLaXRCcm93c2VyV2luZG93OjpjcmVhdGUoSFdORCBtYWluV25k LCBIV05EIHVybEJhclduZCwgYm9vbCkKK1JlZjxCcm93c2VyV2luZG93PiBXZWJLaXRCcm93c2Vy V2luZG93OjpjcmVhdGUoQnJvd3NlcldpbmRvd0NsaWVudCYgY2xpZW50LCBIV05EIG1haW5XbmQs IEhXTkQgdXJsQmFyV25kLCBib29sKQogewogICAgIGF1dG8gY29uZiA9IGFkb3B0V0soV0tQYWdl Q29uZmlndXJhdGlvbkNyZWF0ZSgpKTsKIApAQCAtMTIxLDExICsxMjEsMTIgQEAgUmVmPEJyb3dz ZXJXaW5kb3c+IFdlYktpdEJyb3dzZXJXaW5kb3c6OmNyZWF0ZShIV05EIG1haW5XbmQsIEhXTkQg dXJsQmFyV25kLCBib28KICAgICBhdXRvIGNvbnRleHQgPWFkb3B0V0soV0tDb250ZXh0Q3JlYXRl V2l0aENvbmZpZ3VyYXRpb24obnVsbHB0cikpOwogICAgIFdLUGFnZUNvbmZpZ3VyYXRpb25TZXRD b250ZXh0KGNvbmYuZ2V0KCksIGNvbnRleHQuZ2V0KCkpOwogCi0gICAgcmV0dXJuIGFkb3B0UmVm KCpuZXcgV2ViS2l0QnJvd3NlcldpbmRvdyhjb25mLmdldCgpLCBtYWluV25kLCB1cmxCYXJXbmQp KTsKKyAgICByZXR1cm4gYWRvcHRSZWYoKm5ldyBXZWJLaXRCcm93c2VyV2luZG93KGNsaWVudCwg Y29uZi5nZXQoKSwgbWFpblduZCwgdXJsQmFyV25kKSk7CiB9CiAKLVdlYktpdEJyb3dzZXJXaW5k b3c6OldlYktpdEJyb3dzZXJXaW5kb3coV0tQYWdlQ29uZmlndXJhdGlvblJlZiBjb25mLCBIV05E IG1haW5XbmQsIEhXTkQgdXJsQmFyV25kKQotICAgIDogbV9oTWFpblduZChtYWluV25kKQorV2Vi S2l0QnJvd3NlcldpbmRvdzo6V2ViS2l0QnJvd3NlcldpbmRvdyhCcm93c2VyV2luZG93Q2xpZW50 JiBjbGllbnQsIFdLUGFnZUNvbmZpZ3VyYXRpb25SZWYgY29uZiwgSFdORCBtYWluV25kLCBIV05E IHVybEJhclduZCkKKyAgICA6IG1fY2xpZW50KGNsaWVudCkKKyAgICAsIG1faE1haW5XbmQobWFp blduZCkKICAgICAsIG1fdXJsQmFyV25kKHVybEJhclduZCkKIHsKICAgICBSRUNUIHJlY3QgPSB7 IH07CkBAIC0xNTIsNiArMTUzLDggQEAgV2ViS2l0QnJvd3NlcldpbmRvdzo6V2ViS2l0QnJvd3Nl cldpbmRvdyhXS1BhZ2VDb25maWd1cmF0aW9uUmVmIGNvbmYsIEhXTkQgbWFpblcKICAgICBzdGF0 ZUNsaWVudC5iYXNlLnZlcnNpb24gPSAwOwogICAgIHN0YXRlQ2xpZW50LmJhc2UuY2xpZW50SW5m byA9IHRoaXM7CiAgICAgc3RhdGVDbGllbnQuZGlkQ2hhbmdlVGl0bGUgPSBkaWRDaGFuZ2VUaXRs ZTsKKyAgICBzdGF0ZUNsaWVudC5kaWRDaGFuZ2VJc0xvYWRpbmcgPSBkaWRDaGFuZ2VJc0xvYWRp bmc7CisgICAgc3RhdGVDbGllbnQuZGlkQ2hhbmdlRXN0aW1hdGVkUHJvZ3Jlc3MgPSBkaWRDaGFu Z2VFc3RpbWF0ZWRQcm9ncmVzczsKICAgICBXS1BhZ2VTZXRQYWdlU3RhdGVDbGllbnQocGFnZSwg JnN0YXRlQ2xpZW50LmJhc2UpOwogCiAgICAgdXBkYXRlUHJveHlTZXR0aW5ncygpOwpAQCAtMzA4 LDYgKzMxMSwyMCBAQCB2b2lkIFdlYktpdEJyb3dzZXJXaW5kb3c6OmRpZENoYW5nZVRpdGxlKGNv bnN0IHZvaWQqIGNsaWVudEluZm8pCiAgICAgU2V0V2luZG93VGV4dCh0aGlzV2luZG93Lm1faE1h aW5XbmQsIHRpdGxlU3RyaW5nLmNfc3RyKCkpOwogfQogCit2b2lkIFdlYktpdEJyb3dzZXJXaW5k b3c6OmRpZENoYW5nZUlzTG9hZGluZyhjb25zdCB2b2lkKiBjbGllbnRJbmZvKQoreworICAgIGF1 dG8mIHRoaXNXaW5kb3cgPSB0b1dlYktpdEJyb3dzZXJXaW5kb3coY2xpZW50SW5mbyk7CisgICAg YXV0byBwYWdlID0gV0tWaWV3R2V0UGFnZSh0aGlzV2luZG93Lm1fdmlldy5nZXQoKSk7CisgICAg dGhpc1dpbmRvdy5tX2NsaWVudC5wcm9ncmVzc0ZpbmlzaGVkKCk7Cit9CisKK3ZvaWQgV2ViS2l0 QnJvd3NlcldpbmRvdzo6ZGlkQ2hhbmdlRXN0aW1hdGVkUHJvZ3Jlc3MoY29uc3Qgdm9pZCogY2xp ZW50SW5mbykKK3sKKyAgICBhdXRvJiB0aGlzV2luZG93ID0gdG9XZWJLaXRCcm93c2VyV2luZG93 KGNsaWVudEluZm8pOworICAgIGF1dG8gcGFnZSA9IFdLVmlld0dldFBhZ2UodGhpc1dpbmRvdy5t X3ZpZXcuZ2V0KCkpOworICAgIHRoaXNXaW5kb3cubV9jbGllbnQucHJvZ3Jlc3NDaGFuZ2VkKFdL UGFnZUdldEVzdGltYXRlZFByb2dyZXNzKHBhZ2UpKTsKK30KKwogdm9pZCBXZWJLaXRCcm93c2Vy V2luZG93OjpkaWRDb21taXROYXZpZ2F0aW9uKFdLUGFnZVJlZiBwYWdlLCBXS05hdmlnYXRpb25S ZWYgbmF2aWdhdGlvbiwgV0tUeXBlUmVmIHVzZXJEYXRhLCBjb25zdCB2b2lkKiBjbGllbnRJbmZv KQogewogICAgIGF1dG8mIHRoaXNXaW5kb3cgPSB0b1dlYktpdEJyb3dzZXJXaW5kb3coY2xpZW50 SW5mbyk7CkBAIC0zNjcsOCArMzg0LDggQEAgYm9vbCBXZWJLaXRCcm93c2VyV2luZG93OjpjYW5U cnVzdFNlcnZlckNlcnRpZmljYXRlKFdLUHJvdGVjdGlvblNwYWNlUmVmIHByb3RlY3QKIFdLUGFn ZVJlZiBXZWJLaXRCcm93c2VyV2luZG93OjpjcmVhdGVOZXdQYWdlKFdLUGFnZVJlZiBwYWdlLCBX S1BhZ2VDb25maWd1cmF0aW9uUmVmIGNvbmZpZ3VyYXRpb24sIFdLTmF2aWdhdGlvbkFjdGlvblJl ZiBuYXZpZ2F0aW9uQWN0aW9uLCBXS1dpbmRvd0ZlYXR1cmVzUmVmIHdpbmRvd0ZlYXR1cmVzLCBj b25zdCB2b2lkICpjbGllbnRJbmZvKQogewogICAgIGF1dG8mIG5ld1dpbmRvdyA9IE1haW5XaW5k b3c6OmNyZWF0ZSgpLmxlYWtSZWYoKTsKLSAgICBhdXRvIGZhY3RvcnkgPSBbY29uZmlndXJhdGlv bl0oSFdORCBtYWluV25kLCBIV05EIHVybEJhclduZCwgYm9vbCkgLT4gYXV0byB7Ci0gICAgICAg IHJldHVybiBhZG9wdFJlZigqbmV3IFdlYktpdEJyb3dzZXJXaW5kb3coY29uZmlndXJhdGlvbiwg bWFpblduZCwgdXJsQmFyV25kKSk7CisgICAgYXV0byBmYWN0b3J5ID0gW2NvbmZpZ3VyYXRpb25d KEJyb3dzZXJXaW5kb3dDbGllbnQmIGNsaWVudCwgSFdORCBtYWluV25kLCBIV05EIHVybEJhcldu ZCwgYm9vbCkgLT4gYXV0byB7CisgICAgICAgIHJldHVybiBhZG9wdFJlZigqbmV3IFdlYktpdEJy b3dzZXJXaW5kb3coY2xpZW50LCBjb25maWd1cmF0aW9uLCBtYWluV25kLCB1cmxCYXJXbmQpKTsK ICAgICB9OwogICAgIGJvb2wgb2sgPSBuZXdXaW5kb3cuaW5pdChmYWN0b3J5LCBoSW5zdCk7CiAg ICAgaWYgKCFvaykKZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9XZWJLaXRCcm93 c2VyV2luZG93LmggYi9Ub29scy9NaW5pQnJvd3Nlci93aW4vV2ViS2l0QnJvd3NlcldpbmRvdy5o CmluZGV4IDUzOTg1MDQ4MmI1Li4wYzk1MWE1NDFlYSAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJy b3dzZXIvd2luL1dlYktpdEJyb3dzZXJXaW5kb3cuaAorKysgYi9Ub29scy9NaW5pQnJvd3Nlci93 aW4vV2ViS2l0QnJvd3NlcldpbmRvdy5oCkBAIC0zMywxMCArMzMsMTAgQEAKIAogY2xhc3MgV2Vi S2l0QnJvd3NlcldpbmRvdyA6IHB1YmxpYyBCcm93c2VyV2luZG93IHsKIHB1YmxpYzoKLSAgICBz dGF0aWMgUmVmPEJyb3dzZXJXaW5kb3c+IGNyZWF0ZShIV05EIG1haW5XbmQsIEhXTkQgdXJsQmFy V25kLCBib29sIHVzZUxheWVyZWRXZWJWaWV3ID0gZmFsc2UpOworICAgIHN0YXRpYyBSZWY8QnJv d3NlcldpbmRvdz4gY3JlYXRlKEJyb3dzZXJXaW5kb3dDbGllbnQmLCBIV05EIG1haW5XbmQsIEhX TkQgdXJsQmFyV25kLCBib29sIHVzZUxheWVyZWRXZWJWaWV3ID0gZmFsc2UpOwogCiBwcml2YXRl OgotICAgIFdlYktpdEJyb3dzZXJXaW5kb3coV0tQYWdlQ29uZmlndXJhdGlvblJlZiwgSFdORCBt YWluV25kLCBIV05EIHVybEJhclduZCk7CisgICAgV2ViS2l0QnJvd3NlcldpbmRvdyhCcm93c2Vy V2luZG93Q2xpZW50JiwgV0tQYWdlQ29uZmlndXJhdGlvblJlZiwgSFdORCBtYWluV25kLCBIV05E IHVybEJhclduZCk7CiAKICAgICBIUkVTVUxUIGluaXQoKSBvdmVycmlkZTsKICAgICBIV05EIGh3 bmQoKSBvdmVycmlkZTsKQEAgLTY2LDExICs2NiwxNCBAQCBwcml2YXRlOgogICAgIGJvb2wgY2Fu VHJ1c3RTZXJ2ZXJDZXJ0aWZpY2F0ZShXS1Byb3RlY3Rpb25TcGFjZVJlZik7CiAKICAgICBzdGF0 aWMgdm9pZCBkaWRDaGFuZ2VUaXRsZShjb25zdCB2b2lkKik7CisgICAgc3RhdGljIHZvaWQgZGlk Q2hhbmdlSXNMb2FkaW5nKGNvbnN0IHZvaWQqKTsKKyAgICBzdGF0aWMgdm9pZCBkaWRDaGFuZ2VF c3RpbWF0ZWRQcm9ncmVzcyhjb25zdCB2b2lkKik7CiAgICAgc3RhdGljIHZvaWQgZGlkQ29tbWl0 TmF2aWdhdGlvbihXS1BhZ2VSZWYsIFdLTmF2aWdhdGlvblJlZiwgV0tUeXBlUmVmLCBjb25zdCB2 b2lkKik7CiAgICAgc3RhdGljIHZvaWQgZGlkUmVjZWl2ZUF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdl KFdLUGFnZVJlZiwgV0tBdXRoZW50aWNhdGlvbkNoYWxsZW5nZVJlZiwgY29uc3Qgdm9pZCopOwog ICAgIHN0YXRpYyBXS1BhZ2VSZWYgY3JlYXRlTmV3UGFnZShXS1BhZ2VSZWYsIFdLUGFnZUNvbmZp Z3VyYXRpb25SZWYsIFdLTmF2aWdhdGlvbkFjdGlvblJlZiwgV0tXaW5kb3dGZWF0dXJlc1JlZiwg Y29uc3Qgdm9pZCAqKTsKICAgICBzdGF0aWMgdm9pZCBkaWROb3RIYW5kbGVLZXlFdmVudChXS1Bh Z2VSZWYsIFdLTmF0aXZlRXZlbnRQdHIsIGNvbnN0IHZvaWQqKTsKIAorICAgIEJyb3dzZXJXaW5k b3dDbGllbnQmIG1fY2xpZW50OwogICAgIFdLUmV0YWluUHRyPFdLVmlld1JlZj4gbV92aWV3Owog ICAgIEhXTkQgbV9oTWFpblduZCB7IG51bGxwdHIgfTsKICAgICBIV05EIG1fdXJsQmFyV25kIHsg bnVsbHB0ciB9OwpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvd2luL1dlYktpdExlZ2Fj eUJyb3dzZXJXaW5kb3cuY3BwIGIvVG9vbHMvTWluaUJyb3dzZXIvd2luL1dlYktpdExlZ2FjeUJy b3dzZXJXaW5kb3cuY3BwCmluZGV4IGRlOGVkOGMyMjk4Li43NzQxZDdlMjZjMyAxMDA2NDQKLS0t IGEvVG9vbHMvTWluaUJyb3dzZXIvd2luL1dlYktpdExlZ2FjeUJyb3dzZXJXaW5kb3cuY3BwCisr KyBiL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9XZWJLaXRMZWdhY3lCcm93c2VyV2luZG93LmNwcApA QCAtNTksMTMgKzU5LDE0IEBAIHN0YXRpYyBjb25zdCBpbnQgbWF4SGlzdG9yeVNpemUgPSAxMDsK IAogdHlwZWRlZiBfY29tX3B0cl90PF9jb21fSUlJRDxJV2ViTXV0YWJsZVVSTFJlcXVlc3QsICZf X3V1aWRvZihJV2ViTXV0YWJsZVVSTFJlcXVlc3QpPj4gSVdlYk11dGFibGVVUkxSZXF1ZXN0UHRy OwogCi1SZWY8QnJvd3NlcldpbmRvdz4gV2ViS2l0TGVnYWN5QnJvd3NlcldpbmRvdzo6Y3JlYXRl KEhXTkQgbWFpblduZCwgSFdORCB1cmxCYXJXbmQsIGJvb2wgdXNlTGF5ZXJlZFdlYlZpZXcpCitS ZWY8QnJvd3NlcldpbmRvdz4gV2ViS2l0TGVnYWN5QnJvd3NlcldpbmRvdzo6Y3JlYXRlKEJyb3dz ZXJXaW5kb3dDbGllbnQmIGNsaWVudCwgSFdORCBtYWluV25kLCBIV05EIHVybEJhclduZCwgYm9v bCB1c2VMYXllcmVkV2ViVmlldykKIHsKLSAgICByZXR1cm4gYWRvcHRSZWYoKm5ldyBXZWJLaXRM ZWdhY3lCcm93c2VyV2luZG93KG1haW5XbmQsIHVybEJhclduZCwgdXNlTGF5ZXJlZFdlYlZpZXcp KTsKKyAgICByZXR1cm4gYWRvcHRSZWYoKm5ldyBXZWJLaXRMZWdhY3lCcm93c2VyV2luZG93KGNs aWVudCwgbWFpblduZCwgdXJsQmFyV25kLCB1c2VMYXllcmVkV2ViVmlldykpOwogfQogCi1XZWJL aXRMZWdhY3lCcm93c2VyV2luZG93OjpXZWJLaXRMZWdhY3lCcm93c2VyV2luZG93KEhXTkQgbWFp blduZCwgSFdORCB1cmxCYXJXbmQsIGJvb2wgdXNlTGF5ZXJlZFdlYlZpZXcpCi0gICAgOiBtX2hN YWluV25kKG1haW5XbmQpCitXZWJLaXRMZWdhY3lCcm93c2VyV2luZG93OjpXZWJLaXRMZWdhY3lC cm93c2VyV2luZG93KEJyb3dzZXJXaW5kb3dDbGllbnQmIGNsaWVudCwgSFdORCBtYWluV25kLCBI V05EIHVybEJhclduZCwgYm9vbCB1c2VMYXllcmVkV2ViVmlldykKKyAgICA6IG1fY2xpZW50KGNs aWVudCkKKyAgICAsIG1faE1haW5XbmQobWFpblduZCkKICAgICAsIG1faFVSTEJhclduZCh1cmxC YXJXbmQpCiAgICAgLCBtX3VzZUxheWVyZWRXZWJWaWV3KHVzZUxheWVyZWRXZWJWaWV3KQogewpk aWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvd2luL1dlYktpdExlZ2FjeUJyb3dzZXJXaW5k b3cuaCBiL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9XZWJLaXRMZWdhY3lCcm93c2VyV2luZG93LmgK aW5kZXggYjc2NWJkYWRlYWUuLjE0NWNmNzdmOGU2IDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJv d3Nlci93aW4vV2ViS2l0TGVnYWN5QnJvd3NlcldpbmRvdy5oCisrKyBiL1Rvb2xzL01pbmlCcm93 c2VyL3dpbi9XZWJLaXRMZWdhY3lCcm93c2VyV2luZG93LmgKQEAgLTUwLDcgKzUwLDcgQEAgdHlw ZWRlZiBfY29tX3B0cl90PF9jb21fSUlJRDxJV2ViRnJhbWVQcml2YXRlLCAmX191dWlkb2YoSVdl YkZyYW1lUHJpdmF0ZSk+PiBJV2UKIAogY2xhc3MgV2ViS2l0TGVnYWN5QnJvd3NlcldpbmRvdyA6 IHB1YmxpYyBCcm93c2VyV2luZG93IHsKIHB1YmxpYzoKLSAgICBzdGF0aWMgUmVmPEJyb3dzZXJX aW5kb3c+IGNyZWF0ZShIV05EIG1haW5XbmQsIEhXTkQgdXJsQmFyV25kLCBib29sIHVzZUxheWVy ZWRXZWJWaWV3ID0gZmFsc2UpOworICAgIHN0YXRpYyBSZWY8QnJvd3NlcldpbmRvdz4gY3JlYXRl KEJyb3dzZXJXaW5kb3dDbGllbnQmLCBIV05EIG1haW5XbmQsIEhXTkQgdXJsQmFyV25kLCBib29s IHVzZUxheWVyZWRXZWJWaWV3ID0gZmFsc2UpOwogCiBwcml2YXRlOgogICAgIGZyaWVuZCBjbGFz cyBBY2Nlc3NpYmlsaXR5RGVsZWdhdGU7CkBAIC0xMTAsMTAgKzExMCwxMSBAQCBwcml2YXRlOgog ICAgIHZvaWQgdXBkYXRlU3RhdGlzdGljcyhIV05EIGRpYWxvZyk7CiAgICAgdm9pZCBzZXRQcmVm ZXJlbmNlKFVJTlQgbWVudUlELCBib29sIGVuYWJsZSk7CiAKLSAgICBXZWJLaXRMZWdhY3lCcm93 c2VyV2luZG93KEhXTkQgbWFpblduZCwgSFdORCB1cmxCYXJXbmQsIGJvb2wgdXNlTGF5ZXJlZFdl YlZpZXcpOworICAgIFdlYktpdExlZ2FjeUJyb3dzZXJXaW5kb3coQnJvd3NlcldpbmRvd0NsaWVu dCYsIEhXTkQgbWFpblduZCwgSFdORCB1cmxCYXJXbmQsIGJvb2wgdXNlTGF5ZXJlZFdlYlZpZXcp OwogICAgIHZvaWQgc3ViY2xhc3NGb3JMYXllcmVkV2luZG93KCk7CiAgICAgYm9vbCBzZXRDYWNo ZUZvbGRlcigpOwogCisgICAgQnJvd3NlcldpbmRvd0NsaWVudCYgbV9jbGllbnQ7CiAgICAgc3Rk Ojp2ZWN0b3I8SVdlYkhpc3RvcnlJdGVtUHRyPiBtX2hpc3RvcnlJdGVtczsKIAogICAgIElXZWJW aWV3UHRyIG1fd2ViVmlldzsK 376857 2019-08-21 03:03:40 -0700 2019-08-21 18:50:20 -0700 Patch bug-200970-20190821190338.patch text/plain 19085 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ4OTMzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggY2VhM2E3ZjQ3YjUzMmMzZDJjMmZhYzRkZmIzMWFmNGZi NzExZDNlOC4uNTFhZmNiMmM5NGY5ZDE0M2I2MjQ2ODAyOTBiOWVlZDdhYmQ2YWU0ZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3 IEBACisyMDE5LTA4LTIxICBGdWppaSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29t PgorCisgICAgICAgIFtXaW5dW01pbmlCcm93c2VyXSBBZGQgYSBwcm9ncmVzcyBpbmRpY2F0b3Ig dG8gdGhlIG1haW4gd2luZG93CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMDA5NzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIE1pbmlCcm93c2VyL3dpbi9Ccm93c2VyV2luZG93Lmg6IEFkZGVkIEJyb3dz ZXJXaW5kb3dDbGllbnQgY2xhc3MuCisgICAgICAgICogTWluaUJyb3dzZXIvd2luL01haW5XaW5k b3cuY3BwOgorICAgICAgICAoTWFpbldpbmRvdzo6aW5pdCk6CisgICAgICAgIChNYWluV2luZG93 OjpyZXNpemVTdWJWaWV3cyk6CisgICAgICAgIChNYWluV2luZG93Ojpwcm9ncmVzc0NoYW5nZWQp OgorICAgICAgICAoTWFpbldpbmRvdzo6cHJvZ3Jlc3NGaW5pc2hlZCk6CisgICAgICAgICogTWlu aUJyb3dzZXIvd2luL01haW5XaW5kb3cuaDogSW5oZXJpdGVkIEJyb3dzZXJXaW5kb3dDbGllbnQu CisgICAgICAgIEFkZGVkIG1faFByb2dyZXNzSW5kaWNhdG9yLgorICAgICAgICAoTWFpbldpbmRv dzo6aHduZCBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIChNYWluV2luZG93Ojpicm93c2VyV2lu ZG93IGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKCk6IERlbGV0ZWQuCisgICAgICAgICogTWlu aUJyb3dzZXIvd2luL01pbmlCcm93c2VyV2ViSG9zdC5jcHA6CisgICAgICAgIChNaW5pQnJvd3Nl cldlYkhvc3Q6Om9uTm90aWZ5KToKKyAgICAgICAgKiBNaW5pQnJvd3Nlci93aW4vTWluaUJyb3dz ZXJXZWJIb3N0Lmg6CisgICAgICAgICogTWluaUJyb3dzZXIvd2luL1dlYktpdEJyb3dzZXJXaW5k b3cuY3BwOgorICAgICAgICAoV2ViS2l0QnJvd3NlcldpbmRvdzo6Y3JlYXRlKToKKyAgICAgICAg KFdlYktpdEJyb3dzZXJXaW5kb3c6OldlYktpdEJyb3dzZXJXaW5kb3cpOgorICAgICAgICAoV2Vi S2l0QnJvd3NlcldpbmRvdzo6ZGlkQ2hhbmdlSXNMb2FkaW5nKToKKyAgICAgICAgKFdlYktpdEJy b3dzZXJXaW5kb3c6OmRpZENoYW5nZUVzdGltYXRlZFByb2dyZXNzKToKKyAgICAgICAgKFdlYktp dEJyb3dzZXJXaW5kb3c6OmNyZWF0ZU5ld1BhZ2UpOgorICAgICAgICAqIE1pbmlCcm93c2VyL3dp bi9XZWJLaXRCcm93c2VyV2luZG93Lmg6CisgICAgICAgICogTWluaUJyb3dzZXIvd2luL1dlYktp dExlZ2FjeUJyb3dzZXJXaW5kb3cuY3BwOgorICAgICAgICAoV2ViS2l0TGVnYWN5QnJvd3Nlcldp bmRvdzo6Y3JlYXRlKToKKyAgICAgICAgKFdlYktpdExlZ2FjeUJyb3dzZXJXaW5kb3c6OldlYktp dExlZ2FjeUJyb3dzZXJXaW5kb3cpOgorICAgICAgICAoV2ViS2l0TGVnYWN5QnJvd3NlcldpbmRv dzo6aW5pdCk6CisgICAgICAgICogTWluaUJyb3dzZXIvd2luL1dlYktpdExlZ2FjeUJyb3dzZXJX aW5kb3cuaDoKKwogMjAxOS0wOC0yMCAgWmhpZmVpIEZhbmcgIDx6aGlmZWlfZmFuZ0BhcHBsZS5j b20+CiAKICAgICAgICAgW3Jlc3VsdHMud2Via2l0Lm9yZyBXZWJraXQuY3NzXSBBZGQgcmlnaHQg c2lkZWJhcgpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvd2luL0Jyb3dzZXJXaW5kb3cu aCBiL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9Ccm93c2VyV2luZG93LmgKaW5kZXggZmEwMTBiMTM1 NGJkNWZiZTM4OWRiNTcyZDg2ZjQyNzU2NzI0MDAxNC4uODg3ZDQ2OWI2YTRhY2RjMDc1Y2VmY2Jj YmM0NDlmZmU0N2M2MTEyYyAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvd2luL0Jyb3dz ZXJXaW5kb3cuaAorKysgYi9Ub29scy9NaW5pQnJvd3Nlci93aW4vQnJvd3NlcldpbmRvdy5oCkBA IC0yOCw2ICsyOCwxMiBAQAogI2luY2x1ZGUgPHdpbmRvd3MuaD4KICNpbmNsdWRlIDx3dGYvUmVm Q291bnRlZC5oPgogCitjbGFzcyBCcm93c2VyV2luZG93Q2xpZW50IHsKK3B1YmxpYzoKKyAgICB2 aXJ0dWFsIHZvaWQgcHJvZ3Jlc3NDaGFuZ2VkKGRvdWJsZSkgPSAwOworICAgIHZpcnR1YWwgdm9p ZCBwcm9ncmVzc0ZpbmlzaGVkKCkgPSAwOworfTsKKwogY2xhc3MgQnJvd3NlcldpbmRvdyA6IHB1 YmxpYyBSZWZDb3VudGVkPEJyb3dzZXJXaW5kb3c+IHsKIHB1YmxpYzoKICAgICB2aXJ0dWFsIH5C cm93c2VyV2luZG93KCkgeyB9OwpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvd2luL01h aW5XaW5kb3cuY3BwIGIvVG9vbHMvTWluaUJyb3dzZXIvd2luL01haW5XaW5kb3cuY3BwCmluZGV4 IDc4MTA1NTM0NTIyY2Q5YzhkMjcxYjQxZjA1NWVlYTMyMGIzYWExNjMuLmY4NWVkZWVmZWVjOWI0 MjhmZDI4MDMwMmFkNjU4NWY0MmVhOTRjNjIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2Vy L3dpbi9NYWluV2luZG93LmNwcAorKysgYi9Ub29scy9NaW5pQnJvd3Nlci93aW4vTWFpbldpbmRv dy5jcHAKQEAgLTMwLDYgKzMwLDcgQEAKICNpbmNsdWRlICJNaW5pQnJvd3NlckxpYlJlc291cmNl LmgiCiAjaW5jbHVkZSAiV2ViS2l0TGVnYWN5QnJvd3NlcldpbmRvdy5oIgogI2luY2x1ZGUgPENv cmVGb3VuZGF0aW9uL0NvcmVGb3VuZGF0aW9uLmg+CisjaW5jbHVkZSA8c3N0cmVhbT4KIAogI2lm IEVOQUJMRShXRUJLSVQpCiAjaW5jbHVkZSAiV2ViS2l0QnJvd3NlcldpbmRvdy5oIgpAQCAtMTE1 LDE2ICsxMTYsMTYgQEAgYm9vbCBNYWluV2luZG93Ojppbml0KEJyb3dzZXJXaW5kb3dGYWN0b3J5 IGZhY3RvcnksIEhJTlNUQU5DRSBoSW5zdGFuY2UsIGJvb2wgdXMKICAgICBFbmFibGVNZW51SXRl bShHZXRNZW51KG1faE1haW5XbmQpLCBJRE1fTkVXX1dFQktJVF9XSU5ET1csIE1GX0dSQVlFRCk7 CiAjZW5kaWYKIAotICAgIGZsb2F0IHNjYWxlRmFjdG9yID0gV2ViQ29yZTo6ZGV2aWNlU2NhbGVG YWN0b3JGb3JXaW5kb3cobnVsbHB0cik7CiAgICAgbV9oQmFja0J1dHRvblduZCA9IENyZWF0ZVdp bmRvdyhMIkJVVFRPTiIsIEwiPCIsIFdTX0NISUxEIHwgV1NfVklTSUJMRSAgfCBCU19URVhULCAw LCAwLCAwLCAwLCBtX2hNYWluV25kLCByZWludGVycHJldF9jYXN0PEhNRU5VPihJRE1fSElTVE9S WV9CQUNLV0FSRCksIGhJbnN0YW5jZSwgMCk7CiAgICAgbV9oRm9yd2FyZEJ1dHRvblduZCA9IENy ZWF0ZVdpbmRvdyhMIkJVVFRPTiIsIEwiPiIsIFdTX0NISUxEIHwgV1NfVklTSUJMRSB8IEJTX1RF WFQsIDAsIDAsIDAsIDAsIG1faE1haW5XbmQsIHJlaW50ZXJwcmV0X2Nhc3Q8SE1FTlU+KElETV9I SVNUT1JZX0ZPUldBUkQpLCBoSW5zdGFuY2UsIDApOwogICAgIG1faFJlbG9hZEJ1dHRvblduZCA9 IENyZWF0ZVdpbmRvdyhMIkJVVFRPTiIsIEwi4oa6IiwgV1NfQ0hJTEQgfCBXU19WSVNJQkxFIHwg QlNfVEVYVCwgMCwgMCwgMCwgMCwgbV9oTWFpblduZCwgcmVpbnRlcnByZXRfY2FzdDxITUVOVT4o SURNX1JFTE9BRCksIGhJbnN0YW5jZSwgMCk7CiAgICAgbV9oVVJMQmFyV25kID0gQ3JlYXRlV2lu ZG93KEwiRURJVCIsIDAsIFdTX0NISUxEIHwgV1NfVklTSUJMRSB8IFdTX0JPUkRFUiB8IEVTX0xF RlQgfCBFU19BVVRPVlNDUk9MTCwgMCwgMCwgMCwgMCwgbV9oTWFpblduZCwgMCwgaEluc3RhbmNl LCAwKTsKKyAgICBtX2hQcm9ncmVzc0luZGljYXRvciA9IENyZWF0ZVdpbmRvdyhMIlNUQVRJQyIs IDAsIFdTX0NISUxEIHwgV1NfVklTSUJMRSB8IFdTX0JPUkRFUiB8IFNTX0NFTlRFUiB8IFNTX0NF TlRFUklNQUdFLCAwLCAwLCAwLCAwLCBtX2hNYWluV25kLCAwLCBoSW5zdGFuY2UsIDApOwogCiAg ICAgRGVmRWRpdFByb2MgPSByZWludGVycHJldF9jYXN0PFdORFBST0M+KEdldFdpbmRvd0xvbmdQ dHIobV9oVVJMQmFyV25kLCBHV0xQX1dORFBST0MpKTsKICAgICBTZXRXaW5kb3dMb25nUHRyKG1f aFVSTEJhclduZCwgR1dMUF9XTkRQUk9DLCByZWludGVycHJldF9jYXN0PExPTkdfUFRSPihFZGl0 UHJvYykpOwogCi0gICAgbV9icm93c2VyV2luZG93ID0gZmFjdG9yeShtX2hNYWluV25kLCBtX2hV UkxCYXJXbmQsIHVzZXNMYXllcmVkV2ViVmlldyk7CisgICAgbV9icm93c2VyV2luZG93ID0gZmFj dG9yeSgqdGhpcywgbV9oTWFpblduZCwgbV9oVVJMQmFyV25kLCB1c2VzTGF5ZXJlZFdlYlZpZXcp OwogICAgIGlmICghbV9icm93c2VyV2luZG93KQogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAg SFJFU1VMVCBociA9IG1fYnJvd3NlcldpbmRvdy0+aW5pdCgpOwpAQCAtMTUwLDcgKzE1MSw4IEBA IHZvaWQgTWFpbldpbmRvdzo6cmVzaXplU3ViVmlld3MoKQogICAgIE1vdmVXaW5kb3cobV9oQmFj a0J1dHRvblduZCwgMCwgMCwgd2lkdGgsIGhlaWdodCwgVFJVRSk7CiAgICAgTW92ZVdpbmRvdyht X2hGb3J3YXJkQnV0dG9uV25kLCB3aWR0aCwgMCwgd2lkdGgsIGhlaWdodCwgVFJVRSk7CiAgICAg TW92ZVdpbmRvdyhtX2hSZWxvYWRCdXR0b25XbmQsIHdpZHRoICogMiwgMCwgd2lkdGgsIGhlaWdo dCwgVFJVRSk7Ci0gICAgTW92ZVdpbmRvdyhtX2hVUkxCYXJXbmQsIHdpZHRoICogMywgMCwgcmND bGllbnQucmlnaHQgLSB3aWR0aCAqIDMsIGhlaWdodCwgVFJVRSk7CisgICAgTW92ZVdpbmRvdyht X2hVUkxCYXJXbmQsIHdpZHRoICogMywgMCwgcmNDbGllbnQucmlnaHQgLSB3aWR0aCAqIDUsIGhl aWdodCwgVFJVRSk7CisgICAgTW92ZVdpbmRvdyhtX2hQcm9ncmVzc0luZGljYXRvciwgcmNDbGll bnQucmlnaHQgLSB3aWR0aCAqIDIsIDAsIHdpZHRoICogMiwgaGVpZ2h0LCBUUlVFKTsKIAogICAg IGlmIChtX2Jyb3dzZXJXaW5kb3ctPnVzZXNMYXllcmVkV2ViVmlldygpIHx8ICFtX2Jyb3dzZXJX aW5kb3ctPmh3bmQoKSkKICAgICAgICAgcmV0dXJuOwpAQCAtNDczLDMgKzQ3NSwxNSBAQCB2b2lk IE1haW5XaW5kb3c6OnVwZGF0ZURldmljZVNjYWxlRmFjdG9yKCkKICAgICAgICAgT1VUX1RUX09O TFlfUFJFQ0lTLCBDTElQX0RFRkFVTFRfUFJFQ0lTLCBDTEVBUlRZUEVfUVVBTElUWSwgRkZfRE9O VENBUkUsIEwiVGFob21hIik7CiAgICAgOjpTZW5kTWVzc2FnZShtX2hVUkxCYXJXbmQsIHN0YXRp Y19jYXN0PFVJTlQ+KFdNX1NFVEZPTlQpLCByZWludGVycHJldF9jYXN0PFdQQVJBTT4obV9oVVJM QmFyRm9udCksIFRSVUUpOwogfQorCit2b2lkIE1haW5XaW5kb3c6OnByb2dyZXNzQ2hhbmdlZChk b3VibGUgcHJvZ3Jlc3MpCit7CisgICAgc3RkOjp3b3N0cmluZ3N0cmVhbSB0ZXh0OworICAgIHRl eHQgPDwgc3RhdGljX2Nhc3Q8aW50Pihwcm9ncmVzcyAqIDEwMCkgPDwgTCclJzsKKyAgICBTZXRX aW5kb3dUZXh0KG1faFByb2dyZXNzSW5kaWNhdG9yLCB0ZXh0LnN0cigpLmNfc3RyKCkpOworfQor Cit2b2lkIE1haW5XaW5kb3c6OnByb2dyZXNzRmluaXNoZWQoKQoreworICAgIFNldFdpbmRvd1Rl eHQobV9oUHJvZ3Jlc3NJbmRpY2F0b3IsIEwiIik7Cit9CmRpZmYgLS1naXQgYS9Ub29scy9NaW5p QnJvd3Nlci93aW4vTWFpbldpbmRvdy5oIGIvVG9vbHMvTWluaUJyb3dzZXIvd2luL01haW5XaW5k b3cuaAppbmRleCAwY2I3MmIyZTUyOTdhM2EyMWY2ZDAwOWMyMjEwODAwZmFlMDgwZDA4Li42OGM5 ZmVhYTA3MWZlNjdiZGY1ZDNjMmFkZjgxMjg4ODAyMTBmZDljIDEwMDY0NAotLS0gYS9Ub29scy9N aW5pQnJvd3Nlci93aW4vTWFpbldpbmRvdy5oCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9N YWluV2luZG93LmgKQEAgLTMxLDkgKzMxLDkgQEAKICNpbmNsdWRlIDxzdHJpbmc+CiAjaW5jbHVk ZSA8d3RmL1JlZlB0ci5oPgogCi1jbGFzcyBNYWluV2luZG93IDogcHVibGljIFJlZkNvdW50ZWQ8 TWFpbldpbmRvdz4geworY2xhc3MgTWFpbldpbmRvdyBmaW5hbCA6IHB1YmxpYyBSZWZDb3VudGVk PE1haW5XaW5kb3c+LCBwdWJsaWMgQnJvd3NlcldpbmRvd0NsaWVudCB7CiBwdWJsaWM6Ci0gICAg dXNpbmcgQnJvd3NlcldpbmRvd0ZhY3RvcnkgPSBzdGQ6OmZ1bmN0aW9uPFJlZjxCcm93c2VyV2lu ZG93PihIV05EIG1haW5XbmQsIEhXTkQgdXJsQmFyV25kLCBib29sIHVzZXNMYXllcmVkV2ViVmll dyk+OworICAgIHVzaW5nIEJyb3dzZXJXaW5kb3dGYWN0b3J5ID0gc3RkOjpmdW5jdGlvbjxSZWY8 QnJvd3NlcldpbmRvdz4oQnJvd3NlcldpbmRvd0NsaWVudCYsIEhXTkQgbWFpblduZCwgSFdORCB1 cmxCYXJXbmQsIGJvb2wgdXNlc0xheWVyZWRXZWJWaWV3KT47CiAKICAgICBzdGF0aWMgUmVmPE1h aW5XaW5kb3c+IGNyZWF0ZSgpOwogCkBAIC01OSwxMSArNTksMTYgQEAgcHJpdmF0ZToKICAgICB2 b2lkIG9uVVJMQmFyRW50ZXIoKTsKICAgICB2b2lkIHVwZGF0ZURldmljZVNjYWxlRmFjdG9yKCk7 CiAKKyAgICAvLyBCcm93c2VyV2luZG93Q2xpZW50CisgICAgdm9pZCBwcm9ncmVzc0NoYW5nZWQo ZG91YmxlKSBmaW5hbDsKKyAgICB2b2lkIHByb2dyZXNzRmluaXNoZWQoKSBmaW5hbDsKKwogICAg IEhXTkQgbV9oTWFpblduZCB7IG51bGxwdHIgfTsKICAgICBIV05EIG1faFVSTEJhclduZCB7IG51 bGxwdHIgfTsKICAgICBIV05EIG1faEJhY2tCdXR0b25XbmQgeyBudWxscHRyIH07CiAgICAgSFdO RCBtX2hGb3J3YXJkQnV0dG9uV25kIHsgbnVsbHB0ciB9OwogICAgIEhXTkQgbV9oUmVsb2FkQnV0 dG9uV25kIHsgbnVsbHB0ciB9OworICAgIEhXTkQgbV9oUHJvZ3Jlc3NJbmRpY2F0b3IgeyBudWxs cHRyIH07CiAgICAgSFdORCBtX2hDYWNoZVduZCB7IG51bGxwdHIgfTsKICAgICBIR0RJT0JKIG1f aFVSTEJhckZvbnQgeyBudWxscHRyIH07CiAgICAgUmVmUHRyPEJyb3dzZXJXaW5kb3c+IG1fYnJv d3NlcldpbmRvdzsKZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9NaW5pQnJvd3Nl cldlYkhvc3QuY3BwIGIvVG9vbHMvTWluaUJyb3dzZXIvd2luL01pbmlCcm93c2VyV2ViSG9zdC5j cHAKaW5kZXggZDM1YTI0YTAyOTE1MWM3ZmJhNjFhY2U3NTU3MjA3MjFlNGE4ODY2Zi4uZjYwYmU1 NTU1MjQzNGY5NTA4OWQwNDc5MzJhZWMzYjVmYTU5YTMxMSAxMDA2NDQKLS0tIGEvVG9vbHMvTWlu aUJyb3dzZXIvd2luL01pbmlCcm93c2VyV2ViSG9zdC5jcHAKKysrIGIvVG9vbHMvTWluaUJyb3dz ZXIvd2luL01pbmlCcm93c2VyV2ViSG9zdC5jcHAKQEAgLTE2NiwzICsxNjYsMjggQEAgSFJFU1VM VCBNaW5pQnJvd3NlcldlYkhvc3Q6OmRpZEZpcnN0TGF5b3V0SW5GcmFtZShfSW5fb3B0XyBJV2Vi VmlldyosIF9Jbl9vcHRfIEkKIAogICAgIHJldHVybiBTX09LOwogfQorCitIUkVTVUxUIE1pbmlC cm93c2VyV2ViSG9zdDo6b25Ob3RpZnkoX0luX29wdF8gSVdlYk5vdGlmaWNhdGlvbiogbm90aWZp Y2F0aW9uKQoreworICAgIF9ic3RyX3QgbmFtZTsKKyAgICBIUkVTVUxUIGhyID0gbm90aWZpY2F0 aW9uLT5uYW1lKG5hbWUuR2V0QWRkcmVzcygpKTsKKyAgICBpZiAoRkFJTEVEKGhyKSkKKyAgICAg ICAgcmV0dXJuIGhyOworICAgIGlmIChuYW1lID09IF9ic3RyX3QoV2ViVmlld1Byb2dyZXNzRXN0 aW1hdGVDaGFuZ2VkTm90aWZpY2F0aW9uKSkgeworICAgICAgICBJVW5rbm93blB0ciBvYmplY3Q7 CisgICAgICAgIGhyID0gbm90aWZpY2F0aW9uLT5nZXRPYmplY3QoJm9iamVjdC5HZXRJbnRlcmZh Y2VQdHIoKSk7CisgICAgICAgIGlmIChGQUlMRUQoaHIpKQorICAgICAgICAgICAgcmV0dXJuIGhy OworICAgICAgICBJV2ViVmlld1B0ciB3ZWJWaWV3KG9iamVjdCk7CisgICAgICAgIGlmICghd2Vi VmlldykKKyAgICAgICAgICAgIHJldHVybiBFX05PSU5URVJGQUNFOworICAgICAgICBkb3VibGUg cHJvZ3Jlc3M7CisgICAgICAgIGhyID0gd2ViVmlldy0+ZXN0aW1hdGVkUHJvZ3Jlc3MoJnByb2dy ZXNzKTsKKyAgICAgICAgaWYgKEZBSUxFRChocikpCisgICAgICAgICAgICByZXR1cm4gaHI7Cisg ICAgICAgIG1fY2xpZW50LT5tX2NsaWVudC5wcm9ncmVzc0NoYW5nZWQocHJvZ3Jlc3MpOworICAg IH0gZWxzZSBpZiAobmFtZSA9PSBfYnN0cl90KFdlYlZpZXdQcm9ncmVzc0ZpbmlzaGVkTm90aWZp Y2F0aW9uKSkKKyAgICAgICAgbV9jbGllbnQtPm1fY2xpZW50LnByb2dyZXNzRmluaXNoZWQoKTsK KyAgICAKKyAgICByZXR1cm4gU19PSzsKK30KZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2Vy L3dpbi9NaW5pQnJvd3NlcldlYkhvc3QuaCBiL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9NaW5pQnJv d3NlcldlYkhvc3QuaAppbmRleCA2MWQxNzNkNmIzNTY0Yjc2M2YxYTJjMjIzMDY1MzFlNmZmNjk4 YjY1Li5lZDJlNDc4YmU0MTNhODgzMjA5NTg1NmZlYTIyNDY0YWI4ZWQ4ZTUwIDEwMDY0NAotLS0g YS9Ub29scy9NaW5pQnJvd3Nlci93aW4vTWluaUJyb3dzZXJXZWJIb3N0LmgKKysrIGIvVG9vbHMv TWluaUJyb3dzZXIvd2luL01pbmlCcm93c2VyV2ViSG9zdC5oCkBAIC0zMSw3ICszMSw3IEBACiAK IGNsYXNzIFdlYktpdExlZ2FjeUJyb3dzZXJXaW5kb3c7CiAKLWNsYXNzIE1pbmlCcm93c2VyV2Vi SG9zdCA6IHB1YmxpYyBJV2ViRnJhbWVMb2FkRGVsZWdhdGUsIHB1YmxpYyBJV2ViRnJhbWVMb2Fk RGVsZWdhdGVQcml2YXRlIHsKK2NsYXNzIE1pbmlCcm93c2VyV2ViSG9zdCA6IHB1YmxpYyBJV2Vi RnJhbWVMb2FkRGVsZWdhdGUsIHB1YmxpYyBJV2ViRnJhbWVMb2FkRGVsZWdhdGVQcml2YXRlLCBw dWJsaWMgSVdlYk5vdGlmaWNhdGlvbk9ic2VydmVyIHsKIHB1YmxpYzoKICAgICBNaW5pQnJvd3Nl cldlYkhvc3QoV2ViS2l0TGVnYWN5QnJvd3NlcldpbmRvdyogY2xpZW50LCBIV05EIHVybEJhcikK ICAgICAgICAgOiBtX2NsaWVudChjbGllbnQpLCBtX2hVUkxCYXJXbmQodXJsQmFyKSB7IH0KQEAg LTcxLDYgKzcxLDkgQEAgcHVibGljOgogICAgIHZpcnR1YWwgSFJFU1VMVCBTVERNRVRIT0RDQUxM VFlQRSBkaWRIYW5kbGVPbmxvYWRFdmVudHNGb3JGcmFtZShfSW5fb3B0XyBJV2ViVmlldyosIF9J bl9vcHRfIElXZWJGcmFtZSopOwogICAgIHZpcnR1YWwgSFJFU1VMVCBTVERNRVRIT0RDQUxMVFlQ RSBkaWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXRJbkZyYW1lKF9Jbl9vcHRfIElXZWJWaWV3 KiBzZW5kZXIsIF9Jbl9vcHRfIElXZWJGcmFtZSopICB7IHJldHVybiBTX09LOyB9CiAKKyAgICAv LyBJV2ViTm90aWZpY2F0aW9uT2JzZXJ2ZXIKKyAgICB2aXJ0dWFsIEhSRVNVTFQgU1RETUVUSE9E Q0FMTFRZUEUgb25Ob3RpZnkoX0luX29wdF8gSVdlYk5vdGlmaWNhdGlvbiopOworCiAgICAgdm9p ZCBsb2FkVVJMKF9ic3RyX3QmKTsKIAogcHJvdGVjdGVkOgpkaWZmIC0tZ2l0IGEvVG9vbHMvTWlu aUJyb3dzZXIvd2luL1dlYktpdEJyb3dzZXJXaW5kb3cuY3BwIGIvVG9vbHMvTWluaUJyb3dzZXIv d2luL1dlYktpdEJyb3dzZXJXaW5kb3cuY3BwCmluZGV4IGYzMGU4YWYwNzMxYWE4NzIzOWQ2MTUz NWUwODdmY2RmOThiMzJhYjEuLmU0MWFkNzY1N2NhODZkNTBiZmFiYmU5YmIxNzRjMzk2NWZjZTdm YzQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9XZWJLaXRCcm93c2VyV2luZG93 LmNwcAorKysgYi9Ub29scy9NaW5pQnJvd3Nlci93aW4vV2ViS2l0QnJvd3NlcldpbmRvdy5jcHAK QEAgLTEwNCw3ICsxMDQsNyBAQCBXS1JldGFpblB0cjxXS1VSTFJlZj4gY3JlYXRlV0tVUkwoY29u c3Qgc3RkOjp3c3RyaW5nJiBzdHIpCiAgICAgcmV0dXJuIGFkb3B0V0soV0tVUkxDcmVhdGVXaXRo VVRGOENTdHJpbmcodXRmOC5kYXRhKCkpKTsKIH0KIAotUmVmPEJyb3dzZXJXaW5kb3c+IFdlYktp dEJyb3dzZXJXaW5kb3c6OmNyZWF0ZShIV05EIG1haW5XbmQsIEhXTkQgdXJsQmFyV25kLCBib29s KQorUmVmPEJyb3dzZXJXaW5kb3c+IFdlYktpdEJyb3dzZXJXaW5kb3c6OmNyZWF0ZShCcm93c2Vy V2luZG93Q2xpZW50JiBjbGllbnQsIEhXTkQgbWFpblduZCwgSFdORCB1cmxCYXJXbmQsIGJvb2wp CiB7CiAgICAgYXV0byBjb25mID0gYWRvcHRXSyhXS1BhZ2VDb25maWd1cmF0aW9uQ3JlYXRlKCkp OwogCkBAIC0xMjEsMTEgKzEyMSwxMiBAQCBSZWY8QnJvd3NlcldpbmRvdz4gV2ViS2l0QnJvd3Nl cldpbmRvdzo6Y3JlYXRlKEhXTkQgbWFpblduZCwgSFdORCB1cmxCYXJXbmQsIGJvbwogICAgIGF1 dG8gY29udGV4dCA9YWRvcHRXSyhXS0NvbnRleHRDcmVhdGVXaXRoQ29uZmlndXJhdGlvbihudWxs cHRyKSk7CiAgICAgV0tQYWdlQ29uZmlndXJhdGlvblNldENvbnRleHQoY29uZi5nZXQoKSwgY29u dGV4dC5nZXQoKSk7CiAKLSAgICByZXR1cm4gYWRvcHRSZWYoKm5ldyBXZWJLaXRCcm93c2VyV2lu ZG93KGNvbmYuZ2V0KCksIG1haW5XbmQsIHVybEJhclduZCkpOworICAgIHJldHVybiBhZG9wdFJl ZigqbmV3IFdlYktpdEJyb3dzZXJXaW5kb3coY2xpZW50LCBjb25mLmdldCgpLCBtYWluV25kLCB1 cmxCYXJXbmQpKTsKIH0KIAotV2ViS2l0QnJvd3NlcldpbmRvdzo6V2ViS2l0QnJvd3NlcldpbmRv dyhXS1BhZ2VDb25maWd1cmF0aW9uUmVmIGNvbmYsIEhXTkQgbWFpblduZCwgSFdORCB1cmxCYXJX bmQpCi0gICAgOiBtX2hNYWluV25kKG1haW5XbmQpCitXZWJLaXRCcm93c2VyV2luZG93OjpXZWJL aXRCcm93c2VyV2luZG93KEJyb3dzZXJXaW5kb3dDbGllbnQmIGNsaWVudCwgV0tQYWdlQ29uZmln dXJhdGlvblJlZiBjb25mLCBIV05EIG1haW5XbmQsIEhXTkQgdXJsQmFyV25kKQorICAgIDogbV9j bGllbnQoY2xpZW50KQorICAgICwgbV9oTWFpblduZChtYWluV25kKQogICAgICwgbV91cmxCYXJX bmQodXJsQmFyV25kKQogewogICAgIFJFQ1QgcmVjdCA9IHsgfTsKQEAgLTE1Miw2ICsxNTMsOCBA QCBXZWJLaXRCcm93c2VyV2luZG93OjpXZWJLaXRCcm93c2VyV2luZG93KFdLUGFnZUNvbmZpZ3Vy YXRpb25SZWYgY29uZiwgSFdORCBtYWluVwogICAgIHN0YXRlQ2xpZW50LmJhc2UudmVyc2lvbiA9 IDA7CiAgICAgc3RhdGVDbGllbnQuYmFzZS5jbGllbnRJbmZvID0gdGhpczsKICAgICBzdGF0ZUNs aWVudC5kaWRDaGFuZ2VUaXRsZSA9IGRpZENoYW5nZVRpdGxlOworICAgIHN0YXRlQ2xpZW50LmRp ZENoYW5nZUlzTG9hZGluZyA9IGRpZENoYW5nZUlzTG9hZGluZzsKKyAgICBzdGF0ZUNsaWVudC5k aWRDaGFuZ2VFc3RpbWF0ZWRQcm9ncmVzcyA9IGRpZENoYW5nZUVzdGltYXRlZFByb2dyZXNzOwog ICAgIFdLUGFnZVNldFBhZ2VTdGF0ZUNsaWVudChwYWdlLCAmc3RhdGVDbGllbnQuYmFzZSk7CiAK ICAgICB1cGRhdGVQcm94eVNldHRpbmdzKCk7CkBAIC0zMDgsNiArMzExLDIwIEBAIHZvaWQgV2Vi S2l0QnJvd3NlcldpbmRvdzo6ZGlkQ2hhbmdlVGl0bGUoY29uc3Qgdm9pZCogY2xpZW50SW5mbykK ICAgICBTZXRXaW5kb3dUZXh0KHRoaXNXaW5kb3cubV9oTWFpblduZCwgdGl0bGVTdHJpbmcuY19z dHIoKSk7CiB9CiAKK3ZvaWQgV2ViS2l0QnJvd3NlcldpbmRvdzo6ZGlkQ2hhbmdlSXNMb2FkaW5n KGNvbnN0IHZvaWQqIGNsaWVudEluZm8pCit7CisgICAgYXV0byYgdGhpc1dpbmRvdyA9IHRvV2Vi S2l0QnJvd3NlcldpbmRvdyhjbGllbnRJbmZvKTsKKyAgICBhdXRvIHBhZ2UgPSBXS1ZpZXdHZXRQ YWdlKHRoaXNXaW5kb3cubV92aWV3LmdldCgpKTsKKyAgICB0aGlzV2luZG93Lm1fY2xpZW50LnBy b2dyZXNzRmluaXNoZWQoKTsKK30KKwordm9pZCBXZWJLaXRCcm93c2VyV2luZG93OjpkaWRDaGFu Z2VFc3RpbWF0ZWRQcm9ncmVzcyhjb25zdCB2b2lkKiBjbGllbnRJbmZvKQoreworICAgIGF1dG8m IHRoaXNXaW5kb3cgPSB0b1dlYktpdEJyb3dzZXJXaW5kb3coY2xpZW50SW5mbyk7CisgICAgYXV0 byBwYWdlID0gV0tWaWV3R2V0UGFnZSh0aGlzV2luZG93Lm1fdmlldy5nZXQoKSk7CisgICAgdGhp c1dpbmRvdy5tX2NsaWVudC5wcm9ncmVzc0NoYW5nZWQoV0tQYWdlR2V0RXN0aW1hdGVkUHJvZ3Jl c3MocGFnZSkpOworfQorCiB2b2lkIFdlYktpdEJyb3dzZXJXaW5kb3c6OmRpZENvbW1pdE5hdmln YXRpb24oV0tQYWdlUmVmIHBhZ2UsIFdLTmF2aWdhdGlvblJlZiBuYXZpZ2F0aW9uLCBXS1R5cGVS ZWYgdXNlckRhdGEsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pCiB7CiAgICAgYXV0byYgdGhpc1dp bmRvdyA9IHRvV2ViS2l0QnJvd3NlcldpbmRvdyhjbGllbnRJbmZvKTsKQEAgLTM2Nyw4ICszODQs OCBAQCBib29sIFdlYktpdEJyb3dzZXJXaW5kb3c6OmNhblRydXN0U2VydmVyQ2VydGlmaWNhdGUo V0tQcm90ZWN0aW9uU3BhY2VSZWYgcHJvdGVjdAogV0tQYWdlUmVmIFdlYktpdEJyb3dzZXJXaW5k b3c6OmNyZWF0ZU5ld1BhZ2UoV0tQYWdlUmVmIHBhZ2UsIFdLUGFnZUNvbmZpZ3VyYXRpb25SZWYg Y29uZmlndXJhdGlvbiwgV0tOYXZpZ2F0aW9uQWN0aW9uUmVmIG5hdmlnYXRpb25BY3Rpb24sIFdL V2luZG93RmVhdHVyZXNSZWYgd2luZG93RmVhdHVyZXMsIGNvbnN0IHZvaWQgKmNsaWVudEluZm8p CiB7CiAgICAgYXV0byYgbmV3V2luZG93ID0gTWFpbldpbmRvdzo6Y3JlYXRlKCkubGVha1JlZigp OwotICAgIGF1dG8gZmFjdG9yeSA9IFtjb25maWd1cmF0aW9uXShIV05EIG1haW5XbmQsIEhXTkQg dXJsQmFyV25kLCBib29sKSAtPiBhdXRvIHsKLSAgICAgICAgcmV0dXJuIGFkb3B0UmVmKCpuZXcg V2ViS2l0QnJvd3NlcldpbmRvdyhjb25maWd1cmF0aW9uLCBtYWluV25kLCB1cmxCYXJXbmQpKTsK KyAgICBhdXRvIGZhY3RvcnkgPSBbY29uZmlndXJhdGlvbl0oQnJvd3NlcldpbmRvd0NsaWVudCYg Y2xpZW50LCBIV05EIG1haW5XbmQsIEhXTkQgdXJsQmFyV25kLCBib29sKSAtPiBhdXRvIHsKKyAg ICAgICAgcmV0dXJuIGFkb3B0UmVmKCpuZXcgV2ViS2l0QnJvd3NlcldpbmRvdyhjbGllbnQsIGNv bmZpZ3VyYXRpb24sIG1haW5XbmQsIHVybEJhclduZCkpOwogICAgIH07CiAgICAgYm9vbCBvayA9 IG5ld1dpbmRvdy5pbml0KGZhY3RvcnksIGhJbnN0KTsKICAgICBpZiAoIW9rKQpkaWZmIC0tZ2l0 IGEvVG9vbHMvTWluaUJyb3dzZXIvd2luL1dlYktpdEJyb3dzZXJXaW5kb3cuaCBiL1Rvb2xzL01p bmlCcm93c2VyL3dpbi9XZWJLaXRCcm93c2VyV2luZG93LmgKaW5kZXggNTM5ODUwNDgyYjU1NzNk NTEyM2Q2NjI3OTQyNjk4NjY3MGQzYjIxNC4uMGM5NTFhNTQxZWEwMzQ2MWU5ZjA0YmI4ZTg4M2Ri ZDUxZmQ1YmIzMiAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvd2luL1dlYktpdEJyb3dz ZXJXaW5kb3cuaAorKysgYi9Ub29scy9NaW5pQnJvd3Nlci93aW4vV2ViS2l0QnJvd3NlcldpbmRv dy5oCkBAIC0zMywxMCArMzMsMTAgQEAKIAogY2xhc3MgV2ViS2l0QnJvd3NlcldpbmRvdyA6IHB1 YmxpYyBCcm93c2VyV2luZG93IHsKIHB1YmxpYzoKLSAgICBzdGF0aWMgUmVmPEJyb3dzZXJXaW5k b3c+IGNyZWF0ZShIV05EIG1haW5XbmQsIEhXTkQgdXJsQmFyV25kLCBib29sIHVzZUxheWVyZWRX ZWJWaWV3ID0gZmFsc2UpOworICAgIHN0YXRpYyBSZWY8QnJvd3NlcldpbmRvdz4gY3JlYXRlKEJy b3dzZXJXaW5kb3dDbGllbnQmLCBIV05EIG1haW5XbmQsIEhXTkQgdXJsQmFyV25kLCBib29sIHVz ZUxheWVyZWRXZWJWaWV3ID0gZmFsc2UpOwogCiBwcml2YXRlOgotICAgIFdlYktpdEJyb3dzZXJX aW5kb3coV0tQYWdlQ29uZmlndXJhdGlvblJlZiwgSFdORCBtYWluV25kLCBIV05EIHVybEJhcldu ZCk7CisgICAgV2ViS2l0QnJvd3NlcldpbmRvdyhCcm93c2VyV2luZG93Q2xpZW50JiwgV0tQYWdl Q29uZmlndXJhdGlvblJlZiwgSFdORCBtYWluV25kLCBIV05EIHVybEJhclduZCk7CiAKICAgICBI UkVTVUxUIGluaXQoKSBvdmVycmlkZTsKICAgICBIV05EIGh3bmQoKSBvdmVycmlkZTsKQEAgLTY2 LDExICs2NiwxNCBAQCBwcml2YXRlOgogICAgIGJvb2wgY2FuVHJ1c3RTZXJ2ZXJDZXJ0aWZpY2F0 ZShXS1Byb3RlY3Rpb25TcGFjZVJlZik7CiAKICAgICBzdGF0aWMgdm9pZCBkaWRDaGFuZ2VUaXRs ZShjb25zdCB2b2lkKik7CisgICAgc3RhdGljIHZvaWQgZGlkQ2hhbmdlSXNMb2FkaW5nKGNvbnN0 IHZvaWQqKTsKKyAgICBzdGF0aWMgdm9pZCBkaWRDaGFuZ2VFc3RpbWF0ZWRQcm9ncmVzcyhjb25z dCB2b2lkKik7CiAgICAgc3RhdGljIHZvaWQgZGlkQ29tbWl0TmF2aWdhdGlvbihXS1BhZ2VSZWYs IFdLTmF2aWdhdGlvblJlZiwgV0tUeXBlUmVmLCBjb25zdCB2b2lkKik7CiAgICAgc3RhdGljIHZv aWQgZGlkUmVjZWl2ZUF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlKFdLUGFnZVJlZiwgV0tBdXRoZW50 aWNhdGlvbkNoYWxsZW5nZVJlZiwgY29uc3Qgdm9pZCopOwogICAgIHN0YXRpYyBXS1BhZ2VSZWYg Y3JlYXRlTmV3UGFnZShXS1BhZ2VSZWYsIFdLUGFnZUNvbmZpZ3VyYXRpb25SZWYsIFdLTmF2aWdh dGlvbkFjdGlvblJlZiwgV0tXaW5kb3dGZWF0dXJlc1JlZiwgY29uc3Qgdm9pZCAqKTsKICAgICBz dGF0aWMgdm9pZCBkaWROb3RIYW5kbGVLZXlFdmVudChXS1BhZ2VSZWYsIFdLTmF0aXZlRXZlbnRQ dHIsIGNvbnN0IHZvaWQqKTsKIAorICAgIEJyb3dzZXJXaW5kb3dDbGllbnQmIG1fY2xpZW50Owog ICAgIFdLUmV0YWluUHRyPFdLVmlld1JlZj4gbV92aWV3OwogICAgIEhXTkQgbV9oTWFpblduZCB7 IG51bGxwdHIgfTsKICAgICBIV05EIG1fdXJsQmFyV25kIHsgbnVsbHB0ciB9OwpkaWZmIC0tZ2l0 IGEvVG9vbHMvTWluaUJyb3dzZXIvd2luL1dlYktpdExlZ2FjeUJyb3dzZXJXaW5kb3cuY3BwIGIv VG9vbHMvTWluaUJyb3dzZXIvd2luL1dlYktpdExlZ2FjeUJyb3dzZXJXaW5kb3cuY3BwCmluZGV4 IGRlOGVkOGMyMjk4Njg2YmEyZDg5ZDRkNmFmOGExNTc0NWZhMjYyYzAuLmE0OThhOGM1NWU2YjNi N2MyNDM1NWY0ZTVkMjRiZjZkYmFmYzJiNTMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2Vy L3dpbi9XZWJLaXRMZWdhY3lCcm93c2VyV2luZG93LmNwcAorKysgYi9Ub29scy9NaW5pQnJvd3Nl ci93aW4vV2ViS2l0TGVnYWN5QnJvd3NlcldpbmRvdy5jcHAKQEAgLTU4LDE0ICs1OCwxOCBAQCBm bG9hdCBkZXZpY2VTY2FsZUZhY3RvckZvcldpbmRvdyhIV05EKTsKIHN0YXRpYyBjb25zdCBpbnQg bWF4SGlzdG9yeVNpemUgPSAxMDsKIAogdHlwZWRlZiBfY29tX3B0cl90PF9jb21fSUlJRDxJV2Vi TXV0YWJsZVVSTFJlcXVlc3QsICZfX3V1aWRvZihJV2ViTXV0YWJsZVVSTFJlcXVlc3QpPj4gSVdl Yk11dGFibGVVUkxSZXF1ZXN0UHRyOwordHlwZWRlZiBfY29tX3B0cl90PF9jb21fSUlJRDxJV2Vi Tm90aWZpY2F0aW9uT2JzZXJ2ZXIsICZfX3V1aWRvZihJV2ViTm90aWZpY2F0aW9uT2JzZXJ2ZXIp Pj4gSVdlYk5vdGlmaWNhdGlvbk9ic2VydmVyUHRyOwordHlwZWRlZiBfY29tX3B0cl90PF9jb21f SUlJRDxJV2ViTm90aWZpY2F0aW9uQ2VudGVyLCAmX191dWlkb2YoSVdlYk5vdGlmaWNhdGlvbkNl bnRlcik+PiBJV2ViTm90aWZpY2F0aW9uQ2VudGVyUHRyOwogCi1SZWY8QnJvd3NlcldpbmRvdz4g V2ViS2l0TGVnYWN5QnJvd3NlcldpbmRvdzo6Y3JlYXRlKEhXTkQgbWFpblduZCwgSFdORCB1cmxC YXJXbmQsIGJvb2wgdXNlTGF5ZXJlZFdlYlZpZXcpCisKK1JlZjxCcm93c2VyV2luZG93PiBXZWJL aXRMZWdhY3lCcm93c2VyV2luZG93OjpjcmVhdGUoQnJvd3NlcldpbmRvd0NsaWVudCYgY2xpZW50 LCBIV05EIG1haW5XbmQsIEhXTkQgdXJsQmFyV25kLCBib29sIHVzZUxheWVyZWRXZWJWaWV3KQog ewotICAgIHJldHVybiBhZG9wdFJlZigqbmV3IFdlYktpdExlZ2FjeUJyb3dzZXJXaW5kb3cobWFp blduZCwgdXJsQmFyV25kLCB1c2VMYXllcmVkV2ViVmlldykpOworICAgIHJldHVybiBhZG9wdFJl ZigqbmV3IFdlYktpdExlZ2FjeUJyb3dzZXJXaW5kb3coY2xpZW50LCBtYWluV25kLCB1cmxCYXJX bmQsIHVzZUxheWVyZWRXZWJWaWV3KSk7CiB9CiAKLVdlYktpdExlZ2FjeUJyb3dzZXJXaW5kb3c6 OldlYktpdExlZ2FjeUJyb3dzZXJXaW5kb3coSFdORCBtYWluV25kLCBIV05EIHVybEJhclduZCwg Ym9vbCB1c2VMYXllcmVkV2ViVmlldykKLSAgICA6IG1faE1haW5XbmQobWFpblduZCkKK1dlYktp dExlZ2FjeUJyb3dzZXJXaW5kb3c6OldlYktpdExlZ2FjeUJyb3dzZXJXaW5kb3coQnJvd3Nlcldp bmRvd0NsaWVudCYgY2xpZW50LCBIV05EIG1haW5XbmQsIEhXTkQgdXJsQmFyV25kLCBib29sIHVz ZUxheWVyZWRXZWJWaWV3KQorICAgIDogbV9jbGllbnQoY2xpZW50KQorICAgICwgbV9oTWFpbldu ZChtYWluV25kKQogICAgICwgbV9oVVJMQmFyV25kKHVybEJhclduZCkKICAgICAsIG1fdXNlTGF5 ZXJlZFdlYlZpZXcodXNlTGF5ZXJlZFdlYlZpZXcpCiB7CkBAIC0xMDYsNiArMTEwLDE2IEBAIEhS RVNVTFQgV2ViS2l0TGVnYWN5QnJvd3NlcldpbmRvdzo6aW5pdCgpCiAgICAgaWYgKEZBSUxFRCho cikpCiAgICAgICAgIHJldHVybiBocjsKIAorICAgIElXZWJOb3RpZmljYXRpb25DZW50ZXJQdHIg bm90aWZpY2F0aW9uQ2VudGVyOworICAgIGhyID0gV2ViS2l0Q3JlYXRlSW5zdGFuY2UoQ0xTSURf V2ViTm90aWZpY2F0aW9uQ2VudGVyLCAwLCBfX3V1aWRvZihub3RpZmljYXRpb25DZW50ZXIpLCBy ZWludGVycHJldF9jYXN0PHZvaWQqKj4oJm5vdGlmaWNhdGlvbkNlbnRlci5HZXRJbnRlcmZhY2VQ dHIoKSkpOworICAgIGlmIChGQUlMRUQoaHIpKQorICAgICAgICByZXR1cm4gaHI7CisKKyAgICBJ V2ViTm90aWZpY2F0aW9uQ2VudGVyUHRyIGRlZmF1bHROb3RpZmljYXRpb25DZW50ZXI7CisgICAg aHIgPSBub3RpZmljYXRpb25DZW50ZXItPmRlZmF1bHRDZW50ZXIoJmRlZmF1bHROb3RpZmljYXRp b25DZW50ZXIuR2V0SW50ZXJmYWNlUHRyKCkpOworICAgIGlmIChGQUlMRUQoaHIpKQorICAgICAg ICByZXR1cm4gaHI7CisKICAgICBpZiAoIXNlZWRJbml0aWFsRGVmYXVsdFByZWZlcmVuY2VzKCkp CiAgICAgICAgIHJldHVybiBFX0ZBSUw7CiAKQEAgLTEyNSw2ICsxMzksMTQgQEAgSFJFU1VMVCBX ZWJLaXRMZWdhY3lCcm93c2VyV2luZG93Ojppbml0KCkKICAgICBpZiAoRkFJTEVEKGhyKSkKICAg ICAgICAgcmV0dXJuIGhyOwogCisgICAgaHIgPSBkZWZhdWx0Tm90aWZpY2F0aW9uQ2VudGVyLT5h ZGRPYnNlcnZlcih3ZWJIb3N0LCBfYnN0cl90KFdlYlZpZXdQcm9ncmVzc0VzdGltYXRlQ2hhbmdl ZE5vdGlmaWNhdGlvbiksIG51bGxwdHIpOworICAgIGlmIChGQUlMRUQoaHIpKQorICAgICAgICBy ZXR1cm4gaHI7CisKKyAgICBociA9IGRlZmF1bHROb3RpZmljYXRpb25DZW50ZXItPmFkZE9ic2Vy dmVyKHdlYkhvc3QsIF9ic3RyX3QoV2ViVmlld1Byb2dyZXNzRmluaXNoZWROb3RpZmljYXRpb24p LCBudWxscHRyKTsKKyAgICBpZiAoRkFJTEVEKGhyKSkKKyAgICAgICAgcmV0dXJuIGhyOworCiAg ICAgaHIgPSBzZXRVSURlbGVnYXRlKG5ldyBQcmludFdlYlVJRGVsZWdhdGUoKnRoaXMpKTsKICAg ICBpZiAoRkFJTEVEIChocikpCiAgICAgICAgIHJldHVybiBocjsKZGlmZiAtLWdpdCBhL1Rvb2xz L01pbmlCcm93c2VyL3dpbi9XZWJLaXRMZWdhY3lCcm93c2VyV2luZG93LmggYi9Ub29scy9NaW5p QnJvd3Nlci93aW4vV2ViS2l0TGVnYWN5QnJvd3NlcldpbmRvdy5oCmluZGV4IGI3NjViZGFkZWFl ZmY3NWQ2NTQ1NzcyMmZiNTQ0ZDQ0YTcxMmEyODIuLjM2MGE5MGI0Mjk4ZDNlNjQ3ODIwYzAwNjMy MDZlNjc1MjgwMjg0NjMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9XZWJLaXRM ZWdhY3lCcm93c2VyV2luZG93LmgKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvd2luL1dlYktpdExl Z2FjeUJyb3dzZXJXaW5kb3cuaApAQCAtMzEsNiArMzEsNyBAQAogI2luY2x1ZGUgPHZlY3Rvcj4K ICNpbmNsdWRlIDx3dGYvUmVmLmg+CiAKK3R5cGVkZWYgX2NvbV9wdHJfdDxfY29tX0lJSUQ8SVVu a25vd24sICZfX3V1aWRvZihJVW5rbm93bik+PiBJVW5rbm93blB0cjsKIHR5cGVkZWYgX2NvbV9w dHJfdDxfY29tX0lJSUQ8SVdlYkZyYW1lLCAmX191dWlkb2YoSVdlYkZyYW1lKT4+IElXZWJGcmFt ZVB0cjsKIHR5cGVkZWYgX2NvbV9wdHJfdDxfY29tX0lJSUQ8SVdlYlZpZXcsICZfX3V1aWRvZihJ V2ViVmlldyk+PiBJV2ViVmlld1B0cjsKIHR5cGVkZWYgX2NvbV9wdHJfdDxfY29tX0lJSUQ8SVdl YlZpZXdQcml2YXRlMiwgJl9fdXVpZG9mKElXZWJWaWV3UHJpdmF0ZTIpPj4gSVdlYlZpZXdQcml2 YXRlUHRyOwpAQCAtNTAsNyArNTEsNyBAQCB0eXBlZGVmIF9jb21fcHRyX3Q8X2NvbV9JSUlEPElX ZWJGcmFtZVByaXZhdGUsICZfX3V1aWRvZihJV2ViRnJhbWVQcml2YXRlKT4+IElXZQogCiBjbGFz cyBXZWJLaXRMZWdhY3lCcm93c2VyV2luZG93IDogcHVibGljIEJyb3dzZXJXaW5kb3cgewogcHVi bGljOgotICAgIHN0YXRpYyBSZWY8QnJvd3NlcldpbmRvdz4gY3JlYXRlKEhXTkQgbWFpblduZCwg SFdORCB1cmxCYXJXbmQsIGJvb2wgdXNlTGF5ZXJlZFdlYlZpZXcgPSBmYWxzZSk7CisgICAgc3Rh dGljIFJlZjxCcm93c2VyV2luZG93PiBjcmVhdGUoQnJvd3NlcldpbmRvd0NsaWVudCYsIEhXTkQg bWFpblduZCwgSFdORCB1cmxCYXJXbmQsIGJvb2wgdXNlTGF5ZXJlZFdlYlZpZXcgPSBmYWxzZSk7 CiAKIHByaXZhdGU6CiAgICAgZnJpZW5kIGNsYXNzIEFjY2Vzc2liaWxpdHlEZWxlZ2F0ZTsKQEAg LTExMCwxMCArMTExLDExIEBAIHByaXZhdGU6CiAgICAgdm9pZCB1cGRhdGVTdGF0aXN0aWNzKEhX TkQgZGlhbG9nKTsKICAgICB2b2lkIHNldFByZWZlcmVuY2UoVUlOVCBtZW51SUQsIGJvb2wgZW5h YmxlKTsKIAotICAgIFdlYktpdExlZ2FjeUJyb3dzZXJXaW5kb3coSFdORCBtYWluV25kLCBIV05E IHVybEJhclduZCwgYm9vbCB1c2VMYXllcmVkV2ViVmlldyk7CisgICAgV2ViS2l0TGVnYWN5QnJv d3NlcldpbmRvdyhCcm93c2VyV2luZG93Q2xpZW50JiwgSFdORCBtYWluV25kLCBIV05EIHVybEJh clduZCwgYm9vbCB1c2VMYXllcmVkV2ViVmlldyk7CiAgICAgdm9pZCBzdWJjbGFzc0ZvckxheWVy ZWRXaW5kb3coKTsKICAgICBib29sIHNldENhY2hlRm9sZGVyKCk7CiAKKyAgICBCcm93c2VyV2lu ZG93Q2xpZW50JiBtX2NsaWVudDsKICAgICBzdGQ6OnZlY3RvcjxJV2ViSGlzdG9yeUl0ZW1QdHI+ IG1faGlzdG9yeUl0ZW1zOwogCiAgICAgSVdlYlZpZXdQdHIgbV93ZWJWaWV3Owo=