207686 2020-02-13 03:10:52 -0800 [WPE] Add support for rendering spin buttons 2020-02-18 02:48:36 -0800 1 1 1 Unclassified WebKit WPE WebKit WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 207471 1 cgarcia webkit-unassigned aperez bugs-noreply oldest_to_newest 1618434 0 cgarcia 2020-02-13 03:10:52 -0800 . 1618437 1 390626 cgarcia 2020-02-13 03:15:27 -0800 Created attachment 390626 Patch 1619949 2 390626 aperez 2020-02-17 15:39:02 -0800 Comment on attachment 390626 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=390626&action=review r+, but please check the comment below before landing. > Source/WebCore/platform/wpe/RenderThemeWPE.cpp:50 > +static const unsigned menuListButtonArrowSize = 16; Does this need to have the same value as “arrowSize“ in ThemeWPE.cpp? If yes, please add a comment here saying so. > Source/WebCore/platform/wpe/ThemeWPE.cpp:40 > +static const unsigned arrowSize = 16; If this needs to have the same size as “menuListButtonArrowSize” in RenderThemeWPE.cpp, please add a comment indicating that. 1620101 3 cgarcia 2020-02-18 02:48:10 -0800 (In reply to Adrian Perez from comment #2) > Comment on attachment 390626 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=390626&action=review > > r+, but please check the comment below before landing. > > > Source/WebCore/platform/wpe/RenderThemeWPE.cpp:50 > > +static const unsigned menuListButtonArrowSize = 16; > > Does this need to have the same value as “arrowSize“ in ThemeWPE.cpp? > If yes, please add a comment here saying so. Not necessarily, the arrow can be scaled, but we never scale it in case of menu list button. It's true that we don't scale it because we know the arrow size is 16 too, but still. > > Source/WebCore/platform/wpe/ThemeWPE.cpp:40 > > +static const unsigned arrowSize = 16; > > If this needs to have the same size as “menuListButtonArrowSize” in > RenderThemeWPE.cpp, please add a comment indicating that. 1620102 4 cgarcia 2020-02-18 02:48:36 -0800 Committed r256823: <https://trac.webkit.org/changeset/256823> 390626 2020-02-13 03:15:27 -0800 2020-02-17 15:39:02 -0800 Patch wpe-spin-buttons.diff text/plain 11998 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAwYjg5NjViMGFlOC4uNjBiNmY2OWVlMGMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMCBAQAorMjAyMC0wMi0xMyAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGln YWxpYS5jb20+CisKKyAgICAgICAgW1dQRV0gQWRkIHN1cHBvcnQgZm9yIHJlbmRlcmluZyBzcGlu IGJ1dHRvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIwNzY4NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogcGxhdGZvcm0vd3BlL1JlbmRlclRoZW1lV1BFLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlclRoZW1lV1BFOjpwb3B1cEludGVybmFsUGFkZGluZ0JveCBjb25zdCk6IFJlbmFtZSBhcnJv d1NpemUgYXMgbWVudUxpc3RCdXR0b25BcnJvd1NpemUuCisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJUaGVtZVdQRTo6cGFpbnRNZW51TGlzdCk6IFVzZSBUaGVtZVdQRTo6cGFpbnRBcnJvdygpLgor ICAgICAgICAqIHBsYXRmb3JtL3dwZS9UaGVtZVdQRS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpU aGVtZVdQRTo6cGFpbnRBcnJvdyk6IE1vdmVkIGZyb20gUmVuZGVyVGhlbWVXUEUgYW5kIGFkZGVk IGRpcmVjdGlvbiBwYXJhbWV0ZXIuCisgICAgICAgIChXZWJDb3JlOjpUaGVtZVdQRTo6Y29udHJv bFNpemUgY29uc3QpOiBTZXQgc2l6ZSBvZiBzcGluIGJ1dHRvbnMuCisgICAgICAgIChXZWJDb3Jl OjpUaGVtZVdQRTo6cGFpbnQpOiBDYWxsIHBhaW50U3BpbkJ1dHRvbigpIGZvciBzcGluIGJ1dHRv bnMuCisgICAgICAgIChXZWJDb3JlOjpUaGVtZVdQRTo6cGFpbnRTcGluQnV0dG9uKTogUGFpbnQg dGhlIGJ1dHRvbnMuCisgICAgICAgICogcGxhdGZvcm0vd3BlL1RoZW1lV1BFLmg6CisKIDIwMjAt MDItMTAgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAg ICAgIFtXUEVdIFVzZSBjdXN0b20gdGhlbWUgc3R5bGUgdG8gcmVuZGVyIGJ1dHRvbnMKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dwZS9SZW5kZXJUaGVtZVdQRS5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93cGUvUmVuZGVyVGhlbWVXUEUuY3BwCmluZGV4IDkzYTJl Yzg3MGU3Li43YzM1NDE2NzQwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v d3BlL1JlbmRlclRoZW1lV1BFLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93cGUv UmVuZGVyVGhlbWVXUEUuY3BwCkBAIC00Nyw4ICs0Nyw3IEBAIHN0YXRpYyBjb25zdCBDb2xvciB0 ZXh0RmllbGRCb3JkZXJBY3RpdmVDb2xvciA9IG1ha2VSR0IoNTIsIDEzMiwgMjI4KTsKIHN0YXRp YyBjb25zdCBDb2xvciB0ZXh0RmllbGRCb3JkZXJEaXNhYmxlZENvbG9yID0gbWFrZVJHQigyMTMs IDIwOCwgMjA0KTsKIHN0YXRpYyBjb25zdCBDb2xvciB0ZXh0RmllbGRCYWNrZ3JvdW5kQ29sb3Ig PSBtYWtlUkdCKDI1NSwgMjU1LCAyNTUpOwogc3RhdGljIGNvbnN0IENvbG9yIHRleHRGaWVsZEJh Y2tncm91bmREaXNhYmxlZENvbG9yID0gbWFrZVJHQigyNTIsIDI1MiwgMjUyKTsKLXN0YXRpYyBj b25zdCB1bnNpZ25lZCBhcnJvd1NpemUgPSAxNjsKLXN0YXRpYyBjb25zdCBDb2xvciBhcnJvd0Nv bG9yID0gbWFrZVJHQig0NiwgNTIsIDU0KTsKK3N0YXRpYyBjb25zdCB1bnNpZ25lZCBtZW51TGlz dEJ1dHRvbkFycm93U2l6ZSA9IDE2Owogc3RhdGljIGNvbnN0IGludCBtZW51TGlzdEJ1dHRvbkZv Y3VzT2Zmc2V0ID0gLTM7CiBzdGF0aWMgY29uc3QgdW5zaWduZWQgbWVudUxpc3RCdXR0b25QYWRk aW5nID0gNTsKIHN0YXRpYyBjb25zdCBpbnQgbWVudUxpc3RCdXR0b25Cb3JkZXJTaXplID0gMTsg Ly8gS2VlcCBpbiBzeW5jIHdpdGggYnV0dG9uQm9yZGVyU2l6ZSBpbiBUaGVtZS4KQEAgLTE1Miwy NSArMTUxLDEzIEBAIGJvb2wgUmVuZGVyVGhlbWVXUEU6OnBhaW50U2VhcmNoRmllbGQoY29uc3Qg UmVuZGVyT2JqZWN0JiByZW5kZXJPYmplY3QsIGNvbnN0IFBhCiAgICAgcmV0dXJuIHBhaW50VGV4 dEZpZWxkKHJlbmRlck9iamVjdCwgcGFpbnRJbmZvLCByZWN0KTsKIH0KIAotc3RhdGljIHZvaWQg cGFpbnRBcnJvdyhHcmFwaGljc0NvbnRleHQmIGdyYXBoaWNzQ29udGV4dCwgY29uc3QgRmxvYXRS ZWN0JiByZWN0KQotewotICAgIFBhdGggcGF0aDsKLSAgICBwYXRoLm1vdmVUbyh7IHJlY3QueCgp ICsgMywgcmVjdC55KCkgKyA2IH0pOwotICAgIHBhdGguYWRkTGluZVRvKHsgcmVjdC54KCkgKyAx MywgcmVjdC55KCkgKyA2IH0pOwotICAgIHBhdGguYWRkTGluZVRvKHsgcmVjdC54KCkgKyA4LCBy ZWN0LnkoKSArIDExIH0pOwotICAgIHBhdGguY2xvc2VTdWJwYXRoKCk7Ci0KLSAgICBncmFwaGlj c0NvbnRleHQuc2V0RmlsbENvbG9yKGFycm93Q29sb3IpOwotICAgIGdyYXBoaWNzQ29udGV4dC5m aWxsUGF0aChwYXRoKTsKLX0KLQogTGVuZ3RoQm94IFJlbmRlclRoZW1lV1BFOjpwb3B1cEludGVy bmFsUGFkZGluZ0JveChjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUpIGNvbnN0CiB7CiAgICAgaWYg KHN0eWxlLmFwcGVhcmFuY2UoKSA9PSBOb0NvbnRyb2xQYXJ0KQogICAgICAgICByZXR1cm4geyB9 OwogCi0gICAgaW50IGxlZnRQYWRkaW5nID0gbWVudUxpc3RCdXR0b25QYWRkaW5nICsgKHN0eWxl LmRpcmVjdGlvbigpID09IFRleHREaXJlY3Rpb246OlJUTCA/IGFycm93U2l6ZSA6IDApOwotICAg IGludCByaWdodFBhZGRpbmcgPSBtZW51TGlzdEJ1dHRvblBhZGRpbmcgKyAoc3R5bGUuZGlyZWN0 aW9uKCkgPT0gVGV4dERpcmVjdGlvbjo6TFRSID8gYXJyb3dTaXplIDogMCk7CisgICAgaW50IGxl ZnRQYWRkaW5nID0gbWVudUxpc3RCdXR0b25QYWRkaW5nICsgKHN0eWxlLmRpcmVjdGlvbigpID09 IFRleHREaXJlY3Rpb246OlJUTCA/IG1lbnVMaXN0QnV0dG9uQXJyb3dTaXplIDogMCk7CisgICAg aW50IHJpZ2h0UGFkZGluZyA9IG1lbnVMaXN0QnV0dG9uUGFkZGluZyArIChzdHlsZS5kaXJlY3Rp b24oKSA9PSBUZXh0RGlyZWN0aW9uOjpMVFIgPyBtZW51TGlzdEJ1dHRvbkFycm93U2l6ZSA6IDAp OwogCiAgICAgcmV0dXJuIHsgbWVudUxpc3RCdXR0b25QYWRkaW5nLCByaWdodFBhZGRpbmcsIG1l bnVMaXN0QnV0dG9uUGFkZGluZywgbGVmdFBhZGRpbmcgfTsKIH0KQEAgLTE5MywxMiArMTgwLDE2 IEBAIGJvb2wgUmVuZGVyVGhlbWVXUEU6OnBhaW50TWVudUxpc3QoY29uc3QgUmVuZGVyT2JqZWN0 JiByZW5kZXJPYmplY3QsIGNvbnN0IFBhaW50CiAgICAgRmxvYXRSZWN0IGZpZWxkUmVjdCA9IHJl Y3Q7CiAgICAgZmllbGRSZWN0LmluZmxhdGUobWVudUxpc3RCdXR0b25Cb3JkZXJTaXplKTsKICAg ICBpZiAocmVuZGVyT2JqZWN0LnN0eWxlKCkuZGlyZWN0aW9uKCkgPT0gVGV4dERpcmVjdGlvbjo6 TFRSKQotICAgICAgICBmaWVsZFJlY3QubW92ZShmaWVsZFJlY3Qud2lkdGgoKSAtIChhcnJvd1Np emUgKyBtZW51TGlzdEJ1dHRvblBhZGRpbmcpLCAoZmllbGRSZWN0LmhlaWdodCgpIC8gMi4pIC0g KGFycm93U2l6ZSAvIDIpKTsKKyAgICAgICAgZmllbGRSZWN0Lm1vdmUoZmllbGRSZWN0LndpZHRo KCkgLSAobWVudUxpc3RCdXR0b25BcnJvd1NpemUgKyBtZW51TGlzdEJ1dHRvblBhZGRpbmcpLCAo ZmllbGRSZWN0LmhlaWdodCgpIC8gMi4pIC0gKG1lbnVMaXN0QnV0dG9uQXJyb3dTaXplIC8gMikp OwogICAgIGVsc2UKLSAgICAgICAgZmllbGRSZWN0Lm1vdmUobWVudUxpc3RCdXR0b25QYWRkaW5n LCAoZmllbGRSZWN0LmhlaWdodCgpIC8gMi4pIC0gKGFycm93U2l6ZSAvIDIpKTsKLSAgICBmaWVs ZFJlY3Quc2V0V2lkdGgoYXJyb3dTaXplKTsKLSAgICBmaWVsZFJlY3Quc2V0SGVpZ2h0KGFycm93 U2l6ZSk7Ci0gICAgcGFpbnRBcnJvdyhncmFwaGljc0NvbnRleHQsIGZpZWxkUmVjdCk7CisgICAg ICAgIGZpZWxkUmVjdC5tb3ZlKG1lbnVMaXN0QnV0dG9uUGFkZGluZywgKGZpZWxkUmVjdC5oZWln aHQoKSAvIDIuKSAtIChtZW51TGlzdEJ1dHRvbkFycm93U2l6ZSAvIDIpKTsKKyAgICBmaWVsZFJl Y3Quc2V0V2lkdGgobWVudUxpc3RCdXR0b25BcnJvd1NpemUpOworICAgIGZpZWxkUmVjdC5zZXRI ZWlnaHQobWVudUxpc3RCdXR0b25BcnJvd1NpemUpOworICAgIHsKKyAgICAgICAgR3JhcGhpY3ND b250ZXh0U3RhdGVTYXZlciBhcnJvd1N0YXRlU2F2ZXIoZ3JhcGhpY3NDb250ZXh0KTsKKyAgICAg ICAgZ3JhcGhpY3NDb250ZXh0LnRyYW5zbGF0ZShmaWVsZFJlY3QueCgpLCBmaWVsZFJlY3QueSgp KTsKKyAgICAgICAgVGhlbWVXUEU6OnBhaW50QXJyb3coZ3JhcGhpY3NDb250ZXh0LCBUaGVtZVdQ RTo6QXJyb3dEaXJlY3Rpb246OkRvd24pOworICAgIH0KIAogICAgIGlmIChpc0ZvY3VzZWQocmVu ZGVyT2JqZWN0KSkKICAgICAgICAgVGhlbWVXUEU6OnBhaW50Rm9jdXMoZ3JhcGhpY3NDb250ZXh0 LCByZWN0LCBtZW51TGlzdEJ1dHRvbkZvY3VzT2Zmc2V0KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL3dwZS9UaGVtZVdQRS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS93cGUvVGhlbWVXUEUuY3BwCmluZGV4IGE3NTJhZmY0NDkwLi5kOTIyNGY3YzlhMiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vd3BlL1RoZW1lV1BFLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS93cGUvVGhlbWVXUEUuY3BwCkBAIC0zNyw2ICszNyw4IEBAIG5h bWVzcGFjZSBXZWJDb3JlIHsKIAogc3RhdGljIGNvbnN0IHVuc2lnbmVkIGZvY3VzTGluZVdpZHRo ID0gMTsKIHN0YXRpYyBjb25zdCBDb2xvciBmb2N1c0NvbG9yID0gbWFrZVJHQkEoNDYsIDUyLCA1 NCwgMTUwKTsKK3N0YXRpYyBjb25zdCB1bnNpZ25lZCBhcnJvd1NpemUgPSAxNjsKK3N0YXRpYyBj b25zdCBDb2xvciBhcnJvd0NvbG9yID0gbWFrZVJHQig0NiwgNTIsIDU0KTsKIHN0YXRpYyBjb25z dCBpbnQgYnV0dG9uRm9jdXNPZmZzZXQgPSAtMzsKIHN0YXRpYyBjb25zdCB1bnNpZ25lZCBidXR0 b25QYWRkaW5nID0gNTsKIHN0YXRpYyBjb25zdCBpbnQgYnV0dG9uQm9yZGVyU2l6ZSA9IDE7CkBA IC01Miw2ICs1NCwxMCBAQCBzdGF0aWMgY29uc3QgZG91YmxlIHRvZ2dsZVNpemUgPSAxNC47CiBz dGF0aWMgY29uc3QgaW50IHRvZ2dsZUZvY3VzT2Zmc2V0ID0gMjsKIHN0YXRpYyBjb25zdCBDb2xv ciB0b2dnbGVDb2xvciA9IG1ha2VSR0IoNDYsIDUyLCA1NCk7CiBzdGF0aWMgY29uc3QgQ29sb3Ig dG9nZ2xlRGlzYWJsZWRDb2xvciA9IG1ha2VSR0IoMTYwLCAxNjAsIDE2MCk7CitzdGF0aWMgY29u c3QgQ29sb3Igc3BpbkJ1dHRvbkJvcmRlckNvbG9yID0gbWFrZVJHQigyMjAsIDIyMywgMjI3KTsK K3N0YXRpYyBjb25zdCBDb2xvciBzcGluQnV0dG9uQmFja2dyb3VuZENvbG9yID0gbWFrZVJHQigy NTIsIDI1MiwgMjUyKTsKK3N0YXRpYyBjb25zdCBDb2xvciBzcGluQnV0dG9uQmFja2dyb3VuZEhv dmVyZWRDb2xvciA9IG1ha2VSR0JBKDQ2LCA1MiwgNTQsIDUwKTsKK3N0YXRpYyBjb25zdCBDb2xv ciBzcGluQnV0dG9uQmFja2dyb3VuZFByZXNzZWRDb2xvciA9IG1ha2VSR0JBKDQ2LCA1MiwgNTQs IDcwKTsKIAogVGhlbWUmIFRoZW1lOjpzaW5nbGV0b24oKQogewpAQCAtNzQsNiArODAsMjcgQEAg dm9pZCBUaGVtZVdQRTo6cGFpbnRGb2N1cyhHcmFwaGljc0NvbnRleHQmIGdyYXBoaWNzQ29udGV4 dCwgY29uc3QgRmxvYXRSZWN0JiByZWMKICAgICBncmFwaGljc0NvbnRleHQuc3Ryb2tlUGF0aChw YXRoKTsKIH0KIAordm9pZCBUaGVtZVdQRTo6cGFpbnRBcnJvdyhHcmFwaGljc0NvbnRleHQmIGdy YXBoaWNzQ29udGV4dCwgQXJyb3dEaXJlY3Rpb24gZGlyZWN0aW9uKQoreworICAgIFBhdGggcGF0 aDsKKyAgICBzd2l0Y2ggKGRpcmVjdGlvbikgeworICAgIGNhc2UgQXJyb3dEaXJlY3Rpb246OkRv d246CisgICAgICAgIHBhdGgubW92ZVRvKHsgMywgNiB9KTsKKyAgICAgICAgcGF0aC5hZGRMaW5l VG8oeyAxMywgNiB9KTsKKyAgICAgICAgcGF0aC5hZGRMaW5lVG8oeyA4LCAxMSB9KTsKKyAgICAg ICAgYnJlYWs7CisgICAgY2FzZSBBcnJvd0RpcmVjdGlvbjo6VXA6CisgICAgICAgIHBhdGgubW92 ZVRvKHsgMywgMTAgfSk7CisgICAgICAgIHBhdGguYWRkTGluZVRvKHsgOCwgNSB9KTsKKyAgICAg ICAgcGF0aC5hZGRMaW5lVG8oeyAxMywgMTB9KTsKKyAgICAgICAgYnJlYWs7CisgICAgfQorICAg IHBhdGguY2xvc2VTdWJwYXRoKCk7CisKKyAgICBncmFwaGljc0NvbnRleHQuc2V0RmlsbENvbG9y KGFycm93Q29sb3IpOworICAgIGdyYXBoaWNzQ29udGV4dC5maWxsUGF0aChwYXRoKTsKK30KKwog TGVuZ3RoU2l6ZSBUaGVtZVdQRTo6Y29udHJvbFNpemUoQ29udHJvbFBhcnQgcGFydCwgY29uc3Qg Rm9udENhc2NhZGUmIGZvbnRDYXNjYWRlLCBjb25zdCBMZW5ndGhTaXplJiB6b29tZWRTaXplLCBm bG9hdCB6b29tRmFjdG9yKSBjb25zdAogewogICAgIGlmICghem9vbWVkU2l6ZS53aWR0aC5pc0lu dHJpbnNpY09yQXV0bygpICYmICF6b29tZWRTaXplLmhlaWdodC5pc0ludHJpbnNpY09yQXV0bygp KQpAQCAtODMsNiArMTEwLDE0IEBAIExlbmd0aFNpemUgVGhlbWVXUEU6OmNvbnRyb2xTaXplKENv bnRyb2xQYXJ0IHBhcnQsIGNvbnN0IEZvbnRDYXNjYWRlJiBmb250Q2FzY2FkCiAgICAgY2FzZSBD aGVja2JveFBhcnQ6CiAgICAgY2FzZSBSYWRpb1BhcnQ6CiAgICAgICAgIHJldHVybiBMZW5ndGhT aXplIHsgTGVuZ3RoKDEyLCBGaXhlZCksIExlbmd0aCgxMiwgRml4ZWQpIH07CisgICAgY2FzZSBJ bm5lclNwaW5CdXR0b25QYXJ0OiB7CisgICAgICAgIExlbmd0aFNpemUgc3BpbkJ1dHRvblNpemUg PSB6b29tZWRTaXplOworICAgICAgICBpZiAoc3BpbkJ1dHRvblNpemUud2lkdGguaXNJbnRyaW5z aWNPckF1dG8oKSkKKyAgICAgICAgICAgIHNwaW5CdXR0b25TaXplLndpZHRoID0gTGVuZ3RoKHN0 YXRpY19jYXN0PGludD4oYXJyb3dTaXplKSwgRml4ZWQpOworICAgICAgICBpZiAoc3BpbkJ1dHRv blNpemUuaGVpZ2h0LmlzSW50cmluc2ljT3JBdXRvKCkgfHwgZm9udENhc2NhZGUucGl4ZWxTaXpl KCkgPiBzdGF0aWNfY2FzdDxpbnQ+KGFycm93U2l6ZSkpCisgICAgICAgICAgICBzcGluQnV0dG9u U2l6ZS5oZWlnaHQgPSBMZW5ndGgoZm9udENhc2NhZGUucGl4ZWxTaXplKCksIEZpeGVkKTsKKyAg ICAgICAgcmV0dXJuIHNwaW5CdXR0b25TaXplOworICAgIH0KICAgICBkZWZhdWx0OgogICAgICAg ICBicmVhazsKICAgICB9CkBAIC0xMDUsNiArMTQwLDkgQEAgdm9pZCBUaGVtZVdQRTo6cGFpbnQo Q29udHJvbFBhcnQgcGFydCwgQ29udHJvbFN0YXRlcyYgc3RhdGVzLCBHcmFwaGljc0NvbnRleHQm IGMKICAgICBjYXNlIFNxdWFyZUJ1dHRvblBhcnQ6CiAgICAgICAgIHBhaW50QnV0dG9uKHN0YXRl cywgY29udGV4dCwgem9vbWVkUmVjdCwgem9vbUZhY3Rvcik7CiAgICAgICAgIGJyZWFrOworICAg IGNhc2UgSW5uZXJTcGluQnV0dG9uUGFydDoKKyAgICAgICAgcGFpbnRTcGluQnV0dG9uKHN0YXRl cywgY29udGV4dCwgem9vbWVkUmVjdCwgem9vbUZhY3Rvcik7CisgICAgICAgIGJyZWFrOwogICAg IGRlZmF1bHQ6CiAgICAgICAgIGJyZWFrOwogICAgIH0KQEAgLTIzMyw0ICsyNzEsNzEgQEAgdm9p ZCBUaGVtZVdQRTo6cGFpbnRCdXR0b24oQ29udHJvbFN0YXRlcyYgc3RhdGVzLCBHcmFwaGljc0Nv bnRleHQmIGdyYXBoaWNzQ29udGUKICAgICAgICAgcGFpbnRGb2N1cyhncmFwaGljc0NvbnRleHQs IHpvb21lZFJlY3QsIGJ1dHRvbkZvY3VzT2Zmc2V0KTsKIH0KIAordm9pZCBUaGVtZVdQRTo6cGFp bnRTcGluQnV0dG9uKENvbnRyb2xTdGF0ZXMmIHN0YXRlcywgR3JhcGhpY3NDb250ZXh0JiBncmFw aGljc0NvbnRleHQsIGNvbnN0IEZsb2F0UmVjdCYgem9vbWVkUmVjdCwgZmxvYXQpCit7CisgICAg R3JhcGhpY3NDb250ZXh0U3RhdGVTYXZlciBzdGF0ZVNhdmVyKGdyYXBoaWNzQ29udGV4dCk7CisK KyAgICBGbG9hdFJlY3QgZmllbGRSZWN0ID0gem9vbWVkUmVjdDsKKyAgICBGbG9hdFNpemUgY29y bmVyKDIsIDIpOworICAgIFBhdGggcGF0aDsKKyAgICBwYXRoLmFkZFJvdW5kZWRSZWN0KGZpZWxk UmVjdCwgY29ybmVyKTsKKyAgICBmaWVsZFJlY3QuaW5mbGF0ZSgtYnV0dG9uQm9yZGVyU2l6ZSk7 CisgICAgcGF0aC5hZGRSb3VuZGVkUmVjdChmaWVsZFJlY3QsIGNvcm5lcik7CisgICAgZ3JhcGhp Y3NDb250ZXh0LnNldEZpbGxSdWxlKFdpbmRSdWxlOjpFdmVuT2RkKTsKKyAgICBncmFwaGljc0Nv bnRleHQuc2V0RmlsbENvbG9yKHNwaW5CdXR0b25Cb3JkZXJDb2xvcik7CisgICAgZ3JhcGhpY3ND b250ZXh0LmZpbGxQYXRoKHBhdGgpOworICAgIHBhdGguY2xlYXIoKTsKKworICAgIHBhdGguYWRk Um91bmRlZFJlY3QoZmllbGRSZWN0LCBjb3JuZXIpOworICAgIGdyYXBoaWNzQ29udGV4dC5zZXRG aWxsUnVsZShXaW5kUnVsZTo6Tm9uWmVybyk7CisgICAgZ3JhcGhpY3NDb250ZXh0LnNldEZpbGxD b2xvcihzcGluQnV0dG9uQmFja2dyb3VuZENvbG9yKTsKKyAgICBncmFwaGljc0NvbnRleHQuZmls bFBhdGgocGF0aCk7CisgICAgcGF0aC5jbGVhcigpOworCisgICAgRmxvYXRSZWN0IGJ1dHRvblJl Y3QgPSBmaWVsZFJlY3Q7CisgICAgYnV0dG9uUmVjdC5zZXRIZWlnaHQoZmllbGRSZWN0LmhlaWdo dCgpIC8gMi4wKTsKKyAgICB7CisgICAgICAgIGlmIChzdGF0ZXMuc3RhdGVzKCkgJiBDb250cm9s U3RhdGVzOjpTcGluVXBTdGF0ZSkgeworICAgICAgICAgICAgcGF0aC5hZGRSb3VuZGVkUmVjdChG bG9hdFJvdW5kZWRSZWN0KGJ1dHRvblJlY3QsIGNvcm5lciwgY29ybmVyLCB7IH0sIHsgfSkpOwor ICAgICAgICAgICAgaWYgKHN0YXRlcy5zdGF0ZXMoKSAmIENvbnRyb2xTdGF0ZXM6OlByZXNzZWRT dGF0ZSkKKyAgICAgICAgICAgICAgICBncmFwaGljc0NvbnRleHQuc2V0RmlsbENvbG9yKHNwaW5C dXR0b25CYWNrZ3JvdW5kUHJlc3NlZENvbG9yKTsKKyAgICAgICAgICAgIGVsc2UgaWYgKHN0YXRl cy5zdGF0ZXMoKSAmIENvbnRyb2xTdGF0ZXM6OkhvdmVyU3RhdGUpCisgICAgICAgICAgICAgICAg Z3JhcGhpY3NDb250ZXh0LnNldEZpbGxDb2xvcihzcGluQnV0dG9uQmFja2dyb3VuZEhvdmVyZWRD b2xvcik7CisgICAgICAgICAgICBncmFwaGljc0NvbnRleHQuZmlsbFBhdGgocGF0aCk7CisgICAg ICAgICAgICBwYXRoLmNsZWFyKCk7CisgICAgICAgIH0KKworICAgICAgICBHcmFwaGljc0NvbnRl eHRTdGF0ZVNhdmVyIGJ1dHRvblN0YXRlU2F2ZXIoZ3JhcGhpY3NDb250ZXh0KTsKKyAgICAgICAg aWYgKGJ1dHRvblJlY3QuaGVpZ2h0KCkgPiBhcnJvd1NpemUpCisgICAgICAgICAgICBncmFwaGlj c0NvbnRleHQudHJhbnNsYXRlKGJ1dHRvblJlY3QueCgpLCBidXR0b25SZWN0LnkoKSArIChidXR0 b25SZWN0LmhlaWdodCgpIC8gMi4wKSAtIChhcnJvd1NpemUgLyAyLikpOworICAgICAgICBlbHNl IHsKKyAgICAgICAgICAgIGdyYXBoaWNzQ29udGV4dC50cmFuc2xhdGUoYnV0dG9uUmVjdC54KCks IGJ1dHRvblJlY3QueSgpKTsKKyAgICAgICAgICAgIGdyYXBoaWNzQ29udGV4dC5zY2FsZShGbG9h dFNpemU6Om5hcnJvd1ByZWNpc2lvbihidXR0b25SZWN0LndpZHRoKCkgLyBhcnJvd1NpemUsIGJ1 dHRvblJlY3QuaGVpZ2h0KCkgLyBhcnJvd1NpemUpKTsKKyAgICAgICAgfQorICAgICAgICBwYWlu dEFycm93KGdyYXBoaWNzQ29udGV4dCwgQXJyb3dEaXJlY3Rpb246OlVwKTsKKyAgICB9CisKKyAg ICBidXR0b25SZWN0Lm1vdmUoMCwgYnV0dG9uUmVjdC5oZWlnaHQoKSk7CisgICAgeworICAgICAg ICBpZiAoIShzdGF0ZXMuc3RhdGVzKCkgJiBDb250cm9sU3RhdGVzOjpTcGluVXBTdGF0ZSkpIHsK KyAgICAgICAgICAgIHBhdGguYWRkUm91bmRlZFJlY3QoRmxvYXRSb3VuZGVkUmVjdChidXR0b25S ZWN0LCB7IH0sIHsgfSwgY29ybmVyLCBjb3JuZXIpKTsKKyAgICAgICAgICAgIGlmIChzdGF0ZXMu c3RhdGVzKCkgJiBDb250cm9sU3RhdGVzOjpQcmVzc2VkU3RhdGUpCisgICAgICAgICAgICAgICAg Z3JhcGhpY3NDb250ZXh0LnNldEZpbGxDb2xvcihzcGluQnV0dG9uQmFja2dyb3VuZFByZXNzZWRD b2xvcik7CisgICAgICAgICAgICBlbHNlIGlmIChzdGF0ZXMuc3RhdGVzKCkgJiBDb250cm9sU3Rh dGVzOjpIb3ZlclN0YXRlKQorICAgICAgICAgICAgICAgIGdyYXBoaWNzQ29udGV4dC5zZXRGaWxs Q29sb3Ioc3BpbkJ1dHRvbkJhY2tncm91bmRIb3ZlcmVkQ29sb3IpOworICAgICAgICAgICAgZ3Jh cGhpY3NDb250ZXh0LmZpbGxQYXRoKHBhdGgpOworICAgICAgICAgICAgcGF0aC5jbGVhcigpOwor ICAgICAgICB9CisKKyAgICAgICAgR3JhcGhpY3NDb250ZXh0U3RhdGVTYXZlciBidXR0b25TdGF0 ZVNhdmVyKGdyYXBoaWNzQ29udGV4dCk7CisgICAgICAgIGlmIChidXR0b25SZWN0LmhlaWdodCgp ID4gYXJyb3dTaXplKQorICAgICAgICAgICAgZ3JhcGhpY3NDb250ZXh0LnRyYW5zbGF0ZShidXR0 b25SZWN0LngoKSwgYnV0dG9uUmVjdC55KCkgKyAoYnV0dG9uUmVjdC5oZWlnaHQoKSAvIDIuMCkg LSAoYXJyb3dTaXplIC8gMi4pKTsKKyAgICAgICAgZWxzZSB7CisgICAgICAgICAgICBncmFwaGlj c0NvbnRleHQudHJhbnNsYXRlKGJ1dHRvblJlY3QueCgpLCBidXR0b25SZWN0LnkoKSk7CisgICAg ICAgICAgICBncmFwaGljc0NvbnRleHQuc2NhbGUoRmxvYXRTaXplOjpuYXJyb3dQcmVjaXNpb24o YnV0dG9uUmVjdC53aWR0aCgpIC8gYXJyb3dTaXplLCBidXR0b25SZWN0LmhlaWdodCgpIC8gYXJy b3dTaXplKSk7CisgICAgICAgIH0KKyAgICAgICAgcGFpbnRBcnJvdyhncmFwaGljc0NvbnRleHQs IEFycm93RGlyZWN0aW9uOjpEb3duKTsKKyAgICB9Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNv cmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dwZS9UaGVtZVdQRS5oIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vd3BlL1RoZW1lV1BFLmgKaW5kZXggMmJmMzhmMTcyMWUu LjZhMzY0ZGY5NTE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93cGUvVGhl bWVXUEUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93cGUvVGhlbWVXUEUuaApAQCAt MzIsNiArMzIsOCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiBjbGFzcyBUaGVtZVdQRSBmaW5hbCA6 IHB1YmxpYyBUaGVtZSB7CiBwdWJsaWM6CiAgICAgc3RhdGljIHZvaWQgcGFpbnRGb2N1cyhHcmFw aGljc0NvbnRleHQmLCBjb25zdCBGbG9hdFJlY3QmLCBpbnQgb2Zmc2V0KTsKKyAgICBlbnVtIGNs YXNzIEFycm93RGlyZWN0aW9uIHsgVXAsIERvd24gfTsKKyAgICBzdGF0aWMgdm9pZCBwYWludEFy cm93KEdyYXBoaWNzQ29udGV4dCYsIEFycm93RGlyZWN0aW9uKTsKIAogcHJpdmF0ZToKICAgICBM ZW5ndGhTaXplIGNvbnRyb2xTaXplKENvbnRyb2xQYXJ0LCBjb25zdCBGb250Q2FzY2FkZSYsIGNv bnN0IExlbmd0aFNpemUmLCBmbG9hdCkgY29uc3QgZmluYWw7CkBAIC00MSw2ICs0Myw3IEBAIHBy aXZhdGU6CiAgICAgdm9pZCBwYWludENoZWNrYm94KENvbnRyb2xTdGF0ZXMmLCBHcmFwaGljc0Nv bnRleHQmLCBjb25zdCBGbG9hdFJlY3QmLCBmbG9hdCk7CiAgICAgdm9pZCBwYWludFJhZGlvKENv bnRyb2xTdGF0ZXMmLCBHcmFwaGljc0NvbnRleHQmLCBjb25zdCBGbG9hdFJlY3QmLCBmbG9hdCk7 CiAgICAgdm9pZCBwYWludEJ1dHRvbihDb250cm9sU3RhdGVzJiwgR3JhcGhpY3NDb250ZXh0Jiwg Y29uc3QgRmxvYXRSZWN0JiwgZmxvYXQpOworICAgIHZvaWQgcGFpbnRTcGluQnV0dG9uKENvbnRy b2xTdGF0ZXMmLCBHcmFwaGljc0NvbnRleHQmLCBjb25zdCBGbG9hdFJlY3QmLCBmbG9hdCk7CiB9 OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCg==