207688 2020-02-13 04:42:19 -0800 [WPE] Add support for rendering progress bars 2020-02-18 03:13:23 -0800 1 1 1 Unclassified WebKit WPE WebKit WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cgarcia webkit-unassigned aperez bugs-noreply oldest_to_newest 1618446 0 cgarcia 2020-02-13 04:42:19 -0800 . 1618447 1 390630 cgarcia 2020-02-13 04:43:54 -0800 Created attachment 390630 Patch 1619937 2 390630 aperez 2020-02-17 15:28:39 -0800 Comment on attachment 390630 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=390630&action=review Just one small nit :] > Source/WebCore/platform/wpe/RenderThemeWPE.cpp:263 > + fieldRect.setWidth(std::max<float>(2, fieldRect.width() / progressActivityBlocks)); Isn't two pixels a tad too narrow? Maybe it would make sense to make it slightly wider, I think something around 5 to 6px would be good. 1619938 3 aperez 2020-02-17 15:30:07 -0800 FWIW, which other patches does this depend on? It would be nice to have them listed in the “Depends on” field in the bug =) 1620103 4 cgarcia 2020-02-18 02:56:43 -0800 (In reply to Adrian Perez from comment #2) > Comment on attachment 390630 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=390630&action=review > > Just one small nit :] > > > Source/WebCore/platform/wpe/RenderThemeWPE.cpp:263 > > + fieldRect.setWidth(std::max<float>(2, fieldRect.width() / progressActivityBlocks)); > > Isn't two pixels a tad too narrow? Maybe it would make sense to > make it slightly wider, I think something around 5 to 6px would > be good. I don't think so, this is the small bar that moves left -> right -> left for indeterminate progress bars. Those 2 pixels are only used when the width of the progress bar is very small. 1620104 5 391037 cgarcia 2020-02-18 02:57:49 -0800 Created attachment 391037 Patch for landing 1620107 6 cgarcia 2020-02-18 03:13:23 -0800 Committed r256824: <https://trac.webkit.org/changeset/256824> 390630 2020-02-13 04:43:54 -0800 2020-02-18 02:57:49 -0800 Patch wpe-progress-bars.diff text/plain 6148 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA2MGI2ZjY5ZWUwYy4uNmFlMDhkOTU4NDIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNyBAQAorMjAyMC0wMi0xMyAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGln YWxpYS5jb20+CisKKyAgICAgICAgW1dQRV0gQWRkIHN1cHBvcnQgZm9yIHJlbmRlcmluZyBwcm9n cmVzcyBiYXJzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMDc2ODgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIHBsYXRmb3JtL3dwZS9SZW5kZXJUaGVtZVdQRS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJUaGVtZVdQRTo6YW5pbWF0aW9uUmVwZWF0SW50ZXJ2YWxGb3JQcm9ncmVzc0JhciBjb25z dCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZVdQRTo6YW5pbWF0aW9uRHVyYXRpb25G b3JQcm9ncmVzc0JhciBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZVdQRTo6 cHJvZ3Jlc3NCYXJSZWN0Rm9yQm91bmRzIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl clRoZW1lV1BFOjpwYWludFByb2dyZXNzQmFyKToKKyAgICAgICAgKiBwbGF0Zm9ybS93cGUvUmVu ZGVyVGhlbWVXUEUuaDoKKwogMjAyMC0wMi0xMyAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2Fy Y2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW1dQRV0gQWRkIHN1cHBvcnQgZm9yIHJlbmRlcmlu ZyBzcGluIGJ1dHRvbnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dwZS9S ZW5kZXJUaGVtZVdQRS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93cGUvUmVuZGVyVGhl bWVXUEUuY3BwCmluZGV4IDdjMzU0MTY3NDAzLi5hNzc4MzA5OTMxNiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vd3BlL1JlbmRlclRoZW1lV1BFLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS93cGUvUmVuZGVyVGhlbWVXUEUuY3BwCkBAIC0xLDUgKzEsNSBAQAog LyoKLSAqIENvcHlyaWdodCAoQykgMjAxNCBJZ2FsaWEgUy5MLgorICogQ29weXJpZ2h0IChDKSAy MDE0LCAyMDIwIElnYWxpYSBTLkwuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBz b3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24s IGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAg LTMzLDYgKzMzLDcgQEAKICNpbmNsdWRlICJQYWludEluZm8uaCIKICNpbmNsdWRlICJSZW5kZXJC b3guaCIKICNpbmNsdWRlICJSZW5kZXJPYmplY3QuaCIKKyNpbmNsdWRlICJSZW5kZXJQcm9ncmVz cy5oIgogI2luY2x1ZGUgIlJlbmRlclN0eWxlLmgiCiAjaW5jbHVkZSAiVGhlbWVXUEUuaCIKICNp bmNsdWRlICJVc2VyQWdlbnRTY3JpcHRzLmgiCkBAIC01MSw2ICs1MiwxMiBAQCBzdGF0aWMgY29u c3QgdW5zaWduZWQgbWVudUxpc3RCdXR0b25BcnJvd1NpemUgPSAxNjsKIHN0YXRpYyBjb25zdCBp bnQgbWVudUxpc3RCdXR0b25Gb2N1c09mZnNldCA9IC0zOwogc3RhdGljIGNvbnN0IHVuc2lnbmVk IG1lbnVMaXN0QnV0dG9uUGFkZGluZyA9IDU7CiBzdGF0aWMgY29uc3QgaW50IG1lbnVMaXN0QnV0 dG9uQm9yZGVyU2l6ZSA9IDE7IC8vIEtlZXAgaW4gc3luYyB3aXRoIGJ1dHRvbkJvcmRlclNpemUg aW4gVGhlbWUuCitzdGF0aWMgY29uc3QgdW5zaWduZWQgcHJvZ3Jlc3NBY3Rpdml0eUJsb2NrcyA9 IDU7CitzdGF0aWMgY29uc3QgdW5zaWduZWQgcHJvZ3Jlc3NBbmltYXRpb25GcmFtZUNvdW50ID0g NzU7CitzdGF0aWMgY29uc3QgU2Vjb25kcyBwcm9ncmVzc0FuaW1hdGlvbkZyYW1lUmF0ZSA9IDMz X21zOyAvLyAzMGZwcy4KK3N0YXRpYyBjb25zdCB1bnNpZ25lZCBwcm9ncmVzc0JhclNpemUgPSA2 Oworc3RhdGljIGNvbnN0IENvbG9yIHByb2dyZXNzQmFyQm9yZGVyQ29sb3IgPSBtYWtlUkdCKDIw NSwgMTk5LCAxOTQpOworc3RhdGljIGNvbnN0IENvbG9yIHByb2dyZXNzQmFyQmFja2dyb3VuZENv bG9yID0gbWFrZVJHQigyMjUsIDIyMiwgMjE5KTsKIAogUmVuZGVyVGhlbWUmIFJlbmRlclRoZW1l OjpzaW5nbGV0b24oKQogewpAQCAtMjAyLDQgKzIwOSw3NyBAQCBib29sIFJlbmRlclRoZW1lV1BF OjpwYWludE1lbnVMaXN0QnV0dG9uRGVjb3JhdGlvbnMoY29uc3QgUmVuZGVyQm94JiByZW5kZXJP YmplYwogICAgIHJldHVybiBwYWludE1lbnVMaXN0KHJlbmRlck9iamVjdCwgcGFpbnRJbmZvLCBy ZWN0KTsKIH0KIAorU2Vjb25kcyBSZW5kZXJUaGVtZVdQRTo6YW5pbWF0aW9uUmVwZWF0SW50ZXJ2 YWxGb3JQcm9ncmVzc0JhcihSZW5kZXJQcm9ncmVzcyYpIGNvbnN0Cit7CisgICAgcmV0dXJuIHBy b2dyZXNzQW5pbWF0aW9uRnJhbWVSYXRlOworfQorCitTZWNvbmRzIFJlbmRlclRoZW1lV1BFOjph bmltYXRpb25EdXJhdGlvbkZvclByb2dyZXNzQmFyKFJlbmRlclByb2dyZXNzJikgY29uc3QKK3sK KyAgICByZXR1cm4gcHJvZ3Jlc3NBbmltYXRpb25GcmFtZVJhdGUgKiBwcm9ncmVzc0FuaW1hdGlv bkZyYW1lQ291bnQ7Cit9CisKK0ludFJlY3QgUmVuZGVyVGhlbWVXUEU6OnByb2dyZXNzQmFyUmVj dEZvckJvdW5kcyhjb25zdCBSZW5kZXJPYmplY3QmLCBjb25zdCBJbnRSZWN0JiBib3VuZHMpIGNv bnN0Cit7CisgICAgcmV0dXJuIHsgYm91bmRzLngoKSwgYm91bmRzLnkoKSwgYm91bmRzLndpZHRo KCksIHByb2dyZXNzQmFyU2l6ZSB9OworfQorCitib29sIFJlbmRlclRoZW1lV1BFOjpwYWludFBy b2dyZXNzQmFyKGNvbnN0IFJlbmRlck9iamVjdCYgcmVuZGVyT2JqZWN0LCBjb25zdCBQYWludElu Zm8mIHBhaW50SW5mbywgY29uc3QgSW50UmVjdCYgcmVjdCkKK3sKKyAgICBpZiAoIXJlbmRlck9i amVjdC5pc1Byb2dyZXNzKCkpCisgICAgICAgIHJldHVybiB0cnVlOworCisgICAgYXV0byYgZ3Jh cGhpY3NDb250ZXh0ID0gcGFpbnRJbmZvLmNvbnRleHQoKTsKKyAgICBHcmFwaGljc0NvbnRleHRT dGF0ZVNhdmVyIHN0YXRlU2F2ZXIoZ3JhcGhpY3NDb250ZXh0KTsKKworICAgIEZsb2F0UmVjdCBm aWVsZFJlY3QgPSByZWN0OworICAgIEZsb2F0U2l6ZSBjb3JuZXIoMywgMyk7CisgICAgUGF0aCBw YXRoOworICAgIHBhdGguYWRkUm91bmRlZFJlY3QoZmllbGRSZWN0LCBjb3JuZXIpOworICAgIGZp ZWxkUmVjdC5pbmZsYXRlKC0xKTsKKyAgICBwYXRoLmFkZFJvdW5kZWRSZWN0KGZpZWxkUmVjdCwg Y29ybmVyKTsKKyAgICBncmFwaGljc0NvbnRleHQuc2V0RmlsbFJ1bGUoV2luZFJ1bGU6OkV2ZW5P ZGQpOworICAgIGdyYXBoaWNzQ29udGV4dC5zZXRGaWxsQ29sb3IocHJvZ3Jlc3NCYXJCb3JkZXJD b2xvcik7CisgICAgZ3JhcGhpY3NDb250ZXh0LmZpbGxQYXRoKHBhdGgpOworICAgIHBhdGguY2xl YXIoKTsKKworICAgIHBhdGguYWRkUm91bmRlZFJlY3QoZmllbGRSZWN0LCBjb3JuZXIpOworICAg IGdyYXBoaWNzQ29udGV4dC5zZXRGaWxsUnVsZShXaW5kUnVsZTo6Tm9uWmVybyk7CisgICAgZ3Jh cGhpY3NDb250ZXh0LnNldEZpbGxDb2xvcihwcm9ncmVzc0JhckJhY2tncm91bmRDb2xvcik7Cisg ICAgZ3JhcGhpY3NDb250ZXh0LmZpbGxQYXRoKHBhdGgpOworICAgIHBhdGguY2xlYXIoKTsKKwor ICAgIGZpZWxkUmVjdCA9IHJlY3Q7CisgICAgY29uc3QgYXV0byYgcmVuZGVyUHJvZ3Jlc3MgPSBk b3duY2FzdDxSZW5kZXJQcm9ncmVzcz4ocmVuZGVyT2JqZWN0KTsKKyAgICBpZiAocmVuZGVyUHJv Z3Jlc3MuaXNEZXRlcm1pbmF0ZSgpKSB7CisgICAgICAgIGF1dG8gcHJvZ3Jlc3NXaWR0aCA9IGZp ZWxkUmVjdC53aWR0aCgpICogcmVuZGVyUHJvZ3Jlc3MucG9zaXRpb24oKTsKKyAgICAgICAgaWYg KHJlbmRlck9iamVjdC5zdHlsZSgpLmRpcmVjdGlvbigpID09IFRleHREaXJlY3Rpb246OlJUTCkK KyAgICAgICAgICAgIGZpZWxkUmVjdC5tb3ZlKGZpZWxkUmVjdC53aWR0aCgpIC0gcHJvZ3Jlc3NX aWR0aCwgMCk7CisgICAgICAgIGZpZWxkUmVjdC5zZXRXaWR0aChwcm9ncmVzc1dpZHRoKTsKKyAg ICB9IGVsc2UgeworICAgICAgICBkb3VibGUgYW5pbWF0aW9uUHJvZ3Jlc3MgPSByZW5kZXJQcm9n cmVzcy5hbmltYXRpb25Qcm9ncmVzcygpOworCisgICAgICAgIC8vIE5ldmVyIGxldCB0aGUgcHJv Z3Jlc3MgcmVjdCBzaHJpbmsgc21hbGxlciB0aGFuIDIgcGl4ZWxzLgorICAgICAgICBmaWVsZFJl Y3Quc2V0V2lkdGgoc3RkOjptYXg8ZmxvYXQ+KDIsIGZpZWxkUmVjdC53aWR0aCgpIC8gcHJvZ3Jl c3NBY3Rpdml0eUJsb2NrcykpOworICAgICAgICBhdXRvIG1vdmFibGVXaWR0aCA9IHJlY3Qud2lk dGgoKSAtIGZpZWxkUmVjdC53aWR0aCgpOworCisgICAgICAgIC8vIFdlIHdhbnQgdGhlIGZpcnN0 IDAuNSB1bml0cyBvZiB0aGUgYW5pbWF0aW9uIHByb2dyZXNzIHRvIHJlcHJlc2VudCB0aGUKKyAg ICAgICAgLy8gZm9yd2FyZCBtb3Rpb24gYW5kIHRoZSBzZWNvbmQgMC41IHVuaXRzIHRvIHJlcHJl c2VudCB0aGUgYmFja3dhcmQgbW90aW9uLAorICAgICAgICAvLyB0aHVzIHdlIG11bHRpcGx5IGJ5 IHR3byBoZXJlIHRvIGdldCB0aGUgZnVsbCBzd2VlcCBvZiB0aGUgcHJvZ3Jlc3MgYmFyIHdpdGgK KyAgICAgICAgLy8gZWFjaCBkaXJlY3Rpb24uCisgICAgICAgIGlmIChhbmltYXRpb25Qcm9ncmVz cyA8IDAuNSkKKyAgICAgICAgICAgIGZpZWxkUmVjdC5tb3ZlKGFuaW1hdGlvblByb2dyZXNzICog MiAqIG1vdmFibGVXaWR0aCwgMCk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIGZpZWxkUmVj dC5tb3ZlKCgxLjAgLSBhbmltYXRpb25Qcm9ncmVzcykgKiAyICogbW92YWJsZVdpZHRoLCAwKTsK KyAgICB9CisKKyAgICBwYXRoLmFkZFJvdW5kZWRSZWN0KGZpZWxkUmVjdCwgY29ybmVyKTsKKyAg ICBncmFwaGljc0NvbnRleHQuc2V0RmlsbFJ1bGUoV2luZFJ1bGU6Ok5vblplcm8pOworICAgIGdy YXBoaWNzQ29udGV4dC5zZXRGaWxsQ29sb3IoYWN0aXZlU2VsZWN0aW9uQmFja2dyb3VuZENvbG9y KHsgfSkpOworICAgIGdyYXBoaWNzQ29udGV4dC5maWxsUGF0aChwYXRoKTsKKworICAgIHJldHVy biBmYWxzZTsKK30KKworCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS93cGUvUmVuZGVyVGhlbWVXUEUuaCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL3dwZS9SZW5kZXJUaGVtZVdQRS5oCmluZGV4IDk3ZDgwMTUzYWZlLi5hYmJjZTg1 MzViNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vd3BlL1JlbmRlclRoZW1l V1BFLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vd3BlL1JlbmRlclRoZW1lV1BFLmgK QEAgLTU2LDYgKzU2LDExIEBAIHByaXZhdGU6CiAgICAgTGVuZ3RoQm94IHBvcHVwSW50ZXJuYWxQ YWRkaW5nQm94KGNvbnN0IFJlbmRlclN0eWxlJikgY29uc3Qgb3ZlcnJpZGU7CiAgICAgYm9vbCBw YWludE1lbnVMaXN0KGNvbnN0IFJlbmRlck9iamVjdCYsIGNvbnN0IFBhaW50SW5mbyYsIGNvbnN0 IEZsb2F0UmVjdCYpIG92ZXJyaWRlOwogICAgIGJvb2wgcGFpbnRNZW51TGlzdEJ1dHRvbkRlY29y YXRpb25zKGNvbnN0IFJlbmRlckJveCYsIGNvbnN0IFBhaW50SW5mbyYsIGNvbnN0IEZsb2F0UmVj dCYpIG92ZXJyaWRlOworCisgICAgU2Vjb25kcyBhbmltYXRpb25SZXBlYXRJbnRlcnZhbEZvclBy b2dyZXNzQmFyKFJlbmRlclByb2dyZXNzJikgY29uc3Qgb3ZlcnJpZGU7CisgICAgU2Vjb25kcyBh bmltYXRpb25EdXJhdGlvbkZvclByb2dyZXNzQmFyKFJlbmRlclByb2dyZXNzJikgY29uc3Qgb3Zl cnJpZGU7CisgICAgSW50UmVjdCBwcm9ncmVzc0JhclJlY3RGb3JCb3VuZHMoY29uc3QgUmVuZGVy T2JqZWN0JiwgY29uc3QgSW50UmVjdCYpIGNvbnN0IG92ZXJyaWRlOworICAgIGJvb2wgcGFpbnRQ cm9ncmVzc0Jhcihjb25zdCBSZW5kZXJPYmplY3QmLCBjb25zdCBQYWludEluZm8mLCBjb25zdCBJ bnRSZWN0Jikgb3ZlcnJpZGU7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCg== 391037 2020-02-18 02:57:49 -0800 2020-02-18 02:57:49 -0800 Patch for landing wpe-progress-bars.diff text/plain 6159 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBhYzkxYzY3OTgxZi4uYTA0NzJjNWFiNGQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNyBAQAorMjAyMC0wMi0xMyAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGln YWxpYS5jb20+CisKKyAgICAgICAgW1dQRV0gQWRkIHN1cHBvcnQgZm9yIHJlbmRlcmluZyBwcm9n cmVzcyBiYXJzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMDc2ODgKKworICAgICAgICBSZXZpZXdlZCBieSBBZHJpYW4gUGVyZXogZGUgQ2FzdHJvLgor CisgICAgICAgICogcGxhdGZvcm0vd3BlL1JlbmRlclRoZW1lV1BFLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlclRoZW1lV1BFOjphbmltYXRpb25SZXBlYXRJbnRlcnZhbEZvclByb2dyZXNz QmFyIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lV1BFOjphbmltYXRpb25E dXJhdGlvbkZvclByb2dyZXNzQmFyIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRo ZW1lV1BFOjpwcm9ncmVzc0JhclJlY3RGb3JCb3VuZHMgY29uc3QpOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyVGhlbWVXUEU6OnBhaW50UHJvZ3Jlc3NCYXIpOgorICAgICAgICAqIHBsYXRmb3Jt L3dwZS9SZW5kZXJUaGVtZVdQRS5oOgorCiAyMDIwLTAyLTE4ICBDYXJsb3MgR2FyY2lhIENhbXBv cyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbV1BFXSBBZGQgc3VwcG9ydCBmb3Ig cmVuZGVyaW5nIHNwaW4gYnV0dG9ucwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vd3BlL1JlbmRlclRoZW1lV1BFLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dwZS9S ZW5kZXJUaGVtZVdQRS5jcHAKaW5kZXggMDljZmUwYWIxZmYuLmQ0YzIxOGVkMTg2IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93cGUvUmVuZGVyVGhlbWVXUEUuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dwZS9SZW5kZXJUaGVtZVdQRS5jcHAKQEAgLTEsNSAr MSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDE0IElnYWxpYSBTLkwuCisgKiBDb3B5cmln aHQgKEMpIDIwMTQsIDIwMjAgSWdhbGlhIFMuTC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQg dXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlm aWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0 aW9ucwpAQCAtMzMsNiArMzMsNyBAQAogI2luY2x1ZGUgIlBhaW50SW5mby5oIgogI2luY2x1ZGUg IlJlbmRlckJveC5oIgogI2luY2x1ZGUgIlJlbmRlck9iamVjdC5oIgorI2luY2x1ZGUgIlJlbmRl clByb2dyZXNzLmgiCiAjaW5jbHVkZSAiUmVuZGVyU3R5bGUuaCIKICNpbmNsdWRlICJUaGVtZVdQ RS5oIgogI2luY2x1ZGUgIlVzZXJBZ2VudFNjcmlwdHMuaCIKQEAgLTUxLDYgKzUyLDEyIEBAIHN0 YXRpYyBjb25zdCB1bnNpZ25lZCBtZW51TGlzdEJ1dHRvbkFycm93U2l6ZSA9IDE2Owogc3RhdGlj IGNvbnN0IGludCBtZW51TGlzdEJ1dHRvbkZvY3VzT2Zmc2V0ID0gLTM7CiBzdGF0aWMgY29uc3Qg dW5zaWduZWQgbWVudUxpc3RCdXR0b25QYWRkaW5nID0gNTsKIHN0YXRpYyBjb25zdCBpbnQgbWVu dUxpc3RCdXR0b25Cb3JkZXJTaXplID0gMTsgLy8gS2VlcCBpbiBzeW5jIHdpdGggYnV0dG9uQm9y ZGVyU2l6ZSBpbiBUaGVtZVdQRS4KK3N0YXRpYyBjb25zdCB1bnNpZ25lZCBwcm9ncmVzc0FjdGl2 aXR5QmxvY2tzID0gNTsKK3N0YXRpYyBjb25zdCB1bnNpZ25lZCBwcm9ncmVzc0FuaW1hdGlvbkZy YW1lQ291bnQgPSA3NTsKK3N0YXRpYyBjb25zdCBTZWNvbmRzIHByb2dyZXNzQW5pbWF0aW9uRnJh bWVSYXRlID0gMzNfbXM7IC8vIDMwZnBzLgorc3RhdGljIGNvbnN0IHVuc2lnbmVkIHByb2dyZXNz QmFyU2l6ZSA9IDY7CitzdGF0aWMgY29uc3QgQ29sb3IgcHJvZ3Jlc3NCYXJCb3JkZXJDb2xvciA9 IG1ha2VSR0IoMjA1LCAxOTksIDE5NCk7CitzdGF0aWMgY29uc3QgQ29sb3IgcHJvZ3Jlc3NCYXJC YWNrZ3JvdW5kQ29sb3IgPSBtYWtlUkdCKDIyNSwgMjIyLCAyMTkpOwogCiBSZW5kZXJUaGVtZSYg UmVuZGVyVGhlbWU6OnNpbmdsZXRvbigpCiB7CkBAIC0yMDIsNCArMjA5LDc3IEBAIGJvb2wgUmVu ZGVyVGhlbWVXUEU6OnBhaW50TWVudUxpc3RCdXR0b25EZWNvcmF0aW9ucyhjb25zdCBSZW5kZXJC b3gmIHJlbmRlck9iamVjCiAgICAgcmV0dXJuIHBhaW50TWVudUxpc3QocmVuZGVyT2JqZWN0LCBw YWludEluZm8sIHJlY3QpOwogfQogCitTZWNvbmRzIFJlbmRlclRoZW1lV1BFOjphbmltYXRpb25S ZXBlYXRJbnRlcnZhbEZvclByb2dyZXNzQmFyKFJlbmRlclByb2dyZXNzJikgY29uc3QKK3sKKyAg ICByZXR1cm4gcHJvZ3Jlc3NBbmltYXRpb25GcmFtZVJhdGU7Cit9CisKK1NlY29uZHMgUmVuZGVy VGhlbWVXUEU6OmFuaW1hdGlvbkR1cmF0aW9uRm9yUHJvZ3Jlc3NCYXIoUmVuZGVyUHJvZ3Jlc3Mm KSBjb25zdAoreworICAgIHJldHVybiBwcm9ncmVzc0FuaW1hdGlvbkZyYW1lUmF0ZSAqIHByb2dy ZXNzQW5pbWF0aW9uRnJhbWVDb3VudDsKK30KKworSW50UmVjdCBSZW5kZXJUaGVtZVdQRTo6cHJv Z3Jlc3NCYXJSZWN0Rm9yQm91bmRzKGNvbnN0IFJlbmRlck9iamVjdCYsIGNvbnN0IEludFJlY3Qm IGJvdW5kcykgY29uc3QKK3sKKyAgICByZXR1cm4geyBib3VuZHMueCgpLCBib3VuZHMueSgpLCBi b3VuZHMud2lkdGgoKSwgcHJvZ3Jlc3NCYXJTaXplIH07Cit9CisKK2Jvb2wgUmVuZGVyVGhlbWVX UEU6OnBhaW50UHJvZ3Jlc3NCYXIoY29uc3QgUmVuZGVyT2JqZWN0JiByZW5kZXJPYmplY3QsIGNv bnN0IFBhaW50SW5mbyYgcGFpbnRJbmZvLCBjb25zdCBJbnRSZWN0JiByZWN0KQoreworICAgIGlm ICghcmVuZGVyT2JqZWN0LmlzUHJvZ3Jlc3MoKSkKKyAgICAgICAgcmV0dXJuIHRydWU7CisKKyAg ICBhdXRvJiBncmFwaGljc0NvbnRleHQgPSBwYWludEluZm8uY29udGV4dCgpOworICAgIEdyYXBo aWNzQ29udGV4dFN0YXRlU2F2ZXIgc3RhdGVTYXZlcihncmFwaGljc0NvbnRleHQpOworCisgICAg RmxvYXRSZWN0IGZpZWxkUmVjdCA9IHJlY3Q7CisgICAgRmxvYXRTaXplIGNvcm5lcigzLCAzKTsK KyAgICBQYXRoIHBhdGg7CisgICAgcGF0aC5hZGRSb3VuZGVkUmVjdChmaWVsZFJlY3QsIGNvcm5l cik7CisgICAgZmllbGRSZWN0LmluZmxhdGUoLTEpOworICAgIHBhdGguYWRkUm91bmRlZFJlY3Qo ZmllbGRSZWN0LCBjb3JuZXIpOworICAgIGdyYXBoaWNzQ29udGV4dC5zZXRGaWxsUnVsZShXaW5k UnVsZTo6RXZlbk9kZCk7CisgICAgZ3JhcGhpY3NDb250ZXh0LnNldEZpbGxDb2xvcihwcm9ncmVz c0JhckJvcmRlckNvbG9yKTsKKyAgICBncmFwaGljc0NvbnRleHQuZmlsbFBhdGgocGF0aCk7Cisg ICAgcGF0aC5jbGVhcigpOworCisgICAgcGF0aC5hZGRSb3VuZGVkUmVjdChmaWVsZFJlY3QsIGNv cm5lcik7CisgICAgZ3JhcGhpY3NDb250ZXh0LnNldEZpbGxSdWxlKFdpbmRSdWxlOjpOb25aZXJv KTsKKyAgICBncmFwaGljc0NvbnRleHQuc2V0RmlsbENvbG9yKHByb2dyZXNzQmFyQmFja2dyb3Vu ZENvbG9yKTsKKyAgICBncmFwaGljc0NvbnRleHQuZmlsbFBhdGgocGF0aCk7CisgICAgcGF0aC5j bGVhcigpOworCisgICAgZmllbGRSZWN0ID0gcmVjdDsKKyAgICBjb25zdCBhdXRvJiByZW5kZXJQ cm9ncmVzcyA9IGRvd25jYXN0PFJlbmRlclByb2dyZXNzPihyZW5kZXJPYmplY3QpOworICAgIGlm IChyZW5kZXJQcm9ncmVzcy5pc0RldGVybWluYXRlKCkpIHsKKyAgICAgICAgYXV0byBwcm9ncmVz c1dpZHRoID0gZmllbGRSZWN0LndpZHRoKCkgKiByZW5kZXJQcm9ncmVzcy5wb3NpdGlvbigpOwor ICAgICAgICBpZiAocmVuZGVyT2JqZWN0LnN0eWxlKCkuZGlyZWN0aW9uKCkgPT0gVGV4dERpcmVj dGlvbjo6UlRMKQorICAgICAgICAgICAgZmllbGRSZWN0Lm1vdmUoZmllbGRSZWN0LndpZHRoKCkg LSBwcm9ncmVzc1dpZHRoLCAwKTsKKyAgICAgICAgZmllbGRSZWN0LnNldFdpZHRoKHByb2dyZXNz V2lkdGgpOworICAgIH0gZWxzZSB7CisgICAgICAgIGRvdWJsZSBhbmltYXRpb25Qcm9ncmVzcyA9 IHJlbmRlclByb2dyZXNzLmFuaW1hdGlvblByb2dyZXNzKCk7CisKKyAgICAgICAgLy8gTmV2ZXIg bGV0IHRoZSBwcm9ncmVzcyByZWN0IHNocmluayBzbWFsbGVyIHRoYW4gMiBwaXhlbHMuCisgICAg ICAgIGZpZWxkUmVjdC5zZXRXaWR0aChzdGQ6Om1heDxmbG9hdD4oMiwgZmllbGRSZWN0LndpZHRo KCkgLyBwcm9ncmVzc0FjdGl2aXR5QmxvY2tzKSk7CisgICAgICAgIGF1dG8gbW92YWJsZVdpZHRo ID0gcmVjdC53aWR0aCgpIC0gZmllbGRSZWN0LndpZHRoKCk7CisKKyAgICAgICAgLy8gV2Ugd2Fu dCB0aGUgZmlyc3QgMC41IHVuaXRzIG9mIHRoZSBhbmltYXRpb24gcHJvZ3Jlc3MgdG8gcmVwcmVz ZW50IHRoZQorICAgICAgICAvLyBmb3J3YXJkIG1vdGlvbiBhbmQgdGhlIHNlY29uZCAwLjUgdW5p dHMgdG8gcmVwcmVzZW50IHRoZSBiYWNrd2FyZCBtb3Rpb24sCisgICAgICAgIC8vIHRodXMgd2Ug bXVsdGlwbHkgYnkgdHdvIGhlcmUgdG8gZ2V0IHRoZSBmdWxsIHN3ZWVwIG9mIHRoZSBwcm9ncmVz cyBiYXIgd2l0aAorICAgICAgICAvLyBlYWNoIGRpcmVjdGlvbi4KKyAgICAgICAgaWYgKGFuaW1h dGlvblByb2dyZXNzIDwgMC41KQorICAgICAgICAgICAgZmllbGRSZWN0Lm1vdmUoYW5pbWF0aW9u UHJvZ3Jlc3MgKiAyICogbW92YWJsZVdpZHRoLCAwKTsKKyAgICAgICAgZWxzZQorICAgICAgICAg ICAgZmllbGRSZWN0Lm1vdmUoKDEuMCAtIGFuaW1hdGlvblByb2dyZXNzKSAqIDIgKiBtb3ZhYmxl V2lkdGgsIDApOworICAgIH0KKworICAgIHBhdGguYWRkUm91bmRlZFJlY3QoZmllbGRSZWN0LCBj b3JuZXIpOworICAgIGdyYXBoaWNzQ29udGV4dC5zZXRGaWxsUnVsZShXaW5kUnVsZTo6Tm9uWmVy byk7CisgICAgZ3JhcGhpY3NDb250ZXh0LnNldEZpbGxDb2xvcihhY3RpdmVTZWxlY3Rpb25CYWNr Z3JvdW5kQ29sb3IoeyB9KSk7CisgICAgZ3JhcGhpY3NDb250ZXh0LmZpbGxQYXRoKHBhdGgpOwor CisgICAgcmV0dXJuIGZhbHNlOworfQorCisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dwZS9SZW5kZXJUaGVtZVdQRS5oIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vd3BlL1JlbmRlclRoZW1lV1BFLmgKaW5kZXggOTdkODAxNTNh ZmUuLmFiYmNlODUzNWI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93cGUv UmVuZGVyVGhlbWVXUEUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93cGUvUmVuZGVy VGhlbWVXUEUuaApAQCAtNTYsNiArNTYsMTEgQEAgcHJpdmF0ZToKICAgICBMZW5ndGhCb3ggcG9w dXBJbnRlcm5hbFBhZGRpbmdCb3goY29uc3QgUmVuZGVyU3R5bGUmKSBjb25zdCBvdmVycmlkZTsK ICAgICBib29sIHBhaW50TWVudUxpc3QoY29uc3QgUmVuZGVyT2JqZWN0JiwgY29uc3QgUGFpbnRJ bmZvJiwgY29uc3QgRmxvYXRSZWN0Jikgb3ZlcnJpZGU7CiAgICAgYm9vbCBwYWludE1lbnVMaXN0 QnV0dG9uRGVjb3JhdGlvbnMoY29uc3QgUmVuZGVyQm94JiwgY29uc3QgUGFpbnRJbmZvJiwgY29u c3QgRmxvYXRSZWN0Jikgb3ZlcnJpZGU7CisKKyAgICBTZWNvbmRzIGFuaW1hdGlvblJlcGVhdElu dGVydmFsRm9yUHJvZ3Jlc3NCYXIoUmVuZGVyUHJvZ3Jlc3MmKSBjb25zdCBvdmVycmlkZTsKKyAg ICBTZWNvbmRzIGFuaW1hdGlvbkR1cmF0aW9uRm9yUHJvZ3Jlc3NCYXIoUmVuZGVyUHJvZ3Jlc3Mm KSBjb25zdCBvdmVycmlkZTsKKyAgICBJbnRSZWN0IHByb2dyZXNzQmFyUmVjdEZvckJvdW5kcyhj b25zdCBSZW5kZXJPYmplY3QmLCBjb25zdCBJbnRSZWN0JikgY29uc3Qgb3ZlcnJpZGU7CisgICAg Ym9vbCBwYWludFByb2dyZXNzQmFyKGNvbnN0IFJlbmRlck9iamVjdCYsIGNvbnN0IFBhaW50SW5m byYsIGNvbnN0IEludFJlY3QmKSBvdmVycmlkZTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNv cmUK