236187 2022-02-05 16:24:37 -0800 [LBSE] Apply position / size to SVG layers 2022-02-07 04:52:19 -0800 1 1 1 Unclassified WebKit SVG WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 90738 236194 1 zimmermann zimmermann changseok esprehn+autocc ews-watchlist fred.wang glenn kondapallykalyan pdr rbuis sabouhallawa simon.fraser webkit-bug-importer zimmermann oldest_to_newest 1837815 0 zimmermann 2022-02-05 16:24:37 -0800 Prepare RenderLayer/RenderLayerBacking for RenderSVGModelObject support: Teach RenderLayer::updateLayerPosition() about RenderSVGModelObject derived renderers that create layers. Grab size and position information from the SVG render tree, just as done for CSS boxes in the render tree. 1837826 1 451012 zimmermann 2022-02-05 16:40:19 -0800 Created attachment 451012 Patch, v1 1837866 2 zimmermann 2022-02-06 03:00:01 -0800 Revisiting the whole patch series I noticed this is one of the few places still using the renderer().isRenderSVGModelObject( / renderer().isSVGText() / ... accessors directly instead of is<RenderSVGModelObject>(renderer()). For consistency reasons, I've decided to cleanup this while I'm at it -- that's the diff from patch v1 -> v2. 1837867 3 451031 zimmermann 2022-02-06 03:00:18 -0800 Created attachment 451031 Patch, v2 1838070 4 zimmermann 2022-02-07 04:51:38 -0800 Committed r289207 (246892@trunk): <https://commits.webkit.org/246892@trunk> 1838071 5 webkit-bug-importer 2022-02-07 04:52:19 -0800 <rdar://problem/88566767> 451012 2022-02-05 16:40:19 -0800 2022-02-06 03:00:14 -0800 Patch, v1 bug-236187-20220205164018.patch text/plain 4743 zimmermann U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5MTYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGNhZjNlOTIwYTY3NTgw Njg5ZDI0MzY4Y2EzMjFkN2U3ZTI2YjczMC4uYmYzNDllYTI3Yjg0NWVmNzM0NTBmMDhmZmNlMTU5 MTdmMTExMWJjYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDIyLTAyLTA1ICBOaWtv bGFzIFppbW1lcm1hbm4gIDxuemltbWVybWFubkBpZ2FsaWEuY29tPgorCisgICAgICAgIFtMQlNF XSBBcHBseSBwb3NpdGlvbiAvIHNpemUgdG8gU1ZHIGxheWVycworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM2MTg3CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGVhY2ggUmVuZGVyTGF5ZXI6OnVwZGF0ZUxh eWVyUG9zaXRpb24oKSBhYm91dCBSZW5kZXJTVkdNb2RlbE9iamVjdAorICAgICAgICBkZXJpdmVk IHJlbmRlcmVycyB0aGF0IGNyZWF0ZSBsYXllcnMuIEdyYWIgc2l6ZSBhbmQgcG9zaXRpb24gaW5m b3JtYXRpb24KKyAgICAgICAgZnJvbSB0aGUgU1ZHIHJlbmRlciB0cmVlLCBqdXN0IGFzIGRvbmUg Zm9yIENTUyBib3hlcyBpbiB0aGUgcmVuZGVyIHRyZWUuCisKKyAgICAgICAgVG8gbWluaW1pemUg dGhlIFJlbmRlckxheWVyIGNoYW5nZXMsIGFuZCBtb3N0IGltcG9ydGFudGx5IHRvIGxldCBTVkcK KyAgICAgICAgbG9vayBsaWtlIGEgcmVndWxhciBDU1Mgb2JqZWN0IGZyb20gdGhlIG91dHNpZGUg YSBjb21wYXRpYmlsaXR5IGxheWVyCisgICAgICAgIGlzIGV4cG9zZWQgb2ZmZXJpbmcgbWV0aG9k cyBzdWNoIGFzICdmcmFtZVJlY3RFcXVpdmFsZW50KCknLAorICAgICAgICAndmlzdWFsT3ZlcmZs b3dSZWN0RXF1aXZhbGVudCgpJyBhbmQgb2ZmZXJzIHV0aWxpdHkgbWV0aG9kcyBzdWNoIGFzCisg ICAgICAgICdhcHBseVRvcExlZnRMb2NhdGlvbk9mZnNldEVxdWl2YWxlbnQobG9jYWxQb2ludCkn LiBUaGUgdGVybWlub2xvZ3kKKyAgICAgICAgc3RlbXMgZnJvbSBDU1MgYW5kIGlzIHVzdWFsbHkg bm90IHByZXNlbnQgaW4gU1ZHIC0tIGhvd2V2ZXIgdG8gc2ltcGxpZnkKKyAgICAgICAgdGhlIFJl bmRlckxheWVyIGltcGxlbWVudGF0aW9uIGFuZCBlbXBoYXppc2UgdGhlIGFuYWxvZ3kgYmV0d2Vl bgorICAgICAgICBSZW5kZXJCb3ggYW5kIFJlbmRlclNWR01vZGVsT2JqZWN0IHRoZSB1dGlsaXR5 IG1ldGhvZHMgaGVscCBhIGxvdC4KKworICAgICAgICBTVkcgbm8gbG9uZ2VyIGxvb2tzIHNwZWNp YWwgYW5kIG9uZSBkb2Vzbid0IG5lZWQgdG8gdGhpbmsgaGFyZCB3aGF0CisgICAgICAgIHRoZSBi ZXN0IG1hdGNoaW5nIGVxdWl2YWxlbnQgdG8gYSAndmlzdWFsT3ZlcmZsb3dSZWN0JyBpbiBTVkcs IG9yCisgICAgICAgIGlmIGNvb3JkaW5hdGUgc3lzdGVtIG9yaWdpbnMgYXJlIGlkZW50aWNhbCBv ciBub3QsIGV0Yy4KKworICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLCBubyBjaGFu Z2UgaW4gYmVoYXZpb3VyLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpyZWN1cnNpdmVVcGRhdGVMYXllclBvc2l0 aW9ucyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6dXBkYXRlTGF5ZXJQb3NpdGlv bik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6Y2FsY3VsYXRlQ2xpcFJlY3RzIGNv bnN0KToKKwogMjAyMi0wMi0wMyAgTmlrb2xhcyBaaW1tZXJtYW5uICA8bnppbW1lcm1hbm5AaWdh bGlhLmNvbT4KIAogICAgICAgICBbTEJTRV0gSGFuZGxlIFJlbmRlclNWR1NoYXBlIGluIFNWR1Jl bmRlclN1cHBvcnQ6OmFwcGx5U3Ryb2tlU3R5bGVUb0NvbnRleHQoKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJMYXllci5jcHAKaW5kZXggNzdhOGEyNzgxMjkyNWE1YTQ2NzJjNjVkZjk4 Y2Y3YWRiMjk2ZmRlNy4uZTQ2N2MzNzlkMWM4MDMwNjljZWI3MDU1NzFmN2E4ZTcxMmFlMDUyYiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCkBAIC0xMDYsNiArMTA2 LDcgQEAKICNpbmNsdWRlICJSZW5kZXJNdWx0aUNvbHVtbkZsb3cuaCIKICNpbmNsdWRlICJSZW5k ZXJSZXBsaWNhLmgiCiAjaW5jbHVkZSAiUmVuZGVyU1ZHRm9yZWlnbk9iamVjdC5oIgorI2luY2x1 ZGUgIlJlbmRlclNWR01vZGVsT2JqZWN0LmgiCiAjaW5jbHVkZSAiUmVuZGVyU1ZHUmVzb3VyY2VD bGlwcGVyLmgiCiAjaW5jbHVkZSAiUmVuZGVyU2Nyb2xsYmFyLmgiCiAjaW5jbHVkZSAiUmVuZGVy U2Nyb2xsYmFyUGFydC5oIgpAQCAtMTA1OSw2ICsxMDYwLDE3IEBAIHZvaWQgUmVuZGVyTGF5ZXI6 OnJlY3Vyc2l2ZVVwZGF0ZUxheWVyUG9zaXRpb25zKFJlbmRlckdlb21ldHJ5TWFwKiBnZW9tZXRy eU1hcCwKICAgICAgICAgfQogICAgIH0KIAorI2lmIEVOQUJMRShMQVlFUl9CQVNFRF9TVkdfRU5H SU5FKQorICAgIGlmIChyZW5kZXJlcigpLmlzU1ZHTGF5ZXJBd2FyZVJlbmRlcmVyKCkgJiYgcmVu ZGVyZXIoKS5kb2N1bWVudCgpLnNldHRpbmdzKCkubGF5ZXJCYXNlZFNWR0VuZ2luZUVuYWJsZWQo KSkgeworICAgICAgICBpZiAoIXJlbmRlcmVyKCkuaXNTVkdSb290KCkpCisgICAgICAgICAgICBB U1NFUlQoIXJlbmRlcmVyKCkuaXNGaXhlZFBvc2l0aW9uZWQoKSk7CisKKyAgICAgICAgLy8gT25s eSB0aGUgb3V0ZXJtb3N0IDxzdmc+IGFuZCAvIDxmb3JlaWduT2JqZWN0PiBhcmUgcG90ZW50aWFs bHkgc2Nyb2xsYWJsZS4KKyAgICAgICAgaWYgKHJlbmRlcmVyKCkuaXNSZW5kZXJTVkdNb2RlbE9i amVjdCgpIHx8IHJlbmRlcmVyKCkuaXNTVkdUZXh0KCkgfHwgcmVuZGVyZXIoKS5pc1NWR0lubGlu ZSgpKQorICAgICAgICAgICAgQVNTRVJUKCFtX3Njcm9sbGFibGVBcmVhKTsKKyAgICB9CisjZW5k aWYKKwogICAgIGlmIChpc0NvbXBvc2l0ZWQoKSkKICAgICAgICAgYmFja2luZygpLT51cGRhdGVB ZnRlckxheW91dChmbGFncy5jb250YWlucyhDb250YWluaW5nQ2xpcHBpbmdMYXllckNoYW5nZWRT aXplKSwgZmxhZ3MuY29udGFpbnMoTmVlZHNGdWxsUmVwYWludEluQmFja2luZykpOwogCkBAIC0x Njc4LDYgKzE2OTAsMTkgQEAgYm9vbCBSZW5kZXJMYXllcjo6dXBkYXRlTGF5ZXJQb3NpdGlvbihP cHRpb25TZXQ8VXBkYXRlTGF5ZXJQb3NpdGlvbnNGbGFnPiogZmxhZ3MKICAgICAgICAgfQogICAg ICAgICAKICAgICAgICAgYm94LT5hcHBseVRvcExlZnRMb2NhdGlvbk9mZnNldChsb2NhbFBvaW50 KTsKKyNpZiBFTkFCTEUoTEFZRVJfQkFTRURfU1ZHX0VOR0lORSkKKyAgICB9IGVsc2UgaWYgKGlz PFJlbmRlclNWR01vZGVsT2JqZWN0PihyZW5kZXJlcigpKSkgeworICAgICAgICBhdXRvJiBzdmdS ZW5kZXJlciA9IGRvd25jYXN0PFJlbmRlclNWR01vZGVsT2JqZWN0PihyZW5kZXJlcigpKTsKKyAg ICAgICAgYXV0byBuZXdTaXplID0gZW5jbG9zaW5nSW50UmVjdChzdmdSZW5kZXJlci5mcmFtZVJl Y3RFcXVpdmFsZW50KCkpLnNpemUoKTsKKyAgICAgICAgaWYgKG5ld1NpemUgIT0gc2l6ZSgpKSB7 CisgICAgICAgICAgICBpZiAoZmxhZ3MgJiYgcmVuZGVyZXIoKS5oYXNOb25WaXNpYmxlT3ZlcmZs b3coKSkKKyAgICAgICAgICAgICAgICBmbGFncy0+YWRkKENvbnRhaW5pbmdDbGlwcGluZ0xheWVy Q2hhbmdlZFNpemUpOworCisgICAgICAgICAgICBzZXRTaXplKG5ld1NpemUpOworICAgICAgICB9 CisKKyAgICAgICAgc3ZnUmVuZGVyZXIuYXBwbHlUb3BMZWZ0TG9jYXRpb25PZmZzZXRFcXVpdmFs ZW50KGxvY2FsUG9pbnQpOworI2VuZGlmCiAgICAgfQogCiAgICAgaWYgKCFyZW5kZXJlcigpLmlz T3V0T2ZGbG93UG9zaXRpb25lZCgpKSB7CkBAIC00ODExLDYgKzQ4MzYsMTAgQEAgTGF5b3V0UmVj dCBSZW5kZXJMYXllcjo6bG9jYWxCb3VuZGluZ0JveChPcHRpb25TZXQ8Q2FsY3VsYXRlTGF5ZXJC b3VuZHNGbGFnPiBmbGEKICAgICBMYXlvdXRSZWN0IHJlc3VsdDsKICAgICBpZiAocmVuZGVyZXIo KS5pc0lubGluZSgpICYmIGlzPFJlbmRlcklubGluZT4ocmVuZGVyZXIoKSkpCiAgICAgICAgIHJl c3VsdCA9IGRvd25jYXN0PFJlbmRlcklubGluZT4ocmVuZGVyZXIoKSkubGluZXNWaXN1YWxPdmVy Zmxvd0JvdW5kaW5nQm94KCk7CisjaWYgRU5BQkxFKExBWUVSX0JBU0VEX1NWR19FTkdJTkUpCisg ICAgZWxzZSBpZiAoaXM8UmVuZGVyU1ZHTW9kZWxPYmplY3Q+KHJlbmRlcmVyKCkpKQorICAgICAg ICByZXN1bHQgPSBkb3duY2FzdDxSZW5kZXJTVkdNb2RlbE9iamVjdD4ocmVuZGVyZXIoKSkudmlz dWFsT3ZlcmZsb3dSZWN0RXF1aXZhbGVudCgpOworI2VuZGlmCiAgICAgZWxzZSBpZiAoaXM8UmVu ZGVyVGFibGVSb3c+KHJlbmRlcmVyKCkpKSB7CiAgICAgICAgIGF1dG8mIHRhYmxlUm93ID0gZG93 bmNhc3Q8UmVuZGVyVGFibGVSb3c+KHJlbmRlcmVyKCkpOwogICAgICAgICAvLyBPdXIgYm91bmRp bmcgYm94IGlzIGp1c3QgdGhlIHVuaW9uIG9mIGFsbCBvZiBvdXIgY2VsbHMnIGJvcmRlci9vdmVy ZmxvdyByZWN0cy4K 451031 2022-02-06 03:00:18 -0800 2022-02-07 03:52:01 -0800 Patch, v2 bug-236187-20220206030017.patch text/plain 4843 zimmermann U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5MTY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGNhZjNlOTIwYTY3NTgw Njg5ZDI0MzY4Y2EzMjFkN2U3ZTI2YjczMC4uZTAzMjhmZWNhNjRjYjRlMzliYjQ4ZjE4MmJlNzg2 Y2VmZjg2ZDBhZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDIyLTAyLTA2ICBOaWtv bGFzIFppbW1lcm1hbm4gIDxuemltbWVybWFubkBpZ2FsaWEuY29tPgorCisgICAgICAgIFtMQlNF XSBBcHBseSBwb3NpdGlvbiAvIHNpemUgdG8gU1ZHIGxheWVycworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM2MTg3CisKKyAgICAgICAgVGVhY2ggUmVu ZGVyTGF5ZXI6OnVwZGF0ZUxheWVyUG9zaXRpb24oKSBhYm91dCBSZW5kZXJTVkdNb2RlbE9iamVj dAorICAgICAgICBkZXJpdmVkIHJlbmRlcmVycyB0aGF0IGNyZWF0ZSBsYXllcnMuIEdyYWIgc2l6 ZSBhbmQgcG9zaXRpb24gaW5mb3JtYXRpb24KKyAgICAgICAgZnJvbSB0aGUgU1ZHIHJlbmRlciB0 cmVlLCBqdXN0IGFzIGRvbmUgZm9yIENTUyBib3hlcyBpbiB0aGUgcmVuZGVyIHRyZWUuCisKKyAg ICAgICAgVG8gbWluaW1pemUgdGhlIFJlbmRlckxheWVyIGNoYW5nZXMsIGFuZCBtb3N0IGltcG9y dGFudGx5IHRvIGxldCBTVkcKKyAgICAgICAgbG9vayBsaWtlIGEgcmVndWxhciBDU1Mgb2JqZWN0 IGZyb20gdGhlIG91dHNpZGUgYSBjb21wYXRpYmlsaXR5IGxheWVyCisgICAgICAgIGlzIGV4cG9z ZWQgb2ZmZXJpbmcgbWV0aG9kcyBzdWNoIGFzICdmcmFtZVJlY3RFcXVpdmFsZW50KCknLAorICAg ICAgICAndmlzdWFsT3ZlcmZsb3dSZWN0RXF1aXZhbGVudCgpJyBhbmQgb2ZmZXJzIHV0aWxpdHkg bWV0aG9kcyBzdWNoIGFzCisgICAgICAgICdhcHBseVRvcExlZnRMb2NhdGlvbk9mZnNldEVxdWl2 YWxlbnQobG9jYWxQb2ludCknLiBUaGUgdGVybWlub2xvZ3kKKyAgICAgICAgc3RlbXMgZnJvbSBD U1MgYW5kIGlzIHVzdWFsbHkgbm90IHByZXNlbnQgaW4gU1ZHIC0tIGhvd2V2ZXIgdG8gc2ltcGxp ZnkKKyAgICAgICAgdGhlIFJlbmRlckxheWVyIGltcGxlbWVudGF0aW9uIGFuZCBlbXBoYXppc2Ug dGhlIGFuYWxvZ3kgYmV0d2VlbgorICAgICAgICBSZW5kZXJCb3ggYW5kIFJlbmRlclNWR01vZGVs T2JqZWN0IHRoZSB1dGlsaXR5IG1ldGhvZHMgaGVscCBhIGxvdC4KKworICAgICAgICBTVkcgbm8g bG9uZ2VyIGxvb2tzIHNwZWNpYWwgYW5kIG9uZSBkb2Vzbid0IG5lZWQgdG8gdGhpbmsgaGFyZCB3 aGF0CisgICAgICAgIHRoZSBiZXN0IG1hdGNoaW5nIGVxdWl2YWxlbnQgdG8gYSAndmlzdWFsT3Zl cmZsb3dSZWN0JyBpbiBTVkcsIG9yCisgICAgICAgIGlmIGNvb3JkaW5hdGUgc3lzdGVtIG9yaWdp bnMgYXJlIGlkZW50aWNhbCBvciBub3QsIGV0Yy4KKworICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0 aW5nIHRlc3RzLCBubyBjaGFuZ2UgaW4gYmVoYXZpb3VyLgorCisgICAgICAgICogcmVuZGVyaW5n L1JlbmRlckxheWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpyZWN1cnNp dmVVcGRhdGVMYXllclBvc2l0aW9ucyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6 dXBkYXRlTGF5ZXJQb3NpdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6Y2Fs Y3VsYXRlQ2xpcFJlY3RzIGNvbnN0KToKKwogMjAyMi0wMi0wMyAgTmlrb2xhcyBaaW1tZXJtYW5u ICA8bnppbW1lcm1hbm5AaWdhbGlhLmNvbT4KIAogICAgICAgICBbTEJTRV0gSGFuZGxlIFJlbmRl clNWR1NoYXBlIGluIFNWR1JlbmRlclN1cHBvcnQ6OmFwcGx5U3Ryb2tlU3R5bGVUb0NvbnRleHQo KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKaW5kZXggNzdhOGEyNzgx MjkyNWE1YTQ2NzJjNjVkZjk4Y2Y3YWRiMjk2ZmRlNy4uYjMzOTU5NmU2MTVlNmQwNTVlOWFhMWM2 ZjgxOGI0NmU4OTk5ZGEyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckxheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIu Y3BwCkBAIC0xMDYsNyArMTA2LDExIEBACiAjaW5jbHVkZSAiUmVuZGVyTXVsdGlDb2x1bW5GbG93 LmgiCiAjaW5jbHVkZSAiUmVuZGVyUmVwbGljYS5oIgogI2luY2x1ZGUgIlJlbmRlclNWR0ZvcmVp Z25PYmplY3QuaCIKKyNpbmNsdWRlICJSZW5kZXJTVkdJbmxpbmUuaCIKKyNpbmNsdWRlICJSZW5k ZXJTVkdNb2RlbE9iamVjdC5oIgogI2luY2x1ZGUgIlJlbmRlclNWR1Jlc291cmNlQ2xpcHBlci5o IgorI2luY2x1ZGUgIlJlbmRlclNWR1Jvb3QuaCIKKyNpbmNsdWRlICJSZW5kZXJTVkdUZXh0Lmgi CiAjaW5jbHVkZSAiUmVuZGVyU2Nyb2xsYmFyLmgiCiAjaW5jbHVkZSAiUmVuZGVyU2Nyb2xsYmFy UGFydC5oIgogI2luY2x1ZGUgIlJlbmRlclRhYmxlQ2VsbC5oIgpAQCAtMTA1OSw2ICsxMDYzLDE3 IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnJlY3Vyc2l2ZVVwZGF0ZUxheWVyUG9zaXRpb25zKFJlbmRl ckdlb21ldHJ5TWFwKiBnZW9tZXRyeU1hcCwKICAgICAgICAgfQogICAgIH0KIAorI2lmIEVOQUJM RShMQVlFUl9CQVNFRF9TVkdfRU5HSU5FKQorICAgIGlmIChyZW5kZXJlcigpLmlzU1ZHTGF5ZXJB d2FyZVJlbmRlcmVyKCkgJiYgcmVuZGVyZXIoKS5kb2N1bWVudCgpLnNldHRpbmdzKCkubGF5ZXJC YXNlZFNWR0VuZ2luZUVuYWJsZWQoKSkgeworICAgICAgICBpZiAoIWlzPFJlbmRlclNWR1Jvb3Q+ KHJlbmRlcmVyKCkpKQorICAgICAgICAgICAgQVNTRVJUKCFyZW5kZXJlcigpLmlzRml4ZWRQb3Np dGlvbmVkKCkpOworCisgICAgICAgIC8vIE9ubHkgdGhlIG91dGVybW9zdCA8c3ZnPiBhbmQgLyA8 Zm9yZWlnbk9iamVjdD4gYXJlIHBvdGVudGlhbGx5IHNjcm9sbGFibGUuCisgICAgICAgIGlmIChp czxSZW5kZXJTVkdNb2RlbE9iamVjdD4ocmVuZGVyZXIoKSkgfHwgaXM8UmVuZGVyU1ZHVGV4dD4o cmVuZGVyZXIoKSkgfHwgaXM8UmVuZGVyU1ZHSW5saW5lPihyZW5kZXJlcigpKSkKKyAgICAgICAg ICAgIEFTU0VSVCghbV9zY3JvbGxhYmxlQXJlYSk7CisgICAgfQorI2VuZGlmCisKICAgICBpZiAo aXNDb21wb3NpdGVkKCkpCiAgICAgICAgIGJhY2tpbmcoKS0+dXBkYXRlQWZ0ZXJMYXlvdXQoZmxh Z3MuY29udGFpbnMoQ29udGFpbmluZ0NsaXBwaW5nTGF5ZXJDaGFuZ2VkU2l6ZSksIGZsYWdzLmNv bnRhaW5zKE5lZWRzRnVsbFJlcGFpbnRJbkJhY2tpbmcpKTsKIApAQCAtMTY3OCw2ICsxNjkzLDE5 IEBAIGJvb2wgUmVuZGVyTGF5ZXI6OnVwZGF0ZUxheWVyUG9zaXRpb24oT3B0aW9uU2V0PFVwZGF0 ZUxheWVyUG9zaXRpb25zRmxhZz4qIGZsYWdzCiAgICAgICAgIH0KICAgICAgICAgCiAgICAgICAg IGJveC0+YXBwbHlUb3BMZWZ0TG9jYXRpb25PZmZzZXQobG9jYWxQb2ludCk7CisjaWYgRU5BQkxF KExBWUVSX0JBU0VEX1NWR19FTkdJTkUpCisgICAgfSBlbHNlIGlmIChpczxSZW5kZXJTVkdNb2Rl bE9iamVjdD4ocmVuZGVyZXIoKSkpIHsKKyAgICAgICAgYXV0byYgc3ZnUmVuZGVyZXIgPSBkb3du Y2FzdDxSZW5kZXJTVkdNb2RlbE9iamVjdD4ocmVuZGVyZXIoKSk7CisgICAgICAgIGF1dG8gbmV3 U2l6ZSA9IGVuY2xvc2luZ0ludFJlY3Qoc3ZnUmVuZGVyZXIuZnJhbWVSZWN0RXF1aXZhbGVudCgp KS5zaXplKCk7CisgICAgICAgIGlmIChuZXdTaXplICE9IHNpemUoKSkgeworICAgICAgICAgICAg aWYgKGZsYWdzICYmIHJlbmRlcmVyKCkuaGFzTm9uVmlzaWJsZU92ZXJmbG93KCkpCisgICAgICAg ICAgICAgICAgZmxhZ3MtPmFkZChDb250YWluaW5nQ2xpcHBpbmdMYXllckNoYW5nZWRTaXplKTsK KworICAgICAgICAgICAgc2V0U2l6ZShuZXdTaXplKTsKKyAgICAgICAgfQorCisgICAgICAgIHN2 Z1JlbmRlcmVyLmFwcGx5VG9wTGVmdExvY2F0aW9uT2Zmc2V0RXF1aXZhbGVudChsb2NhbFBvaW50 KTsKKyNlbmRpZgogICAgIH0KIAogICAgIGlmICghcmVuZGVyZXIoKS5pc091dE9mRmxvd1Bvc2l0 aW9uZWQoKSkgewpAQCAtNDgxMSw2ICs0ODM5LDEwIEBAIExheW91dFJlY3QgUmVuZGVyTGF5ZXI6 OmxvY2FsQm91bmRpbmdCb3goT3B0aW9uU2V0PENhbGN1bGF0ZUxheWVyQm91bmRzRmxhZz4gZmxh CiAgICAgTGF5b3V0UmVjdCByZXN1bHQ7CiAgICAgaWYgKHJlbmRlcmVyKCkuaXNJbmxpbmUoKSAm JiBpczxSZW5kZXJJbmxpbmU+KHJlbmRlcmVyKCkpKQogICAgICAgICByZXN1bHQgPSBkb3duY2Fz dDxSZW5kZXJJbmxpbmU+KHJlbmRlcmVyKCkpLmxpbmVzVmlzdWFsT3ZlcmZsb3dCb3VuZGluZ0Jv eCgpOworI2lmIEVOQUJMRShMQVlFUl9CQVNFRF9TVkdfRU5HSU5FKQorICAgIGVsc2UgaWYgKGlz PFJlbmRlclNWR01vZGVsT2JqZWN0PihyZW5kZXJlcigpKSkKKyAgICAgICAgcmVzdWx0ID0gZG93 bmNhc3Q8UmVuZGVyU1ZHTW9kZWxPYmplY3Q+KHJlbmRlcmVyKCkpLnZpc3VhbE92ZXJmbG93UmVj dEVxdWl2YWxlbnQoKTsKKyNlbmRpZgogICAgIGVsc2UgaWYgKGlzPFJlbmRlclRhYmxlUm93Pihy ZW5kZXJlcigpKSkgewogICAgICAgICBhdXRvJiB0YWJsZVJvdyA9IGRvd25jYXN0PFJlbmRlclRh YmxlUm93PihyZW5kZXJlcigpKTsKICAgICAgICAgLy8gT3VyIGJvdW5kaW5nIGJveCBpcyBqdXN0 IHRoZSB1bmlvbiBvZiBhbGwgb2Ygb3VyIGNlbGxzJyBib3JkZXIvb3ZlcmZsb3cgcmVjdHMuCg==