209679 2020-03-27 13:38:21 -0700 Change SVGRenderingContext::renderSubtreeToImageBuffer() to SVGRenderingContext::renderSubtreeToContext() 2020-03-27 16:52:16 -0700 1 1 1 Unclassified WebKit SVG WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=209635 InRadar P2 Normal --- 1 simon.fraser simon.fraser sabouhallawa simon.fraser webkit-bug-importer zimmermann oldest_to_newest 1634977 0 simon.fraser 2020-03-27 13:38:21 -0700 Change SVGRenderingContext::renderSubtreeToImageBuffer() to SVGRenderingContext::renderSubtreeToContext() 1634978 1 394753 simon.fraser 2020-03-27 13:39:12 -0700 Created attachment 394753 Patch 1634985 2 simon.fraser 2020-03-27 13:52:29 -0700 Patch goes on top of patch from bug 209635. 1635054 3 ews-feeder 2020-03-27 16:51:14 -0700 Committed r259147: <https://trac.webkit.org/changeset/259147> All reviewed patches have been landed. Closing bug and clearing flags on attachment 394753. 1635055 4 webkit-bug-importer 2020-03-27 16:52:16 -0700 <rdar://problem/60990820> 394753 2020-03-27 13:39:12 -0700 2020-03-27 16:51:15 -0700 Patch bug-209679-20200327133911.patch text/plain 9171 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5MTI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDg1MmY5MTI0NDI4YWM0 ZWFkYTNlNzNkY2E3OWE5ZWU0NGYwMzZjYy4uMzk4MjVlYTQ0MTUzYmM5ODRkYWM1ODljN2VmNmZj MDAzN2IyZTViNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIwLTAzLTI3ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIENoYW5nZSBTVkdS ZW5kZXJpbmdDb250ZXh0OjpyZW5kZXJTdWJ0cmVlVG9JbWFnZUJ1ZmZlcigpIHRvIFNWR1JlbmRl cmluZ0NvbnRleHQ6OnJlbmRlclN1YnRyZWVUb0NvbnRleHQoKQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA5Njc5CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgcmVuZGVyU3VidHJlZVRvSW1hZ2VCdWZmZXIo KSBqdXN0IGdldHMgdGhlIGNvbnRleHQgZnJvbSB0aGUgYnVmZmVyLCBzbyBjaGFuZ2UgdGhlIG5h bWUgYW5kIHNpZ25hdHVyZQorICAgICAgICBhbmQganVzdCBwYXNzIGEgR3JhcGhpY3NDb250ZXh0 LgorCisgICAgICAgICogcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZUNsaXBwZXIuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU1ZHUmVzb3VyY2VDbGlwcGVyOjpkcmF3Q29udGVu dEludG9NYXNrSW1hZ2UpOgorICAgICAgICAqIHJlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3Vy Y2VNYXNrZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU1ZHUmVzb3VyY2VNYXNrZXI6 OmRyYXdDb250ZW50SW50b01hc2tJbWFnZSk6CisgICAgICAgICogcmVuZGVyaW5nL3N2Zy9SZW5k ZXJTVkdSZXNvdXJjZVBhdHRlcm4uY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU1ZHUmVz b3VyY2VQYXR0ZXJuOjpjcmVhdGVUaWxlSW1hZ2UgY29uc3QpOgorICAgICAgICAqIHJlbmRlcmlu Zy9zdmcvU1ZHUmVuZGVyaW5nQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTVkdSZW5k ZXJpbmdDb250ZXh0OjpyZW5kZXJTdWJ0cmVlVG9Db250ZXh0KToKKyAgICAgICAgKFdlYkNvcmU6 OlNWR1JlbmRlcmluZ0NvbnRleHQ6OnJlbmRlclN1YnRyZWVUb0ltYWdlQnVmZmVyKTogRGVsZXRl ZC4KKyAgICAgICAgKiByZW5kZXJpbmcvc3ZnL1NWR1JlbmRlcmluZ0NvbnRleHQuaDoKKyAgICAg ICAgKiBzdmcvZ3JhcGhpY3MvZmlsdGVycy9TVkdGRUltYWdlLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkZFSW1hZ2U6OnBsYXRmb3JtQXBwbHlTb2Z0d2FyZSk6CisKIDIwMjAtMDMtMjcgIFNpbW9u IEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgSG92ZXJpbmcgb3Zl ciBjb3VudHJpZXMgYXQgaHR0cHM6Ly9jb3ZpZGluYy5pby8gc2hvd3MgYml6YXJyZSByZW5kZXJp bmcgYXJ0aWZhY3RzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1Jl bmRlclNWR1Jlc291cmNlQ2xpcHBlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3Zn L1JlbmRlclNWR1Jlc291cmNlQ2xpcHBlci5jcHAKaW5kZXggN2IwNTc1OTY0MjhkMTE4ZGFiOWY3 YjExY2MxZjE1NzdjMDhmMjYwNS4uODFiNzhlZGM4NTZlMTU5NmU3ZmYxYjMwZGFmZjA1NDU2ZjVj OGVlZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdS ZXNvdXJjZUNsaXBwZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVu ZGVyU1ZHUmVzb3VyY2VDbGlwcGVyLmNwcApAQCAtMjM2LDkgKzIzNiw5IEBAIGJvb2wgUmVuZGVy U1ZHUmVzb3VyY2VDbGlwcGVyOjpkcmF3Q29udGVudEludG9NYXNrSW1hZ2UoSW1hZ2VCdWZmZXIm IG1hc2tJbWFnZUJ1CiAgICAgICAgIG1hc2tDb250ZXh0LnNldEZpbGxSdWxlKG5ld0NsaXBSdWxl KTsKIAogICAgICAgICAvLyBJbiB0aGUgY2FzZSBvZiBhIDx1c2U+IGVsZW1lbnQsIHdlIG9idGFp bmVkIGl0cyByZW5kZXJlcmUgYWJvdmUsIHRvIHJldHJpZXZlIGl0cyBjbGlwUnVsZS4KLSAgICAg ICAgLy8gV2UgaGF2ZSB0byBwYXNzIHRoZSA8dXNlPiByZW5kZXJlciBpdHNlbGYgdG8gcmVuZGVy U3VidHJlZVRvSW1hZ2VCdWZmZXIoKSB0byBhcHBseSBpdCdzIHgveS90cmFuc2Zvcm0vZXRjLiB2 YWx1ZXMgd2hlbiByZW5kZXJpbmcuCisgICAgICAgIC8vIFdlIGhhdmUgdG8gcGFzcyB0aGUgPHVz ZT4gcmVuZGVyZXIgaXRzZWxmIHRvIHJlbmRlclN1YnRyZWVUb0NvbnRleHQoKSB0byBhcHBseSBp dCdzIHgveS90cmFuc2Zvcm0vZXRjLiB2YWx1ZXMgd2hlbiByZW5kZXJpbmcuCiAgICAgICAgIC8v IFNvIGlmIGlzVXNlRWxlbWVudCBpcyB0cnVlLCByZWZldGNoIHRoZSBjaGlsZE5vZGUtPnJlbmRl cmVyKCksIGFzIHJlbmRlcmVyIGdvdCBvdmVycmlkZGVuIGFib3ZlLgotICAgICAgICBTVkdSZW5k ZXJpbmdDb250ZXh0OjpyZW5kZXJTdWJ0cmVlVG9JbWFnZUJ1ZmZlcigmbWFza0ltYWdlQnVmZmVy LCBpc1VzZUVsZW1lbnQgPyAqY2hpbGQucmVuZGVyZXIoKSA6ICpyZW5kZXJlciwgbWFza0NvbnRl bnRUcmFuc2Zvcm1hdGlvbik7CisgICAgICAgIFNWR1JlbmRlcmluZ0NvbnRleHQ6OnJlbmRlclN1 YnRyZWVUb0NvbnRleHQobWFza0NvbnRleHQsIGlzVXNlRWxlbWVudCA/ICpjaGlsZC5yZW5kZXJl cigpIDogKnJlbmRlcmVyLCBtYXNrQ29udGVudFRyYW5zZm9ybWF0aW9uKTsKICAgICB9CiAKICAg ICB2aWV3KCkuZnJhbWVWaWV3KCkuc2V0UGFpbnRCZWhhdmlvcihvbGRCZWhhdmlvcik7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlTWFz a2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VN YXNrZXIuY3BwCmluZGV4IDEyMGM1N2I1Njk3ODcyMjA0NjViYzZhZWMwYjU4MDRjNDU1Y2Q4Mjku Ljg2MWUyNmI0NzZlNTQwOGQ0YjY0OGEzNjk4MDI0NWUxNTA4NmFiMGMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VNYXNrZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VNYXNrZXIu Y3BwCkBAIC0xMDksNyArMTA5LDcgQEAgYm9vbCBSZW5kZXJTVkdSZXNvdXJjZU1hc2tlcjo6ZHJh d0NvbnRlbnRJbnRvTWFza0ltYWdlKE1hc2tlckRhdGEqIG1hc2tlckRhdGEsIEMKICAgICAgICAg Y29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlID0gcmVuZGVyZXItPnN0eWxlKCk7CiAgICAgICAgIGlm IChzdHlsZS5kaXNwbGF5KCkgPT0gRGlzcGxheVR5cGU6Ok5vbmUgfHwgc3R5bGUudmlzaWJpbGl0 eSgpICE9IFZpc2liaWxpdHk6OlZpc2libGUpCiAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAg ICAgU1ZHUmVuZGVyaW5nQ29udGV4dDo6cmVuZGVyU3VidHJlZVRvSW1hZ2VCdWZmZXIobWFza2Vy RGF0YS0+bWFza0ltYWdlLmdldCgpLCAqcmVuZGVyZXIsIG1hc2tDb250ZW50VHJhbnNmb3JtYXRp b24pOworICAgICAgICBTVkdSZW5kZXJpbmdDb250ZXh0OjpyZW5kZXJTdWJ0cmVlVG9Db250ZXh0 KG1hc2tJbWFnZUNvbnRleHQsICpyZW5kZXJlciwgbWFza0NvbnRlbnRUcmFuc2Zvcm1hdGlvbik7 CiAgICAgfQogCiAjaWYgIVVTRShDRykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VQYXR0ZXJuLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VQYXR0ZXJuLmNwcAppbmRleCAxYzNjODU0YWVm Mjk3NjljMmRmOWViNDRmOWNkMTliM2IxYzY1NzAwLi5lOTlmMThlM2I0NDEzYjNiOWIxNTU5MmFl OTI2Y2M4MDIwMjEyZmVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3Zn L1JlbmRlclNWR1Jlc291cmNlUGF0dGVybi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZVBhdHRlcm4uY3BwCkBAIC0yNzgsNyArMjc4LDcgQEAg c3RkOjp1bmlxdWVfcHRyPEltYWdlQnVmZmVyPiBSZW5kZXJTVkdSZXNvdXJjZVBhdHRlcm46OmNy ZWF0ZVRpbGVJbWFnZShjb25zdCBQYXQKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICBp ZiAoY2hpbGQucmVuZGVyZXIoKS0+bmVlZHNMYXlvdXQoKSkKICAgICAgICAgICAgIHJldHVybiBu dWxscHRyOwotICAgICAgICBTVkdSZW5kZXJpbmdDb250ZXh0OjpyZW5kZXJTdWJ0cmVlVG9JbWFn ZUJ1ZmZlcih0aWxlSW1hZ2UuZ2V0KCksICpjaGlsZC5yZW5kZXJlcigpLCBjb250ZW50VHJhbnNm b3JtYXRpb24pOworICAgICAgICBTVkdSZW5kZXJpbmdDb250ZXh0OjpyZW5kZXJTdWJ0cmVlVG9D b250ZXh0KHRpbGVJbWFnZUNvbnRleHQsICpjaGlsZC5yZW5kZXJlcigpLCBjb250ZW50VHJhbnNm b3JtYXRpb24pOwogICAgIH0KIAogICAgIHJldHVybiB0aWxlSW1hZ2U7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1NWR1JlbmRlcmluZ0NvbnRleHQuY3BwIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9TVkdSZW5kZXJpbmdDb250ZXh0LmNwcAppbmRleCBm NmE5NTQ1ODk4NThlMDBlNGU3YjZhM2MxOWYyMmJhZmE1NzYxZDM0Li4zOTQ3ZjdjNzMyOTY5YTQw ZmU4OTYwODRmNTQxZmViOTY1NjQ5YWRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvc3ZnL1NWR1JlbmRlcmluZ0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9zdmcvU1ZHUmVuZGVyaW5nQ29udGV4dC5jcHAKQEAgLTI5MCwxMyArMjkwLDExIEBA IHN0ZDo6dW5pcXVlX3B0cjxJbWFnZUJ1ZmZlcj4gU1ZHUmVuZGVyaW5nQ29udGV4dDo6Y3JlYXRl SW1hZ2VCdWZmZXIoY29uc3QgRmxvYXRSCiAgICAgcmV0dXJuIGltYWdlQnVmZmVyOwogfQogCi12 b2lkIFNWR1JlbmRlcmluZ0NvbnRleHQ6OnJlbmRlclN1YnRyZWVUb0ltYWdlQnVmZmVyKEltYWdl QnVmZmVyKiBpbWFnZSwgUmVuZGVyRWxlbWVudCYgaXRlbSwgY29uc3QgQWZmaW5lVHJhbnNmb3Jt JiBzdWJ0cmVlQ29udGVudFRyYW5zZm9ybWF0aW9uKQordm9pZCBTVkdSZW5kZXJpbmdDb250ZXh0 OjpyZW5kZXJTdWJ0cmVlVG9Db250ZXh0KEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCwgUmVuZGVy RWxlbWVudCYgaXRlbSwgY29uc3QgQWZmaW5lVHJhbnNmb3JtJiBzdWJ0cmVlQ29udGVudFRyYW5z Zm9ybWF0aW9uKQogewotICAgIEFTU0VSVChpbWFnZSk7Ci0KICAgICAvLyBSZW5kZXJpbmcgaW50 byBhIGJ1ZmZlciBpbXBsaWVzIHdlJ3JlIGJlaW5nIHVzZWQgZm9yIG1hc2tpbmcsIGNsaXBwaW5n LCBwYXR0ZXJucyBvciBmaWx0ZXJzLiBJbiBlYWNoIG9mIHRoZXNlCiAgICAgLy8gY2FzZXMgd2Ug ZG9uJ3Qgd2FudCB0byBwYWludCB0aGUgc2VsZWN0aW9uLgotICAgIFBhaW50SW5mbyBpbmZvKGlt YWdlLT5jb250ZXh0KCksIExheW91dFJlY3Q6OmluZmluaXRlUmVjdCgpLCBQYWludFBoYXNlOjpG b3JlZ3JvdW5kLCBQYWludEJlaGF2aW9yOjpTa2lwU2VsZWN0aW9uSGlnaGxpZ2h0KTsKKyAgICBQ YWludEluZm8gaW5mbyhjb250ZXh0LCBMYXlvdXRSZWN0OjppbmZpbml0ZVJlY3QoKSwgUGFpbnRQ aGFzZTo6Rm9yZWdyb3VuZCwgUGFpbnRCZWhhdmlvcjo6U2tpcFNlbGVjdGlvbkhpZ2hsaWdodCk7 CiAKICAgICBBZmZpbmVUcmFuc2Zvcm0mIGNvbnRlbnRUcmFuc2Zvcm1hdGlvbiA9IGN1cnJlbnRD b250ZW50VHJhbnNmb3JtYXRpb24oKTsKICAgICBBZmZpbmVUcmFuc2Zvcm0gc2F2ZWRDb250ZW50 VHJhbnNmb3JtYXRpb24gPSBjb250ZW50VHJhbnNmb3JtYXRpb247CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1NWR1JlbmRlcmluZ0NvbnRleHQuaCBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9zdmcvU1ZHUmVuZGVyaW5nQ29udGV4dC5oCmluZGV4IDNiOWE2NWNi ZjJmMzM3OTEwZDg3YjEyMTBhNGYyMmI3YzljYTgwNzUuLmE2NzViYzI1NzBjYTEyOGQ3NWJlM2Iw NWVjZTQxNzJiMWRkNTFjOTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9z dmcvU1ZHUmVuZGVyaW5nQ29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9z dmcvU1ZHUmVuZGVyaW5nQ29udGV4dC5oCkBAIC02Myw3ICs2Myw3IEBAIHB1YmxpYzoKICAgICBz dGF0aWMgc3RkOjp1bmlxdWVfcHRyPEltYWdlQnVmZmVyPiBjcmVhdGVJbWFnZUJ1ZmZlcihjb25z dCBGbG9hdFJlY3QmIHRhcmdldFJlY3QsIGNvbnN0IEFmZmluZVRyYW5zZm9ybSYgYWJzb2x1dGVU cmFuc2Zvcm0sIENvbG9yU3BhY2UsIFJlbmRlcmluZ01vZGUsIGNvbnN0IEdyYXBoaWNzQ29udGV4 dCogPSBudWxscHRyKTsKICAgICBzdGF0aWMgc3RkOjp1bmlxdWVfcHRyPEltYWdlQnVmZmVyPiBj cmVhdGVJbWFnZUJ1ZmZlcihjb25zdCBGbG9hdFJlY3QmIHRhcmdldFJlY3QsIGNvbnN0IEZsb2F0 UmVjdCYgY2xhbXBlZFJlY3QsIENvbG9yU3BhY2UsIFJlbmRlcmluZ01vZGUsIGNvbnN0IEdyYXBo aWNzQ29udGV4dCogPSBudWxscHRyKTsKIAotICAgIHN0YXRpYyB2b2lkIHJlbmRlclN1YnRyZWVU b0ltYWdlQnVmZmVyKEltYWdlQnVmZmVyKiwgUmVuZGVyRWxlbWVudCYsIGNvbnN0IEFmZmluZVRy YW5zZm9ybSYpOworICAgIHN0YXRpYyB2b2lkIHJlbmRlclN1YnRyZWVUb0NvbnRleHQoR3JhcGhp Y3NDb250ZXh0JiwgUmVuZGVyRWxlbWVudCYsIGNvbnN0IEFmZmluZVRyYW5zZm9ybSYpOwogICAg IHN0YXRpYyB2b2lkIGNsaXBUb0ltYWdlQnVmZmVyKEdyYXBoaWNzQ29udGV4dCYsIGNvbnN0IEFm ZmluZVRyYW5zZm9ybSYgYWJzb2x1dGVUcmFuc2Zvcm0sIGNvbnN0IEZsb2F0UmVjdCYgdGFyZ2V0 UmVjdCwgc3RkOjp1bmlxdWVfcHRyPEltYWdlQnVmZmVyPiYsIGJvb2wgc2FmZVRvQ2xlYXIpOwog CiAgICAgc3RhdGljIGZsb2F0IGNhbGN1bGF0ZVNjcmVlbkZvbnRTaXplU2NhbGluZ0ZhY3Rvcihj b25zdCBSZW5kZXJPYmplY3QmKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N2Zy9ncmFw aGljcy9maWx0ZXJzL1NWR0ZFSW1hZ2UuY3BwIGIvU291cmNlL1dlYkNvcmUvc3ZnL2dyYXBoaWNz L2ZpbHRlcnMvU1ZHRkVJbWFnZS5jcHAKaW5kZXggOGYxMzhhMmU1YTE1ZDhjYjE3MTRjZjJiNmRk MDA1OTVmOTk1YTI3Yi4uMDBhNTlhZGMzODFlYzhlNWQwZWY1ZjA3ZDVmZmE4ZTZmYmViMmJiMiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3ZnL2dyYXBoaWNzL2ZpbHRlcnMvU1ZHRkVJbWFn ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvc3ZnL2dyYXBoaWNzL2ZpbHRlcnMvU1ZHRkVJbWFn ZS5jcHAKQEAgLTExMyw5ICsxMTMsMTEgQEAgdm9pZCBGRUltYWdlOjpwbGF0Zm9ybUFwcGx5U29m dHdhcmUoKQogICAgIEludFBvaW50IHBhaW50TG9jYXRpb24gPSBhYnNvbHV0ZVBhaW50UmVjdCgp LmxvY2F0aW9uKCk7CiAgICAgZGVzdFJlY3QubW92ZSgtcGFpbnRMb2NhdGlvbi54KCksIC1wYWlu dExvY2F0aW9uLnkoKSk7CiAKKyAgICBhdXRvJiBjb250ZXh0ID0gcmVzdWx0SW1hZ2UtPmNvbnRl eHQoKTsKKwogICAgIGlmIChyZW5kZXJlcikgewogICAgICAgICBjb25zdCBBZmZpbmVUcmFuc2Zv cm0mIGFic29sdXRlVHJhbnNmb3JtID0gZmlsdGVyKCkuYWJzb2x1dGVUcmFuc2Zvcm0oKTsKLSAg ICAgICAgcmVzdWx0SW1hZ2UtPmNvbnRleHQoKS5jb25jYXRDVE0oYWJzb2x1dGVUcmFuc2Zvcm0p OworICAgICAgICBjb250ZXh0LmNvbmNhdENUTShhYnNvbHV0ZVRyYW5zZm9ybSk7CiAKICAgICAg ICAgYXV0byBjb250ZXh0Tm9kZSA9IG1ha2VSZWZQdHIoZG93bmNhc3Q8U1ZHRWxlbWVudD4ocmVu ZGVyZXItPmVsZW1lbnQoKSkpOwogICAgICAgICBpZiAoY29udGV4dE5vZGUtPmhhc1JlbGF0aXZl TGVuZ3RocygpKSB7CkBAIC0xMjUsMTUgKzEyNywxNSBAQCB2b2lkIEZFSW1hZ2U6OnBsYXRmb3Jt QXBwbHlTb2Z0d2FyZSgpCiAgICAgICAgICAgICAvLyBJZiB3ZSdyZSByZWZlcmVuY2luZyBhbiBl bGVtZW50IHdpdGggcGVyY2VudGFnZSB1bml0cywgZWcuIDxyZWN0IHdpdGg9IjMwJSI+IHRob3Nl IHZhbHVlcyB3ZXJlIHJlc29sdmVkIGFnYWluc3QgdGhlIHZpZXdwb3J0LgogICAgICAgICAgICAg Ly8gQnVpbGQgdXAgYSB0cmFuc2Zvcm1hdGlvbiB0aGF0IG1hcHMgZnJvbSB0aGUgdmlld3BvcnQg c3BhY2UgdG8gdGhlIGZpbHRlciBwcmltaXRpdmUgc3VicmVnaW9uLgogICAgICAgICAgICAgaWYg KGxlbmd0aENvbnRleHQuZGV0ZXJtaW5lVmlld3BvcnQodmlld3BvcnRTaXplKSkKLSAgICAgICAg ICAgICAgICByZXN1bHRJbWFnZS0+Y29udGV4dCgpLmNvbmNhdENUTShtYWtlTWFwQmV0d2VlblJl Y3RzKEZsb2F0UmVjdChGbG9hdFBvaW50KCksIHZpZXdwb3J0U2l6ZSksIGRlc3RSZWN0KSk7Cisg ICAgICAgICAgICAgICAgY29udGV4dC5jb25jYXRDVE0obWFrZU1hcEJldHdlZW5SZWN0cyhGbG9h dFJlY3QoRmxvYXRQb2ludCgpLCB2aWV3cG9ydFNpemUpLCBkZXN0UmVjdCkpOwogICAgICAgICB9 CiAKICAgICAgICAgQWZmaW5lVHJhbnNmb3JtIGNvbnRlbnRUcmFuc2Zvcm1hdGlvbjsKLSAgICAg ICAgU1ZHUmVuZGVyaW5nQ29udGV4dDo6cmVuZGVyU3VidHJlZVRvSW1hZ2VCdWZmZXIocmVzdWx0 SW1hZ2UsICpyZW5kZXJlciwgY29udGVudFRyYW5zZm9ybWF0aW9uKTsKKyAgICAgICAgU1ZHUmVu ZGVyaW5nQ29udGV4dDo6cmVuZGVyU3VidHJlZVRvQ29udGV4dChjb250ZXh0LCAqcmVuZGVyZXIs IGNvbnRlbnRUcmFuc2Zvcm1hdGlvbik7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBy ZXN1bHRJbWFnZS0+Y29udGV4dCgpLmRyYXdJbWFnZSgqbV9pbWFnZSwgZGVzdFJlY3QsIHNyY1Jl Y3QpOworICAgIGNvbnRleHQuZHJhd0ltYWdlKCptX2ltYWdlLCBkZXN0UmVjdCwgc3JjUmVjdCk7 CiB9CiAKIFRleHRTdHJlYW0mIEZFSW1hZ2U6OmV4dGVybmFsUmVwcmVzZW50YXRpb24oVGV4dFN0 cmVhbSYgdHMsIFJlcHJlc2VudGF0aW9uVHlwZSByZXByZXNlbnRhdGlvbikgY29uc3QK