170245 2017-03-29 10:12:41 -0700 Long Arabic text in ContentEditable with css white-space=pre hangs Safari 2017-04-01 22:39:34 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue mmaxfield simon.fraser zalan oldest_to_newest 1292455 0 zalan 2017-03-29 10:12:41 -0700 rdar://problem/22127615 1292482 1 305760 zalan 2017-03-29 11:03:06 -0700 Created attachment 305760 Patch 1293029 2 305760 mmaxfield 2017-03-30 17:00:09 -0700 Comment on attachment 305760 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=305760&action=review Where's your performance test? > Source/WebCore/rendering/line/BreakingContext.h:798 > + float wrapW = wrapWidthOffset; Can we give this a better name? > Source/WebCore/rendering/line/BreakingContext.h:1065 > + // Measuring complex text with ligature by individual codepoints and by complete words could produce considerably different width values. I'd instead say "Measuring the width of complex text character-by-character, rather than measuring it all together, could produce considerably different width values." > Source/WebCore/rendering/line/BreakingContext.h:1069 > + wrapW = wrapWidthOffset + additionalTempWidth; This doesn't seem right. Shouldn't this get reset from the uncommitted width of the LineWidth object? 1293082 3 zalan 2017-03-30 20:12:47 -0700 (In reply to Myles C. Maxfield from comment #2) > Comment on attachment 305760 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=305760&action=review > > Where's your performance test? https://trac.webkit.org/changeset/214557/webkit > > Source/WebCore/rendering/line/BreakingContext.h:798 > > + float wrapW = wrapWidthOffset; > > Can we give this a better name? Sure. > > > Source/WebCore/rendering/line/BreakingContext.h:1065 > > + // Measuring complex text with ligature by individual codepoints and by complete words could produce considerably different width values. > > I'd instead say "Measuring the width of complex text character-by-character, > rather than measuring it all together, could produce considerably different > width values." ok. > > > Source/WebCore/rendering/line/BreakingContext.h:1069 > > + wrapW = wrapWidthOffset + additionalTempWidth; > > This doesn't seem right. Shouldn't this get reset from the uncommitted width > of the LineWidth object? At this point wrapWidthOffset + additionalTempWidth == uncommitted width, but I agree, using the uncommitted width is a good idea. 1293086 4 zalan 2017-03-30 21:14:58 -0700 > > This doesn't seem right. Shouldn't this get reset from the uncommitted width > > of the LineWidth object? > At this point wrapWidthOffset + additionalTempWidth == uncommitted width, > but I agree, using the uncommitted width is a good idea. Hang on, that's incorrect. 1293478 5 306048 zalan 2017-04-01 12:39:47 -0700 Created attachment 306048 Patch 1293523 6 306048 commit-queue 2017-04-01 22:39:33 -0700 Comment on attachment 306048 Patch Clearing flags on attachment: 306048 Committed r214726: <http://trac.webkit.org/changeset/214726> 1293524 7 commit-queue 2017-04-01 22:39:34 -0700 All reviewed patches have been landed. Closing bug. 305760 2017-03-29 11:03:06 -0700 2017-04-01 12:39:45 -0700 Patch bug-170245-20170329110305.patch text/plain 4277 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjE0NDE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTk4YzNhMjNjNTg2ZmU3 NzA2ZjQwODYwMDM0MzM1OTI5ODFmYmNjNC4uYjI1YzVkNDUzNzA1MWVhMWU5MDQxZTIzM2I4ZjI5 MGFjNmNkZDY1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE3LTAzLTI5ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgTG9uZyBBcmFiaWMgdGV4dCBp biBDb250ZW50RWRpdGFibGUgd2l0aCBjc3Mgd2hpdGUtc3BhY2U9cHJlIGhhbmdzIFNhZmFyaQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcwMjQ1CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2hpbGUgc2Vh cmNoaW5nIGZvciBtaWQtd29yZCBicmVhaywgd2UgbWVhc3VyZSB0aGUgdGV4dCBieSBjb2RlcG9p bnRzIGluIGEgbG9vcCB1bnRpbCB0aGUgYWNjdW11bGF0ZWQgd2lkdGggPiBhdmFpbGFibGUgd2lk dGguCisgICAgICAgIFdoZW4gd2Ugc2VlIHRoYXQgdGhlIGFjY3VtdWxhdGVkIHdpZHRoIGZvciB0 aGUgaW5kaXZpZHVhbCBjb2RlcG9pbnRzIG92ZXJmbG93cywgd2Ugam9pbiB0aGUgY29kZXBvaW50 cyBhbmQgcmUtbWVhc3VyZSB0aGVtLgorICAgICAgICBUaGVzZSAyIHdpZHRocyBjb3VsZCBiZSBj b25zaWRlcmFibHkgZGlmZmVyZW50IGZvciBudW1iZXIgb2YgcmVhc29ucyAobGlnYXR1cmVzIGlz IGEgcHJpbWUgZXhhbXBsZSkuIFdoZW4gd2UgZmlndXJlIHRoYXQKKyAgICAgICAgdGhlIHJ1biBz dGlsbCBmaXRzLCB3ZSBnbyBiYWNrIHRvIHRoZSBtYWluIGxvb3AgKHNpbmNlIHdlIGFyZSBub3Qg c3VwcG9zZWQgdG8gd3JhcCB0aGUgbGluZSBoZXJlKSBhbmQgdGFrZSB0aGUgbmV4dCBjb2RlcG9p bnQuCisgICAgICAgIEhvd2V2ZXIgdGhpcyB0aW1lIHdlIHN0YXJ0IHRoZSBtZWFzdXJlbWVudCBm cm9tIHRoZSBsYXN0IHdoaXRlc3BhY2UsIHNvIHdlIGVuZCB1cCByZW1lYXN1cmluZyBhIHBvdGVu dGlhbGx5IGxvbmcgY2h1Y2sgb2YgdGV4dAorICAgICAgICB1bnRpbCB3ZSBoaXQgdGhlIHdyYXBw aW5nIHBvaW50LiBUaGlzIGlzIHdheSB0b28gZXhwZW5zaXZlLgorICAgICAgICBUaGlzIHBhdGNo IGNoYW5nZXMgdGhlIGxvZ2ljIHNvIHRoYXQgd2UganVzdCBnbyBiYWNrIHRvIG1lYXN1cmluZyBp bmRpdmlkdWFsIGNvZGVwb2ludHMgdW50aWwgd2UgaGl0IHRoZSBjb25zdHJhaW4gYWdhaW4uICAK KworICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgICogcmVuZGVy aW5nL2xpbmUvQnJlYWtpbmdDb250ZXh0Lmg6CisgICAgICAgIChXZWJDb3JlOjpCcmVha2luZ0Nv bnRleHQ6OmhhbmRsZVRleHQpOiBjYW5Vc2VTaW1wbGVGb250Q29kZVBhdGgoKSBpcyBqdXN0IHRv IG1pdGlnYXRlIHRoZSBwb3RlbnRpYWwgcmlzayBvZiByZWdyZXNzaW9uIGFuZAorICAgICAgICBj b21wbGV4IHRleHQgaXMgbW9yZSBsaWtlbHkgdG8gZmFsbCBpbnRvIHRoaXMgY2F0ZWdvcnkuIAor CiAyMDE3LTAzLTI3ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CiAK ICAgICAgICAgSW1wbGVtZW50IGZvcm1hdCBzcGVjaWZpZXIgZm9yIHZhcmlhdGlvbiBmb250cwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL2xpbmUvQnJlYWtpbmdDb250ZXh0 LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbGluZS9CcmVha2luZ0NvbnRleHQuaAppbmRl eCA3ZTIyZmYyZWJkNzRjMmRhYmJhYmJhZjgzZmRkYjgwOWVhMjAxNTU5Li4xMjU1ODBjMWNmOTI2 YTA2OTU2ZjA2Nzc1NzAxOGFhZDM1NGMxOWZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvbGluZS9CcmVha2luZ0NvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvbGluZS9CcmVha2luZ0NvbnRleHQuaApAQCAtNzk0LDcgKzc5NCw4IEBAIGlubGluZSBi b29sIEJyZWFraW5nQ29udGV4dDo6aGFuZGxlVGV4dChXb3JkTWVhc3VyZW1lbnRzJiB3b3JkTWVh c3VyZW1lbnRzLCBib29sCiAgICAgZmxvYXQgbGFzdFNwYWNlV29yZFNwYWNpbmcgPSAwOwogICAg IGZsb2F0IHdvcmRTcGFjaW5nRm9yV29yZE1lYXN1cmVtZW50ID0gMDsKIAotICAgIGZsb2F0IHdy YXBXID0gbV93aWR0aC51bmNvbW1pdHRlZFdpZHRoKCkgKyBpbmxpbmVMb2dpY2FsV2lkdGgobV9j dXJyZW50LnJlbmRlcmVyKCksICFtX2FwcGxpZWRTdGFydFdpZHRoLCB0cnVlKTsKKyAgICBmbG9h dCB3cmFwV2lkdGhPZmZzZXQgPSBtX3dpZHRoLnVuY29tbWl0dGVkV2lkdGgoKSArIGlubGluZUxv Z2ljYWxXaWR0aChtX2N1cnJlbnQucmVuZGVyZXIoKSwgIW1fYXBwbGllZFN0YXJ0V2lkdGgsIHRy dWUpOworICAgIGZsb2F0IHdyYXBXID0gd3JhcFdpZHRoT2Zmc2V0OwogICAgIGZsb2F0IGNoYXJX aWR0aCA9IDA7CiAgICAgYm9vbCBicmVha05CU1AgPSBtX2F1dG9XcmFwICYmIG1fY3VycmVudFN0 eWxlLT5uYnNwTW9kZSgpID09IFNQQUNFOwogICAgIC8vIEF1dG8td3JhcHBpbmcgdGV4dCBzaG91 bGQgd3JhcCBpbiB0aGUgbWlkZGxlIG9mIGEgd29yZCBvbmx5IGlmIGl0IGNvdWxkIG5vdCB3cmFw IGJlZm9yZSB0aGUgd29yZCwKQEAgLTEwMjgsNyArMTAyOSw4IEBAIGlubGluZSBib29sIEJyZWFr aW5nQ29udGV4dDo6aGFuZGxlVGV4dChXb3JkTWVhc3VyZW1lbnRzJiB3b3JkTWVhc3VyZW1lbnRz LCBib29sCiAKICAgICAgICAgICAgIGlmIChtX2F1dG9XcmFwICYmIGJldHdlZW5Xb3Jkcykgewog ICAgICAgICAgICAgICAgIGNvbW1pdExpbmVCcmVha0F0Q3VycmVudFdpZHRoKHJlbmRlck9iamVj dCwgbV9jdXJyZW50Lm9mZnNldCgpLCBtX2N1cnJlbnQubmV4dEJyZWFrYWJsZVBvc2l0aW9uKCkp OwotICAgICAgICAgICAgICAgIHdyYXBXID0gMDsKKyAgICAgICAgICAgICAgICB3cmFwV2lkdGhP ZmZzZXQgPSAwOworICAgICAgICAgICAgICAgIHdyYXBXID0gd3JhcFdpZHRoT2Zmc2V0OwogICAg ICAgICAgICAgICAgIC8vIEF1dG8td3JhcHBpbmcgdGV4dCBzaG91bGQgbm90IHdyYXAgaW4gdGhl IG1pZGRsZSBvZiBhIHdvcmQgb25jZSBpdCBoYXMgaGFkIGFuCiAgICAgICAgICAgICAgICAgLy8g b3Bwb3J0dW5pdHkgdG8gYnJlYWsgYWZ0ZXIgYSB3b3JkLgogICAgICAgICAgICAgICAgIGJyZWFr V29yZHMgPSBmYWxzZTsKQEAgLTEwNjAsNyArMTA2MiwxMiBAQCBpbmxpbmUgYm9vbCBCcmVha2lu Z0NvbnRleHQ6OmhhbmRsZVRleHQoV29yZE1lYXN1cmVtZW50cyYgd29yZE1lYXN1cmVtZW50cywg Ym9vbAogICAgICAgICAgICAgICAgICAgICBtX3RyYWlsaW5nT2JqZWN0cy51cGRhdGVXaGl0ZXNw YWNlQ29sbGFwc2luZ1RyYW5zaXRpb25zRm9yVHJhaWxpbmdCb3hlcyhtX2xpbmVXaGl0ZXNwYWNl Q29sbGFwc2luZ1N0YXRlLCBJbmxpbmVJdGVyYXRvcigpLCBUcmFpbGluZ09iamVjdHM6OkRvTm90 Q29sbGFwc2VGaXJzdFNwYWNlKTsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9Ci0g ICAgICAgICAgICAKKyAgICAgICAgICAgIC8vIE1lYXN1cmluZyBjb21wbGV4IHRleHQgd2l0aCBs aWdhdHVyZSBieSBpbmRpdmlkdWFsIGNvZGVwb2ludHMgYW5kIGJ5IGNvbXBsZXRlIHdvcmRzIGNv dWxkIHByb2R1Y2UgY29uc2lkZXJhYmx5IGRpZmZlcmVudCB3aWR0aCB2YWx1ZXMuCisgICAgICAg ICAgICAvLyBJZiB3ZSBhcmUgbm90IHJlYWxseSBhdCBhIG1pZC13b3JkIGJyZWFrLCBsZXQncyBq dXN0IHJlc2V0IHRoZSBmbGFnIHNvIHRoYXQgd2UgY291bGQgZ28gYmFjayB0byBtZWFzdXJpbmcg aW5kaXZpZHVhbCBjb2RlcG9pbnRzLgorICAgICAgICAgICAgaWYgKCFyZW5kZXJUZXh0LmNhblVz ZVNpbXBsZUZvbnRDb2RlUGF0aCgpICYmIG1pZFdvcmRCcmVhayAmJiBtX3dpZHRoLmZpdHNPbkxp bmUoKSkgeworICAgICAgICAgICAgICAgIG1pZFdvcmRCcmVhayA9IGZhbHNlOworICAgICAgICAg ICAgICAgIHdyYXBXID0gd3JhcFdpZHRoT2Zmc2V0ICsgYWRkaXRpb25hbFRlbXBXaWR0aDsKKyAg ICAgICAgICAgIH0KICAgICAgICAgICAgIGlzTGluZUVtcHR5ID0gbV9saW5lSW5mby5pc0VtcHR5 KCk7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICBpZiAobV9pZ25vcmluZ1NwYWNlcykg ewo= 306048 2017-04-01 12:39:47 -0700 2017-04-01 22:39:33 -0700 Patch bug-170245-20170401123944.patch text/plain 4178 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjE0NzE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzMzODE5MDM1M2ZkYWU0 OTUxNWMxYTM1ZjViNWVkNWM2NWU3ZDE3Ni4uNTFlMjNkZDdhNDg5Nzg4Y2JkOTE2NTE4MmZhMTMw MTIyM2RlNGEyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE3LTA0LTAxICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgTG9uZyBBcmFiaWMgdGV4dCBp biBDb250ZW50RWRpdGFibGUgd2l0aCBjc3Mgd2hpdGUtc3BhY2U9cHJlIGhhbmdzIFNhZmFyaQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcwMjQ1CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTXlsZXMgQy4gTWF4ZmllbGQuCisKKyAgICAgICAgV2hpbGUg c2VhcmNoaW5nIGZvciBtaWQtd29yZCBicmVhaywgd2UgbWVhc3VyZSB0aGUgdGV4dCBieSBjb2Rl cG9pbnRzIGluIGEgbG9vcCB1bnRpbCB0aGUgYWNjdW11bGF0ZWQgd2lkdGggPiBhdmFpbGFibGUg d2lkdGguCisgICAgICAgIFdoZW4gd2Ugc2VlIHRoYXQgdGhlIGFjY3VtdWxhdGVkIHdpZHRoIGZv ciB0aGUgaW5kaXZpZHVhbCBjb2RlcG9pbnRzIG92ZXJmbG93cywgd2Ugam9pbiB0aGUgY29kZXBv aW50cyBhbmQgcmUtbWVhc3VyZSB0aGVtLgorICAgICAgICBUaGVzZSAyIHdpZHRocyBjb3VsZCBi ZSBjb25zaWRlcmFibHkgZGlmZmVyZW50IGZvciBudW1iZXIgb2YgcmVhc29ucyAobGlnYXR1cmVz IGlzIGEgcHJpbWUgZXhhbXBsZSkuIFdoZW4gd2UgZmlndXJlIHRoYXQKKyAgICAgICAgdGhlIHJ1 biBzdGlsbCBmaXRzLCB3ZSBnbyBiYWNrIHRvIHRoZSBtYWluIGxvb3AgKHNpbmNlIHdlIGFyZSBu b3Qgc3VwcG9zZWQgdG8gd3JhcCB0aGUgbGluZSBoZXJlKSBhbmQgdGFrZSB0aGUgbmV4dCBjb2Rl cG9pbnQuCisgICAgICAgIEhvd2V2ZXIgdGhpcyB0aW1lIHdlIHN0YXJ0IHRoZSBtZWFzdXJlbWVu dCBmcm9tIHRoZSBsYXN0IHdoaXRlc3BhY2UsIHNvIHdlIGVuZCB1cCByZW1lYXN1cmluZyBhIHBv dGVudGlhbGx5IGxvbmcgY2h1Y2sgb2YgdGV4dAorICAgICAgICB1bnRpbCB3ZSBoaXQgdGhlIHdy YXBwaW5nIHBvaW50LiBUaGlzIGlzIHdheSB0b28gZXhwZW5zaXZlLgorICAgICAgICBUaGlzIHBh dGNoIGNoYW5nZXMgdGhlIGxvZ2ljIHNvIHRoYXQgd2UganVzdCBnbyBiYWNrIHRvIG1lYXN1cmlu ZyBpbmRpdmlkdWFsIGNvZGVwb2ludHMgdW50aWwgd2UgaGl0IHRoZSBjb25zdHJhaW4gYWdhaW4u ICAKKworICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgICogcmVu ZGVyaW5nL2xpbmUvQnJlYWtpbmdDb250ZXh0Lmg6CisgICAgICAgIChXZWJDb3JlOjpCcmVha2lu Z0NvbnRleHQ6OmhhbmRsZVRleHQpOiBjYW5Vc2VTaW1wbGVGb250Q29kZVBhdGgoKSBpcyBqdXN0 IHRvIG1pdGlnYXRlIHRoZSBwb3RlbnRpYWwgcmlzayBvZiByZWdyZXNzaW9uIGFuZAorICAgICAg ICBjb21wbGV4IHRleHQgaXMgbW9yZSBsaWtlbHkgdG8gZmFsbCBpbnRvIHRoaXMgY2F0ZWdvcnku IAorCiAyMDE3LTA0LTAxICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgogCiAg ICAgICAgIFJvbGxpbmcgYmFjayBodHRwOi8vdHJhYy53ZWJraXQub3JnL3IyMTQ2NjMgLSBtZW1v cnkgY29ycnVwdGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL2xpbmUv QnJlYWtpbmdDb250ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbGluZS9CcmVha2lu Z0NvbnRleHQuaAppbmRleCA3ZTIyZmYyZWJkNzRjMmRhYmJhYmJhZjgzZmRkYjgwOWVhMjAxNTU5 Li43OGYzZmRhNzAzZTdjYzlmOThhNmYwZmI4MTQwOTFlNTQ5Mzk2NzAyIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbGluZS9CcmVha2luZ0NvbnRleHQuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvbGluZS9CcmVha2luZ0NvbnRleHQuaApAQCAtNzk0LDcgKzc5 NCw4IEBAIGlubGluZSBib29sIEJyZWFraW5nQ29udGV4dDo6aGFuZGxlVGV4dChXb3JkTWVhc3Vy ZW1lbnRzJiB3b3JkTWVhc3VyZW1lbnRzLCBib29sCiAgICAgZmxvYXQgbGFzdFNwYWNlV29yZFNw YWNpbmcgPSAwOwogICAgIGZsb2F0IHdvcmRTcGFjaW5nRm9yV29yZE1lYXN1cmVtZW50ID0gMDsK IAotICAgIGZsb2F0IHdyYXBXID0gbV93aWR0aC51bmNvbW1pdHRlZFdpZHRoKCkgKyBpbmxpbmVM b2dpY2FsV2lkdGgobV9jdXJyZW50LnJlbmRlcmVyKCksICFtX2FwcGxpZWRTdGFydFdpZHRoLCB0 cnVlKTsKKyAgICBmbG9hdCB3cmFwV2lkdGhPZmZzZXQgPSBtX3dpZHRoLnVuY29tbWl0dGVkV2lk dGgoKSArIGlubGluZUxvZ2ljYWxXaWR0aChtX2N1cnJlbnQucmVuZGVyZXIoKSwgIW1fYXBwbGll ZFN0YXJ0V2lkdGgsIHRydWUpOworICAgIGZsb2F0IHdyYXBXID0gd3JhcFdpZHRoT2Zmc2V0Owog ICAgIGZsb2F0IGNoYXJXaWR0aCA9IDA7CiAgICAgYm9vbCBicmVha05CU1AgPSBtX2F1dG9XcmFw ICYmIG1fY3VycmVudFN0eWxlLT5uYnNwTW9kZSgpID09IFNQQUNFOwogICAgIC8vIEF1dG8td3Jh cHBpbmcgdGV4dCBzaG91bGQgd3JhcCBpbiB0aGUgbWlkZGxlIG9mIGEgd29yZCBvbmx5IGlmIGl0 IGNvdWxkIG5vdCB3cmFwIGJlZm9yZSB0aGUgd29yZCwKQEAgLTEwMjgsNyArMTAyOSw4IEBAIGlu bGluZSBib29sIEJyZWFraW5nQ29udGV4dDo6aGFuZGxlVGV4dChXb3JkTWVhc3VyZW1lbnRzJiB3 b3JkTWVhc3VyZW1lbnRzLCBib29sCiAKICAgICAgICAgICAgIGlmIChtX2F1dG9XcmFwICYmIGJl dHdlZW5Xb3JkcykgewogICAgICAgICAgICAgICAgIGNvbW1pdExpbmVCcmVha0F0Q3VycmVudFdp ZHRoKHJlbmRlck9iamVjdCwgbV9jdXJyZW50Lm9mZnNldCgpLCBtX2N1cnJlbnQubmV4dEJyZWFr YWJsZVBvc2l0aW9uKCkpOwotICAgICAgICAgICAgICAgIHdyYXBXID0gMDsKKyAgICAgICAgICAg ICAgICB3cmFwV2lkdGhPZmZzZXQgPSAwOworICAgICAgICAgICAgICAgIHdyYXBXID0gd3JhcFdp ZHRoT2Zmc2V0OwogICAgICAgICAgICAgICAgIC8vIEF1dG8td3JhcHBpbmcgdGV4dCBzaG91bGQg bm90IHdyYXAgaW4gdGhlIG1pZGRsZSBvZiBhIHdvcmQgb25jZSBpdCBoYXMgaGFkIGFuCiAgICAg ICAgICAgICAgICAgLy8gb3Bwb3J0dW5pdHkgdG8gYnJlYWsgYWZ0ZXIgYSB3b3JkLgogICAgICAg ICAgICAgICAgIGJyZWFrV29yZHMgPSBmYWxzZTsKQEAgLTEwNjAsNyArMTA2MiwxMiBAQCBpbmxp bmUgYm9vbCBCcmVha2luZ0NvbnRleHQ6OmhhbmRsZVRleHQoV29yZE1lYXN1cmVtZW50cyYgd29y ZE1lYXN1cmVtZW50cywgYm9vbAogICAgICAgICAgICAgICAgICAgICBtX3RyYWlsaW5nT2JqZWN0 cy51cGRhdGVXaGl0ZXNwYWNlQ29sbGFwc2luZ1RyYW5zaXRpb25zRm9yVHJhaWxpbmdCb3hlcyht X2xpbmVXaGl0ZXNwYWNlQ29sbGFwc2luZ1N0YXRlLCBJbmxpbmVJdGVyYXRvcigpLCBUcmFpbGlu Z09iamVjdHM6OkRvTm90Q29sbGFwc2VGaXJzdFNwYWNlKTsKICAgICAgICAgICAgICAgICB9CiAg ICAgICAgICAgICB9Ci0gICAgICAgICAgICAKKyAgICAgICAgICAgIC8vIE1lYXN1cmluZyB0aGUg d2lkdGggb2YgY29tcGxleCB0ZXh0IGNoYXJhY3Rlci1ieS1jaGFyYWN0ZXIsIHJhdGhlciB0aGFu IG1lYXN1cmluZyBpdCBhbGwgdG9nZXRoZXIsCisgICAgICAgICAgICAvLyBjb3VsZCBwcm9kdWNl IGNvbnNpZGVyYWJseSBkaWZmZXJlbnQgd2lkdGggdmFsdWVzLgorICAgICAgICAgICAgaWYgKCFy ZW5kZXJUZXh0LmNhblVzZVNpbXBsZUZvbnRDb2RlUGF0aCgpICYmIG1pZFdvcmRCcmVhayAmJiBt X3dpZHRoLmZpdHNPbkxpbmUoKSkgeworICAgICAgICAgICAgICAgIG1pZFdvcmRCcmVhayA9IGZh bHNlOworICAgICAgICAgICAgICAgIHdyYXBXID0gd3JhcFdpZHRoT2Zmc2V0ICsgYWRkaXRpb25h bFRlbXBXaWR0aDsKKyAgICAgICAgICAgIH0KICAgICAgICAgICAgIGlzTGluZUVtcHR5ID0gbV9s aW5lSW5mby5pc0VtcHR5KCk7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICBpZiAobV9p Z25vcmluZ1NwYWNlcykgewo=