224271 2021-04-07 00:26:11 -0700 [Cairo][GPUP] GraphicsContextGLOpenGL::paintToCanvas can't paint into a remote canvas 2021-04-09 15:10:31 -0700 1 1 1 Unclassified WebKit WebGL WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 fujii fujii dino don.olmstead ews-watchlist graouts kbr kkinnunen kondapallykalyan mrobinson webkit-bug-importer zdobersek oldest_to_newest 1747788 0 fujii 2021-04-07 00:26:11 -0700 [Cairo][GPUP] GraphicsContextGLOpenGL::paintToCanvas can't paint into a remote canvas WebGL canvas tests are failing in WinCairo WK2 layout tests since r274327 enabled GPU process mode for WebKitTestRunner. webgl/1.0.3/conformance/canvas/canvas-test.html [ Failure ] webgl/1.0.3/conformance/canvas/draw-static-webgl-to-multiple-canvas-test.html [ Failure ] webgl/1.0.3/conformance/canvas/draw-webgl-to-canvas-test.html [ Failure ] webgl/1.0.3/conformance/canvas/to-data-url-test.html [ Failure ] webgl/1.0.3/conformance/context/context-attribute-preserve-drawing-buffer.html [ Failure ] webgl/1.0.3/conformance/textures/gl-pixelstorei.html [ Failure ] webgl/1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-webgl-canvas-rgb565.html [ Failure ] webgl/1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-webgl-canvas-rgba4444.html [ Failure ] webgl/1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-webgl-canvas-rgba5551.html [ Failure ] webgl/1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-webgl-canvas.html [ Failure ] webgl/1.0.3/conformance/textures/tex-image-canvas-corruption.html [ Failure ] webgl/1.0.3/conformance/textures/tex-image-webgl.html [ Failure ] webgl/2.0.0/conformance/canvas/canvas-test.html [ Failure ] webgl/2.0.0/conformance/canvas/draw-static-webgl-to-multiple-canvas-test.html [ Failure ] webgl/2.0.0/conformance/canvas/draw-webgl-to-canvas-test.html [ Failure ] webgl/2.0.0/conformance/canvas/to-data-url-test.html [ Failure ] webgl/2.0.0/conformance/context/context-attribute-preserve-drawing-buffer.html [ Failure ] webgl/2.0.0/conformance/textures/misc/gl-pixelstorei.html [ Failure ] webgl/2.0.0/conformance/textures/misc/tex-image-canvas-corruption.html [ Failure ] webgl/2.0.0/conformance/textures/misc/tex-image-webgl.html [ Failure ] webgl/2.0.0/conformance/textures/webgl_canvas/tex-2d-rgb-rgb-unsigned_byte.html [ Failure ] webgl/2.0.0/conformance/textures/webgl_canvas/tex-2d-rgb-rgb-unsigned_short_5_6_5.html [ Failure ] webgl/2.0.0/conformance/textures/webgl_canvas/tex-2d-rgba-rgba-unsigned_byte.html [ Failure ] webgl/2.0.0/conformance/textures/webgl_canvas/tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html [ Failure ] webgl/2.0.0/conformance/textures/webgl_canvas/tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html [ Failure ] webgl/2.0.0/conformance2/textures/canvas_sub_rectangle/tex-2d-r11f_g11f_b10f-rgb-float.html [ Failure ] webgl/2.0.0/conformance2/textures/canvas_sub_rectangle/tex-2d-r11f_g11f_b10f-rgb-half_float.html [ Failure ] (snipped) 1747789 1 425360 fujii 2021-04-07 00:27:01 -0700 Created attachment 425360 WIP patch 1748058 2 425436 fujii 2021-04-07 14:08:11 -0700 Created attachment 425436 Patch 1748222 3 425436 kkinnunen 2021-04-08 00:27:11 -0700 Comment on attachment 425436 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=425436&action=review Makes sense to me > Source/WebCore/platform/graphics/cairo/GraphicsContextGLCairo.cpp:136 > + // CSS styling may cause the canvas's content to be resized on Not sure this comment is valuable enough to copy from CG, it appears to be pointless.. > Source/WebCore/platform/graphics/cairo/GraphicsContextGLCairo.cpp:140 > + // We want to completely overwrite the previous frame's Maybe you don't need to duplicate this from CG, it appears to be a bit wrong. (there's no previous frame) > Source/WebCore/platform/graphics/cairo/GraphicsContextGLCairo.cpp:147 > + context.drawNativeImage(*image, imageSize, canvasRect, FloatRect(FloatPoint(), imageSize), { CompositeOperator::Copy }); I know you copied CG, but I think this could also be : context.drawNativeImage(*image, imageSize, FloatRect{{}, canvasSize }, FloatRect{{}, imageSize}, { CompositeOperator::Copy }); (e.g. no need to declare canvasRect if you don't anyway declare imageRect either. 1748482 4 fujii 2021-04-08 14:49:38 -0700 Yup, I just copied the CG port code thoughtlessly. Will fix. Thank you very much. 1748555 5 425563 fujii 2021-04-08 17:13:07 -0700 Created attachment 425563 Patch 1748881 6 425563 fujii 2021-04-09 15:09:32 -0700 Comment on attachment 425563 Patch Clearing flags on attachment: 425563 Committed r275780 (236353@main): <https://commits.webkit.org/236353@main> 1748882 7 fujii 2021-04-09 15:09:36 -0700 All reviewed patches have been landed. Closing bug. 1748884 8 webkit-bug-importer 2021-04-09 15:10:31 -0700 <rdar://problem/76472277> 425360 2021-04-07 00:27:01 -0700 2021-04-07 14:07:54 -0700 WIP patch a.diff text/plain 2689 fujii ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0dyYXBo aWNzQ29udGV4dEdMQ2Fpcm8uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2Fpcm8vR3JhcGhpY3NDb250ZXh0R0xDYWlyby5jcHAKaW5kZXggNWI4ZDhiNWYxYWUyLi40OGI4 NWU4MDBkZWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nh aXJvL0dyYXBoaWNzQ29udGV4dEdMQ2Fpcm8uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2NhaXJvL0dyYXBoaWNzQ29udGV4dEdMQ2Fpcm8uY3BwCkBAIC0xMTIsMTAg KzExMiw2IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0R0xPcGVuR0w6OnBhaW50VG9DYW52YXMoY29u c3QgR3JhcGhpY3NDb250ZXh0R0xBdHRyaWJ1dGVzJiBzCiAgICAgaWYgKGNhbnZhc1NpemUuaXNF bXB0eSgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBQbGF0Zm9ybUNvbnRleHRDYWlybyogcGxh dGZvcm1Db250ZXh0ID0gY29udGV4dC5wbGF0Zm9ybUNvbnRleHQoKTsKLSAgICBpZiAoIXBsYXRm b3JtQ29udGV4dCkKLSAgICAgICAgcmV0dXJuOwotCiAgICAgLy8gQ29udmVydCBSR0JBIHRvIEJH UkEuIEJHUkEgaXMgQ0FJUk9fRk9STUFUX0FSR0IzMiBvbiBsaXR0bGUtZW5kaWFuIGFyY2hpdGVj dHVyZXMuCiAgICAgc2l6ZV90IHRvdGFsQnl0ZXMgPSBpbWFnZURhdGEtPmRhdGEoKS0+Ynl0ZUxl bmd0aCgpOwogICAgIHVpbnQ4X3QqIHBpeGVscyA9IGltYWdlRGF0YS0+ZGF0YSgpLT5kYXRhKCk7 CkBAIC0xMzAsMjYgKzEyNiwyNSBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dEdMT3BlbkdMOjpwYWlu dFRvQ2FudmFzKGNvbnN0IEdyYXBoaWNzQ29udGV4dEdMQXR0cmlidXRlcyYgcwogICAgICAgICB9 CiAgICAgfQogCi0gICAgY2Fpcm9fdCogY3IgPSBwbGF0Zm9ybUNvbnRleHQtPmNyKCk7Ci0gICAg cGxhdGZvcm1Db250ZXh0LT5zYXZlKCk7Ci0KLSAgICBjYWlyb19yZWN0YW5nbGUoY3IsIDAsIDAs IGNhbnZhc1NpemUud2lkdGgoKSwgY2FudmFzU2l6ZS5oZWlnaHQoKSk7Ci0gICAgY2Fpcm9fc2V0 X29wZXJhdG9yKGNyLCBDQUlST19PUEVSQVRPUl9DTEVBUik7Ci0gICAgY2Fpcm9fcGFpbnQoY3Ip OworICAgIGF1dG8gaW1hZ2VTaXplID0gaW1hZ2VEYXRhLT5zaXplKCk7CiAKICAgICBSZWZQdHI8 Y2Fpcm9fc3VyZmFjZV90PiBpbWFnZVN1cmZhY2UgPSBhZG9wdFJlZihjYWlyb19pbWFnZV9zdXJm YWNlX2NyZWF0ZV9mb3JfZGF0YSgKLSAgICAgICAgaW1hZ2VEYXRhLT5kYXRhKCktPmRhdGEoKSwg Q0FJUk9fRk9STUFUX0FSR0IzMiwgaW1hZ2VEYXRhLT53aWR0aCgpLCBpbWFnZURhdGEtPmhlaWdo dCgpLCBpbWFnZURhdGEtPndpZHRoKCkgKiA0KSk7Ci0KLSAgICAvLyBPcGVuR0wga2VlcHMgdGhl IHBpeGVscyBzdG9yZWQgYm90dG9tIHVwLCBzbyB3ZSBuZWVkIHRvIGZsaXAgdGhlIGltYWdlIGhl cmUuCi0gICAgY2Fpcm9fdHJhbnNsYXRlKGNyLCAwLCBpbWFnZURhdGEtPmhlaWdodCgpKTsKLSAg ICBjYWlyb19zY2FsZShjciwgMSwgLTEpOwotCi0gICAgY2Fpcm9fc2V0X29wZXJhdG9yKGNyLCBD QUlST19PUEVSQVRPUl9PVkVSKTsKLSAgICBjYWlyb19zZXRfc291cmNlX3N1cmZhY2UoY3IsIGlt YWdlU3VyZmFjZS5nZXQoKSwgMCwgMCk7Ci0gICAgY2Fpcm9fcmVjdGFuZ2xlKGNyLCAwLCAwLCBj YW52YXNTaXplLndpZHRoKCksIC1jYW52YXNTaXplLmhlaWdodCgpKTsKLQotICAgIGNhaXJvX2Zp bGwoY3IpOwotICAgIHBsYXRmb3JtQ29udGV4dC0+cmVzdG9yZSgpOworICAgICAgICAgICAgaW1h Z2VEYXRhLT5kYXRhKCktPmRhdGEoKSwgQ0FJUk9fRk9STUFUX0FSR0IzMiwgaW1hZ2VEYXRhLT53 aWR0aCgpLCBpbWFnZURhdGEtPmhlaWdodCgpLCBpbWFnZURhdGEtPndpZHRoKCkgKiA0KSk7CisK KyAgICBhdXRvIGltYWdlID0gTmF0aXZlSW1hZ2U6OmNyZWF0ZShXVEZNb3ZlKGltYWdlU3VyZmFj ZSkpOworCisgICAgLy8gQ1NTIHN0eWxpbmcgbWF5IGNhdXNlIHRoZSBjYW52YXMncyBjb250ZW50 IHRvIGJlIHJlc2l6ZWQgb24KKyAgICAvLyB0aGUgcGFnZS4gR28gYmFjayB0byB0aGUgQ2FudmFz IHRvIGZpZ3VyZSBvdXQgdGhlIGNvcnJlY3QKKyAgICAvLyB3aWR0aCBhbmQgaGVpZ2h0IHRvIGRy YXcuCisgICAgRmxvYXRSZWN0IGNhbnZhc1JlY3QoRmxvYXRQb2ludCgpLCBjYW52YXNTaXplKTsK KyAgICAvLyBXZSB3YW50IHRvIGNvbXBsZXRlbHkgb3ZlcndyaXRlIHRoZSBwcmV2aW91cyBmcmFt ZSdzCisgICAgLy8gcmVuZGVyaW5nIHJlc3VsdHMuCisKKyAgICBHcmFwaGljc0NvbnRleHRTdGF0 ZVNhdmVyIHN0YXRlU2F2ZXIoY29udGV4dCk7CisgICAgY29udGV4dC5zY2FsZShGbG9hdFNpemUo MSwgLTEpKTsKKyAgICBjb250ZXh0LnRyYW5zbGF0ZSgwLCAtaW1hZ2VTaXplLmhlaWdodCgpKTsK KyAgICBjb250ZXh0LnNldEltYWdlSW50ZXJwb2xhdGlvblF1YWxpdHkoSW50ZXJwb2xhdGlvblF1 YWxpdHk6OkRvTm90SW50ZXJwb2xhdGUpOworICAgIGNvbnRleHQuZHJhd05hdGl2ZUltYWdlKCpp bWFnZSwgaW1hZ2VTaXplLCBjYW52YXNSZWN0LCBGbG9hdFJlY3QoRmxvYXRQb2ludCgpLCBpbWFn ZVNpemUpLCB7IENvbXBvc2l0ZU9wZXJhdG9yOjpDb3B5IH0pOwogfQogCiB9IC8vIG5hbWVzcGFj ZSBXZWJDb3JlCg== 425436 2021-04-07 14:08:11 -0700 2021-04-08 17:12:55 -0700 Patch bug-224271-20210408060810.patch text/plain 3954 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1NTg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2Q2NmYzY2EyZjA4NDc4 OTgzMzIwNGQ3Njg0YzlmYzBhMjQ0NzFmMy4uMWU2ODQ2NzQwMzg2ZGI1ZDZlMjUwMGE2MzlmOGM5 NzNiNGY2MzI0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIxLTA0LTA3ICBGdWpp aSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgorCisgICAgICAgIFtDYWlyb11b R1BVUF0gR3JhcGhpY3NDb250ZXh0R0xPcGVuR0w6OnBhaW50VG9DYW52YXMgY2FuJ3QgcGFpbnQg aW50byBhIHJlbW90ZSBjYW52YXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIyNDI3MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFdlYkdMIGNhbnZhcyB0ZXN0cyB3ZXJlIGZhaWxpbmcgZm9yIFdpbkNhaXJv IHBvcnQgc2luY2UgcjI3NDMyNworICAgICAgICBlbmFibGVkIEdQVSBwcm9jZXNzIGZvciBjYW52 YXMgcmVuZGVyaW5nLiBJbiB0aGUgY3VycmVudAorICAgICAgICBpbXBsZW1lbnRhdGlvbiBvZiBX ZWJLaXRUZXN0UnVubmVyLCAyRCBjYW52YXNlcyBhcmUgaW4gR1BVCisgICAgICAgIHByb2Nlc3Ms IHdoaWxlIFdlYkdMIGNhbnZhc2VzIGFyZSBpbiBXZWJDb250ZW50IHByb2Nlc3MuIFJlbW90ZQor ICAgICAgICBjYW52YXNlcyBpbiBHUFUgcHJvY2VzcyBmYWlsZWQgdG8gZHJhd0ltYWdlKCkgd2l0 aCBhIFdlYkdMIGNhbnZhcworICAgICAgICB3aGF0IGlzIGluIFdlYkNvbnRlbnQgcHJvY2Vzcy4K KworICAgICAgICBHcmFwaGljc0NvbnRleHRHTE9wZW5HTDo6cGFpbnRUb0NhbnZhcyBvZiBDYWly byBwb3J0IHdhcyBwYWludGluZworICAgICAgICBkaXJlY3RseSBpbnRvIFBsYXRmb3JtQ29udGV4 dENhaXJvLiBJdCBhbHNvIHNob3VsZCB1c2UKKyAgICAgICAgR3JhcGhpY3NDb250ZXh0OjpkcmF3 TmF0aXZlSW1hZ2UgYXMgd2VsbCBhcyBDRyBwb3J0IGRvZXMuCisKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9jYWlyby9HcmFwaGljc0NvbnRleHRHTENhaXJvLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkdyYXBoaWNzQ29udGV4dEdMT3BlbkdMOjpwYWludFRvQ2FudmFzKToKKwogMjAyMS0w NC0wNiAgSmVhbi1ZdmVzIEF2ZW5hcmQgIDxqeWFAYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCBs b2dpYyBlcnJvciBpbiBNZWRpYU1ldGFkYXRhSW5pdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vR3JhcGhpY3NDb250ZXh0R0xDYWlyby5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9HcmFwaGljc0NvbnRleHRHTENh aXJvLmNwcAppbmRleCA1YjhkOGI1ZjFhZTJjMWZiNmI0ZWIxOGI4NWYwYTI1YzhhNTc0N2NiLi45 OTJjOGFiOWNlNWM1ZTMzZGRkZWVlYmMzNzhlYTVjOTc4ZDdkY2I3IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9HcmFwaGljc0NvbnRleHRHTENhaXJv LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9HcmFwaGlj c0NvbnRleHRHTENhaXJvLmNwcApAQCAtMTEyLDEwICsxMTIsNiBAQCB2b2lkIEdyYXBoaWNzQ29u dGV4dEdMT3BlbkdMOjpwYWludFRvQ2FudmFzKGNvbnN0IEdyYXBoaWNzQ29udGV4dEdMQXR0cmli dXRlcyYgcwogICAgIGlmIChjYW52YXNTaXplLmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuOwog Ci0gICAgUGxhdGZvcm1Db250ZXh0Q2Fpcm8qIHBsYXRmb3JtQ29udGV4dCA9IGNvbnRleHQucGxh dGZvcm1Db250ZXh0KCk7Ci0gICAgaWYgKCFwbGF0Zm9ybUNvbnRleHQpCi0gICAgICAgIHJldHVy bjsKLQogICAgIC8vIENvbnZlcnQgUkdCQSB0byBCR1JBLiBCR1JBIGlzIENBSVJPX0ZPUk1BVF9B UkdCMzIgb24gbGl0dGxlLWVuZGlhbiBhcmNoaXRlY3R1cmVzLgogICAgIHNpemVfdCB0b3RhbEJ5 dGVzID0gaW1hZ2VEYXRhLT5kYXRhKCktPmJ5dGVMZW5ndGgoKTsKICAgICB1aW50OF90KiBwaXhl bHMgPSBpbWFnZURhdGEtPmRhdGEoKS0+ZGF0YSgpOwpAQCAtMTMwLDI2ICsxMjYsMjUgQEAgdm9p ZCBHcmFwaGljc0NvbnRleHRHTE9wZW5HTDo6cGFpbnRUb0NhbnZhcyhjb25zdCBHcmFwaGljc0Nv bnRleHRHTEF0dHJpYnV0ZXMmIHMKICAgICAgICAgfQogICAgIH0KIAotICAgIGNhaXJvX3QqIGNy ID0gcGxhdGZvcm1Db250ZXh0LT5jcigpOwotICAgIHBsYXRmb3JtQ29udGV4dC0+c2F2ZSgpOwot Ci0gICAgY2Fpcm9fcmVjdGFuZ2xlKGNyLCAwLCAwLCBjYW52YXNTaXplLndpZHRoKCksIGNhbnZh c1NpemUuaGVpZ2h0KCkpOwotICAgIGNhaXJvX3NldF9vcGVyYXRvcihjciwgQ0FJUk9fT1BFUkFU T1JfQ0xFQVIpOwotICAgIGNhaXJvX3BhaW50KGNyKTsKKyAgICBhdXRvIGltYWdlU2l6ZSA9IGlt YWdlRGF0YS0+c2l6ZSgpOwogCiAgICAgUmVmUHRyPGNhaXJvX3N1cmZhY2VfdD4gaW1hZ2VTdXJm YWNlID0gYWRvcHRSZWYoY2Fpcm9faW1hZ2Vfc3VyZmFjZV9jcmVhdGVfZm9yX2RhdGEoCiAgICAg ICAgIGltYWdlRGF0YS0+ZGF0YSgpLT5kYXRhKCksIENBSVJPX0ZPUk1BVF9BUkdCMzIsIGltYWdl RGF0YS0+d2lkdGgoKSwgaW1hZ2VEYXRhLT5oZWlnaHQoKSwgaW1hZ2VEYXRhLT53aWR0aCgpICog NCkpOwogCi0gICAgLy8gT3BlbkdMIGtlZXBzIHRoZSBwaXhlbHMgc3RvcmVkIGJvdHRvbSB1cCwg c28gd2UgbmVlZCB0byBmbGlwIHRoZSBpbWFnZSBoZXJlLgotICAgIGNhaXJvX3RyYW5zbGF0ZShj ciwgMCwgaW1hZ2VEYXRhLT5oZWlnaHQoKSk7Ci0gICAgY2Fpcm9fc2NhbGUoY3IsIDEsIC0xKTsK KyAgICBhdXRvIGltYWdlID0gTmF0aXZlSW1hZ2U6OmNyZWF0ZShXVEZNb3ZlKGltYWdlU3VyZmFj ZSkpOwogCi0gICAgY2Fpcm9fc2V0X29wZXJhdG9yKGNyLCBDQUlST19PUEVSQVRPUl9PVkVSKTsK LSAgICBjYWlyb19zZXRfc291cmNlX3N1cmZhY2UoY3IsIGltYWdlU3VyZmFjZS5nZXQoKSwgMCwg MCk7Ci0gICAgY2Fpcm9fcmVjdGFuZ2xlKGNyLCAwLCAwLCBjYW52YXNTaXplLndpZHRoKCksIC1j YW52YXNTaXplLmhlaWdodCgpKTsKKyAgICAvLyBDU1Mgc3R5bGluZyBtYXkgY2F1c2UgdGhlIGNh bnZhcydzIGNvbnRlbnQgdG8gYmUgcmVzaXplZCBvbgorICAgIC8vIHRoZSBwYWdlLiBHbyBiYWNr IHRvIHRoZSBDYW52YXMgdG8gZmlndXJlIG91dCB0aGUgY29ycmVjdAorICAgIC8vIHdpZHRoIGFu ZCBoZWlnaHQgdG8gZHJhdy4KKyAgICBGbG9hdFJlY3QgY2FudmFzUmVjdChGbG9hdFBvaW50KCks IGNhbnZhc1NpemUpOworICAgIC8vIFdlIHdhbnQgdG8gY29tcGxldGVseSBvdmVyd3JpdGUgdGhl IHByZXZpb3VzIGZyYW1lJ3MKKyAgICAvLyByZW5kZXJpbmcgcmVzdWx0cy4KIAotICAgIGNhaXJv X2ZpbGwoY3IpOwotICAgIHBsYXRmb3JtQ29udGV4dC0+cmVzdG9yZSgpOworICAgIEdyYXBoaWNz Q29udGV4dFN0YXRlU2F2ZXIgc3RhdGVTYXZlcihjb250ZXh0KTsKKyAgICBjb250ZXh0LnNjYWxl KEZsb2F0U2l6ZSgxLCAtMSkpOworICAgIGNvbnRleHQudHJhbnNsYXRlKDAsIC1pbWFnZVNpemUu aGVpZ2h0KCkpOworICAgIGNvbnRleHQuc2V0SW1hZ2VJbnRlcnBvbGF0aW9uUXVhbGl0eShJbnRl cnBvbGF0aW9uUXVhbGl0eTo6RG9Ob3RJbnRlcnBvbGF0ZSk7CisgICAgY29udGV4dC5kcmF3TmF0 aXZlSW1hZ2UoKmltYWdlLCBpbWFnZVNpemUsIGNhbnZhc1JlY3QsIEZsb2F0UmVjdChGbG9hdFBv aW50KCksIGltYWdlU2l6ZSksIHsgQ29tcG9zaXRlT3BlcmF0b3I6OkNvcHkgfSk7CiB9CiAKIH0g Ly8gbmFtZXNwYWNlIFdlYkNvcmUK 425563 2021-04-08 17:13:07 -0700 2021-04-09 15:09:32 -0700 Patch bug-224271-20210409091306.patch text/plain 3652 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1NTg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2Q2NmYzY2EyZjA4NDc4 OTgzMzIwNGQ3Njg0YzlmYzBhMjQ0NzFmMy4uMWU2ODQ2NzQwMzg2ZGI1ZDZlMjUwMGE2MzlmOGM5 NzNiNGY2MzI0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIxLTA0LTA3ICBGdWpp aSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgorCisgICAgICAgIFtDYWlyb11b R1BVUF0gR3JhcGhpY3NDb250ZXh0R0xPcGVuR0w6OnBhaW50VG9DYW52YXMgY2FuJ3QgcGFpbnQg aW50byBhIHJlbW90ZSBjYW52YXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIyNDI3MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFdlYkdMIGNhbnZhcyB0ZXN0cyB3ZXJlIGZhaWxpbmcgZm9yIFdpbkNhaXJv IHBvcnQgc2luY2UgcjI3NDMyNworICAgICAgICBlbmFibGVkIEdQVSBwcm9jZXNzIGZvciBjYW52 YXMgcmVuZGVyaW5nLiBJbiB0aGUgY3VycmVudAorICAgICAgICBpbXBsZW1lbnRhdGlvbiBvZiBX ZWJLaXRUZXN0UnVubmVyLCAyRCBjYW52YXNlcyBhcmUgaW4gR1BVCisgICAgICAgIHByb2Nlc3Ms IHdoaWxlIFdlYkdMIGNhbnZhc2VzIGFyZSBpbiBXZWJDb250ZW50IHByb2Nlc3MuIFJlbW90ZQor ICAgICAgICBjYW52YXNlcyBpbiBHUFUgcHJvY2VzcyBmYWlsZWQgdG8gZHJhd0ltYWdlKCkgd2l0 aCBhIFdlYkdMIGNhbnZhcworICAgICAgICB3aGF0IGlzIGluIFdlYkNvbnRlbnQgcHJvY2Vzcy4K KworICAgICAgICBHcmFwaGljc0NvbnRleHRHTE9wZW5HTDo6cGFpbnRUb0NhbnZhcyBvZiBDYWly byBwb3J0IHdhcyBwYWludGluZworICAgICAgICBkaXJlY3RseSBpbnRvIFBsYXRmb3JtQ29udGV4 dENhaXJvLiBJdCBhbHNvIHNob3VsZCB1c2UKKyAgICAgICAgR3JhcGhpY3NDb250ZXh0OjpkcmF3 TmF0aXZlSW1hZ2UgYXMgd2VsbCBhcyBDRyBwb3J0IGRvZXMuCisKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9jYWlyby9HcmFwaGljc0NvbnRleHRHTENhaXJvLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkdyYXBoaWNzQ29udGV4dEdMT3BlbkdMOjpwYWludFRvQ2FudmFzKToKKwogMjAyMS0w NC0wNiAgSmVhbi1ZdmVzIEF2ZW5hcmQgIDxqeWFAYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCBs b2dpYyBlcnJvciBpbiBNZWRpYU1ldGFkYXRhSW5pdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vR3JhcGhpY3NDb250ZXh0R0xDYWlyby5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9HcmFwaGljc0NvbnRleHRHTENh aXJvLmNwcAppbmRleCA1YjhkOGI1ZjFhZTJjMWZiNmI0ZWIxOGI4NWYwYTI1YzhhNTc0N2NiLi43 YjBhYzJmZWUwNWNiYjE5OTQzNGMzMWZmYmM3YzNjMjQ4Zjk5Yzc3IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9HcmFwaGljc0NvbnRleHRHTENhaXJv LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9HcmFwaGlj c0NvbnRleHRHTENhaXJvLmNwcApAQCAtMTEyLDEwICsxMTIsNiBAQCB2b2lkIEdyYXBoaWNzQ29u dGV4dEdMT3BlbkdMOjpwYWludFRvQ2FudmFzKGNvbnN0IEdyYXBoaWNzQ29udGV4dEdMQXR0cmli dXRlcyYgcwogICAgIGlmIChjYW52YXNTaXplLmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuOwog Ci0gICAgUGxhdGZvcm1Db250ZXh0Q2Fpcm8qIHBsYXRmb3JtQ29udGV4dCA9IGNvbnRleHQucGxh dGZvcm1Db250ZXh0KCk7Ci0gICAgaWYgKCFwbGF0Zm9ybUNvbnRleHQpCi0gICAgICAgIHJldHVy bjsKLQogICAgIC8vIENvbnZlcnQgUkdCQSB0byBCR1JBLiBCR1JBIGlzIENBSVJPX0ZPUk1BVF9B UkdCMzIgb24gbGl0dGxlLWVuZGlhbiBhcmNoaXRlY3R1cmVzLgogICAgIHNpemVfdCB0b3RhbEJ5 dGVzID0gaW1hZ2VEYXRhLT5kYXRhKCktPmJ5dGVMZW5ndGgoKTsKICAgICB1aW50OF90KiBwaXhl bHMgPSBpbWFnZURhdGEtPmRhdGEoKS0+ZGF0YSgpOwpAQCAtMTMwLDI2ICsxMjYsMTggQEAgdm9p ZCBHcmFwaGljc0NvbnRleHRHTE9wZW5HTDo6cGFpbnRUb0NhbnZhcyhjb25zdCBHcmFwaGljc0Nv bnRleHRHTEF0dHJpYnV0ZXMmIHMKICAgICAgICAgfQogICAgIH0KIAotICAgIGNhaXJvX3QqIGNy ID0gcGxhdGZvcm1Db250ZXh0LT5jcigpOwotICAgIHBsYXRmb3JtQ29udGV4dC0+c2F2ZSgpOwot Ci0gICAgY2Fpcm9fcmVjdGFuZ2xlKGNyLCAwLCAwLCBjYW52YXNTaXplLndpZHRoKCksIGNhbnZh c1NpemUuaGVpZ2h0KCkpOwotICAgIGNhaXJvX3NldF9vcGVyYXRvcihjciwgQ0FJUk9fT1BFUkFU T1JfQ0xFQVIpOwotICAgIGNhaXJvX3BhaW50KGNyKTsKKyAgICBhdXRvIGltYWdlU2l6ZSA9IGlt YWdlRGF0YS0+c2l6ZSgpOwogCiAgICAgUmVmUHRyPGNhaXJvX3N1cmZhY2VfdD4gaW1hZ2VTdXJm YWNlID0gYWRvcHRSZWYoY2Fpcm9faW1hZ2Vfc3VyZmFjZV9jcmVhdGVfZm9yX2RhdGEoCiAgICAg ICAgIGltYWdlRGF0YS0+ZGF0YSgpLT5kYXRhKCksIENBSVJPX0ZPUk1BVF9BUkdCMzIsIGltYWdl RGF0YS0+d2lkdGgoKSwgaW1hZ2VEYXRhLT5oZWlnaHQoKSwgaW1hZ2VEYXRhLT53aWR0aCgpICog NCkpOwogCi0gICAgLy8gT3BlbkdMIGtlZXBzIHRoZSBwaXhlbHMgc3RvcmVkIGJvdHRvbSB1cCwg c28gd2UgbmVlZCB0byBmbGlwIHRoZSBpbWFnZSBoZXJlLgotICAgIGNhaXJvX3RyYW5zbGF0ZShj ciwgMCwgaW1hZ2VEYXRhLT5oZWlnaHQoKSk7Ci0gICAgY2Fpcm9fc2NhbGUoY3IsIDEsIC0xKTsK LQotICAgIGNhaXJvX3NldF9vcGVyYXRvcihjciwgQ0FJUk9fT1BFUkFUT1JfT1ZFUik7Ci0gICAg Y2Fpcm9fc2V0X3NvdXJjZV9zdXJmYWNlKGNyLCBpbWFnZVN1cmZhY2UuZ2V0KCksIDAsIDApOwot ICAgIGNhaXJvX3JlY3RhbmdsZShjciwgMCwgMCwgY2FudmFzU2l6ZS53aWR0aCgpLCAtY2FudmFz U2l6ZS5oZWlnaHQoKSk7CisgICAgYXV0byBpbWFnZSA9IE5hdGl2ZUltYWdlOjpjcmVhdGUoV1RG TW92ZShpbWFnZVN1cmZhY2UpKTsKIAotICAgIGNhaXJvX2ZpbGwoY3IpOwotICAgIHBsYXRmb3Jt Q29udGV4dC0+cmVzdG9yZSgpOworICAgIEdyYXBoaWNzQ29udGV4dFN0YXRlU2F2ZXIgc3RhdGVT YXZlcihjb250ZXh0KTsKKyAgICBjb250ZXh0LnNjYWxlKEZsb2F0U2l6ZSgxLCAtMSkpOworICAg IGNvbnRleHQudHJhbnNsYXRlKDAsIC1pbWFnZVNpemUuaGVpZ2h0KCkpOworICAgIGNvbnRleHQu c2V0SW1hZ2VJbnRlcnBvbGF0aW9uUXVhbGl0eShJbnRlcnBvbGF0aW9uUXVhbGl0eTo6RG9Ob3RJ bnRlcnBvbGF0ZSk7CisgICAgY29udGV4dC5kcmF3TmF0aXZlSW1hZ2UoKmltYWdlLCBpbWFnZVNp emUsIEZsb2F0UmVjdCh7IH0sIGNhbnZhc1NpemUpLCBGbG9hdFJlY3QoeyB9LCBpbWFnZVNpemUp LCB7IENvbXBvc2l0ZU9wZXJhdG9yOjpDb3B5IH0pOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJD b3JlCg==