223179 2021-03-15 05:44:23 -0700 Move instanced drawing functionality from ExtensionsGL to GraphicsContextGL 2021-03-23 05:34:06 -0700 1 1 1 Unclassified WebKit WebGL Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 223633 221664 1 kkinnunen kkinnunen dino kbr kkinnunen pnormand webkit-bug-importer oldest_to_newest 1739383 0 kkinnunen 2021-03-15 05:44:23 -0700 Move instanced drawing functionality from ExtensionsGL to GraphicsContextGL ExtensionsGL never fulfilled its purpose. Currently it is equivalent to corresponding GraphicsContextGL instance. This just complicates the implementation. 1742190 1 423871 kkinnunen 2021-03-22 04:41:02 -0700 Created attachment 423871 Patch 1742202 2 webkit-bug-importer 2021-03-22 05:45:13 -0700 <rdar://problem/75687036> 1742534 3 423871 kbr 2021-03-22 16:09:41 -0700 Comment on attachment 423871 Patch Looks good to delete this unused code. r+ 1742711 4 ews-feeder 2021-03-23 01:42:17 -0700 commit-queue failed to commit attachment 423871 to WebKit repository. To retry, please set cq+ flag again. 1742752 5 ews-feeder 2021-03-23 03:57:20 -0700 Committed r274860: <https://commits.webkit.org/r274860> All reviewed patches have been landed. Closing bug and clearing flags on attachment 423871. 1742755 6 pnormand 2021-03-23 05:12:29 -0700 This broke the WPE build... 1742757 7 kkinnunen 2021-03-23 05:16:26 -0700 (In reply to Philippe Normand from comment #6) > This broke the WPE build... Sorry. I'll check. 1742759 8 pnormand 2021-03-23 05:20:12 -0700 This is what I have so far: http://sprunge.us/ZTnlLR 1742762 9 pnormand 2021-03-23 05:32:54 -0700 (In reply to Philippe Normand from comment #8) > This is what I have so far: http://sprunge.us/ZTnlLR Not good :) 1742764 10 kkinnunen 2021-03-23 05:34:06 -0700 tracked in bug 223633 423871 2021-03-22 04:41:02 -0700 2021-03-23 03:57:20 -0700 Patch bug-223179-20210322134101.patch text/plain 13020 kkinnunen U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0NzUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWQ5MjI2OTk4MWQ3OWQy YjFmZjcwMjhmZGUyOGEwMGU3YzQ0MzdmMi4uMjZmNjQwNDUyOWFmNjdmNTVjN2U0NTZhNjJjN2E3 ZmMyZjRmZGY5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTAzLTIyICBLaW1t byBLaW5udW5lbiAgPGtraW5udW5lbkBhcHBsZS5jb20+CisKKyAgICAgICAgTW92ZSBpbnN0YW5j ZWQgZHJhd2luZyBmdW5jdGlvbmFsaXR5IGZyb20gRXh0ZW5zaW9uc0dMIHRvIEdyYXBoaWNzQ29u dGV4dEdMCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MjMxNzkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBS ZW1vdmUgdW51c2VkIGluc3RhbmNlZCByZW5kZXJpbmcgZnVuY3Rpb25zIGZyb20gRXh0ZW5zaW9u c0dMLgorICAgICAgICBUaGV5IGFyZSBhbHJlYWR5IGluIEdyYXBoaWNzQ29udGV4dEdMIGludGVy ZmFjZXMuCisgICAgICAgIEV4dGVuc2lvbnNHTCBpcyBiZWluZyByZW1vdmVkIGFzIGl0IGlzIHJl ZHVuZGFudC4gVGhlIGV4dGVuc2lvbiBvYmplY3QKKyAgICAgICAgaXMgdGhlIHNhbWUgb2JqZWN0 IGFzIHRoZSBjb250ZXh0IG9iamVjdCBhbmQgbm90IHVzZWZ1bC4KKworICAgICAgICAqIHBsYXRm b3JtL2dyYXBoaWNzL0V4dGVuc2lvbnNHTC5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L2FuZ2xlL0V4dGVuc2lvbnNHTEFOR0xFLmNwcDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9hbmdsZS9FeHRlbnNpb25zR0xBTkdMRS5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L29wZW5nbC9FeHRlbnNpb25zR0xPcGVuR0wuaDoKKwogMjAyMS0wMy0xOSAgRGVhbiBKYWNrc29u ICA8ZGlub0BhcHBsZS5jb20+CiAKICAgICAgICAgTGluayBhZ2FpbnN0IHRoZSBBTkdMRSBTaGFy ZWQgTGlicmFyeQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZwppbmRleCBlOWY3Nzk0Yzk1ZWIzMGVkNmRlNGQwNGIyMzQ2YjgyNTQ5 MmQ3MzczLi5lYjU0MmQ2YjRhN2FmZDI3OTBkMTc1YWQ0MjhmNWRiODVkODcxZmEwIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxv ZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTAzLTIyICBLaW1tbyBLaW5udW5lbiAgPGtraW5udW5l bkBhcHBsZS5jb20+CisKKyAgICAgICAgTW92ZSBpbnN0YW5jZWQgZHJhd2luZyBmdW5jdGlvbmFs aXR5IGZyb20gRXh0ZW5zaW9uc0dMIHRvIEdyYXBoaWNzQ29udGV4dEdMCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjMxNzkKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmUgdW51c2VkIGluc3RhbmNl ZCByZW5kZXJpbmcgZnVuY3Rpb25zIGZyb20gRXh0ZW5zaW9uc0dMLgorICAgICAgICBUaGV5IGFy ZSBhbHJlYWR5IGluIEdyYXBoaWNzQ29udGV4dEdMIGludGVyZmFjZXMuCisgICAgICAgIEV4dGVu c2lvbnNHTCBpcyBiZWluZyByZW1vdmVkIGFzIGl0IGlzIHJlZHVuZGFudC4gVGhlIGV4dGVuc2lv biBvYmplY3QKKyAgICAgICAgaXMgdGhlIHNhbWUgb2JqZWN0IGFzIHRoZSBjb250ZXh0IG9iamVj dCBhbmQgbm90IHVzZWZ1bC4KKworICAgICAgICAqIEdQVVByb2Nlc3MvZ3JhcGhpY3MvUmVtb3Rl R3JhcGhpY3NDb250ZXh0R0wubWVzc2FnZXMuaW46CisgICAgICAgICogR1BVUHJvY2Vzcy9ncmFw aGljcy9SZW1vdGVHcmFwaGljc0NvbnRleHRHTEZ1bmN0aW9uc0dlbmVyYXRlZC5oOgorICAgICAg ICAoZHJhd0J1ZmZlcnNFWFQpOgorICAgICAgICAqIFdlYlByb2Nlc3MvR1BVL2dyYXBoaWNzL1Jl bW90ZUdyYXBoaWNzQ29udGV4dEdMUHJveHkuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL0dQVS9n cmFwaGljcy9SZW1vdGVHcmFwaGljc0NvbnRleHRHTFByb3h5RnVuY3Rpb25zR2VuZXJhdGVkLmNw cDoKKwogMjAyMS0wMy0xOSAgS2F0ZSBDaGVuZXkgIDxrYXRoZXJpbmVfY2hlbmV5QGFwcGxlLmNv bT4KIAogICAgICAgICBDYW5ub3QgbG9naW4gdG8gbWljcm9zb2Z0b25saW5lLmNvbSB3aXRob3V0 IGFsbG93aW5nIHN0b3JhZ2UgYWNjZXNzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9FeHRlbnNpb25zR0wuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL0V4dGVuc2lvbnNHTC5oCmluZGV4IDZmOTkwZmRmODdlMGEwYmJmZTY2YWQzNjY4Zjhh NjZmZjM2NDU1YzguLjU2MDc2MzA4YzU4YTBiZDQ1OTM5YjBhN2JjNWU2MjRkNTY0ZWI1MTAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0V4dGVuc2lvbnNHTC5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0V4dGVuc2lvbnNHTC5oCkBA IC0yODcsMTEgKzI4Nyw2IEBAIHB1YmxpYzoKICAgICAvLyBHTF9BUkJfZHJhd19idWZmZXJzIC8g R0xfRVhUX2RyYXdfYnVmZmVycwogICAgIHZpcnR1YWwgdm9pZCBkcmF3QnVmZmVyc0VYVChHQ0dM U3Bhbjxjb25zdCBHQ0dMZW51bT4gYnVmcykgPSAwOwogCi0gICAgLy8gR0xfQU5HTEVfaW5zdGFu Y2VkX2FycmF5cwotICAgIHZpcnR1YWwgdm9pZCBkcmF3QXJyYXlzSW5zdGFuY2VkQU5HTEUoR0NH TGVudW0gbW9kZSwgR0NHTGludCBmaXJzdCwgR0NHTHNpemVpIGNvdW50LCBHQ0dMc2l6ZWkgcHJp bWNvdW50KSA9IDA7Ci0gICAgdmlydHVhbCB2b2lkIGRyYXdFbGVtZW50c0luc3RhbmNlZEFOR0xF KEdDR0xlbnVtIG1vZGUsIEdDR0xzaXplaSBjb3VudCwgR0NHTGVudW0gdHlwZSwgR0NHTHZvaWRw dHIgb2Zmc2V0LCBHQ0dMc2l6ZWkgcHJpbWNvdW50KSA9IDA7Ci0gICAgdmlydHVhbCB2b2lkIHZl cnRleEF0dHJpYkRpdmlzb3JBTkdMRShHQ0dMdWludCBpbmRleCwgR0NHTHVpbnQgZGl2aXNvcikg PSAwOwotCiAgICAgLy8gT3RoZXIgZnVuY3Rpb25zLgogI2lmICFVU0UoQU5HTEUpCiAgICAgLy8g RVhUIFJvYnVzdG5lc3MgLSB1c2VzIGdldEdyYXBoaWNzUmVzZXRTdGF0dXNBUkIKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2FuZ2xlL0V4dGVuc2lvbnNHTEFO R0xFLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2FuZ2xlL0V4dGVuc2lv bnNHTEFOR0xFLmNwcAppbmRleCBjMmYwNDgyMzk5NWY3NDAyNDEzNjAyZGYzMTRjOGI2Mjc3Y2Fi NzI2Li43ODlmZTZiNTA2ODRiODZlNmYwZmI1ZWUxYWMzOTg5OTU1NzkxMWM2IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hbmdsZS9FeHRlbnNpb25zR0xBTkdM RS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYW5nbGUvRXh0ZW5z aW9uc0dMQU5HTEUuY3BwCkBAIC0xMjAsMzAgKzEyMCw2IEBAIHZvaWQgRXh0ZW5zaW9uc0dMQU5H TEU6OmRyYXdCdWZmZXJzRVhUKEdDR0xTcGFuPGNvbnN0IEdDR0xlbnVtPiBidWZzKQogICAgIGds OjpEcmF3QnVmZmVyc0VYVChidWZzLmJ1ZlNpemUsIGJ1ZnMuZGF0YSk7CiB9CiAKLXZvaWQgRXh0 ZW5zaW9uc0dMQU5HTEU6OmRyYXdBcnJheXNJbnN0YW5jZWRBTkdMRShHQ0dMZW51bSBtb2RlLCBH Q0dMaW50IGZpcnN0LCBHQ0dMc2l6ZWkgY291bnQsIEdDR0xzaXplaSBwcmltY291bnQpCi17Ci0g ICAgaWYgKCFtX2NvbnRleHQtPm1ha2VDb250ZXh0Q3VycmVudCgpKQotICAgICAgICByZXR1cm47 Ci0KLSAgICBnbDo6RHJhd0FycmF5c0luc3RhbmNlZEFOR0xFKG1vZGUsIGZpcnN0LCBjb3VudCwg cHJpbWNvdW50KTsKLX0KLQotdm9pZCBFeHRlbnNpb25zR0xBTkdMRTo6ZHJhd0VsZW1lbnRzSW5z dGFuY2VkQU5HTEUoR0NHTGVudW0gbW9kZSwgR0NHTHNpemVpIGNvdW50LCBHQ0dMZW51bSB0eXBl LCBHQ0dMdm9pZHB0ciBvZmZzZXQsIEdDR0xzaXplaSBwcmltY291bnQpCi17Ci0gICAgaWYgKCFt X2NvbnRleHQtPm1ha2VDb250ZXh0Q3VycmVudCgpKQotICAgICAgICByZXR1cm47Ci0KLSAgICBn bDo6RHJhd0VsZW1lbnRzSW5zdGFuY2VkQU5HTEUobW9kZSwgY291bnQsIHR5cGUsIHJlaW50ZXJw cmV0X2Nhc3Q8R0x2b2lkKj4ob2Zmc2V0KSwgcHJpbWNvdW50KTsKLX0KLQotdm9pZCBFeHRlbnNp b25zR0xBTkdMRTo6dmVydGV4QXR0cmliRGl2aXNvckFOR0xFKEdDR0x1aW50IGluZGV4LCBHQ0dM dWludCBkaXZpc29yKQotewotICAgIGlmICghbV9jb250ZXh0LT5tYWtlQ29udGV4dEN1cnJlbnQo KSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgZ2w6OlZlcnRleEF0dHJpYkRpdmlzb3JBTkdMRShp bmRleCwgZGl2aXNvcik7Ci19Ci0KIFN0cmluZyBFeHRlbnNpb25zR0xBTkdMRTo6Z2V0RXh0ZW5z aW9ucygpCiB7CiAgICAgcmV0dXJuIFN0cmluZyhyZWludGVycHJldF9jYXN0PGNvbnN0IGNoYXIq PihnbDo6R2V0U3RyaW5nKEdMX0VYVEVOU0lPTlMpKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hbmdsZS9FeHRlbnNpb25zR0xBTkdMRS5oIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYW5nbGUvRXh0ZW5zaW9uc0dMQU5HTEUuaAppbmRl eCBhMWQ1YmJiOWM3ZWI5OTBjNzMwNTUyMTNmODEwZDExNzExMjc2MjlmLi5lY2I5ZjZjMDkzNGM2 MzZkNmNjMTU1NjRlODVkNmJmNWQ4MzRhMjhiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9hbmdsZS9FeHRlbnNpb25zR0xBTkdMRS5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2FuZ2xlL0V4dGVuc2lvbnNHTEFOR0xFLmgKQEAgLTUx LDEwICs1MSw2IEBAIHB1YmxpYzoKIAogICAgIFN0cmluZyBnZXRUcmFuc2xhdGVkU2hhZGVyU291 cmNlQU5HTEUoUGxhdGZvcm1HTE9iamVjdCkgb3ZlcnJpZGU7CiAKLSAgICB2b2lkIGRyYXdBcnJh eXNJbnN0YW5jZWRBTkdMRShHQ0dMZW51bSBtb2RlLCBHQ0dMaW50IGZpcnN0LCBHQ0dMc2l6ZWkg Y291bnQsIEdDR0xzaXplaSBwcmltY291bnQpIG92ZXJyaWRlOwotICAgIHZvaWQgZHJhd0VsZW1l bnRzSW5zdGFuY2VkQU5HTEUoR0NHTGVudW0gbW9kZSwgR0NHTHNpemVpIGNvdW50LCBHQ0dMZW51 bSB0eXBlLCBHQ0dMdm9pZHB0ciBvZmZzZXQsIEdDR0xzaXplaSBwcmltY291bnQpIG92ZXJyaWRl OwotICAgIHZvaWQgdmVydGV4QXR0cmliRGl2aXNvckFOR0xFKEdDR0x1aW50IGluZGV4LCBHQ0dM dWludCBkaXZpc29yKSBvdmVycmlkZTsKLQogICAgIC8vIE9ubHkgZm9yIG5vbi1XZWJHTCAyLjAg Y29udGV4dHMuCiAgICAgR0NHTGVudW0gYWRqdXN0V2ViR0wxVGV4dHVyZUludGVybmFsRm9ybWF0 KEdDR0xlbnVtIGludGVybmFsZm9ybWF0LCBHQ0dMZW51bSBmb3JtYXQsIEdDR0xlbnVtIHR5cGUp OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9vcGVuZ2wv RXh0ZW5zaW9uc0dMT3BlbkdMLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9v cGVuZ2wvRXh0ZW5zaW9uc0dMT3BlbkdMLmgKaW5kZXggNjQ5ZjkzODNjZjRlZDQ4NTQ0Y2FkYTE2 YjRjNjc4YjBiN2ZkMTFiYy4uYjE5MmMwNGJlMGJkYTMxNmZlMjYzMDRhYzBjNWY4YjQzY2ZlZGI4 NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL0V4 dGVuc2lvbnNHTE9wZW5HTC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L29wZW5nbC9FeHRlbnNpb25zR0xPcGVuR0wuaApAQCAtNDcsOSArNDcsOSBAQCBwdWJsaWM6CiAg ICAgdm9pZCBiaW5kVmVydGV4QXJyYXlPRVMoUGxhdGZvcm1HTE9iamVjdCkgb3ZlcnJpZGU7CiAg ICAgdm9pZCBkcmF3QnVmZmVyc0VYVChHQ0dMU3Bhbjxjb25zdCBHQ0dMZW51bT4pIG92ZXJyaWRl OwogCi0gICAgdm9pZCBkcmF3QXJyYXlzSW5zdGFuY2VkQU5HTEUoR0NHTGVudW0gbW9kZSwgR0NH TGludCBmaXJzdCwgR0NHTHNpemVpIGNvdW50LCBHQ0dMc2l6ZWkgcHJpbWNvdW50KSBvdmVycmlk ZTsKLSAgICB2b2lkIGRyYXdFbGVtZW50c0luc3RhbmNlZEFOR0xFKEdDR0xlbnVtIG1vZGUsIEdD R0xzaXplaSBjb3VudCwgR0NHTGVudW0gdHlwZSwgR0NHTHZvaWRwdHIgb2Zmc2V0LCBHQ0dMc2l6 ZWkgcHJpbWNvdW50KSBvdmVycmlkZTsKLSAgICB2b2lkIHZlcnRleEF0dHJpYkRpdmlzb3JBTkdM RShHQ0dMdWludCBpbmRleCwgR0NHTHVpbnQgZGl2aXNvcikgb3ZlcnJpZGU7CisgICAgdm9pZCBk cmF3QXJyYXlzSW5zdGFuY2VkQU5HTEUoR0NHTGVudW0gbW9kZSwgR0NHTGludCBmaXJzdCwgR0NH THNpemVpIGNvdW50LCBHQ0dMc2l6ZWkgcHJpbWNvdW50KTsKKyAgICB2b2lkIGRyYXdFbGVtZW50 c0luc3RhbmNlZEFOR0xFKEdDR0xlbnVtIG1vZGUsIEdDR0xzaXplaSBjb3VudCwgR0NHTGVudW0g dHlwZSwgR0NHTHZvaWRwdHIgb2Zmc2V0LCBHQ0dMc2l6ZWkgcHJpbWNvdW50KTsKKyAgICB2b2lk IHZlcnRleEF0dHJpYkRpdmlzb3JBTkdMRShHQ0dMdWludCBpbmRleCwgR0NHTHVpbnQgZGl2aXNv cik7CiAKIHByb3RlY3RlZDoKICAgICBib29sIHN1cHBvcnRzRXh0ZW5zaW9uKGNvbnN0IFdURjo6 U3RyaW5nJikgb3ZlcnJpZGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3Mv Z3JhcGhpY3MvUmVtb3RlR3JhcGhpY3NDb250ZXh0R0wubWVzc2FnZXMuaW4gYi9Tb3VyY2UvV2Vi S2l0L0dQVVByb2Nlc3MvZ3JhcGhpY3MvUmVtb3RlR3JhcGhpY3NDb250ZXh0R0wubWVzc2FnZXMu aW4KaW5kZXggOTdkOThkMGUwMGM4MWMxZjJhYmJjODRlZjUzMDViZTk2YWE1ZmJjZi4uNzVhMDM0 YzY2ZWI0N2Y5ODNmNWRjMTUyNDEzOWQxMTM5MGZkMDA5MCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9HUFVQcm9jZXNzL2dyYXBoaWNzL1JlbW90ZUdyYXBoaWNzQ29udGV4dEdMLm1lc3NhZ2Vz LmluCisrKyBiL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9ncmFwaGljcy9SZW1vdGVHcmFwaGlj c0NvbnRleHRHTC5tZXNzYWdlcy5pbgpAQCAtMjc5LDkgKzI3OSw2IEBAIG1lc3NhZ2VzIC0+IFJl bW90ZUdyYXBoaWNzQ29udGV4dEdMIE5vdFJlZkNvdW50ZWQgU3RyZWFtIHsKICAgICB2b2lkIEdl dEdyYXBoaWNzUmVzZXRTdGF0dXNBUkIoKSAtPiAoaW50MzJfdCByZXR1cm5WYWx1ZSkgU3luY2hy b25vdXMKICAgICB2b2lkIEdldFRyYW5zbGF0ZWRTaGFkZXJTb3VyY2VBTkdMRSh1aW50MzJfdCBh cmcwKSAtPiAoU3RyaW5nIHJldHVyblZhbHVlKSBTeW5jaHJvbm91cwogICAgIHZvaWQgRHJhd0J1 ZmZlcnNFWFQoSVBDOjpBcnJheVJlZmVyZW5jZTx1aW50MzJfdD4gYnVmcykKLSAgICB2b2lkIERy YXdBcnJheXNJbnN0YW5jZWRBTkdMRSh1aW50MzJfdCBtb2RlLCBpbnQzMl90IGZpcnN0LCBpbnQz Ml90IGNvdW50LCBpbnQzMl90IHByaW1jb3VudCkKLSAgICB2b2lkIERyYXdFbGVtZW50c0luc3Rh bmNlZEFOR0xFKHVpbnQzMl90IG1vZGUsIGludDMyX3QgY291bnQsIHVpbnQzMl90IHR5cGUsIHVp bnQ2NF90IG9mZnNldCwgaW50MzJfdCBwcmltY291bnQpCi0gICAgdm9pZCBWZXJ0ZXhBdHRyaWJE aXZpc29yQU5HTEUodWludDMyX3QgaW5kZXgsIHVpbnQzMl90IGRpdmlzb3IpCiAgICAgdm9pZCBH ZXRJbnRlcm5hbGZvcm1hdGl2KHVpbnQzMl90IHRhcmdldCwgdWludDMyX3QgaW50ZXJuYWxmb3Jt YXQsIHVpbnQzMl90IHBuYW1lLCB1aW50NjRfdCBwYXJhbXNTaXplKSAtPiAoSVBDOjpBcnJheVJl ZmVyZW5jZTxpbnQzMl90PiBwYXJhbXMpIFN5bmNocm9ub3VzCiAgICAgdm9pZCBNdWx0aURyYXdB cnJheXNBTkdMRSh1aW50MzJfdCBtb2RlLCBJUEM6OkFycmF5UmVmZXJlbmNlPGludDMyX3Q+IGZp cnN0cywgSVBDOjpBcnJheVJlZmVyZW5jZTxpbnQzMl90PiBjb3VudHMsIGludDMyX3QgZHJhd2Nv dW50KQogICAgIHZvaWQgTXVsdGlEcmF3QXJyYXlzSW5zdGFuY2VkQU5HTEUodWludDMyX3QgbW9k ZSwgSVBDOjpBcnJheVJlZmVyZW5jZTxpbnQzMl90PiBmaXJzdHMsIElQQzo6QXJyYXlSZWZlcmVu Y2U8aW50MzJfdD4gY291bnRzLCBJUEM6OkFycmF5UmVmZXJlbmNlPGludDMyX3Q+IGluc3RhbmNl Q291bnRzLCBpbnQzMl90IGRyYXdjb3VudCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvR1BV UHJvY2Vzcy9ncmFwaGljcy9SZW1vdGVHcmFwaGljc0NvbnRleHRHTEZ1bmN0aW9uc0dlbmVyYXRl ZC5oIGIvU291cmNlL1dlYktpdC9HUFVQcm9jZXNzL2dyYXBoaWNzL1JlbW90ZUdyYXBoaWNzQ29u dGV4dEdMRnVuY3Rpb25zR2VuZXJhdGVkLmgKaW5kZXggMTA5ZTAxZThjMzZkY2VmZmUyNDkwNTBm MzNjMGY2ODBjMmFjY2Q5OC4uYmM1NTE2NzgwY2EwMGY1ZWViYzdlNGRhMmQyOWI3MDg4M2VhZDE4 NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9HUFVQcm9jZXNzL2dyYXBoaWNzL1JlbW90ZUdy YXBoaWNzQ29udGV4dEdMRnVuY3Rpb25zR2VuZXJhdGVkLmgKKysrIGIvU291cmNlL1dlYktpdC9H UFVQcm9jZXNzL2dyYXBoaWNzL1JlbW90ZUdyYXBoaWNzQ29udGV4dEdMRnVuY3Rpb25zR2VuZXJh dGVkLmgKQEAgLTExMTQsMTggKzExMTQsNiBAQAogICAgIHsKICAgICAgICAgbV9jb250ZXh0LT5n ZXRFeHRlbnNpb25zKCkuZHJhd0J1ZmZlcnNFWFQobWFrZUdDR0xTcGFuKHJlaW50ZXJwcmV0X2Nh c3Q8Y29uc3QgR0NHTGVudW0qPihidWZzLmRhdGEoKSksIGJ1ZnMuc2l6ZSgpKSk7CiAgICAgfQot ICAgIHZvaWQgZHJhd0FycmF5c0luc3RhbmNlZEFOR0xFKHVpbnQzMl90IG1vZGUsIGludDMyX3Qg Zmlyc3QsIGludDMyX3QgY291bnQsIGludDMyX3QgcHJpbWNvdW50KQotICAgIHsKLSAgICAgICAg bV9jb250ZXh0LT5nZXRFeHRlbnNpb25zKCkuZHJhd0FycmF5c0luc3RhbmNlZEFOR0xFKG1vZGUs IGZpcnN0LCBjb3VudCwgcHJpbWNvdW50KTsKLSAgICB9Ci0gICAgdm9pZCBkcmF3RWxlbWVudHNJ bnN0YW5jZWRBTkdMRSh1aW50MzJfdCBtb2RlLCBpbnQzMl90IGNvdW50LCB1aW50MzJfdCB0eXBl LCB1aW50NjRfdCBvZmZzZXQsIGludDMyX3QgcHJpbWNvdW50KQotICAgIHsKLSAgICAgICAgbV9j b250ZXh0LT5nZXRFeHRlbnNpb25zKCkuZHJhd0VsZW1lbnRzSW5zdGFuY2VkQU5HTEUobW9kZSwg Y291bnQsIHR5cGUsIHN0YXRpY19jYXN0PEdDR0x2b2lkcHRyPihvZmZzZXQpLCBwcmltY291bnQp OwotICAgIH0KLSAgICB2b2lkIHZlcnRleEF0dHJpYkRpdmlzb3JBTkdMRSh1aW50MzJfdCBpbmRl eCwgdWludDMyX3QgZGl2aXNvcikKLSAgICB7Ci0gICAgICAgIG1fY29udGV4dC0+Z2V0RXh0ZW5z aW9ucygpLnZlcnRleEF0dHJpYkRpdmlzb3JBTkdMRShpbmRleCwgZGl2aXNvcik7Ci0gICAgfQog ICAgIHZvaWQgZ2V0SW50ZXJuYWxmb3JtYXRpdih1aW50MzJfdCB0YXJnZXQsIHVpbnQzMl90IGlu dGVybmFsZm9ybWF0LCB1aW50MzJfdCBwbmFtZSwgdWludDY0X3QgcGFyYW1zU2l6ZSwgQ29tcGxl dGlvbkhhbmRsZXI8dm9pZChJUEM6OkFycmF5UmVmZXJlbmNlPGludDMyX3Q+KT4mJiBjb21wbGV0 aW9uSGFuZGxlcikKICAgICB7CiAgICAgICAgIFZlY3RvcjxHQ0dMaW50LCA0PiBwYXJhbXMoc3Rh dGljX2Nhc3Q8c2l6ZV90PihwYXJhbXNTaXplKSwgMCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1dlYlByb2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90ZUdyYXBoaWNzQ29udGV4dEdMUHJveHku aCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvZ3JhcGhpY3MvUmVtb3RlR3JhcGhpY3ND b250ZXh0R0xQcm94eS5oCmluZGV4IGI0YjcxMGE1OTVkODVkODhiZWFhYmU2YWYzZDE3MzE3YWNi Y2ViYjkuLjEyZTg5OWJiZWZlZjZkNDFiNzRjM2E3YWMyYjcxMmVjMzFmOGRkMzcgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvZ3JhcGhpY3MvUmVtb3RlR3JhcGhpY3ND b250ZXh0R0xQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvZ3JhcGhp Y3MvUmVtb3RlR3JhcGhpY3NDb250ZXh0R0xQcm94eS5oCkBAIC0zMTAsOSArMzEwLDYgQEAgcHVi bGljOgogICAgIEdDR0xpbnQgZ2V0R3JhcGhpY3NSZXNldFN0YXR1c0FSQigpIGZpbmFsOwogICAg IFN0cmluZyBnZXRUcmFuc2xhdGVkU2hhZGVyU291cmNlQU5HTEUoUGxhdGZvcm1HTE9iamVjdCBh cmcwKSBmaW5hbDsKICAgICB2b2lkIGRyYXdCdWZmZXJzRVhUKEdDR0xTcGFuPGNvbnN0IEdDR0xl bnVtPiBidWZzKSBmaW5hbDsKLSAgICB2b2lkIGRyYXdBcnJheXNJbnN0YW5jZWRBTkdMRShHQ0dM ZW51bSBtb2RlLCBHQ0dMaW50IGZpcnN0LCBHQ0dMc2l6ZWkgY291bnQsIEdDR0xzaXplaSBwcmlt Y291bnQpIGZpbmFsOwotICAgIHZvaWQgZHJhd0VsZW1lbnRzSW5zdGFuY2VkQU5HTEUoR0NHTGVu dW0gbW9kZSwgR0NHTHNpemVpIGNvdW50LCBHQ0dMZW51bSB0eXBlLCBHQ0dMdm9pZHB0ciBvZmZz ZXQsIEdDR0xzaXplaSBwcmltY291bnQpIGZpbmFsOwotICAgIHZvaWQgdmVydGV4QXR0cmliRGl2 aXNvckFOR0xFKEdDR0x1aW50IGluZGV4LCBHQ0dMdWludCBkaXZpc29yKSBmaW5hbDsKICAgICB2 b2lkIGdldEludGVybmFsZm9ybWF0aXYoR0NHTGVudW0gdGFyZ2V0LCBHQ0dMZW51bSBpbnRlcm5h bGZvcm1hdCwgR0NHTGVudW0gcG5hbWUsIEdDR0xTcGFuPEdDR0xpbnQ+IHBhcmFtcykgZmluYWw7 CiAgICAgdm9pZCBtdWx0aURyYXdBcnJheXNBTkdMRShHQ0dMZW51bSBtb2RlLCBHQ0dMU3Bhbjxj b25zdCBHQ0dMaW50PiBmaXJzdHMsIEdDR0xTcGFuPGNvbnN0IEdDR0xzaXplaT4gY291bnRzLCBH Q0dMc2l6ZWkgZHJhd2NvdW50KSBmaW5hbDsKICAgICB2b2lkIG11bHRpRHJhd0FycmF5c0luc3Rh bmNlZEFOR0xFKEdDR0xlbnVtIG1vZGUsIEdDR0xTcGFuPGNvbnN0IEdDR0xpbnQ+IGZpcnN0cywg R0NHTFNwYW48Y29uc3QgR0NHTHNpemVpPiBjb3VudHMsIEdDR0xTcGFuPGNvbnN0IEdDR0xzaXpl aT4gaW5zdGFuY2VDb3VudHMsIEdDR0xzaXplaSBkcmF3Y291bnQpIGZpbmFsOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9ncmFwaGljcy9SZW1vdGVHcmFwaGljc0Nv bnRleHRHTFByb3h5RnVuY3Rpb25zR2VuZXJhdGVkLmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9HUFUvZ3JhcGhpY3MvUmVtb3RlR3JhcGhpY3NDb250ZXh0R0xQcm94eUZ1bmN0aW9uc0dl bmVyYXRlZC5jcHAKaW5kZXggYzgxM2U4ZjQyYmI2Mjc1YzdhNTY1ZmIxMzM5OGViM2FhNWI2NTE2 Yy4uNGRhMmQ2NDBhMTNjYWYwOGZmMWYzYTUwOTkzYmI0MTc3OTQ1Yjk5YSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9ncmFwaGljcy9SZW1vdGVHcmFwaGljc0NvbnRl eHRHTFByb3h5RnVuY3Rpb25zR2VuZXJhdGVkLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlBy b2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90ZUdyYXBoaWNzQ29udGV4dEdMUHJveHlGdW5jdGlvbnNH ZW5lcmF0ZWQuY3BwCkBAIC0yMzE4LDMzICsyMzE4LDYgQEAgdm9pZCBSZW1vdGVHcmFwaGljc0Nv bnRleHRHTFByb3h5OjpkcmF3QnVmZmVyc0VYVChHQ0dMU3Bhbjxjb25zdCBHQ0dMZW51bT4gYnVm cykKICAgICB9CiB9CiAKLXZvaWQgUmVtb3RlR3JhcGhpY3NDb250ZXh0R0xQcm94eTo6ZHJhd0Fy cmF5c0luc3RhbmNlZEFOR0xFKEdDR0xlbnVtIG1vZGUsIEdDR0xpbnQgZmlyc3QsIEdDR0xzaXpl aSBjb3VudCwgR0NHTHNpemVpIHByaW1jb3VudCkKLXsKLSAgICBpZiAoIWlzQ29udGV4dExvc3Qo KSkgewotICAgICAgICBhdXRvIHNlbmRSZXN1bHQgPSBzZW5kKE1lc3NhZ2VzOjpSZW1vdGVHcmFw aGljc0NvbnRleHRHTDo6RHJhd0FycmF5c0luc3RhbmNlZEFOR0xFKG1vZGUsIGZpcnN0LCBjb3Vu dCwgcHJpbWNvdW50KSk7Ci0gICAgICAgIGlmICghc2VuZFJlc3VsdCkKLSAgICAgICAgICAgIG1h cmtDb250ZXh0TG9zdCgpOwotICAgIH0KLX0KLQotdm9pZCBSZW1vdGVHcmFwaGljc0NvbnRleHRH TFByb3h5OjpkcmF3RWxlbWVudHNJbnN0YW5jZWRBTkdMRShHQ0dMZW51bSBtb2RlLCBHQ0dMc2l6 ZWkgY291bnQsIEdDR0xlbnVtIHR5cGUsIEdDR0x2b2lkcHRyIG9mZnNldCwgR0NHTHNpemVpIHBy aW1jb3VudCkKLXsKLSAgICBpZiAoIWlzQ29udGV4dExvc3QoKSkgewotICAgICAgICBhdXRvIHNl bmRSZXN1bHQgPSBzZW5kKE1lc3NhZ2VzOjpSZW1vdGVHcmFwaGljc0NvbnRleHRHTDo6RHJhd0Vs ZW1lbnRzSW5zdGFuY2VkQU5HTEUobW9kZSwgY291bnQsIHR5cGUsIHN0YXRpY19jYXN0PHVpbnQ2 NF90PihvZmZzZXQpLCBwcmltY291bnQpKTsKLSAgICAgICAgaWYgKCFzZW5kUmVzdWx0KQotICAg ICAgICAgICAgbWFya0NvbnRleHRMb3N0KCk7Ci0gICAgfQotfQotCi12b2lkIFJlbW90ZUdyYXBo aWNzQ29udGV4dEdMUHJveHk6OnZlcnRleEF0dHJpYkRpdmlzb3JBTkdMRShHQ0dMdWludCBpbmRl eCwgR0NHTHVpbnQgZGl2aXNvcikKLXsKLSAgICBpZiAoIWlzQ29udGV4dExvc3QoKSkgewotICAg ICAgICBhdXRvIHNlbmRSZXN1bHQgPSBzZW5kKE1lc3NhZ2VzOjpSZW1vdGVHcmFwaGljc0NvbnRl eHRHTDo6VmVydGV4QXR0cmliRGl2aXNvckFOR0xFKGluZGV4LCBkaXZpc29yKSk7Ci0gICAgICAg IGlmICghc2VuZFJlc3VsdCkKLSAgICAgICAgICAgIG1hcmtDb250ZXh0TG9zdCgpOwotICAgIH0K LX0KLQogdm9pZCBSZW1vdGVHcmFwaGljc0NvbnRleHRHTFByb3h5OjpnZXRJbnRlcm5hbGZvcm1h dGl2KEdDR0xlbnVtIHRhcmdldCwgR0NHTGVudW0gaW50ZXJuYWxmb3JtYXQsIEdDR0xlbnVtIHBu YW1lLCBHQ0dMU3BhbjxHQ0dMaW50PiBwYXJhbXMpCiB7CiAgICAgSVBDOjpBcnJheVJlZmVyZW5j ZTxpbnQzMl90PiBwYXJhbXNSZXBseTsK