159825 2016-07-15 12:29:17 -0700 ScrollView::setHasHorizontalScrollbar / setHasVerticalScrollbar duplicate their logic 2016-07-15 13:21:12 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Local Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 tonikitoo tonikitoo simon.fraser oldest_to_newest 1211522 0 tonikitoo 2016-07-15 12:29:17 -0700 I believe we can introduce a method to avoid this. Patch coming.. 1211523 1 283782 tonikitoo 2016-07-15 12:34:33 -0700 Created attachment 283782 patch v1 1211525 2 283783 tonikitoo 2016-07-15 12:37:08 -0700 Created attachment 283783 Patch 1211531 3 283783 simon.fraser 2016-07-15 13:06:31 -0700 Comment on attachment 283783 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=283783&action=review > Source/WebCore/platform/ScrollView.cpp:121 > + Extra blank line here. 1211535 4 tonikitoo 2016-07-15 13:20:45 -0700 (In reply to comment #3) > Comment on attachment 283783 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=283783&action=review > > > Source/WebCore/platform/ScrollView.cpp:121 > > + > > Extra blank line here. Done. 1211536 5 tonikitoo 2016-07-15 13:21:12 -0700 Committed r203294: <https://trac.webkit.org/r203294>. 283782 2016-07-15 12:34:33 -0700 2016-07-15 12:36:44 -0700 patch v1 0001-ScrollView-setHasHorizontalScrollbar-setHasVerticalS.patch text/plain 6049 tonikitoo RnJvbSBiMzY1MmEwODllZmQ5YTBiN2VhMzBkOTBjNTQ1OTRjN2UyYTQ5OTEzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnRvbmlvIEdvbWVzIDx0b25pa2l0b29Ad2Via2l0Lm9yZz4K RGF0ZTogRnJpLCAxNSBKdWwgMjAxNiAxNTozMDo0NSAtMDQwMApTdWJqZWN0OiBbUEFUQ0hdIFNj cm9sbFZpZXc6OnNldEhhc0hvcml6b250YWxTY3JvbGxiYXIgLwogc2V0SGFzVmVydGljYWxTY3Jv bGxiYXIgZHVwbGljYXRlIHRoZWlyIGxvZ2ljCiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTU5ODI1CgpQYXRjaCBpbnRyb2R1Y2VzIGEgKHByaXZhdGUpIG1ldGhvZCB0 byBTY3JvbGxWaWV3CnRvIHNoYXJlIHRoZSBjb2RlL2xvZ2ljIG9mIHNldEhhc3tIb3Jpem9udGFs LFZlcnRpY2FsfVNjcm9sbGJhci4KClBhdGNoIGJ5IEFudG9uaW8gR29tZXMgPHRvbmlraXRvb0Bp Z2FsaWEuY29tPiBvbiAyMDE2LTA3LTE1ClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKTm8g bmV3IHRlc3RzIG5lZWRlZC4KCiogcGxhdGZvcm0vU2Nyb2xsVmlldy5jcHA6CihXZWJDb3JlOjpT Y3JvbGxWaWV3OjpzZXRIYXNTY3JvbGxiYXJJbnRlcm5hbCk6CihXZWJDb3JlOjpTY3JvbGxWaWV3 OjpzZXRIYXNIb3Jpem9udGFsU2Nyb2xsYmFyKToKKFdlYkNvcmU6OlNjcm9sbFZpZXc6OnNldEhh c1ZlcnRpY2FsU2Nyb2xsYmFyKToKKiBwbGF0Zm9ybS9TY3JvbGxWaWV3Lmg6Ci0tLQogU291cmNl L1dlYkNvcmUvQ2hhbmdlTG9nICAgICAgICAgICAgICAgfCAxOCArKysrKysrKysrKysKIFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuY3BwIHwgNTMgKysrKysrKysrKysrLS0tLS0t LS0tLS0tLS0tLS0tLS0tLQogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5oICAg fCAgMiArKwogMyBmaWxlcyBjaGFuZ2VkLCAzOSBpbnNlcnRpb25zKCspLCAzNCBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKaW5kZXggNzEwYzdjYS4uNGNiZDZhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsx LDIxIEBACisyMDE2LTA3LTE1ICBBbnRvbmlvIEdvbWVzICA8dG9uaWtpdG9vQGlnYWxpYS5jb20+ CisKKyAgICAgICAgU2Nyb2xsVmlldzo6c2V0SGFzSG9yaXpvbnRhbFNjcm9sbGJhciAvIHNldEhh c1ZlcnRpY2FsU2Nyb2xsYmFyIGR1cGxpY2F0ZSB0aGVpciBsb2dpYworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU5ODI1CisKKyAgICAgICAgUGF0Y2gg aW50cm9kdWNlcyBhIChwcml2YXRlKSBtZXRob2QgdG8gU2Nyb2xsVmlldworICAgICAgICB0byBz aGFyZSB0aGUgY29kZS9sb2dpYyBvZiBzZXRIYXN7SG9yaXpvbnRhbCxWZXJ0aWNhbH1TY3JvbGxi YXIuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8g bmV3IHRlc3RzIG5lZWRlZC4KKworICAgICAgICAqIHBsYXRmb3JtL1Njcm9sbFZpZXcuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsVmlldzo6c2V0SGFzU2Nyb2xsYmFySW50ZXJuYWwpOgor ICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsVmlldzo6c2V0SGFzSG9yaXpvbnRhbFNjcm9sbGJhcik6 CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxWaWV3OjpzZXRIYXNWZXJ0aWNhbFNjcm9sbGJhcik6 CisgICAgICAgICogcGxhdGZvcm0vU2Nyb2xsVmlldy5oOgorCiAyMDE2LTA3LTE1ICBSYXdpbmRl ciBTaW5naCAgPHJhd2luZGVyLnNpbmdoLXdlYmtpdEBjaXNyYS5jYW5vbi5jb20uYXU+CiAKICAg ICAgICAgQWRkIGZpbmFsIGtleXdvcmQgdG8gV2ViQ29yZS9zdmcgY2xhc3NlcwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmNwcAppbmRleCA0NWNmZmNhLi5kNDRmODZhIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmNwcApAQCAtODEsMjQgKzgxLDI1IEBAIHZvaWQg U2Nyb2xsVmlldzo6cmVtb3ZlQ2hpbGQoV2lkZ2V0JiBjaGlsZCkKICAgICAgICAgcGxhdGZvcm1S ZW1vdmVDaGlsZCgmY2hpbGQpOwogfQogCi1ib29sIFNjcm9sbFZpZXc6OnNldEhhc0hvcml6b250 YWxTY3JvbGxiYXIoYm9vbCBoYXNCYXIsIGJvb2wqIGNvbnRlbnRTaXplQWZmZWN0ZWQpCitib29s IFNjcm9sbFZpZXc6OnNldEhhc1Njcm9sbGJhckludGVybmFsKFJlZlB0cjxTY3JvbGxiYXI+JiBz Y3JvbGxiYXIsIFNjcm9sbGJhck9yaWVudGF0aW9uIG9yaWVudGF0aW9uLCBib29sIGhhc0Jhciwg Ym9vbCogY29udGVudFNpemVBZmZlY3RlZCkKIHsKICAgICBBU1NFUlQoIWhhc0JhciB8fCAhYXZv aWRTY3JvbGxiYXJDcmVhdGlvbigpKTsKLSAgICBpZiAoaGFzQmFyICYmICFtX2hvcml6b250YWxT Y3JvbGxiYXIpIHsKLSAgICAgICAgbV9ob3Jpem9udGFsU2Nyb2xsYmFyID0gY3JlYXRlU2Nyb2xs YmFyKEhvcml6b250YWxTY3JvbGxiYXIpOwotICAgICAgICBhZGRDaGlsZChtX2hvcml6b250YWxT Y3JvbGxiYXIuZ2V0KCkpOwotICAgICAgICBkaWRBZGRTY3JvbGxiYXIobV9ob3Jpem9udGFsU2Ny b2xsYmFyLmdldCgpLCBIb3Jpem9udGFsU2Nyb2xsYmFyKTsKLSAgICAgICAgbV9ob3Jpem9udGFs U2Nyb2xsYmFyLT5zdHlsZUNoYW5nZWQoKTsKKworICAgIGlmIChoYXNCYXIgJiYgIXNjcm9sbGJh cikgeworICAgICAgICBzY3JvbGxiYXIgPSBjcmVhdGVTY3JvbGxiYXIob3JpZW50YXRpb24pOwor ICAgICAgICBhZGRDaGlsZChzY3JvbGxiYXIuZ2V0KCkpOworICAgICAgICBkaWRBZGRTY3JvbGxi YXIoc2Nyb2xsYmFyLmdldCgpLCBvcmllbnRhdGlvbik7CisgICAgICAgIHNjcm9sbGJhci0+c3R5 bGVDaGFuZ2VkKCk7CiAgICAgICAgIGlmIChjb250ZW50U2l6ZUFmZmVjdGVkKQotICAgICAgICAg ICAgKmNvbnRlbnRTaXplQWZmZWN0ZWQgPSAhbV9ob3Jpem9udGFsU2Nyb2xsYmFyLT5pc092ZXJs YXlTY3JvbGxiYXIoKTsKKyAgICAgICAgICAgICpjb250ZW50U2l6ZUFmZmVjdGVkID0gIXNjcm9s bGJhci0+aXNPdmVybGF5U2Nyb2xsYmFyKCk7CiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0K ICAgICAKLSAgICBpZiAoIWhhc0JhciAmJiBtX2hvcml6b250YWxTY3JvbGxiYXIpIHsKLSAgICAg ICAgYm9vbCB3YXNPdmVybGF5U2Nyb2xsYmFyID0gbV9ob3Jpem9udGFsU2Nyb2xsYmFyLT5pc092 ZXJsYXlTY3JvbGxiYXIoKTsKLSAgICAgICAgd2lsbFJlbW92ZVNjcm9sbGJhcihtX2hvcml6b250 YWxTY3JvbGxiYXIuZ2V0KCksIEhvcml6b250YWxTY3JvbGxiYXIpOwotICAgICAgICByZW1vdmVD aGlsZCgqbV9ob3Jpem9udGFsU2Nyb2xsYmFyKTsKLSAgICAgICAgbV9ob3Jpem9udGFsU2Nyb2xs YmFyID0gbnVsbHB0cjsKKyAgICBpZiAoIWhhc0JhciAmJiBzY3JvbGxiYXIpIHsKKyAgICAgICAg Ym9vbCB3YXNPdmVybGF5U2Nyb2xsYmFyID0gc2Nyb2xsYmFyLT5pc092ZXJsYXlTY3JvbGxiYXIo KTsKKyAgICAgICAgd2lsbFJlbW92ZVNjcm9sbGJhcihzY3JvbGxiYXIuZ2V0KCksIG9yaWVudGF0 aW9uKTsKKyAgICAgICAgcmVtb3ZlQ2hpbGQoKnNjcm9sbGJhcik7CisgICAgICAgIHNjcm9sbGJh ciA9IG51bGxwdHI7CiAgICAgICAgIGlmIChjb250ZW50U2l6ZUFmZmVjdGVkKQogICAgICAgICAg ICAgKmNvbnRlbnRTaXplQWZmZWN0ZWQgPSAhd2FzT3ZlcmxheVNjcm9sbGJhcjsKICAgICAgICAg cmV0dXJuIHRydWU7CkBAIC0xMDcsMzAgKzEwOCwxNCBAQCBib29sIFNjcm9sbFZpZXc6OnNldEhh c0hvcml6b250YWxTY3JvbGxiYXIoYm9vbCBoYXNCYXIsIGJvb2wqIGNvbnRlbnRTaXplQWZmZWN0 ZQogICAgIHJldHVybiBmYWxzZTsKIH0KIAotYm9vbCBTY3JvbGxWaWV3OjpzZXRIYXNWZXJ0aWNh bFNjcm9sbGJhcihib29sIGhhc0JhciwgYm9vbCogY29udGVudFNpemVBZmZlY3RlZCkKK2Jvb2wg U2Nyb2xsVmlldzo6c2V0SGFzSG9yaXpvbnRhbFNjcm9sbGJhcihib29sIGhhc0JhciwgYm9vbCog Y29udGVudFNpemVBZmZlY3RlZCkKIHsKLSAgICBBU1NFUlQoIWhhc0JhciB8fCAhYXZvaWRTY3Jv bGxiYXJDcmVhdGlvbigpKTsKLSAgICBpZiAoaGFzQmFyICYmICFtX3ZlcnRpY2FsU2Nyb2xsYmFy KSB7Ci0gICAgICAgIG1fdmVydGljYWxTY3JvbGxiYXIgPSBjcmVhdGVTY3JvbGxiYXIoVmVydGlj YWxTY3JvbGxiYXIpOwotICAgICAgICBhZGRDaGlsZChtX3ZlcnRpY2FsU2Nyb2xsYmFyLmdldCgp KTsKLSAgICAgICAgZGlkQWRkU2Nyb2xsYmFyKG1fdmVydGljYWxTY3JvbGxiYXIuZ2V0KCksIFZl cnRpY2FsU2Nyb2xsYmFyKTsKLSAgICAgICAgbV92ZXJ0aWNhbFNjcm9sbGJhci0+c3R5bGVDaGFu Z2VkKCk7Ci0gICAgICAgIGlmIChjb250ZW50U2l6ZUFmZmVjdGVkKQotICAgICAgICAgICAgKmNv bnRlbnRTaXplQWZmZWN0ZWQgPSAhbV92ZXJ0aWNhbFNjcm9sbGJhci0+aXNPdmVybGF5U2Nyb2xs YmFyKCk7Ci0gICAgICAgIHJldHVybiB0cnVlOwotICAgIH0KLSAgICAKLSAgICBpZiAoIWhhc0Jh ciAmJiBtX3ZlcnRpY2FsU2Nyb2xsYmFyKSB7Ci0gICAgICAgIGJvb2wgd2FzT3ZlcmxheVNjcm9s bGJhciA9IG1fdmVydGljYWxTY3JvbGxiYXItPmlzT3ZlcmxheVNjcm9sbGJhcigpOwotICAgICAg ICB3aWxsUmVtb3ZlU2Nyb2xsYmFyKG1fdmVydGljYWxTY3JvbGxiYXIuZ2V0KCksIFZlcnRpY2Fs U2Nyb2xsYmFyKTsKLSAgICAgICAgcmVtb3ZlQ2hpbGQoKm1fdmVydGljYWxTY3JvbGxiYXIpOwot ICAgICAgICBtX3ZlcnRpY2FsU2Nyb2xsYmFyID0gbnVsbHB0cjsKLSAgICAgICAgaWYgKGNvbnRl bnRTaXplQWZmZWN0ZWQpCi0gICAgICAgICAgICAqY29udGVudFNpemVBZmZlY3RlZCA9ICF3YXNP dmVybGF5U2Nyb2xsYmFyOwotICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICB9CisgICAgcmV0dXJu IHNldEhhc1Njcm9sbGJhckludGVybmFsKG1faG9yaXpvbnRhbFNjcm9sbGJhciwgSG9yaXpvbnRh bFNjcm9sbGJhciwgaGFzQmFyLCBjb250ZW50U2l6ZUFmZmVjdGVkKTsKK30KIAotICAgIHJldHVy biBmYWxzZTsKK2Jvb2wgU2Nyb2xsVmlldzo6c2V0SGFzVmVydGljYWxTY3JvbGxiYXIoYm9vbCBo YXNCYXIsIGJvb2wqIGNvbnRlbnRTaXplQWZmZWN0ZWQpCit7CisgICAgcmV0dXJuIHNldEhhc1Nj cm9sbGJhckludGVybmFsKG1fdmVydGljYWxTY3JvbGxiYXIsIFZlcnRpY2FsU2Nyb2xsYmFyLCBo YXNCYXIsIGNvbnRlbnRTaXplQWZmZWN0ZWQpOwogfQogCiBQYXNzUmVmUHRyPFNjcm9sbGJhcj4g U2Nyb2xsVmlldzo6Y3JlYXRlU2Nyb2xsYmFyKFNjcm9sbGJhck9yaWVudGF0aW9uIG9yaWVudGF0 aW9uKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5oIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5oCmluZGV4IGRkOWRiM2QuLmU2MDVh YTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmgKQEAgLTQzMSw2ICs0MzEsOCBA QCBwcml2YXRlOgogCiAgICAgdm9pZCBjb21wbGV0ZVVwZGF0ZXNBZnRlclNjcm9sbFRvKGNvbnN0 IEludFNpemUmIHNjcm9sbERlbHRhKTsKIAorICAgIGJvb2wgc2V0SGFzU2Nyb2xsYmFySW50ZXJu YWwoUmVmUHRyPFNjcm9sbGJhcj4mLCBTY3JvbGxiYXJPcmllbnRhdGlvbiwgYm9vbCBoYXNCYXIs IGJvb2wqIGNvbnRlbnRTaXplQWZmZWN0ZWQpOworCiAgICAgUmVmUHRyPFNjcm9sbGJhcj4gbV9o b3Jpem9udGFsU2Nyb2xsYmFyOwogICAgIFJlZlB0cjxTY3JvbGxiYXI+IG1fdmVydGljYWxTY3Jv bGxiYXI7CiAgICAgU2Nyb2xsYmFyTW9kZSBtX2hvcml6b250YWxTY3JvbGxiYXJNb2RlOwotLSAK Mi41LjUKCg== 283783 2016-07-15 12:37:08 -0700 2016-07-15 13:06:31 -0700 Patch bug-159825-20160715153613.patch text/plain 5173 tonikitoo U3VidmVyc2lvbiBSZXZpc2lvbjogMjAzMjc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzEwYzdjYTVhN2JmMmMz Y2IxYTZkYjZiMWQ0NzI1NWI4Njk2MzU3NC4uNGNiZDZhYTgyOWU5ZmExNDI2YjJmODcwODI2MmNk YWFkZTZlNTA1YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE2LTA3LTE1ICBBbnRv bmlvIEdvbWVzICA8dG9uaWtpdG9vQGlnYWxpYS5jb20+CisKKyAgICAgICAgU2Nyb2xsVmlldzo6 c2V0SGFzSG9yaXpvbnRhbFNjcm9sbGJhciAvIHNldEhhc1ZlcnRpY2FsU2Nyb2xsYmFyIGR1cGxp Y2F0ZSB0aGVpciBsb2dpYworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTU5ODI1CisKKyAgICAgICAgUGF0Y2ggaW50cm9kdWNlcyBhIChwcml2YXRlKSBt ZXRob2QgdG8gU2Nyb2xsVmlldworICAgICAgICB0byBzaGFyZSB0aGUgY29kZS9sb2dpYyBvZiBz ZXRIYXN7SG9yaXpvbnRhbCxWZXJ0aWNhbH1TY3JvbGxiYXIuCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIG5lZWRlZC4KKworICAg ICAgICAqIHBsYXRmb3JtL1Njcm9sbFZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xs Vmlldzo6c2V0SGFzU2Nyb2xsYmFySW50ZXJuYWwpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xs Vmlldzo6c2V0SGFzSG9yaXpvbnRhbFNjcm9sbGJhcik6CisgICAgICAgIChXZWJDb3JlOjpTY3Jv bGxWaWV3OjpzZXRIYXNWZXJ0aWNhbFNjcm9sbGJhcik6CisgICAgICAgICogcGxhdGZvcm0vU2Ny b2xsVmlldy5oOgorCiAyMDE2LTA3LTE1ICBSYXdpbmRlciBTaW5naCAgPHJhd2luZGVyLnNpbmdo LXdlYmtpdEBjaXNyYS5jYW5vbi5jb20uYXU+CiAKICAgICAgICAgQWRkIGZpbmFsIGtleXdvcmQg dG8gV2ViQ29yZS9zdmcgY2xhc3NlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vU2Nyb2xsVmlldy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmNw cAppbmRleCA0NWNmZmNhMzA5NGYxMzMwOTAzNzYxMmU3NzlkMDhiMmU0ZDIwOGVjLi40YjI2Yjk1 MDVlNDRmMGRlNGRiYTA4OTI0NTE4MTQzOGFjNmM3ZTYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9TY3JvbGxWaWV3LmNwcApAQCAtODMsNDggKzgzLDMzIEBAIHZvaWQgU2Nyb2xsVmlldzo6cmVt b3ZlQ2hpbGQoV2lkZ2V0JiBjaGlsZCkKIAogYm9vbCBTY3JvbGxWaWV3OjpzZXRIYXNIb3Jpem9u dGFsU2Nyb2xsYmFyKGJvb2wgaGFzQmFyLCBib29sKiBjb250ZW50U2l6ZUFmZmVjdGVkKQogewot ICAgIEFTU0VSVCghaGFzQmFyIHx8ICFhdm9pZFNjcm9sbGJhckNyZWF0aW9uKCkpOwotICAgIGlm IChoYXNCYXIgJiYgIW1faG9yaXpvbnRhbFNjcm9sbGJhcikgewotICAgICAgICBtX2hvcml6b250 YWxTY3JvbGxiYXIgPSBjcmVhdGVTY3JvbGxiYXIoSG9yaXpvbnRhbFNjcm9sbGJhcik7Ci0gICAg ICAgIGFkZENoaWxkKG1faG9yaXpvbnRhbFNjcm9sbGJhci5nZXQoKSk7Ci0gICAgICAgIGRpZEFk ZFNjcm9sbGJhcihtX2hvcml6b250YWxTY3JvbGxiYXIuZ2V0KCksIEhvcml6b250YWxTY3JvbGxi YXIpOwotICAgICAgICBtX2hvcml6b250YWxTY3JvbGxiYXItPnN0eWxlQ2hhbmdlZCgpOwotICAg ICAgICBpZiAoY29udGVudFNpemVBZmZlY3RlZCkKLSAgICAgICAgICAgICpjb250ZW50U2l6ZUFm ZmVjdGVkID0gIW1faG9yaXpvbnRhbFNjcm9sbGJhci0+aXNPdmVybGF5U2Nyb2xsYmFyKCk7Ci0g ICAgICAgIHJldHVybiB0cnVlOwotICAgIH0KLSAgICAKLSAgICBpZiAoIWhhc0JhciAmJiBtX2hv cml6b250YWxTY3JvbGxiYXIpIHsKLSAgICAgICAgYm9vbCB3YXNPdmVybGF5U2Nyb2xsYmFyID0g bV9ob3Jpem9udGFsU2Nyb2xsYmFyLT5pc092ZXJsYXlTY3JvbGxiYXIoKTsKLSAgICAgICAgd2ls bFJlbW92ZVNjcm9sbGJhcihtX2hvcml6b250YWxTY3JvbGxiYXIuZ2V0KCksIEhvcml6b250YWxT Y3JvbGxiYXIpOwotICAgICAgICByZW1vdmVDaGlsZCgqbV9ob3Jpem9udGFsU2Nyb2xsYmFyKTsK LSAgICAgICAgbV9ob3Jpem9udGFsU2Nyb2xsYmFyID0gbnVsbHB0cjsKLSAgICAgICAgaWYgKGNv bnRlbnRTaXplQWZmZWN0ZWQpCi0gICAgICAgICAgICAqY29udGVudFNpemVBZmZlY3RlZCA9ICF3 YXNPdmVybGF5U2Nyb2xsYmFyOwotICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICB9Ci0KLSAgICBy ZXR1cm4gZmFsc2U7CisgICAgcmV0dXJuIHNldEhhc1Njcm9sbGJhckludGVybmFsKG1faG9yaXpv bnRhbFNjcm9sbGJhciwgSG9yaXpvbnRhbFNjcm9sbGJhciwgaGFzQmFyLCBjb250ZW50U2l6ZUFm ZmVjdGVkKTsKIH0KIAogYm9vbCBTY3JvbGxWaWV3OjpzZXRIYXNWZXJ0aWNhbFNjcm9sbGJhcihi b29sIGhhc0JhciwgYm9vbCogY29udGVudFNpemVBZmZlY3RlZCkKIHsKKyAgICByZXR1cm4gc2V0 SGFzU2Nyb2xsYmFySW50ZXJuYWwobV92ZXJ0aWNhbFNjcm9sbGJhciwgVmVydGljYWxTY3JvbGxi YXIsIGhhc0JhciwgY29udGVudFNpemVBZmZlY3RlZCk7Cit9CisKK2Jvb2wgU2Nyb2xsVmlldzo6 c2V0SGFzU2Nyb2xsYmFySW50ZXJuYWwoUmVmUHRyPFNjcm9sbGJhcj4mIHNjcm9sbGJhciwgU2Ny b2xsYmFyT3JpZW50YXRpb24gb3JpZW50YXRpb24sIGJvb2wgaGFzQmFyLCBib29sKiBjb250ZW50 U2l6ZUFmZmVjdGVkKQorewogICAgIEFTU0VSVCghaGFzQmFyIHx8ICFhdm9pZFNjcm9sbGJhckNy ZWF0aW9uKCkpOwotICAgIGlmIChoYXNCYXIgJiYgIW1fdmVydGljYWxTY3JvbGxiYXIpIHsKLSAg ICAgICAgbV92ZXJ0aWNhbFNjcm9sbGJhciA9IGNyZWF0ZVNjcm9sbGJhcihWZXJ0aWNhbFNjcm9s bGJhcik7Ci0gICAgICAgIGFkZENoaWxkKG1fdmVydGljYWxTY3JvbGxiYXIuZ2V0KCkpOwotICAg ICAgICBkaWRBZGRTY3JvbGxiYXIobV92ZXJ0aWNhbFNjcm9sbGJhci5nZXQoKSwgVmVydGljYWxT Y3JvbGxiYXIpOwotICAgICAgICBtX3ZlcnRpY2FsU2Nyb2xsYmFyLT5zdHlsZUNoYW5nZWQoKTsK KworICAgIGlmIChoYXNCYXIgJiYgIXNjcm9sbGJhcikgeworICAgICAgICBzY3JvbGxiYXIgPSBj cmVhdGVTY3JvbGxiYXIob3JpZW50YXRpb24pOworICAgICAgICBhZGRDaGlsZChzY3JvbGxiYXIu Z2V0KCkpOworICAgICAgICBkaWRBZGRTY3JvbGxiYXIoc2Nyb2xsYmFyLmdldCgpLCBvcmllbnRh dGlvbik7CisgICAgICAgIHNjcm9sbGJhci0+c3R5bGVDaGFuZ2VkKCk7CiAgICAgICAgIGlmIChj b250ZW50U2l6ZUFmZmVjdGVkKQotICAgICAgICAgICAgKmNvbnRlbnRTaXplQWZmZWN0ZWQgPSAh bV92ZXJ0aWNhbFNjcm9sbGJhci0+aXNPdmVybGF5U2Nyb2xsYmFyKCk7CisgICAgICAgICAgICAq Y29udGVudFNpemVBZmZlY3RlZCA9ICFzY3JvbGxiYXItPmlzT3ZlcmxheVNjcm9sbGJhcigpOwog ICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CiAgICAgCi0gICAgaWYgKCFoYXNCYXIgJiYgbV92 ZXJ0aWNhbFNjcm9sbGJhcikgewotICAgICAgICBib29sIHdhc092ZXJsYXlTY3JvbGxiYXIgPSBt X3ZlcnRpY2FsU2Nyb2xsYmFyLT5pc092ZXJsYXlTY3JvbGxiYXIoKTsKLSAgICAgICAgd2lsbFJl bW92ZVNjcm9sbGJhcihtX3ZlcnRpY2FsU2Nyb2xsYmFyLmdldCgpLCBWZXJ0aWNhbFNjcm9sbGJh cik7Ci0gICAgICAgIHJlbW92ZUNoaWxkKCptX3ZlcnRpY2FsU2Nyb2xsYmFyKTsKLSAgICAgICAg bV92ZXJ0aWNhbFNjcm9sbGJhciA9IG51bGxwdHI7CisgICAgaWYgKCFoYXNCYXIgJiYgc2Nyb2xs YmFyKSB7CisgICAgICAgIGJvb2wgd2FzT3ZlcmxheVNjcm9sbGJhciA9IHNjcm9sbGJhci0+aXNP dmVybGF5U2Nyb2xsYmFyKCk7CisgICAgICAgIHdpbGxSZW1vdmVTY3JvbGxiYXIoc2Nyb2xsYmFy LmdldCgpLCBvcmllbnRhdGlvbik7CisgICAgICAgIHJlbW92ZUNoaWxkKCpzY3JvbGxiYXIpOwor ICAgICAgICBzY3JvbGxiYXIgPSBudWxscHRyOwogICAgICAgICBpZiAoY29udGVudFNpemVBZmZl Y3RlZCkKICAgICAgICAgICAgICpjb250ZW50U2l6ZUFmZmVjdGVkID0gIXdhc092ZXJsYXlTY3Jv bGxiYXI7CiAgICAgICAgIHJldHVybiB0cnVlOwpAQCAtMTMzLDYgKzExOCw3IEBAIGJvb2wgU2Ny b2xsVmlldzo6c2V0SGFzVmVydGljYWxTY3JvbGxiYXIoYm9vbCBoYXNCYXIsIGJvb2wqIGNvbnRl bnRTaXplQWZmZWN0ZWQpCiAgICAgcmV0dXJuIGZhbHNlOwogfQogCisKIFBhc3NSZWZQdHI8U2Ny b2xsYmFyPiBTY3JvbGxWaWV3OjpjcmVhdGVTY3JvbGxiYXIoU2Nyb2xsYmFyT3JpZW50YXRpb24g b3JpZW50YXRpb24pCiB7CiAgICAgcmV0dXJuIFNjcm9sbGJhcjo6Y3JlYXRlTmF0aXZlU2Nyb2xs YmFyKCp0aGlzLCBvcmllbnRhdGlvbiwgUmVndWxhclNjcm9sbGJhcik7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9TY3JvbGxWaWV3LmgKaW5kZXggZGQ5ZGIzZGFjZjc2NjQwM2M0MTllMjg3ZDU3ZjUwNjE2 YzllZjE0Mi4uZTYwNWFhMGQzYTM0YTAxYzc0ZTYxYWEzYTdlOTZiYzcxMTRhNGRiYyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuaApAQCAtNDMxLDYgKzQzMSw4IEBAIHByaXZhdGU6 CiAKICAgICB2b2lkIGNvbXBsZXRlVXBkYXRlc0FmdGVyU2Nyb2xsVG8oY29uc3QgSW50U2l6ZSYg c2Nyb2xsRGVsdGEpOwogCisgICAgYm9vbCBzZXRIYXNTY3JvbGxiYXJJbnRlcm5hbChSZWZQdHI8 U2Nyb2xsYmFyPiYsIFNjcm9sbGJhck9yaWVudGF0aW9uLCBib29sIGhhc0JhciwgYm9vbCogY29u dGVudFNpemVBZmZlY3RlZCk7CisKICAgICBSZWZQdHI8U2Nyb2xsYmFyPiBtX2hvcml6b250YWxT Y3JvbGxiYXI7CiAgICAgUmVmUHRyPFNjcm9sbGJhcj4gbV92ZXJ0aWNhbFNjcm9sbGJhcjsKICAg ICBTY3JvbGxiYXJNb2RlIG1faG9yaXpvbnRhbFNjcm9sbGJhck1vZGU7Cg==