205371 2019-12-17 18:57:31 -0800 [LFC][IFC] LineBreaker::isAtSoftWrapOpportunity should return the wrap position 2019-12-18 07:39:55 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1599665 0 zalan 2019-12-17 18:57:31 -0800 ssia 1599666 1 webkit-bug-importer 2019-12-17 18:57:56 -0800 <rdar://problem/58029811> 1599670 2 385934 zalan 2019-12-17 19:14:40 -0800 Created attachment 385934 Patch 1599671 3 385934 simon.fraser 2019-12-17 19:16:50 -0800 Comment on attachment 385934 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=385934&action=review > Source/WebCore/layout/inlineformatting/InlineLineBreaker.cpp:293 > + return { }; Is this 0 or WTF::nullopt? 1599673 4 zalan 2019-12-17 19:18:06 -0800 (In reply to Simon Fraser (smfr) from comment #3) > Comment on attachment 385934 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=385934&action=review > > > Source/WebCore/layout/inlineformatting/InlineLineBreaker.cpp:293 > > + return { }; > > Is this 0 or WTF::nullopt? it's constructing an Optional<unsigned> object so I'd guess it's WTF::nullopt. 1599793 5 zalan 2019-12-18 07:39:55 -0800 Committed r253682: <https://trac.webkit.org/changeset/253682> 385934 2019-12-17 19:14:40 -0800 2019-12-18 06:59:09 -0800 Patch bug-205371-20191217191440.patch text/plain 9896 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzNjQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGM3MGMyMTQyNzFkZmUz MjNmNjQ2N2RkYjRjZjlmYWFhN2IwMDVjZi4uZTMyNjI5MzE3Zjc0N2YzODI1OThkMTM0Yjk2M2Q1 ZjQwZTY2MDQ1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE5LTEyLTE3ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBMaW5lQnJl YWtlcjo6aXNBdFNvZnRXcmFwT3Bwb3J0dW5pdHkgc2hvdWxkIHJldHVybiB0aGUgd3JhcCBwb3Np dGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA1 MzcxCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81ODAyOTgxMT4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW5hbWUgaXNBdFNvZnRXcmFwT3Bwb3J0 dW5pdHkgdG8gbGFzdFNvZnRXcmFwT3Bwb3J0dW5pdHkgdG8gcmVmbGVjdCB0aGF0IGl0IHJldHVy bnMgdGhlIGxhc3Qgc29mdCB3cmFwCisgICAgICAgIG9wcG9ydHVuaXR5IGluZGV4LgorCisgICAg ICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJyZWFrZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnJlYWtlcjo6Q29udGVudDo6bGFzdFNvZnRXcmFw T3Bwb3J0dW5pdHkpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnJlYWtlcjo6Q29u dGVudDo6YXBwZW5kKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJyZWFrZXI6OkNv bnRlbnQ6OmlzQXRTb2Z0V3JhcE9wcG9ydHVuaXR5KTogRGVsZXRlZC4KKyAgICAgICAgKiBsYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnJlYWtlci5oOgorICAgICAgICAqIGxheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0xpbmVMYXlvdXRDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6TGluZUxheW91dENvbnRleHQ6OnBsYWNlSW5saW5lSXRlbSk6CisKIDIwMTkt MTItMTcgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtJ RkNdIEFkZCBsYXN0SW5saW5lSXRlbVdpdGhDb250ZW50IHRvIExpbmVCcmVha2VyOjpDb250ZW50 Ojppc0F0U29mdFdyYXBPcHBvcnR1bml0eQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJyZWFrZXIuY3BwIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJyZWFrZXIuY3BwCmluZGV4IGIy MGUxYjNjMTg0YTMwNzc2MTlhY2UyNmQxMTZkMTllNDQ2MDdkNjEuLjkxYzIzMWExNWNkZmJhZDIz OTA3OGI1NGM3M2NlMTkxYjAwM2U1YTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCcmVha2VyLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnJlYWtlci5jcHAKQEAgLTI4 MCw3ICsyODAsNyBAQCBzdGF0aWMgYm9vbCBlbmRzV2l0aFNvZnRXcmFwT3Bwb3J0dW5pdHkoY29u c3QgSW5saW5lVGV4dEl0ZW0mIHByZXZpb3VzVGV4dEl0ZW0sCiAgICAgcmV0dXJuICFUZXh0VXRp bDo6ZmluZE5leHRCcmVha2FibGVQb3NpdGlvbihsaW5lQnJlYWtJdGVyYXRvciwgMCwgbmV4dElu bGluZVRleHRJdGVtLnN0eWxlKCkpOwogfQogCi1ib29sIExpbmVCcmVha2VyOjpDb250ZW50Ojpp c0F0U29mdFdyYXBPcHBvcnR1bml0eShjb25zdCBJbmxpbmVJdGVtJiBpbmxpbmVJdGVtLCBjb25z dCBDb250ZW50JiBwcmlvckNvbnRlbnQpCitPcHRpb25hbDx1bnNpZ25lZD4gTGluZUJyZWFrZXI6 OkNvbnRlbnQ6Omxhc3RTb2Z0V3JhcE9wcG9ydHVuaXR5KGNvbnN0IElubGluZUl0ZW0mIGlubGlu ZUl0ZW0sIGNvbnN0IENvbnRlbnQmIHByaW9yQ29udGVudCkKIHsKICAgICAvLyBodHRwczovL2Ry YWZ0cy5jc3N3Zy5vcmcvY3NzLXRleHQtMy8jbGluZS1icmVhay1kZXRhaWxzCiAgICAgLy8gRmln dXJlIG91dCBpZiB0aGUgbmV3IGluY29taW5nIGNvbnRlbnQgcHV0cyB0aGUgdW5jb21taXR0ZWQg Y29udGVudCBvbiBhIHNvZnQgd3JhcCBvcHBvcnR1bml0eS4KQEAgLTI5MCw3ICsyOTAsNyBAQCBi b29sIExpbmVCcmVha2VyOjpDb250ZW50Ojppc0F0U29mdFdyYXBPcHBvcnR1bml0eShjb25zdCBJ bmxpbmVJdGVtJiBpbmxpbmVJdGVtLAogICAgIEFTU0VSVCghaW5saW5lSXRlbS5pc0Zsb2F0KCkg JiYgIWlubGluZUl0ZW0uaXNMaW5lQnJlYWsoKSk7CiAgICAgaWYgKHByaW9yQ29udGVudC5pc0Vt cHR5KCkpIHsKICAgICAgICAgLy8gQ2FuJ3QgZGVjaWRlIGl0IHlldC4KLSAgICAgICAgcmV0dXJu IGZhbHNlOworICAgICAgICByZXR1cm4geyB9OwogICAgIH0KIAogICAgIGF1dG8gbGFzdElubGlu ZUl0ZW1XaXRoQ29udGVudCA9IFsmXSAoKSAtPiBjb25zdCBJbmxpbmVJdGVtKiB7CkBAIC0zMTEs NyArMzExLDcgQEAgYm9vbCBMaW5lQnJlYWtlcjo6Q29udGVudDo6aXNBdFNvZnRXcmFwT3Bwb3J0 dW5pdHkoY29uc3QgSW5saW5lSXRlbSYgaW5saW5lSXRlbSwKICAgICAgICAgaWYgKGlubGluZUl0 ZW0uc3R5bGUoKS5saW5lQnJlYWsoKSA9PSBMaW5lQnJlYWs6OkFueXdoZXJlKSB7CiAgICAgICAg ICAgICAvLyBUaGVyZSBpcyBhIHNvZnQgd3JhcCBvcHBvcnR1bml0eSBhcm91bmQgZXZlcnkgdHlw b2dyYXBoaWMgY2hhcmFjdGVyIHVuaXQsIGluY2x1ZGluZyBhcm91bmQgYW55IHB1bmN0dWF0aW9u IGNoYXJhY3RlcgogICAgICAgICAgICAgLy8gb3IgcHJlc2VydmVkIHdoaXRlIHNwYWNlcywgb3Ig aW4gdGhlIG1pZGRsZSBvZiB3b3Jkcy4KLSAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAg ICAgICAgcmV0dXJuIHByaW9yQ29udGVudC5zaXplKCk7CiAgICAgICAgIH0KICAgICAgICAgaWYg KGRvd25jYXN0PElubGluZVRleHRJdGVtPihpbmxpbmVJdGVtKS5pc1doaXRlc3BhY2UoKSkgewog ICAgICAgICAgICAgLy8gW3ByaW9yIGNvbnRlbnRdWyBdICg8c3Bhbj5zb21lX2NvbnRlbnQ8L3Nw YW4+ICkKQEAgLTMyMCwxMSArMzIwLDExIEBAIGJvb2wgTGluZUJyZWFrZXI6OkNvbnRlbnQ6Omlz QXRTb2Z0V3JhcE9wcG9ydHVuaXR5KGNvbnN0IElubGluZUl0ZW0mIGlubGluZUl0ZW0sCiAgICAg ICAgICAgICAvLyBbIF1bIF0gOiBhZGphY2VudCB3aGl0ZXNwYWNlIGNvbnRlbnQgaGFzIHNvZnQg d3JhcCBvcHBvcnR1bml0eS4KICAgICAgICAgICAgIGlmIChsYXN0VW5jb21pdHRlZENvbnRlbnQt PmlzVGV4dCgpICYmIGRvd25jYXN0PElubGluZVRleHRJdGVtPigqbGFzdFVuY29taXR0ZWRDb250 ZW50KS5pc1doaXRlc3BhY2UoKSkKICAgICAgICAgICAgICAgICBpc0F0U29mdFdyYXBPcHBvcnR1 bml0eUJlZm9yZVdoaXRlc3BhY2UgPSB0cnVlOwotICAgICAgICAgICAgcmV0dXJuIGlzQXRTb2Z0 V3JhcE9wcG9ydHVuaXR5QmVmb3JlV2hpdGVzcGFjZTsKKyAgICAgICAgICAgIHJldHVybiBpc0F0 U29mdFdyYXBPcHBvcnR1bml0eUJlZm9yZVdoaXRlc3BhY2UgPyBtYWtlT3B0aW9uYWwocHJpb3JD b250ZW50LnNpemUoKSkgOiBXVEY6Om51bGxvcHQ7CiAgICAgICAgIH0KICAgICAgICAgaWYgKGxh c3RVbmNvbWl0dGVkQ29udGVudC0+aXNDb250YWluZXJTdGFydCgpKSB7CiAgICAgICAgICAgICAv LyBbY29udGFpbmVyIHN0YXJ0XVt0ZXh0XSAoPHNwYW4+dGV4dCkgOiB0aGUgW2NvbnRhaW5lciBz dGFydF0gYW5kIHRoZSBbdGV4dF0gY29udGVudCBmb3JtIGEgY29udGludW91cyBjb250ZW50Lgot ICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICAgICAgcmV0dXJuIHsgfTsKICAgICAg ICAgfQogICAgICAgICBpZiAobGFzdFVuY29taXR0ZWRDb250ZW50LT5pc0NvbnRhaW5lckVuZCgp KSB7CiAgICAgICAgICAgICAvLyBbY29udGFpbmVyIGVuZF1bdGV4dF0gKDwvc3Bhbj50ZXh0KQpA QCAtMzM1LDMzICszMzUsMzQgQEAgYm9vbCBMaW5lQnJlYWtlcjo6Q29udGVudDo6aXNBdFNvZnRX cmFwT3Bwb3J0dW5pdHkoY29uc3QgSW5saW5lSXRlbSYgaW5saW5lSXRlbSwKICAgICAgICAgICAg IGxhc3RVbmNvbWl0dGVkQ29udGVudCA9IGxhc3RJbmxpbmVJdGVtV2l0aENvbnRlbnQoKTsKICAg ICAgICAgICAgIGlmICghbGFzdFVuY29taXR0ZWRDb250ZW50KSB7CiAgICAgICAgICAgICAgICAg Ly8gRGlkIG5vdCBmaW5kIGFueSBjb250ZW50IGF0IGFsbCAoZS5nLiBbY29udGFpbmVyIHN0YXJ0 XVtjb250YWluZXIgZW5kXVt0ZXh0XSAoPHNwYW4+PC9zcGFuPnRleHQpKS4KLSAgICAgICAgICAg ICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgICAgICAgICAgcmV0dXJuIHsgfTsKICAgICAgICAg ICAgIH0KICAgICAgICAgfQogICAgICAgICBpZiAobGFzdFVuY29taXR0ZWRDb250ZW50LT5pc1Rl eHQoKSkgewogICAgICAgICAgICAgLy8gW3RleHRdW3RleHRdIDogaXMgYSBjb250aW51b3VzIGNv bnRlbnQuCiAgICAgICAgICAgICAvLyBbdGV4dC1dW3RleHRdIDogYWZ0ZXIgW2h5cGhlbl0gcG9z aXRpb24gaXMgYSBzb2Z0IHdyYXAgb3Bwb3J0dW5pdHkuCiAgICAgICAgICAgICAvLyBbIF1bdGV4 dF0gOiBhZnRlciBbd2hpdGVzcGFjZV0gcG9zaXRpb24gaXMgYSBzb2Z0IHdyYXAgb3Bwb3J0dW5p dHkuCi0gICAgICAgICAgICByZXR1cm4gZW5kc1dpdGhTb2Z0V3JhcE9wcG9ydHVuaXR5KGRvd25j YXN0PElubGluZVRleHRJdGVtPigqbGFzdFVuY29taXR0ZWRDb250ZW50KSwgZG93bmNhc3Q8SW5s aW5lVGV4dEl0ZW0+KGlubGluZUl0ZW0pKTsKKyAgICAgICAgICAgIGF1dG8gbGFzdFVuY29taXR0 ZWRFbmRzV2l0aFNvZnRXcmFwT3Bwb3J0dW5pdHkgPSBlbmRzV2l0aFNvZnRXcmFwT3Bwb3J0dW5p dHkoZG93bmNhc3Q8SW5saW5lVGV4dEl0ZW0+KCpsYXN0VW5jb21pdHRlZENvbnRlbnQpLCBkb3du Y2FzdDxJbmxpbmVUZXh0SXRlbT4oaW5saW5lSXRlbSkpOworICAgICAgICAgICAgcmV0dXJuIGxh c3RVbmNvbWl0dGVkRW5kc1dpdGhTb2Z0V3JhcE9wcG9ydHVuaXR5ID8gbWFrZU9wdGlvbmFsKHBy aW9yQ29udGVudC5zaXplKCkpIDogV1RGOjpudWxsb3B0OwogICAgICAgICB9CiAgICAgICAgIGlm IChsYXN0VW5jb21pdHRlZENvbnRlbnQtPmlzQm94KCkpIHsKICAgICAgICAgICAgIC8vIFtpbmxp bmUgYm94XVt0ZXh0XSAoPGltZz50ZXh0KSA6IGFmdGVyIFtpbmxpbmUgYm94XSBwb3NpdGlvbiBp cyBhIHNvZnQgd3JhcCBvcHBvcnR1bml0eS4KLSAgICAgICAgICAgIHJldHVybiB0cnVlOworICAg ICAgICAgICAgcmV0dXJuIHByaW9yQ29udGVudC5zaXplKCk7CiAgICAgICAgIH0KICAgICAgICAg QVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgfQogICAgIGlmIChpbmxpbmVJdGVtLmlzQm94KCkp IHsKICAgICAgICAgaWYgKGxhc3RVbmNvbWl0dGVkQ29udGVudC0+aXNDb250YWluZXJTdGFydCgp KSB7CiAgICAgICAgICAgICAvLyBbY29udGFpbmVyIHN0YXJ0XVtpbmxpbmUgYm94XSAoPHNwYW0+ PGltZz4pIDogdGhlIFtjb250YWluZXIgc3RhcnRdIGFuZCB0aGUgW2lubGluZSBib3hdIGZvcm0g YSBjb250aW51b3VzIGNvbnRlbnQuCi0gICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAg ICAgICByZXR1cm4geyB9OwogICAgICAgICB9CiAgICAgICAgIGlmIChsYXN0VW5jb21pdHRlZENv bnRlbnQtPmlzQ29udGFpbmVyRW5kKCkpIHsKICAgICAgICAgICAgIC8vIFtjb250YWluZXIgZW5k XVtpbmxpbmUgYm94XSAoPC9zcGFuPjxpbWc+KSA6IGFmdGVyIFtjb250YWluZXIgZW5kXSBwb3Np dGlvbiBpcyBhIHNvZnQgd3JhcCBvcHBvcnR1bml0eS4KLSAgICAgICAgICAgIHJldHVybiB0cnVl OworICAgICAgICAgICAgcmV0dXJuIHByaW9yQ29udGVudC5zaXplKCk7CiAgICAgICAgIH0KICAg ICAgICAgaWYgKGxhc3RVbmNvbWl0dGVkQ29udGVudC0+aXNUZXh0KCkgfHwgbGFzdFVuY29taXR0 ZWRDb250ZW50LT5pc0JveCgpKSB7CiAgICAgICAgICAgICAvLyBbaW5saW5lIGJveF1bdGV4dF0g KDxpbWc+dGV4dCkgYW5kIFtpbmxpbmUgYm94XVtpbmxpbmUgYm94XSAoPGltZz48aW1nPikgOiBh ZnRlciBmaXJzdCBbaW5saW5lIGJveF0gcG9zaXRpb24gaXMgYSBzb2Z0IHdyYXAgb3Bwb3J0dW5p dHkuCi0gICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgICAgIHJldHVybiBwcmlvckNv bnRlbnQuc2l6ZSgpOwogICAgICAgICB9CiAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwog ICAgIH0KQEAgLTM3MCwxNyArMzcxLDE3IEBAIGJvb2wgTGluZUJyZWFrZXI6OkNvbnRlbnQ6Omlz QXRTb2Z0V3JhcE9wcG9ydHVuaXR5KGNvbnN0IElubGluZUl0ZW0mIGlubGluZUl0ZW0sCiAgICAg ICAgIGlmIChsYXN0VW5jb21pdHRlZENvbnRlbnQtPmlzQ29udGFpbmVyU3RhcnQoKSB8fCBsYXN0 VW5jb21pdHRlZENvbnRlbnQtPmlzQ29udGFpbmVyRW5kKCkpIHsKICAgICAgICAgICAgIC8vIFtj b250YWluZXIgc3RhcnRdW2NvbnRhaW5lciBlbmRdICg8c3Bhbj48c3Bhbj4pIG9yCiAgICAgICAg ICAgICAvLyBbY29udGFpbmVyIGVuZF1bY29udGFpbmVyIHN0YXJ0XSAoPC9zcGFuPjxzcGFuPikg OiBuZWVkIG1vcmUgY29udGVudCB0byBkZWNpZGUuCi0gICAgICAgICAgICByZXR1cm4gZmFsc2U7 CisgICAgICAgICAgICByZXR1cm4geyB9OwogICAgICAgICB9CiAgICAgICAgIGlmIChsYXN0VW5j b21pdHRlZENvbnRlbnQtPmlzVGV4dCgpKSB7CiAgICAgICAgICAgICAvLyBbIF1bY29udGFpbmVy IHN0YXJ0XSAoIDxzcGFuPikgOiBhZnRlciBbd2hpdGVzcGFjZV0gcG9zaXRpb24gaXMgYSBzb2Z0 IHdyYXAgb3Bwb3J0dW5pdHkuCiAgICAgICAgICAgICAvLyBbdGV4dF1bY29udGFpbmVyIHN0YXJ0 XSAodGV4dDxzcGFuPikgOiBOZWVkIG1vcmUgY29udGVudCB0byBkZWNpZGUgKGUuZy4gdGV4dDxz cGFuPnRleHQgdnMuIHRleHQ8c3Bhbj48aW1nPikuCi0gICAgICAgICAgICByZXR1cm4gZG93bmNh c3Q8SW5saW5lVGV4dEl0ZW0+KCpsYXN0VW5jb21pdHRlZENvbnRlbnQpLmlzV2hpdGVzcGFjZSgp OworICAgICAgICAgICAgcmV0dXJuIGRvd25jYXN0PElubGluZVRleHRJdGVtPigqbGFzdFVuY29t aXR0ZWRDb250ZW50KS5pc1doaXRlc3BhY2UoKSA/IG1ha2VPcHRpb25hbChwcmlvckNvbnRlbnQu c2l6ZSgpKSA6IFdURjo6bnVsbG9wdDsKICAgICAgICAgfQogICAgICAgICBpZiAobGFzdFVuY29t aXR0ZWRDb250ZW50LT5pc0JveCgpKSB7CiAgICAgICAgICAgICAvLyBbaW5saW5lIGJveF1bY29u dGFpbmVyIHN0YXJ0XSAoPGltZz48c3Bhbj4pIDogYWZ0ZXIgW2lubGluZSBib3hdIHBvc2l0aW9u IGlzIGEgc29mdCB3cmFwIG9wcG9ydHVuaXR5LgogICAgICAgICAgICAgLy8gW2lubGluZSBib3hd W2NvbnRhaW5lciBlbmRdICg8aW1nPjwvc3Bhbj4pIDogdGhlIFtpbmxpbmUgYm94XSBhbmQgdGhl IFtjb250YWluZXIgZW5kXSBmb3JtIGEgY29udGludW91cyBjb250ZW50LgotICAgICAgICAgICAg cmV0dXJuIGlubGluZUl0ZW0uaXNDb250YWluZXJTdGFydCgpOworICAgICAgICAgICAgcmV0dXJu IGlubGluZUl0ZW0uaXNDb250YWluZXJTdGFydCgpID8gbWFrZU9wdGlvbmFsKHByaW9yQ29udGVu dC5zaXplKCkpIDogV1RGOjpudWxsb3B0OwogICAgICAgICB9CiAgICAgICAgIEFTU0VSVF9OT1Rf UkVBQ0hFRCgpOwogICAgIH0KQEAgLTM5MSw3ICszOTIsNiBAQCBib29sIExpbmVCcmVha2VyOjpD b250ZW50Ojppc0F0U29mdFdyYXBPcHBvcnR1bml0eShjb25zdCBJbmxpbmVJdGVtJiBpbmxpbmVJ dGVtLAogdm9pZCBMaW5lQnJlYWtlcjo6Q29udGVudDo6YXBwZW5kKGNvbnN0IElubGluZUl0ZW0m IGlubGluZUl0ZW0sIElubGluZUxheW91dFVuaXQgbG9naWNhbFdpZHRoKQogewogICAgIEFTU0VS VCghaW5saW5lSXRlbS5pc0Zsb2F0KCkpOwotICAgIEFTU0VSVChpbmxpbmVJdGVtLmlzTGluZUJy ZWFrKCkgfHwgIWlzQXRTb2Z0V3JhcE9wcG9ydHVuaXR5KGlubGluZUl0ZW0sICp0aGlzKSk7CiAg ICAgbV9jb250aW5vdXNSdW5zLmFwcGVuZCh7IGlubGluZUl0ZW0sIGxvZ2ljYWxXaWR0aCB9KTsK ICAgICBtX3dpZHRoICs9IGxvZ2ljYWxXaWR0aDsKICAgICAvLyBGaWd1cmUgb3V0IHRoZSB0cmFp bGluZyBjb2xsYXBzaWJsZSBzdGF0ZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCcmVha2VyLmggYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnJlYWtlci5oCmluZGV4IDQ4ZWJhNmQ3 NDBkMTQ2NTU4YzYzOTQxNWU3ZDk1N2MwOGY3NDM4MGYuLjZkN2JjZjU5NzRmM2VkNGY0MzRhMjE5 YjA4YjQ4ODc5NTMwMDhmMmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUxpbmVCcmVha2VyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJyZWFrZXIuaApAQCAtNzAsNyArNzAsNyBA QCBwdWJsaWM6CiAgICAgICAgIHZvaWQgcmVzZXQoKTsKICAgICAgICAgdm9pZCBzaHJpbmsodW5z aWduZWQgbmV3U2l6ZSk7CiAKLSAgICAgICAgc3RhdGljIGJvb2wgaXNBdFNvZnRXcmFwT3Bwb3J0 dW5pdHkoY29uc3QgSW5saW5lSXRlbSYsIGNvbnN0IENvbnRlbnQmIHByaW9yQ29udGVudCk7Cisg ICAgICAgIHN0YXRpYyBPcHRpb25hbDx1bnNpZ25lZD4gbGFzdFNvZnRXcmFwT3Bwb3J0dW5pdHko Y29uc3QgSW5saW5lSXRlbSYsIGNvbnN0IENvbnRlbnQmIHByaW9yQ29udGVudCk7CiAKICAgICAg ICAgc3RydWN0IFJ1biB7CiAgICAgICAgICAgICBjb25zdCBJbmxpbmVJdGVtJiBpbmxpbmVJdGVt OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvTGlu ZUxheW91dENvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRp bmcvTGluZUxheW91dENvbnRleHQuY3BwCmluZGV4IGZiY2YxNWFhODliNGJjZWY0YWZmOGY5MjIy ZWJmOTY3YTk4OGQ4OTQuLmU2YmIzMzFiY2UxNjI4ODBkMzA5NDE0YmJhODAzZTgwY2FjNTRmYmMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0xpbmVM YXlvdXRDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0 dGluZy9MaW5lTGF5b3V0Q29udGV4dC5jcHAKQEAgLTE4Niw3ICsxODYsNyBAQCBMaW5lTGF5b3V0 Q29udGV4dDo6SXNFbmRPZkxpbmUgTGluZUxheW91dENvbnRleHQ6OnBsYWNlSW5saW5lSXRlbShM aW5lQnVpbGRlciYgbAogICAgIH0KICAgICBhdXRvIGlzRW5kT2ZMaW5lID0gSXNFbmRPZkxpbmU6 Ok5vOwogICAgIC8vIENhbiB3ZSBjb21taXQgdGhlIHBlbmRpbmcgY29udGVudCBhbHJlYWR5Pwot ICAgIGlmIChMaW5lQnJlYWtlcjo6Q29udGVudDo6aXNBdFNvZnRXcmFwT3Bwb3J0dW5pdHkoaW5s aW5lSXRlbSwgbV91bmNvbW1pdHRlZENvbnRlbnQpKQorICAgIGlmIChMaW5lQnJlYWtlcjo6Q29u dGVudDo6bGFzdFNvZnRXcmFwT3Bwb3J0dW5pdHkoaW5saW5lSXRlbSwgbV91bmNvbW1pdHRlZENv bnRlbnQpKQogICAgICAgICBpc0VuZE9mTGluZSA9IHByb2Nlc3NVbmNvbW1pdHRlZENvbnRlbnQo bGluZSk7CiAgICAgLy8gVGhlIGN1cnJlbnQgaXRlbSBtaWdodCBmaXQgYXMgd2VsbC4KICAgICBp ZiAoaXNFbmRPZkxpbmUgPT0gSXNFbmRPZkxpbmU6Ok5vKQo=