169628 2017-03-14 14:22:47 -0700 Rename LayerTypeWebGLLayer and use it for both WebGL and WebGPU 2017-03-14 16:23:01 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 dino dino commit-queue ryanhaddad simon.fraser oldest_to_newest 1287785 0 dino 2017-03-14 14:22:47 -0700 Rename LayerTypeWebGLLayer and use it for both WebGL and WebGPU 1287786 1 dino 2017-03-14 14:24:42 -0700 <rdar://problem/31047025> 1287788 2 304420 dino 2017-03-14 14:27:09 -0700 Created attachment 304420 Patch 1287812 3 dino 2017-03-14 14:51:00 -0700 Committed r213940: <http://trac.webkit.org/changeset/213940> 1287866 4 ryanhaddad 2017-03-14 16:23:01 -0700 (In reply to comment #3) > Committed r213940: <http://trac.webkit.org/changeset/213940> We weren't warned since win-ews was broken, but it looks like this broke the Windows build: https://build.webkit.org/builders/Apple%20Win%20Release%20%28Build%29/builds/84798 304420 2017-03-14 14:27:09 -0700 2017-03-14 14:28:27 -0700 Patch bug-169628-20170315082706.patch text/plain 12001 dino U3VidmVyc2lvbiBSZXZpc2lvbjogMjEzOTMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjE2MDkxZDk0MDM0MDM0 MjdlMWQ1ZWRkNTk1ODg0MWE3YWVmMDI2Mi4uZDEzZjBlMTg5NTcxMDQ0NjM3ODA2MzIyY2EwYjhh OWYwYzFkODVkNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE3LTAzLTE0ICBEZWFu IEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KKworICAgICAgICBSZW5hbWUgTGF5ZXJUeXBlV2Vi R0xMYXllciBhbmQgdXNlIGl0IGZvciBib3RoIFdlYkdMIGFuZCBXZWJHUFUKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2OTYyOAorICAgICAgICA8cmRh cjovL3Byb2JsZW1zLzMxMDQ3MDI1PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFJlbmFtZSBMYXllclR5cGVXZWJHTExheWVyIHRvIExheWVyVHlwZUNv bnRlbnRzUHJvdmlkZWRMYXllcgorICAgICAgICBhbmQgdXNlIGl0IGZvciBib3RoIFdlYkdMTGF5 ZXIgYW5kIFdlYkdQVUxheWVyLCB0byBhdm9pZAorICAgICAgICBjb2RlIGR1cGxpY2F0aW9uLgor CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2EvUGxhdGZvcm1DQUxheWVyLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6Om9wZXJhdG9yPDwpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L2NhL1BsYXRmb3JtQ0FMYXllci5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NhL2Nv Y29hL1BsYXRmb3JtQ0FMYXllckNvY29hLm1tOgorICAgICAgICAoUGxhdGZvcm1DQUxheWVyQ29j b2E6OmxheWVyVHlwZUZvclBsYXRmb3JtTGF5ZXIpOgorICAgICAgICAoUGxhdGZvcm1DQUxheWVy Q29jb2E6OlBsYXRmb3JtQ0FMYXllckNvY29hKToKKyAgICAgICAgKFBsYXRmb3JtQ0FMYXllckNv Y29hOjpjb21tb25Jbml0KToKKwogMjAxNy0wMy0xNCAgTWVnYW4gR2FyZG5lciAgPG1lZ2FuX2dh cmRuZXJAYXBwbGUuY29tPgogCiAgICAgICAgIENvcnJlY3RseSBleHBvcnQgV2ViSXRlbVByb3Zp ZGVyUGFzdGVib2FyZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IGRhOTM2YmQyZGQwMjc2ZDc2YjdmY2QzOWRiZDkz MmYzZDg5MmY0NzkuLmViNzVkMzA0ODgyMzJjOGZmMDU5YzU3OWNhZjYwNTFlMmU4NGU3YjMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cKQEAgLTEsMyArMSwyNyBAQAorMjAxNy0wMy0xNCAgRGVhbiBKYWNrc29uICA8ZGlu b0BhcHBsZS5jb20+CisKKyAgICAgICAgUmVuYW1lIExheWVyVHlwZVdlYkdMTGF5ZXIgYW5kIHVz ZSBpdCBmb3IgYm90aCBXZWJHTCBhbmQgV2ViR1BVCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjk2MjgKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtcy8z MTA0NzAyNT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBSZW5hbWUgTGF5ZXJUeXBlV2ViR0xMYXllciB0byBMYXllclR5cGVDb250ZW50c1Byb3ZpZGVk TGF5ZXIKKyAgICAgICAgYW5kIHVzZSBpdCBmb3IgYm90aCBXZWJHTExheWVyIGFuZCBXZWJHUFVM YXllciwgdG8gYXZvaWQKKyAgICAgICAgY29kZSBkdXBsaWNhdGlvbi4KKworICAgICAgICAqIFNo YXJlZC9tYWMvUmVtb3RlTGF5ZXJCYWNraW5nU3RvcmUubW06CisgICAgICAgIChXZWJLaXQ6OlJl bW90ZUxheWVyQmFja2luZ1N0b3JlOjpkcmF3SW5Db250ZXh0KToKKyAgICAgICAgKiBTaGFyZWQv bWFjL1JlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uLm1tOgorICAgICAgICAoV2ViS2l0OjpSZW1v dGVMYXllclRyZWVUcmFuc2FjdGlvbjo6ZGVzY3JpcHRpb24pOgorICAgICAgICAqIFVJUHJvY2Vz cy9pb3MvUmVtb3RlTGF5ZXJUcmVlSG9zdElPUy5tbToKKyAgICAgICAgKFdlYktpdDo6UmVtb3Rl TGF5ZXJUcmVlSG9zdDo6Y3JlYXRlTGF5ZXIpOgorICAgICAgICAqIFVJUHJvY2Vzcy9tYWMvUmVt b3RlTGF5ZXJUcmVlSG9zdC5tbToKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlTGF5ZXJUcmVlSG9z dDo6Y3JlYXRlTGF5ZXIpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9tYWMvUGxhdGZv cm1DQUxheWVyUmVtb3RlQ3VzdG9tLm1tOgorICAgICAgICAoV2ViS2l0OjpQbGF0Zm9ybUNBTGF5 ZXJSZW1vdGVDdXN0b206OlBsYXRmb3JtQ0FMYXllclJlbW90ZUN1c3RvbSk6CisgICAgICAgIChX ZWJLaXQ6OlBsYXRmb3JtQ0FMYXllclJlbW90ZUN1c3RvbTo6Y2xvbmUpOgorCiAyMDE3LTAzLTE0 ICBSeWFuIEhhZGRhZCAgPHJ5YW5oYWRkYWRAYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3 ZWQsIHJvbGxpbmcgb3V0IHIyMTM5MTUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jYS9QbGF0Zm9ybUNBTGF5ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2EvUGxhdGZvcm1DQUxheWVyLmNwcAppbmRleCA4NDQ4NmFhYjdhZmUw NTk0NzlkYWI5NTYyODcyNmM3NDhmYjNiZThlLi5mNGY4NDVlZTgzNjE3NzY1M2NkYTIzMDI0Nzlm YmUyOWI2Y2I0YzU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jYS9QbGF0Zm9ybUNBTGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2NhL1BsYXRmb3JtQ0FMYXllci5jcHAKQEAgLTIyMywxNCArMjIzLDkgQEAgVGV4dFN0 cmVhbSYgb3BlcmF0b3I8PChUZXh0U3RyZWFtJiB0cywgUGxhdGZvcm1DQUxheWVyOjpMYXllclR5 cGUgbGF5ZXJUeXBlKQogICAgIGNhc2UgUGxhdGZvcm1DQUxheWVyOjpMYXllclR5cGVBVlBsYXll ckxheWVyOgogICAgICAgICB0cyA8PCAiYXYtcGxheWVyLWxheWVyIjsKICAgICAgICAgYnJlYWs7 Ci0gICAgY2FzZSBQbGF0Zm9ybUNBTGF5ZXI6OkxheWVyVHlwZVdlYkdMTGF5ZXI6Ci0gICAgICAg IHRzIDw8ICJ3ZWItZ2wtbGF5ZXIiOworICAgIGNhc2UgUGxhdGZvcm1DQUxheWVyOjpMYXllclR5 cGVDb250ZW50c1Byb3ZpZGVkTGF5ZXI6CisgICAgICAgIHRzIDw8ICJjb250ZW50cy1wcm92aWRl ZC1sYXllciI7CiAgICAgICAgIGJyZWFrOwotI2lmIEVOQUJMRShXRUJHUFUpCi0gICAgY2FzZSBQ bGF0Zm9ybUNBTGF5ZXI6OkxheWVyVHlwZVdlYkdQVUxheWVyOgotICAgICAgICB0cyA8PCAid2Vi Z3B1LWxheWVyIjsKLSAgICAgICAgYnJlYWs7Ci0jZW5kaWYKICAgICBjYXNlIFBsYXRmb3JtQ0FM YXllcjo6TGF5ZXJUeXBlU2hhcGVMYXllcjoKICAgICAgICAgdHMgPDwgInNoYXBlLWxheWVyIjsK ICAgICAgICAgYnJlYWs7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jYS9QbGF0Zm9ybUNBTGF5ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2NhL1BsYXRmb3JtQ0FMYXllci5oCmluZGV4IGY3YWMxYzhiZTY3NDk3M2NjYmVlODQzMjRk ZGEwOGNmNzdiZWNkYmMuLmI5YzM4NDk0ZDRmODZiNjE0MWNkZTUzYzQ2M2IyZTQzNTU3M2M2YmEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL1BsYXRmb3Jt Q0FMYXllci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL1BsYXRm b3JtQ0FMYXllci5oCkBAIC03MiwxMCArNzIsNyBAQCBwdWJsaWM6CiAgICAgICAgIExheWVyVHlw ZVRpbGVkQmFja2luZ1RpbGVMYXllciwKICAgICAgICAgTGF5ZXJUeXBlUm9vdExheWVyLAogICAg ICAgICBMYXllclR5cGVBVlBsYXllckxheWVyLAotICAgICAgICBMYXllclR5cGVXZWJHTExheWVy LAotI2lmIEVOQUJMRShXRUJHUFUpCi0gICAgICAgIExheWVyVHlwZVdlYkdQVUxheWVyLAotI2Vu ZGlmCisgICAgICAgIExheWVyVHlwZUNvbnRlbnRzUHJvdmlkZWRMYXllciwKICAgICAgICAgTGF5 ZXJUeXBlQmFja2Ryb3BMYXllciwKICAgICAgICAgTGF5ZXJUeXBlU2hhcGVMYXllciwKICAgICAg ICAgTGF5ZXJUeXBlTGlnaHRTeXN0ZW1CYWNrZHJvcExheWVyLApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvY29jb2EvUGxhdGZvcm1DQUxheWVyQ29jb2Eu bW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9jb2NvYS9QbGF0Zm9ybUNB TGF5ZXJDb2NvYS5tbQppbmRleCA2OGE4YjNhY2YzOGM5ODM4NjAwMjBiNDljOGVlMjUxZTA0Y2Fh ZjBkLi5iMDUyNjRkODRjZTRhOGMyYTljM2Q5YzFlNWI1NjIwYzBjOGEyN2NmIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9jb2NvYS9QbGF0Zm9ybUNBTGF5 ZXJDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9jb2Nv YS9QbGF0Zm9ybUNBTGF5ZXJDb2NvYS5tbQpAQCAtMTk2LDExICsxOTYsMTEgQEAgUGxhdGZvcm1D QUxheWVyOjpMYXllclR5cGUgUGxhdGZvcm1DQUxheWVyQ29jb2E6OmxheWVyVHlwZUZvclBsYXRm b3JtTGF5ZXIoUGxhdGYKICAgICAgICAgcmV0dXJuIExheWVyVHlwZUFWUGxheWVyTGF5ZXI7CiAK ICAgICBpZiAoW2xheWVyIGlzS2luZE9mQ2xhc3M6W1dlYkdMTGF5ZXIgY2xhc3NdXSkKLSAgICAg ICAgcmV0dXJuIExheWVyVHlwZVdlYkdMTGF5ZXI7CisgICAgICAgIHJldHVybiBMYXllclR5cGVD b250ZW50c1Byb3ZpZGVkTGF5ZXI7CiAKICNpZiBFTkFCTEUoV0VCR1BVKQogICAgIGlmIChbbGF5 ZXIgaXNLaW5kT2ZDbGFzczpbV2ViR1BVTGF5ZXIgY2xhc3NdXSkKLSAgICAgICAgcmV0dXJuIExh eWVyVHlwZVdlYkdQVUxheWVyOworICAgICAgICByZXR1cm4gTGF5ZXJUeXBlQ29udGVudHNQcm92 aWRlZExheWVyOwogI2VuZGlmCiAKICAgICByZXR1cm4gTGF5ZXJUeXBlQ3VzdG9tOwpAQCAtMjU0 LDExICsyNTQsOCBAQCBQbGF0Zm9ybUNBTGF5ZXJDb2NvYTo6UGxhdGZvcm1DQUxheWVyQ29jb2Eo TGF5ZXJUeXBlIGxheWVyVHlwZSwgUGxhdGZvcm1DQUxheWVyQwogICAgIGNhc2UgTGF5ZXJUeXBl QVZQbGF5ZXJMYXllcjoKICAgICAgICAgbGF5ZXJDbGFzcyA9IGdldEFWUGxheWVyTGF5ZXJDbGFz cygpOwogICAgICAgICBicmVhazsKLSNpZiBFTkFCTEUoV0VCR1BVKQotICAgIGNhc2UgTGF5ZXJU eXBlV2ViR1BVTGF5ZXI6Ci0jZW5kaWYKLSAgICBjYXNlIExheWVyVHlwZVdlYkdMTGF5ZXI6Ci0g ICAgICAgIC8vIFdlIGRvbid0IGNyZWF0ZSBQbGF0Zm9ybUNBTGF5ZXJDb2NvYXMgd3JhcHBlZCBh cm91bmQgV2ViR0xMYXllcnMuCisgICAgY2FzZSBMYXllclR5cGVDb250ZW50c1Byb3ZpZGVkTGF5 ZXI6CisgICAgICAgIC8vIFdlIGRvbid0IGNyZWF0ZSBQbGF0Zm9ybUNBTGF5ZXJDb2NvYXMgd3Jh cHBlZCBhcm91bmQgV2ViR0xMYXllcnMgb3IgV2ViR1BVTGF5ZXJzLgogICAgICAgICBBU1NFUlRf Tk9UX1JFQUNIRUQoKTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBMYXllclR5cGVTaGFwZUxh eWVyOgpAQCAtMjk1LDExICsyOTIsNyBAQCB2b2lkIFBsYXRmb3JtQ0FMYXllckNvY29hOjpjb21t b25Jbml0KCkKICAgICBbbV9sYXllciBzZXRWYWx1ZTpbTlNWYWx1ZSB2YWx1ZVdpdGhQb2ludGVy OnRoaXNdIGZvcktleTpwbGF0Zm9ybUNBTGF5ZXJQb2ludGVyXTsKICAgICAKICAgICAvLyBDbGVh ciBhbGwgdGhlIGltcGxpY2l0IGFuaW1hdGlvbnMgb24gdGhlIENBTGF5ZXIKLSNpZiBFTkFCTEUo V0VCR1BVKQotICAgIGlmIChtX2xheWVyVHlwZSA9PSBMYXllclR5cGVBVlBsYXllckxheWVyIHx8 IG1fbGF5ZXJUeXBlID09IExheWVyVHlwZVdlYkdMTGF5ZXIgfHwgbV9sYXllclR5cGUgPT0gTGF5 ZXJUeXBlV2ViR1BVTGF5ZXIgfHwgbV9sYXllclR5cGUgPT0gTGF5ZXJUeXBlU2Nyb2xsaW5nTGF5 ZXIgfHwgbV9sYXllclR5cGUgPT0gTGF5ZXJUeXBlQ3VzdG9tKQotI2Vsc2UKLSAgICBpZiAobV9s YXllclR5cGUgPT0gTGF5ZXJUeXBlQVZQbGF5ZXJMYXllciB8fCBtX2xheWVyVHlwZSA9PSBMYXll clR5cGVXZWJHTExheWVyIHx8IG1fbGF5ZXJUeXBlID09IExheWVyVHlwZVNjcm9sbGluZ0xheWVy IHx8IG1fbGF5ZXJUeXBlID09IExheWVyVHlwZUN1c3RvbSkKLSNlbmRpZgorICAgIGlmIChtX2xh eWVyVHlwZSA9PSBMYXllclR5cGVBVlBsYXllckxheWVyIHx8IG1fbGF5ZXJUeXBlID09IExheWVy VHlwZUNvbnRlbnRzUHJvdmlkZWRMYXllciB8fCBtX2xheWVyVHlwZSA9PSBMYXllclR5cGVTY3Jv bGxpbmdMYXllciB8fCBtX2xheWVyVHlwZSA9PSBMYXllclR5cGVDdXN0b20pCiAgICAgICAgIFtt X2xheWVyIHdlYl9kaXNhYmxlQWxsQWN0aW9uc107CiAgICAgZWxzZQogICAgICAgICBbbV9sYXll ciBzZXREZWxlZ2F0ZTpbV2ViQWN0aW9uRGlzYWJsaW5nQ0FMYXllckRlbGVnYXRlIHNoYXJlZF1d OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL21hYy9SZW1vdGVMYXllckJhY2tp bmdTdG9yZS5tbSBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMvUmVtb3RlTGF5ZXJCYWNraW5n U3RvcmUubW0KaW5kZXggNGY5OGQ0ODkxNzY5ODJjMmY5ZDIzZDc1YTczM2I1MmQ2OGI5NjFmOS4u Mjg0MGI5NTY2M2NmZTkzZGY1NWMxMDJkOWFiODMwZTA5N2FmZTg3YiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvU2hhcmVkL21hYy9SZW1vdGVMYXllckJhY2tpbmdTdG9yZS5tbQorKysgYi9T b3VyY2UvV2ViS2l0Mi9TaGFyZWQvbWFjL1JlbW90ZUxheWVyQmFja2luZ1N0b3JlLm1tCkBAIC0z NTgsMTAgKzM1OCw3IEBAIHZvaWQgUmVtb3RlTGF5ZXJCYWNraW5nU3RvcmU6OmRyYXdJbkNvbnRl eHQoR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0LCBDR0ltYWdlUmVmCiAgICAgY2FzZSBQbGF0Zm9y bUNBTGF5ZXI6OkxheWVyVHlwZVBhZ2VUaWxlZEJhY2tpbmdMYXllcjoKICAgICBjYXNlIFBsYXRm b3JtQ0FMYXllcjo6TGF5ZXJUeXBlUm9vdExheWVyOgogICAgIGNhc2UgUGxhdGZvcm1DQUxheWVy OjpMYXllclR5cGVBVlBsYXllckxheWVyOgotICAgIGNhc2UgUGxhdGZvcm1DQUxheWVyOjpMYXll clR5cGVXZWJHTExheWVyOgotI2lmIEVOQUJMRShXRUJHUFUpCi0gICAgY2FzZSBQbGF0Zm9ybUNB TGF5ZXI6OkxheWVyVHlwZVdlYkdQVUxheWVyOgotI2VuZGlmCisgICAgY2FzZSBQbGF0Zm9ybUNB TGF5ZXI6OkxheWVyVHlwZUNvbnRlbnRzUHJvdmlkZWRMYXllcjoKICAgICBjYXNlIFBsYXRmb3Jt Q0FMYXllcjo6TGF5ZXJUeXBlU2hhcGVMYXllcjoKICAgICBjYXNlIFBsYXRmb3JtQ0FMYXllcjo6 TGF5ZXJUeXBlU2Nyb2xsaW5nTGF5ZXI6CiAgICAgY2FzZSBQbGF0Zm9ybUNBTGF5ZXI6OkxheWVy VHlwZUN1c3RvbToKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMvUmVtb3Rl TGF5ZXJUcmVlVHJhbnNhY3Rpb24ubW0gYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvbWFjL1JlbW90 ZUxheWVyVHJlZVRyYW5zYWN0aW9uLm1tCmluZGV4IDAzM2FkMGU0OTdlYTY4ODU3NmZlMWIxZTE5 YmMyNzM4NWQ4N2IzMzEuLmQ0ZjI0NTBkZjYwM2JiZDFjMDQyODA5YmQ3MzQ3OGEzMzE2YmIxOTkg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMvUmVtb3RlTGF5ZXJUcmVlVHJh bnNhY3Rpb24ubW0KKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL21hYy9SZW1vdGVMYXllclRy ZWVUcmFuc2FjdGlvbi5tbQpAQCAtODkzLDEyICs4OTMsNyBAQCBDU3RyaW5nIFJlbW90ZUxheWVy VHJlZVRyYW5zYWN0aW9uOjpkZXNjcmlwdGlvbigpIGNvbnN0CiAgICAgICAgICAgICBjYXNlIFBs YXRmb3JtQ0FMYXllcjo6TGF5ZXJUeXBlQVZQbGF5ZXJMYXllcjoKICAgICAgICAgICAgICAgICB0 cyA8PCAiIChjb250ZXh0LWlkICIgPDwgY3JlYXRlZExheWVyLmhvc3RpbmdDb250ZXh0SUQgPDwg IikiOwogICAgICAgICAgICAgICAgIGJyZWFrOwotI2lmIEVOQUJMRShXRUJHUFUpCi0gICAgICAg ICAgICBjYXNlIFBsYXRmb3JtQ0FMYXllcjo6TGF5ZXJUeXBlV2ViR1BVTGF5ZXI6Ci0gICAgICAg ICAgICAgICAgdHMgPDwgIiAoY29udGV4dC1pZCAiIDw8IGNyZWF0ZWRMYXllci5ob3N0aW5nQ29u dGV4dElEIDw8ICIpIjsKLSAgICAgICAgICAgICAgICBicmVhazsKLSNlbmRpZgotICAgICAgICAg ICAgY2FzZSBQbGF0Zm9ybUNBTGF5ZXI6OkxheWVyVHlwZVdlYkdMTGF5ZXI6CisgICAgICAgICAg ICBjYXNlIFBsYXRmb3JtQ0FMYXllcjo6TGF5ZXJUeXBlQ29udGVudHNQcm92aWRlZExheWVyOgog ICAgICAgICAgICAgICAgIHRzIDw8ICIgKGNvbnRleHQtaWQgIiA8PCBjcmVhdGVkTGF5ZXIuaG9z dGluZ0NvbnRleHRJRCA8PCAiKSI7CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAg ICBjYXNlIFBsYXRmb3JtQ0FMYXllcjo6TGF5ZXJUeXBlQ3VzdG9tOgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9SZW1vdGVMYXllclRyZWVIb3N0SU9TLm1tIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9SZW1vdGVMYXllclRyZWVIb3N0SU9TLm1tCmluZGV4 IDYzNWQ3MWFjN2I1Yzk3ZWQwZGVhN2I5ODg3OWUwZmQ4ZTZmOGM3NWUuLmRiZDYxZWJjZDkwMTYz ODI3NWZmODc0MTNlNWNmNzFkNWUyNjAzZTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9pb3MvUmVtb3RlTGF5ZXJUcmVlSG9zdElPUy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvaW9zL1JlbW90ZUxheWVyVHJlZUhvc3RJT1MubW0KQEAgLTIwNiwxMCArMjA2 LDcgQEAgTGF5ZXJPclZpZXcgKlJlbW90ZUxheWVyVHJlZUhvc3Q6OmNyZWF0ZUxheWVyKGNvbnN0 IFJlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uOjoKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBQ bGF0Zm9ybUNBTGF5ZXI6OkxheWVyVHlwZUN1c3RvbToKICAgICBjYXNlIFBsYXRmb3JtQ0FMYXll cjo6TGF5ZXJUeXBlQVZQbGF5ZXJMYXllcjoKLSNpZiBFTkFCTEUoV0VCR1BVKQotICAgIGNhc2Ug UGxhdGZvcm1DQUxheWVyOjpMYXllclR5cGVXZWJHUFVMYXllcjoKLSNlbmRpZgotICAgIGNhc2Ug UGxhdGZvcm1DQUxheWVyOjpMYXllclR5cGVXZWJHTExheWVyOgorICAgIGNhc2UgUGxhdGZvcm1D QUxheWVyOjpMYXllclR5cGVDb250ZW50c1Byb3ZpZGVkTGF5ZXI6CiAgICAgICAgIGlmICghbV9p c0RlYnVnTGF5ZXJUcmVlSG9zdCkgewogICAgICAgICAgICAgdmlldyA9IGFkb3B0TlMoW1tXS1Jl bW90ZVZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6Q0dSZWN0WmVybyBjb250ZXh0SUQ6cHJvcGVy dGllcy5ob3N0aW5nQ29udGV4dElEXSk7CiAgICAgICAgICAgICBpZiAocHJvcGVydGllcy50eXBl ID09IFBsYXRmb3JtQ0FMYXllcjo6TGF5ZXJUeXBlQVZQbGF5ZXJMYXllcikgewpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9SZW1vdGVMYXllclRyZWVIb3N0Lm1tIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9SZW1vdGVMYXllclRyZWVIb3N0Lm1tCmluZGV4 IDVhZTFiZjAwNWU2NzVmNjkwYjJmMmJiZmZhYTQ4MTY0MDJmMzg5MTUuLmUyOTg4MWI3NDEyNWJm NDE2ZDJhNTIzMjhlOTA1YTQxMWMwN2ViMTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9tYWMvUmVtb3RlTGF5ZXJUcmVlSG9zdC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvbWFjL1JlbW90ZUxheWVyVHJlZUhvc3QubW0KQEAgLTI1NCwxMCArMjU0LDcgQEAg TGF5ZXJPclZpZXcgKlJlbW90ZUxheWVyVHJlZUhvc3Q6OmNyZWF0ZUxheWVyKGNvbnN0IFJlbW90 ZUxheWVyVHJlZVRyYW5zYWN0aW9uOjoKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBQbGF0Zm9y bUNBTGF5ZXI6OkxheWVyVHlwZUN1c3RvbToKICAgICBjYXNlIFBsYXRmb3JtQ0FMYXllcjo6TGF5 ZXJUeXBlQVZQbGF5ZXJMYXllcjoKLSNpZiBFTkFCTEUoV0VCR1BVKQotICAgIGNhc2UgUGxhdGZv cm1DQUxheWVyOjpMYXllclR5cGVXZWJHUFVMYXllcjoKLSNlbmRpZgotICAgIGNhc2UgUGxhdGZv cm1DQUxheWVyOjpMYXllclR5cGVXZWJHTExheWVyOgorICAgIGNhc2UgUGxhdGZvcm1DQUxheWVy OjpMYXllclR5cGVDb250ZW50c1Byb3ZpZGVkTGF5ZXI6CiAgICAgICAgIGlmICghbV9pc0RlYnVn TGF5ZXJUcmVlSG9zdCkKICAgICAgICAgICAgIGxheWVyID0gV0tNYWtlUmVuZGVyTGF5ZXIocHJv cGVydGllcy5ob3N0aW5nQ29udGV4dElEKTsKICAgICAgICAgZWxzZQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9QbGF0Zm9ybUNBTGF5ZXJSZW1vdGVD dXN0b20ubW0gYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1BsYXRmb3Jt Q0FMYXllclJlbW90ZUN1c3RvbS5tbQppbmRleCA2ZWM4ZjEzZTg2OTZiOTQyNDA5OTNiODBkMjY5 NzQyYmMzM2Q5NDE0Li40OWM0Mzk3OGVmNmVlMDYwOWM5N2RhNGZhMzIzNDU5OTg1YTE5MWIxIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1BsYXRmb3Jt Q0FMYXllclJlbW90ZUN1c3RvbS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dl YlBhZ2UvbWFjL1BsYXRmb3JtQ0FMYXllclJlbW90ZUN1c3RvbS5tbQpAQCAtODIsMTEgKzgyLDcg QEAgUGxhdGZvcm1DQUxheWVyUmVtb3RlQ3VzdG9tOjpQbGF0Zm9ybUNBTGF5ZXJSZW1vdGVDdXN0 b20oTGF5ZXJUeXBlIGxheWVyVHlwZSwgUGwKICAgICBtX3BsYXRmb3JtTGF5ZXIgPSBjdXN0b21M YXllcjsKICAgICBbY3VzdG9tTGF5ZXIgd2ViX2Rpc2FibGVBbGxBY3Rpb25zXTsKIAotI2lmIEVO QUJMRShXRUJHUFUpCi0gICAgbV9wcm92aWRlc0NvbnRlbnRzID0gbGF5ZXJUeXBlID09IExheWVy VHlwZVdlYkdMTGF5ZXIgfHwgbGF5ZXJUeXBlID09IExheWVyVHlwZVdlYkdQVUxheWVyOwotI2Vs c2UKLSAgICBtX3Byb3ZpZGVzQ29udGVudHMgPSBsYXllclR5cGUgPT0gTGF5ZXJUeXBlV2ViR0xM YXllcjsKLSNlbmRpZgorICAgIG1fcHJvdmlkZXNDb250ZW50cyA9IGxheWVyVHlwZSA9PSBMYXll clR5cGVDb250ZW50c1Byb3ZpZGVkTGF5ZXI7CiAKICAgICBwcm9wZXJ0aWVzKCkucG9zaXRpb24g PSBGbG9hdFBvaW50M0QoY3VzdG9tTGF5ZXIucG9zaXRpb24ueCwgY3VzdG9tTGF5ZXIucG9zaXRp b24ueSwgY3VzdG9tTGF5ZXIuelBvc2l0aW9uKTsKICAgICBwcm9wZXJ0aWVzKCkuYW5jaG9yUG9p bnQgPSBGbG9hdFBvaW50M0QoY3VzdG9tTGF5ZXIuYW5jaG9yUG9pbnQueCwgY3VzdG9tTGF5ZXIu YW5jaG9yUG9pbnQueSwgY3VzdG9tTGF5ZXIuYW5jaG9yUG9pbnRaKTsKQEAgLTEyNSwxMSArMTIx LDcgQEAgUGFzc1JlZlB0cjxXZWJDb3JlOjpQbGF0Zm9ybUNBTGF5ZXI+IFBsYXRmb3JtQ0FMYXll clJlbW90ZUN1c3RvbTo6Y2xvbmUoUGxhdGZvcm0KICAgICAgICAgfQogCiAgICAgICAgIGNvcHlD b250ZW50cyA9IGZhbHNlOwotI2lmIEVOQUJMRShXRUJHUFUpCi0gICAgfSBlbHNlIGlmIChsYXll clR5cGUoKSA9PSBMYXllclR5cGVXZWJHTExheWVyIHx8IGxheWVyVHlwZSgpID09IExheWVyVHlw ZVdlYkdQVUxheWVyKSB7Ci0jZWxzZQotICAgIH0gZWxzZSBpZiAobGF5ZXJUeXBlKCkgPT0gTGF5 ZXJUeXBlV2ViR0xMYXllcikgewotI2VuZGlmCisgICAgfSBlbHNlIGlmIChsYXllclR5cGUoKSA9 PSBMYXllclR5cGVDb250ZW50c1Byb3ZpZGVkTGF5ZXIpIHsKICAgICAgICAgY2xvbmVkTGF5ZXIg PSBhZG9wdE5TKFtbQ0FMYXllciBhbGxvY10gaW5pdF0pOwogICAgICAgICAvLyBGSVhNRTogY3Vy cmVudGx5IGNvcHlpbmcgV2ViR0wgY29udGVudHMgYnJlYWtzIHRoZSBvcmlnaW5hbCBsYXllci4K ICAgICAgICAgY29weUNvbnRlbnRzID0gZmFsc2U7Cg==