192802 2018-12-17 21:55:26 -0800 [iOS] Focusing an editable element should scroll to reveal the selection 2019-01-02 11:35:43 -0800 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 193084 1 wenson_hsieh wenson_hsieh bdakin commit-queue megan_gardner simon.fraser thorton webkit-bug-importer oldest_to_newest 1488791 0 wenson_hsieh 2018-12-17 21:55:26 -0800 It currently scrolls to the last touch location (see the FIXME in WebPage::getAssistedNodeInformation, in WebPageIOS.mm). 1488792 1 wenson_hsieh 2018-12-17 21:55:53 -0800 <rdar://problem/46781759> 1489756 2 357790 wenson_hsieh 2018-12-19 22:58:37 -0800 Created attachment 357790 Patch for EWS 1489846 3 357790 commit-queue 2018-12-20 08:29:03 -0800 Comment on attachment 357790 Patch for EWS Clearing flags on attachment: 357790 Committed r239441: <https://trac.webkit.org/changeset/239441> 1489847 4 commit-queue 2018-12-20 08:29:05 -0800 All reviewed patches have been landed. Closing bug. 1491196 5 dbates 2019-01-02 11:35:43 -0800 (In reply to WebKit Commit Bot from comment #3) > Comment on attachment 357790 [details] > Patch for EWS > > Clearing flags on attachment: 357790 > > Committed r239441: <https://trac.webkit.org/changeset/239441> This broke tab cycling to offscreen <select>s. See bug #193084. 357790 2018-12-19 22:58:37 -0800 2018-12-20 08:29:03 -0800 Patch for EWS bug-192802-20181219225836.patch text/plain 31387 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5MzY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDZmNmQ2MWMyZDliYWMzZDc4 NmMwMzgxYjNlN2Y2N2NiNjMyNmVhOWYuLmQ2NTg1MmY5YmVhYjVlMDM5MWMzNGY4ZTgzMjIyMTlj ZDQzYzc2NjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMyIEBACisyMDE4LTEyLTE5ICBXZW5zb24g SHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIEZvY3VzaW5n IGFuIGVkaXRhYmxlIGVsZW1lbnQgc2hvdWxkIHNjcm9sbCB0byByZXZlYWwgdGhlIHNlbGVjdGlv bgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkyODAy CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80Njc4MTc1OT4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDdXJyZW50bHksIHdoZW4gdGFwcGluZyBvbiBh biBlZGl0YWJsZSBlbGVtZW50LCBsb2dpYyBpbiAtW1dLV2ViVmlldyBfem9vbVRvRm9jdXNSZWN0 OuKApjpdIGF0dGVtcHRzIHRvIGFkanVzdCB0aGUKKyAgICAgICAgdmlzaWJsZSB2aWV3cG9ydCBz dWNoIHRoYXQgdGhlIHJlY3QgY29udGFpbmluZyB0aGUgc2VsZWN0aW9uIGlzIHZpc2libGUuIEhv d2V2ZXIsIEFzc2lzdGVkTm9kZUluZm9ybWF0aW9uJ3MKKyAgICAgICAgc2VsZWN0aW9uUmVjdCBp cyB1c2VkIGhlcmUsIHdoaWNoIChhcyB0aGUgRklYTUUgaW4gV2ViUGFnZTo6Z2V0QXNzaXN0ZWRO b2RlSW5mb3JtYXRpb24gbm90ZXMpIGlzIGVpdGhlciB0aGUgbGFzdAorICAgICAgICB0b3VjaCBs b2NhdGlvbiwgb3IgdGhlIHRvcCBsZWZ0IG9mIHRoZSBlbGVtZW50IGlmIHRoZSB0b3VjaCBsb2Nh dGlvbiBpcyBvdXRzaWRlIG9mIHRoZSBlbGVtZW50J3MgYm91bmRpbmcgcmVjdC4KKyAgICAgICAg VGhpcyBsZWFkcyB0byBjb25mdXNpbmcgYW5kIHVuZGVzaXJhYmxlIGJlaGF2aW9yIHdoZW4gdGFw cGluZyBuZWFyIHRoZSBib3R0b20gb2YgYSBsYXJnZSBjb250ZW50ZWRpdGFibGUgZWxlbWVudAor ICAgICAgICB0byBmb2N1cyBpdCwgc2luY2UgdGhlIGFjdHVhbCBzZWxlY3Rpb24gd2lsbCBlbmQg dXAgbmVhciB0aGUgdG9wIG9mIHRoZSBlbGVtZW50LCB5ZXQgd2UnbGwgdHJ5IHRvIHNjcm9sbCB0 bworICAgICAgICByZXZlYWwgdGhlIGJvdHRvbSBvZiB0aGUgZWxlbWVudCwgd2hpY2ggY2F1c2Vz IHRoZSB2aXNpYmxlIHNlbGVjdGlvbiB0byBzY3JvbGwgb2Zmc2NyZWVuLiBOb3RhYmx5LCB0aGlz IGFmZmVjdHMKKyAgICAgICAgc2NlbmFyaW9zIGludm9sdmluZyBlZGl0YWJsZSB3ZWIgdmlld3Mg ZW1iZWRkZWQgaW4gYXBwcywgc3VjaCBhcyBNYWlsIGNvbXBvc2UuCisKKyAgICAgICAgUmlnaHQg bm93LCB3ZSB1c2UgdGhlIGxhc3QgdG91Y2ggbG9jYXRpb24gYXMgYW4gYXBwcm94aW1hdGlvbiBm b3IgdGhlIHNlbGVjdGlvbiByZWN0IGJlY2F1c2UgdGhlIHNlbGVjdGlvbiBtYXkKKyAgICAgICAg aGF2ZSBub3QgeWV0IGJlZW4gdXBkYXRlZCBhdCB0aGUgbW9tZW50IHdoZW4gZm9jdXMgbW92ZXMg aW50byBhbiBlZGl0YWJsZSBlbGVtZW50LiBUbyBmaXggdGhpcywgd2UgZGVmZXIgdGhlCisgICAg ICAgIHByb2Nlc3Mgb2Ygem9vbWluZyB0byB0aGUgZm9jdXNlZCBlbGVtZW50IHJlY3QgdW50aWwg YWZ0ZXIgdGhlIHNlbGVjdGlvbiBjaGFuZ2VzIGFuZCB0aGUgVUkgcHJvY2VzcyBpcyB1cGRhdGVk CisgICAgICAgIHdpdGggaW5mb3JtYXRpb24gYWJvdXQgdGhlIG5ldyBzZWxlY3Rpb24gcmVjdHMu CisKKyAgICAgICAgVGVzdDogZWRpdGluZy9zZWxlY3Rpb24vaW9zL3NlbGVjdGlvbi1pcy12aXNp YmxlLWFmdGVyLWZvY3VzaW5nLWVkaXRhYmxlLWFyZWEuaHRtbAorCisgICAgICAgICogU2hhcmVk L0Fzc2lzdGVkTm9kZUluZm9ybWF0aW9uLmNwcDoKKyAgICAgICAgKFdlYktpdDo6QXNzaXN0ZWRO b2RlSW5mb3JtYXRpb246OmVuY29kZSBjb25zdCk6CisgICAgICAgIChXZWJLaXQ6OkFzc2lzdGVk Tm9kZUluZm9ybWF0aW9uOjpkZWNvZGUpOgorICAgICAgICAqIFNoYXJlZC9Bc3Npc3RlZE5vZGVJ bmZvcm1hdGlvbi5oOgorCisgICAgICAgIFJlbmFtZSBzZWxlY3Rpb25SZWN0IHRvIGVsZW1lbnRJ bnRlcmFjdGlvbkxvY2F0aW9uLCB0byBtb3JlIGFjY3VyYXRlbHkgcmVmbGVjdCBpdHMgdmFsdWUg YW5kIHB1cnBvc2UuIFRoaXMgaXNuJ3QKKyAgICAgICAgc3RyaWN0bHkgYWx3YXlzIHRoZSBsYXN0 IHRvdWNoIGxvY2F0aW9uLCBzaW5jZSB3ZSBtYXkgZGVmYXVsdCB0byB0aGUgZm9jdXNlZCBlbGVt ZW50IGxvY2F0aW9uIGluc3RlYWQgaWYgdGhlCisgICAgICAgIGxhc3QgdG91Y2ggbG9jYXRpb24g aXMgb3V0c2lkZSBvZiB0aGUgZWxlbWVudCByZWN0LgorCisgICAgICAgICogVUlQcm9jZXNzL0FQ SS9Db2NvYS9XS1dlYlZpZXcubW06CisgICAgICAgICgtW1dLV2ViVmlldyBfem9vbVRvRm9jdXNS ZWN0OnNlbGVjdGlvblJlY3Q6aW5zaWRlRml4ZWQ6Zm9udFNpemU6bWluaW11bVNjYWxlOm1heGlt dW1TY2FsZTphbGxvd1NjYWxpbmc6Zm9yY2VTY3JvbGw6XSk6CisKKyAgICAgICAgVHdlYWsgYSBj b25zdGFudCB0aGF0IGRldGVybWluZXMgdGhlIG1pbmltdW0gYW1vdW50IG9mIG1hcmdpbiB0byBs ZWF2ZSBiZXR3ZWVuIHRoZSBzZWxlY3Rpb24gcmVjdCBhbmQgdGhlIGVkZ2UKKyAgICAgICAgb2Yg dGhlIHdpbmRvdyB3aGVuIHNjcm9sbGluZyB0byByZXZlYWwgdGhlIGZvY3VzZWQgZWxlbWVudC4g UHJldmlvdXNseSwgdGhpcyB3YXMgbGFyZ2VyIHRoYW4gbmVjZXNzYXJ5IHRvCisgICAgICAgIGFj Y29tb2RhdGUgZm9yIHRoZSBmYWN0IHRoYXQgdGhlICJzZWxlY3Rpb24gcmVjdCIgdXNlZCB3aGVu IHpvb21pbmcgdG8gdGhlIGZvY3VzZWQgZWxlbWVudCBkaWQgbm90IHRha2UgdGhlCisgICAgICAg IGFjdHVhbCBzZWxlY3Rpb24gaW50byBhY2NvdW50IGF0IGFsbCwgYW5kIHdhcyBzaW1wbHkgYSAx IGJ5IDEgcmVjdDsgdGhpcyBtZWFudCB0aGF0IHRoZSBtYXJnaW4gbmVlZGVkIHRvIGJlCisgICAg ICAgIGxhcmdlIGVub3VnaCB0byBleGNlZWQgdGhlIHVzdWFsIGhlaWdodCBvZiBhIHRleHQgY2Fy ZXQgaW4gZWRpdGFibGUgY29udGVudC4gU2luY2Ugd2Ugbm93IHVzZSB0aGUgcmVhbCBzZWxlY3Rp b24KKyAgICAgICAgcmVjdCwgd2UgY2FuIGJlIG11Y2ggbGVzcyBnZW5lcm91cyB3aXRoIHRoaXMg bWFyZ2luLgorCisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rp b24uaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5t bToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBjbGVhbnVwSW50ZXJhY3Rpb25dKToKKyAgICAg ICAgKC1bV0tDb250ZW50VmlldyBvYnNlcnZlVmFsdWVGb3JLZXlQYXRoOm9mT2JqZWN0OmNoYW5n ZTpjb250ZXh0Ol0pOgorCisgICAgICAgIERvbid0IGFkZGl0aW9uYWxseSB1cGRhdGUgdGhlIHNl bGVjdGlvbiBpbiB0aGUgbWlkZGxlIG9mIHRyaWdnZXJpbmcgem9vbWluZyB0byB0aGUgZm9jdXNl ZCBlbGVtZW50OyBvbgorICAgICAgICBwYXJ0aWN1bGFyIHZlcnNpb25zIG9mIGlPUywgdGhpcyBu b3cgYXR0ZW1wdHMgdG8gc2Nyb2xsIHRoZSBzZWxlY3Rpb24gcmVjdCBvbi1zY3JlZW4sIHdoaWNo IHRoZW4gY29uZmxpY3RzIHdpdGgKKyAgICAgICAgem9vbWluZyB0byByZXZlYWwgdGhlIGZvY3Vz ZWQgZWxlbWVudC4KKworICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IF96b29tVG9SZXZlYWxGb2N1 c2VkRWxlbWVudF0pOgorCisgICAgICAgIFJlbmFtZWQgZnJvbSBfZGlzcGxheUZvcm1Ob2RlSW5w dXRWaWV3IHRvIF96b29tVG9SZXZlYWxGb2N1c2VkRWxlbWVudCwgdG8gbWFrZSB0aGUgcHVycG9z ZSBvZiB0aGlzIGZ1bmN0aW9uIG1vcmUKKyAgICAgICAgY2xlYXIuIEFkZGl0aW9uYWxseSwgcHVs bCBsb2dpYyB0byB1cGRhdGUgdGhlIGFjY2Vzc29yeSB2aWV3IG91dCBvZiB0aGlzIG1ldGhvZCwg c28gdGhhdCBpdCdzIHN0cmljdGx5IGNvbmNlcm5lZAorICAgICAgICB3aXRoIHpvb21pbmcgdG8g dGhlIGZvY3VzZWQgZWxlbWVudC4KKworICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IGlucHV0Vmll d10pOgorCisgICAgICAgIEFkZCBhIEZJWE1FIGRlc2NyaWJpbmcgdGhlIGltcGxpY2F0aW9ucyBv ZiB6b29taW5nIHRvIHRoZSBmb2N1c2VkIGVsZW1lbnQgaW4gdGhlIGltcGxlbWVudGF0aW9uIG9m IC1pbnB1dFZpZXcuCisgICAgICAgIFNlZSBhbHNvOiA8aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE5Mjg3OD4uCisKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBhY2Nl c3NvcnlUYWI6XSk6CisKKyAgICAgICAgRml4IGEgc3VidGxlIGlzc3VlIHdoZW4ga2VlcGluZyB0 cmFjayBvZiBfZGlkQWNjZXNzb3J5VGFiSW5pdGlhdGVGb2N1cy4gQ3VycmVudGx5LCB0aGlzIGlz IHNldCB0byBZRVMgaW4KKyAgICAgICAgLWFjY2Vzc29yeVRhYjogYW5kIHVuc2V0IGluIF9kaXNw bGF5Rm9ybU5vZGVJbnB1dFZpZXcsIGJ1dCBzaW5jZSBfZGlzcGxheUZvcm1Ob2RlSW5wdXRWaWV3 IG1heSBiZSBpbnZva2VkCisgICAgICAgIG11bHRpcGxlIHRpbWVzIGZvciB0aGUgc2FtZSBmb2N1 c2VkIGVsZW1lbnQgKHNlZTogLWlucHV0VmlldyksIHdlIG1pZ2h0IGVuZCB1cCB6b29taW5nIHRv IHRoZSBmb2N1c2VkIGVsZW1lbnQKKyAgICAgICAgd2l0aCBfZGlkQWNjZXNzb3J5VGFiSW5pdGlh dGVGb2N1cyBzZXQgdG8gTk8sIGV2ZW4gdGhvdWdoIHdlIGluaXRpYXRlZCBmb2N1cyB3aXRoIHRo ZSBwcmV2aW91cy9uZXh0IGJ1dHRvbnMuCisKKyAgICAgICAgSW5zdGVhZCwgdGVtcG9yYXJpbHkg c2V0IGEgZGlmZmVyZW50IGl2YXIsIF9pc0NoYW5naW5nRm9jdXNVc2luZ0FjY2Vzc29yeVRhYiwg dG8gWUVTIGluIC1hY2Nlc3NvcnlUYWI6LCBhbmQKKyAgICAgICAgdW5zZXQgaXQgaW4gdGhlIGNv bXBsZXRpb24gaGFuZGxlciBhZnRlciB0aGUgZm9jdXNlZCBlbGVtZW50IGhhcyBjaGFuZ2VkLiBU aGVuLCB3aGVuIHdlIF9zdGFydEFzc2lzdGluZ05vZGU6LAorICAgICAgICBzZXQgX2RpZEFjY2Vz c29yeVRhYkluaXRpYXRlRm9jdXMgdG8gX2lzQ2hhbmdpbmdGb2N1c1VzaW5nQWNjZXNzb3J5VGFi LiBUaGlzIGVuc3VyZXMgdGhhdCB0aGUgY29ycmVjdG5lc3Mgb2YKKyAgICAgICAgX2RpZEFjY2Vz c29yeVRhYkluaXRpYXRlRm9jdXMgaXNuJ3QgdGllZCB0byB0aGUgbnVtYmVyIG9mIHRpbWVzIC1b V0tDb250ZW50VmlldyBpbnB1dFZpZXddIGlzIGludm9rZWQgd2hlbgorICAgICAgICBmb2N1c2lu ZyBhbiBlbGVtZW50LgorCisgICAgICAgIChzaG91bGRab29tVG9SZXZlYWxTZWxlY3Rpb25SZWN0 KToKKyAgICAgICAgKHJlY3RUb1JldmVhbFdoZW5ab29taW5nVG9Gb2N1c2VkRWxlbWVudCk6CisK KyAgICAgICAgQWRkIGEgaGVscGVyIG1ldGhvZCB0byBkZXRlcm1pbmUgdGhlIHNlbGVjdGlvbiBy ZWN0IHRvIHVzZSB3aGVuIHpvb21pbmcgdG8gcmV2ZWFsIHRoZSBmb2N1c2VkIGVsZW1lbnQuIEFT U0VSVHMKKyAgICAgICAgdGhhdCB3ZSBoYXZlIHBvc3QtbGF5b3V0IGRhdGEgaW4gdGhlIEVkaXRv clN0YXRlLgorCisgICAgICAgICgtW1dLQ29udGVudFZpZXcgX3N0YXJ0QXNzaXN0aW5nTm9kZTp1 c2VySXNJbnRlcmFjdGluZzpibHVyUHJldmlvdXNOb2RlOmNoYW5naW5nQWN0aXZpdHlTdGF0ZTp1 c2VyT2JqZWN0Ol0pOgorCisgICAgICAgIFdoZW4gImFzc2lzdGluZyIgYSBmb2N1c2VkIGVsZW1l bnQsIGltbWVkaWF0ZWx5IHpvb20gdG8gaXQgaWYgd2UgZG9uJ3QgbmVlZCBzZWxlY3Rpb24gaW5m b3JtYXRpb24gdG8gY29tcHV0ZSB0aGUKKyAgICAgICAgcmVjdCB0byB6b29tIHRvOyBvdGhlcndp c2UsIGRlZmVyIHpvb21pbmcgdW50aWwgd2UgcmVjZWl2ZSB0aGUgZmlyc3QgZWRpdG9yIHN0YXRl IHVwZGF0ZSBpbiB0aGUgVUkgcHJvY2VzcyB0aGF0CisgICAgICAgIGNvbnRhaW5zIGluZm9ybWF0 aW9uIGFib3V0IG91ciBzZWxlY3Rpb24gcmVjdHMuCisKKyAgICAgICAgKC1bV0tDb250ZW50Vmll dyBfc3RvcEFzc2lzdGluZ05vZGVdKToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBfZGlkUmVj ZWl2ZUVkaXRvclN0YXRlVXBkYXRlQWZ0ZXJGb2N1c10pOgorCisgICAgICAgIElmIG5lY2Vzc2Fy eSwgcmV2ZWFsIHRoZSBmb2N1c2VkIGVsZW1lbnQgYnkgem9vbWluZy4KKworICAgICAgICAoLVtX S0NvbnRlbnRWaWV3IF91cGRhdGVJbml0aWFsV3JpdGluZ0RpcmVjdGlvbklmTmVjZXNzYXJ5XSk6 CisKKyAgICAgICAgUHVsbCB0aGlzIGluaXRpYWwgd3JpdGluZyBkaXJlY3Rpb24gdXBkYXRlIGxv Z2ljIG91dCBpbnRvIGEgc2VwYXJhdGUgaGVscGVyIG1ldGhvZC4KKworICAgICAgICAoLVtXS0Nv bnRlbnRWaWV3IF9kaXNwbGF5Rm9ybU5vZGVJbnB1dFZpZXddKTogRGVsZXRlZC4KKworICAgICAg ICBSZXBsYWNlZCBieSBfem9vbVRvUmV2ZWFsRm9jdXNlZEVsZW1lbnQuCisKKyAgICAgICAgKiBX ZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5jcHA6CisgICAgICAgIChX ZWJLaXQ6OldlYkNocm9tZUNsaWVudDo6ZWxlbWVudERpZFJlZm9jdXMpOgorCisgICAgICAgIFRo aXMgY3VycmVudGx5IGNhbGxzIFdlYkNocm9tZUNsaWVudDo6ZWxlbWVudERpZEZvY3VzOyBpbnN0 ZWFkLCBjYWxsIHRoZSBuZXcgV2ViUGFnZTo6ZWxlbWVudERpZFJlZm9jdXM7CisgICAgICAgIGFk ZGl0aW9uYWxseSwgbWFrZSB0aGlzIGF2YWlsYWJsZSBvbiBhbGwgUExBVEZPUk0oQ09DT0EpLCBy YXRoZXIgdGhhbiBqdXN0IElPU19GQU1JTFkuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNv cmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29y ZVN1cHBvcnQvaW9zL1dlYkNocm9tZUNsaWVudElPUy5tbToKKyAgICAgICAgKFdlYktpdDo6V2Vi Q2hyb21lQ2xpZW50OjplbGVtZW50RGlkUmVmb2N1cyk6IERlbGV0ZWQuCisKKyAgICAgICAgUmVw bGFjZWQgYnkgdGhlIFBMQVRGT1JNKENPQ09BKSB2ZXJzaW9uLgorCisgICAgICAgICogV2ViUHJv Y2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjplbGVt ZW50RGlkUmVmb2N1cyk6CisKKyAgICAgICAgV2hlbiByZWZvY3VzaW5nIGFuIGVsZW1lbnQsIGVu c3VyZSB0aGF0IHBvc3QtbGF5b3V0IGVkaXRvciBzdGF0ZSBkYXRhIGlzIHNlbnQgdG8gdGhlIFVJ IHByb2Nlc3MgYnkgaW5jbHVkaW5nIGEKKyAgICAgICAgZnVsbCBFZGl0b3JTdGF0ZSBpbiB0aGUg bmV4dCBsYXllciB0cmVlIHRyYW5zYWN0aW9uLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQ YWdlL1dlYlBhZ2UuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJ T1MubW06CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmNvbXBsZXRlU3ludGhldGljQ2xpY2sp OgorCisgICAgICAgIENhbGwgZWxlbWVudERpZFJlZm9jdXMgaW5zdGVhZCBvZiBlbGVtZW50RGlk Rm9jdXMsIGluIHRoZSBjYXNlIHdoZXJlIHRoZSBleGlzdGluZyBmb2N1c2VkIGVsZW1lbnQgaXMg Y2xpY2tlZC4KKworICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpnZXRBc3Npc3RlZE5vZGVJbmZv cm1hdGlvbik6CisKKyAgICAgICAgQWRqdXN0IGZvciB0aGUgY2hhbmdlIGZyb20gc2VsZWN0aW9u UmVjdCB0byBlbGVtZW50SW50ZXJhY3Rpb25Mb2NhdGlvbi4KKwogMjAxOC0xMi0xOCAgQWxleCBD aHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIFJFR1JFU1NJ T04ocjIzOTEzNCkgaU9TIHNhZmUgYnJvd3Npbmcgd2FybmluZyB1bmFibGUgdG8gc2hvdyBkZXRh aWxzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9Bc3Npc3RlZE5vZGVJbmZvcm1h dGlvbi5jcHAgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9Bc3Npc3RlZE5vZGVJbmZvcm1hdGlvbi5j cHAKaW5kZXggNTEzNDc5MTgwMDMxNTA2MGE5Y2U4ZmYyY2JhZWQzMWU5M2YyMmE3Mi4uYmVjOWM4 ZmI3MGFjNjkyN2FlYTM5NzY4YTNiMmZjNmUyMTM4ODZmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9TaGFyZWQvQXNzaXN0ZWROb2RlSW5mb3JtYXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvU2hhcmVkL0Fzc2lzdGVkTm9kZUluZm9ybWF0aW9uLmNwcApAQCAtNjQsNyArNjQsNyBAQCBz dGQ6Om9wdGlvbmFsPE9wdGlvbkl0ZW0+IE9wdGlvbkl0ZW06OmRlY29kZShJUEM6OkRlY29kZXIm IGRlY29kZXIpCiB2b2lkIEFzc2lzdGVkTm9kZUluZm9ybWF0aW9uOjplbmNvZGUoSVBDOjpFbmNv ZGVyJiBlbmNvZGVyKSBjb25zdAogewogICAgIGVuY29kZXIgPDwgZWxlbWVudFJlY3Q7Ci0gICAg ZW5jb2RlciA8PCBzZWxlY3Rpb25SZWN0OworICAgIGVuY29kZXIgPDwgZWxlbWVudEludGVyYWN0 aW9uTG9jYXRpb247CiAgICAgZW5jb2RlciA8PCBtaW5pbXVtU2NhbGVGYWN0b3I7CiAgICAgZW5j b2RlciA8PCBtYXhpbXVtU2NhbGVGYWN0b3I7CiAgICAgZW5jb2RlciA8PCBtYXhpbXVtU2NhbGVG YWN0b3JJZ25vcmluZ0Fsd2F5c1NjYWxhYmxlOwpAQCAtMTEyLDcgKzExMiw3IEBAIGJvb2wgQXNz aXN0ZWROb2RlSW5mb3JtYXRpb246OmRlY29kZShJUEM6OkRlY29kZXImIGRlY29kZXIsIEFzc2lz dGVkTm9kZUluZm9ybWF0CiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQuZWxlbWVudFJl Y3QpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJl c3VsdC5zZWxlY3Rpb25SZWN0KSkKKyAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJlc3VsdC5lbGVt ZW50SW50ZXJhY3Rpb25Mb2NhdGlvbikpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIGlm ICghZGVjb2Rlci5kZWNvZGUocmVzdWx0Lm1pbmltdW1TY2FsZUZhY3RvcikpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9Bc3Npc3RlZE5vZGVJbmZvcm1hdGlvbi5oIGIvU291cmNl L1dlYktpdC9TaGFyZWQvQXNzaXN0ZWROb2RlSW5mb3JtYXRpb24uaAppbmRleCA5YjFjM2IwMTQ1 ZjgzZjc5NDg1MTc3NGU5NmI4NTg2YWU3MmQ4ZDE5Li5kNzc1MjU0NGQ1YWE4Nzg2ZjFhYmNiNjhl ZTYwOGY4Njc4Zjk5MDQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9Bc3Npc3Rl ZE5vZGVJbmZvcm1hdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0Fzc2lzdGVkTm9k ZUluZm9ybWF0aW9uLmgKQEAgLTk1LDcgKzk1LDcgQEAgc3RydWN0IE9wdGlvbkl0ZW0gewogCiBz dHJ1Y3QgQXNzaXN0ZWROb2RlSW5mb3JtYXRpb24gewogICAgIFdlYkNvcmU6OkludFJlY3QgZWxl bWVudFJlY3Q7Ci0gICAgV2ViQ29yZTo6SW50UmVjdCBzZWxlY3Rpb25SZWN0OworICAgIFdlYkNv cmU6OkludFBvaW50IGVsZW1lbnRJbnRlcmFjdGlvbkxvY2F0aW9uOwogICAgIGRvdWJsZSBtaW5p bXVtU2NhbGVGYWN0b3IgeyAtSU5GSU5JVFkgfTsKICAgICBkb3VibGUgbWF4aW11bVNjYWxlRmFj dG9yIHsgSU5GSU5JVFkgfTsKICAgICBkb3VibGUgbWF4aW11bVNjYWxlRmFjdG9ySWdub3JpbmdB bHdheXNTY2FsYWJsZSB7IElORklOSVRZIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QVBJL0NvY29hL1dLV2ViVmlldy5tbQppbmRleCA5ZjY1ZjJlZTdhMzI3OTFjZTI1YTYwNWNmYjI4 MTdmMGMzZWQ0NDFmLi5iNzdmMjk1N2ZjNmMwYzk0ZTUwMmVlYjVlYTM4YTU1YmQ5MGNjY2EwIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1t CisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KQEAg LTIyMzMsNyArMjIzMyw3IEBAIC0gKHZvaWQpX3pvb21Ub0ZvY3VzUmVjdDooY29uc3QgV2ViQ29y ZTo6RmxvYXRSZWN0Jilmb2N1c2VkRWxlbWVudFJlY3RJbkRvY3VtZW50CiAKICAgICBjb25zdCBk b3VibGUgbWluaW11bUhlaWdodFRvU2hvd0NvbnRlbnRBYm92ZUtleWJvYXJkID0gMTA2OwogICAg IGNvbnN0IENGVGltZUludGVydmFsIGZvcm1Db250cm9sWm9vbUFuaW1hdGlvbkR1cmF0aW9uID0g MC4yNTsKLSAgICBjb25zdCBkb3VibGUgY2FyZXRPZmZzZXRGcm9tV2luZG93RWRnZSA9IDIwOwor ICAgIGNvbnN0IGRvdWJsZSBjYXJldE9mZnNldEZyb21XaW5kb3dFZGdlID0gODsKIAogICAgIFVJ V2luZG93ICp3aW5kb3cgPSBbX3Njcm9sbFZpZXcgd2luZG93XTsKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5oIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5oCmluZGV4 IGU3OTRlM2M2MzFkZGViNTNhMWE0NjliNzkwOTQyOWI0Y2JhM2JjNjEuLmYxZjE1NmVkMGY5NWQ1 Yjg4YWRkYjQxODIwYTA2ZDM5YjExMDQ5ODUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLmgKQEAgLTI5Niw5ICsyOTYs MTEgQEAgc3RydWN0IFdLQXV0b0NvcnJlY3Rpb25EYXRhIHsKICAgICBCT09MIF9zaG91bGRSZXN0 b3JlU2VsZWN0aW9uOwogICAgIEJPT0wgX3VzaW5nR2VzdHVyZUZvclNlbGVjdGlvbjsKICAgICBC T09MIF9pbnNwZWN0b3JOb2RlU2VhcmNoRW5hYmxlZDsKKyAgICBCT09MIF9pc0NoYW5naW5nRm9j dXNVc2luZ0FjY2Vzc29yeVRhYjsKICAgICBCT09MIF9kaWRBY2Nlc3NvcnlUYWJJbml0aWF0ZUZv Y3VzOwogICAgIEJPT0wgX2lzRXhwZWN0aW5nRmFzdFNpbmdsZVRhcENvbW1pdDsKICAgICBCT09M IF9zaG93RGVidWdUYXBIaWdobGlnaHRzRm9yRmFzdENsaWNraW5nOworICAgIEJPT0wgX2lzWm9v bWluZ1RvUmV2ZWFsRm9jdXNlZEVsZW1lbnQ7CiAKICAgICBCT09MIF9iZWNvbWluZ0ZpcnN0UmVz cG9uZGVyOwogICAgIEJPT0wgX3Jlc2lnbmluZ0ZpcnN0UmVzcG9uZGVyOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbSBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0K aW5kZXggZGVlODk4OGM0MjBhZGNjZDU3ZWRiMmNkYzliNDI5YTFmNWU5YzdiNC4uNDAzODA4Yzkx OWMxNDBmYmQ4YmU4MTBmNWIxZTc3NmE2YzU4YzJlMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQorKysgYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCkBAIC03NTcs NiArNzU3LDcgQEAgLSAodm9pZCljbGVhbnVwSW50ZXJhY3Rpb24KICAgICAKICAgICBfc21hcnRN YWduaWZpY2F0aW9uQ29udHJvbGxlciA9IG5pbDsKICAgICBfZGlkQWNjZXNzb3J5VGFiSW5pdGlh dGVGb2N1cyA9IE5POworICAgIF9pc0NoYW5naW5nRm9jdXNVc2luZ0FjY2Vzc29yeVRhYiA9IE5P OwogICAgIF9pc0V4cGVjdGluZ0Zhc3RTaW5nbGVUYXBDb21taXQgPSBOTzsKICAgICBfbmVlZHNE ZWZlcnJlZEVuZFNjcm9sbGluZ1NlbGVjdGlvblVwZGF0ZSA9IE5POwogICAgIFtfZm9ybUlucHV0 U2Vzc2lvbiBpbnZhbGlkYXRlXTsKQEAgLTg1NCw2ICs4NTUsNyBAQCAtICh2b2lkKWNsZWFudXBJ bnRlcmFjdGlvbgogCiAgICAgX2hhc1NldFVwSW50ZXJhY3Rpb25zID0gTk87CiAgICAgX3N1cHBy ZXNzU2VsZWN0aW9uQXNzaXN0YW50UmVhc29ucyA9IHsgfTsKKyAgICBfaXNab29taW5nVG9SZXZl YWxGb2N1c2VkRWxlbWVudCA9IE5POwogfQogCiAtICh2b2lkKV9yZW1vdmVEZWZhdWx0R2VzdHVy ZVJlY29nbml6ZXJzCkBAIC05NDEsOSArOTQzLDE2IEBAIC0gKHZvaWQpb2JzZXJ2ZVZhbHVlRm9y S2V5UGF0aDooTlNTdHJpbmcgKilrZXlQYXRoIG9mT2JqZWN0OihpZClvYmplY3QgY2hhbmdlOihO CiAgICAgICAgIFtVSVZpZXcgX2FkZENvbXBsZXRpb246XihCT09MKXsgW19pbnRlcmFjdGlvblZp ZXdzQ29udGFpbmVyVmlldyBzZXRIaWRkZW46Tk9dOyB9XTsKICAgICB9CiAKKyAgICBbc2VsZiBf dXBkYXRlVGFwSGlnaGxpZ2h0XTsKKworICAgIGlmIChfaXNab29taW5nVG9SZXZlYWxGb2N1c2Vk RWxlbWVudCkgeworICAgICAgICAvLyBXaGVuIHpvb21pbmcgdG8gdGhlIGZvY3VzZWQgZWxlbWVu dCwgYXZvaWQgYWRkaXRpb25hbGx5IHNjcm9sbGluZyB0byByZXZlYWwgdGhlIHNlbGVjdGlvbi4g U2luY2UgdGhlIHNjYWxlIHRyYW5zZm9ybSBoYXMgbm90IHlldCBiZWVuCisgICAgICAgIC8vIGFw cGxpZWQgdG8gdGhlIGNvbnRlbnQgdmlldyBhdCB0aGlzIHBvaW50LCB3ZSdsbCBlbmQgdXAgc2Ny b2xsaW5nIHRvIHJldmVhbCBhIHJlY3QgdGhhdCBpcyBjb21wdXRlZCB1c2luZyB0aGUgd3Jvbmcg c2NhbGUuCisgICAgICAgIHJldHVybjsKKyAgICB9CisKICAgICBfc2VsZWN0aW9uTmVlZHNVcGRh dGUgPSBZRVM7CiAgICAgW3NlbGYgX3VwZGF0ZUNoYW5nZWRTZWxlY3Rpb246WUVTXTsKLSAgICBb c2VsZiBfdXBkYXRlVGFwSGlnaGxpZ2h0XTsKIH0KIAogLSAodm9pZClfZW5hYmxlSW5zcGVjdG9y Tm9kZVNlYXJjaApAQCAtMTM4OCwyNCArMTM5NywyMiBAQCAtIChCT09MKV9yZXF1aXJlc0tleWJv YXJkUmVzZXRPblJlbG9hZAogICAgIHJldHVybiBZRVM7CiB9CiAKLS0gKHZvaWQpX2Rpc3BsYXlG b3JtTm9kZUlucHV0VmlldworLSAodm9pZClfem9vbVRvUmV2ZWFsRm9jdXNlZEVsZW1lbnQKIHsK LSAgICBpZiAoIV9zdXBwcmVzc1NlbGVjdGlvbkFzc2lzdGFudFJlYXNvbnMuY29udGFpbnMoV2Vi S2l0OjpGb2N1c2VkRWxlbWVudElzVHJhbnNwYXJlbnQpKSB7Ci0gICAgICAgIC8vIEluIGNhc2Ug dXNlciBzY2FsaW5nIGlzIGZvcmNlIGVuYWJsZWQsIGRvIG5vdCB1c2UgdGhhdCBzY2FsaW5nIHdo ZW4gem9vbWluZyBpbiB3aXRoIGFuIGlucHV0IGZpZWxkLgotICAgICAgICAvLyBab29taW5nIGFi b3ZlIHRoZSBwYWdlJ3MgZGVmYXVsdCBzY2FsZSBmYWN0b3Igc2hvdWxkIG9ubHkgaGFwcGVuIHdo ZW4gdGhlIHVzZXIgcGVyZm9ybXMgaXQuCi0gICAgICAgIFtzZWxmIF96b29tVG9Gb2N1c1JlY3Q6 X2Fzc2lzdGVkTm9kZUluZm9ybWF0aW9uLmVsZW1lbnRSZWN0Ci0gICAgICAgICAgICBzZWxlY3Rp b25SZWN0Ol9kaWRBY2Nlc3NvcnlUYWJJbml0aWF0ZUZvY3VzID8gV2ViQ29yZTo6SW50UmVjdCgp IDogX2Fzc2lzdGVkTm9kZUluZm9ybWF0aW9uLnNlbGVjdGlvblJlY3QKLSAgICAgICAgICAgIGlu c2lkZUZpeGVkOl9hc3Npc3RlZE5vZGVJbmZvcm1hdGlvbi5pbnNpZGVGaXhlZFBvc2l0aW9uCi0g ICAgICAgICAgICBmb250U2l6ZTpfYXNzaXN0ZWROb2RlSW5mb3JtYXRpb24ubm9kZUZvbnRTaXpl Ci0gICAgICAgICAgICBtaW5pbXVtU2NhbGU6X2Fzc2lzdGVkTm9kZUluZm9ybWF0aW9uLm1pbmlt dW1TY2FsZUZhY3RvcgotICAgICAgICAgICAgbWF4aW11bVNjYWxlOl9hc3Npc3RlZE5vZGVJbmZv cm1hdGlvbi5tYXhpbXVtU2NhbGVGYWN0b3JJZ25vcmluZ0Fsd2F5c1NjYWxhYmxlCi0gICAgICAg ICAgICBhbGxvd1NjYWxpbmc6X2Fzc2lzdGVkTm9kZUluZm9ybWF0aW9uLmFsbG93c1VzZXJTY2Fs aW5nSWdub3JpbmdBbHdheXNTY2FsYWJsZSAmJiAhY3VycmVudFVzZXJJbnRlcmZhY2VJZGlvbUlz UGFkKCkKLSAgICAgICAgICAgIGZvcmNlU2Nyb2xsOihfYXNzaXN0ZWROb2RlSW5mb3JtYXRpb24u aW5wdXRNb2RlID09IFdlYkNvcmU6OklucHV0TW9kZTo6Tm9uZSkgPyAhY3VycmVudFVzZXJJbnRl cmZhY2VJZGlvbUlzUGFkKCkgOiBbc2VsZiByZXF1aXJlc0FjY2Vzc29yeVZpZXddXTsKLSAgICB9 CisgICAgaWYgKF9zdXBwcmVzc1NlbGVjdGlvbkFzc2lzdGFudFJlYXNvbnMuY29udGFpbnMoV2Vi S2l0OjpGb2N1c2VkRWxlbWVudElzVHJhbnNwYXJlbnQpKQorICAgICAgICByZXR1cm47CiAKLSAg ICBfZGlkQWNjZXNzb3J5VGFiSW5pdGlhdGVGb2N1cyA9IE5POwotICAgIFtzZWxmIF9lbnN1cmVG b3JtQWNjZXNzb3J5Vmlld107Ci0gICAgW3NlbGYgX3VwZGF0ZUFjY2Vzc29yeV07CisgICAgU2V0 Rm9yU2NvcGU8Qk9PTD4gaXNab29taW5nVG9SZXZlYWxGb2N1c2VkRWxlbWVudEZvclNjb3BlIHsg X2lzWm9vbWluZ1RvUmV2ZWFsRm9jdXNlZEVsZW1lbnQsIFlFUyB9OworICAgIC8vIEluIGNhc2Ug dXNlciBzY2FsaW5nIGlzIGZvcmNlIGVuYWJsZWQsIGRvIG5vdCB1c2UgdGhhdCBzY2FsaW5nIHdo ZW4gem9vbWluZyBpbiB3aXRoIGFuIGlucHV0IGZpZWxkLgorICAgIC8vIFpvb21pbmcgYWJvdmUg dGhlIHBhZ2UncyBkZWZhdWx0IHNjYWxlIGZhY3RvciBzaG91bGQgb25seSBoYXBwZW4gd2hlbiB0 aGUgdXNlciBwZXJmb3JtcyBpdC4KKyAgICBbc2VsZiBfem9vbVRvRm9jdXNSZWN0Ol9hc3Npc3Rl ZE5vZGVJbmZvcm1hdGlvbi5lbGVtZW50UmVjdAorICAgICAgICBzZWxlY3Rpb25SZWN0Ol9kaWRB Y2Nlc3NvcnlUYWJJbml0aWF0ZUZvY3VzID8gV2ViQ29yZTo6RmxvYXRSZWN0KCkgOiByZWN0VG9S ZXZlYWxXaGVuWm9vbWluZ1RvRm9jdXNlZEVsZW1lbnQoX2Fzc2lzdGVkTm9kZUluZm9ybWF0aW9u LCBfcGFnZS0+ZWRpdG9yU3RhdGUoKSkKKyAgICAgICAgaW5zaWRlRml4ZWQ6X2Fzc2lzdGVkTm9k ZUluZm9ybWF0aW9uLmluc2lkZUZpeGVkUG9zaXRpb24KKyAgICAgICAgZm9udFNpemU6X2Fzc2lz dGVkTm9kZUluZm9ybWF0aW9uLm5vZGVGb250U2l6ZQorICAgICAgICBtaW5pbXVtU2NhbGU6X2Fz c2lzdGVkTm9kZUluZm9ybWF0aW9uLm1pbmltdW1TY2FsZUZhY3RvcgorICAgICAgICBtYXhpbXVt U2NhbGU6X2Fzc2lzdGVkTm9kZUluZm9ybWF0aW9uLm1heGltdW1TY2FsZUZhY3Rvcklnbm9yaW5n QWx3YXlzU2NhbGFibGUKKyAgICAgICAgYWxsb3dTY2FsaW5nOl9hc3Npc3RlZE5vZGVJbmZvcm1h dGlvbi5hbGxvd3NVc2VyU2NhbGluZ0lnbm9yaW5nQWx3YXlzU2NhbGFibGUgJiYgIWN1cnJlbnRV c2VySW50ZXJmYWNlSWRpb21Jc1BhZCgpCisgICAgICAgIGZvcmNlU2Nyb2xsOihfYXNzaXN0ZWRO b2RlSW5mb3JtYXRpb24uaW5wdXRNb2RlID09IFdlYkNvcmU6OklucHV0TW9kZTo6Tm9uZSkgPyAh Y3VycmVudFVzZXJJbnRlcmZhY2VJZGlvbUlzUGFkKCkgOiBbc2VsZiByZXF1aXJlc0FjY2Vzc29y eVZpZXddXTsKIH0KIAogLSAoVUlWaWV3ICopaW5wdXRWaWV3CkBAIC0xNDM4LDggKzE0NDUsMTkg QEAgLSAoVUlWaWV3ICopaW5wdXRWaWV3CiAgICAgICAgICAgICBfaW5wdXRQZXJpcGhlcmFsID0g YWRvcHROUyhbW1dLRm9ybUlucHV0Q29udHJvbCBhbGxvY10gaW5pdFdpdGhWaWV3OnNlbGZdKTsK ICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9Ci0gICAgfSBlbHNlCi0gICAgICAgIFtzZWxm IF9kaXNwbGF5Rm9ybU5vZGVJbnB1dFZpZXddOworICAgIH0gZWxzZSB7CisgICAgICAgIC8vIEZJ WE1FOiBVSUtpdCBtYXkgaW52b2tlIC1bV0tDb250ZW50VmlldyBpbnB1dFZpZXddIGF0IGFueSB0 aW1lIHdoZW4gV0tDb250ZW50VmlldyBpcyB0aGUgZmlyc3QgcmVzcG9uZGVyOworICAgICAgICAv LyBhcyBzdWNoLCBpdCBkb2Vzbid0IG1ha2Ugc2Vuc2UgdG8gY2hhbmdlIHRoZSBlbmNsb3Npbmcg c2Nyb2xsIHZpZXcncyB6b29tIHNjYWxlIGFuZCBjb250ZW50IG9mZnNldCB0byByZXZlYWwKKyAg ICAgICAgLy8gdGhlIGZvY3VzZWQgZWxlbWVudCBoZXJlLiBJdCBzZWVtcyB0aGlzIGJlaGF2aW9y IHdhcyBhZGRlZCB0byBtYXRjaCBsb2dpYyBpbiBsZWdhY3kgV2ViS2l0IChyZWZlciB0bworICAg ICAgICAvLyBVSVdlYkJyb3dzZXJWaWV3KS4gSW5zdGVhZCwgd2Ugc2hvdWxkIGZpbmQgdGhlIHBs YWNlcyB3aGVyZSB3ZSBjdXJyZW50bHkgYXNzdW1lIHRoYXQgVUlLaXQgKG9yIG90aGVyIGNsaWVu dHMpCisgICAgICAgIC8vIGludm9rZSAtaW5wdXRWaWV3IHRvIHpvb20gdG8gdGhlIGZvY3VzZWQg ZWxlbWVudCwgYW5kIGVpdGhlciBzdXJmYWNlIFNQSSBmb3IgY2xpZW50cyB0byB6b29tIHRvIHRo ZSBmb2N1c2VkCisgICAgICAgIC8vIGVsZW1lbnQsIG9yIGV4cGxpY2l0bHkgdHJpZ2dlciB0aGUg em9vbSBmcm9tIFdlYktpdC4KKyAgICAgICAgLy8gRm9yIGluc3RhbmNlLCBvbmUgdXNlIGNhc2Ug dGhhdCBjdXJyZW50bHkgcmVsaWVzIG9uIHRoaXMgZGV0YWlsIGlzIGFkanVzdGluZyB0aGUgem9v bSBzY2FsZSBhbmQgdmlld3BvcnQgdXBvbgorICAgICAgICAvLyByb3RhdGlvbiwgd2hlbiBhIHNl bGVjdCBlbGVtZW50IGlzIGZvY3VzZWQuIFNlZSA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMTkyODc4 PiBmb3IgbW9yZSBpbmZvcm1hdGlvbi4KKyAgICAgICAgW3NlbGYgX3pvb21Ub1JldmVhbEZvY3Vz ZWRFbGVtZW50XTsKKyAgICAgICAgW3NlbGYgX2Vuc3VyZUZvcm1BY2Nlc3NvcnlWaWV3XTsKKyAg ICAgICAgW3NlbGYgX3VwZGF0ZUFjY2Vzc29yeV07CisgICAgfQogCiAgICAgaWYgKFVJVmlldyAq Y3VzdG9tSW5wdXRWaWV3ID0gW19mb3JtSW5wdXRTZXNzaW9uIGN1c3RvbUlucHV0Vmlld10pCiAg ICAgICAgIHJldHVybiBjdXN0b21JbnB1dFZpZXc7CkBAIC0zMzQwLDEyICszMzU4LDEzIEBAIC0g KHZvaWQpYWNjZXNzb3J5VGFiOihCT09MKWlzTmV4dAogICAgIFtzZWxmIF9lbmRFZGl0aW5nXTsK ICAgICBfaW5wdXRQZXJpcGhlcmFsID0gbmlsOwogCi0gICAgX2RpZEFjY2Vzc29yeVRhYkluaXRp YXRlRm9jdXMgPSBZRVM7IC8vIFdpbGwgYmUgY2xlYXJlZCBpbiBlaXRoZXIgLV9kaXNwbGF5Rm9y bU5vZGVJbnB1dFZpZXcgb3IgLWNsZWFudXBJbnRlcmFjdGlvbi4KKyAgICBfaXNDaGFuZ2luZ0Zv Y3VzVXNpbmdBY2Nlc3NvcnlUYWIgPSBZRVM7CiAgICAgW3NlbGYgYmVnaW5TZWxlY3Rpb25DaGFu Z2VdOwogICAgIFJldGFpblB0cjxXS0NvbnRlbnRWaWV3PiB2aWV3ID0gc2VsZjsKICAgICBfcGFn ZS0+Zm9jdXNOZXh0QXNzaXN0ZWROb2RlKGlzTmV4dCwgW3ZpZXddKFdlYktpdDo6Q2FsbGJhY2tC YXNlOjpFcnJvcikgewogICAgICAgICBbdmlldyBlbmRTZWxlY3Rpb25DaGFuZ2VdOwogICAgICAg ICBbdmlldyByZWxvYWRJbnB1dFZpZXdzXTsKKyAgICAgICAgdmlldy0+X2lzQ2hhbmdpbmdGb2N1 c1VzaW5nQWNjZXNzb3J5VGFiID0gTk87CiAgICAgfSk7CiB9CiAKQEAgLTQzNTgsNiArNDM3Nyw1 MSBAQCAtIChVSVdlYkZvcm1BY2Nlc3NvcnkgKilmb3JtQWNjZXNzb3J5VmlldwogICAgIHJldHVy biBfZm9ybUFjY2Vzc29yeVZpZXcuZ2V0KCk7CiB9CiAKK3N0YXRpYyBib29sIHNob3VsZFpvb21U b1JldmVhbFNlbGVjdGlvblJlY3QoV2ViS2l0OjpJbnB1dFR5cGUgdHlwZSkKK3sKKyAgICBzd2l0 Y2ggKHR5cGUpIHsKKyAgICBjYXNlIFdlYktpdDo6SW5wdXRUeXBlOjpDb250ZW50RWRpdGFibGU6 CisgICAgY2FzZSBXZWJLaXQ6OklucHV0VHlwZTo6VGV4dDoKKyAgICBjYXNlIFdlYktpdDo6SW5w dXRUeXBlOjpQYXNzd29yZDoKKyAgICBjYXNlIFdlYktpdDo6SW5wdXRUeXBlOjpUZXh0QXJlYToK KyAgICBjYXNlIFdlYktpdDo6SW5wdXRUeXBlOjpTZWFyY2g6CisgICAgY2FzZSBXZWJLaXQ6Oklu cHV0VHlwZTo6RW1haWw6CisgICAgY2FzZSBXZWJLaXQ6OklucHV0VHlwZTo6VVJMOgorICAgIGNh c2UgV2ViS2l0OjpJbnB1dFR5cGU6OlBob25lOgorICAgIGNhc2UgV2ViS2l0OjpJbnB1dFR5cGU6 Ok51bWJlcjoKKyAgICBjYXNlIFdlYktpdDo6SW5wdXRUeXBlOjpOdW1iZXJQYWQ6CisgICAgICAg IHJldHVybiB0cnVlOworICAgIGRlZmF1bHQ6CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9 Cit9CisKK3N0YXRpYyBXZWJDb3JlOjpGbG9hdFJlY3QgcmVjdFRvUmV2ZWFsV2hlblpvb21pbmdU b0ZvY3VzZWRFbGVtZW50KGNvbnN0IFdlYktpdDo6QXNzaXN0ZWROb2RlSW5mb3JtYXRpb24mIGVs ZW1lbnRJbmZvLCBjb25zdCBXZWJLaXQ6OkVkaXRvclN0YXRlJiBlZGl0b3JTdGF0ZSkKK3sKKyAg ICBXZWJDb3JlOjpJbnRSZWN0IGVsZW1lbnRJbnRlcmFjdGlvblJlY3QoZWxlbWVudEluZm8uZWxl bWVudEludGVyYWN0aW9uTG9jYXRpb24sIHsgMSwgMSB9KTsKKyAgICBpZiAoIXNob3VsZFpvb21U b1JldmVhbFNlbGVjdGlvblJlY3QoZWxlbWVudEluZm8uZWxlbWVudFR5cGUpKQorICAgICAgICBy ZXR1cm4gZWxlbWVudEludGVyYWN0aW9uUmVjdDsKKworICAgIGlmIChlZGl0b3JTdGF0ZS5pc01p c3NpbmdQb3N0TGF5b3V0RGF0YSkgeworICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAg ICAgICAgcmV0dXJuIGVsZW1lbnRJbnRlcmFjdGlvblJlY3Q7CisgICAgfQorCisgICAgaWYgKGVk aXRvclN0YXRlLnNlbGVjdGlvbklzTm9uZSkKKyAgICAgICAgcmV0dXJuIHsgfTsKKworICAgIFdl YkNvcmU6OkZsb2F0UmVjdCBzZWxlY3Rpb25Cb3VuZGluZ1JlY3Q7CisgICAgYXV0byYgcG9zdExh eW91dERhdGEgPSBlZGl0b3JTdGF0ZS5wb3N0TGF5b3V0RGF0YSgpOworICAgIGlmIChlZGl0b3JT dGF0ZS5zZWxlY3Rpb25Jc1JhbmdlKSB7CisgICAgICAgIGZvciAoYXV0byYgcmVjdCA6IHBvc3RM YXlvdXREYXRhLnNlbGVjdGlvblJlY3RzKQorICAgICAgICAgICAgc2VsZWN0aW9uQm91bmRpbmdS ZWN0LnVuaXRlKHJlY3QucmVjdCgpKTsKKyAgICB9IGVsc2UKKyAgICAgICAgc2VsZWN0aW9uQm91 bmRpbmdSZWN0ID0gcG9zdExheW91dERhdGEuY2FyZXRSZWN0QXRTdGFydDsKKworICAgIHNlbGVj dGlvbkJvdW5kaW5nUmVjdC5pbnRlcnNlY3QoZWxlbWVudEluZm8uZWxlbWVudFJlY3QpOworICAg IHJldHVybiBzZWxlY3Rpb25Cb3VuZGluZ1JlY3Q7Cit9CisKIHN0YXRpYyBib29sIGlzQXNzaXN0 YWJsZUlucHV0VHlwZShXZWJLaXQ6OklucHV0VHlwZSB0eXBlKQogewogICAgIHN3aXRjaCAodHlw ZSkgewpAQCAtNDM5Nyw2ICs0NDYxLDggQEAgLSAodm9pZClfc3RhcnRBc3Npc3RpbmdOb2RlOihj b25zdCBXZWJLaXQ6OkFzc2lzdGVkTm9kZUluZm9ybWF0aW9uJilpbmZvcm1hdGlvbgogICAgIFNl dEZvclNjb3BlPEJPT0w+IGlzQ2hhbmdpbmdGb2N1c0ZvclNjb3BlIHsgX2lzQ2hhbmdpbmdGb2N1 cywgaGFzQXNzaXN0ZWROb2RlKF9hc3Npc3RlZE5vZGVJbmZvcm1hdGlvbikgfTsKICAgICBfaW5w dXRWaWV3VXBkYXRlRGVmZXJyZXIgPSBudWxscHRyOwogCisgICAgX2RpZEFjY2Vzc29yeVRhYklu aXRpYXRlRm9jdXMgPSBfaXNDaGFuZ2luZ0ZvY3VzVXNpbmdBY2Nlc3NvcnlUYWI7CisKICAgICBp ZCA8X1dLSW5wdXREZWxlZ2F0ZT4gaW5wdXREZWxlZ2F0ZSA9IFtfd2ViVmlldyBfaW5wdXREZWxl Z2F0ZV07CiAgICAgUmV0YWluUHRyPFdLRm9jdXNlZEVsZW1lbnRJbmZvPiBmb2N1c2VkRWxlbWVu dEluZm8gPSBhZG9wdE5TKFtbV0tGb2N1c2VkRWxlbWVudEluZm8gYWxsb2NdIGluaXRXaXRoQXNz aXN0ZWROb2RlSW5mb3JtYXRpb246aW5mb3JtYXRpb24gaXNVc2VySW5pdGlhdGVkOnVzZXJJc0lu dGVyYWN0aW5nIHVzZXJPYmplY3Q6dXNlck9iamVjdF0pOwogCkBAIC00NTEwLDcgKzQ1NzYsMTEg QEAgLSAodm9pZClfc3RhcnRBc3Npc3RpbmdOb2RlOihjb25zdCBXZWJLaXQ6OkFzc2lzdGVkTm9k ZUluZm9ybWF0aW9uJilpbmZvcm1hdGlvbgogICAgIGlmIChlZGl0YWJsZUNoYW5nZWQpCiAgICAg ICAgIFtfd2ViVmlldyBfc2NoZWR1bGVWaXNpYmxlQ29udGVudFJlY3RVcGRhdGVdOwogICAgIAot ICAgIFtzZWxmIF9kaXNwbGF5Rm9ybU5vZGVJbnB1dFZpZXddOworICAgIGlmICghc2hvdWxkWm9v bVRvUmV2ZWFsU2VsZWN0aW9uUmVjdChfYXNzaXN0ZWROb2RlSW5mb3JtYXRpb24uZWxlbWVudFR5 cGUpKQorICAgICAgICBbc2VsZiBfem9vbVRvUmV2ZWFsRm9jdXNlZEVsZW1lbnRdOworCisgICAg W3NlbGYgX2Vuc3VyZUZvcm1BY2Nlc3NvcnlWaWV3XTsKKyAgICBbc2VsZiBfdXBkYXRlQWNjZXNz b3J5XTsKIAogI2lmIFBMQVRGT1JNKFdBVENIT1MpCiAgICAgaWYgKF9pc0NoYW5naW5nRm9jdXMp CkBAIC00NTYyLDkgKzQ2MzIsMjIgQEAgLSAodm9pZClfc3RvcEFzc2lzdGluZ05vZGUKICAgICBb X3dlYlZpZXcgZGlkRW5kRm9ybUNvbnRyb2xJbnRlcmFjdGlvbl07CiAKICAgICBbc2VsZiBfc3Rv cFN1cHByZXNzaW5nU2VsZWN0aW9uQXNzaXN0YW50Rm9yUmVhc29uOldlYktpdDo6Rm9jdXNlZEVs ZW1lbnRJc1RyYW5zcGFyZW50XTsKKworICAgIGlmICghX2lzQ2hhbmdpbmdGb2N1cykKKyAgICAg ICAgX2RpZEFjY2Vzc29yeVRhYkluaXRpYXRlRm9jdXMgPSBOTzsKIH0KIAogLSAodm9pZClfZGlk UmVjZWl2ZUVkaXRvclN0YXRlVXBkYXRlQWZ0ZXJGb2N1cworeworICAgIFtzZWxmIF91cGRhdGVJ bml0aWFsV3JpdGluZ0RpcmVjdGlvbklmTmVjZXNzYXJ5XTsKKworICAgIC8vIEZJWE1FOiBJZiB0 aGUgaW5pdGlhbCB3cml0aW5nIGRpcmVjdGlvbiBqdXN0IGNoYW5nZWQsIHdlIHNob3VsZCB3YWl0 IHVudGlsIHdlIGdldCB0aGUgbmV4dCBwb3N0LWxheW91dCBlZGl0b3Igc3RhdGUKKyAgICAvLyBi ZWZvcmUgem9vbWluZyB0byByZXZlYWwgdGhlIHNlbGVjdGlvbiByZWN0LgorICAgIGlmIChzaG91 bGRab29tVG9SZXZlYWxTZWxlY3Rpb25SZWN0KF9hc3Npc3RlZE5vZGVJbmZvcm1hdGlvbi5lbGVt ZW50VHlwZSkpCisgICAgICAgIFtzZWxmIF96b29tVG9SZXZlYWxGb2N1c2VkRWxlbWVudF07Cit9 CisKKy0gKHZvaWQpX3VwZGF0ZUluaXRpYWxXcml0aW5nRGlyZWN0aW9uSWZOZWNlc3NhcnkKIHsK ICAgICBpZiAoIV9wYWdlLT5pc0VkaXRhYmxlKCkpCiAgICAgICAgIHJldHVybjsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGll bnQuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9t ZUNsaWVudC5jcHAKaW5kZXggYjMxYjExN2YwZWRhYjM5OGIyNTEyNDA2NGUxNjIyN2ZhZjc4NjI1 NS4uMThlMmNlODQwMDU1YjViNTJjYzU0ODA3ODllMmI1ZDFhNDZjZDMxNSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5j cHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9t ZUNsaWVudC5jcHAKQEAgLTIwMyw2ICsyMDMsMTEgQEAgdm9pZCBXZWJDaHJvbWVDbGllbnQ6OmVs ZW1lbnREaWRGb2N1cyhFbGVtZW50JiBlbGVtZW50KQogICAgIG1fcGFnZS5lbGVtZW50RGlkRm9j dXMoJmVsZW1lbnQpOwogfQogCit2b2lkIFdlYkNocm9tZUNsaWVudDo6ZWxlbWVudERpZFJlZm9j dXMoRWxlbWVudCYgZWxlbWVudCkKK3sKKyAgICBtX3BhZ2UuZWxlbWVudERpZFJlZm9jdXMoJmVs ZW1lbnQpOworfQorCiB2b2lkIFdlYkNocm9tZUNsaWVudDo6ZWxlbWVudERpZEJsdXIoRWxlbWVu dCYgZWxlbWVudCkKIHsKICAgICBtX3BhZ2UuZWxlbWVudERpZEJsdXIoJmVsZW1lbnQpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9t ZUNsaWVudC5oIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNo cm9tZUNsaWVudC5oCmluZGV4IDQzMTUxMjZiMDY0OGUzNDQ3ZmMwYjljZmJjODgwMjNjMDAxYmZj YTkuLmJiZTEwYTdjNDJkMDM3Mzk2OTQyMmZjMTMzYmU2YzQ2NjVkZWNkNzAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQu aAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21l Q2xpZW50LmgKQEAgLTI1MiwxMCArMjUyLDYgQEAgcHJpdmF0ZToKICAgICBSZWZQdHI8V2ViQ29y ZTo6U2Nyb2xsaW5nQ29vcmRpbmF0b3I+IGNyZWF0ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yKFdlYkNv cmU6OlBhZ2UmKSBjb25zdCBmaW5hbDsKICNlbmRpZgogCi0jaWYgUExBVEZPUk0oSU9TX0ZBTUlM WSkKLSAgICB2b2lkIGVsZW1lbnREaWRSZWZvY3VzKFdlYkNvcmU6OkVsZW1lbnQmKSBmaW5hbDsK LSNlbmRpZgotCiAjaWYgKFBMQVRGT1JNKElPU19GQU1JTFkpICYmIEhBVkUoQVZLSVQpKSB8fCAo UExBVEZPUk0oTUFDKSAmJiBFTkFCTEUoVklERU9fUFJFU0VOVEFUSU9OX01PREUpKQogICAgIGJv b2wgc3VwcG9ydHNWaWRlb0Z1bGxzY3JlZW4oV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudEVudW1z OjpWaWRlb0Z1bGxzY3JlZW5Nb2RlKSBmaW5hbDsKICAgICBib29sIHN1cHBvcnRzVmlkZW9GdWxs c2NyZWVuU3RhbmRieSgpIGZpbmFsOwpAQCAtMjc4LDYgKzI3NCw3IEBAIHByaXZhdGU6CiAjaWYg UExBVEZPUk0oQ09DT0EpCiAgICAgdm9pZCBlbGVtZW50RGlkRm9jdXMoV2ViQ29yZTo6RWxlbWVu dCYpIGZpbmFsOwogICAgIHZvaWQgZWxlbWVudERpZEJsdXIoV2ViQ29yZTo6RWxlbWVudCYpIGZp bmFsOworICAgIHZvaWQgZWxlbWVudERpZFJlZm9jdXMoV2ViQ29yZTo6RWxlbWVudCYpIGZpbmFs OwogCiAgICAgdm9pZCBtYWtlRmlyc3RSZXNwb25kZXIoKSBmaW5hbDsKICAgICB2b2lkIGFzc2lz dGl2ZVRlY2hub2xvZ3lNYWtlRmlyc3RSZXNwb25kZXIoKSBmaW5hbDsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9pb3MvV2ViQ2hyb21lQ2xpZW50 SU9TLm1tIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L2lvcy9XZWJD aHJvbWVDbGllbnRJT1MubW0KaW5kZXggZjZhMDI4MDIwMzI0ODc5ZmViZGRiMjczNGVhNjk3MDFm ZmRhODkxNS4uZjdmNGU5MzUxMmM0MjUwMDI3MzIwM2Q4MmY0NjE1MzhmYzI2ZmM5OSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L2lvcy9XZWJDaHJv bWVDbGllbnRJT1MubW0KKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYkNvcmVTdXBw b3J0L2lvcy9XZWJDaHJvbWVDbGllbnRJT1MubW0KQEAgLTUzLDExICs1Myw2IEBAIHZvaWQgV2Vi Q2hyb21lQ2xpZW50OjpkaWRQcmV2ZW50RGVmYXVsdEZvckV2ZW50KCkKIAogI2VuZGlmCiAKLXZv aWQgV2ViQ2hyb21lQ2xpZW50OjplbGVtZW50RGlkUmVmb2N1cyhXZWJDb3JlOjpFbGVtZW50JiBl bGVtZW50KQotewotICAgIGVsZW1lbnREaWRGb2N1cyhlbGVtZW50KTsKLX0KLQogdm9pZCBXZWJD aHJvbWVDbGllbnQ6OmRpZFJlY2VpdmVNb2JpbGVEb2NUeXBlKGJvb2wgaXNNb2JpbGVEb2N0eXBl KQogewogICAgIG1fcGFnZS5kaWRSZWNlaXZlTW9iaWxlRG9jVHlwZShpc01vYmlsZURvY3R5cGUp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5j cHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAppbmRleCBi ZTZiZWZiODE0Nzg2NWZjMGU4MWU4MTIyM2I2YzQ5NmFiN2YxYmQ1Li44MDIxZDE2MjhiMGJiMGE4 MjE2OTIwMTliNDY0YmYyNWViYzY4OTg3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlBy b2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv V2ViUGFnZS9XZWJQYWdlLmNwcApAQCAtNTI3OCw2ICs1Mjc4LDEyIEBAIHZvaWQgV2ViUGFnZTo6 cmVzZXRBc3Npc3RlZE5vZGVGb3JGcmFtZShXZWJGcmFtZSogZnJhbWUpCiAgICAgfQogfQogCit2 b2lkIFdlYlBhZ2U6OmVsZW1lbnREaWRSZWZvY3VzKFdlYkNvcmU6Ok5vZGUqIG5vZGUpCit7Cisg ICAgZWxlbWVudERpZEZvY3VzKG5vZGUpOworICAgIG1faGFzUGVuZGluZ0VkaXRvclN0YXRlVXBk YXRlID0gdHJ1ZTsKK30KKwogdm9pZCBXZWJQYWdlOjplbGVtZW50RGlkRm9jdXMoV2ViQ29yZTo6 Tm9kZSogbm9kZSkKIHsKICAgICBpZiAobV9hc3Npc3RlZE5vZGUgPT0gbm9kZSAmJiBtX2lzQXNz aXN0aW5nTm9kZUR1ZVRvVXNlckludGVyYWN0aW9uKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz L1dlYlBhZ2UvV2ViUGFnZS5oCmluZGV4IDQ3NzA4NjgwNzQ1NDgwODdiNzNjMzZjNjU4YjBlZGZi NGUwYTZiMjQuLjY3NGMxMjVjNzU0M2YyYjBhNjdmMTc5MDI4MWE3NDY4YWI0MjI0MzkgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAorKysgYi9T b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKQEAgLTU4NSw3ICs1ODUs OSBAQCBwdWJsaWM6CiAgICAgdm9pZCBjYXB0dXJlRGV2aWNlc0NoYW5nZWQoKTsKICNlbmRpZgog CisgICAgLy8gRklYTUU6IFRoZXNlIHNob3VsZCBhbGwgdGFrZSBFbGVtZW50JiBpbnN0ZWFkIG9m IE5vZGUqLgogICAgIHZvaWQgZWxlbWVudERpZEZvY3VzKFdlYkNvcmU6Ok5vZGUqKTsKKyAgICB2 b2lkIGVsZW1lbnREaWRSZWZvY3VzKFdlYkNvcmU6Ok5vZGUqKTsKICAgICB2b2lkIGVsZW1lbnRE aWRCbHVyKFdlYkNvcmU6Ok5vZGUqKTsKICAgICB2b2lkIHJlc2V0QXNzaXN0ZWROb2RlRm9yRnJh bWUoV2ViRnJhbWUqKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl YlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0gYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFn ZS9pb3MvV2ViUGFnZUlPUy5tbQppbmRleCA5ZGY2MThhNGQ5YWQ4ZTliMWQ2MzIwNmM2MDA1MWRh ZmI3NmRiMjM1Li5jMDBhNmNiM2E1YjNiMTZiZWZhNzBiYTY0NWVlMTkxYjA4ZjFkZDZkIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5t bQorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5t bQpAQCAtNjE1LDcgKzYxNSw3IEBAIHZvaWQgV2ViUGFnZTo6Y29tcGxldGVTeW50aGV0aWNDbGlj ayhOb2RlKiBub2RlUmVzcG9uZGluZ1RvQ2xpY2ssIGNvbnN0IFdlYkNvcmU6CiAgICAgLy8gSWYg dGhlIG5vZGUgaGFzIGJlZW4gZm9jdXNlZCBieSBKYXZhU2NyaXB0IHdpdGhvdXQgdXNlciBpbnRl cmFjdGlvbiwgdGhlCiAgICAgLy8ga2V5Ym9hcmQgaXMgbm90IG9uIHNjcmVlbi4KICAgICBpZiAo bmV3Rm9jdXNlZEVsZW1lbnQgJiYgbmV3Rm9jdXNlZEVsZW1lbnQgPT0gb2xkRm9jdXNlZEVsZW1l bnQpCi0gICAgICAgIGVsZW1lbnREaWRGb2N1cyhuZXdGb2N1c2VkRWxlbWVudC5nZXQoKSk7Cisg ICAgICAgIGVsZW1lbnREaWRSZWZvY3VzKG5ld0ZvY3VzZWRFbGVtZW50LmdldCgpKTsKIAogICAg IGlmICghdGFwV2FzSGFuZGxlZCB8fCAhbm9kZVJlc3BvbmRpbmdUb0NsaWNrIHx8ICFub2RlUmVz cG9uZGluZ1RvQ2xpY2stPmlzRWxlbWVudE5vZGUoKSkKICAgICAgICAgc2VuZChNZXNzYWdlczo6 V2ViUGFnZVByb3h5OjpEaWROb3RIYW5kbGVUYXBBc0NsaWNrKHJvdW5kZWRJbnRQb2ludChsb2Nh dGlvbikpKTsKQEAgLTIzNjMsOSArMjM2Myw3IEBAIHZvaWQgV2ViUGFnZTo6Z2V0QXNzaXN0ZWRO b2RlSW5mb3JtYXRpb24oQXNzaXN0ZWROb2RlSW5mb3JtYXRpb24mIGluZm9ybWF0aW9uKQogewog ICAgIGxheW91dElmTmVlZGVkKCk7CiAKLSAgICAvLyBGSVhNRTogaW5mb3JtYXRpb24uc2VsZWN0 aW9uUmVjdCBzaG91bGQgYmUgc2V0IHRvIHRoZSBhY3R1YWwgc2VsZWN0aW9uIHJlY3QsIGJ1dCB3 aGVuIHRoaXMgaXMgY2FsbGVkIGF0IGZvY3VzIHRpbWUKLSAgICAvLyB3ZSBkb24ndCBoYXZlIGEg c2VsZWN0aW9uIHlldC4gVXNpbmcgdGhlIGxhc3QgaW50ZXJhY3Rpb24gbG9jYXRpb24gaXMgYSBy ZWFzb25hYmxlIGFwcHJveGltYXRpb24gZm9yIG5vdy4KLSAgICBpbmZvcm1hdGlvbi5zZWxlY3Rp b25SZWN0ID0gSW50UmVjdChtX2xhc3RJbnRlcmFjdGlvbkxvY2F0aW9uLCBJbnRTaXplKDEsIDEp KTsKKyAgICBpbmZvcm1hdGlvbi5lbGVtZW50SW50ZXJhY3Rpb25Mb2NhdGlvbiA9IG1fbGFzdElu dGVyYWN0aW9uTG9jYXRpb247CiAKICAgICBpZiAoUmVuZGVyT2JqZWN0KiByZW5kZXJlciA9IG1f YXNzaXN0ZWROb2RlLT5yZW5kZXJlcigpKSB7CiAgICAgICAgIEZyYW1lJiBlbGVtZW50RnJhbWUg PSBtX3BhZ2UtPmZvY3VzQ29udHJvbGxlcigpLmZvY3VzZWRPck1haW5GcmFtZSgpOwpAQCAtMjM4 NiwxMSArMjM4NCwxMSBAQCB2b2lkIFdlYlBhZ2U6OmdldEFzc2lzdGVkTm9kZUluZm9ybWF0aW9u KEFzc2lzdGVkTm9kZUluZm9ybWF0aW9uJiBpbmZvcm1hdGlvbikKICAgICAgICAgICAgIGZyYW1l Vmlldy0+c2V0Q3VzdG9tRml4ZWRQb3NpdGlvbkxheW91dFJlY3QoY3VycmVudEZpeGVkUG9zaXRp b25SZWN0KTsKICAgICAgICAgICAgIAogICAgICAgICAgICAgaWYgKCFpbmZvcm1hdGlvbi5lbGVt ZW50UmVjdC5jb250YWlucyhtX2xhc3RJbnRlcmFjdGlvbkxvY2F0aW9uKSkKLSAgICAgICAgICAg ICAgICBpbmZvcm1hdGlvbi5zZWxlY3Rpb25SZWN0LnNldExvY2F0aW9uKGluZm9ybWF0aW9uLmVs ZW1lbnRSZWN0LmxvY2F0aW9uKCkpOworICAgICAgICAgICAgICAgIGluZm9ybWF0aW9uLmVsZW1l bnRJbnRlcmFjdGlvbkxvY2F0aW9uID0gaW5mb3JtYXRpb24uZWxlbWVudFJlY3QubG9jYXRpb24o KTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIC8vIERvbid0IHVzZSB0aGUgc2VsZWN0 aW9uIHJlY3QgaWYgaW50ZXJhY3Rpb24gd2FzIG91dHNpZGUgdGhlIGVsZW1lbnQgcmVjdC4KICAg ICAgICAgICAgIGlmICghaW5mb3JtYXRpb24uZWxlbWVudFJlY3QuY29udGFpbnMobV9sYXN0SW50 ZXJhY3Rpb25Mb2NhdGlvbikpCi0gICAgICAgICAgICAgICAgaW5mb3JtYXRpb24uc2VsZWN0aW9u UmVjdCA9IEludFJlY3QoKTsKKyAgICAgICAgICAgICAgICBpbmZvcm1hdGlvbi5lbGVtZW50SW50 ZXJhY3Rpb25Mb2NhdGlvbiA9IHsgfTsKICAgICAgICAgfQogICAgIH0gZWxzZQogICAgICAgICBp bmZvcm1hdGlvbi5lbGVtZW50UmVjdCA9IEludFJlY3QoKTsKZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA4MjFjNzU3MjlmMzI4 NWNlMjNlYTU4MGNmMzY2ODc3NjA4YjJkZTY3Li4xMDgwMjVhNDg0ZDQ5ZTUzOTc5OGExMmRlNzMz YmMxOWZiZGNlNDQwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTgtMTItMTkgIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gRm9jdXNpbmcg YW4gZWRpdGFibGUgZWxlbWVudCBzaG91bGQgc2Nyb2xsIHRvIHJldmVhbCB0aGUgc2VsZWN0aW9u CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTI4MDIK KyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ2NzgxNzU5PgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZHMgYSBuZXcgbGF5b3V0IHRlc3QgdG8gdmVy aWZ5IHRoYXQgdGFwcGluZyBuZWFyIHRoZSBib3R0b20gb2YgYSB0YWxsIGVkaXRhYmxlIGVsZW1l bnQgdG8gZm9jdXMgaXQgZG9lc24ndAorICAgICAgICBjYXVzZSB0aGUgcGFnZSB0byBzY3JvbGwg dXAgKGFuZCwgYXMgYSByZXN1bHQsIGxlYXZlIHRoZSBzZWxlY3Rpb24gY2FyZXQgb2JzY3VyZWQp LgorCisgICAgICAgICogZWRpdGluZy9zZWxlY3Rpb24vaW9zL3NlbGVjdGlvbi1pcy12aXNpYmxl LWFmdGVyLWZvY3VzaW5nLWVkaXRhYmxlLWFyZWEtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAg ICAgKiBlZGl0aW5nL3NlbGVjdGlvbi9pb3Mvc2VsZWN0aW9uLWlzLXZpc2libGUtYWZ0ZXItZm9j dXNpbmctZWRpdGFibGUtYXJlYS5odG1sOiBBZGRlZC4KKwogMjAxOC0xMi0xOCAgSnVzdGluIE1p Y2hhdWQgIDxqdXN0aW5fbWljaGF1ZEBhcHBsZS5jb20+CiAKICAgICAgICAgVXBkYXRlIENTUyBQ cm9wZXJ0aWVzIGFuZCBWYWx1ZXMgQVBJIHRvIHVzZSBuZXcgY3ljbGUgZmFsbGJhY2sgYmVoYXZp b3VyCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9lZGl0aW5nL3NlbGVjdGlvbi9pb3Mvc2VsZWN0 aW9uLWlzLXZpc2libGUtYWZ0ZXItZm9jdXNpbmctZWRpdGFibGUtYXJlYS1leHBlY3RlZC50eHQg Yi9MYXlvdXRUZXN0cy9lZGl0aW5nL3NlbGVjdGlvbi9pb3Mvc2VsZWN0aW9uLWlzLXZpc2libGUt YWZ0ZXItZm9jdXNpbmctZWRpdGFibGUtYXJlYS1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAx MDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMzg2 M2FkMGY4M2U4NjVjOTA2MjEzNzU3YjQzZjJhYjBmMjUwZjlhZQotLS0gL2Rldi9udWxsCisrKyBi L0xheW91dFRlc3RzL2VkaXRpbmcvc2VsZWN0aW9uL2lvcy9zZWxlY3Rpb24taXMtdmlzaWJsZS1h ZnRlci1mb2N1c2luZy1lZGl0YWJsZS1hcmVhLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDUgQEAK K1RoaXMgdGVzdCB2ZXJpZmllcyB0aGF0IHRoZSBzZWxlY3Rpb24gaXMgdmlzaWJsZSBhZnRlciB0 YXBwaW5nIG5lYXIgdGhlIGJvdHRvbSBvZiBhIGxhcmdlIGVkaXRhYmxlIGFyZWEuIFRvIHRlc3Qg bWFudWFsbHksIHRhcCBuZWFyIHRoZSBib3R0b20gb2YgdGhlIHNjcmVlbiBhbmQgY2hlY2sgdGhh dCB0aGUgcGFnZSBkaWQgbm90IHNjcm9sbCwgYW5kIHRoYXQgdGhlIHNlbGVjdGlvbiBpcyB2aXNp YmxlIGF0IHRoZSB0b3Agb2YgdGhlIGVkaXRhYmxlIGFyZWEuCisKK1RhcCBoZXJlCitUaGUgaW5p dGlhbCBzY3JvbGwgb2Zmc2V0IGlzOiAwLDAKK1RoZSBmaW5hbCBzY3JvbGwgb2Zmc2V0IGlzOiAw LDAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2VkaXRpbmcvc2VsZWN0aW9uL2lvcy9zZWxlY3Rp b24taXMtdmlzaWJsZS1hZnRlci1mb2N1c2luZy1lZGl0YWJsZS1hcmVhLmh0bWwgYi9MYXlvdXRU ZXN0cy9lZGl0aW5nL3NlbGVjdGlvbi9pb3Mvc2VsZWN0aW9uLWlzLXZpc2libGUtYWZ0ZXItZm9j dXNpbmctZWRpdGFibGUtYXJlYS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjJmNDA2MzY3MDdkNDQwMmI5OWM1 M2VhYjBjNjdkNTlhZmY0M2VjNTIKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9lZGl0 aW5nL3NlbGVjdGlvbi9pb3Mvc2VsZWN0aW9uLWlzLXZpc2libGUtYWZ0ZXItZm9jdXNpbmctZWRp dGFibGUtYXJlYS5odG1sCkBAIC0wLDAgKzEsNjQgQEAKKzwhRE9DVFlQRSBodG1sPiA8IS0tIHdl YmtpdC10ZXN0LXJ1bm5lciBbIHVzZUZsZXhpYmxlVmlld3BvcnQ9dHJ1ZSBdIC0tPgorPGh0bWw+ Cis8aGVhZD4KKyAgICA8bWV0YSBuYW1lPSJ2aWV3cG9ydCIgY29udGVudD0id2lkdGg9ZGV2aWNl LXdpZHRoLCBpbml0aWFsLXNjYWxlPTEsIG1heGltdW0tc2NhbGU9MSI+CisgICAgPHNjcmlwdCBz cmM9Ii4uLy4uLy4uL3Jlc291cmNlcy91aS1oZWxwZXIuanMiPjwvc2NyaXB0PgorICAgIDxzdHls ZT4KKyAgICBkaXYjdGFwLWhlcmUgeworICAgICAgICBib3JkZXItcmFkaXVzOiA1MHB4OworICAg ICAgICB3aWR0aDogMTAwcHg7CisgICAgICAgIGhlaWdodDogMTAwcHg7CisgICAgICAgIHBvc2l0 aW9uOiBhYnNvbHV0ZTsKKyAgICAgICAgbGVmdDogMTAwcHg7CisgICAgICAgIHRvcDogNDAwcHg7 CisgICAgICAgIGJhY2tncm91bmQtY29sb3I6IHRvbWF0bzsKKyAgICAgICAgY29sb3I6IHdoaXRl OworICAgICAgICBwYWRkaW5nLXRvcDogNDJweDsKKyAgICAgICAgYm94LXNpemluZzogYm9yZGVy LWJveDsKKyAgICAgICAgdGV4dC1hbGlnbjogY2VudGVyOworICAgICAgICBwb2ludGVyLWV2ZW50 czogbm9uZTsKKyAgICAgICAgb3BhY2l0eTogMC43NTsKKyAgICB9CisKKyAgICBwcmUjZWRpdG9y IHsKKyAgICAgICAgbGluZS1oZWlnaHQ6IDEuNWVtOworICAgICAgICBib3JkZXI6IHNpbHZlciBk YXNoZWQgMnB4OworICAgICAgICBoZWlnaHQ6IDEwMHZoOworICAgICAgICBtYXJnaW4tdG9wOiAw OworICAgIH0KKyAgICA8L3N0eWxlPgorPC9oZWFkPgorPGJvZHkgc3R5bGU9Im1hcmdpbjogMCI+ CisgICAgPHByZSBpZD0iZWRpdG9yIiBjb250ZW50ZWRpdGFibGU+PC9wcmU+CisgICAgPHAgaWQ9 ImRlc2NyaXB0aW9uIj4KKyAgICBUaGlzIHRlc3QgdmVyaWZpZXMgdGhhdCB0aGUgc2VsZWN0aW9u IGlzIHZpc2libGUgYWZ0ZXIgdGFwcGluZyBuZWFyIHRoZSBib3R0b20gb2YgYSBsYXJnZSBlZGl0 YWJsZSBhcmVhLgorICAgIFRvIHRlc3QgbWFudWFsbHksIHRhcCBuZWFyIHRoZSBib3R0b20gb2Yg dGhlIHNjcmVlbiBhbmQgY2hlY2sgdGhhdCB0aGUgcGFnZSBkaWQgbm90IHNjcm9sbCwgYW5kIHRo YXQgdGhlIHNlbGVjdGlvbgorICAgIGlzIHZpc2libGUgYXQgdGhlIHRvcCBvZiB0aGUgZWRpdGFi bGUgYXJlYS4KKyAgICA8L3A+CisgICAgPGRpdiBpZD0idGFwLWhlcmUiPlRhcCBoZXJlPC9kaXY+ CisgICAgPGRpdj4KKyAgICAgICAgPHByZT5UaGUgaW5pdGlhbCBzY3JvbGwgb2Zmc2V0IGlzOiA8 c3BhbiBpZD0iaW5pdGlhbCI+PC9zcGFuPjwvcHJlPgorICAgICAgICA8cHJlPlRoZSBmaW5hbCBz Y3JvbGwgb2Zmc2V0IGlzOiA8c3BhbiBpZD0iZmluYWwiPjwvc3Bhbj48L3ByZT4KKyAgICA8L2Rp dj4KKzwvYm9keT4KKzxzY3JpcHQ+CitpZiAod2luZG93LnRlc3RSdW5uZXIpIHsKKyAgICB0ZXN0 UnVubmVyLmR1bXBBc1RleHQoKTsKKyAgICB0ZXN0UnVubmVyLndhaXRVbnRpbERvbmUoKTsKK30K KworYWRkRXZlbnRMaXN0ZW5lcigibG9hZCIsIGFzeW5jICgpID0+IHsKKyAgICBpZiAoIXdpbmRv dy50ZXN0UnVubmVyKQorICAgICAgICByZXR1cm47CisKKyAgICBpbml0aWFsLnRleHRDb250ZW50 ID0gW3BhZ2VYT2Zmc2V0LCBwYWdlWU9mZnNldF0udG9TdHJpbmcoKTsKKworICAgIGF3YWl0IFVJ SGVscGVyLmFjdGl2YXRlQW5kV2FpdEZvcklucHV0U2Vzc2lvbkF0KDE1MCwgNDUwKTsKKyAgICBl ZGl0b3IuYmx1cigpOworICAgIGF3YWl0IFVJSGVscGVyLndhaXRGb3JLZXlib2FyZFRvSGlkZSgp OworCisgICAgZmluYWwudGV4dENvbnRlbnQgPSBbcGFnZVhPZmZzZXQsIHBhZ2VZT2Zmc2V0XS50 b1N0cmluZygpOworICAgIHRlc3RSdW5uZXIubm90aWZ5RG9uZSgpOworfSk7Cis8L3NjcmlwdD4K KzwvaHRtbD4KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCg==