213408 2020-06-19 14:56:45 -0700 [AutoSizing] Resolve viewport units against the preferred content size 2020-06-19 19:45:00 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham simon.fraser thorton timothy zalan oldest_to_newest 1664541 0 zalan 2020-06-19 14:56:45 -0700 <rdar://problem/64267539> 1664545 1 zalan 2020-06-19 14:59:45 -0700 *** Bug 213313 has been marked as a duplicate of this bug. *** 1664555 2 402333 zalan 2020-06-19 15:14:47 -0700 Created attachment 402333 Patch 1664565 3 402333 thorton 2020-06-19 15:26:10 -0700 Comment on attachment 402333 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=402333&action=review > Source/WebCore/ChangeLog:19 > + and resolved the values against the horiztonal constraint). horiztonal > Source/WebCore/testing/Internals.cpp:3716 > +void Internals::enableSizeToContentAutoSizeMode(bool enabled, int width, int height) We already have tests. Maybe no internals method because they’re all API tests? OK 1664568 4 402336 zalan 2020-06-19 15:30:20 -0700 Created attachment 402336 Patch 1664569 5 zalan 2020-06-19 15:31:59 -0700 > > Source/WebCore/testing/Internals.cpp:3716 > > +void Internals::enableSizeToContentAutoSizeMode(bool enabled, int width, int height) > > We already have tests. Maybe no internals method because they’re all API > tests? OK Yeah, and we already have layout tests for the fixed-autosizing(mail), so I thought why not add one for the contentsize-autosizing. 1664636 6 402354 zalan 2020-06-19 17:21:24 -0700 Created attachment 402354 Patch 1664663 7 ews-feeder 2020-06-19 17:57:40 -0700 commit-queue failed to commit attachment 402354 to WebKit repository. 1664690 8 zalan 2020-06-19 19:45:00 -0700 Committed r263311: <https://trac.webkit.org/changeset/263311> 402333 2020-06-19 15:14:47 -0700 2020-06-19 15:30:19 -0700 Patch bug-213408-20200619151446.patch text/plain 12549 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzMjcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWRhYWNkMTM3YmMyZjg4 ZjBmZDQ2NjM4ZGM5ZjgyNGM2ZjgzZDVjMy4uMDgxZGQwMWQ5NDk2YTMwZjEyYmYxNTJlMzE1ODhl YzIxZjhlNjdlZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDIwLTA2LTE5ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0F1dG9TaXppbmddIFJlc29s dmUgdmlld3BvcnQgdW5pdHMgYWdhaW5zdCB0aGUgcHJlZmVycmVkIGNvbnRlbnQgc2l6ZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEzNDA4CisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS82NDI2NzUzOT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBJbnN0ZWFkIG9mIHJlc29sdmluZyB0aGUgdmlld3BvcnQg dW5pdHMgYWdhaW5zdCB0aGUgbWF4aW11bSBjb250ZW50IHNpemUgY29uc3RyYWludHMsIGxldCdz IHVzZSB0aGUgcHJlZmVycmVkIGNvbnRlbnQgc2l6ZS4KKyAgICAgICAgSXQgZW5zdXJlcyB0aGF0 IGNvbnRlbnQgd2l0aCB2dywgdmggdW5pdHMgZG9lcyBub3QgZ3JvdyBiZXlvbmQgdGhlIHByZWZl cnJlZCBjb250ZW50IHNpemUuCisKKyAgICAgICAgVGVzdDogZmFzdC9keW5hbWljL3NpemUtdG8t Y29udGVudC1hdXRvc2l6ZS13aXRoLXZpZXdwb3J0LXVuaXRzLmh0bWwKKworICAgICAgICAqIHBh Z2UvRnJhbWVWaWV3LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6cGVyZm9ybVNp emVUb0NvbnRlbnRBdXRvU2l6ZSk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OmVuYWJs ZUF1dG9TaXplTW9kZSk6IExldCdzICJpZ25vcmUiIHZpZXdwb3J0IHVuaXRzIGR1cmluZyB0aGUg aW5pdGlhbAorICAgICAgICBwYXNzIGFuZCB1c2UgdGhlIHByZWZlcnJlZCB3aWR0aCB0byBmaW5h bGl6ZSB0aGUgdncgdmggdW5pdCB2YWx1ZXMgKHdlIGRvbid0IHJlYWxseSBpZ25vcmUgdGhlbSwg YnV0IHRoZXkgYXJlIHJlc29sdmVkIGFnYWluc3QgYSBbIDEsIDEgXSB2aWV3cG9ydCkuCisgICAg ICAgIFRoaXMgYXBwcm9hY2ggZmFpbHMgaWYgdGhlIG1haW4gY29udGVudCBoYXMgMTAwdncgd2l0 aCBvdmVyZmxvdyBoaWRkZW4uIFN1Y2ggY29udGVudCB3b3VsZCBlbmQgdXAgd2l0aCBhIFsgMSwg MSBdIHNpemUgKHdlIG1pZ2h0IHdhbnQgdG8gZGV0ZWN0IGl0IAorICAgICAgICBhbmQgcmVzb2x2 ZWQgdGhlIHZhbHVlcyBhZ2FpbnN0IHRoZSBob3JpenRvbmFsIGNvbnN0cmFpbnQpLgorICAgICAg ICAoV2ViQ29yZTo6RnJhbWVWaWV3OjpvdmVycmlkZVZpZXdwb3J0V2lkdGhGb3JDU1NWaWV3cG9y dFVuaXRzKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6cmVzZXRPdmVycmlkZGVuVmll d3BvcnRXaWR0aEZvckNTU1ZpZXdwb3J0VW5pdHMpOgorICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3 Lmg6CisgICAgICAgICogdGVzdGluZy9JbnRlcm5hbHMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 SW50ZXJuYWxzOjplbmFibGVTaXplVG9Db250ZW50QXV0b1NpemVNb2RlKToKKyAgICAgICAgKiB0 ZXN0aW5nL0ludGVybmFscy5oOgorICAgICAgICAqIHRlc3RpbmcvSW50ZXJuYWxzLmlkbDoKKwog MjAyMC0wNi0xOSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIE1v dmUgUHJlZml4ZWQgV2ViQXVkaW8gaW50ZXJmYWNlcyBiZWhpbmQgdGhlaXIgb3duIGZlYXR1cmUg ZmxhZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCmluZGV4IDk3MWY1NTU3OTlmZGZjNGIxN2I0 MzEzMGVjMDAxNzVmMTYzODljMjguLjdiNTJjODZkNGMyOWMxNTM4MzljM2RlMDZmNzdjYzZjNDU4 YmY4ZTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKQEAgLTM0NzksMTkgKzM0NzksMTgg QEAgdm9pZCBGcmFtZVZpZXc6OnBlcmZvcm1TaXplVG9Db250ZW50QXV0b1NpemUoKQogICAgIGF1 dG8qIGRvY3VtZW50ID0gZnJhbWUoKS5kb2N1bWVudCgpOwogICAgIGF1dG8qIHJlbmRlclZpZXcg PSBkb2N1bWVudC0+cmVuZGVyVmlldygpOwogCi0gICAgSW50U2l6ZSBtaW5BdXRvU2l6ZSgxLCAx KTsKLQogICAgIC8vIFN0YXJ0IGZyb20gdGhlIG1pbmltdW0gc2l6ZSBhbmQgYWxsb3cgaXQgdG8g Z3Jvdy4KLSAgICByZXNpemUobWluQXV0b1NpemUud2lkdGgoKSwgbWluQXV0b1NpemUuaGVpZ2h0 KCkpOwotICAgIEludFNpemUgc2l6ZSA9IGZyYW1lUmVjdCgpLnNpemUoKTsKKyAgICBhdXRvIG1p bkF1dG9TaXplID0gSW50U2l6ZSB7IDEsIDEgfTsKKyAgICByZXNpemUobWluQXV0b1NpemUpOwor ICAgIGF1dG8gc2l6ZSA9IGZyYW1lUmVjdCgpLnNpemUoKTsKICAgICAvLyBEbyB0aGUgcmVzaXpp bmcgdHdpY2UuIFRoZSBmaXJzdCB0aW1lIGlzIGJhc2ljYWxseSBhIHJvdWdoIGNhbGN1bGF0aW9u IHVzaW5nIHRoZSBwcmVmZXJyZWQgd2lkdGgKICAgICAvLyB3aGljaCBtYXkgcmVzdWx0IGluIGEg aGVpZ2h0IGNoYW5nZSBkdXJpbmcgdGhlIHNlY29uZCBpdGVyYXRpb24uCisgICAgLy8gTGV0J3Mg aWdub3JlIHJlbmRlcmVycyB3aXRoIHZpZXdwb3J0IHVuaXRzIGZpcnN0IGFuZCByZXNvbHZlIHRo ZXNlIGJveGVzIGR1cmluZyB0aGUgc2Vjb25kIHBoYXNlIG9mIHRoZSBhdXRvc2l6aW5nLgorICAg IHJlc2V0T3ZlcnJpZGRlblZpZXdwb3J0V2lkdGhGb3JDU1NWaWV3cG9ydFVuaXRzKCk7CiAgICAg Zm9yIChpbnQgaSA9IDA7IGkgPCAyOyBpKyspIHsKICAgICAgICAgLy8gVXBkYXRlIHZhcmlvdXMg c2l6ZXMgaW5jbHVkaW5nIGNvbnRlbnRzU2l6ZSwgc2Nyb2xsSGVpZ2h0LCBldGMuCiAgICAgICAg IGRvY3VtZW50LT51cGRhdGVMYXlvdXRJZ25vcmVQZW5kaW5nU3R5bGVzaGVldHMoKTsKLSAgICAg ICAgaW50IHdpZHRoID0gcmVuZGVyVmlldy0+bWluUHJlZmVycmVkTG9naWNhbFdpZHRoKCk7Ci0g ICAgICAgIGludCBoZWlnaHQgPSByZW5kZXJWaWV3LT5kb2N1bWVudFJlY3QoKS5oZWlnaHQoKTsK LSAgICAgICAgSW50U2l6ZSBuZXdTaXplKHdpZHRoLCBoZWlnaHQpOworICAgICAgICBhdXRvIG5l d1NpemUgPSBJbnRTaXplIHsgcmVuZGVyVmlldy0+bWluUHJlZmVycmVkTG9naWNhbFdpZHRoKCks IHJlbmRlclZpZXctPmRvY3VtZW50UmVjdCgpLmhlaWdodCgpIH07CiAKICAgICAgICAgLy8gQ2hl Y2sgdG8gc2VlIGlmIGEgc2Nyb2xsYmFyIGlzIG5lZWRlZCBmb3IgYSBnaXZlbiBkaW1lbnNpb24g YW5kCiAgICAgICAgIC8vIGlmIHNvLCBpbmNyZWFzZSB0aGUgb3RoZXIgZGltZW5zaW9uIHRvIGFj Y291bnQgZm9yIHRoZSBzY3JvbGxiYXIuCkBAIC0zNTAyLDcgKzM1MDEsNiBAQCB2b2lkIEZyYW1l Vmlldzo6cGVyZm9ybVNpemVUb0NvbnRlbnRBdXRvU2l6ZSgpCiAgICAgICAgICAgICBpZiAoIWxv Y2FsSG9yaXpvbnRhbFNjcm9sbGJhcikKICAgICAgICAgICAgICAgICBsb2NhbEhvcml6b250YWxT Y3JvbGxiYXIgPSBjcmVhdGVTY3JvbGxiYXIoSG9yaXpvbnRhbFNjcm9sbGJhcik7CiAgICAgICAg ICAgICBuZXdTaXplLmV4cGFuZCgwLCBsb2NhbEhvcml6b250YWxTY3JvbGxiYXItPm9jY3VwaWVk SGVpZ2h0KCkpOwotCiAgICAgICAgICAgICAvLyBEb24ndCBib3RoZXIgY2hlY2tpbmcgZm9yIGEg dmVydGljYWwgc2Nyb2xsYmFyIGJlY2F1c2UgdGhlIHdpZHRoIGlzIGF0CiAgICAgICAgICAgICAv LyBhbHJlYWR5IGdyZWF0ZXIgdGhlIG1heGltdW0uCiAgICAgICAgIH0gZWxzZSBpZiAobmV3U2l6 ZS5oZWlnaHQoKSA+IG1fYXV0b1NpemVDb25zdHJhaW50LmhlaWdodCgpKSB7CkBAIC0zNTEwLDcg KzM1MDgsNiBAQCB2b2lkIEZyYW1lVmlldzo6cGVyZm9ybVNpemVUb0NvbnRlbnRBdXRvU2l6ZSgp CiAgICAgICAgICAgICBpZiAoIWxvY2FsVmVydGljYWxTY3JvbGxiYXIpCiAgICAgICAgICAgICAg ICAgbG9jYWxWZXJ0aWNhbFNjcm9sbGJhciA9IGNyZWF0ZVNjcm9sbGJhcihWZXJ0aWNhbFNjcm9s bGJhcik7CiAgICAgICAgICAgICBuZXdTaXplLmV4cGFuZChsb2NhbFZlcnRpY2FsU2Nyb2xsYmFy LT5vY2N1cGllZFdpZHRoKCksIDApOwotCiAgICAgICAgICAgICAvLyBEb24ndCBib3RoZXIgY2hl Y2tpbmcgZm9yIGEgaG9yaXpvbnRhbCBzY3JvbGxiYXIgYmVjYXVzZSB0aGUgaGVpZ2h0IGlzCiAg ICAgICAgICAgICAvLyBhbHJlYWR5IGdyZWF0ZXIgdGhlIG1heGltdW0uCiAgICAgICAgIH0KQEAg LTM1NDMsNiArMzU0MCw5IEBAIHZvaWQgRnJhbWVWaWV3OjpwZXJmb3JtU2l6ZVRvQ29udGVudEF1 dG9TaXplKCkKICAgICAgICAgLy8gb24gcGFnZXMgKGUuZy4gcXVpcmtzIG1vZGUpIHdoZXJlIHRo ZSBib2R5L2RvY3VtZW50IHJlc2l6ZSB0byB0aGUgdmlldyBzaXplLAogICAgICAgICAvLyB3ZSds bCBlbmQgdXAgbm90IHNocmlua2luZyBiYWNrIGRvd24gYWZ0ZXIgcmVzaXppbmcgdG8gdGhlIGNv bXB1dGVkIHByZWZlcnJlZCB3aWR0aC4KICAgICAgICAgcmVzaXplKG5ld1NpemUud2lkdGgoKSwg aSA/IG5ld1NpemUuaGVpZ2h0KCkgOiBtaW5BdXRvU2l6ZS5oZWlnaHQoKSk7CisgICAgICAgIC8v IFByb3RlY3QgdGhlIGNvbnRlbnQgZnJvbSBldmVyZ3Jvd2luZyBsYXlvdXQuCisgICAgICAgIGF1 dG8gcHJlZmVycmVkVmlld3BvcnRXaWR0aCA9IHN0ZDo6bWluKG5ld1NpemUud2lkdGgoKSwgbV9h dXRvU2l6ZUNvbnN0cmFpbnQud2lkdGgoKSk7CisgICAgICAgIG92ZXJyaWRlVmlld3BvcnRXaWR0 aEZvckNTU1ZpZXdwb3J0VW5pdHMocHJlZmVycmVkVmlld3BvcnRXaWR0aCk7CiAgICAgICAgIC8v IEZvcmNlIHRoZSBzY3JvbGxiYXIgc3RhdGUgdG8gYXZvaWQgdGhlIHNjcm9sbGJhciBjb2RlIGFk ZGluZyB0aGVtIGFuZCBjYXVzaW5nIHRoZW0gdG8gYmUgbmVlZGVkLiBGb3IgZXhhbXBsZSwKICAg ICAgICAgLy8gYSB2ZXJ0aWNhbCBzY3JvbGxiYXIgbWF5IGNhdXNlIHRleHQgdG8gd3JhcCBhbmQg dGh1cyBpbmNyZWFzZSB0aGUgaGVpZ2h0ICh3aGljaCBpcyB0aGUgb25seSByZWFzb24gdGhlIHNj b2xsYmFyIGlzIG5lZWRlZCkuCiAgICAgICAgIHNldFZlcnRpY2FsU2Nyb2xsYmFyTG9jayhmYWxz ZSk7CkBAIC0zNTUwLDcgKzM1NTAsNiBAQCB2b2lkIEZyYW1lVmlldzo6cGVyZm9ybVNpemVUb0Nv bnRlbnRBdXRvU2l6ZSgpCiAgICAgICAgIHNldFNjcm9sbGJhck1vZGVzKGhvcml6b25hbFNjcm9s bGJhck1vZGUsIHZlcnRpY2FsU2Nyb2xsYmFyTW9kZSwgdHJ1ZSwgdHJ1ZSk7CiAgICAgfQogICAg IC8vIEFsbCB0aGUgcmVzaXppbmcgYWJvdmUgbWF5IGhhdmUgaW52YWxpZGF0ZWQgc3R5bGUgKGZv ciBleGFtcGxlIGlmIHZpZXdwb3J0IHVuaXRzIGFyZSBiZWluZyB1c2VkKS4KLQogICAgIGRvY3Vt ZW50LT51cGRhdGVTdHlsZUlmTmVlZGVkKCk7CiAgICAgLy8gRklYTUU6IFVzZSB0aGUgZmluYWwg bGF5b3V0J3MgcmVzdWx0IGFzIHRoZSBjb250ZW50IHNpemUgKHdlYmtpdC5vcmcvYi8xNzM1NjEp LgogICAgIGRvY3VtZW50LT51cGRhdGVMYXlvdXRJZ25vcmVQZW5kaW5nU3R5bGVzaGVldHMoKTsK QEAgLTQ2MDcsNyArNDYwNiw3IEBAIHZvaWQgRnJhbWVWaWV3OjplbmFibGVBdXRvU2l6ZU1vZGUo Ym9vbCBlbmFibGUsIGNvbnN0IEludFNpemUmIHZpZXdTaXplLCBBdXRvU2l6CiAgICAgc2V0TmVl ZHNMYXlvdXRBZnRlclZpZXdDb25maWd1cmF0aW9uQ2hhbmdlKCk7CiAgICAgbGF5b3V0Q29udGV4 dCgpLnNjaGVkdWxlTGF5b3V0KCk7CiAgICAgaWYgKG1fc2hvdWxkQXV0b1NpemUpIHsKLSAgICAg ICAgb3ZlcnJpZGVWaWV3cG9ydFNpemVGb3JDU1NWaWV3cG9ydFVuaXRzKHsgbV9hdXRvU2l6ZUNv bnN0cmFpbnQud2lkdGgoKSwgbV9vdmVycmlkZVZpZXdwb3J0U2l6ZSA/IG1fb3ZlcnJpZGVWaWV3 cG9ydFNpemUtPmhlaWdodCA6IFdURjo6bnVsbG9wdCB9KTsKKyAgICAgICAgb3ZlcnJpZGVWaWV3 cG9ydFdpZHRoRm9yQ1NTVmlld3BvcnRVbml0cyhtX2F1dG9TaXplQ29uc3RyYWludC53aWR0aCgp KTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApAQCAtNTQwOSw2ICs1NDA4LDE2IEBAIHZvaWQg RnJhbWVWaWV3OjpzZXRWaWV3cG9ydFNpemVGb3JDU1NWaWV3cG9ydFVuaXRzKEludFNpemUgc2l6 ZSkKICAgICBvdmVycmlkZVZpZXdwb3J0U2l6ZUZvckNTU1ZpZXdwb3J0VW5pdHMoeyBzaXplLndp ZHRoKCksIHNpemUuaGVpZ2h0KCkgfSk7CiB9CiAKK3ZvaWQgRnJhbWVWaWV3OjpvdmVycmlkZVZp ZXdwb3J0V2lkdGhGb3JDU1NWaWV3cG9ydFVuaXRzKGludCB3aWR0aCkKK3sKKyAgICBvdmVycmlk ZVZpZXdwb3J0U2l6ZUZvckNTU1ZpZXdwb3J0VW5pdHMoeyB3aWR0aCwgbV9vdmVycmlkZVZpZXdw b3J0U2l6ZSA/IG1fb3ZlcnJpZGVWaWV3cG9ydFNpemUtPmhlaWdodCA6IFdURjo6bnVsbG9wdCB9 KTsKK30KKwordm9pZCBGcmFtZVZpZXc6OnJlc2V0T3ZlcnJpZGRlblZpZXdwb3J0V2lkdGhGb3JD U1NWaWV3cG9ydFVuaXRzKCkKK3sKKyAgICBvdmVycmlkZVZpZXdwb3J0U2l6ZUZvckNTU1ZpZXdw b3J0VW5pdHMoeyB7IH0sIG1fb3ZlcnJpZGVWaWV3cG9ydFNpemUgPyBtX292ZXJyaWRlVmlld3Bv cnRTaXplLT5oZWlnaHQgOiBXVEY6Om51bGxvcHQgfSk7Cit9CisKIHZvaWQgRnJhbWVWaWV3Ojpv dmVycmlkZVZpZXdwb3J0U2l6ZUZvckNTU1ZpZXdwb3J0VW5pdHMoT3ZlcnJpZGVWaWV3cG9ydFNp emUgc2l6ZSkKIHsKICAgICBpZiAobV9vdmVycmlkZVZpZXdwb3J0U2l6ZSAmJiAqbV9vdmVycmlk ZVZpZXdwb3J0U2l6ZSA9PSBzaXplKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9G cmFtZVZpZXcuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgKaW5kZXggMjgyN2Yx MjMwYTUzOTM5MTNjZGNhZTRkYmM3ZGE1NTQ5YmM3ZjhmZS4uN2U1Yjk3YjkzZjI4NzRhNmIwNWQ1 NWQ1YzVhNzI0MTU5ODQxYzg3MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFt ZVZpZXcuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oCkBAIC04MzAsNiAr ODMwLDggQEAgcHJpdmF0ZToKICAgICAgICAgYm9vbCBvcGVyYXRvcj09KGNvbnN0IE92ZXJyaWRl Vmlld3BvcnRTaXplJiByaHMpIGNvbnN0IHsgcmV0dXJuIHJocy53aWR0aCA9PSB3aWR0aCAmJiBy aHMuaGVpZ2h0ID09IGhlaWdodDsgfQogICAgIH07CiAgICAgdm9pZCBvdmVycmlkZVZpZXdwb3J0 U2l6ZUZvckNTU1ZpZXdwb3J0VW5pdHMoT3ZlcnJpZGVWaWV3cG9ydFNpemUpOworICAgIHZvaWQg b3ZlcnJpZGVWaWV3cG9ydFdpZHRoRm9yQ1NTVmlld3BvcnRVbml0cyhpbnQpOworICAgIHZvaWQg cmVzZXRPdmVycmlkZGVuVmlld3BvcnRXaWR0aEZvckNTU1ZpZXdwb3J0VW5pdHMoKTsKIAogICAg IHN0YXRpYyBNb25vdG9uaWNUaW1lIHNDdXJyZW50UGFpbnRUaW1lU3RhbXA7IC8vIHVzZWQgZm9y IGRldGVjdGluZyBkZWNvZGVkIHJlc291cmNlIHRocmFzaCBpbiB0aGUgY2FjaGUKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3BwIGIvU291cmNlL1dlYkNv cmUvdGVzdGluZy9JbnRlcm5hbHMuY3BwCmluZGV4IDYyZmFmYmVkMGNjY2U3NzQzY2UyZDRiMTk3 M2UwMTc4MjE4NDNjZTYuLjM0MWZlZjFhNzA5NTEzODIzOGUwMTRlNGM4Y2Y0YzNjOTE1OTE4NWQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5jcHAKQEAgLTM3MTMsNiArMzcxMywxNCBA QCB2b2lkIEludGVybmFsczo6ZW5hYmxlRml4ZWRXaWR0aEF1dG9TaXplTW9kZShib29sIGVuYWJs ZWQsIGludCB3aWR0aCwgaW50IGhlaWdodAogICAgIGRvY3VtZW50LT52aWV3KCktPmVuYWJsZUZp eGVkV2lkdGhBdXRvU2l6ZU1vZGUoZW5hYmxlZCwgeyB3aWR0aCwgaGVpZ2h0IH0pOwogfQogCit2 b2lkIEludGVybmFsczo6ZW5hYmxlU2l6ZVRvQ29udGVudEF1dG9TaXplTW9kZShib29sIGVuYWJs ZWQsIGludCB3aWR0aCwgaW50IGhlaWdodCkKK3sKKyAgICBhdXRvKiBkb2N1bWVudCA9IGNvbnRl eHREb2N1bWVudCgpOworICAgIGlmICghZG9jdW1lbnQgfHwgIWRvY3VtZW50LT52aWV3KCkpCisg ICAgICAgIHJldHVybjsKKyAgICBkb2N1bWVudC0+dmlldygpLT5lbmFibGVTaXplVG9Db250ZW50 QXV0b1NpemVNb2RlKGVuYWJsZWQsIHsgd2lkdGgsIGhlaWdodCB9KTsKK30KKwogI2lmIEVOQUJM RShMRUdBQ1lfRU5DUllQVEVEX01FRElBKQogCiB2b2lkIEludGVybmFsczo6aW5pdGlhbGl6ZU1v Y2tDRE0oKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaCBi L1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmgKaW5kZXggYzFmYWQ5YmYyOTVjOTZj YWRiYjgyZTFkNmI1MDczNjRjMzFiZDAxNC4uZGRhOWM4OTA1NmNmYmQxMWNkYjc2NzdlN2JlMjlh NjNkMmI2NmQ5NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5oCkBAIC01NjYsNiArNTY2 LDcgQEAgcHVibGljOgogICAgIHZvaWQgcmVsb2FkRXhwaXJlZE9ubHkoKTsKIAogICAgIHZvaWQg ZW5hYmxlRml4ZWRXaWR0aEF1dG9TaXplTW9kZShib29sIGVuYWJsZWQsIGludCB3aWR0aCwgaW50 IGhlaWdodCk7CisgICAgdm9pZCBlbmFibGVTaXplVG9Db250ZW50QXV0b1NpemVNb2RlKGJvb2wg ZW5hYmxlZCwgaW50IHdpZHRoLCBpbnQgaGVpZ2h0KTsKIAogI2lmIEVOQUJMRShMRUdBQ1lfRU5D UllQVEVEX01FRElBKQogICAgIHZvaWQgaW5pdGlhbGl6ZU1vY2tDRE0oKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmlkbCBiL1NvdXJjZS9XZWJDb3JlL3Rl c3RpbmcvSW50ZXJuYWxzLmlkbAppbmRleCAyYTMzYzlhYTUxZWFiNWI3NjY4ZjYwOTY4NGEyMTFh N2I3ZDVjM2U1Li4wZWIwZjE1YWJkMGM4NTQwN2MwMTE1ODMxODQ2YjZkYTE3MGNiOTE2IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5pZGwKKysrIGIvU291cmNl L1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaWRsCkBAIC02MTQsNiArNjE0LDcgQEAgZW51bSBD b21wb3NpdGluZ1BvbGljeSB7CiAgICAgdm9pZCByZWxvYWRFeHBpcmVkT25seSgpOwogCiAgICAg dm9pZCBlbmFibGVGaXhlZFdpZHRoQXV0b1NpemVNb2RlKGJvb2xlYW4gZW5hYmxlZCwgbG9uZyB3 aWR0aCwgbG9uZyBoZWlnaHQpOworICAgIHZvaWQgZW5hYmxlU2l6ZVRvQ29udGVudEF1dG9TaXpl TW9kZShib29sZWFuIGVuYWJsZWQsIGxvbmcgd2lkdGgsIGxvbmcgaGVpZ2h0KTsKIAogICAgIFtD b25kaXRpb25hbD1WSURFT10gc2VxdWVuY2U8RE9NU3RyaW5nPiBtZWRpYVJlc3BvbnNlU291cmNl cyhIVE1MTWVkaWFFbGVtZW50IG1lZGlhKTsKICAgICBbQ29uZGl0aW9uYWw9VklERU9dIHNlcXVl bmNlPERPTVN0cmluZz4gbWVkaWFSZXNwb25zZUNvbnRlbnRSYW5nZXMoSFRNTE1lZGlhRWxlbWVu dCBtZWRpYSk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKaW5kZXggYjhlOGIyYTQyNGE2MjUyNjVmN2E2ODliYTQ2OGY3MzQxOTg1NGQ0 Zi4uMzZhYzFkZWVlZTA5M2UwMDViYzU5ZTkyNDRjNzAzMGRlYzk1OGNiZSAxMDA2NDQKLS0tIGEv TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDE0IEBACisyMDIwLTA2LTE5ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisK KyAgICAgICAgW0F1dG9TaXppbmddIFJlc29sdmUgdmlld3BvcnQgdW5pdHMgYWdhaW5zdCB0aGUg cHJlZmVycmVkIGNvbnRlbnQgc2l6ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjEzNDA4CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82NDI2NzUzOT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGZhc3Qv ZHluYW1pYy9zaXplLXRvLWNvbnRlbnQtYXV0b3NpemUtd2l0aC12aWV3cG9ydC11bml0cy1leHBl Y3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvZHluYW1pYy9zaXplLXRvLWNvbnRlbnQt YXV0b3NpemUtd2l0aC12aWV3cG9ydC11bml0cy5odG1sOiBBZGRlZC4KKwogMjAyMC0wNi0xOSAg WmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW1RGQ10gRG8g bm90IHNwZWNpYWwtY2FzZSBlbXB0eSB0YWJsZXMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zh c3QvZHluYW1pYy9zaXplLXRvLWNvbnRlbnQtYXV0b3NpemUtd2l0aC12aWV3cG9ydC11bml0cy1l eHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2R5bmFtaWMvc2l6ZS10by1jb250ZW50LWF1 dG9zaXplLXdpdGgtdmlld3BvcnQtdW5pdHMtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAw NjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmU0Njk2 NWRiYjkzNTUyZjI2Yzc3OTkxZmQ1ZDJiNGVkNDUzNWVmZmMKLS0tIC9kZXYvbnVsbAorKysgYi9M YXlvdXRUZXN0cy9mYXN0L2R5bmFtaWMvc2l6ZS10by1jb250ZW50LWF1dG9zaXplLXdpdGgtdmll d3BvcnQtdW5pdHMtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEgQEAKKzM1MHB4IDE3NXB4IDM1cHgg MHB4CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2R5bmFtaWMvc2l6ZS10by1jb250ZW50 LWF1dG9zaXplLXdpdGgtdmlld3BvcnQtdW5pdHMuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvZHlu YW1pYy9zaXplLXRvLWNvbnRlbnQtYXV0b3NpemUtd2l0aC12aWV3cG9ydC11bml0cy5odG1sCm5l dyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAuLmZkYjIzYzUxZmFhNmYxNDY5ZGFlOGY3N2Q4ODY4YTA2NDEyOTgzODQKLS0tIC9k ZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2R5bmFtaWMvc2l6ZS10by1jb250ZW50LWF1 dG9zaXplLXdpdGgtdmlld3BvcnQtdW5pdHMuaHRtbApAQCAtMCwwICsxLDU0IEBACis8IURPQ1RZ UEUgSFRNTD4KKzxodG1sPgorPGhlYWQ+Cis8dGl0bGU+VGhpcyB0ZXN0cyB0aGF0IGF1dG9zaXpl IHVzZXMgdGhlIGNvbnRlbnQtd2lkdGggYXMgdGhlIGJhc2UgZm9yIHJlc29sdmluZyB2aWV3cG9y dCB1bml0IHZhbHVlczwvdGl0bGU+Cis8c3R5bGU+Citib2R5IHsKKyAgICBtYXJnaW46IDBweDsK K30KKyN3MTAwIHsKKyAgICB3aWR0aDogMTAwdnc7CisgICAgaGVpZ2h0OiAxMHB4OworfQorCisj dzUwIHsKKyAgICB3aWR0aDogNTB2dzsKKyAgICBoZWlnaHQ6IDEwcHg7Cit9CisKKyN3MTAgewor ICAgIHdpZHRoOiAxMHZ3OworICAgIGhlaWdodDogMTBweDsKK30KKworI3cwIHsKKyAgICB3aWR0 aDogMHZ3OworICAgIGhlaWdodDogMTBweDsKK30KKzwvc3R5bGU+Cis8c2NyaXB0PgoraWYgKHdp bmRvdy5pbnRlcm5hbHMpCisgICAgaW50ZXJuYWxzLmVuYWJsZVNpemVUb0NvbnRlbnRBdXRvU2l6 ZU1vZGUodHJ1ZSwgMjAwMCwgNjAwKTsKKworaWYgKHdpbmRvdy50ZXN0UnVubmVyKQorICAgIHRl c3RSdW5uZXIuZHVtcEFzVGV4dCgpOworPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keT4KKzxkaXYg aWQ9dzEwMD48L2Rpdj4KKzxkaXYgaWQ9dzUwPjwvZGl2PgorPGRpdiBpZD13MTA+PC9kaXY+Cis8 ZGl2IGlkPXcwPjwvZGl2PgorPGRpdiBzdHlsZT0id2lkdGg6IDM1MHB4OyBoZWlnaHQ6IDM1MHB4 OyBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsiPjwvZGl2PgorPHByZSBpZD1yZXN1bHQ+PC9wcmU+ Cis8c2NyaXB0PgorZG9jdW1lbnQuYm9keS5vZmZzZXRXaWR0aDsKK3Jlc3VsdC50ZXh0Q29udGVu dCA9IHdpbmRvdy5nZXRDb21wdXRlZFN0eWxlKHcxMDAsIG51bGwpLmdldFByb3BlcnR5VmFsdWUo IndpZHRoIikgKyAiICIKKyAgICArIHdpbmRvdy5nZXRDb21wdXRlZFN0eWxlKHc1MCwgbnVsbCku Z2V0UHJvcGVydHlWYWx1ZSgid2lkdGgiKSArICIgIgorICAgICsgd2luZG93LmdldENvbXB1dGVk U3R5bGUodzEwLCBudWxsKS5nZXRQcm9wZXJ0eVZhbHVlKCJ3aWR0aCIpICsgIiAiICAKKwkrIHdp bmRvdy5nZXRDb21wdXRlZFN0eWxlKHcwLCBudWxsKS5nZXRQcm9wZXJ0eVZhbHVlKCJ3aWR0aCIp OyAgCitpZiAod2luZG93LmludGVybmFscykKKyAgICBpbnRlcm5hbHMuZW5hYmxlU2l6ZVRvQ29u dGVudEF1dG9TaXplTW9kZShmYWxzZSwgMCwgMCwgMCwgMCk7Cis8L3NjcmlwdD4KKzwvYm9keT4K KzwvaHRtbD4K 402336 2020-06-19 15:30:20 -0700 2020-06-19 17:21:23 -0700 Patch bug-213408-20200619153019.patch text/plain 12541 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzMjcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWRhYWNkMTM3YmMyZjg4 ZjBmZDQ2NjM4ZGM5ZjgyNGM2ZjgzZDVjMy4uNDczYWYxZGZjZjlhNGUyMjI5YzYxMzVjZWYzMmY1 ZDgyZDQ3OTQxNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDIwLTA2LTE5ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0F1dG9TaXppbmddIFJlc29s dmUgdmlld3BvcnQgdW5pdHMgYWdhaW5zdCB0aGUgcHJlZmVycmVkIGNvbnRlbnQgc2l6ZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEzNDA4CisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS82NDI2NzUzOT4KKworICAgICAgICBSZXZpZXdlZCBieSBUaW0g SG9ydG9uLgorCisgICAgICAgIEluc3RlYWQgb2YgcmVzb2x2aW5nIHRoZSB2aWV3cG9ydCB1bml0 cyBhZ2FpbnN0IHRoZSBtYXhpbXVtIGNvbnRlbnQgc2l6ZSBjb25zdHJhaW50cywgbGV0J3MgdXNl IHRoZSBwcmVmZXJyZWQgY29udGVudCBzaXplLgorICAgICAgICBJdCBlbnN1cmVzIHRoYXQgY29u dGVudCB3aXRoIHZ3LCB2aCB1bml0cyBkb2VzIG5vdCBncm93IGJleW9uZCB0aGUgcHJlZmVycmVk IGNvbnRlbnQgc2l6ZS4KKworICAgICAgICBUZXN0OiBmYXN0L2R5bmFtaWMvc2l6ZS10by1jb250 ZW50LWF1dG9zaXplLXdpdGgtdmlld3BvcnQtdW5pdHMuaHRtbAorCisgICAgICAgICogcGFnZS9G cmFtZVZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3OjpwZXJmb3JtU2l6ZVRv Q29udGVudEF1dG9TaXplKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6ZW5hYmxlQXV0 b1NpemVNb2RlKTogTGV0J3MgImlnbm9yZSIgdmlld3BvcnQgdW5pdHMgZHVyaW5nIHRoZSBpbml0 aWFsCisgICAgICAgIHBhc3MgYW5kIHVzZSB0aGUgcHJlZmVycmVkIHdpZHRoIHRvIGZpbmFsaXpl IHRoZSB2dyB2aCB1bml0IHZhbHVlcyAod2UgZG9uJ3QgcmVhbGx5IGlnbm9yZSB0aGVtLCBidXQg dGhleSBhcmUgcmVzb2x2ZWQgYWdhaW5zdCBhIFsgMSwgMSBdIHZpZXdwb3J0KS4KKyAgICAgICAg VGhpcyBhcHByb2FjaCBmYWlscyBpZiB0aGUgbWFpbiBjb250ZW50IGhhcyAxMDB2dyB3aXRoIG92 ZXJmbG93IGhpZGRlbi4gU3VjaCBjb250ZW50IHdvdWxkIGVuZCB1cCB3aXRoIGEgWyAxLCAxIF0g c2l6ZSAod2UgbWlnaHQgd2FudCB0byBkZXRlY3QgaXQgCisgICAgICAgIGFuZCByZXNvbHZlZCB0 aGUgdmFsdWVzIGFnYWluc3QgdGhlIGhvcml6b250YWwgY29uc3RyYWludCkuCisgICAgICAgIChX ZWJDb3JlOjpGcmFtZVZpZXc6Om92ZXJyaWRlVmlld3BvcnRXaWR0aEZvckNTU1ZpZXdwb3J0VW5p dHMpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3OjpyZXNldE92ZXJyaWRkZW5WaWV3cG9y dFdpZHRoRm9yQ1NTVmlld3BvcnRVbml0cyk6CisgICAgICAgICogcGFnZS9GcmFtZVZpZXcuaDoK KyAgICAgICAgKiB0ZXN0aW5nL0ludGVybmFscy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnRl cm5hbHM6OmVuYWJsZVNpemVUb0NvbnRlbnRBdXRvU2l6ZU1vZGUpOgorICAgICAgICAqIHRlc3Rp bmcvSW50ZXJuYWxzLmg6CisgICAgICAgICogdGVzdGluZy9JbnRlcm5hbHMuaWRsOgorCiAyMDIw LTA2LTE5ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgTW92ZSBQ cmVmaXhlZCBXZWJBdWRpbyBpbnRlcmZhY2VzIGJlaGluZCB0aGVpciBvd24gZmVhdHVyZSBmbGFn CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKaW5kZXggOTcxZjU1NTc5OWZkZmM0YjE3YjQzMTMw ZWMwMDE3NWYxNjM4OWMyOC4uN2I1MmM4NmQ0YzI5YzE1MzgzOWMzZGUwNmY3N2NjNmM0NThiZjhl OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcApAQCAtMzQ3OSwxOSArMzQ3OSwxOCBAQCB2 b2lkIEZyYW1lVmlldzo6cGVyZm9ybVNpemVUb0NvbnRlbnRBdXRvU2l6ZSgpCiAgICAgYXV0byog ZG9jdW1lbnQgPSBmcmFtZSgpLmRvY3VtZW50KCk7CiAgICAgYXV0byogcmVuZGVyVmlldyA9IGRv Y3VtZW50LT5yZW5kZXJWaWV3KCk7CiAKLSAgICBJbnRTaXplIG1pbkF1dG9TaXplKDEsIDEpOwot CiAgICAgLy8gU3RhcnQgZnJvbSB0aGUgbWluaW11bSBzaXplIGFuZCBhbGxvdyBpdCB0byBncm93 LgotICAgIHJlc2l6ZShtaW5BdXRvU2l6ZS53aWR0aCgpLCBtaW5BdXRvU2l6ZS5oZWlnaHQoKSk7 Ci0gICAgSW50U2l6ZSBzaXplID0gZnJhbWVSZWN0KCkuc2l6ZSgpOworICAgIGF1dG8gbWluQXV0 b1NpemUgPSBJbnRTaXplIHsgMSwgMSB9OworICAgIHJlc2l6ZShtaW5BdXRvU2l6ZSk7CisgICAg YXV0byBzaXplID0gZnJhbWVSZWN0KCkuc2l6ZSgpOwogICAgIC8vIERvIHRoZSByZXNpemluZyB0 d2ljZS4gVGhlIGZpcnN0IHRpbWUgaXMgYmFzaWNhbGx5IGEgcm91Z2ggY2FsY3VsYXRpb24gdXNp bmcgdGhlIHByZWZlcnJlZCB3aWR0aAogICAgIC8vIHdoaWNoIG1heSByZXN1bHQgaW4gYSBoZWln aHQgY2hhbmdlIGR1cmluZyB0aGUgc2Vjb25kIGl0ZXJhdGlvbi4KKyAgICAvLyBMZXQncyBpZ25v cmUgcmVuZGVyZXJzIHdpdGggdmlld3BvcnQgdW5pdHMgZmlyc3QgYW5kIHJlc29sdmUgdGhlc2Ug Ym94ZXMgZHVyaW5nIHRoZSBzZWNvbmQgcGhhc2Ugb2YgdGhlIGF1dG9zaXppbmcuCisgICAgcmVz ZXRPdmVycmlkZGVuVmlld3BvcnRXaWR0aEZvckNTU1ZpZXdwb3J0VW5pdHMoKTsKICAgICBmb3Ig KGludCBpID0gMDsgaSA8IDI7IGkrKykgewogICAgICAgICAvLyBVcGRhdGUgdmFyaW91cyBzaXpl cyBpbmNsdWRpbmcgY29udGVudHNTaXplLCBzY3JvbGxIZWlnaHQsIGV0Yy4KICAgICAgICAgZG9j dW1lbnQtPnVwZGF0ZUxheW91dElnbm9yZVBlbmRpbmdTdHlsZXNoZWV0cygpOwotICAgICAgICBp bnQgd2lkdGggPSByZW5kZXJWaWV3LT5taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgoKTsKLSAgICAg ICAgaW50IGhlaWdodCA9IHJlbmRlclZpZXctPmRvY3VtZW50UmVjdCgpLmhlaWdodCgpOwotICAg ICAgICBJbnRTaXplIG5ld1NpemUod2lkdGgsIGhlaWdodCk7CisgICAgICAgIGF1dG8gbmV3U2l6 ZSA9IEludFNpemUgeyByZW5kZXJWaWV3LT5taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgoKSwgcmVu ZGVyVmlldy0+ZG9jdW1lbnRSZWN0KCkuaGVpZ2h0KCkgfTsKIAogICAgICAgICAvLyBDaGVjayB0 byBzZWUgaWYgYSBzY3JvbGxiYXIgaXMgbmVlZGVkIGZvciBhIGdpdmVuIGRpbWVuc2lvbiBhbmQK ICAgICAgICAgLy8gaWYgc28sIGluY3JlYXNlIHRoZSBvdGhlciBkaW1lbnNpb24gdG8gYWNjb3Vu dCBmb3IgdGhlIHNjcm9sbGJhci4KQEAgLTM1MDIsNyArMzUwMSw2IEBAIHZvaWQgRnJhbWVWaWV3 OjpwZXJmb3JtU2l6ZVRvQ29udGVudEF1dG9TaXplKCkKICAgICAgICAgICAgIGlmICghbG9jYWxI b3Jpem9udGFsU2Nyb2xsYmFyKQogICAgICAgICAgICAgICAgIGxvY2FsSG9yaXpvbnRhbFNjcm9s bGJhciA9IGNyZWF0ZVNjcm9sbGJhcihIb3Jpem9udGFsU2Nyb2xsYmFyKTsKICAgICAgICAgICAg IG5ld1NpemUuZXhwYW5kKDAsIGxvY2FsSG9yaXpvbnRhbFNjcm9sbGJhci0+b2NjdXBpZWRIZWln aHQoKSk7Ci0KICAgICAgICAgICAgIC8vIERvbid0IGJvdGhlciBjaGVja2luZyBmb3IgYSB2ZXJ0 aWNhbCBzY3JvbGxiYXIgYmVjYXVzZSB0aGUgd2lkdGggaXMgYXQKICAgICAgICAgICAgIC8vIGFs cmVhZHkgZ3JlYXRlciB0aGUgbWF4aW11bS4KICAgICAgICAgfSBlbHNlIGlmIChuZXdTaXplLmhl aWdodCgpID4gbV9hdXRvU2l6ZUNvbnN0cmFpbnQuaGVpZ2h0KCkpIHsKQEAgLTM1MTAsNyArMzUw OCw2IEBAIHZvaWQgRnJhbWVWaWV3OjpwZXJmb3JtU2l6ZVRvQ29udGVudEF1dG9TaXplKCkKICAg ICAgICAgICAgIGlmICghbG9jYWxWZXJ0aWNhbFNjcm9sbGJhcikKICAgICAgICAgICAgICAgICBs b2NhbFZlcnRpY2FsU2Nyb2xsYmFyID0gY3JlYXRlU2Nyb2xsYmFyKFZlcnRpY2FsU2Nyb2xsYmFy KTsKICAgICAgICAgICAgIG5ld1NpemUuZXhwYW5kKGxvY2FsVmVydGljYWxTY3JvbGxiYXItPm9j Y3VwaWVkV2lkdGgoKSwgMCk7Ci0KICAgICAgICAgICAgIC8vIERvbid0IGJvdGhlciBjaGVja2lu ZyBmb3IgYSBob3Jpem9udGFsIHNjcm9sbGJhciBiZWNhdXNlIHRoZSBoZWlnaHQgaXMKICAgICAg ICAgICAgIC8vIGFscmVhZHkgZ3JlYXRlciB0aGUgbWF4aW11bS4KICAgICAgICAgfQpAQCAtMzU0 Myw2ICszNTQwLDkgQEAgdm9pZCBGcmFtZVZpZXc6OnBlcmZvcm1TaXplVG9Db250ZW50QXV0b1Np emUoKQogICAgICAgICAvLyBvbiBwYWdlcyAoZS5nLiBxdWlya3MgbW9kZSkgd2hlcmUgdGhlIGJv ZHkvZG9jdW1lbnQgcmVzaXplIHRvIHRoZSB2aWV3IHNpemUsCiAgICAgICAgIC8vIHdlJ2xsIGVu ZCB1cCBub3Qgc2hyaW5raW5nIGJhY2sgZG93biBhZnRlciByZXNpemluZyB0byB0aGUgY29tcHV0 ZWQgcHJlZmVycmVkIHdpZHRoLgogICAgICAgICByZXNpemUobmV3U2l6ZS53aWR0aCgpLCBpID8g bmV3U2l6ZS5oZWlnaHQoKSA6IG1pbkF1dG9TaXplLmhlaWdodCgpKTsKKyAgICAgICAgLy8gUHJv dGVjdCB0aGUgY29udGVudCBmcm9tIGV2ZXJncm93aW5nIGxheW91dC4KKyAgICAgICAgYXV0byBw cmVmZXJyZWRWaWV3cG9ydFdpZHRoID0gc3RkOjptaW4obmV3U2l6ZS53aWR0aCgpLCBtX2F1dG9T aXplQ29uc3RyYWludC53aWR0aCgpKTsKKyAgICAgICAgb3ZlcnJpZGVWaWV3cG9ydFdpZHRoRm9y Q1NTVmlld3BvcnRVbml0cyhwcmVmZXJyZWRWaWV3cG9ydFdpZHRoKTsKICAgICAgICAgLy8gRm9y Y2UgdGhlIHNjcm9sbGJhciBzdGF0ZSB0byBhdm9pZCB0aGUgc2Nyb2xsYmFyIGNvZGUgYWRkaW5n IHRoZW0gYW5kIGNhdXNpbmcgdGhlbSB0byBiZSBuZWVkZWQuIEZvciBleGFtcGxlLAogICAgICAg ICAvLyBhIHZlcnRpY2FsIHNjcm9sbGJhciBtYXkgY2F1c2UgdGV4dCB0byB3cmFwIGFuZCB0aHVz IGluY3JlYXNlIHRoZSBoZWlnaHQgKHdoaWNoIGlzIHRoZSBvbmx5IHJlYXNvbiB0aGUgc2NvbGxi YXIgaXMgbmVlZGVkKS4KICAgICAgICAgc2V0VmVydGljYWxTY3JvbGxiYXJMb2NrKGZhbHNlKTsK QEAgLTM1NTAsNyArMzU1MCw2IEBAIHZvaWQgRnJhbWVWaWV3OjpwZXJmb3JtU2l6ZVRvQ29udGVu dEF1dG9TaXplKCkKICAgICAgICAgc2V0U2Nyb2xsYmFyTW9kZXMoaG9yaXpvbmFsU2Nyb2xsYmFy TW9kZSwgdmVydGljYWxTY3JvbGxiYXJNb2RlLCB0cnVlLCB0cnVlKTsKICAgICB9CiAgICAgLy8g QWxsIHRoZSByZXNpemluZyBhYm92ZSBtYXkgaGF2ZSBpbnZhbGlkYXRlZCBzdHlsZSAoZm9yIGV4 YW1wbGUgaWYgdmlld3BvcnQgdW5pdHMgYXJlIGJlaW5nIHVzZWQpLgotCiAgICAgZG9jdW1lbnQt PnVwZGF0ZVN0eWxlSWZOZWVkZWQoKTsKICAgICAvLyBGSVhNRTogVXNlIHRoZSBmaW5hbCBsYXlv dXQncyByZXN1bHQgYXMgdGhlIGNvbnRlbnQgc2l6ZSAod2Via2l0Lm9yZy9iLzE3MzU2MSkuCiAg ICAgZG9jdW1lbnQtPnVwZGF0ZUxheW91dElnbm9yZVBlbmRpbmdTdHlsZXNoZWV0cygpOwpAQCAt NDYwNyw3ICs0NjA2LDcgQEAgdm9pZCBGcmFtZVZpZXc6OmVuYWJsZUF1dG9TaXplTW9kZShib29s IGVuYWJsZSwgY29uc3QgSW50U2l6ZSYgdmlld1NpemUsIEF1dG9TaXoKICAgICBzZXROZWVkc0xh eW91dEFmdGVyVmlld0NvbmZpZ3VyYXRpb25DaGFuZ2UoKTsKICAgICBsYXlvdXRDb250ZXh0KCku c2NoZWR1bGVMYXlvdXQoKTsKICAgICBpZiAobV9zaG91bGRBdXRvU2l6ZSkgewotICAgICAgICBv dmVycmlkZVZpZXdwb3J0U2l6ZUZvckNTU1ZpZXdwb3J0VW5pdHMoeyBtX2F1dG9TaXplQ29uc3Ry YWludC53aWR0aCgpLCBtX292ZXJyaWRlVmlld3BvcnRTaXplID8gbV9vdmVycmlkZVZpZXdwb3J0 U2l6ZS0+aGVpZ2h0IDogV1RGOjpudWxsb3B0IH0pOworICAgICAgICBvdmVycmlkZVZpZXdwb3J0 V2lkdGhGb3JDU1NWaWV3cG9ydFVuaXRzKG1fYXV0b1NpemVDb25zdHJhaW50LndpZHRoKCkpOwog ICAgICAgICByZXR1cm47CiAgICAgfQogCkBAIC01NDA5LDYgKzU0MDgsMTYgQEAgdm9pZCBGcmFt ZVZpZXc6OnNldFZpZXdwb3J0U2l6ZUZvckNTU1ZpZXdwb3J0VW5pdHMoSW50U2l6ZSBzaXplKQog ICAgIG92ZXJyaWRlVmlld3BvcnRTaXplRm9yQ1NTVmlld3BvcnRVbml0cyh7IHNpemUud2lkdGgo KSwgc2l6ZS5oZWlnaHQoKSB9KTsKIH0KIAordm9pZCBGcmFtZVZpZXc6Om92ZXJyaWRlVmlld3Bv cnRXaWR0aEZvckNTU1ZpZXdwb3J0VW5pdHMoaW50IHdpZHRoKQoreworICAgIG92ZXJyaWRlVmll d3BvcnRTaXplRm9yQ1NTVmlld3BvcnRVbml0cyh7IHdpZHRoLCBtX292ZXJyaWRlVmlld3BvcnRT aXplID8gbV9vdmVycmlkZVZpZXdwb3J0U2l6ZS0+aGVpZ2h0IDogV1RGOjpudWxsb3B0IH0pOwor fQorCit2b2lkIEZyYW1lVmlldzo6cmVzZXRPdmVycmlkZGVuVmlld3BvcnRXaWR0aEZvckNTU1Zp ZXdwb3J0VW5pdHMoKQoreworICAgIG92ZXJyaWRlVmlld3BvcnRTaXplRm9yQ1NTVmlld3BvcnRV bml0cyh7IHsgfSwgbV9vdmVycmlkZVZpZXdwb3J0U2l6ZSA/IG1fb3ZlcnJpZGVWaWV3cG9ydFNp emUtPmhlaWdodCA6IFdURjo6bnVsbG9wdCB9KTsKK30KKwogdm9pZCBGcmFtZVZpZXc6Om92ZXJy aWRlVmlld3BvcnRTaXplRm9yQ1NTVmlld3BvcnRVbml0cyhPdmVycmlkZVZpZXdwb3J0U2l6ZSBz aXplKQogewogICAgIGlmIChtX292ZXJyaWRlVmlld3BvcnRTaXplICYmICptX292ZXJyaWRlVmll d3BvcnRTaXplID09IHNpemUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1l Vmlldy5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaAppbmRleCAyODI3ZjEyMzBh NTM5MzkxM2NkY2FlNGRiYzdkYTU1NDliYzdmOGZlLi43ZTViOTdiOTNmMjg3NGE2YjA1ZDU1ZDVj NWE3MjQxNTk4NDFjODcyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmll dy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgKQEAgLTgzMCw2ICs4MzAs OCBAQCBwcml2YXRlOgogICAgICAgICBib29sIG9wZXJhdG9yPT0oY29uc3QgT3ZlcnJpZGVWaWV3 cG9ydFNpemUmIHJocykgY29uc3QgeyByZXR1cm4gcmhzLndpZHRoID09IHdpZHRoICYmIHJocy5o ZWlnaHQgPT0gaGVpZ2h0OyB9CiAgICAgfTsKICAgICB2b2lkIG92ZXJyaWRlVmlld3BvcnRTaXpl Rm9yQ1NTVmlld3BvcnRVbml0cyhPdmVycmlkZVZpZXdwb3J0U2l6ZSk7CisgICAgdm9pZCBvdmVy cmlkZVZpZXdwb3J0V2lkdGhGb3JDU1NWaWV3cG9ydFVuaXRzKGludCk7CisgICAgdm9pZCByZXNl dE92ZXJyaWRkZW5WaWV3cG9ydFdpZHRoRm9yQ1NTVmlld3BvcnRVbml0cygpOwogCiAgICAgc3Rh dGljIE1vbm90b25pY1RpbWUgc0N1cnJlbnRQYWludFRpbWVTdGFtcDsgLy8gdXNlZCBmb3IgZGV0 ZWN0aW5nIGRlY29kZWQgcmVzb3VyY2UgdGhyYXNoIGluIHRoZSBjYWNoZQogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS90 ZXN0aW5nL0ludGVybmFscy5jcHAKaW5kZXggNjJmYWZiZWQwY2NjZTc3NDNjZTJkNGIxOTczZTAx NzgyMTg0M2NlNi4uMzQxZmVmMWE3MDk1MTM4MjM4ZTAxNGU0YzhjZjRjM2M5MTU5MTg1ZCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmNwcApAQCAtMzcxMyw2ICszNzEzLDE0IEBAIHZv aWQgSW50ZXJuYWxzOjplbmFibGVGaXhlZFdpZHRoQXV0b1NpemVNb2RlKGJvb2wgZW5hYmxlZCwg aW50IHdpZHRoLCBpbnQgaGVpZ2h0CiAgICAgZG9jdW1lbnQtPnZpZXcoKS0+ZW5hYmxlRml4ZWRX aWR0aEF1dG9TaXplTW9kZShlbmFibGVkLCB7IHdpZHRoLCBoZWlnaHQgfSk7CiB9CiAKK3ZvaWQg SW50ZXJuYWxzOjplbmFibGVTaXplVG9Db250ZW50QXV0b1NpemVNb2RlKGJvb2wgZW5hYmxlZCwg aW50IHdpZHRoLCBpbnQgaGVpZ2h0KQoreworICAgIGF1dG8qIGRvY3VtZW50ID0gY29udGV4dERv Y3VtZW50KCk7CisgICAgaWYgKCFkb2N1bWVudCB8fCAhZG9jdW1lbnQtPnZpZXcoKSkKKyAgICAg ICAgcmV0dXJuOworICAgIGRvY3VtZW50LT52aWV3KCktPmVuYWJsZVNpemVUb0NvbnRlbnRBdXRv U2l6ZU1vZGUoZW5hYmxlZCwgeyB3aWR0aCwgaGVpZ2h0IH0pOworfQorCiAjaWYgRU5BQkxFKExF R0FDWV9FTkNSWVBURURfTUVESUEpCiAKIHZvaWQgSW50ZXJuYWxzOjppbml0aWFsaXplTW9ja0NE TSgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5oIGIvU291 cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaAppbmRleCBjMWZhZDliZjI5NWM5NmNhZGJi ODJlMWQ2YjUwNzM2NGMzMWJkMDE0Li5kZGE5Yzg5MDU2Y2ZiZDExY2RiNzY3N2U3YmUyOWE2M2Qy YjY2ZDk2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmgKQEAgLTU2Niw2ICs1NjYsNyBA QCBwdWJsaWM6CiAgICAgdm9pZCByZWxvYWRFeHBpcmVkT25seSgpOwogCiAgICAgdm9pZCBlbmFi bGVGaXhlZFdpZHRoQXV0b1NpemVNb2RlKGJvb2wgZW5hYmxlZCwgaW50IHdpZHRoLCBpbnQgaGVp Z2h0KTsKKyAgICB2b2lkIGVuYWJsZVNpemVUb0NvbnRlbnRBdXRvU2l6ZU1vZGUoYm9vbCBlbmFi bGVkLCBpbnQgd2lkdGgsIGludCBoZWlnaHQpOwogCiAjaWYgRU5BQkxFKExFR0FDWV9FTkNSWVBU RURfTUVESUEpCiAgICAgdm9pZCBpbml0aWFsaXplTW9ja0NETSgpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaWRsIGIvU291cmNlL1dlYkNvcmUvdGVzdGlu Zy9JbnRlcm5hbHMuaWRsCmluZGV4IDJhMzNjOWFhNTFlYWI1Yjc2NjhmNjA5Njg0YTIxMWE3Yjdk NWMzZTUuLjBlYjBmMTVhYmQwYzg1NDA3YzAxMTU4MzE4NDZiNmRhMTcwY2I5MTYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmlkbAorKysgYi9Tb3VyY2UvV2Vi Q29yZS90ZXN0aW5nL0ludGVybmFscy5pZGwKQEAgLTYxNCw2ICs2MTQsNyBAQCBlbnVtIENvbXBv c2l0aW5nUG9saWN5IHsKICAgICB2b2lkIHJlbG9hZEV4cGlyZWRPbmx5KCk7CiAKICAgICB2b2lk IGVuYWJsZUZpeGVkV2lkdGhBdXRvU2l6ZU1vZGUoYm9vbGVhbiBlbmFibGVkLCBsb25nIHdpZHRo LCBsb25nIGhlaWdodCk7CisgICAgdm9pZCBlbmFibGVTaXplVG9Db250ZW50QXV0b1NpemVNb2Rl KGJvb2xlYW4gZW5hYmxlZCwgbG9uZyB3aWR0aCwgbG9uZyBoZWlnaHQpOwogCiAgICAgW0NvbmRp dGlvbmFsPVZJREVPXSBzZXF1ZW5jZTxET01TdHJpbmc+IG1lZGlhUmVzcG9uc2VTb3VyY2VzKEhU TUxNZWRpYUVsZW1lbnQgbWVkaWEpOwogICAgIFtDb25kaXRpb25hbD1WSURFT10gc2VxdWVuY2U8 RE9NU3RyaW5nPiBtZWRpYVJlc3BvbnNlQ29udGVudFJhbmdlcyhIVE1MTWVkaWFFbGVtZW50IG1l ZGlhKTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0No YW5nZUxvZwppbmRleCBiOGU4YjJhNDI0YTYyNTI2NWY3YTY4OWJhNDY4ZjczNDE5ODU0ZDRmLi45 NWRmNTYyYzBkYjJiMDA5NGE3NWRmMmIzMzc1MTBhMTUxZGFlZjlmIDEwMDY0NAotLS0gYS9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MTQgQEAKKzIwMjAtMDYtMTkgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAg ICAgICBbQXV0b1NpemluZ10gUmVzb2x2ZSB2aWV3cG9ydCB1bml0cyBhZ2FpbnN0IHRoZSBwcmVm ZXJyZWQgY29udGVudCBzaXplCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMTM0MDgKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY0MjY3NTM5PgorCisg ICAgICAgIFJldmlld2VkIGJ5IFRpbSBIb3J0b24uCisKKyAgICAgICAgKiBmYXN0L2R5bmFtaWMv c2l6ZS10by1jb250ZW50LWF1dG9zaXplLXdpdGgtdmlld3BvcnQtdW5pdHMtZXhwZWN0ZWQudHh0 OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2R5bmFtaWMvc2l6ZS10by1jb250ZW50LWF1dG9zaXpl LXdpdGgtdmlld3BvcnQtdW5pdHMuaHRtbDogQWRkZWQuCisKIDIwMjAtMDYtMTkgIFphbGFuIEJ1 anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtURkNdIERvIG5vdCBzcGVj aWFsLWNhc2UgZW1wdHkgdGFibGVzCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2R5bmFt aWMvc2l6ZS10by1jb250ZW50LWF1dG9zaXplLXdpdGgtdmlld3BvcnQtdW5pdHMtZXhwZWN0ZWQu dHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9keW5hbWljL3NpemUtdG8tY29udGVudC1hdXRvc2l6ZS13 aXRoLXZpZXdwb3J0LXVuaXRzLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRl eCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5lNDY5NjVkYmI5MzU1 MmYyNmM3Nzk5MWZkNWQyYjRlZDQ1MzVlZmZjCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVz dHMvZmFzdC9keW5hbWljL3NpemUtdG8tY29udGVudC1hdXRvc2l6ZS13aXRoLXZpZXdwb3J0LXVu aXRzLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxIEBACiszNTBweCAxNzVweCAzNXB4IDBweApkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9keW5hbWljL3NpemUtdG8tY29udGVudC1hdXRvc2l6 ZS13aXRoLXZpZXdwb3J0LXVuaXRzLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2R5bmFtaWMvc2l6 ZS10by1jb250ZW50LWF1dG9zaXplLXdpdGgtdmlld3BvcnQtdW5pdHMuaHRtbApuZXcgZmlsZSBt b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw Li5mZGIyM2M1MWZhYTZmMTQ2OWRhZThmNzdkODg2OGEwNjQxMjk4Mzg0Ci0tLSAvZGV2L251bGwK KysrIGIvTGF5b3V0VGVzdHMvZmFzdC9keW5hbWljL3NpemUtdG8tY29udGVudC1hdXRvc2l6ZS13 aXRoLXZpZXdwb3J0LXVuaXRzLmh0bWwKQEAgLTAsMCArMSw1NCBAQAorPCFET0NUWVBFIEhUTUw+ Cis8aHRtbD4KKzxoZWFkPgorPHRpdGxlPlRoaXMgdGVzdHMgdGhhdCBhdXRvc2l6ZSB1c2VzIHRo ZSBjb250ZW50LXdpZHRoIGFzIHRoZSBiYXNlIGZvciByZXNvbHZpbmcgdmlld3BvcnQgdW5pdCB2 YWx1ZXM8L3RpdGxlPgorPHN0eWxlPgorYm9keSB7CisgICAgbWFyZ2luOiAwcHg7Cit9CisjdzEw MCB7CisgICAgd2lkdGg6IDEwMHZ3OworICAgIGhlaWdodDogMTBweDsKK30KKworI3c1MCB7Cisg ICAgd2lkdGg6IDUwdnc7CisgICAgaGVpZ2h0OiAxMHB4OworfQorCisjdzEwIHsKKyAgICB3aWR0 aDogMTB2dzsKKyAgICBoZWlnaHQ6IDEwcHg7Cit9CisKKyN3MCB7CisgICAgd2lkdGg6IDB2dzsK KyAgICBoZWlnaHQ6IDEwcHg7Cit9Cis8L3N0eWxlPgorPHNjcmlwdD4KK2lmICh3aW5kb3cuaW50 ZXJuYWxzKQorICAgIGludGVybmFscy5lbmFibGVTaXplVG9Db250ZW50QXV0b1NpemVNb2RlKHRy dWUsIDIwMDAsIDYwMCk7CisKK2lmICh3aW5kb3cudGVzdFJ1bm5lcikKKyAgICB0ZXN0UnVubmVy LmR1bXBBc1RleHQoKTsKKzwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+Cis8ZGl2IGlkPXcxMDA+ PC9kaXY+Cis8ZGl2IGlkPXc1MD48L2Rpdj4KKzxkaXYgaWQ9dzEwPjwvZGl2PgorPGRpdiBpZD13 MD48L2Rpdj4KKzxkaXYgc3R5bGU9IndpZHRoOiAzNTBweDsgaGVpZ2h0OiAzNTBweDsgYmFja2dy b3VuZC1jb2xvcjogZ3JlZW47Ij48L2Rpdj4KKzxwcmUgaWQ9cmVzdWx0PjwvcHJlPgorPHNjcmlw dD4KK2RvY3VtZW50LmJvZHkub2Zmc2V0V2lkdGg7CityZXN1bHQudGV4dENvbnRlbnQgPSB3aW5k b3cuZ2V0Q29tcHV0ZWRTdHlsZSh3MTAwLCBudWxsKS5nZXRQcm9wZXJ0eVZhbHVlKCJ3aWR0aCIp ICsgIiAiCisgICAgKyB3aW5kb3cuZ2V0Q29tcHV0ZWRTdHlsZSh3NTAsIG51bGwpLmdldFByb3Bl cnR5VmFsdWUoIndpZHRoIikgKyAiICIKKyAgICArIHdpbmRvdy5nZXRDb21wdXRlZFN0eWxlKHcx MCwgbnVsbCkuZ2V0UHJvcGVydHlWYWx1ZSgid2lkdGgiKSArICIgIiAgCisJKyB3aW5kb3cuZ2V0 Q29tcHV0ZWRTdHlsZSh3MCwgbnVsbCkuZ2V0UHJvcGVydHlWYWx1ZSgid2lkdGgiKTsgIAoraWYg KHdpbmRvdy5pbnRlcm5hbHMpCisgICAgaW50ZXJuYWxzLmVuYWJsZVNpemVUb0NvbnRlbnRBdXRv U2l6ZU1vZGUoZmFsc2UsIDAsIDAsIDAsIDApOworPC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+ Cg== 402354 2020-06-19 17:21:24 -0700 2020-06-19 17:57:40 -0700 Patch bug-213408-20200619172124.patch text/plain 13166 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzMjcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWRhYWNkMTM3YmMyZjg4 ZjBmZDQ2NjM4ZGM5ZjgyNGM2ZjgzZDVjMy4uNDczYWYxZGZjZjlhNGUyMjI5YzYxMzVjZWYzMmY1 ZDgyZDQ3OTQxNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDIwLTA2LTE5ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0F1dG9TaXppbmddIFJlc29s dmUgdmlld3BvcnQgdW5pdHMgYWdhaW5zdCB0aGUgcHJlZmVycmVkIGNvbnRlbnQgc2l6ZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEzNDA4CisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS82NDI2NzUzOT4KKworICAgICAgICBSZXZpZXdlZCBieSBUaW0g SG9ydG9uLgorCisgICAgICAgIEluc3RlYWQgb2YgcmVzb2x2aW5nIHRoZSB2aWV3cG9ydCB1bml0 cyBhZ2FpbnN0IHRoZSBtYXhpbXVtIGNvbnRlbnQgc2l6ZSBjb25zdHJhaW50cywgbGV0J3MgdXNl IHRoZSBwcmVmZXJyZWQgY29udGVudCBzaXplLgorICAgICAgICBJdCBlbnN1cmVzIHRoYXQgY29u dGVudCB3aXRoIHZ3LCB2aCB1bml0cyBkb2VzIG5vdCBncm93IGJleW9uZCB0aGUgcHJlZmVycmVk IGNvbnRlbnQgc2l6ZS4KKworICAgICAgICBUZXN0OiBmYXN0L2R5bmFtaWMvc2l6ZS10by1jb250 ZW50LWF1dG9zaXplLXdpdGgtdmlld3BvcnQtdW5pdHMuaHRtbAorCisgICAgICAgICogcGFnZS9G cmFtZVZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3OjpwZXJmb3JtU2l6ZVRv Q29udGVudEF1dG9TaXplKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6ZW5hYmxlQXV0 b1NpemVNb2RlKTogTGV0J3MgImlnbm9yZSIgdmlld3BvcnQgdW5pdHMgZHVyaW5nIHRoZSBpbml0 aWFsCisgICAgICAgIHBhc3MgYW5kIHVzZSB0aGUgcHJlZmVycmVkIHdpZHRoIHRvIGZpbmFsaXpl IHRoZSB2dyB2aCB1bml0IHZhbHVlcyAod2UgZG9uJ3QgcmVhbGx5IGlnbm9yZSB0aGVtLCBidXQg dGhleSBhcmUgcmVzb2x2ZWQgYWdhaW5zdCBhIFsgMSwgMSBdIHZpZXdwb3J0KS4KKyAgICAgICAg VGhpcyBhcHByb2FjaCBmYWlscyBpZiB0aGUgbWFpbiBjb250ZW50IGhhcyAxMDB2dyB3aXRoIG92 ZXJmbG93IGhpZGRlbi4gU3VjaCBjb250ZW50IHdvdWxkIGVuZCB1cCB3aXRoIGEgWyAxLCAxIF0g c2l6ZSAod2UgbWlnaHQgd2FudCB0byBkZXRlY3QgaXQgCisgICAgICAgIGFuZCByZXNvbHZlZCB0 aGUgdmFsdWVzIGFnYWluc3QgdGhlIGhvcml6b250YWwgY29uc3RyYWludCkuCisgICAgICAgIChX ZWJDb3JlOjpGcmFtZVZpZXc6Om92ZXJyaWRlVmlld3BvcnRXaWR0aEZvckNTU1ZpZXdwb3J0VW5p dHMpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3OjpyZXNldE92ZXJyaWRkZW5WaWV3cG9y dFdpZHRoRm9yQ1NTVmlld3BvcnRVbml0cyk6CisgICAgICAgICogcGFnZS9GcmFtZVZpZXcuaDoK KyAgICAgICAgKiB0ZXN0aW5nL0ludGVybmFscy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnRl cm5hbHM6OmVuYWJsZVNpemVUb0NvbnRlbnRBdXRvU2l6ZU1vZGUpOgorICAgICAgICAqIHRlc3Rp bmcvSW50ZXJuYWxzLmg6CisgICAgICAgICogdGVzdGluZy9JbnRlcm5hbHMuaWRsOgorCiAyMDIw LTA2LTE5ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgTW92ZSBQ cmVmaXhlZCBXZWJBdWRpbyBpbnRlcmZhY2VzIGJlaGluZCB0aGVpciBvd24gZmVhdHVyZSBmbGFn CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKaW5kZXggOTcxZjU1NTc5OWZkZmM0YjE3YjQzMTMw ZWMwMDE3NWYxNjM4OWMyOC4uN2I1MmM4NmQ0YzI5YzE1MzgzOWMzZGUwNmY3N2NjNmM0NThiZjhl OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcApAQCAtMzQ3OSwxOSArMzQ3OSwxOCBAQCB2 b2lkIEZyYW1lVmlldzo6cGVyZm9ybVNpemVUb0NvbnRlbnRBdXRvU2l6ZSgpCiAgICAgYXV0byog ZG9jdW1lbnQgPSBmcmFtZSgpLmRvY3VtZW50KCk7CiAgICAgYXV0byogcmVuZGVyVmlldyA9IGRv Y3VtZW50LT5yZW5kZXJWaWV3KCk7CiAKLSAgICBJbnRTaXplIG1pbkF1dG9TaXplKDEsIDEpOwot CiAgICAgLy8gU3RhcnQgZnJvbSB0aGUgbWluaW11bSBzaXplIGFuZCBhbGxvdyBpdCB0byBncm93 LgotICAgIHJlc2l6ZShtaW5BdXRvU2l6ZS53aWR0aCgpLCBtaW5BdXRvU2l6ZS5oZWlnaHQoKSk7 Ci0gICAgSW50U2l6ZSBzaXplID0gZnJhbWVSZWN0KCkuc2l6ZSgpOworICAgIGF1dG8gbWluQXV0 b1NpemUgPSBJbnRTaXplIHsgMSwgMSB9OworICAgIHJlc2l6ZShtaW5BdXRvU2l6ZSk7CisgICAg YXV0byBzaXplID0gZnJhbWVSZWN0KCkuc2l6ZSgpOwogICAgIC8vIERvIHRoZSByZXNpemluZyB0 d2ljZS4gVGhlIGZpcnN0IHRpbWUgaXMgYmFzaWNhbGx5IGEgcm91Z2ggY2FsY3VsYXRpb24gdXNp bmcgdGhlIHByZWZlcnJlZCB3aWR0aAogICAgIC8vIHdoaWNoIG1heSByZXN1bHQgaW4gYSBoZWln aHQgY2hhbmdlIGR1cmluZyB0aGUgc2Vjb25kIGl0ZXJhdGlvbi4KKyAgICAvLyBMZXQncyBpZ25v cmUgcmVuZGVyZXJzIHdpdGggdmlld3BvcnQgdW5pdHMgZmlyc3QgYW5kIHJlc29sdmUgdGhlc2Ug Ym94ZXMgZHVyaW5nIHRoZSBzZWNvbmQgcGhhc2Ugb2YgdGhlIGF1dG9zaXppbmcuCisgICAgcmVz ZXRPdmVycmlkZGVuVmlld3BvcnRXaWR0aEZvckNTU1ZpZXdwb3J0VW5pdHMoKTsKICAgICBmb3Ig KGludCBpID0gMDsgaSA8IDI7IGkrKykgewogICAgICAgICAvLyBVcGRhdGUgdmFyaW91cyBzaXpl cyBpbmNsdWRpbmcgY29udGVudHNTaXplLCBzY3JvbGxIZWlnaHQsIGV0Yy4KICAgICAgICAgZG9j dW1lbnQtPnVwZGF0ZUxheW91dElnbm9yZVBlbmRpbmdTdHlsZXNoZWV0cygpOwotICAgICAgICBp bnQgd2lkdGggPSByZW5kZXJWaWV3LT5taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgoKTsKLSAgICAg ICAgaW50IGhlaWdodCA9IHJlbmRlclZpZXctPmRvY3VtZW50UmVjdCgpLmhlaWdodCgpOwotICAg ICAgICBJbnRTaXplIG5ld1NpemUod2lkdGgsIGhlaWdodCk7CisgICAgICAgIGF1dG8gbmV3U2l6 ZSA9IEludFNpemUgeyByZW5kZXJWaWV3LT5taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgoKSwgcmVu ZGVyVmlldy0+ZG9jdW1lbnRSZWN0KCkuaGVpZ2h0KCkgfTsKIAogICAgICAgICAvLyBDaGVjayB0 byBzZWUgaWYgYSBzY3JvbGxiYXIgaXMgbmVlZGVkIGZvciBhIGdpdmVuIGRpbWVuc2lvbiBhbmQK ICAgICAgICAgLy8gaWYgc28sIGluY3JlYXNlIHRoZSBvdGhlciBkaW1lbnNpb24gdG8gYWNjb3Vu dCBmb3IgdGhlIHNjcm9sbGJhci4KQEAgLTM1MDIsNyArMzUwMSw2IEBAIHZvaWQgRnJhbWVWaWV3 OjpwZXJmb3JtU2l6ZVRvQ29udGVudEF1dG9TaXplKCkKICAgICAgICAgICAgIGlmICghbG9jYWxI b3Jpem9udGFsU2Nyb2xsYmFyKQogICAgICAgICAgICAgICAgIGxvY2FsSG9yaXpvbnRhbFNjcm9s bGJhciA9IGNyZWF0ZVNjcm9sbGJhcihIb3Jpem9udGFsU2Nyb2xsYmFyKTsKICAgICAgICAgICAg IG5ld1NpemUuZXhwYW5kKDAsIGxvY2FsSG9yaXpvbnRhbFNjcm9sbGJhci0+b2NjdXBpZWRIZWln aHQoKSk7Ci0KICAgICAgICAgICAgIC8vIERvbid0IGJvdGhlciBjaGVja2luZyBmb3IgYSB2ZXJ0 aWNhbCBzY3JvbGxiYXIgYmVjYXVzZSB0aGUgd2lkdGggaXMgYXQKICAgICAgICAgICAgIC8vIGFs cmVhZHkgZ3JlYXRlciB0aGUgbWF4aW11bS4KICAgICAgICAgfSBlbHNlIGlmIChuZXdTaXplLmhl aWdodCgpID4gbV9hdXRvU2l6ZUNvbnN0cmFpbnQuaGVpZ2h0KCkpIHsKQEAgLTM1MTAsNyArMzUw OCw2IEBAIHZvaWQgRnJhbWVWaWV3OjpwZXJmb3JtU2l6ZVRvQ29udGVudEF1dG9TaXplKCkKICAg ICAgICAgICAgIGlmICghbG9jYWxWZXJ0aWNhbFNjcm9sbGJhcikKICAgICAgICAgICAgICAgICBs b2NhbFZlcnRpY2FsU2Nyb2xsYmFyID0gY3JlYXRlU2Nyb2xsYmFyKFZlcnRpY2FsU2Nyb2xsYmFy KTsKICAgICAgICAgICAgIG5ld1NpemUuZXhwYW5kKGxvY2FsVmVydGljYWxTY3JvbGxiYXItPm9j Y3VwaWVkV2lkdGgoKSwgMCk7Ci0KICAgICAgICAgICAgIC8vIERvbid0IGJvdGhlciBjaGVja2lu ZyBmb3IgYSBob3Jpem9udGFsIHNjcm9sbGJhciBiZWNhdXNlIHRoZSBoZWlnaHQgaXMKICAgICAg ICAgICAgIC8vIGFscmVhZHkgZ3JlYXRlciB0aGUgbWF4aW11bS4KICAgICAgICAgfQpAQCAtMzU0 Myw2ICszNTQwLDkgQEAgdm9pZCBGcmFtZVZpZXc6OnBlcmZvcm1TaXplVG9Db250ZW50QXV0b1Np emUoKQogICAgICAgICAvLyBvbiBwYWdlcyAoZS5nLiBxdWlya3MgbW9kZSkgd2hlcmUgdGhlIGJv ZHkvZG9jdW1lbnQgcmVzaXplIHRvIHRoZSB2aWV3IHNpemUsCiAgICAgICAgIC8vIHdlJ2xsIGVu ZCB1cCBub3Qgc2hyaW5raW5nIGJhY2sgZG93biBhZnRlciByZXNpemluZyB0byB0aGUgY29tcHV0 ZWQgcHJlZmVycmVkIHdpZHRoLgogICAgICAgICByZXNpemUobmV3U2l6ZS53aWR0aCgpLCBpID8g bmV3U2l6ZS5oZWlnaHQoKSA6IG1pbkF1dG9TaXplLmhlaWdodCgpKTsKKyAgICAgICAgLy8gUHJv dGVjdCB0aGUgY29udGVudCBmcm9tIGV2ZXJncm93aW5nIGxheW91dC4KKyAgICAgICAgYXV0byBw cmVmZXJyZWRWaWV3cG9ydFdpZHRoID0gc3RkOjptaW4obmV3U2l6ZS53aWR0aCgpLCBtX2F1dG9T aXplQ29uc3RyYWludC53aWR0aCgpKTsKKyAgICAgICAgb3ZlcnJpZGVWaWV3cG9ydFdpZHRoRm9y Q1NTVmlld3BvcnRVbml0cyhwcmVmZXJyZWRWaWV3cG9ydFdpZHRoKTsKICAgICAgICAgLy8gRm9y Y2UgdGhlIHNjcm9sbGJhciBzdGF0ZSB0byBhdm9pZCB0aGUgc2Nyb2xsYmFyIGNvZGUgYWRkaW5n IHRoZW0gYW5kIGNhdXNpbmcgdGhlbSB0byBiZSBuZWVkZWQuIEZvciBleGFtcGxlLAogICAgICAg ICAvLyBhIHZlcnRpY2FsIHNjcm9sbGJhciBtYXkgY2F1c2UgdGV4dCB0byB3cmFwIGFuZCB0aHVz IGluY3JlYXNlIHRoZSBoZWlnaHQgKHdoaWNoIGlzIHRoZSBvbmx5IHJlYXNvbiB0aGUgc2NvbGxi YXIgaXMgbmVlZGVkKS4KICAgICAgICAgc2V0VmVydGljYWxTY3JvbGxiYXJMb2NrKGZhbHNlKTsK QEAgLTM1NTAsNyArMzU1MCw2IEBAIHZvaWQgRnJhbWVWaWV3OjpwZXJmb3JtU2l6ZVRvQ29udGVu dEF1dG9TaXplKCkKICAgICAgICAgc2V0U2Nyb2xsYmFyTW9kZXMoaG9yaXpvbmFsU2Nyb2xsYmFy TW9kZSwgdmVydGljYWxTY3JvbGxiYXJNb2RlLCB0cnVlLCB0cnVlKTsKICAgICB9CiAgICAgLy8g QWxsIHRoZSByZXNpemluZyBhYm92ZSBtYXkgaGF2ZSBpbnZhbGlkYXRlZCBzdHlsZSAoZm9yIGV4 YW1wbGUgaWYgdmlld3BvcnQgdW5pdHMgYXJlIGJlaW5nIHVzZWQpLgotCiAgICAgZG9jdW1lbnQt PnVwZGF0ZVN0eWxlSWZOZWVkZWQoKTsKICAgICAvLyBGSVhNRTogVXNlIHRoZSBmaW5hbCBsYXlv dXQncyByZXN1bHQgYXMgdGhlIGNvbnRlbnQgc2l6ZSAod2Via2l0Lm9yZy9iLzE3MzU2MSkuCiAg ICAgZG9jdW1lbnQtPnVwZGF0ZUxheW91dElnbm9yZVBlbmRpbmdTdHlsZXNoZWV0cygpOwpAQCAt NDYwNyw3ICs0NjA2LDcgQEAgdm9pZCBGcmFtZVZpZXc6OmVuYWJsZUF1dG9TaXplTW9kZShib29s IGVuYWJsZSwgY29uc3QgSW50U2l6ZSYgdmlld1NpemUsIEF1dG9TaXoKICAgICBzZXROZWVkc0xh eW91dEFmdGVyVmlld0NvbmZpZ3VyYXRpb25DaGFuZ2UoKTsKICAgICBsYXlvdXRDb250ZXh0KCku c2NoZWR1bGVMYXlvdXQoKTsKICAgICBpZiAobV9zaG91bGRBdXRvU2l6ZSkgewotICAgICAgICBv dmVycmlkZVZpZXdwb3J0U2l6ZUZvckNTU1ZpZXdwb3J0VW5pdHMoeyBtX2F1dG9TaXplQ29uc3Ry YWludC53aWR0aCgpLCBtX292ZXJyaWRlVmlld3BvcnRTaXplID8gbV9vdmVycmlkZVZpZXdwb3J0 U2l6ZS0+aGVpZ2h0IDogV1RGOjpudWxsb3B0IH0pOworICAgICAgICBvdmVycmlkZVZpZXdwb3J0 V2lkdGhGb3JDU1NWaWV3cG9ydFVuaXRzKG1fYXV0b1NpemVDb25zdHJhaW50LndpZHRoKCkpOwog ICAgICAgICByZXR1cm47CiAgICAgfQogCkBAIC01NDA5LDYgKzU0MDgsMTYgQEAgdm9pZCBGcmFt ZVZpZXc6OnNldFZpZXdwb3J0U2l6ZUZvckNTU1ZpZXdwb3J0VW5pdHMoSW50U2l6ZSBzaXplKQog ICAgIG92ZXJyaWRlVmlld3BvcnRTaXplRm9yQ1NTVmlld3BvcnRVbml0cyh7IHNpemUud2lkdGgo KSwgc2l6ZS5oZWlnaHQoKSB9KTsKIH0KIAordm9pZCBGcmFtZVZpZXc6Om92ZXJyaWRlVmlld3Bv cnRXaWR0aEZvckNTU1ZpZXdwb3J0VW5pdHMoaW50IHdpZHRoKQoreworICAgIG92ZXJyaWRlVmll d3BvcnRTaXplRm9yQ1NTVmlld3BvcnRVbml0cyh7IHdpZHRoLCBtX292ZXJyaWRlVmlld3BvcnRT aXplID8gbV9vdmVycmlkZVZpZXdwb3J0U2l6ZS0+aGVpZ2h0IDogV1RGOjpudWxsb3B0IH0pOwor fQorCit2b2lkIEZyYW1lVmlldzo6cmVzZXRPdmVycmlkZGVuVmlld3BvcnRXaWR0aEZvckNTU1Zp ZXdwb3J0VW5pdHMoKQoreworICAgIG92ZXJyaWRlVmlld3BvcnRTaXplRm9yQ1NTVmlld3BvcnRV bml0cyh7IHsgfSwgbV9vdmVycmlkZVZpZXdwb3J0U2l6ZSA/IG1fb3ZlcnJpZGVWaWV3cG9ydFNp emUtPmhlaWdodCA6IFdURjo6bnVsbG9wdCB9KTsKK30KKwogdm9pZCBGcmFtZVZpZXc6Om92ZXJy aWRlVmlld3BvcnRTaXplRm9yQ1NTVmlld3BvcnRVbml0cyhPdmVycmlkZVZpZXdwb3J0U2l6ZSBz aXplKQogewogICAgIGlmIChtX292ZXJyaWRlVmlld3BvcnRTaXplICYmICptX292ZXJyaWRlVmll d3BvcnRTaXplID09IHNpemUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1l Vmlldy5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaAppbmRleCAyODI3ZjEyMzBh NTM5MzkxM2NkY2FlNGRiYzdkYTU1NDliYzdmOGZlLi43ZTViOTdiOTNmMjg3NGE2YjA1ZDU1ZDVj NWE3MjQxNTk4NDFjODcyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmll dy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgKQEAgLTgzMCw2ICs4MzAs OCBAQCBwcml2YXRlOgogICAgICAgICBib29sIG9wZXJhdG9yPT0oY29uc3QgT3ZlcnJpZGVWaWV3 cG9ydFNpemUmIHJocykgY29uc3QgeyByZXR1cm4gcmhzLndpZHRoID09IHdpZHRoICYmIHJocy5o ZWlnaHQgPT0gaGVpZ2h0OyB9CiAgICAgfTsKICAgICB2b2lkIG92ZXJyaWRlVmlld3BvcnRTaXpl Rm9yQ1NTVmlld3BvcnRVbml0cyhPdmVycmlkZVZpZXdwb3J0U2l6ZSk7CisgICAgdm9pZCBvdmVy cmlkZVZpZXdwb3J0V2lkdGhGb3JDU1NWaWV3cG9ydFVuaXRzKGludCk7CisgICAgdm9pZCByZXNl dE92ZXJyaWRkZW5WaWV3cG9ydFdpZHRoRm9yQ1NTVmlld3BvcnRVbml0cygpOwogCiAgICAgc3Rh dGljIE1vbm90b25pY1RpbWUgc0N1cnJlbnRQYWludFRpbWVTdGFtcDsgLy8gdXNlZCBmb3IgZGV0 ZWN0aW5nIGRlY29kZWQgcmVzb3VyY2UgdGhyYXNoIGluIHRoZSBjYWNoZQogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS90 ZXN0aW5nL0ludGVybmFscy5jcHAKaW5kZXggNjJmYWZiZWQwY2NjZTc3NDNjZTJkNGIxOTczZTAx NzgyMTg0M2NlNi4uMzQxZmVmMWE3MDk1MTM4MjM4ZTAxNGU0YzhjZjRjM2M5MTU5MTg1ZCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmNwcApAQCAtMzcxMyw2ICszNzEzLDE0IEBAIHZv aWQgSW50ZXJuYWxzOjplbmFibGVGaXhlZFdpZHRoQXV0b1NpemVNb2RlKGJvb2wgZW5hYmxlZCwg aW50IHdpZHRoLCBpbnQgaGVpZ2h0CiAgICAgZG9jdW1lbnQtPnZpZXcoKS0+ZW5hYmxlRml4ZWRX aWR0aEF1dG9TaXplTW9kZShlbmFibGVkLCB7IHdpZHRoLCBoZWlnaHQgfSk7CiB9CiAKK3ZvaWQg SW50ZXJuYWxzOjplbmFibGVTaXplVG9Db250ZW50QXV0b1NpemVNb2RlKGJvb2wgZW5hYmxlZCwg aW50IHdpZHRoLCBpbnQgaGVpZ2h0KQoreworICAgIGF1dG8qIGRvY3VtZW50ID0gY29udGV4dERv Y3VtZW50KCk7CisgICAgaWYgKCFkb2N1bWVudCB8fCAhZG9jdW1lbnQtPnZpZXcoKSkKKyAgICAg ICAgcmV0dXJuOworICAgIGRvY3VtZW50LT52aWV3KCktPmVuYWJsZVNpemVUb0NvbnRlbnRBdXRv U2l6ZU1vZGUoZW5hYmxlZCwgeyB3aWR0aCwgaGVpZ2h0IH0pOworfQorCiAjaWYgRU5BQkxFKExF R0FDWV9FTkNSWVBURURfTUVESUEpCiAKIHZvaWQgSW50ZXJuYWxzOjppbml0aWFsaXplTW9ja0NE TSgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5oIGIvU291 cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaAppbmRleCBjMWZhZDliZjI5NWM5NmNhZGJi ODJlMWQ2YjUwNzM2NGMzMWJkMDE0Li5kZGE5Yzg5MDU2Y2ZiZDExY2RiNzY3N2U3YmUyOWE2M2Qy YjY2ZDk2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmgKQEAgLTU2Niw2ICs1NjYsNyBA QCBwdWJsaWM6CiAgICAgdm9pZCByZWxvYWRFeHBpcmVkT25seSgpOwogCiAgICAgdm9pZCBlbmFi bGVGaXhlZFdpZHRoQXV0b1NpemVNb2RlKGJvb2wgZW5hYmxlZCwgaW50IHdpZHRoLCBpbnQgaGVp Z2h0KTsKKyAgICB2b2lkIGVuYWJsZVNpemVUb0NvbnRlbnRBdXRvU2l6ZU1vZGUoYm9vbCBlbmFi bGVkLCBpbnQgd2lkdGgsIGludCBoZWlnaHQpOwogCiAjaWYgRU5BQkxFKExFR0FDWV9FTkNSWVBU RURfTUVESUEpCiAgICAgdm9pZCBpbml0aWFsaXplTW9ja0NETSgpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaWRsIGIvU291cmNlL1dlYkNvcmUvdGVzdGlu Zy9JbnRlcm5hbHMuaWRsCmluZGV4IDJhMzNjOWFhNTFlYWI1Yjc2NjhmNjA5Njg0YTIxMWE3Yjdk NWMzZTUuLjBlYjBmMTVhYmQwYzg1NDA3YzAxMTU4MzE4NDZiNmRhMTcwY2I5MTYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmlkbAorKysgYi9Tb3VyY2UvV2Vi Q29yZS90ZXN0aW5nL0ludGVybmFscy5pZGwKQEAgLTYxNCw2ICs2MTQsNyBAQCBlbnVtIENvbXBv c2l0aW5nUG9saWN5IHsKICAgICB2b2lkIHJlbG9hZEV4cGlyZWRPbmx5KCk7CiAKICAgICB2b2lk IGVuYWJsZUZpeGVkV2lkdGhBdXRvU2l6ZU1vZGUoYm9vbGVhbiBlbmFibGVkLCBsb25nIHdpZHRo LCBsb25nIGhlaWdodCk7CisgICAgdm9pZCBlbmFibGVTaXplVG9Db250ZW50QXV0b1NpemVNb2Rl KGJvb2xlYW4gZW5hYmxlZCwgbG9uZyB3aWR0aCwgbG9uZyBoZWlnaHQpOwogCiAgICAgW0NvbmRp dGlvbmFsPVZJREVPXSBzZXF1ZW5jZTxET01TdHJpbmc+IG1lZGlhUmVzcG9uc2VTb3VyY2VzKEhU TUxNZWRpYUVsZW1lbnQgbWVkaWEpOwogICAgIFtDb25kaXRpb25hbD1WSURFT10gc2VxdWVuY2U8 RE9NU3RyaW5nPiBtZWRpYVJlc3BvbnNlQ29udGVudFJhbmdlcyhIVE1MTWVkaWFFbGVtZW50IG1l ZGlhKTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0No YW5nZUxvZwppbmRleCBiOGU4YjJhNDI0YTYyNTI2NWY3YTY4OWJhNDY4ZjczNDE5ODU0ZDRmLi45 NWRmNTYyYzBkYjJiMDA5NGE3NWRmMmIzMzc1MTBhMTUxZGFlZjlmIDEwMDY0NAotLS0gYS9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MTQgQEAKKzIwMjAtMDYtMTkgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAg ICAgICBbQXV0b1NpemluZ10gUmVzb2x2ZSB2aWV3cG9ydCB1bml0cyBhZ2FpbnN0IHRoZSBwcmVm ZXJyZWQgY29udGVudCBzaXplCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMTM0MDgKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY0MjY3NTM5PgorCisg ICAgICAgIFJldmlld2VkIGJ5IFRpbSBIb3J0b24uCisKKyAgICAgICAgKiBmYXN0L2R5bmFtaWMv c2l6ZS10by1jb250ZW50LWF1dG9zaXplLXdpdGgtdmlld3BvcnQtdW5pdHMtZXhwZWN0ZWQudHh0 OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2R5bmFtaWMvc2l6ZS10by1jb250ZW50LWF1dG9zaXpl LXdpdGgtdmlld3BvcnQtdW5pdHMuaHRtbDogQWRkZWQuCisKIDIwMjAtMDYtMTkgIFphbGFuIEJ1 anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtURkNdIERvIG5vdCBzcGVj aWFsLWNhc2UgZW1wdHkgdGFibGVzCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2R5bmFt aWMvc2l6ZS10by1jb250ZW50LWF1dG9zaXplLXdpdGgtdmlld3BvcnQtdW5pdHMtZXhwZWN0ZWQu dHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9keW5hbWljL3NpemUtdG8tY29udGVudC1hdXRvc2l6ZS13 aXRoLXZpZXdwb3J0LXVuaXRzLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRl eCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5lNDY5NjVkYmI5MzU1 MmYyNmM3Nzk5MWZkNWQyYjRlZDQ1MzVlZmZjCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVz dHMvZmFzdC9keW5hbWljL3NpemUtdG8tY29udGVudC1hdXRvc2l6ZS13aXRoLXZpZXdwb3J0LXVu aXRzLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxIEBACiszNTBweCAxNzVweCAzNXB4IDBweApkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9keW5hbWljL3NpemUtdG8tY29udGVudC1hdXRvc2l6 ZS13aXRoLXZpZXdwb3J0LXVuaXRzLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2R5bmFtaWMvc2l6 ZS10by1jb250ZW50LWF1dG9zaXplLXdpdGgtdmlld3BvcnQtdW5pdHMuaHRtbApuZXcgZmlsZSBt b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw Li5mZGIyM2M1MWZhYTZmMTQ2OWRhZThmNzdkODg2OGEwNjQxMjk4Mzg0Ci0tLSAvZGV2L251bGwK KysrIGIvTGF5b3V0VGVzdHMvZmFzdC9keW5hbWljL3NpemUtdG8tY29udGVudC1hdXRvc2l6ZS13 aXRoLXZpZXdwb3J0LXVuaXRzLmh0bWwKQEAgLTAsMCArMSw1NCBAQAorPCFET0NUWVBFIEhUTUw+ Cis8aHRtbD4KKzxoZWFkPgorPHRpdGxlPlRoaXMgdGVzdHMgdGhhdCBhdXRvc2l6ZSB1c2VzIHRo ZSBjb250ZW50LXdpZHRoIGFzIHRoZSBiYXNlIGZvciByZXNvbHZpbmcgdmlld3BvcnQgdW5pdCB2 YWx1ZXM8L3RpdGxlPgorPHN0eWxlPgorYm9keSB7CisgICAgbWFyZ2luOiAwcHg7Cit9CisjdzEw MCB7CisgICAgd2lkdGg6IDEwMHZ3OworICAgIGhlaWdodDogMTBweDsKK30KKworI3c1MCB7Cisg ICAgd2lkdGg6IDUwdnc7CisgICAgaGVpZ2h0OiAxMHB4OworfQorCisjdzEwIHsKKyAgICB3aWR0 aDogMTB2dzsKKyAgICBoZWlnaHQ6IDEwcHg7Cit9CisKKyN3MCB7CisgICAgd2lkdGg6IDB2dzsK KyAgICBoZWlnaHQ6IDEwcHg7Cit9Cis8L3N0eWxlPgorPHNjcmlwdD4KK2lmICh3aW5kb3cuaW50 ZXJuYWxzKQorICAgIGludGVybmFscy5lbmFibGVTaXplVG9Db250ZW50QXV0b1NpemVNb2RlKHRy dWUsIDIwMDAsIDYwMCk7CisKK2lmICh3aW5kb3cudGVzdFJ1bm5lcikKKyAgICB0ZXN0UnVubmVy LmR1bXBBc1RleHQoKTsKKzwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+Cis8ZGl2IGlkPXcxMDA+ PC9kaXY+Cis8ZGl2IGlkPXc1MD48L2Rpdj4KKzxkaXYgaWQ9dzEwPjwvZGl2PgorPGRpdiBpZD13 MD48L2Rpdj4KKzxkaXYgc3R5bGU9IndpZHRoOiAzNTBweDsgaGVpZ2h0OiAzNTBweDsgYmFja2dy b3VuZC1jb2xvcjogZ3JlZW47Ij48L2Rpdj4KKzxwcmUgaWQ9cmVzdWx0PjwvcHJlPgorPHNjcmlw dD4KK2RvY3VtZW50LmJvZHkub2Zmc2V0V2lkdGg7CityZXN1bHQudGV4dENvbnRlbnQgPSB3aW5k b3cuZ2V0Q29tcHV0ZWRTdHlsZSh3MTAwLCBudWxsKS5nZXRQcm9wZXJ0eVZhbHVlKCJ3aWR0aCIp ICsgIiAiCisgICAgKyB3aW5kb3cuZ2V0Q29tcHV0ZWRTdHlsZSh3NTAsIG51bGwpLmdldFByb3Bl cnR5VmFsdWUoIndpZHRoIikgKyAiICIKKyAgICArIHdpbmRvdy5nZXRDb21wdXRlZFN0eWxlKHcx MCwgbnVsbCkuZ2V0UHJvcGVydHlWYWx1ZSgid2lkdGgiKSArICIgIiAgCisJKyB3aW5kb3cuZ2V0 Q29tcHV0ZWRTdHlsZSh3MCwgbnVsbCkuZ2V0UHJvcGVydHlWYWx1ZSgid2lkdGgiKTsgIAoraWYg KHdpbmRvdy5pbnRlcm5hbHMpCisgICAgaW50ZXJuYWxzLmVuYWJsZVNpemVUb0NvbnRlbnRBdXRv U2l6ZU1vZGUoZmFsc2UsIDAsIDAsIDAsIDApOworPC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+ CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3MvVGVzdEV4cGVjdGF0aW9ucyBi L0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy9UZXN0RXhwZWN0YXRpb25zCmluZGV4IDk3MjI2YWIw YzI0ZWYwZjM0YjVkM2Q0MTJjN2RmYjI5OGU4NjhhZmEuLjFjNWVjNjE3ZjRiOTY4NTZkMGYxYjYx MDkxNWE1MWQzYWM2MzhlZmQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy9U ZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy9UZXN0RXhwZWN0 YXRpb25zCkBAIC0zMDY0LDYgKzMwNjQsNyBAQCB3ZWJraXQub3JnL2IvMTk4NTQzIGltcG9ydGVk L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy10ZXh0L2xpbmUtYnJlYWsvbGluZQogCiAj IHVuc3VwcG9ydGVkCiBmYXN0L2R5bmFtaWMvbWFpbC1hdXRvc2l6ZS12aWV3cG9ydC11bml0Lmh0 bWwgWyBGYWlsdXJlIF0KK2Zhc3QvZHluYW1pYy9zaXplLXRvLWNvbnRlbnQtYXV0b3NpemUtd2l0 aC12aWV3cG9ydC11bml0cy5odG1sIFsgRmFpbHVyZSBdCiAKICMgTEZDCiBmYXN0L2Jsb2NrL2Jh c2ljL2lubGluZS1jb250ZW50LXdpdGgtZmxvYXRpbmctaW1hZ2UuaHRtbCBbIEZhaWx1cmUgXQo=