231014 2021-09-30 02:37:13 -0700 Move canCompositeClipPath to RenderLayer 2021-09-30 14:21:14 -0700 1 1 1 Unclassified WebKit Layout and Rendering Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 rbuis rbuis bfulgham changseok esprehn+autocc ews-watchlist fred.wang glenn kondapallykalyan pdr simon.fraser webkit-bug-importer zalan oldest_to_newest 1798801 0 rbuis 2021-09-30 02:37:13 -0700 Move canCompositeClipPath to RenderLayer. 1798804 1 439710 rbuis 2021-09-30 02:39:17 -0700 Created attachment 439710 Patch 1798915 2 439710 simon.fraser 2021-09-30 10:05:16 -0700 Comment on attachment 439710 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=439710&action=review > Source/WebCore/rendering/RenderLayer.h:241 > + bool canCompositeClipPath() const; Moving it here has added ambiguity. It's not clear if this is "if this layer were composited, can it composite clip-path", or "is this layer composited and has a clip path and can composite it". 1798927 3 439751 rbuis 2021-09-30 10:18:57 -0700 Created attachment 439751 Patch 1798932 4 439710 rbuis 2021-09-30 10:23:52 -0700 Comment on attachment 439710 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=439710&action=review >> Source/WebCore/rendering/RenderLayer.h:241 >> + bool canCompositeClipPath() const; > > Moving it here has added ambiguity. It's not clear if this is "if this layer were composited, can it composite clip-path", or "is this layer composited and has a clip path and can composite it". Fair enough, I did another stab. To be clear, what I do not like about current code: - unneeded layer accessing - unneeded ASSERTs Of these to me the ASSERTs are more annoying. Note that this is not high priority at all but let me know if you think we can make this code a bit nicer/more efficient this way or some other. 1798933 5 439710 rbuis 2021-09-30 10:24:45 -0700 Comment on attachment 439710 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=439710&action=review >>> Source/WebCore/rendering/RenderLayer.h:241 >>> + bool canCompositeClipPath() const; >> >> Moving it here has added ambiguity. It's not clear if this is "if this layer were composited, can it composite clip-path", or "is this layer composited and has a clip path and can composite it". > > Fair enough, I did another stab. > To be clear, what I do not like about current code: > - unneeded layer accessing > - unneeded ASSERTs > Of these to me the ASSERTs are more annoying. Note that this is not high priority at all but let me know if you think we can make this code a bit nicer/more efficient this way or some other. Nm, thanks :) 1798934 6 439710 rbuis 2021-09-30 10:24:45 -0700 Comment on attachment 439710 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=439710&action=review >>> Source/WebCore/rendering/RenderLayer.h:241 >>> + bool canCompositeClipPath() const; >> >> Moving it here has added ambiguity. It's not clear if this is "if this layer were composited, can it composite clip-path", or "is this layer composited and has a clip path and can composite it". > > Fair enough, I did another stab. > To be clear, what I do not like about current code: > - unneeded layer accessing > - unneeded ASSERTs > Of these to me the ASSERTs are more annoying. Note that this is not high priority at all but let me know if you think we can make this code a bit nicer/more efficient this way or some other. Nm, thanks :) 1799028 7 ews-feeder 2021-09-30 14:20:41 -0700 Committed r283340 (242357@main): <https://commits.webkit.org/242357@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 439751. 1799029 8 webkit-bug-importer 2021-09-30 14:21:14 -0700 <rdar://problem/83737585> 439710 2021-09-30 02:39:17 -0700 2021-09-30 10:18:52 -0700 Patch bug-231014-20210930103915.patch text/plain 5227 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzMzA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTU3M2MxNjRlM2Y4NTA3 ZTU4NDY2M2M0NjlkNTU5OWIxM2M2Zjk1MS4uNGJkMWQ4OTAxNjY3ZWEyYjBjOWM4YmRiNTQ4MmZj ZTIyMzBmOWFlYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTA5LTMwICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgTW92ZSBjYW5Db21wb3NpdGVDbGlw UGF0aCB0byBSZW5kZXJMYXllcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjMxMDE0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgTW92ZSBjYW5Db21wb3NpdGVDbGlwUGF0aCB0byBSZW5kZXJMYXllciBzaW5j ZSB0aGUKKyAgICAgICAgY29kZSBhbG1vc3QgZXhjbHVzaXZlbHkgZGVhbHMgd2l0aCBsYXllcnMu CisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJFbGVtZW50OjphZGp1c3RTdHlsZURpZmZlcmVuY2UgY29uc3QpOgorICAgICAg ICAqIHJlbmRlcmluZy9SZW5kZXJMYXllci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJM YXllcjo6Y2FuQ29tcG9zaXRlQ2xpcFBhdGggY29uc3QpOgorICAgICAgICAqIHJlbmRlcmluZy9S ZW5kZXJMYXllci5oOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3Iu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpjYW5Db21wb3Np dGVDbGlwUGF0aCk6IERlbGV0ZWQuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyQ29t cG9zaXRvci5oOgorCiAyMDIxLTA5LTMwICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFA aWdhbGlhLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkIEdUSyBidWlsZCBmaXggYWZ0ZXIgcjI4 MzMwNApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQu Y3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuY3BwCmluZGV4IDVk MzU2MThkNzBmNTE3M2Y0ZjM1YzYxOGFjMTVjNTUxNTJjYzM3NDAuLjA5NjU5MDA1NzMyYWFkMDE1 YzczNGY0YzI3YjA3M2JmODY3ZTg2NWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyRWxlbWVudC5jcHAKQEAgLTMwNiwxMCArMzA2LDcgQEAgU3R5bGVEaWZmZXJlbmNlIFJlbmRl ckVsZW1lbnQ6OmFkanVzdFN0eWxlRGlmZmVyZW5jZShTdHlsZURpZmZlcmVuY2UgZGlmZiwgT3B0 aW8KICAgICB9CiAKICAgICBpZiAoY29udGV4dFNlbnNpdGl2ZVByb3BlcnRpZXMgJiBTdHlsZURp ZmZlcmVuY2VDb250ZXh0U2Vuc2l0aXZlUHJvcGVydHk6OkNsaXBQYXRoKSB7Ci0gICAgICAgIGlm IChoYXNMYXllcigpCi0gICAgICAgICAgICAmJiBkb3duY2FzdDxSZW5kZXJMYXllck1vZGVsT2Jq ZWN0PigqdGhpcykubGF5ZXIoKS0+aXNDb21wb3NpdGVkKCkKLSAgICAgICAgICAgICYmIGhhc0Ns aXBQYXRoKCkKLSAgICAgICAgICAgICYmIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6Y2FuQ29tcG9z aXRlQ2xpcFBhdGgoKmRvd25jYXN0PFJlbmRlckxheWVyTW9kZWxPYmplY3Q+KCp0aGlzKS5sYXll cigpKSkKKyAgICAgICAgaWYgKGhhc0xheWVyKCkgJiYgZG93bmNhc3Q8UmVuZGVyTGF5ZXJNb2Rl bE9iamVjdD4oKnRoaXMpLmxheWVyKCktPmNhbkNvbXBvc2l0ZUNsaXBQYXRoKCkpCiAgICAgICAg ICAgICBkaWZmID0gc3RkOjptYXgoZGlmZiwgU3R5bGVEaWZmZXJlbmNlOjpSZWNvbXBvc2l0ZUxh eWVyKTsKICAgICAgICAgZWxzZQogICAgICAgICAgICAgZGlmZiA9IHN0ZDo6bWF4KGRpZmYsIFN0 eWxlRGlmZmVyZW5jZTo6UmVwYWludCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTGF5ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxh eWVyLmNwcAppbmRleCA1NmNiZTcxOTg3YmNhMGEyOWNjYWM1ZWFiNTkxNzE4M2RiNDc0YWU4Li4w ODRiMDhlZTk2ZTFlOTAyOWVjMjBmZDk3NjQxNGRiMzlhYmYzOGRlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKQEAgLTY4Miw2ICs2ODIsMjEgQEAgdm9pZCBSZW5k ZXJMYXllcjo6ZGlydHlTdGFja2luZ0NvbnRleHRaT3JkZXJMaXN0cygpCiAgICAgICAgIHNjLT5k aXJ0eVpPcmRlckxpc3RzKCk7CiB9CiAKK2Jvb2wgUmVuZGVyTGF5ZXI6OmNhbkNvbXBvc2l0ZUNs aXBQYXRoKCkgY29uc3QKK3sKKyAgICBpZiAoIWlzQ29tcG9zaXRlZCgpKQorICAgICAgICByZXR1 cm4gZmFsc2U7CisKKyAgICBhdXRvKiBjbGlwUGF0aCA9IHJlbmRlcmVyKCkuc3R5bGUoKS5jbGlw UGF0aCgpOworICAgIGlmICghY2xpcFBhdGgpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAg IGlmIChyZW5kZXJlcigpLmhhc01hc2soKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAg cmV0dXJuIChjbGlwUGF0aC0+dHlwZSgpICE9IENsaXBQYXRoT3BlcmF0aW9uOjpTaGFwZSB8fCBj bGlwUGF0aC0+dHlwZSgpID09IENsaXBQYXRoT3BlcmF0aW9uOjpTaGFwZSkgJiYgR3JhcGhpY3NM YXllcjo6c3VwcG9ydHNMYXllclR5cGUoR3JhcGhpY3NMYXllcjo6VHlwZTo6U2hhcGUpOworfQor CiB2b2lkIFJlbmRlckxheWVyOjpkaXJ0eU5vcm1hbEZsb3dMaXN0KCkKIHsKICAgICBBU1NFUlQo bGF5ZXJMaXN0TXV0YXRpb25BbGxvd2VkKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckxheWVyLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy TGF5ZXIuaAppbmRleCAxNGIwMWQ2MDUyZmEyN2NiMmMzNTY2MWMwMmVkZDdiODM5ZGFiMjZkLi45 MDdiNTA4ODM2ZmVkMDQzNTliYzlmYjMwZmUyZWQ5YjQwMjdhODdmIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaApAQCAtMjM4LDYgKzIzOCw4IEBAIHB1YmxpYzoKICAgICB2 b2lkIHNldExheWVyTGlzdE11dGF0aW9uQWxsb3dlZChib29sIGZsYWcpIHsgbV9sYXllckxpc3RN dXRhdGlvbkFsbG93ZWQgPSBmbGFnOyB9CiAjZW5kaWYKIAorICAgIGJvb2wgY2FuQ29tcG9zaXRl Q2xpcFBhdGgoKSBjb25zdDsKKwogcHJvdGVjdGVkOgogICAgIHZvaWQgZGVzdHJveSgpOwogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9y LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3Bw CmluZGV4IDcwNmMyMzE0YjQwZTc1YzE1OTVmMzgxMjQ5M2U4ZjMxZjNiMzAyNjcuLjAxZTFlYjky MDA1Mzk1MjM1YzVkNmM5MzJkMzRiOWQ2NWQ1MzFmNTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCkBAIC0xNzYwLDE4ICsxNzYw LDYgQEAgYm9vbCBSZW5kZXJMYXllckNvbXBvc2l0b3I6Om5lZWRzQ29tcG9zaXRpbmdVcGRhdGVG b3JTdHlsZUNoYW5nZU9uTm9uQ29tcG9zaXRlZEwKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKLWJv b2wgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpjYW5Db21wb3NpdGVDbGlwUGF0aChjb25zdCBSZW5k ZXJMYXllciYgbGF5ZXIpCi17Ci0gICAgQVNTRVJUKGxheWVyLmlzQ29tcG9zaXRlZCgpKTsKLSAg ICBBU1NFUlQobGF5ZXIucmVuZGVyZXIoKS5zdHlsZSgpLmNsaXBQYXRoKCkpOwotCi0gICAgaWYg KGxheWVyLnJlbmRlcmVyKCkuaGFzTWFzaygpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAg ICBhdXRvJiBjbGlwUGF0aCA9ICpsYXllci5yZW5kZXJlcigpLnN0eWxlKCkuY2xpcFBhdGgoKTsK LSAgICByZXR1cm4gKGNsaXBQYXRoLnR5cGUoKSAhPSBDbGlwUGF0aE9wZXJhdGlvbjo6U2hhcGUg fHwgY2xpcFBhdGgudHlwZSgpID09IENsaXBQYXRoT3BlcmF0aW9uOjpTaGFwZSkgJiYgR3JhcGhp Y3NMYXllcjo6c3VwcG9ydHNMYXllclR5cGUoR3JhcGhpY3NMYXllcjo6VHlwZTo6U2hhcGUpOwot fQotCiAvLyBGSVhNRTogcmVtb3ZlIGFuZCBuZXZlciBhc2sgcXVlc3Rpb25zIGFib3V0IHJlZmxl Y3Rpb24gbGF5ZXJzLgogc3RhdGljIFJlbmRlckxheWVyTW9kZWxPYmplY3QmIHJlbmRlcmVyRm9y Q29tcG9zaXRpbmdUZXN0cyhjb25zdCBSZW5kZXJMYXllciYgbGF5ZXIpCiB7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmggYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmgKaW5kZXggMjAyNmVk MTQ0YzNlMjExNjJmOWZlMGU2NWZkNDhjOTUyYThmZWUzNi4uYWE4ZGU0YmFmNmYxYjdjOTYzYjE0 NTkyOTFjOTRjNTEzNTBlYzM1YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxheWVyQ29tcG9zaXRvci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJMYXllckNvbXBvc2l0b3IuaApAQCAtMjQ1LDggKzI0NSw2IEBAIHB1YmxpYzoKIAogICAg IHZvaWQgbGF5ZXJTdHlsZUNoYW5nZWQoU3R5bGVEaWZmZXJlbmNlLCBSZW5kZXJMYXllciYsIGNv bnN0IFJlbmRlclN0eWxlKiBvbGRTdHlsZSk7CiAKLSAgICBzdGF0aWMgYm9vbCBjYW5Db21wb3Np dGVDbGlwUGF0aChjb25zdCBSZW5kZXJMYXllciYpOwotCiAgICAgLy8gR2V0IHRoZSBuZWFyZXN0 IGFuY2VzdG9yIGxheWVyIHRoYXQgaGFzIG92ZXJmbG93IG9yIGNsaXAsIGJ1dCBpcyBub3QgYSBz dGFja2luZyBjb250ZXh0CiAgICAgUmVuZGVyTGF5ZXIqIGVuY2xvc2luZ05vblN0YWNraW5nQ2xp cHBpbmdMYXllcihjb25zdCBSZW5kZXJMYXllciYpIGNvbnN0OwogCg== 439751 2021-09-30 10:18:57 -0700 2021-09-30 14:20:43 -0700 Patch bug-231014-20210930181856.patch text/plain 5319 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzMzE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmY0ZTIyOGZiMjk0ZGU4 YTE1YzNkNWVhYWViMzBkMWRkNzU4MThjMS4uYzkxODUyNWM5NjhmZjJkMDU4N2UyYjUxYTI1Mjg1 OTYzODE4NmVmMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIxLTA5LTMwICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgTW92ZSBjYW5Db21wb3NpdGVDbGlw UGF0aCB0byBSZW5kZXJMYXllcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjMxMDE0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgTW92ZSBjYW5Db21wb3NpdGVDbGlwUGF0aCB0byBSZW5kZXJMYXllciBzaW5j ZSB0aGUKKyAgICAgICAgY29kZSBhbG1vc3QgZXhjbHVzaXZlbHkgZGVhbHMgd2l0aCBsYXllcnMu IEFsc28KKyAgICAgICAgcmVtb3ZlIHVubmVlZGVkIEFTU0VSVHMuCisKKyAgICAgICAgKiByZW5k ZXJpbmcvUmVuZGVyRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJFbGVtZW50 OjphZGp1c3RTdHlsZURpZmZlcmVuY2UgY29uc3QpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5k ZXJMYXllci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6d2lsbENvbXBvc2l0 ZUNsaXBQYXRoIGNvbnN0KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaDoKKyAg ICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6Y2FuQ29tcG9zaXRlQ2xpcFBhdGgpOiBEZWxl dGVkLgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuaDoKKwogMjAy MS0wOS0zMCAgSm9obiBXaWxhbmRlciAgPHdpbGFuZGVyQGFwcGxlLmNvbT4KIAogICAgICAgICBQ Q006IFRha2UgYXBwIGJ1bmRsZSBJRCBpbnRvIGNvbnNpZGVyYXRpb24gd2hlbiBtYXRjaGluZyB0 cmlnZ2VyaW5nIGV2ZW50cyB3aXRoIHBlbmRpbmcgY2xpY2tzCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyRWxlbWVudC5jcHAKaW5kZXggNWQzNTYxOGQ3MGY1MTczZjRmMzVjNjE4YWMx NWM1NTE1MmNjMzc0MC4uMmE4OGMyMWZjNDYxYjkwOWNhNzI5MTZmZmVjNWQzZmE4OThlZmNkMiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmNwcApAQCAtMzA2LDEw ICszMDYsNyBAQCBTdHlsZURpZmZlcmVuY2UgUmVuZGVyRWxlbWVudDo6YWRqdXN0U3R5bGVEaWZm ZXJlbmNlKFN0eWxlRGlmZmVyZW5jZSBkaWZmLCBPcHRpbwogICAgIH0KIAogICAgIGlmIChjb250 ZXh0U2Vuc2l0aXZlUHJvcGVydGllcyAmIFN0eWxlRGlmZmVyZW5jZUNvbnRleHRTZW5zaXRpdmVQ cm9wZXJ0eTo6Q2xpcFBhdGgpIHsKLSAgICAgICAgaWYgKGhhc0xheWVyKCkKLSAgICAgICAgICAg ICYmIGRvd25jYXN0PFJlbmRlckxheWVyTW9kZWxPYmplY3Q+KCp0aGlzKS5sYXllcigpLT5pc0Nv bXBvc2l0ZWQoKQotICAgICAgICAgICAgJiYgaGFzQ2xpcFBhdGgoKQotICAgICAgICAgICAgJiYg UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpjYW5Db21wb3NpdGVDbGlwUGF0aCgqZG93bmNhc3Q8UmVu ZGVyTGF5ZXJNb2RlbE9iamVjdD4oKnRoaXMpLmxheWVyKCkpKQorICAgICAgICBpZiAoaGFzTGF5 ZXIoKSAmJiBkb3duY2FzdDxSZW5kZXJMYXllck1vZGVsT2JqZWN0PigqdGhpcykubGF5ZXIoKS0+ d2lsbENvbXBvc2l0ZUNsaXBQYXRoKCkpCiAgICAgICAgICAgICBkaWZmID0gc3RkOjptYXgoZGlm ZiwgU3R5bGVEaWZmZXJlbmNlOjpSZWNvbXBvc2l0ZUxheWVyKTsKICAgICAgICAgZWxzZQogICAg ICAgICAgICAgZGlmZiA9IHN0ZDo6bWF4KGRpZmYsIFN0eWxlRGlmZmVyZW5jZTo6UmVwYWludCk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAppbmRleCA1NmNiZTcxOTg3 YmNhMGEyOWNjYWM1ZWFiNTkxNzE4M2RiNDc0YWU4Li4zZDU3NDU1MTdiNDU2YWZkNTcyMmNmZmRk NTU0ZTZhYjA1ZGJiNzZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyTGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5j cHAKQEAgLTY4Miw2ICs2ODIsMjEgQEAgdm9pZCBSZW5kZXJMYXllcjo6ZGlydHlTdGFja2luZ0Nv bnRleHRaT3JkZXJMaXN0cygpCiAgICAgICAgIHNjLT5kaXJ0eVpPcmRlckxpc3RzKCk7CiB9CiAK K2Jvb2wgUmVuZGVyTGF5ZXI6OndpbGxDb21wb3NpdGVDbGlwUGF0aCgpIGNvbnN0Cit7CisgICAg aWYgKCFpc0NvbXBvc2l0ZWQoKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgYXV0byog Y2xpcFBhdGggPSByZW5kZXJlcigpLnN0eWxlKCkuY2xpcFBhdGgoKTsKKyAgICBpZiAoIWNsaXBQ YXRoKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBpZiAocmVuZGVyZXIoKS5oYXNNYXNr KCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIHJldHVybiAoY2xpcFBhdGgtPnR5cGUo KSAhPSBDbGlwUGF0aE9wZXJhdGlvbjo6U2hhcGUgfHwgY2xpcFBhdGgtPnR5cGUoKSA9PSBDbGlw UGF0aE9wZXJhdGlvbjo6U2hhcGUpICYmIEdyYXBoaWNzTGF5ZXI6OnN1cHBvcnRzTGF5ZXJUeXBl KEdyYXBoaWNzTGF5ZXI6OlR5cGU6OlNoYXBlKTsKK30KKwogdm9pZCBSZW5kZXJMYXllcjo6ZGly dHlOb3JtYWxGbG93TGlzdCgpCiB7CiAgICAgQVNTRVJUKGxheWVyTGlzdE11dGF0aW9uQWxsb3dl ZCgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5o IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmgKaW5kZXggMTRiMDFkNjA1 MmZhMjdjYjJjMzU2NjFjMDJlZGQ3YjgzOWRhYjI2ZC4uOTEwNGQ2ZjM1NzRlODMxMWI3MzI5NWIw NzEwMTA2MGUwNDFiZjk2ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckxheWVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmgK QEAgLTIzOCw2ICsyMzgsOCBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRMYXllckxpc3RNdXRhdGlv bkFsbG93ZWQoYm9vbCBmbGFnKSB7IG1fbGF5ZXJMaXN0TXV0YXRpb25BbGxvd2VkID0gZmxhZzsg fQogI2VuZGlmCiAKKyAgICBib29sIHdpbGxDb21wb3NpdGVDbGlwUGF0aCgpIGNvbnN0OworCiBw cm90ZWN0ZWQ6CiAgICAgdm9pZCBkZXN0cm95KCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKaW5kZXggNzA2YzIzMTRiNDBlNzVj MTU5NWYzODEyNDkzZThmMzFmM2IzMDI2Ny4uMDFlMWViOTIwMDUzOTUyMzVjNWQ2YzkzMmQzNGI5 ZDY1ZDUzMWY1NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxh eWVyQ29tcG9zaXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxh eWVyQ29tcG9zaXRvci5jcHAKQEAgLTE3NjAsMTggKzE3NjAsNiBAQCBib29sIFJlbmRlckxheWVy Q29tcG9zaXRvcjo6bmVlZHNDb21wb3NpdGluZ1VwZGF0ZUZvclN0eWxlQ2hhbmdlT25Ob25Db21w b3NpdGVkTAogICAgIHJldHVybiBmYWxzZTsKIH0KIAotYm9vbCBSZW5kZXJMYXllckNvbXBvc2l0 b3I6OmNhbkNvbXBvc2l0ZUNsaXBQYXRoKGNvbnN0IFJlbmRlckxheWVyJiBsYXllcikKLXsKLSAg ICBBU1NFUlQobGF5ZXIuaXNDb21wb3NpdGVkKCkpOwotICAgIEFTU0VSVChsYXllci5yZW5kZXJl cigpLnN0eWxlKCkuY2xpcFBhdGgoKSk7Ci0KLSAgICBpZiAobGF5ZXIucmVuZGVyZXIoKS5oYXNN YXNrKCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgIGF1dG8mIGNsaXBQYXRoID0gKmxh eWVyLnJlbmRlcmVyKCkuc3R5bGUoKS5jbGlwUGF0aCgpOwotICAgIHJldHVybiAoY2xpcFBhdGgu dHlwZSgpICE9IENsaXBQYXRoT3BlcmF0aW9uOjpTaGFwZSB8fCBjbGlwUGF0aC50eXBlKCkgPT0g Q2xpcFBhdGhPcGVyYXRpb246OlNoYXBlKSAmJiBHcmFwaGljc0xheWVyOjpzdXBwb3J0c0xheWVy VHlwZShHcmFwaGljc0xheWVyOjpUeXBlOjpTaGFwZSk7Ci19Ci0KIC8vIEZJWE1FOiByZW1vdmUg YW5kIG5ldmVyIGFzayBxdWVzdGlvbnMgYWJvdXQgcmVmbGVjdGlvbiBsYXllcnMuCiBzdGF0aWMg UmVuZGVyTGF5ZXJNb2RlbE9iamVjdCYgcmVuZGVyZXJGb3JDb21wb3NpdGluZ1Rlc3RzKGNvbnN0 IFJlbmRlckxheWVyJiBsYXllcikKIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJMYXllckNvbXBvc2l0b3IuaAppbmRleCAyMDI2ZWQxNDRjM2UyMTE2MmY5ZmUwZTY1ZmQ0 OGM5NTJhOGZlZTM2Li5hYThkZTRiYWY2ZjFiN2M5NjNiMTQ1OTI5MWM5NGM1MTM1MGVjMzVhIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9y LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5o CkBAIC0yNDUsOCArMjQ1LDYgQEAgcHVibGljOgogCiAgICAgdm9pZCBsYXllclN0eWxlQ2hhbmdl ZChTdHlsZURpZmZlcmVuY2UsIFJlbmRlckxheWVyJiwgY29uc3QgUmVuZGVyU3R5bGUqIG9sZFN0 eWxlKTsKIAotICAgIHN0YXRpYyBib29sIGNhbkNvbXBvc2l0ZUNsaXBQYXRoKGNvbnN0IFJlbmRl ckxheWVyJik7Ci0KICAgICAvLyBHZXQgdGhlIG5lYXJlc3QgYW5jZXN0b3IgbGF5ZXIgdGhhdCBo YXMgb3ZlcmZsb3cgb3IgY2xpcCwgYnV0IGlzIG5vdCBhIHN0YWNraW5nIGNvbnRleHQKICAgICBS ZW5kZXJMYXllciogZW5jbG9zaW5nTm9uU3RhY2tpbmdDbGlwcGluZ0xheWVyKGNvbnN0IFJlbmRl ckxheWVyJikgY29uc3Q7CiAK