211850 2020-05-13 10:35:25 -0700 [Wheel event region] Debug overlay 2020-05-13 12:25:16 -0700 1 1 1 Unclassified WebKit Compositing WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 koivisto webkit-unassigned changseok esprehn+autocc ews-watchlist fred.wang glenn kondapallykalyan pdr simon.fraser webkit-bug-importer oldest_to_newest 1652277 0 koivisto 2020-05-13 10:35:25 -0700 Paint debug overlay 1652280 1 399279 koivisto 2020-05-13 10:40:00 -0700 Created attachment 399279 patch 1652288 2 399280 koivisto 2020-05-13 11:04:52 -0700 Created attachment 399280 patch 1652334 3 ews-feeder 2020-05-13 12:24:05 -0700 Committed r261636: <https://trac.webkit.org/changeset/261636> All reviewed patches have been landed. Closing bug and clearing flags on attachment 399280. 1652335 4 webkit-bug-importer 2020-05-13 12:25:16 -0700 <rdar://problem/63194948> 399279 2020-05-13 10:40:00 -0700 2020-05-13 11:04:52 -0700 patch wheel-region-debug-paint.patch text/plain 11498 koivisto ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA5NjY5OWI2OGIwMi4uZjFhOGE2YTM2MTkgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzNCBAQAorMjAyMC0wNS0xMyAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+ CisKKyAgICAgICAgW1doZWVsIGV2ZW50IHJlZ2lvbl0gRGVidWcgb3ZlcmxheQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjExODUwCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBpcyB0aWVkIHRvIHRo ZSBleGlzdGluZyBXaGVlbCBldmVudCBoYW5kbGVyIG92ZXJsYXkgZGVidWcgZmxhZy4KKworICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0NvbG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Om1h a2VSR0IpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6bWFrZVJHQkEpOiBEZWxldGVkLgor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0NvbG9yLmg6CisgICAgICAgIChXZWJDb3JlOjpt YWtlUkdCKToKKyAgICAgICAgKFdlYkNvcmU6Om1ha2VSR0JBKToKKworICAgICAgICBNYWtlIGNv bnN0ZXhwci4KKworICAgICAgICAqIHJlbmRlcmluZy9FdmVudFJlZ2lvbi5jcHA6CisgICAgICAg IChXZWJDb3JlOjpFdmVudFJlZ2lvbjo6ZXZlbnRMaXN0ZW5lclJlZ2lvbkZvclR5cGUgY29uc3Qp OgorICAgICAgICAqIHJlbmRlcmluZy9FdmVudFJlZ2lvbi5oOgorICAgICAgICAqIHJlbmRlcmlu Zy9SZW5kZXJMYXllckJhY2tpbmcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6cGF0dGVybkZvckRl c2NyaXB0aW9uKToKKworICAgICAgICBGYWN0b3IgaW50byBhIGZ1bmN0aW9uLgorCisgICAgICAg IChXZWJDb3JlOjpwYXR0ZXJuRm9yVG91Y2hBY3Rpb24pOgorICAgICAgICAoV2ViQ29yZTo6cGF0 dGVybkZvckV2ZW50TGlzdGVuZXJSZWdpb25UeXBlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckxheWVyQmFja2luZzo6cGFpbnREZWJ1Z092ZXJsYXlzKToKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlckxheWVyQmFja2luZzo6cGFpbnRDb250ZW50cyk6CisKIDIwMjAtMDUtMTMgIFphbiBEb2Jl cnNlayAgPHpkb2JlcnNla0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04ocjI2MTAy Myk6IFtHVEtdW1dQRV0gU2V2ZXJhbCBXZWJHTCB0ZXN0cyBhcmUgZmFpbGluZwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvQ29sb3IuY3BwIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvQ29sb3IuY3BwCmluZGV4IGI1YTJhMjRlZGEwLi43Mzgw MjVlNTM1MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvQ29s b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0NvbG9yLmNwcApA QCAtNTAsMTYgKzUwLDYgQEAgc3RhdGljIGlubGluZSB1bnNpZ25lZCB1bnByZW11bHRpcGxpZWRD aGFubmVsKHVuc2lnbmVkIGMsIHVuc2lnbmVkIGEpCiAgICAgcmV0dXJuIChmYXN0TXVsdGlwbHlC eTI1NShjKSArIGEgLSAxKSAvIGE7CiB9CiAKLVJHQkEzMiBtYWtlUkdCKGludCByLCBpbnQgZywg aW50IGIpCi17Ci0gICAgcmV0dXJuIG1ha2VSR0JBKHIsIGcsIGIsIDB4RkYpOwotfQotCi1SR0JB MzIgbWFrZVJHQkEoaW50IHIsIGludCBnLCBpbnQgYiwgaW50IGEpCi17Ci0gICAgcmV0dXJuIHsg c3RhdGljX2Nhc3Q8dW5zaWduZWQ+KHN0ZDo6bWF4KDAsIHN0ZDo6bWluKGEsIDB4RkYpKSA8PCAy NCB8IHN0ZDo6bWF4KDAsIHN0ZDo6bWluKHIsIDB4RkYpKSA8PCAxNiB8IHN0ZDo6bWF4KDAsIHN0 ZDo6bWluKGcsIDB4RkYpKSA8PCA4IHwgc3RkOjptYXgoMCwgc3RkOjptaW4oYiwgMHhGRikpKSB9 OwotfQotCiBSR0JBMzIgbWFrZVByZW11bHRpcGxpZWRSR0JBKGludCByLCBpbnQgZywgaW50IGIs IGludCBhLCBib29sIGNlaWxpbmcpCiB7CiAgICAgcmV0dXJuIG1ha2VSR0JBKHByZW11bHRpcGxp ZWRDaGFubmVsKHIsIGEsIGNlaWxpbmcpLCBwcmVtdWx0aXBsaWVkQ2hhbm5lbChnLCBhLCBjZWls aW5nKSwgcHJlbXVsdGlwbGllZENoYW5uZWwoYiwgYSwgY2VpbGluZyksIGEpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvQ29sb3IuaCBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL0NvbG9yLmgKaW5kZXggMDE0ZDE0ZWMwNzcuLmI5NDI0Y2M0 YzMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Db2xvci5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0NvbG9yLmgKQEAgLTg0LDgg Kzg0LDggQEAgYm9vbCBvcGVyYXRvciE9KFNpbXBsZUNvbG9yLCBTaW1wbGVDb2xvcik7CiAvLyBG SVhNRTogUmVtb3ZlIHRoaXMgYWZ0ZXIgbWlncmF0aW5nIHRvIHRoZSBuZXcgbmFtZS4KIHVzaW5n IFJHQkEzMiA9IFNpbXBsZUNvbG9yOwogCi1XRUJDT1JFX0VYUE9SVCBSR0JBMzIgbWFrZVJHQihp bnQgciwgaW50IGcsIGludCBiKTsKLVdFQkNPUkVfRVhQT1JUIFJHQkEzMiBtYWtlUkdCQShpbnQg ciwgaW50IGcsIGludCBiLCBpbnQgYSk7Citjb25zdGV4cHIgUkdCQTMyIG1ha2VSR0IoaW50IHIs IGludCBnLCBpbnQgYik7Citjb25zdGV4cHIgUkdCQTMyIG1ha2VSR0JBKGludCByLCBpbnQgZywg aW50IGIsIGludCBhKTsKIAogUkdCQTMyIG1ha2VQcmVtdWx0aXBsaWVkUkdCQShpbnQgciwgaW50 IGcsIGludCBiLCBpbnQgYSwgYm9vbCBjZWlsaW5nID0gdHJ1ZSk7CiBSR0JBMzIgbWFrZVVuUHJl bXVsdGlwbGllZFJHQkEoaW50IHIsIGludCBnLCBpbnQgYiwgaW50IGEpOwpAQCAtNDE4LDYgKzQx OCwxNiBAQCBpbmxpbmUgYm9vbCBDb2xvcjo6aXNXaGl0ZUNvbG9yKGNvbnN0IENvbG9yJiBjb2xv cikKICAgICByZXR1cm4gY29sb3IucmdiKCkgPT0gQ29sb3I6OndoaXRlOwogfQogCitjb25zdGV4 cHIgUkdCQTMyIG1ha2VSR0IoaW50IHIsIGludCBnLCBpbnQgYikKK3sKKyAgICByZXR1cm4gbWFr ZVJHQkEociwgZywgYiwgMHhGRik7Cit9CisKK2NvbnN0ZXhwciBSR0JBMzIgbWFrZVJHQkEoaW50 IHIsIGludCBnLCBpbnQgYiwgaW50IGEpCit7CisgICAgcmV0dXJuIHsgc3RhdGljX2Nhc3Q8dW5z aWduZWQ+KHN0ZDo6bWF4KDAsIHN0ZDo6bWluKGEsIDB4RkYpKSA8PCAyNCB8IHN0ZDo6bWF4KDAs IHN0ZDo6bWluKHIsIDB4RkYpKSA8PCAxNiB8IHN0ZDo6bWF4KDAsIHN0ZDo6bWluKGcsIDB4RkYp KSA8PCA4IHwgc3RkOjptYXgoMCwgc3RkOjptaW4oYiwgMHhGRikpKSB9OworfQorCiB9IC8vIG5h bWVzcGFjZSBXZWJDb3JlCiAKIG5hbWVzcGFjZSBXVEYgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL0V2ZW50UmVnaW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9FdmVudFJlZ2lvbi5jcHAKaW5kZXggZjBhOThiMWZmMTcuLjAyZTMxMzdjNDY5IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvRXZlbnRSZWdpb24uY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9FdmVudFJlZ2lvbi5jcHAKQEAgLTI0MCw2ICsyNDAsMTYgQEAg T3B0aW9uU2V0PEV2ZW50TGlzdGVuZXJSZWdpb25UeXBlPiBFdmVudFJlZ2lvbjo6ZXZlbnRMaXN0 ZW5lclJlZ2lvblR5cGVzRm9yUG9pbnQKICAgICByZXR1cm4gcmVnaW9uVHlwZXM7CiB9CiAKK2Nv bnN0IFJlZ2lvbiYgRXZlbnRSZWdpb246OmV2ZW50TGlzdGVuZXJSZWdpb25Gb3JUeXBlKEV2ZW50 TGlzdGVuZXJSZWdpb25UeXBlIHR5cGUpIGNvbnN0Cit7CisgICAgc3dpdGNoICh0eXBlKSB7Cisg ICAgY2FzZSBFdmVudExpc3RlbmVyUmVnaW9uVHlwZTo6V2hlZWw6CisgICAgICAgIHJldHVybiBt X3doZWVsRXZlbnRMaXN0ZW5lclJlZ2lvbjsKKyAgICBjYXNlIEV2ZW50TGlzdGVuZXJSZWdpb25U eXBlOjpOb25QYXNzaXZlV2hlZWw6CisgICAgICAgIHJldHVybiBtX25vblBhc3NpdmVXaGVlbEV2 ZW50TGlzdGVuZXJSZWdpb247CisgICAgfQorfQorCiAjaWYgRU5BQkxFKEVESVRBQkxFX1JFR0lP TikKIAogYm9vbCBFdmVudFJlZ2lvbjo6Y29udGFpbnNFZGl0YWJsZUVsZW1lbnRzSW5SZWN0KGNv bnN0IEludFJlY3QmIHJlY3QpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvRXZlbnRSZWdpb24uaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9FdmVudFJlZ2lv bi5oCmluZGV4IDk4NjJmMzM2ODQ3Li5hNzAxNDA0YzlmMiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL0V2ZW50UmVnaW9uLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL0V2ZW50UmVnaW9uLmgKQEAgLTgwLDYgKzgwLDcgQEAgcHVibGljOgogICAgIGNvbnN0IFJl Z2lvbiogcmVnaW9uRm9yVG91Y2hBY3Rpb24oVG91Y2hBY3Rpb24pIGNvbnN0OwogCiAgICAgT3B0 aW9uU2V0PEV2ZW50TGlzdGVuZXJSZWdpb25UeXBlPiBldmVudExpc3RlbmVyUmVnaW9uVHlwZXNG b3JQb2ludChjb25zdCBJbnRQb2ludCYpIGNvbnN0OworICAgIGNvbnN0IFJlZ2lvbiYgZXZlbnRM aXN0ZW5lclJlZ2lvbkZvclR5cGUoRXZlbnRMaXN0ZW5lclJlZ2lvblR5cGUpIGNvbnN0OwogCiAj aWYgRU5BQkxFKEVESVRBQkxFX1JFR0lPTikKICAgICBXRUJDT1JFX0VYUE9SVCBib29sIGNvbnRh aW5zRWRpdGFibGVFbGVtZW50c0luUmVjdChjb25zdCBJbnRSZWN0JikgY29uc3Q7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCmluZGV4IDU0Zjlk MzM1ZjEyLi5kN2U4ZTg1YTBjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxheWVyQmFja2luZy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckxheWVyQmFja2luZy5jcHAKQEAgLTMwNTMsNTEgKzMwNTMsMjAgQEAgT3B0aW9uU2V0PFJl bmRlckxheWVyOjpQYWludExheWVyRmxhZz4gUmVuZGVyTGF5ZXJCYWNraW5nOjpwYWludEZsYWdz Rm9yTGF5ZXIoY28KICAgICByZXR1cm4gcGFpbnRGbGFnczsKIH0KIAotc3RhdGljIFJlZlB0cjxQ YXR0ZXJuPiBwYXR0ZXJuRm9yVG91Y2hBY3Rpb24oVG91Y2hBY3Rpb24gdG91Y2hBY3Rpb24sIEZs b2F0U2l6ZSBjb250ZW50T2Zmc2V0LCBHcmFwaGljc0NvbnRleHQmIGRlc3RDb250ZXh0KQotewot ICAgIGF1dG8gdG9JbmRleCA9IFtdKFRvdWNoQWN0aW9uIHRvdWNoQWN0aW9uKSAtPiB1bnNpZ25l ZCB7Ci0gICAgICAgIHN3aXRjaCAodG91Y2hBY3Rpb24pIHsKLSAgICAgICAgY2FzZSBUb3VjaEFj dGlvbjo6Tm9uZToKLSAgICAgICAgICAgIHJldHVybiAxOwotICAgICAgICBjYXNlIFRvdWNoQWN0 aW9uOjpNYW5pcHVsYXRpb246Ci0gICAgICAgICAgICByZXR1cm4gMjsKLSAgICAgICAgY2FzZSBU b3VjaEFjdGlvbjo6UGFuWDoKLSAgICAgICAgICAgIHJldHVybiAzOwotICAgICAgICBjYXNlIFRv dWNoQWN0aW9uOjpQYW5ZOgotICAgICAgICAgICAgcmV0dXJuIDQ7Ci0gICAgICAgIGNhc2UgVG91 Y2hBY3Rpb246OlBpbmNoWm9vbToKLSAgICAgICAgICAgIHJldHVybiA1OwotICAgICAgICBjYXNl IFRvdWNoQWN0aW9uOjpBdXRvOgotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIH0KLSAgICAg ICAgcmV0dXJuIDA7Ci0gICAgfTsKLQotICAgIHN0cnVjdCBUb3VjaEFjdGlvbkFuZFJHQiB7Ci0g ICAgICAgIFRvdWNoQWN0aW9uIGFjdGlvbjsKLSAgICAgICAgQVNDSUlMaXRlcmFsIG5hbWU7Ci0g ICAgICAgIEZsb2F0U2l6ZSBwaGFzZTsKLSAgICB9OwotICAgIHN0YXRpYyBjb25zdCBUb3VjaEFj dGlvbkFuZFJHQiBhY3Rpb25zQW5kQ29sb3JzW10gPSB7Ci0gICAgICAgIHsgVG91Y2hBY3Rpb246 OkF1dG8sICJhdXRvIl9zLCB7IH0gfSwKLSAgICAgICAgeyBUb3VjaEFjdGlvbjo6Tm9uZSwgIm5v bmUiX3MsIHsgfSB9LAotICAgICAgICB7IFRvdWNoQWN0aW9uOjpNYW5pcHVsYXRpb24sICJtYW5p cCJfcywgeyB9IH0sCi0gICAgICAgIHsgVG91Y2hBY3Rpb246OlBhblgsICJwYW4teCJfcywgeyB9 IH0sCi0gICAgICAgIHsgVG91Y2hBY3Rpb246OlBhblksICJwYW4teSJfcywgeyAwLCA5IH0gfSwK LSAgICAgICAgeyBUb3VjaEFjdGlvbjo6UGluY2hab29tLCAicC16Il9zLCB7IDE2LCA0LjUgfSB9 LAotICAgIH07Ci0gICAgCi0gICAgYXV0byBhY3Rpb25JbmRleCA9IHRvSW5kZXgodG91Y2hBY3Rp b24pOwotICAgIGlmICghYWN0aW9uSW5kZXggfHwgYWN0aW9uSW5kZXggPj0gQVJSQVlfU0laRShh Y3Rpb25zQW5kQ29sb3JzKSkKLSAgICAgICAgcmV0dXJuIG51bGxwdHI7CitzdHJ1Y3QgUGF0dGVy bkRlc2NyaXB0aW9uIHsKKyAgICBBU0NJSUxpdGVyYWwgbmFtZTsKKyAgICBGbG9hdFNpemUgcGhh c2U7CisgICAgUkdCQTMyIGZpbGxDb2xvcjsKK307CiAKK3N0YXRpYyBSZWZQdHI8UGF0dGVybj4g cGF0dGVybkZvckRlc2NyaXB0aW9uKFBhdHRlcm5EZXNjcmlwdGlvbiBkZXNjcmlwdGlvbiwgRmxv YXRTaXplIGNvbnRlbnRPZmZzZXQsIEdyYXBoaWNzQ29udGV4dCYgZGVzdENvbnRleHQpCit7CiAg ICAgY29uc3QgRmxvYXRTaXplIHRpbGVTaXplIHsgMzIsIDE4IH07CiAKICAgICBhdXRvIGltYWdl QnVmZmVyID0gSW1hZ2VCdWZmZXI6OmNyZWF0ZUNvbXBhdGlibGVCdWZmZXIodGlsZVNpemUsIENv bG9yU3BhY2U6OlNSR0IsIGRlc3RDb250ZXh0KTsKICAgICBpZiAoIWltYWdlQnVmZmVyKQogICAg ICAgICByZXR1cm4gbnVsbHB0cjsKIAotICAgIGNvbnN0IGF1dG8mIHRvdWNoQWN0aW9uRGF0YSA9 IGFjdGlvbnNBbmRDb2xvcnNbYWN0aW9uSW5kZXhdOwogICAgIHsKICAgICAgICAgR3JhcGhpY3ND b250ZXh0JiBpbWFnZUNvbnRleHQgPSBpbWFnZUJ1ZmZlci0+Y29udGV4dCgpOwogCkBAIC0zMTA5 LDggKzMwNzgsOCBAQCBzdGF0aWMgUmVmUHRyPFBhdHRlcm4+IHBhdHRlcm5Gb3JUb3VjaEFjdGlv bihUb3VjaEFjdGlvbiB0b3VjaEFjdGlvbiwgRmxvYXRTaXplCiAgICAgICAgIEZvbnRDYXNjYWRl IGZvbnQoV1RGTW92ZShmb250RGVzY3JpcHRpb24pLCAwLCAwKTsKICAgICAgICAgZm9udC51cGRh dGUobnVsbHB0cik7CiAKLSAgICAgICAgVGV4dFJ1biB0ZXh0UnVuID0gVGV4dFJ1bih0b3VjaEFj dGlvbkRhdGEubmFtZSk7Ci0gICAgICAgIGltYWdlQ29udGV4dC5zZXRGaWxsQ29sb3IoQ29sb3Io MCwgMCwgMCwgMTI4KSk7CisgICAgICAgIFRleHRSdW4gdGV4dFJ1biA9IFRleHRSdW4oZGVzY3Jp cHRpb24ubmFtZSk7CisgICAgICAgIGltYWdlQ29udGV4dC5zZXRGaWxsQ29sb3IoZGVzY3JpcHRp b24uZmlsbENvbG9yKTsKIAogICAgICAgICBjb25zdGV4cHIgZmxvYXQgdGV4dEdhcCA9IDQ7CiAg ICAgICAgIGNvbnN0ZXhwciBmbG9hdCB5T2Zmc2V0ID0gMTI7CkBAIC0zMTIwLDExICszMDg5LDY1 IEBAIHN0YXRpYyBSZWZQdHI8UGF0dGVybj4gcGF0dGVybkZvclRvdWNoQWN0aW9uKFRvdWNoQWN0 aW9uIHRvdWNoQWN0aW9uLCBGbG9hdFNpemUKICAgICBhdXRvIHRpbGVJbWFnZSA9IEltYWdlQnVm ZmVyOjpzaW5rSW50b0ltYWdlKFdURk1vdmUoaW1hZ2VCdWZmZXIpKTsKICAgICBhdXRvIGZpbGxQ YXR0ZXJuID0gUGF0dGVybjo6Y3JlYXRlKHRpbGVJbWFnZS5yZWxlYXNlTm9uTnVsbCgpLCB0cnVl LCB0cnVlKTsKICAgICBBZmZpbmVUcmFuc2Zvcm0gcGF0dGVybk9mZnNldFRyYW5zZm9ybTsKLSAg ICBwYXR0ZXJuT2Zmc2V0VHJhbnNmb3JtLnRyYW5zbGF0ZShjb250ZW50T2Zmc2V0ICsgdG91Y2hB Y3Rpb25EYXRhLnBoYXNlKTsKKyAgICBwYXR0ZXJuT2Zmc2V0VHJhbnNmb3JtLnRyYW5zbGF0ZShj b250ZW50T2Zmc2V0ICsgZGVzY3JpcHRpb24ucGhhc2UpOwogICAgIHBhdHRlcm5PZmZzZXRUcmFu c2Zvcm0uc2NhbGUoMSAvIGRlc3RDb250ZXh0LnNjYWxlRmFjdG9yKCkpOwogICAgIGZpbGxQYXR0 ZXJuLT5zZXRQYXR0ZXJuU3BhY2VUcmFuc2Zvcm0ocGF0dGVybk9mZnNldFRyYW5zZm9ybSk7CiAK ICAgICByZXR1cm4gZmlsbFBhdHRlcm47Cit9OworCitzdGF0aWMgUmVmUHRyPFBhdHRlcm4+IHBh dHRlcm5Gb3JUb3VjaEFjdGlvbihUb3VjaEFjdGlvbiB0b3VjaEFjdGlvbiwgRmxvYXRTaXplIGNv bnRlbnRPZmZzZXQsIEdyYXBoaWNzQ29udGV4dCYgZGVzdENvbnRleHQpCit7CisgICAgYXV0byB0 b0luZGV4ID0gW10oVG91Y2hBY3Rpb24gdG91Y2hBY3Rpb24pIC0+IHVuc2lnbmVkIHsKKyAgICAg ICAgc3dpdGNoICh0b3VjaEFjdGlvbikgeworICAgICAgICBjYXNlIFRvdWNoQWN0aW9uOjpOb25l OgorICAgICAgICAgICAgcmV0dXJuIDE7CisgICAgICAgIGNhc2UgVG91Y2hBY3Rpb246Ok1hbmlw dWxhdGlvbjoKKyAgICAgICAgICAgIHJldHVybiAyOworICAgICAgICBjYXNlIFRvdWNoQWN0aW9u OjpQYW5YOgorICAgICAgICAgICAgcmV0dXJuIDM7CisgICAgICAgIGNhc2UgVG91Y2hBY3Rpb246 OlBhblk6CisgICAgICAgICAgICByZXR1cm4gNDsKKyAgICAgICAgY2FzZSBUb3VjaEFjdGlvbjo6 UGluY2hab29tOgorICAgICAgICAgICAgcmV0dXJuIDU7CisgICAgICAgIGNhc2UgVG91Y2hBY3Rp b246OkF1dG86CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgfQorICAgICAgICByZXR1cm4g MDsKKyAgICB9OworCisgICAgY29uc3RleHByIGF1dG8gZmlsbENvbG9yID0gbWFrZVJHQkEoMCwg MCwgMCwgMTI4KTsKKworICAgIHN0YXRpYyBjb25zdCBQYXR0ZXJuRGVzY3JpcHRpb24gcGF0dGVy bkRlc2NyaXB0aW9uc1tdID0geworICAgICAgICB7ICJhdXRvIl9zLCB7IH0sIGZpbGxDb2xvciB9 LAorICAgICAgICB7ICJub25lIl9zLCB7IH0sIGZpbGxDb2xvciB9LAorICAgICAgICB7ICJtYW5p cCJfcywgeyB9LCBmaWxsQ29sb3IgfSwKKyAgICAgICAgeyAicGFuLXgiX3MsIHsgfSwgZmlsbENv bG9yIH0sCisgICAgICAgIHsgInBhbi15Il9zLCB7IDAsIDkgfSwgZmlsbENvbG9yIH0sCisgICAg ICAgIHsgInAteiJfcywgeyAxNiwgNC41IH0sIGZpbGxDb2xvciB9LAorICAgIH07CisgICAgCisg ICAgYXV0byBhY3Rpb25JbmRleCA9IHRvSW5kZXgodG91Y2hBY3Rpb24pOworICAgIGlmICghYWN0 aW9uSW5kZXggfHwgYWN0aW9uSW5kZXggPj0gQVJSQVlfU0laRShwYXR0ZXJuRGVzY3JpcHRpb25z KSkKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisKKyAgICByZXR1cm4gcGF0dGVybkZvckRlc2Ny aXB0aW9uKHBhdHRlcm5EZXNjcmlwdGlvbnNbYWN0aW9uSW5kZXhdLCBjb250ZW50T2Zmc2V0LCBk ZXN0Q29udGV4dCk7Cit9CisKK3N0YXRpYyBSZWZQdHI8UGF0dGVybj4gcGF0dGVybkZvckV2ZW50 TGlzdGVuZXJSZWdpb25UeXBlKEV2ZW50TGlzdGVuZXJSZWdpb25UeXBlIHR5cGUsIEZsb2F0U2l6 ZSBjb250ZW50T2Zmc2V0LCBHcmFwaGljc0NvbnRleHQmIGRlc3RDb250ZXh0KQoreworICAgIGNv bnN0ZXhwciBhdXRvIGZpbGxDb2xvciA9IG1ha2VSR0JBKDAsIDEyOCwgMCwgMTI4KTsKKworICAg IGF1dG8gcGF0dGVybkFuZFBoYXNlID0gWyZdKCkgLT4gUGF0dGVybkRlc2NyaXB0aW9uIHsKKyAg ICAgICAgc3dpdGNoICh0eXBlKSB7CisgICAgICAgIGNhc2UgRXZlbnRMaXN0ZW5lclJlZ2lvblR5 cGU6OldoZWVsOgorICAgICAgICAgICAgcmV0dXJuIHsgIndoZWVsIl9zLCB7IH0sIGZpbGxDb2xv ciB9OworICAgICAgICBjYXNlIEV2ZW50TGlzdGVuZXJSZWdpb25UeXBlOjpOb25QYXNzaXZlV2hl ZWw6CisgICAgICAgICAgICByZXR1cm4geyAic3luYyJfcywgeyAwLCA5IH0sIGZpbGxDb2xvciB9 OworICAgICAgICB9CisgICAgfSgpOworCisgICAgcmV0dXJuIHBhdHRlcm5Gb3JEZXNjcmlwdGlv bihwYXR0ZXJuQW5kUGhhc2UsIGNvbnRlbnRPZmZzZXQsIGRlc3RDb250ZXh0KTsKIH0KIAogdm9p ZCBSZW5kZXJMYXllckJhY2tpbmc6OnBhaW50RGVidWdPdmVybGF5cyhjb25zdCBHcmFwaGljc0xh eWVyKiBncmFwaGljc0xheWVyLCBHcmFwaGljc0NvbnRleHQmIGNvbnRleHQpCkBAIC0zMTcyLDYg KzMxOTUsMTcgQEAgdm9pZCBSZW5kZXJMYXllckJhY2tpbmc6OnBhaW50RGVidWdPdmVybGF5cyhj b25zdCBHcmFwaGljc0xheWVyKiBncmFwaGljc0xheWVyLAogICAgICAgICB9CiAgICAgfQogCisg ICAgaWYgKHZpc2libGVEZWJ1Z092ZXJsYXlSZWdpb25zICYgV2hlZWxFdmVudEhhbmRsZXJSZWdp b24pIHsKKyAgICAgICAgZm9yIChhdXRvIHR5cGUgOiB7IEV2ZW50TGlzdGVuZXJSZWdpb25UeXBl OjpXaGVlbCwgRXZlbnRMaXN0ZW5lclJlZ2lvblR5cGU6Ok5vblBhc3NpdmVXaGVlbCB9KSB7Cisg ICAgICAgICAgICBhdXRvIGZpbGxQYXR0ZXJuID0gcGF0dGVybkZvckV2ZW50TGlzdGVuZXJSZWdp b25UeXBlKHR5cGUsIGNvbnRlbnRPZmZzZXRJbkNvbXBvc2l0aW5nTGF5ZXIoKSwgY29udGV4dCk7 CisgICAgICAgICAgICBjb250ZXh0LnNldEZpbGxQYXR0ZXJuKGZpbGxQYXR0ZXJuLnJlbGVhc2VO b25OdWxsKCkpOworCisgICAgICAgICAgICBhdXRvJiByZWdpb24gPSBncmFwaGljc0xheWVyLT5l dmVudFJlZ2lvbigpLmV2ZW50TGlzdGVuZXJSZWdpb25Gb3JUeXBlKHR5cGUpOworICAgICAgICAg ICAgZm9yIChhdXRvIHJlY3QgOiByZWdpb24ucmVjdHMoKSkKKyAgICAgICAgICAgICAgICBjb250 ZXh0LmZpbGxSZWN0KHJlY3QpOworICAgICAgICB9CisgICAgfQorCiAjaWYgRU5BQkxFKEVESVRB QkxFX1JFR0lPTikKICAgICAvLyBQYWludCByZWN0cyBmb3IgZWRpdGFibGUgZWxlbWVudHMuCiAg ICAgaWYgKHZpc2libGVEZWJ1Z092ZXJsYXlSZWdpb25zICYgRWRpdGFibGVFbGVtZW50UmVnaW9u KSB7CkBAIC0zMjIxLDcgKzMyNTUsNyBAQCB2b2lkIFJlbmRlckxheWVyQmFja2luZzo6cGFpbnRD b250ZW50cyhjb25zdCBHcmFwaGljc0xheWVyKiBncmFwaGljc0xheWVyLCBHcmFwaAogCiAgICAg ICAgIHBhaW50SW50b0xheWVyKGdyYXBoaWNzTGF5ZXIsIGNvbnRleHQsIGRpcnR5UmVjdCwgYmVo YXZpb3IpOwogCi0gICAgICAgIGlmIChyZW5kZXJlcigpLnNldHRpbmdzKCkudmlzaWJsZURlYnVn T3ZlcmxheVJlZ2lvbnMoKSAmIChUb3VjaEFjdGlvblJlZ2lvbiB8IEVkaXRhYmxlRWxlbWVudFJl Z2lvbikpCisgICAgICAgIGlmIChyZW5kZXJlcigpLnNldHRpbmdzKCkudmlzaWJsZURlYnVnT3Zl cmxheVJlZ2lvbnMoKSAmIChUb3VjaEFjdGlvblJlZ2lvbiB8IEVkaXRhYmxlRWxlbWVudFJlZ2lv biB8IFdoZWVsRXZlbnRIYW5kbGVyUmVnaW9uKSkKICAgICAgICAgICAgIHBhaW50RGVidWdPdmVy bGF5cyhncmFwaGljc0xheWVyLCBjb250ZXh0KTsKIAogICAgIH0gZWxzZSBpZiAoZ3JhcGhpY3NM YXllciA9PSBsYXllckZvckhvcml6b250YWxTY3JvbGxiYXIoKSkgewo= 399280 2020-05-13 11:04:52 -0700 2020-05-13 12:24:06 -0700 patch wheel-region-debug-paint-2.patch text/plain 11636 koivisto ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA5NjY5OWI2OGIwMi4uNzczODJhM2UwM2MgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzNCBAQAorMjAyMC0wNS0xMyAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+ CisKKyAgICAgICAgW1doZWVsIGV2ZW50IHJlZ2lvbl0gRGVidWcgb3ZlcmxheQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjExODUwCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgU2ltb24gRnJhc2VyLgorCisgICAgICAgIFRoaXMgaXMgdGllZCB0byB0aGUg ZXhpc3RpbmcgV2hlZWwgZXZlbnQgaGFuZGxlciBvdmVybGF5IGRlYnVnIGZsYWcuCisKKyAgICAg ICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9Db2xvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjptYWtl UkdCKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6Om1ha2VSR0JBKTogRGVsZXRlZC4KKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9Db2xvci5oOgorICAgICAgICAoV2ViQ29yZTo6bWFr ZVJHQik6CisgICAgICAgIChXZWJDb3JlOjptYWtlUkdCQSk6CisKKyAgICAgICAgTWFrZSBjb25z dGV4cHIuCisKKyAgICAgICAgKiByZW5kZXJpbmcvRXZlbnRSZWdpb24uY3BwOgorICAgICAgICAo V2ViQ29yZTo6RXZlbnRSZWdpb246OmV2ZW50TGlzdGVuZXJSZWdpb25Gb3JUeXBlIGNvbnN0KToK KyAgICAgICAgKiByZW5kZXJpbmcvRXZlbnRSZWdpb24uaDoKKyAgICAgICAgKiByZW5kZXJpbmcv UmVuZGVyTGF5ZXJCYWNraW5nLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnBhdHRlcm5Gb3JEZXNj cmlwdGlvbik6CisKKyAgICAgICAgRmFjdG9yIGludG8gYSBmdW5jdGlvbi4KKworICAgICAgICAo V2ViQ29yZTo6cGF0dGVybkZvclRvdWNoQWN0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OnBhdHRl cm5Gb3JFdmVudExpc3RlbmVyUmVnaW9uVHlwZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJM YXllckJhY2tpbmc6OnBhaW50RGVidWdPdmVybGF5cyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJMYXllckJhY2tpbmc6OnBhaW50Q29udGVudHMpOgorCiAyMDIwLTA1LTEzICBaYW4gRG9iZXJz ZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OKHIyNjEwMjMp OiBbR1RLXVtXUEVdIFNldmVyYWwgV2ViR0wgdGVzdHMgYXJlIGZhaWxpbmcKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0NvbG9yLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL0NvbG9yLmNwcAppbmRleCBiNWEyYTI0ZWRhMC4uNzM4MDI1 ZTUzNTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0NvbG9y LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Db2xvci5jcHAKQEAg LTUwLDE2ICs1MCw2IEBAIHN0YXRpYyBpbmxpbmUgdW5zaWduZWQgdW5wcmVtdWx0aXBsaWVkQ2hh bm5lbCh1bnNpZ25lZCBjLCB1bnNpZ25lZCBhKQogICAgIHJldHVybiAoZmFzdE11bHRpcGx5Qnky NTUoYykgKyBhIC0gMSkgLyBhOwogfQogCi1SR0JBMzIgbWFrZVJHQihpbnQgciwgaW50IGcsIGlu dCBiKQotewotICAgIHJldHVybiBtYWtlUkdCQShyLCBnLCBiLCAweEZGKTsKLX0KLQotUkdCQTMy IG1ha2VSR0JBKGludCByLCBpbnQgZywgaW50IGIsIGludCBhKQotewotICAgIHJldHVybiB7IHN0 YXRpY19jYXN0PHVuc2lnbmVkPihzdGQ6Om1heCgwLCBzdGQ6Om1pbihhLCAweEZGKSkgPDwgMjQg fCBzdGQ6Om1heCgwLCBzdGQ6Om1pbihyLCAweEZGKSkgPDwgMTYgfCBzdGQ6Om1heCgwLCBzdGQ6 Om1pbihnLCAweEZGKSkgPDwgOCB8IHN0ZDo6bWF4KDAsIHN0ZDo6bWluKGIsIDB4RkYpKSkgfTsK LX0KLQogUkdCQTMyIG1ha2VQcmVtdWx0aXBsaWVkUkdCQShpbnQgciwgaW50IGcsIGludCBiLCBp bnQgYSwgYm9vbCBjZWlsaW5nKQogewogICAgIHJldHVybiBtYWtlUkdCQShwcmVtdWx0aXBsaWVk Q2hhbm5lbChyLCBhLCBjZWlsaW5nKSwgcHJlbXVsdGlwbGllZENoYW5uZWwoZywgYSwgY2VpbGlu ZyksIHByZW11bHRpcGxpZWRDaGFubmVsKGIsIGEsIGNlaWxpbmcpLCBhKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0NvbG9yLmggYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9Db2xvci5oCmluZGV4IDAxNGQxNGVjMDc3Li5iOTQyNGNjNGMz MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvQ29sb3IuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Db2xvci5oCkBAIC04NCw4ICs4 NCw4IEBAIGJvb2wgb3BlcmF0b3IhPShTaW1wbGVDb2xvciwgU2ltcGxlQ29sb3IpOwogLy8gRklY TUU6IFJlbW92ZSB0aGlzIGFmdGVyIG1pZ3JhdGluZyB0byB0aGUgbmV3IG5hbWUuCiB1c2luZyBS R0JBMzIgPSBTaW1wbGVDb2xvcjsKIAotV0VCQ09SRV9FWFBPUlQgUkdCQTMyIG1ha2VSR0IoaW50 IHIsIGludCBnLCBpbnQgYik7Ci1XRUJDT1JFX0VYUE9SVCBSR0JBMzIgbWFrZVJHQkEoaW50IHIs IGludCBnLCBpbnQgYiwgaW50IGEpOworY29uc3RleHByIFJHQkEzMiBtYWtlUkdCKGludCByLCBp bnQgZywgaW50IGIpOworY29uc3RleHByIFJHQkEzMiBtYWtlUkdCQShpbnQgciwgaW50IGcsIGlu dCBiLCBpbnQgYSk7CiAKIFJHQkEzMiBtYWtlUHJlbXVsdGlwbGllZFJHQkEoaW50IHIsIGludCBn LCBpbnQgYiwgaW50IGEsIGJvb2wgY2VpbGluZyA9IHRydWUpOwogUkdCQTMyIG1ha2VVblByZW11 bHRpcGxpZWRSR0JBKGludCByLCBpbnQgZywgaW50IGIsIGludCBhKTsKQEAgLTQxOCw2ICs0MTgs MTYgQEAgaW5saW5lIGJvb2wgQ29sb3I6OmlzV2hpdGVDb2xvcihjb25zdCBDb2xvciYgY29sb3Ip CiAgICAgcmV0dXJuIGNvbG9yLnJnYigpID09IENvbG9yOjp3aGl0ZTsKIH0KIAorY29uc3RleHBy IFJHQkEzMiBtYWtlUkdCKGludCByLCBpbnQgZywgaW50IGIpCit7CisgICAgcmV0dXJuIG1ha2VS R0JBKHIsIGcsIGIsIDB4RkYpOworfQorCitjb25zdGV4cHIgUkdCQTMyIG1ha2VSR0JBKGludCBy LCBpbnQgZywgaW50IGIsIGludCBhKQoreworICAgIHJldHVybiB7IHN0YXRpY19jYXN0PHVuc2ln bmVkPihzdGQ6Om1heCgwLCBzdGQ6Om1pbihhLCAweEZGKSkgPDwgMjQgfCBzdGQ6Om1heCgwLCBz dGQ6Om1pbihyLCAweEZGKSkgPDwgMTYgfCBzdGQ6Om1heCgwLCBzdGQ6Om1pbihnLCAweEZGKSkg PDwgOCB8IHN0ZDo6bWF4KDAsIHN0ZDo6bWluKGIsIDB4RkYpKSkgfTsKK30KKwogfSAvLyBuYW1l c3BhY2UgV2ViQ29yZQogCiBuYW1lc3BhY2UgV1RGIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9FdmVudFJlZ2lvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv RXZlbnRSZWdpb24uY3BwCmluZGV4IGYwYTk4YjFmZjE3Li4yMjhjMWMwZTNjMyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0V2ZW50UmVnaW9uLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvRXZlbnRSZWdpb24uY3BwCkBAIC0yNDAsNiArMjQwLDE4IEBAIE9w dGlvblNldDxFdmVudExpc3RlbmVyUmVnaW9uVHlwZT4gRXZlbnRSZWdpb246OmV2ZW50TGlzdGVu ZXJSZWdpb25UeXBlc0ZvclBvaW50CiAgICAgcmV0dXJuIHJlZ2lvblR5cGVzOwogfQogCitjb25z dCBSZWdpb24mIEV2ZW50UmVnaW9uOjpldmVudExpc3RlbmVyUmVnaW9uRm9yVHlwZShFdmVudExp c3RlbmVyUmVnaW9uVHlwZSB0eXBlKSBjb25zdAoreworICAgIHN3aXRjaCAodHlwZSkgeworICAg IGNhc2UgRXZlbnRMaXN0ZW5lclJlZ2lvblR5cGU6OldoZWVsOgorICAgICAgICByZXR1cm4gbV93 aGVlbEV2ZW50TGlzdGVuZXJSZWdpb247CisgICAgY2FzZSBFdmVudExpc3RlbmVyUmVnaW9uVHlw ZTo6Tm9uUGFzc2l2ZVdoZWVsOgorICAgICAgICByZXR1cm4gbV9ub25QYXNzaXZlV2hlZWxFdmVu dExpc3RlbmVyUmVnaW9uOworICAgIH0KKyAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICBy ZXR1cm4gbV93aGVlbEV2ZW50TGlzdGVuZXJSZWdpb247Cit9CisKICNpZiBFTkFCTEUoRURJVEFC TEVfUkVHSU9OKQogCiBib29sIEV2ZW50UmVnaW9uOjpjb250YWluc0VkaXRhYmxlRWxlbWVudHNJ blJlY3QoY29uc3QgSW50UmVjdCYgcmVjdCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9FdmVudFJlZ2lvbi5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0V2 ZW50UmVnaW9uLmgKaW5kZXggOTg2MmYzMzY4NDcuLmE3MDE0MDRjOWYyIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvRXZlbnRSZWdpb24uaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvRXZlbnRSZWdpb24uaApAQCAtODAsNiArODAsNyBAQCBwdWJsaWM6CiAgICAg Y29uc3QgUmVnaW9uKiByZWdpb25Gb3JUb3VjaEFjdGlvbihUb3VjaEFjdGlvbikgY29uc3Q7CiAK ICAgICBPcHRpb25TZXQ8RXZlbnRMaXN0ZW5lclJlZ2lvblR5cGU+IGV2ZW50TGlzdGVuZXJSZWdp b25UeXBlc0ZvclBvaW50KGNvbnN0IEludFBvaW50JikgY29uc3Q7CisgICAgY29uc3QgUmVnaW9u JiBldmVudExpc3RlbmVyUmVnaW9uRm9yVHlwZShFdmVudExpc3RlbmVyUmVnaW9uVHlwZSkgY29u c3Q7CiAKICNpZiBFTkFCTEUoRURJVEFCTEVfUkVHSU9OKQogICAgIFdFQkNPUkVfRVhQT1JUIGJv b2wgY29udGFpbnNFZGl0YWJsZUVsZW1lbnRzSW5SZWN0KGNvbnN0IEludFJlY3QmKSBjb25zdDsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcu Y3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAKaW5k ZXggNTRmOWQzMzVmMTIuLjUxOTJhMzJhZTM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcApAQCAtMzA1Myw1MSArMzA1MywyMCBAQCBPcHRp b25TZXQ8UmVuZGVyTGF5ZXI6OlBhaW50TGF5ZXJGbGFnPiBSZW5kZXJMYXllckJhY2tpbmc6OnBh aW50RmxhZ3NGb3JMYXllcihjbwogICAgIHJldHVybiBwYWludEZsYWdzOwogfQogCi1zdGF0aWMg UmVmUHRyPFBhdHRlcm4+IHBhdHRlcm5Gb3JUb3VjaEFjdGlvbihUb3VjaEFjdGlvbiB0b3VjaEFj dGlvbiwgRmxvYXRTaXplIGNvbnRlbnRPZmZzZXQsIEdyYXBoaWNzQ29udGV4dCYgZGVzdENvbnRl eHQpCi17Ci0gICAgYXV0byB0b0luZGV4ID0gW10oVG91Y2hBY3Rpb24gdG91Y2hBY3Rpb24pIC0+ IHVuc2lnbmVkIHsKLSAgICAgICAgc3dpdGNoICh0b3VjaEFjdGlvbikgewotICAgICAgICBjYXNl IFRvdWNoQWN0aW9uOjpOb25lOgotICAgICAgICAgICAgcmV0dXJuIDE7Ci0gICAgICAgIGNhc2Ug VG91Y2hBY3Rpb246Ok1hbmlwdWxhdGlvbjoKLSAgICAgICAgICAgIHJldHVybiAyOwotICAgICAg ICBjYXNlIFRvdWNoQWN0aW9uOjpQYW5YOgotICAgICAgICAgICAgcmV0dXJuIDM7Ci0gICAgICAg IGNhc2UgVG91Y2hBY3Rpb246OlBhblk6Ci0gICAgICAgICAgICByZXR1cm4gNDsKLSAgICAgICAg Y2FzZSBUb3VjaEFjdGlvbjo6UGluY2hab29tOgotICAgICAgICAgICAgcmV0dXJuIDU7Ci0gICAg ICAgIGNhc2UgVG91Y2hBY3Rpb246OkF1dG86Ci0gICAgICAgICAgICBicmVhazsKLSAgICAgICAg fQotICAgICAgICByZXR1cm4gMDsKLSAgICB9OwotCi0gICAgc3RydWN0IFRvdWNoQWN0aW9uQW5k UkdCIHsKLSAgICAgICAgVG91Y2hBY3Rpb24gYWN0aW9uOwotICAgICAgICBBU0NJSUxpdGVyYWwg bmFtZTsKLSAgICAgICAgRmxvYXRTaXplIHBoYXNlOwotICAgIH07Ci0gICAgc3RhdGljIGNvbnN0 IFRvdWNoQWN0aW9uQW5kUkdCIGFjdGlvbnNBbmRDb2xvcnNbXSA9IHsKLSAgICAgICAgeyBUb3Vj aEFjdGlvbjo6QXV0bywgImF1dG8iX3MsIHsgfSB9LAotICAgICAgICB7IFRvdWNoQWN0aW9uOjpO b25lLCAibm9uZSJfcywgeyB9IH0sCi0gICAgICAgIHsgVG91Y2hBY3Rpb246Ok1hbmlwdWxhdGlv biwgIm1hbmlwIl9zLCB7IH0gfSwKLSAgICAgICAgeyBUb3VjaEFjdGlvbjo6UGFuWCwgInBhbi14 Il9zLCB7IH0gfSwKLSAgICAgICAgeyBUb3VjaEFjdGlvbjo6UGFuWSwgInBhbi15Il9zLCB7IDAs IDkgfSB9LAotICAgICAgICB7IFRvdWNoQWN0aW9uOjpQaW5jaFpvb20sICJwLXoiX3MsIHsgMTYs IDQuNSB9IH0sCi0gICAgfTsKLSAgICAKLSAgICBhdXRvIGFjdGlvbkluZGV4ID0gdG9JbmRleCh0 b3VjaEFjdGlvbik7Ci0gICAgaWYgKCFhY3Rpb25JbmRleCB8fCBhY3Rpb25JbmRleCA+PSBBUlJB WV9TSVpFKGFjdGlvbnNBbmRDb2xvcnMpKQotICAgICAgICByZXR1cm4gbnVsbHB0cjsKK3N0cnVj dCBQYXR0ZXJuRGVzY3JpcHRpb24geworICAgIEFTQ0lJTGl0ZXJhbCBuYW1lOworICAgIEZsb2F0 U2l6ZSBwaGFzZTsKKyAgICBSR0JBMzIgZmlsbENvbG9yOworfTsKIAorc3RhdGljIFJlZlB0cjxQ YXR0ZXJuPiBwYXR0ZXJuRm9yRGVzY3JpcHRpb24oUGF0dGVybkRlc2NyaXB0aW9uIGRlc2NyaXB0 aW9uLCBGbG9hdFNpemUgY29udGVudE9mZnNldCwgR3JhcGhpY3NDb250ZXh0JiBkZXN0Q29udGV4 dCkKK3sKICAgICBjb25zdCBGbG9hdFNpemUgdGlsZVNpemUgeyAzMiwgMTggfTsKIAogICAgIGF1 dG8gaW1hZ2VCdWZmZXIgPSBJbWFnZUJ1ZmZlcjo6Y3JlYXRlQ29tcGF0aWJsZUJ1ZmZlcih0aWxl U2l6ZSwgQ29sb3JTcGFjZTo6U1JHQiwgZGVzdENvbnRleHQpOwogICAgIGlmICghaW1hZ2VCdWZm ZXIpCiAgICAgICAgIHJldHVybiBudWxscHRyOwogCi0gICAgY29uc3QgYXV0byYgdG91Y2hBY3Rp b25EYXRhID0gYWN0aW9uc0FuZENvbG9yc1thY3Rpb25JbmRleF07CiAgICAgewogICAgICAgICBH cmFwaGljc0NvbnRleHQmIGltYWdlQ29udGV4dCA9IGltYWdlQnVmZmVyLT5jb250ZXh0KCk7CiAK QEAgLTMxMDksOCArMzA3OCw4IEBAIHN0YXRpYyBSZWZQdHI8UGF0dGVybj4gcGF0dGVybkZvclRv dWNoQWN0aW9uKFRvdWNoQWN0aW9uIHRvdWNoQWN0aW9uLCBGbG9hdFNpemUKICAgICAgICAgRm9u dENhc2NhZGUgZm9udChXVEZNb3ZlKGZvbnREZXNjcmlwdGlvbiksIDAsIDApOwogICAgICAgICBm b250LnVwZGF0ZShudWxscHRyKTsKIAotICAgICAgICBUZXh0UnVuIHRleHRSdW4gPSBUZXh0UnVu KHRvdWNoQWN0aW9uRGF0YS5uYW1lKTsKLSAgICAgICAgaW1hZ2VDb250ZXh0LnNldEZpbGxDb2xv cihDb2xvcigwLCAwLCAwLCAxMjgpKTsKKyAgICAgICAgVGV4dFJ1biB0ZXh0UnVuID0gVGV4dFJ1 bihkZXNjcmlwdGlvbi5uYW1lKTsKKyAgICAgICAgaW1hZ2VDb250ZXh0LnNldEZpbGxDb2xvcihk ZXNjcmlwdGlvbi5maWxsQ29sb3IpOwogCiAgICAgICAgIGNvbnN0ZXhwciBmbG9hdCB0ZXh0R2Fw ID0gNDsKICAgICAgICAgY29uc3RleHByIGZsb2F0IHlPZmZzZXQgPSAxMjsKQEAgLTMxMjAsMTEg KzMwODksNjcgQEAgc3RhdGljIFJlZlB0cjxQYXR0ZXJuPiBwYXR0ZXJuRm9yVG91Y2hBY3Rpb24o VG91Y2hBY3Rpb24gdG91Y2hBY3Rpb24sIEZsb2F0U2l6ZQogICAgIGF1dG8gdGlsZUltYWdlID0g SW1hZ2VCdWZmZXI6OnNpbmtJbnRvSW1hZ2UoV1RGTW92ZShpbWFnZUJ1ZmZlcikpOwogICAgIGF1 dG8gZmlsbFBhdHRlcm4gPSBQYXR0ZXJuOjpjcmVhdGUodGlsZUltYWdlLnJlbGVhc2VOb25OdWxs KCksIHRydWUsIHRydWUpOwogICAgIEFmZmluZVRyYW5zZm9ybSBwYXR0ZXJuT2Zmc2V0VHJhbnNm b3JtOwotICAgIHBhdHRlcm5PZmZzZXRUcmFuc2Zvcm0udHJhbnNsYXRlKGNvbnRlbnRPZmZzZXQg KyB0b3VjaEFjdGlvbkRhdGEucGhhc2UpOworICAgIHBhdHRlcm5PZmZzZXRUcmFuc2Zvcm0udHJh bnNsYXRlKGNvbnRlbnRPZmZzZXQgKyBkZXNjcmlwdGlvbi5waGFzZSk7CiAgICAgcGF0dGVybk9m ZnNldFRyYW5zZm9ybS5zY2FsZSgxIC8gZGVzdENvbnRleHQuc2NhbGVGYWN0b3IoKSk7CiAgICAg ZmlsbFBhdHRlcm4tPnNldFBhdHRlcm5TcGFjZVRyYW5zZm9ybShwYXR0ZXJuT2Zmc2V0VHJhbnNm b3JtKTsKIAogICAgIHJldHVybiBmaWxsUGF0dGVybjsKK307CisKK3N0YXRpYyBSZWZQdHI8UGF0 dGVybj4gcGF0dGVybkZvclRvdWNoQWN0aW9uKFRvdWNoQWN0aW9uIHRvdWNoQWN0aW9uLCBGbG9h dFNpemUgY29udGVudE9mZnNldCwgR3JhcGhpY3NDb250ZXh0JiBkZXN0Q29udGV4dCkKK3sKKyAg ICBhdXRvIHRvSW5kZXggPSBbXShUb3VjaEFjdGlvbiB0b3VjaEFjdGlvbikgLT4gdW5zaWduZWQg eworICAgICAgICBzd2l0Y2ggKHRvdWNoQWN0aW9uKSB7CisgICAgICAgIGNhc2UgVG91Y2hBY3Rp b246Ok5vbmU6CisgICAgICAgICAgICByZXR1cm4gMTsKKyAgICAgICAgY2FzZSBUb3VjaEFjdGlv bjo6TWFuaXB1bGF0aW9uOgorICAgICAgICAgICAgcmV0dXJuIDI7CisgICAgICAgIGNhc2UgVG91 Y2hBY3Rpb246OlBhblg6CisgICAgICAgICAgICByZXR1cm4gMzsKKyAgICAgICAgY2FzZSBUb3Vj aEFjdGlvbjo6UGFuWToKKyAgICAgICAgICAgIHJldHVybiA0OworICAgICAgICBjYXNlIFRvdWNo QWN0aW9uOjpQaW5jaFpvb206CisgICAgICAgICAgICByZXR1cm4gNTsKKyAgICAgICAgY2FzZSBU b3VjaEFjdGlvbjo6QXV0bzoKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICB9CisgICAgICAg IHJldHVybiAwOworICAgIH07CisKKyAgICBjb25zdGV4cHIgYXV0byBmaWxsQ29sb3IgPSBtYWtl UkdCQSgwLCAwLCAwLCAxMjgpOworCisgICAgc3RhdGljIGNvbnN0IFBhdHRlcm5EZXNjcmlwdGlv biBwYXR0ZXJuRGVzY3JpcHRpb25zW10gPSB7CisgICAgICAgIHsgImF1dG8iX3MsIHsgfSwgZmls bENvbG9yIH0sCisgICAgICAgIHsgIm5vbmUiX3MsIHsgfSwgZmlsbENvbG9yIH0sCisgICAgICAg IHsgIm1hbmlwIl9zLCB7IH0sIGZpbGxDb2xvciB9LAorICAgICAgICB7ICJwYW4teCJfcywgeyB9 LCBmaWxsQ29sb3IgfSwKKyAgICAgICAgeyAicGFuLXkiX3MsIHsgMCwgOSB9LCBmaWxsQ29sb3Ig fSwKKyAgICAgICAgeyAicC16Il9zLCB7IDE2LCA0LjUgfSwgZmlsbENvbG9yIH0sCisgICAgfTsK KyAgICAKKyAgICBhdXRvIGFjdGlvbkluZGV4ID0gdG9JbmRleCh0b3VjaEFjdGlvbik7CisgICAg aWYgKCFhY3Rpb25JbmRleCB8fCBhY3Rpb25JbmRleCA+PSBBUlJBWV9TSVpFKHBhdHRlcm5EZXNj cmlwdGlvbnMpKQorICAgICAgICByZXR1cm4gbnVsbHB0cjsKKworICAgIHJldHVybiBwYXR0ZXJu Rm9yRGVzY3JpcHRpb24ocGF0dGVybkRlc2NyaXB0aW9uc1thY3Rpb25JbmRleF0sIGNvbnRlbnRP ZmZzZXQsIGRlc3RDb250ZXh0KTsKK30KKworc3RhdGljIFJlZlB0cjxQYXR0ZXJuPiBwYXR0ZXJu Rm9yRXZlbnRMaXN0ZW5lclJlZ2lvblR5cGUoRXZlbnRMaXN0ZW5lclJlZ2lvblR5cGUgdHlwZSwg RmxvYXRTaXplIGNvbnRlbnRPZmZzZXQsIEdyYXBoaWNzQ29udGV4dCYgZGVzdENvbnRleHQpCit7 CisgICAgY29uc3RleHByIGF1dG8gZmlsbENvbG9yID0gbWFrZVJHQkEoMCwgMTI4LCAwLCAxMjgp OworCisgICAgYXV0byBwYXR0ZXJuQW5kUGhhc2UgPSBbJl0oKSAtPiBQYXR0ZXJuRGVzY3JpcHRp b24geworICAgICAgICBzd2l0Y2ggKHR5cGUpIHsKKyAgICAgICAgY2FzZSBFdmVudExpc3RlbmVy UmVnaW9uVHlwZTo6V2hlZWw6CisgICAgICAgICAgICByZXR1cm4geyAid2hlZWwiX3MsIHsgfSwg ZmlsbENvbG9yIH07CisgICAgICAgIGNhc2UgRXZlbnRMaXN0ZW5lclJlZ2lvblR5cGU6Ok5vblBh c3NpdmVXaGVlbDoKKyAgICAgICAgICAgIHJldHVybiB7ICJzeW5jIl9zLCB7IDAsIDkgfSwgZmls bENvbG9yIH07CisgICAgICAgIH0KKyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAg ICAgIHJldHVybiB7ICIiX3MsIHsgfSwgZmlsbENvbG9yIH07CisgICAgfSgpOworCisgICAgcmV0 dXJuIHBhdHRlcm5Gb3JEZXNjcmlwdGlvbihwYXR0ZXJuQW5kUGhhc2UsIGNvbnRlbnRPZmZzZXQs IGRlc3RDb250ZXh0KTsKIH0KIAogdm9pZCBSZW5kZXJMYXllckJhY2tpbmc6OnBhaW50RGVidWdP dmVybGF5cyhjb25zdCBHcmFwaGljc0xheWVyKiBncmFwaGljc0xheWVyLCBHcmFwaGljc0NvbnRl eHQmIGNvbnRleHQpCkBAIC0zMTcyLDYgKzMxOTcsMTcgQEAgdm9pZCBSZW5kZXJMYXllckJhY2tp bmc6OnBhaW50RGVidWdPdmVybGF5cyhjb25zdCBHcmFwaGljc0xheWVyKiBncmFwaGljc0xheWVy LAogICAgICAgICB9CiAgICAgfQogCisgICAgaWYgKHZpc2libGVEZWJ1Z092ZXJsYXlSZWdpb25z ICYgV2hlZWxFdmVudEhhbmRsZXJSZWdpb24pIHsKKyAgICAgICAgZm9yIChhdXRvIHR5cGUgOiB7 IEV2ZW50TGlzdGVuZXJSZWdpb25UeXBlOjpXaGVlbCwgRXZlbnRMaXN0ZW5lclJlZ2lvblR5cGU6 Ok5vblBhc3NpdmVXaGVlbCB9KSB7CisgICAgICAgICAgICBhdXRvIGZpbGxQYXR0ZXJuID0gcGF0 dGVybkZvckV2ZW50TGlzdGVuZXJSZWdpb25UeXBlKHR5cGUsIGNvbnRlbnRPZmZzZXRJbkNvbXBv c2l0aW5nTGF5ZXIoKSwgY29udGV4dCk7CisgICAgICAgICAgICBjb250ZXh0LnNldEZpbGxQYXR0 ZXJuKGZpbGxQYXR0ZXJuLnJlbGVhc2VOb25OdWxsKCkpOworCisgICAgICAgICAgICBhdXRvJiBy ZWdpb24gPSBncmFwaGljc0xheWVyLT5ldmVudFJlZ2lvbigpLmV2ZW50TGlzdGVuZXJSZWdpb25G b3JUeXBlKHR5cGUpOworICAgICAgICAgICAgZm9yIChhdXRvIHJlY3QgOiByZWdpb24ucmVjdHMo KSkKKyAgICAgICAgICAgICAgICBjb250ZXh0LmZpbGxSZWN0KHJlY3QpOworICAgICAgICB9Cisg ICAgfQorCiAjaWYgRU5BQkxFKEVESVRBQkxFX1JFR0lPTikKICAgICAvLyBQYWludCByZWN0cyBm b3IgZWRpdGFibGUgZWxlbWVudHMuCiAgICAgaWYgKHZpc2libGVEZWJ1Z092ZXJsYXlSZWdpb25z ICYgRWRpdGFibGVFbGVtZW50UmVnaW9uKSB7CkBAIC0zMjIxLDcgKzMyNTcsNyBAQCB2b2lkIFJl bmRlckxheWVyQmFja2luZzo6cGFpbnRDb250ZW50cyhjb25zdCBHcmFwaGljc0xheWVyKiBncmFw aGljc0xheWVyLCBHcmFwaAogCiAgICAgICAgIHBhaW50SW50b0xheWVyKGdyYXBoaWNzTGF5ZXIs IGNvbnRleHQsIGRpcnR5UmVjdCwgYmVoYXZpb3IpOwogCi0gICAgICAgIGlmIChyZW5kZXJlcigp LnNldHRpbmdzKCkudmlzaWJsZURlYnVnT3ZlcmxheVJlZ2lvbnMoKSAmIChUb3VjaEFjdGlvblJl Z2lvbiB8IEVkaXRhYmxlRWxlbWVudFJlZ2lvbikpCisgICAgICAgIGlmIChyZW5kZXJlcigpLnNl dHRpbmdzKCkudmlzaWJsZURlYnVnT3ZlcmxheVJlZ2lvbnMoKSAmIChUb3VjaEFjdGlvblJlZ2lv biB8IEVkaXRhYmxlRWxlbWVudFJlZ2lvbiB8IFdoZWVsRXZlbnRIYW5kbGVyUmVnaW9uKSkKICAg ICAgICAgICAgIHBhaW50RGVidWdPdmVybGF5cyhncmFwaGljc0xheWVyLCBjb250ZXh0KTsKIAog ICAgIH0gZWxzZSBpZiAoZ3JhcGhpY3NMYXllciA9PSBsYXllckZvckhvcml6b250YWxTY3JvbGxi YXIoKSkgewo=