218292 2020-10-28 10:31:58 -0700 [GTK] Direct composited images may not be rendered after a window resize 2020-10-30 01:40:19 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 magomez magomez bugs-noreply cgarcia cmarcelo ews-watchlist kondapallykalyan luiz noam oldest_to_newest 1702362 0 magomez 2020-10-28 10:31:58 -0700 This can be reproduced when there is a directly composited image that's invisible and becomes visible after maximizing the minibrowser window. What happens here is quite tricky (yet reproducible most of the times): 1 - The resize triggers a call to ThreadedCompositor::setViewportSize(), and this schedules an update. 2 - The resize triggers a call to LayerTreeHost::forceRepaint(), which calls CompositingCoordinator::flushPendingLayerChanges() causing a layer flush. 3 - The layer flush finds that the directly composited image is now visible, renders the content in a buffer, and pass the buffer to the state so it can reach the CoordinatedGraphisScene 4 - On a normal layer flush, the scene grabs the state, updates its values with the new ones, renders, and tells the LayerTreeHost that a new layer flush can be performed (with LayerTreeHost::renderNextFrame). But end of the rendering triggering in 1 will also call LayerTreeHost::renderNextFrame, causing the LayerTreeHost to launch a new layer flush before the scene has grabbed the state contents generated by the last one 5 - The new layer flush, knowing that the buffer for the image was already sent, will send an empty buffer this time (the content was already sent, no need to do it again) 6 - ImageBackingTextureMapperImpl::flushUpdate() will overwrite the previous update with the new one (with the empty buffer). But the previous update was the one containing the valid buffer, which wasn't consumed by the scene yet. 7 - After the layer flush, the new state is passed to the scene, where it will get the new image backing update, which has an empty buffer. This causes that the image won't be rendered. 1702649 1 412624 magomez 2020-10-29 01:24:37 -0700 Created attachment 412624 Patch 1702659 2 412624 cgarcia 2020-10-29 02:17:33 -0700 Comment on attachment 412624 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=412624&action=review > Source/WebCore/platform/graphics/nicosia/texmap/NicosiaImageBackingTextureMapperImpl.cpp:55 > + m_update.update.isVisible = m_layerState.update.isVisible; There's an extra space after the = 1702754 3 412660 magomez 2020-10-29 09:30:37 -0700 Created attachment 412660 Patch 1703000 4 ews-feeder 2020-10-30 01:40:18 -0700 Committed r269179: <https://trac.webkit.org/changeset/269179> All reviewed patches have been landed. Closing bug and clearing flags on attachment 412660. 412624 2020-10-29 01:24:37 -0700 2020-10-29 09:30:32 -0700 Patch bug-218292-20201029092436.patch text/plain 5431 magomez U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5MDk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzQ1MWEyOGI0NWEwYmRj MmQzZjAwMDEzMTY2ZTBmZmM3YTQ4OTRlMy4uMzIxMGEwNjFhNzhmYmNkNDU1Y2VlZWQwMDg2NjBk NDNhYjEwNzBjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIwLTEwLTI5ICBNaWd1 ZWwgR29tZXogIDxtYWdvbWV6QGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS10gRGlyZWN0IGNv bXBvc2l0ZWQgaW1hZ2VzIG1heSBub3QgYmUgcmVuZGVyZWQgYWZ0ZXIgYSB3aW5kb3cgcmVzaXpl CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTgyOTIK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBFbnN1cmUg dGhhdCB2YWxpZCBidWZmZXJzIHBhc3NlZCBmb3IgSW1hZ2VCYWNraW5ncyBhcmUgbm90IGRlc3Ry b3llZCB1bnRpbCB0aGUKKyAgICAgICAgQ29vcmRpbmF0ZWRHcmFwaGljc1NjZW5lIGNvbnN1bWVz IHRoZW0uCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9uaWNvc2lhL3RleG1hcC9OaWNv c2lhSW1hZ2VCYWNraW5nVGV4dHVyZU1hcHBlckltcGwuY3BwOgorICAgICAgICAoTmljb3NpYTo6 SW1hZ2VCYWNraW5nVGV4dHVyZU1hcHBlckltcGw6OmZsdXNoVXBkYXRlKToKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9uaWNvc2lhL3RleG1hcC9OaWNvc2lhSW1hZ2VCYWNraW5nVGV4dHVy ZU1hcHBlckltcGwuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvY29vcmRp bmF0ZWQvQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNv b3JkaW5hdGVkR3JhcGhpY3NMYXllcjo6Zmx1c2hDb21wb3NpdGluZ1N0YXRlRm9yVGhpc0xheWVy T25seSk6CisgICAgICAgIChXZWJDb3JlOjpDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6OnB1cmdl QmFja2luZ1N0b3Jlcyk6CisKIDIwMjAtMTAtMjcgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2ll aEBhcHBsZS5jb20+CiAKICAgICAgICAgW0NvbmN1cnJlbnQgZGlzcGxheSBsaXN0c10gQWRkIGFs dGVybmF0ZSB2ZXJzaW9ucyBvZiBleGlzdGluZyBkaXNwbGF5IGxpc3QgaXRlbXMgdGhhdCBvbmx5 IGNvbnRhaW4gaW5saW5lIGRhdGEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL25pY29zaWEvdGV4bWFwL05pY29zaWFJbWFnZUJhY2tpbmdUZXh0dXJlTWFwcGVy SW1wbC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9uaWNvc2lhL3RleG1h cC9OaWNvc2lhSW1hZ2VCYWNraW5nVGV4dHVyZU1hcHBlckltcGwuY3BwCmluZGV4IGQzNTNjOGJl MWI1YmZhMTE2YjZjYjg1MjA5NzAyNzdjYzkzMjQ1Y2UuLmM0Mjk2YWRhMjc3ZTEyMGI3ZDdkNTUw MGE4Y2ZhYTI0NTgyNTk0NTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL25pY29zaWEvdGV4bWFwL05pY29zaWFJbWFnZUJhY2tpbmdUZXh0dXJlTWFwcGVySW1w bC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvbmljb3NpYS90ZXht YXAvTmljb3NpYUltYWdlQmFja2luZ1RleHR1cmVNYXBwZXJJbXBsLmNwcApAQCAtNDcsNiArNDcs MTUgQEAgSW1hZ2VCYWNraW5nVGV4dHVyZU1hcHBlckltcGw6On5JbWFnZUJhY2tpbmdUZXh0dXJl TWFwcGVySW1wbCgpID0gZGVmYXVsdDsKIHZvaWQgSW1hZ2VCYWNraW5nVGV4dHVyZU1hcHBlcklt cGw6OmZsdXNoVXBkYXRlKCkKIHsKICAgICBMb2NrSG9sZGVyIGxvY2tlcihtX3VwZGF0ZS5sb2Nr KTsKKworICAgIC8vIElmIHRoZSB1cGRhdGUgaGFwcGVucyBmb3IgdGhlIHNhbWUgaW1hZ2UgYW5k IHRoZXJlJ3Mgbm8gYnVmZmVyLCBrZWVwIHRoZSBjdXJyZW50IG9uZQorICAgIC8vIHNvIGl0IGNh biBiZSByZWNlaXZlZCBieSB0aGUgQ29vcmRpbmF0ZWRHcmFwaGljc1NjZW5lLiBJbiB0aGF0IGNh c2Ugd2Ugb25seSBuZWVkIHRvIHVwZGF0ZQorICAgIC8vIHRoZSBpc1Zpc2libGUgZmxhZy4KKyAg ICBpZiAoKG1fbGF5ZXJTdGF0ZS51cGRhdGUubmF0aXZlSW1hZ2VJRCA9PSBtX3VwZGF0ZS51cGRh dGUubmF0aXZlSW1hZ2VJRCkgJiYgIW1fbGF5ZXJTdGF0ZS51cGRhdGUuYnVmZmVyKSB7CisgICAg ICAgIG1fdXBkYXRlLnVwZGF0ZS5pc1Zpc2libGUgPSAgbV9sYXllclN0YXRlLnVwZGF0ZS5pc1Zp c2libGU7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKICAgICBtX3VwZGF0ZS51cGRhdGUgPSBX VEZNb3ZlKG1fbGF5ZXJTdGF0ZS51cGRhdGUpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9uaWNvc2lhL3RleG1hcC9OaWNvc2lhSW1hZ2VCYWNraW5n VGV4dHVyZU1hcHBlckltcGwuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL25p Y29zaWEvdGV4bWFwL05pY29zaWFJbWFnZUJhY2tpbmdUZXh0dXJlTWFwcGVySW1wbC5oCmluZGV4 IDQ5YjFlOWIyZWMwMzU1MmEwYmQ2MTIwYWU3N2I4ZTY5NGE5NDYxNWEuLjQwMmI1NGQwODI2YWZm OTlkYjIzY2NhNzNjNzkzYTQxYTdiY2FhZjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL25pY29zaWEvdGV4bWFwL05pY29zaWFJbWFnZUJhY2tpbmdUZXh0dXJl TWFwcGVySW1wbC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL25pY29z aWEvdGV4bWFwL05pY29zaWFJbWFnZUJhY2tpbmdUZXh0dXJlTWFwcGVySW1wbC5oCkBAIC02MCw2 ICs2MCw3IEBAIHB1YmxpYzoKIAogICAgICAgICBib29sIGlzVmlzaWJsZSB7IGZhbHNlIH07CiAg ICAgICAgIFJlZlB0cjxOaWNvc2lhOjpCdWZmZXI+IGJ1ZmZlcjsKKyAgICAgICAgdWludHB0cl90 IG5hdGl2ZUltYWdlSUQgeyAwIH07CiAgICAgfTsKIAogICAgIC8vIEFuIGltbXV0YWJsZSBsYXll ci1zaWRlIHN0YXRlIG9iamVjdC4gZmx1c2hVcGRhdGUoKSBwcmVwYXJlcwpAQCAtNzIsNyArNzMs NiBAQCBwdWJsaWM6CiAgICAgICAgIExheWVyU3RhdGUmIG9wZXJhdG9yPShMYXllclN0YXRlJiYp ID0gZGVsZXRlOwogCiAgICAgICAgIHVpbnRwdHJfdCBpbWFnZUlEIHsgMCB9OwotICAgICAgICB1 aW50cHRyX3QgbmF0aXZlSW1hZ2VJRCB7IDAgfTsKICAgICAgICAgVXBkYXRlIHVwZGF0ZTsKICAg ICB9OwogICAgIExheWVyU3RhdGUmIGxheWVyU3RhdGUoKSB7IHJldHVybiBtX2xheWVyU3RhdGU7 IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9j b29yZGluYXRlZC9Db29yZGluYXRlZEdyYXBoaWNzTGF5ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL2Nvb3JkaW5hdGVkL0Nvb3JkaW5hdGVkR3JhcGhpY3NM YXllci5jcHAKaW5kZXggZTI4NzIyODRkZDRlYWI5MWNkZGZlNmY1ZDhhNTg5MzNhZmRjMDA0Mi4u ZDUyYzVkYjA3NzYwZWY3Y2YxNWYwOWMyODM3OGZjZmQ0ZDgwZDk1MyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL2Nvb3JkaW5hdGVkL0Nvb3JkaW5h dGVkR3JhcGhpY3NMYXllci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvdGV4bWFwL2Nvb3JkaW5hdGVkL0Nvb3JkaW5hdGVkR3JhcGhpY3NMYXllci5jcHAKQEAgLTg3 Myw3ICs4NzMsNyBAQCB2b2lkIENvb3JkaW5hdGVkR3JhcGhpY3NMYXllcjo6Zmx1c2hDb21wb3Np dGluZ1N0YXRlRm9yVGhpc0xheWVyT25seSgpCiAgICAgICAgIGF1dG8mIGxheWVyU3RhdGUgPSBp bXBsLmxheWVyU3RhdGUoKTsKICAgICAgICAgbGF5ZXJTdGF0ZS5pbWFnZUlEID0gaW1hZ2VJRDsK ICAgICAgICAgbGF5ZXJTdGF0ZS51cGRhdGUuaXNWaXNpYmxlID0gdHJhbnNmb3JtZWRWaXNpYmxl UmVjdCgpLmludGVyc2VjdHMoSW50UmVjdChjb250ZW50c1JlY3QoKSkpOwotICAgICAgICBpZiAo bGF5ZXJTdGF0ZS51cGRhdGUuaXNWaXNpYmxlICYmIGxheWVyU3RhdGUubmF0aXZlSW1hZ2VJRCAh PSBuYXRpdmVJbWFnZUlEKSB7CisgICAgICAgIGlmIChsYXllclN0YXRlLnVwZGF0ZS5pc1Zpc2li bGUgJiYgbGF5ZXJTdGF0ZS51cGRhdGUubmF0aXZlSW1hZ2VJRCAhPSBuYXRpdmVJbWFnZUlEKSB7 CiAgICAgICAgICAgICBhdXRvIGJ1ZmZlciA9IE5pY29zaWE6OkJ1ZmZlcjo6Y3JlYXRlKEludFNp emUoaW1hZ2Uuc2l6ZSgpKSwKICAgICAgICAgICAgICAgICAhaW1hZ2UuY3VycmVudEZyYW1lS25v d25Ub0JlT3BhcXVlKCkgPyBOaWNvc2lhOjpCdWZmZXI6OlN1cHBvcnRzQWxwaGEgOiBOaWNvc2lh OjpCdWZmZXI6Ok5vRmxhZ3MpOwogICAgICAgICAgICAgTmljb3NpYTo6UGFpbnRpbmdDb250ZXh0 OjpwYWludChidWZmZXIsCkBAIC04ODIsNyArODgyLDcgQEAgdm9pZCBDb29yZGluYXRlZEdyYXBo aWNzTGF5ZXI6OmZsdXNoQ29tcG9zaXRpbmdTdGF0ZUZvclRoaXNMYXllck9ubHkoKQogICAgICAg ICAgICAgICAgICAgICBJbnRSZWN0IHJlY3QgeyB7IH0sIEludFNpemUgeyBpbWFnZS5zaXplKCkg fSB9OwogICAgICAgICAgICAgICAgICAgICBjb250ZXh0LmRyYXdJbWFnZShpbWFnZSwgcmVjdCwg cmVjdCwgSW1hZ2VQYWludGluZ09wdGlvbnMoQ29tcG9zaXRlT3BlcmF0b3I6OkNvcHkpKTsKICAg ICAgICAgICAgICAgICB9KTsKLSAgICAgICAgICAgIGxheWVyU3RhdGUubmF0aXZlSW1hZ2VJRCA9 IG5hdGl2ZUltYWdlSUQ7CisgICAgICAgICAgICBsYXllclN0YXRlLnVwZGF0ZS5uYXRpdmVJbWFn ZUlEID0gbmF0aXZlSW1hZ2VJRDsKICAgICAgICAgICAgIGxheWVyU3RhdGUudXBkYXRlLmJ1ZmZl ciA9IFdURk1vdmUoYnVmZmVyKTsKICAgICAgICAgICAgIG1fbmljb3NpYS5kZWx0YS5pbWFnZUJh Y2tpbmdDaGFuZ2VkID0gdHJ1ZTsKICAgICAgICAgfQpAQCAtMTE4NSw3ICsxMTg1LDYgQEAgdm9p ZCBDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6OnB1cmdlQmFja2luZ1N0b3JlcygpCiAgICAgaWYg KG1fbmljb3NpYS5pbWFnZUJhY2tpbmcpIHsKICAgICAgICAgYXV0byYgbGF5ZXJTdGF0ZSA9IGRv d25jYXN0PE5pY29zaWE6OkltYWdlQmFja2luZ1RleHR1cmVNYXBwZXJJbXBsPihtX25pY29zaWEu aW1hZ2VCYWNraW5nLT5pbXBsKCkpLmxheWVyU3RhdGUoKTsKICAgICAgICAgbGF5ZXJTdGF0ZS5p bWFnZUlEID0gMDsKLSAgICAgICAgbGF5ZXJTdGF0ZS5uYXRpdmVJbWFnZUlEID0gMDsKICAgICAg ICAgbGF5ZXJTdGF0ZS51cGRhdGUgPSB7IH07CiAKICAgICAgICAgbV9uaWNvc2lhLmltYWdlQmFj a2luZyA9IG51bGxwdHI7Cg== 412660 2020-10-29 09:30:37 -0700 2020-10-30 01:40:18 -0700 Patch bug-218292-20201029173035.patch text/plain 5389 magomez U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5MTUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmUwYmQ1YmVjZmZhZWIx YmQ1MjcyZmM5ZDdlNDUwNDQ5ZDY5M2EzMC4uYTdmYTgyYzE2ZDk1NjczMmYwN2RjZDhlMzY2Mjlm NzNhYTUyZGI0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIwLTEwLTI5ICBNaWd1 ZWwgR29tZXogIDxtYWdvbWV6QGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS10gRGlyZWN0IGNv bXBvc2l0ZWQgaW1hZ2VzIG1heSBub3QgYmUgcmVuZGVyZWQgYWZ0ZXIgYSB3aW5kb3cgcmVzaXpl CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTgyOTIK KworICAgICAgICBSZXZpZXdlZCBieSBDYXJsb3MgR2FyY2lhIENhbXBvcy4KKworICAgICAgICBF bnN1cmUgdGhhdCB2YWxpZCBidWZmZXJzIHBhc3NlZCBmb3IgSW1hZ2VCYWNraW5ncyBhcmUgbm90 IGRlc3Ryb3llZCB1bnRpbCB0aGUKKyAgICAgICAgQ29vcmRpbmF0ZWRHcmFwaGljc1NjZW5lIGNv bnN1bWVzIHRoZW0uCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9uaWNvc2lhL3RleG1h cC9OaWNvc2lhSW1hZ2VCYWNraW5nVGV4dHVyZU1hcHBlckltcGwuY3BwOgorICAgICAgICAoTmlj b3NpYTo6SW1hZ2VCYWNraW5nVGV4dHVyZU1hcHBlckltcGw6OmZsdXNoVXBkYXRlKToKKyAgICAg ICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9uaWNvc2lhL3RleG1hcC9OaWNvc2lhSW1hZ2VCYWNraW5n VGV4dHVyZU1hcHBlckltcGwuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAv Y29vcmRpbmF0ZWQvQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkNvb3JkaW5hdGVkR3JhcGhpY3NMYXllcjo6Zmx1c2hDb21wb3NpdGluZ1N0YXRlRm9yVGhp c0xheWVyT25seSk6CisgICAgICAgIChXZWJDb3JlOjpDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6 OnB1cmdlQmFja2luZ1N0b3Jlcyk6CisKIDIwMjAtMTAtMjkgIEFudHRpIEtvaXZpc3RvICA8YW50 dGlAYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0ludGVncmF0aW9uXSBSZW5hbWUgdG9wL2Jv dHRvbVdpdGhMZWFkaW5nIHRvIGxpbmVCb3hUb3AvQm90dG9tCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9uaWNvc2lhL3RleG1hcC9OaWNvc2lhSW1hZ2VCYWNr aW5nVGV4dHVyZU1hcHBlckltcGwuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3Mvbmljb3NpYS90ZXhtYXAvTmljb3NpYUltYWdlQmFja2luZ1RleHR1cmVNYXBwZXJJbXBsLmNw cAppbmRleCBkMzUzYzhiZTFiNWJmYTExNmI2Y2I4NTIwOTcwMjc3Y2M5MzI0NWNlLi4xYThlNjk4 MzQ0OGQ2MjEyZTI5ZWIyMDYwNjAwZDRhM2I2Yzk0NGU2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9uaWNvc2lhL3RleG1hcC9OaWNvc2lhSW1hZ2VCYWNraW5n VGV4dHVyZU1hcHBlckltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL25pY29zaWEvdGV4bWFwL05pY29zaWFJbWFnZUJhY2tpbmdUZXh0dXJlTWFwcGVySW1wbC5j cHAKQEAgLTQ3LDYgKzQ3LDE1IEBAIEltYWdlQmFja2luZ1RleHR1cmVNYXBwZXJJbXBsOjp+SW1h Z2VCYWNraW5nVGV4dHVyZU1hcHBlckltcGwoKSA9IGRlZmF1bHQ7CiB2b2lkIEltYWdlQmFja2lu Z1RleHR1cmVNYXBwZXJJbXBsOjpmbHVzaFVwZGF0ZSgpCiB7CiAgICAgTG9ja0hvbGRlciBsb2Nr ZXIobV91cGRhdGUubG9jayk7CisKKyAgICAvLyBJZiB0aGUgdXBkYXRlIGhhcHBlbnMgZm9yIHRo ZSBzYW1lIGltYWdlIGFuZCB0aGVyZSdzIG5vIGJ1ZmZlciwga2VlcCB0aGUgY3VycmVudCBvbmUK KyAgICAvLyBzbyBpdCBjYW4gYmUgcmVjZWl2ZWQgYnkgdGhlIENvb3JkaW5hdGVkR3JhcGhpY3NT Y2VuZS4gSW4gdGhhdCBjYXNlIHdlIG9ubHkgbmVlZCB0byB1cGRhdGUKKyAgICAvLyB0aGUgaXNW aXNpYmxlIGZsYWcuCisgICAgaWYgKChtX2xheWVyU3RhdGUudXBkYXRlLm5hdGl2ZUltYWdlSUQg PT0gbV91cGRhdGUudXBkYXRlLm5hdGl2ZUltYWdlSUQpICYmICFtX2xheWVyU3RhdGUudXBkYXRl LmJ1ZmZlcikgeworICAgICAgICBtX3VwZGF0ZS51cGRhdGUuaXNWaXNpYmxlID0gbV9sYXllclN0 YXRlLnVwZGF0ZS5pc1Zpc2libGU7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKICAgICBtX3Vw ZGF0ZS51cGRhdGUgPSBXVEZNb3ZlKG1fbGF5ZXJTdGF0ZS51cGRhdGUpOwogfQogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9uaWNvc2lhL3RleG1hcC9OaWNv c2lhSW1hZ2VCYWNraW5nVGV4dHVyZU1hcHBlckltcGwuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL25pY29zaWEvdGV4bWFwL05pY29zaWFJbWFnZUJhY2tpbmdUZXh0dXJlTWFw cGVySW1wbC5oCmluZGV4IDQ5YjFlOWIyZWMwMzU1MmEwYmQ2MTIwYWU3N2I4ZTY5NGE5NDYxNWEu LjQwMmI1NGQwODI2YWZmOTlkYjIzY2NhNzNjNzkzYTQxYTdiY2FhZjMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL25pY29zaWEvdGV4bWFwL05pY29zaWFJbWFn ZUJhY2tpbmdUZXh0dXJlTWFwcGVySW1wbC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL25pY29zaWEvdGV4bWFwL05pY29zaWFJbWFnZUJhY2tpbmdUZXh0dXJlTWFwcGVy SW1wbC5oCkBAIC02MCw2ICs2MCw3IEBAIHB1YmxpYzoKIAogICAgICAgICBib29sIGlzVmlzaWJs ZSB7IGZhbHNlIH07CiAgICAgICAgIFJlZlB0cjxOaWNvc2lhOjpCdWZmZXI+IGJ1ZmZlcjsKKyAg ICAgICAgdWludHB0cl90IG5hdGl2ZUltYWdlSUQgeyAwIH07CiAgICAgfTsKIAogICAgIC8vIEFu IGltbXV0YWJsZSBsYXllci1zaWRlIHN0YXRlIG9iamVjdC4gZmx1c2hVcGRhdGUoKSBwcmVwYXJl cwpAQCAtNzIsNyArNzMsNiBAQCBwdWJsaWM6CiAgICAgICAgIExheWVyU3RhdGUmIG9wZXJhdG9y PShMYXllclN0YXRlJiYpID0gZGVsZXRlOwogCiAgICAgICAgIHVpbnRwdHJfdCBpbWFnZUlEIHsg MCB9OwotICAgICAgICB1aW50cHRyX3QgbmF0aXZlSW1hZ2VJRCB7IDAgfTsKICAgICAgICAgVXBk YXRlIHVwZGF0ZTsKICAgICB9OwogICAgIExheWVyU3RhdGUmIGxheWVyU3RhdGUoKSB7IHJldHVy biBtX2xheWVyU3RhdGU7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL3RleG1hcC9jb29yZGluYXRlZC9Db29yZGluYXRlZEdyYXBoaWNzTGF5ZXIuY3BwIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL2Nvb3JkaW5hdGVkL0Nvb3Jk aW5hdGVkR3JhcGhpY3NMYXllci5jcHAKaW5kZXggZTI4NzIyODRkZDRlYWI5MWNkZGZlNmY1ZDhh NTg5MzNhZmRjMDA0Mi4uZDUyYzVkYjA3NzYwZWY3Y2YxNWYwOWMyODM3OGZjZmQ0ZDgwZDk1MyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL2Nvb3Jk aW5hdGVkL0Nvb3JkaW5hdGVkR3JhcGhpY3NMYXllci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL2Nvb3JkaW5hdGVkL0Nvb3JkaW5hdGVkR3JhcGhpY3NM YXllci5jcHAKQEAgLTg3Myw3ICs4NzMsNyBAQCB2b2lkIENvb3JkaW5hdGVkR3JhcGhpY3NMYXll cjo6Zmx1c2hDb21wb3NpdGluZ1N0YXRlRm9yVGhpc0xheWVyT25seSgpCiAgICAgICAgIGF1dG8m IGxheWVyU3RhdGUgPSBpbXBsLmxheWVyU3RhdGUoKTsKICAgICAgICAgbGF5ZXJTdGF0ZS5pbWFn ZUlEID0gaW1hZ2VJRDsKICAgICAgICAgbGF5ZXJTdGF0ZS51cGRhdGUuaXNWaXNpYmxlID0gdHJh bnNmb3JtZWRWaXNpYmxlUmVjdCgpLmludGVyc2VjdHMoSW50UmVjdChjb250ZW50c1JlY3QoKSkp OwotICAgICAgICBpZiAobGF5ZXJTdGF0ZS51cGRhdGUuaXNWaXNpYmxlICYmIGxheWVyU3RhdGUu bmF0aXZlSW1hZ2VJRCAhPSBuYXRpdmVJbWFnZUlEKSB7CisgICAgICAgIGlmIChsYXllclN0YXRl LnVwZGF0ZS5pc1Zpc2libGUgJiYgbGF5ZXJTdGF0ZS51cGRhdGUubmF0aXZlSW1hZ2VJRCAhPSBu YXRpdmVJbWFnZUlEKSB7CiAgICAgICAgICAgICBhdXRvIGJ1ZmZlciA9IE5pY29zaWE6OkJ1ZmZl cjo6Y3JlYXRlKEludFNpemUoaW1hZ2Uuc2l6ZSgpKSwKICAgICAgICAgICAgICAgICAhaW1hZ2Uu Y3VycmVudEZyYW1lS25vd25Ub0JlT3BhcXVlKCkgPyBOaWNvc2lhOjpCdWZmZXI6OlN1cHBvcnRz QWxwaGEgOiBOaWNvc2lhOjpCdWZmZXI6Ok5vRmxhZ3MpOwogICAgICAgICAgICAgTmljb3NpYTo6 UGFpbnRpbmdDb250ZXh0OjpwYWludChidWZmZXIsCkBAIC04ODIsNyArODgyLDcgQEAgdm9pZCBD b29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6OmZsdXNoQ29tcG9zaXRpbmdTdGF0ZUZvclRoaXNMYXll ck9ubHkoKQogICAgICAgICAgICAgICAgICAgICBJbnRSZWN0IHJlY3QgeyB7IH0sIEludFNpemUg eyBpbWFnZS5zaXplKCkgfSB9OwogICAgICAgICAgICAgICAgICAgICBjb250ZXh0LmRyYXdJbWFn ZShpbWFnZSwgcmVjdCwgcmVjdCwgSW1hZ2VQYWludGluZ09wdGlvbnMoQ29tcG9zaXRlT3BlcmF0 b3I6OkNvcHkpKTsKICAgICAgICAgICAgICAgICB9KTsKLSAgICAgICAgICAgIGxheWVyU3RhdGUu bmF0aXZlSW1hZ2VJRCA9IG5hdGl2ZUltYWdlSUQ7CisgICAgICAgICAgICBsYXllclN0YXRlLnVw ZGF0ZS5uYXRpdmVJbWFnZUlEID0gbmF0aXZlSW1hZ2VJRDsKICAgICAgICAgICAgIGxheWVyU3Rh dGUudXBkYXRlLmJ1ZmZlciA9IFdURk1vdmUoYnVmZmVyKTsKICAgICAgICAgICAgIG1fbmljb3Np YS5kZWx0YS5pbWFnZUJhY2tpbmdDaGFuZ2VkID0gdHJ1ZTsKICAgICAgICAgfQpAQCAtMTE4NSw3 ICsxMTg1LDYgQEAgdm9pZCBDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6OnB1cmdlQmFja2luZ1N0 b3JlcygpCiAgICAgaWYgKG1fbmljb3NpYS5pbWFnZUJhY2tpbmcpIHsKICAgICAgICAgYXV0byYg bGF5ZXJTdGF0ZSA9IGRvd25jYXN0PE5pY29zaWE6OkltYWdlQmFja2luZ1RleHR1cmVNYXBwZXJJ bXBsPihtX25pY29zaWEuaW1hZ2VCYWNraW5nLT5pbXBsKCkpLmxheWVyU3RhdGUoKTsKICAgICAg ICAgbGF5ZXJTdGF0ZS5pbWFnZUlEID0gMDsKLSAgICAgICAgbGF5ZXJTdGF0ZS5uYXRpdmVJbWFn ZUlEID0gMDsKICAgICAgICAgbGF5ZXJTdGF0ZS51cGRhdGUgPSB7IH07CiAKICAgICAgICAgbV9u aWNvc2lhLmltYWdlQmFja2luZyA9IG51bGxwdHI7Cg==