206999 2020-01-30 08:07:16 -0800 [WPE] Add initial support for rendering scrollbars 2020-02-11 04:42:43 -0800 1 1 1 Unclassified WebKit WPE WebKit WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=207536 P2 Normal --- 1 cgarcia webkit-unassigned bugs-noreply mcatanzaro oldest_to_newest 1612956 0 cgarcia 2020-01-30 08:07:16 -0800 For now I've used a style similar to Adwaita, but we can just change it. 1612959 1 389250 cgarcia 2020-01-30 08:10:42 -0800 Created attachment 389250 Patch 1613929 2 389505 cgarcia 2020-02-03 07:21:47 -0800 Created attachment 389505 Patch 1617307 3 cgarcia 2020-02-11 01:35:31 -0800 Committed r256298: <https://trac.webkit.org/changeset/256298> 389250 2020-01-30 08:10:42 -0800 2020-02-03 07:21:47 -0800 Patch wpe-scrollbars.diff text/plain 8275 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4MWZjMjk4ZjNmZi4uMzliN2RiMThiYzIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNSBAQAorMjAyMC0wMS0zMCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGln YWxpYS5jb20+CisKKyAgICAgICAgW1dQRV0gQWRkIGluaXRpYWwgc3VwcG9ydCBmb3IgcmVuZGVy aW5nIHNjcm9sbGJhcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIwNjk5OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFNob3cgb3ZlcmxheSBzY3JvbGxiYXJzIHdpdGggYSBzdHlsZSBzaW1pbGFyIHRvIEFk d2FpdGEuCisKKyAgICAgICAgKiBTb3VyY2VzV1BFLnR4dDogQWRkIFNjcm9sbEFuaW1hdG9yR2Vu ZXJpYy5jcHAgdG8gdGhlIGJ1aWxkLgorICAgICAgICAqIHBsYXRmb3JtL1Njcm9sbEFuaW1hdG9y LmNwcDogU3dpdGNoIHRvIHVzZSBTY3JvbGxBbmltYXRvckdlbmVyaWMsIHJlcXVpcmVkIHRvIHNo b3cvaGlkZSB0aGUgb3ZlcmxheSBzY3JvbGxiYXJzLgorICAgICAgICAqIHBsYXRmb3JtL3dwZS9T Y3JvbGxiYXJUaGVtZVdQRS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxiYXJUaGVtZVdQ RTo6c2Nyb2xsYmFyVGhpY2tuZXNzKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGJhclRoZW1l V1BFOjptaW5pbXVtVGh1bWJMZW5ndGgpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsYmFyVGhl bWVXUEU6Omhhc0J1dHRvbnMpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsYmFyVGhlbWVXUEU6 Omhhc1RodW1iKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGJhclRoZW1lV1BFOjpiYWNrQnV0 dG9uUmVjdCk6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxiYXJUaGVtZVdQRTo6Zm9yd2FyZEJ1 dHRvblJlY3QpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsYmFyVGhlbWVXUEU6OnRyYWNrUmVj dCk6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxiYXJUaGVtZVdQRTo6cGFpbnQpOgorICAgICAg ICAqIHBsYXRmb3JtL3dwZS9TY3JvbGxiYXJUaGVtZVdQRS5oOgorCiAyMDIwLTAxLTI5ICBGdWpp aSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgogCiAgICAgICAgIFtNU1ZDXSBB ZGQgL2V4cGVyaW1lbnRhbDpuZXdMYW1iZGFQcm9jZXNzb3Igc3dpdGNoIGZvciBiZXR0ZXIgQysr IGNvbmZvcm1hbmNlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Tb3VyY2VzV1BFLnR4dCBi L1NvdXJjZS9XZWJDb3JlL1NvdXJjZXNXUEUudHh0CmluZGV4IGI1Yzg5MTUwODg3Li45N2VjZGFj NDkyMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvU291cmNlc1dQRS50eHQKKysrIGIvU291 cmNlL1dlYkNvcmUvU291cmNlc1dQRS50eHQKQEAgLTU5LDggKzU5LDExIEBAIHBhZ2Uvc2Nyb2xs aW5nL25pY29zaWEvU2Nyb2xsaW5nVHJlZVN0aWNreU5vZGUuY3BwCiAKIHBhZ2Uvc2Nyb2xsaW5n L2dlbmVyaWMvU2Nyb2xsaW5nVGhyZWFkR2VuZXJpYy5jcHAKIAorcGxhdGZvcm0vU2Nyb2xsQW5p bWF0aW9uS2luZXRpYy5jcHAKIHBsYXRmb3JtL1VzZXJBZ2VudFF1aXJrcy5jcHAKIAorcGxhdGZv cm0vZ2VuZXJpYy9TY3JvbGxBbmltYXRvckdlbmVyaWMuY3BwCisKIHBsYXRmb3JtL2dyYXBoaWNz L0dMQ29udGV4dC5jcHAKIHBsYXRmb3JtL2dyYXBoaWNzL1BsYXRmb3JtRGlzcGxheS5jcHAKIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsQW5pbWF0b3IuY3BwIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsQW5pbWF0b3IuY3BwCmluZGV4IGE2MTE4Njgz N2RhLi45ODk3YjA2ZjI1YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Ny b2xsQW5pbWF0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbEFuaW1h dG9yLmNwcApAQCAtNDAsNyArNDAsNyBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLSNpZiAh RU5BQkxFKFNNT09USF9TQ1JPTExJTkcpICYmICFQTEFURk9STShJT1NfRkFNSUxZKSAmJiAhUExB VEZPUk0oTUFDKQorI2lmICFFTkFCTEUoU01PT1RIX1NDUk9MTElORykgJiYgIVBMQVRGT1JNKElP U19GQU1JTFkpICYmICFQTEFURk9STShNQUMpICYmICFQTEFURk9STShXUEUpCiBzdGQ6OnVuaXF1 ZV9wdHI8U2Nyb2xsQW5pbWF0b3I+IFNjcm9sbEFuaW1hdG9yOjpjcmVhdGUoU2Nyb2xsYWJsZUFy ZWEmIHNjcm9sbGFibGVBcmVhKQogewogICAgIHJldHVybiBtYWtlVW5pcXVlPFNjcm9sbEFuaW1h dG9yPihzY3JvbGxhYmxlQXJlYSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS93cGUvU2Nyb2xsYmFyVGhlbWVXUEUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vd3Bl L1Njcm9sbGJhclRoZW1lV1BFLmNwcAppbmRleCAwZjlmZTVkNGQ4NC4uYzE5MWY1ZDk3ZmIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dwZS9TY3JvbGxiYXJUaGVtZVdQRS5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vd3BlL1Njcm9sbGJhclRoZW1lV1BFLmNw cApAQCAtMjYsMzggKzI2LDEzNiBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIlNj cm9sbGJhclRoZW1lV1BFLmgiCiAKLSNpbmNsdWRlICJOb3RJbXBsZW1lbnRlZC5oIgorI2luY2x1 ZGUgIkNvbG9yLmgiCisjaW5jbHVkZSAiRmxvYXRSb3VuZGVkUmVjdC5oIgorI2luY2x1ZGUgIkdy YXBoaWNzQ29udGV4dC5oIgorI2luY2x1ZGUgIlNjcm9sbGJhci5oIgogCiBuYW1lc3BhY2UgV2Vi Q29yZSB7CiAKK3N0YXRpYyBjb25zdCB1bnNpZ25lZCBzY3JvbGxiYXJTaXplID0gMTI7CitzdGF0 aWMgY29uc3QgdW5zaWduZWQgdGh1bWJCb3JkZXJTaXplID0gMTsKK3N0YXRpYyBjb25zdCB1bnNp Z25lZCBvdmVybGF5VGh1bWJTaXplID0gNTsKK3N0YXRpYyBjb25zdCB1bnNpZ25lZCB0aHVtYlNp emUgPSA2Oworc3RhdGljIGNvbnN0IENvbG9yIHNjcm9sbGJhckJhY2tncm91bmRDb2xvciA9IG1h a2VSR0IoMjA2LCAyMDYsIDIwNik7CitzdGF0aWMgY29uc3QgQ29sb3Igb3ZlcmxheVRodW1iQm9y ZGVyQ29sb3IgPSBtYWtlUkdCQSgyNTUsIDI1NSwgMjU1LCAxMDApOworc3RhdGljIGNvbnN0IENv bG9yIG92ZXJsYXlUaHVtYkNvbG9yID0gbWFrZVJHQkEoNDYsIDUyLCA1NCwgMTAwKTsKK3N0YXRp YyBjb25zdCBDb2xvciB0aHVtYkhvdmVyZWRDb2xvciA9IG1ha2VSR0IoODYsIDkxLCA5Mik7Citz dGF0aWMgY29uc3QgQ29sb3IgdGh1bWJQcmVzc2VkQ29sb3IgPSBtYWtlUkdCKDI3LCAxMDYsIDIw Myk7CitzdGF0aWMgY29uc3QgQ29sb3IgdGh1bWJDb2xvciA9IG1ha2VSR0IoMTI2LCAxMjksIDEz MCk7CisKK2ludCBTY3JvbGxiYXJUaGVtZVdQRTo6c2Nyb2xsYmFyVGhpY2tuZXNzKFNjcm9sbGJh ckNvbnRyb2xTaXplLCBTY3JvbGxiYXJFeHBhbnNpb25TdGF0ZSkKK3sKKyAgICByZXR1cm4gc2Ny b2xsYmFyU2l6ZTsKK30KKworaW50IFNjcm9sbGJhclRoZW1lV1BFOjptaW5pbXVtVGh1bWJMZW5n dGgoU2Nyb2xsYmFyJiBzY3JvbGxiYXIpCit7CisgICAgcmV0dXJuIDA7Cit9CisKIGJvb2wgU2Ny b2xsYmFyVGhlbWVXUEU6Omhhc0J1dHRvbnMoU2Nyb2xsYmFyJikKIHsKLSAgICBub3RJbXBsZW1l bnRlZCgpOwotICAgIHJldHVybiB0cnVlOworICAgIHJldHVybiBmYWxzZTsKIH0KIAotYm9vbCBT Y3JvbGxiYXJUaGVtZVdQRTo6aGFzVGh1bWIoU2Nyb2xsYmFyJikKK2Jvb2wgU2Nyb2xsYmFyVGhl bWVXUEU6Omhhc1RodW1iKFNjcm9sbGJhciYgc2Nyb2xsYmFyKQogewotICAgIG5vdEltcGxlbWVu dGVkKCk7Ci0gICAgcmV0dXJuIHRydWU7CisgICAgcmV0dXJuIHRodW1iTGVuZ3RoKHNjcm9sbGJh cikgPiAwOwogfQogCiBJbnRSZWN0IFNjcm9sbGJhclRoZW1lV1BFOjpiYWNrQnV0dG9uUmVjdChT Y3JvbGxiYXImLCBTY3JvbGxiYXJQYXJ0LCBib29sKQogewotICAgIG5vdEltcGxlbWVudGVkKCk7 Ci0gICAgcmV0dXJuIEludFJlY3QoKTsKKyAgICByZXR1cm4geyB9OwogfQogCiBJbnRSZWN0IFNj cm9sbGJhclRoZW1lV1BFOjpmb3J3YXJkQnV0dG9uUmVjdChTY3JvbGxiYXImLCBTY3JvbGxiYXJQ YXJ0LCBib29sKQogewotICAgIG5vdEltcGxlbWVudGVkKCk7Ci0gICAgcmV0dXJuIEludFJlY3Qo KTsKKyAgICByZXR1cm4geyB9OworfQorCitJbnRSZWN0IFNjcm9sbGJhclRoZW1lV1BFOjp0cmFj a1JlY3QoU2Nyb2xsYmFyJiBzY3JvbGxiYXIsIGJvb2wpCit7CisgICAgcmV0dXJuIHNjcm9sbGJh ci5mcmFtZVJlY3QoKTsKIH0KIAotSW50UmVjdCBTY3JvbGxiYXJUaGVtZVdQRTo6dHJhY2tSZWN0 KFNjcm9sbGJhciYsIGJvb2wpCitib29sIFNjcm9sbGJhclRoZW1lV1BFOjpwYWludChTY3JvbGxi YXImIHNjcm9sbGJhciwgR3JhcGhpY3NDb250ZXh0JiBncmFwaGljc0NvbnRleHQsIGNvbnN0IElu dFJlY3QmIGRhbWFnZVJlY3QpCiB7Ci0gICAgbm90SW1wbGVtZW50ZWQoKTsKLSAgICByZXR1cm4g SW50UmVjdCgpOworICAgIGlmIChncmFwaGljc0NvbnRleHQucGFpbnRpbmdEaXNhYmxlZCgpKQor ICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBpZiAoIXNjcm9sbGJhci5lbmFibGVkKCkpCisg ICAgICAgIHJldHVybiB0cnVlOworCisgICAgSW50UmVjdCByZWN0ID0gc2Nyb2xsYmFyLmZyYW1l UmVjdCgpOworICAgIGlmICghcmVjdC5pbnRlcnNlY3RzKGRhbWFnZVJlY3QpKQorICAgICAgICBy ZXR1cm4gdHJ1ZTsKKworICAgIGRvdWJsZSBvcGFjaXR5ID0gc2Nyb2xsYmFyLmhvdmVyZWRQYXJ0 KCkgPT0gTm9QYXJ0ID8gc2Nyb2xsYmFyLm9wYWNpdHkoKSA6IDE7CisgICAgaWYgKCFvcGFjaXR5 KQorICAgICAgICByZXR1cm4gdHJ1ZTsKKworICAgIEdyYXBoaWNzQ29udGV4dFN0YXRlU2F2ZXIg c3RhdGVTYXZlcihncmFwaGljc0NvbnRleHQpOworICAgIGlmIChvcGFjaXR5ICE9IDEpIHsKKyAg ICAgICAgZ3JhcGhpY3NDb250ZXh0LmNsaXAoZGFtYWdlUmVjdCk7CisgICAgICAgIGdyYXBoaWNz Q29udGV4dC5iZWdpblRyYW5zcGFyZW5jeUxheWVyKG9wYWNpdHkpOworICAgIH0KKworICAgIGlm IChzY3JvbGxiYXIuaG92ZXJlZFBhcnQoKSAhPSBOb1BhcnQpCisgICAgICAgIGdyYXBoaWNzQ29u dGV4dC5maWxsUmVjdChyZWN0LCBzY3JvbGxiYXJCYWNrZ3JvdW5kQ29sb3IpOworCisgICAgaW50 IHRodW1iUG9zID0gdGh1bWJQb3NpdGlvbihzY3JvbGxiYXIpOworICAgIGludCB0aHVtYkxlbiA9 IHRodW1iTGVuZ3RoKHNjcm9sbGJhcik7CisgICAgSW50UmVjdCB0aHVtYiA9IHJlY3Q7CisgICAg aWYgKHNjcm9sbGJhci5ob3ZlcmVkUGFydCgpID09IE5vUGFydCkgeworICAgICAgICBpZiAoc2Ny b2xsYmFyLm9yaWVudGF0aW9uKCkgPT0gVmVydGljYWxTY3JvbGxiYXIpIHsKKyAgICAgICAgICAg IHRodW1iLm1vdmUoc2Nyb2xsYmFyU2l6ZSAtIChvdmVybGF5VGh1bWJTaXplICsgdGh1bWJCb3Jk ZXJTaXplKSwgdGh1bWJQb3MgKyB0aHVtYkJvcmRlclNpemUpOworICAgICAgICAgICAgdGh1bWIu c2V0V2lkdGgob3ZlcmxheVRodW1iU2l6ZSk7CisgICAgICAgICAgICB0aHVtYi5zZXRIZWlnaHQo dGh1bWJMZW4gLSB0aHVtYkJvcmRlclNpemUgKiAyKTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAg ICAgICAgIHRodW1iLm1vdmUodGh1bWJQb3MgKyB0aHVtYkJvcmRlclNpemUsIHNjcm9sbGJhclNp emUgLSA2KTsKKyAgICAgICAgICAgIHRodW1iLnNldFdpZHRoKHRodW1iTGVuIC0gdGh1bWJCb3Jk ZXJTaXplICogMik7CisgICAgICAgICAgICB0aHVtYi5zZXRIZWlnaHQob3ZlcmxheVRodW1iU2l6 ZSk7CisgICAgICAgIH0KKyAgICB9IGVsc2UgeworICAgICAgICBpZiAoc2Nyb2xsYmFyLm9yaWVu dGF0aW9uKCkgPT0gVmVydGljYWxTY3JvbGxiYXIpIHsKKyAgICAgICAgICAgIHRodW1iLm1vdmUo c2Nyb2xsYmFyU2l6ZSAtIChzY3JvbGxiYXJTaXplIC8gMiArIHRodW1iU2l6ZSAvIDIpLCB0aHVt YlBvcyArIHRodW1iQm9yZGVyU2l6ZSk7CisgICAgICAgICAgICB0aHVtYi5zZXRXaWR0aCh0aHVt YlNpemUpOworICAgICAgICAgICAgdGh1bWIuc2V0SGVpZ2h0KHRodW1iTGVuIC0gdGh1bWJCb3Jk ZXJTaXplICogMik7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICB0aHVtYi5tb3ZlKHRo dW1iUG9zICsgdGh1bWJCb3JkZXJTaXplLCBzY3JvbGxiYXJTaXplIC0gKHNjcm9sbGJhclNpemUg LyAyICsgdGh1bWJTaXplIC8gMikpOworICAgICAgICAgICAgdGh1bWIuc2V0V2lkdGgodGh1bWJM ZW4gLSB0aHVtYkJvcmRlclNpemUgKiAyKTsKKyAgICAgICAgICAgIHRodW1iLnNldEhlaWdodCh0 aHVtYlNpemUpOworICAgICAgICB9CisgICAgfQorCisgICAgRmxvYXRTaXplIGNvcm5lcigyLCAy KTsKKyAgICBQYXRoIHBhdGg7CisgICAgaWYgKHNjcm9sbGJhci5ob3ZlcmVkUGFydCgpID09IE5v UGFydCkgeworICAgICAgICBwYXRoLmFkZFJvdW5kZWRSZWN0KHRodW1iLCBjb3JuZXIpOworICAg ICAgICB0aHVtYi5pbmZsYXRlKC0xKTsKKyAgICAgICAgcGF0aC5hZGRSb3VuZGVkUmVjdCh0aHVt YiwgY29ybmVyKTsKKyAgICAgICAgZ3JhcGhpY3NDb250ZXh0LnNldEZpbGxSdWxlKFdpbmRSdWxl OjpFdmVuT2RkKTsKKyAgICAgICAgZ3JhcGhpY3NDb250ZXh0LnNldEZpbGxDb2xvcihvdmVybGF5 VGh1bWJCb3JkZXJDb2xvcik7CisgICAgICAgIGdyYXBoaWNzQ29udGV4dC5maWxsUGF0aChwYXRo KTsKKyAgICAgICAgcGF0aC5jbGVhcigpOworICAgIH0KKyAgICBwYXRoLmFkZFJvdW5kZWRSZWN0 KHRodW1iLCBjb3JuZXIpOworICAgIGdyYXBoaWNzQ29udGV4dC5zZXRGaWxsUnVsZShXaW5kUnVs ZTo6Tm9uWmVybyk7CisgICAgaWYgKHNjcm9sbGJhci5ob3ZlcmVkUGFydCgpID09IE5vUGFydCkK KyAgICAgICAgZ3JhcGhpY3NDb250ZXh0LnNldEZpbGxDb2xvcihvdmVybGF5VGh1bWJDb2xvcik7 CisgICAgZWxzZSBpZiAoc2Nyb2xsYmFyLnByZXNzZWRQYXJ0KCkgPT0gVGh1bWJQYXJ0KQorICAg ICAgICBncmFwaGljc0NvbnRleHQuc2V0RmlsbENvbG9yKHRodW1iUHJlc3NlZENvbG9yKTsKKyAg ICBlbHNlIGlmIChzY3JvbGxiYXIuaG92ZXJlZFBhcnQoKSA9PSBUaHVtYlBhcnQpCisgICAgICAg IGdyYXBoaWNzQ29udGV4dC5zZXRGaWxsQ29sb3IodGh1bWJIb3ZlcmVkQ29sb3IpOworICAgIGVs c2UKKyAgICAgICAgZ3JhcGhpY3NDb250ZXh0LnNldEZpbGxDb2xvcih0aHVtYkNvbG9yKTsKKyAg ICBncmFwaGljc0NvbnRleHQuZmlsbFBhdGgocGF0aCk7CisKKyAgICBpZiAob3BhY2l0eSAhPSAx KQorICAgICAgICBncmFwaGljc0NvbnRleHQuZW5kVHJhbnNwYXJlbmN5TGF5ZXIoKTsKKworICAg IHJldHVybiB0cnVlOwogfQogCiBTY3JvbGxiYXJUaGVtZSYgU2Nyb2xsYmFyVGhlbWU6Om5hdGl2 ZVRoZW1lKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dwZS9TY3JvbGxi YXJUaGVtZVdQRS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vd3BlL1Njcm9sbGJhclRoZW1l V1BFLmgKaW5kZXggNjcxODVhZGEyOWQuLjA0MTdjMTVmMmY2IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS93cGUvU2Nyb2xsYmFyVGhlbWVXUEUuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS93cGUvU2Nyb2xsYmFyVGhlbWVXUEUuaApAQCAtMzQsNiArMzQsMTQgQEAg cHVibGljOgogICAgIFNjcm9sbGJhclRoZW1lV1BFKCkgPSBkZWZhdWx0OwogICAgIHZpcnR1YWwg flNjcm9sbGJhclRoZW1lV1BFKCkgPSBkZWZhdWx0OwogCitwcml2YXRlOgorICAgIGJvb2wgdXNl c092ZXJsYXlTY3JvbGxiYXJzKCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gdHJ1ZTsgfQorCisg ICAgYm9vbCBwYWludChTY3JvbGxiYXImLCBHcmFwaGljc0NvbnRleHQmLCBjb25zdCBJbnRSZWN0 Jikgb3ZlcnJpZGU7CisKKyAgICBpbnQgc2Nyb2xsYmFyVGhpY2tuZXNzKFNjcm9sbGJhckNvbnRy b2xTaXplLCBTY3JvbGxiYXJFeHBhbnNpb25TdGF0ZSkgb3ZlcnJpZGU7CisgICAgaW50IG1pbmlt dW1UaHVtYkxlbmd0aChTY3JvbGxiYXImKSBvdmVycmlkZTsKKwogICAgIGJvb2wgaGFzQnV0dG9u cyhTY3JvbGxiYXImKSBvdmVycmlkZTsKICAgICBib29sIGhhc1RodW1iKFNjcm9sbGJhciYpIG92 ZXJyaWRlOwogCg== 389505 2020-02-03 07:21:47 -0800 2020-02-04 04:15:13 -0800 Patch wpe-scrollbars.diff text/plain 9867 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4MWZjMjk4ZjNmZi4uMzliN2RiMThiYzIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNSBAQAorMjAyMC0wMS0zMCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGln YWxpYS5jb20+CisKKyAgICAgICAgW1dQRV0gQWRkIGluaXRpYWwgc3VwcG9ydCBmb3IgcmVuZGVy aW5nIHNjcm9sbGJhcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIwNjk5OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFNob3cgb3ZlcmxheSBzY3JvbGxiYXJzIHdpdGggYSBzdHlsZSBzaW1pbGFyIHRvIEFk d2FpdGEuCisKKyAgICAgICAgKiBTb3VyY2VzV1BFLnR4dDogQWRkIFNjcm9sbEFuaW1hdG9yR2Vu ZXJpYy5jcHAgdG8gdGhlIGJ1aWxkLgorICAgICAgICAqIHBsYXRmb3JtL1Njcm9sbEFuaW1hdG9y LmNwcDogU3dpdGNoIHRvIHVzZSBTY3JvbGxBbmltYXRvckdlbmVyaWMsIHJlcXVpcmVkIHRvIHNo b3cvaGlkZSB0aGUgb3ZlcmxheSBzY3JvbGxiYXJzLgorICAgICAgICAqIHBsYXRmb3JtL3dwZS9T Y3JvbGxiYXJUaGVtZVdQRS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxiYXJUaGVtZVdQ RTo6c2Nyb2xsYmFyVGhpY2tuZXNzKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGJhclRoZW1l V1BFOjptaW5pbXVtVGh1bWJMZW5ndGgpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsYmFyVGhl bWVXUEU6Omhhc0J1dHRvbnMpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsYmFyVGhlbWVXUEU6 Omhhc1RodW1iKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGJhclRoZW1lV1BFOjpiYWNrQnV0 dG9uUmVjdCk6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxiYXJUaGVtZVdQRTo6Zm9yd2FyZEJ1 dHRvblJlY3QpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsYmFyVGhlbWVXUEU6OnRyYWNrUmVj dCk6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxiYXJUaGVtZVdQRTo6cGFpbnQpOgorICAgICAg ICAqIHBsYXRmb3JtL3dwZS9TY3JvbGxiYXJUaGVtZVdQRS5oOgorCiAyMDIwLTAxLTI5ICBGdWpp aSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgogCiAgICAgICAgIFtNU1ZDXSBB ZGQgL2V4cGVyaW1lbnRhbDpuZXdMYW1iZGFQcm9jZXNzb3Igc3dpdGNoIGZvciBiZXR0ZXIgQysr IGNvbmZvcm1hbmNlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Tb3VyY2VzV1BFLnR4dCBi L1NvdXJjZS9XZWJDb3JlL1NvdXJjZXNXUEUudHh0CmluZGV4IGI1Yzg5MTUwODg3Li45N2VjZGFj NDkyMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvU291cmNlc1dQRS50eHQKKysrIGIvU291 cmNlL1dlYkNvcmUvU291cmNlc1dQRS50eHQKQEAgLTU5LDggKzU5LDExIEBAIHBhZ2Uvc2Nyb2xs aW5nL25pY29zaWEvU2Nyb2xsaW5nVHJlZVN0aWNreU5vZGUuY3BwCiAKIHBhZ2Uvc2Nyb2xsaW5n L2dlbmVyaWMvU2Nyb2xsaW5nVGhyZWFkR2VuZXJpYy5jcHAKIAorcGxhdGZvcm0vU2Nyb2xsQW5p bWF0aW9uS2luZXRpYy5jcHAKIHBsYXRmb3JtL1VzZXJBZ2VudFF1aXJrcy5jcHAKIAorcGxhdGZv cm0vZ2VuZXJpYy9TY3JvbGxBbmltYXRvckdlbmVyaWMuY3BwCisKIHBsYXRmb3JtL2dyYXBoaWNz L0dMQ29udGV4dC5jcHAKIHBsYXRmb3JtL2dyYXBoaWNzL1BsYXRmb3JtRGlzcGxheS5jcHAKIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsQW5pbWF0b3IuY3BwIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsQW5pbWF0b3IuY3BwCmluZGV4IGE2MTE4Njgz N2RhLi45ODk3YjA2ZjI1YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Ny b2xsQW5pbWF0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbEFuaW1h dG9yLmNwcApAQCAtNDAsNyArNDAsNyBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLSNpZiAh RU5BQkxFKFNNT09USF9TQ1JPTExJTkcpICYmICFQTEFURk9STShJT1NfRkFNSUxZKSAmJiAhUExB VEZPUk0oTUFDKQorI2lmICFFTkFCTEUoU01PT1RIX1NDUk9MTElORykgJiYgIVBMQVRGT1JNKElP U19GQU1JTFkpICYmICFQTEFURk9STShNQUMpICYmICFQTEFURk9STShXUEUpCiBzdGQ6OnVuaXF1 ZV9wdHI8U2Nyb2xsQW5pbWF0b3I+IFNjcm9sbEFuaW1hdG9yOjpjcmVhdGUoU2Nyb2xsYWJsZUFy ZWEmIHNjcm9sbGFibGVBcmVhKQogewogICAgIHJldHVybiBtYWtlVW5pcXVlPFNjcm9sbEFuaW1h dG9yPihzY3JvbGxhYmxlQXJlYSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS93cGUvU2Nyb2xsYmFyVGhlbWVXUEUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vd3Bl L1Njcm9sbGJhclRoZW1lV1BFLmNwcAppbmRleCAwZjlmZTVkNGQ4NC4uNDFkNmE1Y2JhNzYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dwZS9TY3JvbGxiYXJUaGVtZVdQRS5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vd3BlL1Njcm9sbGJhclRoZW1lV1BFLmNw cApAQCAtMjYsMzggKzI2LDE3NCBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIlNj cm9sbGJhclRoZW1lV1BFLmgiCiAKLSNpbmNsdWRlICJOb3RJbXBsZW1lbnRlZC5oIgorI2luY2x1 ZGUgIkNvbG9yLmgiCisjaW5jbHVkZSAiRmxvYXRSb3VuZGVkUmVjdC5oIgorI2luY2x1ZGUgIkdy YXBoaWNzQ29udGV4dC5oIgorI2luY2x1ZGUgIlBsYXRmb3JtTW91c2VFdmVudC5oIgorI2luY2x1 ZGUgIlNjcm9sbGJhci5oIgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKK3N0YXRpYyBjb25zdCB1 bnNpZ25lZCBzY3JvbGxiYXJTaXplID0gMTM7CitzdGF0aWMgY29uc3QgdW5zaWduZWQgaG92ZXJl ZFNjcm9sbGJhckJvcmRlclNpemUgPSAxOworc3RhdGljIGNvbnN0IHVuc2lnbmVkIHRodW1iQm9y ZGVyU2l6ZSA9IDE7CitzdGF0aWMgY29uc3QgdW5zaWduZWQgb3ZlcmxheVRodW1iU2l6ZSA9IDU7 CitzdGF0aWMgY29uc3QgdW5zaWduZWQgdGh1bWJTaXplID0gNjsKK3N0YXRpYyBjb25zdCBkb3Vi bGUgc2Nyb2xsYmFyT3BhY2l0eSA9IDAuODsKK3N0YXRpYyBjb25zdCBDb2xvciBzY3JvbGxiYXJC YWNrZ3JvdW5kQ29sb3IgPSBtYWtlUkdCKDI1MiwgMjUyLCAyNTIpOworc3RhdGljIGNvbnN0IENv bG9yIHNjcm9sbGJhckJvcmRlckNvbG9yID0gbWFrZVJHQigyMjAsIDIyMywgMjI3KTsKK3N0YXRp YyBjb25zdCBDb2xvciBvdmVybGF5VGh1bWJCb3JkZXJDb2xvciA9IG1ha2VSR0JBKDI1NSwgMjU1 LCAyNTUsIDEwMCk7CitzdGF0aWMgY29uc3QgQ29sb3Igb3ZlcmxheVRodW1iQ29sb3IgPSBtYWtl UkdCQSg0NiwgNTIsIDU0LCAxMDApOworc3RhdGljIGNvbnN0IENvbG9yIHRodW1iSG92ZXJlZENv bG9yID0gbWFrZVJHQig4NiwgOTEsIDkyKTsKK3N0YXRpYyBjb25zdCBDb2xvciB0aHVtYlByZXNz ZWRDb2xvciA9IG1ha2VSR0IoMjcsIDEwNiwgMjAzKTsKK3N0YXRpYyBjb25zdCBDb2xvciB0aHVt YkNvbG9yID0gbWFrZVJHQigxMjYsIDEyOSwgMTMwKTsKKworaW50IFNjcm9sbGJhclRoZW1lV1BF OjpzY3JvbGxiYXJUaGlja25lc3MoU2Nyb2xsYmFyQ29udHJvbFNpemUsIFNjcm9sbGJhckV4cGFu c2lvblN0YXRlKQoreworICAgIHJldHVybiBzY3JvbGxiYXJTaXplOworfQorCitpbnQgU2Nyb2xs YmFyVGhlbWVXUEU6Om1pbmltdW1UaHVtYkxlbmd0aChTY3JvbGxiYXImKQoreworICAgIHJldHVy biAwOworfQorCiBib29sIFNjcm9sbGJhclRoZW1lV1BFOjpoYXNCdXR0b25zKFNjcm9sbGJhciYp CiB7Ci0gICAgbm90SW1wbGVtZW50ZWQoKTsKLSAgICByZXR1cm4gdHJ1ZTsKKyAgICByZXR1cm4g ZmFsc2U7CiB9CiAKLWJvb2wgU2Nyb2xsYmFyVGhlbWVXUEU6Omhhc1RodW1iKFNjcm9sbGJhciYp Citib29sIFNjcm9sbGJhclRoZW1lV1BFOjpoYXNUaHVtYihTY3JvbGxiYXImIHNjcm9sbGJhcikK IHsKLSAgICBub3RJbXBsZW1lbnRlZCgpOwotICAgIHJldHVybiB0cnVlOworICAgIHJldHVybiB0 aHVtYkxlbmd0aChzY3JvbGxiYXIpID4gMDsKIH0KIAogSW50UmVjdCBTY3JvbGxiYXJUaGVtZVdQ RTo6YmFja0J1dHRvblJlY3QoU2Nyb2xsYmFyJiwgU2Nyb2xsYmFyUGFydCwgYm9vbCkKIHsKLSAg ICBub3RJbXBsZW1lbnRlZCgpOwotICAgIHJldHVybiBJbnRSZWN0KCk7CisgICAgcmV0dXJuIHsg fTsKIH0KIAogSW50UmVjdCBTY3JvbGxiYXJUaGVtZVdQRTo6Zm9yd2FyZEJ1dHRvblJlY3QoU2Ny b2xsYmFyJiwgU2Nyb2xsYmFyUGFydCwgYm9vbCkKIHsKLSAgICBub3RJbXBsZW1lbnRlZCgpOwot ICAgIHJldHVybiBJbnRSZWN0KCk7CisgICAgcmV0dXJuIHsgfTsKK30KKworSW50UmVjdCBTY3Jv bGxiYXJUaGVtZVdQRTo6dHJhY2tSZWN0KFNjcm9sbGJhciYgc2Nyb2xsYmFyLCBib29sKQorewor ICAgIHJldHVybiBzY3JvbGxiYXIuZnJhbWVSZWN0KCk7Cit9CisKK2Jvb2wgU2Nyb2xsYmFyVGhl bWVXUEU6OnBhaW50KFNjcm9sbGJhciYgc2Nyb2xsYmFyLCBHcmFwaGljc0NvbnRleHQmIGdyYXBo aWNzQ29udGV4dCwgY29uc3QgSW50UmVjdCYgZGFtYWdlUmVjdCkKK3sKKyAgICBpZiAoZ3JhcGhp Y3NDb250ZXh0LnBhaW50aW5nRGlzYWJsZWQoKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisg ICAgaWYgKCFzY3JvbGxiYXIuZW5hYmxlZCgpKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKworICAg IEludFJlY3QgcmVjdCA9IHNjcm9sbGJhci5mcmFtZVJlY3QoKTsKKyAgICBpZiAoIXJlY3QuaW50 ZXJzZWN0cyhkYW1hZ2VSZWN0KSkKKyAgICAgICAgcmV0dXJuIHRydWU7CisKKyAgICBkb3VibGUg b3BhY2l0eSA9IHNjcm9sbGJhci5ob3ZlcmVkUGFydCgpID09IE5vUGFydCA/IHNjcm9sbGJhci5v cGFjaXR5KCkgOiBzY3JvbGxiYXJPcGFjaXR5OworICAgIGlmICghb3BhY2l0eSkKKyAgICAgICAg cmV0dXJuIHRydWU7CisKKyAgICBHcmFwaGljc0NvbnRleHRTdGF0ZVNhdmVyIHN0YXRlU2F2ZXIo Z3JhcGhpY3NDb250ZXh0KTsKKyAgICBpZiAob3BhY2l0eSAhPSAxKSB7CisgICAgICAgIGdyYXBo aWNzQ29udGV4dC5jbGlwKGRhbWFnZVJlY3QpOworICAgICAgICBncmFwaGljc0NvbnRleHQuYmVn aW5UcmFuc3BhcmVuY3lMYXllcihvcGFjaXR5KTsKKyAgICB9CisKKyAgICBpZiAoc2Nyb2xsYmFy LmhvdmVyZWRQYXJ0KCkgIT0gTm9QYXJ0KSB7CisgICAgICAgIGdyYXBoaWNzQ29udGV4dC5maWxs UmVjdChyZWN0LCBzY3JvbGxiYXJCYWNrZ3JvdW5kQ29sb3IpOworCisgICAgICAgIEludFJlY3Qg ZnJhbWUgPSByZWN0OworICAgICAgICBpZiAoc2Nyb2xsYmFyLm9yaWVudGF0aW9uKCkgPT0gVmVy dGljYWxTY3JvbGxiYXIpCisgICAgICAgICAgICBmcmFtZS5zZXRXaWR0aChob3ZlcmVkU2Nyb2xs YmFyQm9yZGVyU2l6ZSk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIGZyYW1lLnNldEhlaWdo dChob3ZlcmVkU2Nyb2xsYmFyQm9yZGVyU2l6ZSk7CisgICAgICAgIGdyYXBoaWNzQ29udGV4dC5m aWxsUmVjdChmcmFtZSwgc2Nyb2xsYmFyQm9yZGVyQ29sb3IpOworICAgIH0KKworICAgIGludCB0 aHVtYlBvcyA9IHRodW1iUG9zaXRpb24oc2Nyb2xsYmFyKTsKKyAgICBpbnQgdGh1bWJMZW4gPSB0 aHVtYkxlbmd0aChzY3JvbGxiYXIpOworICAgIEludFJlY3QgdGh1bWIgPSByZWN0OworICAgIGlm IChzY3JvbGxiYXIuaG92ZXJlZFBhcnQoKSA9PSBOb1BhcnQpIHsKKyAgICAgICAgaWYgKHNjcm9s bGJhci5vcmllbnRhdGlvbigpID09IFZlcnRpY2FsU2Nyb2xsYmFyKSB7CisgICAgICAgICAgICB0 aHVtYi5tb3ZlKHNjcm9sbGJhclNpemUgLSAob3ZlcmxheVRodW1iU2l6ZSArIHRodW1iQm9yZGVy U2l6ZSkgKyBob3ZlcmVkU2Nyb2xsYmFyQm9yZGVyU2l6ZSwgdGh1bWJQb3MgKyB0aHVtYkJvcmRl clNpemUpOworICAgICAgICAgICAgdGh1bWIuc2V0V2lkdGgob3ZlcmxheVRodW1iU2l6ZSk7Cisg ICAgICAgICAgICB0aHVtYi5zZXRIZWlnaHQodGh1bWJMZW4gLSB0aHVtYkJvcmRlclNpemUgKiAy KTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIHRodW1iLm1vdmUodGh1bWJQb3MgKyB0 aHVtYkJvcmRlclNpemUsIHNjcm9sbGJhclNpemUgLSAob3ZlcmxheVRodW1iU2l6ZSArIHRodW1i Qm9yZGVyU2l6ZSkgKyBob3ZlcmVkU2Nyb2xsYmFyQm9yZGVyU2l6ZSk7CisgICAgICAgICAgICB0 aHVtYi5zZXRXaWR0aCh0aHVtYkxlbiAtIHRodW1iQm9yZGVyU2l6ZSAqIDIpOworICAgICAgICAg ICAgdGh1bWIuc2V0SGVpZ2h0KG92ZXJsYXlUaHVtYlNpemUpOworICAgICAgICB9CisgICAgfSBl bHNlIHsKKyAgICAgICAgaWYgKHNjcm9sbGJhci5vcmllbnRhdGlvbigpID09IFZlcnRpY2FsU2Ny b2xsYmFyKSB7CisgICAgICAgICAgICB0aHVtYi5tb3ZlKHNjcm9sbGJhclNpemUgLSAoc2Nyb2xs YmFyU2l6ZSAvIDIgKyB0aHVtYlNpemUgLyAyKSwgdGh1bWJQb3MgKyB0aHVtYkJvcmRlclNpemUp OworICAgICAgICAgICAgdGh1bWIuc2V0V2lkdGgodGh1bWJTaXplKTsKKyAgICAgICAgICAgIHRo dW1iLnNldEhlaWdodCh0aHVtYkxlbiAtIHRodW1iQm9yZGVyU2l6ZSAqIDIpOworICAgICAgICB9 IGVsc2UgeworICAgICAgICAgICAgdGh1bWIubW92ZSh0aHVtYlBvcyArIHRodW1iQm9yZGVyU2l6 ZSwgc2Nyb2xsYmFyU2l6ZSAtIChzY3JvbGxiYXJTaXplIC8gMiArIHRodW1iU2l6ZSAvIDIpKTsK KyAgICAgICAgICAgIHRodW1iLnNldFdpZHRoKHRodW1iTGVuIC0gdGh1bWJCb3JkZXJTaXplICog Mik7CisgICAgICAgICAgICB0aHVtYi5zZXRIZWlnaHQodGh1bWJTaXplKTsKKyAgICAgICAgfQor ICAgIH0KKworICAgIEZsb2F0U2l6ZSBjb3JuZXIoNCwgNCk7CisgICAgUGF0aCBwYXRoOworICAg IGlmIChzY3JvbGxiYXIuaG92ZXJlZFBhcnQoKSA9PSBOb1BhcnQpIHsKKyAgICAgICAgcGF0aC5h ZGRSb3VuZGVkUmVjdCh0aHVtYiwgY29ybmVyKTsKKyAgICAgICAgdGh1bWIuaW5mbGF0ZSgtMSk7 CisgICAgICAgIHBhdGguYWRkUm91bmRlZFJlY3QodGh1bWIsIGNvcm5lcik7CisgICAgICAgIGdy YXBoaWNzQ29udGV4dC5zZXRGaWxsUnVsZShXaW5kUnVsZTo6RXZlbk9kZCk7CisgICAgICAgIGdy YXBoaWNzQ29udGV4dC5zZXRGaWxsQ29sb3Iob3ZlcmxheVRodW1iQm9yZGVyQ29sb3IpOworICAg ICAgICBncmFwaGljc0NvbnRleHQuZmlsbFBhdGgocGF0aCk7CisgICAgICAgIHBhdGguY2xlYXIo KTsKKyAgICB9CisKKyAgICBwYXRoLmFkZFJvdW5kZWRSZWN0KHRodW1iLCBjb3JuZXIpOworICAg IGdyYXBoaWNzQ29udGV4dC5zZXRGaWxsUnVsZShXaW5kUnVsZTo6Tm9uWmVybyk7CisgICAgaWYg KHNjcm9sbGJhci5ob3ZlcmVkUGFydCgpID09IE5vUGFydCkKKyAgICAgICAgZ3JhcGhpY3NDb250 ZXh0LnNldEZpbGxDb2xvcihvdmVybGF5VGh1bWJDb2xvcik7CisgICAgZWxzZSBpZiAoc2Nyb2xs YmFyLnByZXNzZWRQYXJ0KCkgPT0gVGh1bWJQYXJ0KQorICAgICAgICBncmFwaGljc0NvbnRleHQu c2V0RmlsbENvbG9yKHRodW1iUHJlc3NlZENvbG9yKTsKKyAgICBlbHNlIGlmIChzY3JvbGxiYXIu aG92ZXJlZFBhcnQoKSA9PSBUaHVtYlBhcnQpCisgICAgICAgIGdyYXBoaWNzQ29udGV4dC5zZXRG aWxsQ29sb3IodGh1bWJIb3ZlcmVkQ29sb3IpOworICAgIGVsc2UKKyAgICAgICAgZ3JhcGhpY3ND b250ZXh0LnNldEZpbGxDb2xvcih0aHVtYkNvbG9yKTsKKyAgICBncmFwaGljc0NvbnRleHQuZmls bFBhdGgocGF0aCk7CisKKyAgICBpZiAob3BhY2l0eSAhPSAxKQorICAgICAgICBncmFwaGljc0Nv bnRleHQuZW5kVHJhbnNwYXJlbmN5TGF5ZXIoKTsKKworICAgIHJldHVybiB0cnVlOwogfQogCi1J bnRSZWN0IFNjcm9sbGJhclRoZW1lV1BFOjp0cmFja1JlY3QoU2Nyb2xsYmFyJiwgYm9vbCkKK1Nj cm9sbGJhckJ1dHRvblByZXNzQWN0aW9uIFNjcm9sbGJhclRoZW1lV1BFOjpoYW5kbGVNb3VzZVBy ZXNzRXZlbnQoU2Nyb2xsYmFyJiwgY29uc3QgUGxhdGZvcm1Nb3VzZUV2ZW50JiBldmVudCwgU2Ny b2xsYmFyUGFydCBwcmVzc2VkUGFydCkKIHsKLSAgICBub3RJbXBsZW1lbnRlZCgpOwotICAgIHJl dHVybiBJbnRSZWN0KCk7CisgICAgc3dpdGNoIChwcmVzc2VkUGFydCkgeworICAgIGNhc2UgQmFj a1RyYWNrUGFydDoKKyAgICBjYXNlIEZvcndhcmRUcmFja1BhcnQ6CisgICAgICAgIC8vIFRoZSBz aGlmdCBrZXkgb3IgbWlkZGxlL3JpZ2h0IGJ1dHRvbiByZXZlcnNlcyB0aGUgc2Vuc2UuCisgICAg ICAgIGlmIChldmVudC5zaGlmdEtleSgpIHx8IGV2ZW50LmJ1dHRvbigpICE9IExlZnRCdXR0b24p CisgICAgICAgICAgICByZXR1cm4gU2Nyb2xsYmFyQnV0dG9uUHJlc3NBY3Rpb246OkNlbnRlck9u VGh1bWI7CisgICAgICAgIHJldHVybiBTY3JvbGxiYXJCdXR0b25QcmVzc0FjdGlvbjo6U2Nyb2xs OworICAgIGNhc2UgVGh1bWJQYXJ0OgorICAgICAgICBpZiAoZXZlbnQuYnV0dG9uKCkgIT0gUmln aHRCdXR0b24pCisgICAgICAgICAgICByZXR1cm4gU2Nyb2xsYmFyQnV0dG9uUHJlc3NBY3Rpb246 OlN0YXJ0RHJhZzsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBCYWNrQnV0dG9uU3RhcnRQYXJ0 OgorICAgIGNhc2UgRm9yd2FyZEJ1dHRvblN0YXJ0UGFydDoKKyAgICBjYXNlIEJhY2tCdXR0b25F bmRQYXJ0OgorICAgIGNhc2UgRm9yd2FyZEJ1dHRvbkVuZFBhcnQ6CisgICAgICAgIHJldHVybiBT Y3JvbGxiYXJCdXR0b25QcmVzc0FjdGlvbjo6U2Nyb2xsOworICAgIGRlZmF1bHQ6CisgICAgICAg IGJyZWFrOworICAgIH0KKworICAgIHJldHVybiBTY3JvbGxiYXJCdXR0b25QcmVzc0FjdGlvbjo6 Tm9uZTsKIH0KIAogU2Nyb2xsYmFyVGhlbWUmIFNjcm9sbGJhclRoZW1lOjpuYXRpdmVUaGVtZSgp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93cGUvU2Nyb2xsYmFyVGhlbWVX UEUuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dwZS9TY3JvbGxiYXJUaGVtZVdQRS5oCmlu ZGV4IDY3MTg1YWRhMjlkLi5hZTlkNjU5MTFiZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vd3BlL1Njcm9sbGJhclRoZW1lV1BFLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vd3BlL1Njcm9sbGJhclRoZW1lV1BFLmgKQEAgLTM0LDYgKzM0LDE1IEBAIHB1YmxpYzoK ICAgICBTY3JvbGxiYXJUaGVtZVdQRSgpID0gZGVmYXVsdDsKICAgICB2aXJ0dWFsIH5TY3JvbGxi YXJUaGVtZVdQRSgpID0gZGVmYXVsdDsKIAorcHJpdmF0ZToKKyAgICBib29sIHVzZXNPdmVybGF5 U2Nyb2xsYmFycygpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIHRydWU7IH0KKworICAgIGJvb2wg cGFpbnQoU2Nyb2xsYmFyJiwgR3JhcGhpY3NDb250ZXh0JiwgY29uc3QgSW50UmVjdCYpIG92ZXJy aWRlOworICAgIFNjcm9sbGJhckJ1dHRvblByZXNzQWN0aW9uIGhhbmRsZU1vdXNlUHJlc3NFdmVu dChTY3JvbGxiYXImLCBjb25zdCBQbGF0Zm9ybU1vdXNlRXZlbnQmLCBTY3JvbGxiYXJQYXJ0KSBv dmVycmlkZTsKKworICAgIGludCBzY3JvbGxiYXJUaGlja25lc3MoU2Nyb2xsYmFyQ29udHJvbFNp emUsIFNjcm9sbGJhckV4cGFuc2lvblN0YXRlKSBvdmVycmlkZTsKKyAgICBpbnQgbWluaW11bVRo dW1iTGVuZ3RoKFNjcm9sbGJhciYpIG92ZXJyaWRlOworCiAgICAgYm9vbCBoYXNCdXR0b25zKFNj cm9sbGJhciYpIG92ZXJyaWRlOwogICAgIGJvb2wgaGFzVGh1bWIoU2Nyb2xsYmFyJikgb3ZlcnJp ZGU7CiAK