260438 2023-08-19 20:19:37 -0700 [IFC] TextOnlySimpleLineBuilder::placeNonWrappingInlineTextContent should use CandidateTextContent 2023-08-21 05:06:13 -0700 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 1972263 0 zalan 2023-08-19 20:19:37 -0700 ssia 1972264 1 467345 zalan 2023-08-19 20:23:48 -0700 Created attachment 467345 Patch 1972327 2 467356 zalan 2023-08-20 21:02:07 -0700 Created attachment 467356 [fast-cq]Patch 1972350 3 ews-feeder 2023-08-21 05:05:24 -0700 Committed 267085@main (3defc11c5fe7): <https://commits.webkit.org/267085@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 467356. 1972351 4 webkit-bug-importer 2023-08-21 05:06:13 -0700 <rdar://problem/114188310> 467345 2023-08-19 20:23:48 -0700 2023-08-20 21:02:04 -0700 Patch bug-260438-20230819202347.patch text/plain 7726 zalan RnJvbSAxMDIwY2Q1OGY2MDZkZjJjOGZlMzU4OGYxNDk5NDNlOGRiOTcxNmE2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFNhdCwgMTkgQXVnIDIwMjMgMjA6MjE6MzkgLTA3MDAKU3ViamVjdDogW1BBVENIXSBbSUZDXQog VGV4dE9ubHlTaW1wbGVMaW5lQnVpbGRlcjo6cGxhY2VOb25XcmFwcGluZ0lubGluZVRleHRDb250 ZW50IHNob3VsZCB1c2UKIENhbmRpZGF0ZVRleHRDb250ZW50IGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yNjA0MzgKClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoK TGV0J3MgdXNlIHRoZSBmYXN0IGNvZGVwYXRoICh3aGVyZSB3ZSBkaXJlY3RseSBjb21taXQgdG8g bGluZSkgZm9yIG5vbi13cmFwcGluZyBjb250ZW50LgoKKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQv Zm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9UZXh0T25seVNpbXBsZUxpbmVCdWlsZGVyLmNwcDoK KFdlYkNvcmU6OkxheW91dDo6VGV4dE9ubHlTaW1wbGVMaW5lQnVpbGRlcjo6cGxhY2VOb25XcmFw cGluZ0lubGluZVRleHRDb250ZW50KToKKFdlYkNvcmU6OkxheW91dDo6VGV4dE9ubHlTaW1wbGVM aW5lQnVpbGRlcjo6Y29tbWl0Q2FuZGlkYXRlQ29udGVudCk6CihXZWJDb3JlOjpMYXlvdXQ6OmFw cGVuZElubGluZVRleHRJdGVtKTogRGVsZXRlZC4KLS0tCiAuLi4vaW5saW5lL1RleHRPbmx5U2lt cGxlTGluZUJ1aWxkZXIuY3BwICAgICAgfCA1NSArKysrKysrKystLS0tLS0tLS0tCiAxIGZpbGUg Y2hhbmdlZCwgMjUgaW5zZXJ0aW9ucygrKSwgMzAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvVGV4dE9ubHlT aW1wbGVMaW5lQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0Nv bnRleHRzL2lubGluZS9UZXh0T25seVNpbXBsZUxpbmVCdWlsZGVyLmNwcAppbmRleCBmOTA3NjU4 YjczM2QuLjU1MTEwZjMwNzU2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zv cm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvVGV4dE9ubHlTaW1wbGVMaW5lQnVpbGRlci5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvVGV4dE9u bHlTaW1wbGVMaW5lQnVpbGRlci5jcHAKQEAgLTcxLDE2ICs3MSw2IEBAIHN0YXRpYyBpbmxpbmUg Ym9vbCBpc0xhc3RMaW5lV2l0aElubGluZUNvbnRlbnQoSW5saW5lSXRlbVBvc2l0aW9uIHBsYWNl ZENvbnRlbnRFCiAgICAgcmV0dXJuIHBsYWNlZENvbnRlbnRFbmQuaW5kZXggPT0gbGF5b3V0UmFu Z2VFbmRJbmRleCAmJiAhcGxhY2VkQ29udGVudEVuZC5vZmZzZXQ7CiB9CiAKLXN0YXRpYyBpbmxp bmUgdm9pZCBhcHBlbmRJbmxpbmVUZXh0SXRlbShjb25zdCBJbmxpbmVUZXh0SXRlbSYgaW5saW5l VGV4dEl0ZW0sIGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSwgY29uc3QgTGluZSYgbGluZSwgSW5s aW5lQ29udGVudEJyZWFrZXI6OkNvbnRpbnVvdXNDb250ZW50JiBjYW5kaWRhdGVDb250ZW50KQot ewotICAgIGF1dG8gdGV4dENvbnRlbnRsV2lkdGggPSBbJl0gewotICAgICAgICBpZiAoYXV0byB0 ZXh0V2lkdGggPSBpbmxpbmVUZXh0SXRlbS53aWR0aCgpKQotICAgICAgICAgICAgcmV0dXJuICp0 ZXh0V2lkdGg7Ci0gICAgICAgIHJldHVybiBtZWFzdXJlZElubGluZVRleHRJdGVtKGlubGluZVRl eHRJdGVtLCBzdHlsZSwgbGluZS5jb250ZW50TG9naWNhbFJpZ2h0KCkgKyBjYW5kaWRhdGVDb250 ZW50LmxvZ2ljYWxXaWR0aCgpKTsKLSAgICB9OwotICAgIGNhbmRpZGF0ZUNvbnRlbnQuYXBwZW5k VGV4dENvbnRlbnQoaW5saW5lVGV4dEl0ZW0sIHN0eWxlLCB0ZXh0Q29udGVudGxXaWR0aCgpKTsK LX0KLQogc3RhdGljIGlubGluZSBib29sIGNvbnN1bWVUcmFpbGluZ0xpbmVCcmVha0lmQXBwbGlj YWJsZShjb25zdCBUZXh0T25seUxpbmVCcmVha1Jlc3VsdCYgcmVzdWx0LCBzaXplX3QgdHJhaWxp bmdJbmxpbmVJdGVtSW5kZXgsIHNpemVfdCBsYXlvdXRSYW5nZUVuZCwgTGluZSYgbGluZSwgY29u c3QgSW5saW5lSXRlbXMmIGlubGluZUl0ZW1zKQogewogICAgIC8vIFRyYWlsaW5nIGZvcmNlZCBs aW5lIGJyZWFrIHNob3VsZCBiZSBjb25zdW1lZCBhZnRlciBmdWxseSBwbGFjZWQgY29udGVudC4K QEAgLTIyMCwzNSArMjEwLDM2IEBAIElubGluZUl0ZW1Qb3NpdGlvbiBUZXh0T25seVNpbXBsZUxp bmVCdWlsZGVyOjpwbGFjZUlubGluZVRleHRDb250ZW50KGNvbnN0IElubGluCiBJbmxpbmVJdGVt UG9zaXRpb24gVGV4dE9ubHlTaW1wbGVMaW5lQnVpbGRlcjo6cGxhY2VOb25XcmFwcGluZ0lubGlu ZVRleHRDb250ZW50KGNvbnN0IElubGluZUl0ZW1SYW5nZSYgbGF5b3V0UmFuZ2UpCiB7CiAgICAg QVNTRVJUKCFUZXh0VXRpbDo6aXNXcmFwcGluZ0FsbG93ZWQocm9vdCgpLnN0eWxlKCkpKTsKKyAg ICBBU1NFUlQoIW1fcGFydGlhbExlYWRpbmdUZXh0SXRlbSk7CiAKLSAgICBhdXRvIGNhbmRpZGF0 ZUNvbnRlbnQgPSBJbmxpbmVDb250ZW50QnJlYWtlcjo6Q29udGludW91c0NvbnRlbnQgeyB9Owor ICAgIGF1dG8gY2FuZGlkYXRlQ29udGVudCA9IENhbmRpZGF0ZVRleHRDb250ZW50IHsgbGF5b3V0 UmFuZ2Uuc3RhcnRJbmRleCgpLCBsYXlvdXRSYW5nZS5zdGFydEluZGV4KCksIHsgfSB9OwogICAg IGF1dG8mIHJvb3RTdHlsZSA9ICFpc0ZpcnN0Rm9ybWF0dGVkTGluZSgpID8gcm9vdCgpLnN0eWxl KCkgOiByb290KCkuZmlyc3RMaW5lU3R5bGUoKTsKICAgICBhdXRvIGlzRW5kT2ZMaW5lID0gZmFs c2U7CiAgICAgYXV0byB0cmFpbGluZ0xpbmVCcmVha0luZGV4ID0gc3RkOjpvcHRpb25hbDxzaXpl X3Q+IHsgfTsKICAgICBhdXRvIG5leHRJdGVtSW5kZXggPSBsYXlvdXRSYW5nZS5zdGFydEluZGV4 KCk7CiAKLSAgICBpZiAobV9wYXJ0aWFsTGVhZGluZ1RleHRJdGVtKSB7Ci0gICAgICAgIGFwcGVu ZElubGluZVRleHRJdGVtKCptX3BhcnRpYWxMZWFkaW5nVGV4dEl0ZW0sIHJvb3RTdHlsZSwgbV9s aW5lLCBjYW5kaWRhdGVDb250ZW50KTsKLSAgICAgICAgKytuZXh0SXRlbUluZGV4OwotICAgICAg ICBpc0VuZE9mTGluZSA9IG5leHRJdGVtSW5kZXggPj0gbGF5b3V0UmFuZ2UuZW5kSW5kZXgoKTsK LSAgICB9CiAgICAgd2hpbGUgKCFpc0VuZE9mTGluZSkgewogICAgICAgICBhdXRvJiBpbmxpbmVJ dGVtID0gbV9pbmxpbmVJdGVtc1tuZXh0SXRlbUluZGV4XTsKICAgICAgICAgQVNTRVJUKGlubGlu ZUl0ZW0uaXNUZXh0KCkgfHwgaW5saW5lSXRlbS5pc0xpbmVCcmVhaygpKTsKLSAgICAgICAgaWYg KGlubGluZUl0ZW0uaXNUZXh0KCkpCi0gICAgICAgICAgICBhcHBlbmRJbmxpbmVUZXh0SXRlbShk b3duY2FzdDxJbmxpbmVUZXh0SXRlbT4oaW5saW5lSXRlbSksIHJvb3RTdHlsZSwgbV9saW5lLCBj YW5kaWRhdGVDb250ZW50KTsKLSAgICAgICAgZWxzZSBpZiAoaW5saW5lSXRlbS5pc0xpbmVCcmVh aygpKQorICAgICAgICBpZiAoaW5saW5lSXRlbS5pc1RleHQoKSkgeworICAgICAgICAgICAgYXV0 byBjb250ZW50V2lkdGggPSBbJl0geworICAgICAgICAgICAgICAgIGlmIChhdXRvIGxvZ2ljYWxX aWR0aCA9IGRvd25jYXN0PElubGluZVRleHRJdGVtPihpbmxpbmVJdGVtKS53aWR0aCgpKQorICAg ICAgICAgICAgICAgICAgICByZXR1cm4gKmxvZ2ljYWxXaWR0aDsKKyAgICAgICAgICAgICAgICBy ZXR1cm4gbWVhc3VyZWRJbmxpbmVUZXh0SXRlbShkb3duY2FzdDxJbmxpbmVUZXh0SXRlbT4oaW5s aW5lSXRlbSksIHJvb3RTdHlsZSwgY2FuZGlkYXRlQ29udGVudC5sb2dpY2FsV2lkdGgpOworICAg ICAgICAgICAgfTsKKyAgICAgICAgICAgIGNhbmRpZGF0ZUNvbnRlbnQuYXBwZW5kKGNvbnRlbnRX aWR0aCgpKTsKKyAgICAgICAgfSBlbHNlIGlmIChpbmxpbmVJdGVtLmlzTGluZUJyZWFrKCkpCiAg ICAgICAgICAgICB0cmFpbGluZ0xpbmVCcmVha0luZGV4ID0gbmV4dEl0ZW1JbmRleDsKICAgICAg ICAgKytuZXh0SXRlbUluZGV4OwogICAgICAgICBpc0VuZE9mTGluZSA9IG5leHRJdGVtSW5kZXgg Pj0gbGF5b3V0UmFuZ2UuZW5kSW5kZXgoKSB8fCB0cmFpbGluZ0xpbmVCcmVha0luZGV4Lmhhc192 YWx1ZSgpOwogICAgIH0KIAotICAgIGlmICh0cmFpbGluZ0xpbmVCcmVha0luZGV4ICYmIGNhbmRp ZGF0ZUNvbnRlbnQucnVucygpLmlzRW1wdHkoKSkgeworICAgIGlmICh0cmFpbGluZ0xpbmVCcmVh a0luZGV4ICYmIGNhbmRpZGF0ZUNvbnRlbnQuc3RhcnRJbmRleCA9PSBjYW5kaWRhdGVDb250ZW50 LmVuZEluZGV4KSB7CiAgICAgICAgIG1fbGluZS5hcHBlbmQobV9pbmxpbmVJdGVtc1sqdHJhaWxp bmdMaW5lQnJlYWtJbmRleF0sIG1faW5saW5lSXRlbXNbKnRyYWlsaW5nTGluZUJyZWFrSW5kZXhd LnN0eWxlKCksIHsgfSk7CiAgICAgICAgIHJldHVybiB7ICp0cmFpbGluZ0xpbmVCcmVha0luZGV4 ICsgMSwgeyB9IH07CiAgICAgfQogCi0gICAgYXV0byByZXN1bHQgPSBoYW5kbGVPdmVyZmxvd2lu Z1RleHRDb250ZW50KGNhbmRpZGF0ZUNvbnRlbnQsIGxheW91dFJhbmdlKTsKKyAgICBhdXRvIHJl c3VsdCA9IGNvbW1pdENhbmRpZGF0ZUNvbnRlbnQoY2FuZGlkYXRlQ29udGVudCwgbGF5b3V0UmFu Z2UpOwogICAgIG5leHRJdGVtSW5kZXggPSBsYXlvdXRSYW5nZS5zdGFydEluZGV4KCkgKyByZXN1 bHQuY29tbWl0dGVkQ291bnQ7CiAgICAgaWYgKGNvbnN1bWVUcmFpbGluZ0xpbmVCcmVha0lmQXBw bGljYWJsZShyZXN1bHQsIG5leHRJdGVtSW5kZXgsIGxheW91dFJhbmdlLmVuZEluZGV4KCksIG1f bGluZSwgbV9pbmxpbmVJdGVtcykpCiAgICAgICAgICsrbmV4dEl0ZW1JbmRleDsKQEAgLTI2Mywx NyArMjU0LDE4IEBAIFRleHRPbmx5TGluZUJyZWFrUmVzdWx0IFRleHRPbmx5U2ltcGxlTGluZUJ1 aWxkZXI6OmNvbW1pdENhbmRpZGF0ZUNvbnRlbnQoY29uc3QKIHsKICAgICBhdXRvJiByb290U3R5 bGUgPSAhaXNGaXJzdEZvcm1hdHRlZExpbmUoKSA/IHJvb3QoKS5zdHlsZSgpIDogcm9vdCgpLmZp cnN0TGluZVN0eWxlKCk7CiAgICAgYXV0byBoYXNMZWFkaW5nUGFydGlhQ29udGVudCA9IG1fcGFy dGlhbExlYWRpbmdUZXh0SXRlbSAmJiBjYW5kaWRhdGVDb250ZW50LnN0YXJ0SW5kZXggPT0gbGF5 b3V0UmFuZ2Uuc3RhcnRJbmRleCgpOworICAgIGF1dG8gY29udGVudFdpZHRoID0gWyZdIChhdXRv JiBpbmxpbmVUZXh0SXRlbSwgSW5saW5lTGF5b3V0VW5pdCBjb250ZW50T2Zmc2V0KSB7CisgICAg ICAgIGlmIChhdXRvIGxvZ2ljYWxXaWR0aCA9IGlubGluZVRleHRJdGVtLndpZHRoKCkpCisgICAg ICAgICAgICByZXR1cm4gKmxvZ2ljYWxXaWR0aDsKKyAgICAgICAgcmV0dXJuIG1lYXN1cmVkSW5s aW5lVGV4dEl0ZW0oaW5saW5lVGV4dEl0ZW0sIHJvb3RTdHlsZSwgbV9saW5lLmNvbnRlbnRMb2dp Y2FsUmlnaHQoKSArIGNvbnRlbnRPZmZzZXQpOworICAgIH07CiAKICAgICBpZiAoY2FuZGlkYXRl Q29udGVudC5sb2dpY2FsV2lkdGggPD0gYXZhaWxhYmxlV2lkdGgoKSAmJiAhaGFzTGVhZGluZ1Bh cnRpYUNvbnRlbnQpIHsKICAgICAgICAgZm9yIChhdXRvIGluZGV4ID0gY2FuZGlkYXRlQ29udGVu dC5zdGFydEluZGV4OyBpbmRleCA8IGNhbmRpZGF0ZUNvbnRlbnQuZW5kSW5kZXg7ICsraW5kZXgp IHsKICAgICAgICAgICAgIGF1dG8mIGlubGluZVRleHRJdGVtID0gZG93bmNhc3Q8SW5saW5lVGV4 dEl0ZW0+KG1faW5saW5lSXRlbXNbaW5kZXhdKTsKLSAgICAgICAgICAgIGF1dG8gY29udGVudFdp ZHRoID0gWyZdIHsKLSAgICAgICAgICAgICAgICBpZiAoYXV0byBsb2dpY2FsV2lkdGggPSBpbmxp bmVUZXh0SXRlbS53aWR0aCgpKQotICAgICAgICAgICAgICAgICAgICByZXR1cm4gKmxvZ2ljYWxX aWR0aDsKLSAgICAgICAgICAgICAgICByZXR1cm4gbWVhc3VyZWRJbmxpbmVUZXh0SXRlbShpbmxp bmVUZXh0SXRlbSwgcm9vdFN0eWxlLCBtX2xpbmUuY29udGVudExvZ2ljYWxSaWdodCgpKTsKLSAg ICAgICAgICAgIH07Ci0gICAgICAgICAgICBtX2xpbmUuYXBwZW5kVGV4dEZhc3QoaW5saW5lVGV4 dEl0ZW0sIHJvb3RTdHlsZSwgY29udGVudFdpZHRoKCkpOworICAgICAgICAgICAgbV9saW5lLmFw cGVuZFRleHRGYXN0KGlubGluZVRleHRJdGVtLCByb290U3R5bGUsIGNvbnRlbnRXaWR0aChpbmxp bmVUZXh0SXRlbSwgeyB9KSk7CiAgICAgICAgIH0KKwogICAgICAgICBpZiAobV9saW5lLmhhc0Nv bnRlbnRPckxpc3RNYXJrZXIoKSkKICAgICAgICAgICAgIG1fd3JhcE9wcG9ydHVuaXR5TGlzdC5h cHBlbmQoJmRvd25jYXN0PElubGluZVRleHRJdGVtPihtX2lubGluZUl0ZW1zW2NhbmRpZGF0ZUNv bnRlbnQuZW5kSW5kZXggLSAxXSkpOwogICAgICAgICByZXR1cm4geyBJbmxpbmVDb250ZW50QnJl YWtlcjo6SXNFbmRPZkxpbmU6Ok5vLCBjYW5kaWRhdGVDb250ZW50LmVuZEluZGV4IC0gY2FuZGlk YXRlQ29udGVudC5zdGFydEluZGV4IH07CkBAIC0yODEsMTIgKzI3MywxNSBAQCBUZXh0T25seUxp bmVCcmVha1Jlc3VsdCBUZXh0T25seVNpbXBsZUxpbmVCdWlsZGVyOjpjb21taXRDYW5kaWRhdGVD b250ZW50KGNvbnN0CiAKICAgICBhdXRvIGNhbmRpZGF0ZUNvbnRlbnRGb3JMaW5lQnJlYWtpbmcg PSBJbmxpbmVDb250ZW50QnJlYWtlcjo6Q29udGludW91c0NvbnRlbnQgeyB9OwogICAgIGF1dG8g c3RhcnRJbmRleCA9IGNhbmRpZGF0ZUNvbnRlbnQuc3RhcnRJbmRleDsKKwogICAgIGlmIChoYXNM ZWFkaW5nUGFydGlhQ29udGVudCkgewotICAgICAgICBhcHBlbmRJbmxpbmVUZXh0SXRlbSgqbV9w YXJ0aWFsTGVhZGluZ1RleHRJdGVtLCByb290U3R5bGUsIG1fbGluZSwgY2FuZGlkYXRlQ29udGVu dEZvckxpbmVCcmVha2luZyk7CisgICAgICAgIGNhbmRpZGF0ZUNvbnRlbnRGb3JMaW5lQnJlYWtp bmcuYXBwZW5kVGV4dENvbnRlbnQoKm1fcGFydGlhbExlYWRpbmdUZXh0SXRlbSwgcm9vdFN0eWxl LCBjb250ZW50V2lkdGgoKm1fcGFydGlhbExlYWRpbmdUZXh0SXRlbSwgeyB9KSk7CiAgICAgICAg ICsrc3RhcnRJbmRleDsKICAgICB9Ci0gICAgZm9yIChhdXRvIGluZGV4ID0gc3RhcnRJbmRleDsg aW5kZXggPCBjYW5kaWRhdGVDb250ZW50LmVuZEluZGV4OyArK2luZGV4KQotICAgICAgICBhcHBl bmRJbmxpbmVUZXh0SXRlbShkb3duY2FzdDxJbmxpbmVUZXh0SXRlbT4obV9pbmxpbmVJdGVtc1tp bmRleF0pLCByb290U3R5bGUsIG1fbGluZSwgY2FuZGlkYXRlQ29udGVudEZvckxpbmVCcmVha2lu Zyk7CisgICAgZm9yIChhdXRvIGluZGV4ID0gc3RhcnRJbmRleDsgaW5kZXggPCBjYW5kaWRhdGVD b250ZW50LmVuZEluZGV4OyArK2luZGV4KSB7CisgICAgICAgIGF1dG8mIGlubGluZVRleHRJdGVt ID0gZG93bmNhc3Q8SW5saW5lVGV4dEl0ZW0+KG1faW5saW5lSXRlbXNbaW5kZXhdKTsKKyAgICAg ICAgY2FuZGlkYXRlQ29udGVudEZvckxpbmVCcmVha2luZy5hcHBlbmRUZXh0Q29udGVudChpbmxp bmVUZXh0SXRlbSwgcm9vdFN0eWxlLCBjb250ZW50V2lkdGgoaW5saW5lVGV4dEl0ZW0sIGNhbmRp ZGF0ZUNvbnRlbnRGb3JMaW5lQnJlYWtpbmcubG9naWNhbFdpZHRoKCkpKTsKKyAgICB9CiAgICAg cmV0dXJuIGhhbmRsZU92ZXJmbG93aW5nVGV4dENvbnRlbnQoY2FuZGlkYXRlQ29udGVudEZvckxp bmVCcmVha2luZywgbGF5b3V0UmFuZ2UpOwogfQogCg== 467356 2023-08-20 21:02:07 -0700 2023-08-21 05:05:25 -0700 [fast-cq]Patch bug-260438-20230820210206.patch text/plain 7726 zalan RnJvbSA4Y2I5OGM0MmYwYzMwMDQyYTZkOGYzYjY4MjcyMDhlYmUwMTNhNDAzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFNhdCwgMTkgQXVnIDIwMjMgMjA6MjE6MzkgLTA3MDAKU3ViamVjdDogW1BBVENIXSBbSUZDXQog VGV4dE9ubHlTaW1wbGVMaW5lQnVpbGRlcjo6cGxhY2VOb25XcmFwcGluZ0lubGluZVRleHRDb250 ZW50IHNob3VsZCB1c2UKIENhbmRpZGF0ZVRleHRDb250ZW50IGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yNjA0MzgKClJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3RvLgoK TGV0J3MgdXNlIHRoZSBmYXN0IGNvZGVwYXRoICh3aGVyZSB3ZSBkaXJlY3RseSBjb21taXQgdG8g bGluZSkgZm9yIG5vbi13cmFwcGluZyBjb250ZW50LgoKKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQv Zm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9UZXh0T25seVNpbXBsZUxpbmVCdWlsZGVyLmNwcDoK KFdlYkNvcmU6OkxheW91dDo6VGV4dE9ubHlTaW1wbGVMaW5lQnVpbGRlcjo6cGxhY2VOb25XcmFw cGluZ0lubGluZVRleHRDb250ZW50KToKKFdlYkNvcmU6OkxheW91dDo6VGV4dE9ubHlTaW1wbGVM aW5lQnVpbGRlcjo6Y29tbWl0Q2FuZGlkYXRlQ29udGVudCk6CihXZWJDb3JlOjpMYXlvdXQ6OmFw cGVuZElubGluZVRleHRJdGVtKTogRGVsZXRlZC4KLS0tCiAuLi4vaW5saW5lL1RleHRPbmx5U2lt cGxlTGluZUJ1aWxkZXIuY3BwICAgICAgfCA1NSArKysrKysrKystLS0tLS0tLS0tCiAxIGZpbGUg Y2hhbmdlZCwgMjUgaW5zZXJ0aW9ucygrKSwgMzAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvVGV4dE9ubHlT aW1wbGVMaW5lQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0Nv bnRleHRzL2lubGluZS9UZXh0T25seVNpbXBsZUxpbmVCdWlsZGVyLmNwcAppbmRleCA3OTMyYWM1 ZWVmNDkuLjA2NGU3Y2NiODEwYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zv cm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvVGV4dE9ubHlTaW1wbGVMaW5lQnVpbGRlci5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvVGV4dE9u bHlTaW1wbGVMaW5lQnVpbGRlci5jcHAKQEAgLTcxLDE2ICs3MSw2IEBAIHN0YXRpYyBpbmxpbmUg Ym9vbCBpc0xhc3RMaW5lV2l0aElubGluZUNvbnRlbnQoSW5saW5lSXRlbVBvc2l0aW9uIHBsYWNl ZENvbnRlbnRFCiAgICAgcmV0dXJuIHBsYWNlZENvbnRlbnRFbmQuaW5kZXggPT0gbGF5b3V0UmFu Z2VFbmRJbmRleCAmJiAhcGxhY2VkQ29udGVudEVuZC5vZmZzZXQ7CiB9CiAKLXN0YXRpYyBpbmxp bmUgdm9pZCBhcHBlbmRJbmxpbmVUZXh0SXRlbShjb25zdCBJbmxpbmVUZXh0SXRlbSYgaW5saW5l VGV4dEl0ZW0sIGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSwgY29uc3QgTGluZSYgbGluZSwgSW5s aW5lQ29udGVudEJyZWFrZXI6OkNvbnRpbnVvdXNDb250ZW50JiBjYW5kaWRhdGVDb250ZW50KQot ewotICAgIGF1dG8gdGV4dENvbnRlbnRsV2lkdGggPSBbJl0gewotICAgICAgICBpZiAoYXV0byB0 ZXh0V2lkdGggPSBpbmxpbmVUZXh0SXRlbS53aWR0aCgpKQotICAgICAgICAgICAgcmV0dXJuICp0 ZXh0V2lkdGg7Ci0gICAgICAgIHJldHVybiBtZWFzdXJlZElubGluZVRleHRJdGVtKGlubGluZVRl eHRJdGVtLCBzdHlsZSwgbGluZS5jb250ZW50TG9naWNhbFJpZ2h0KCkgKyBjYW5kaWRhdGVDb250 ZW50LmxvZ2ljYWxXaWR0aCgpKTsKLSAgICB9OwotICAgIGNhbmRpZGF0ZUNvbnRlbnQuYXBwZW5k VGV4dENvbnRlbnQoaW5saW5lVGV4dEl0ZW0sIHN0eWxlLCB0ZXh0Q29udGVudGxXaWR0aCgpKTsK LX0KLQogc3RhdGljIGlubGluZSBib29sIGNvbnN1bWVUcmFpbGluZ0xpbmVCcmVha0lmQXBwbGlj YWJsZShjb25zdCBUZXh0T25seUxpbmVCcmVha1Jlc3VsdCYgcmVzdWx0LCBzaXplX3QgdHJhaWxp bmdJbmxpbmVJdGVtSW5kZXgsIHNpemVfdCBsYXlvdXRSYW5nZUVuZCwgTGluZSYgbGluZSwgY29u c3QgSW5saW5lSXRlbXMmIGlubGluZUl0ZW1zKQogewogICAgIC8vIFRyYWlsaW5nIGZvcmNlZCBs aW5lIGJyZWFrIHNob3VsZCBiZSBjb25zdW1lZCBhZnRlciBmdWxseSBwbGFjZWQgY29udGVudC4K QEAgLTIyMCwzNSArMjEwLDM2IEBAIElubGluZUl0ZW1Qb3NpdGlvbiBUZXh0T25seVNpbXBsZUxp bmVCdWlsZGVyOjpwbGFjZUlubGluZVRleHRDb250ZW50KGNvbnN0IElubGluCiBJbmxpbmVJdGVt UG9zaXRpb24gVGV4dE9ubHlTaW1wbGVMaW5lQnVpbGRlcjo6cGxhY2VOb25XcmFwcGluZ0lubGlu ZVRleHRDb250ZW50KGNvbnN0IElubGluZUl0ZW1SYW5nZSYgbGF5b3V0UmFuZ2UpCiB7CiAgICAg QVNTRVJUKCFUZXh0VXRpbDo6aXNXcmFwcGluZ0FsbG93ZWQocm9vdCgpLnN0eWxlKCkpKTsKKyAg ICBBU1NFUlQoIW1fcGFydGlhbExlYWRpbmdUZXh0SXRlbSk7CiAKLSAgICBhdXRvIGNhbmRpZGF0 ZUNvbnRlbnQgPSBJbmxpbmVDb250ZW50QnJlYWtlcjo6Q29udGludW91c0NvbnRlbnQgeyB9Owor ICAgIGF1dG8gY2FuZGlkYXRlQ29udGVudCA9IENhbmRpZGF0ZVRleHRDb250ZW50IHsgbGF5b3V0 UmFuZ2Uuc3RhcnRJbmRleCgpLCBsYXlvdXRSYW5nZS5zdGFydEluZGV4KCksIHsgfSB9OwogICAg IGF1dG8mIHJvb3RTdHlsZSA9ICFpc0ZpcnN0Rm9ybWF0dGVkTGluZSgpID8gcm9vdCgpLnN0eWxl KCkgOiByb290KCkuZmlyc3RMaW5lU3R5bGUoKTsKICAgICBhdXRvIGlzRW5kT2ZMaW5lID0gZmFs c2U7CiAgICAgYXV0byB0cmFpbGluZ0xpbmVCcmVha0luZGV4ID0gc3RkOjpvcHRpb25hbDxzaXpl X3Q+IHsgfTsKICAgICBhdXRvIG5leHRJdGVtSW5kZXggPSBsYXlvdXRSYW5nZS5zdGFydEluZGV4 KCk7CiAKLSAgICBpZiAobV9wYXJ0aWFsTGVhZGluZ1RleHRJdGVtKSB7Ci0gICAgICAgIGFwcGVu ZElubGluZVRleHRJdGVtKCptX3BhcnRpYWxMZWFkaW5nVGV4dEl0ZW0sIHJvb3RTdHlsZSwgbV9s aW5lLCBjYW5kaWRhdGVDb250ZW50KTsKLSAgICAgICAgKytuZXh0SXRlbUluZGV4OwotICAgICAg ICBpc0VuZE9mTGluZSA9IG5leHRJdGVtSW5kZXggPj0gbGF5b3V0UmFuZ2UuZW5kSW5kZXgoKTsK LSAgICB9CiAgICAgd2hpbGUgKCFpc0VuZE9mTGluZSkgewogICAgICAgICBhdXRvJiBpbmxpbmVJ dGVtID0gbV9pbmxpbmVJdGVtc1tuZXh0SXRlbUluZGV4XTsKICAgICAgICAgQVNTRVJUKGlubGlu ZUl0ZW0uaXNUZXh0KCkgfHwgaW5saW5lSXRlbS5pc0xpbmVCcmVhaygpKTsKLSAgICAgICAgaWYg KGlubGluZUl0ZW0uaXNUZXh0KCkpCi0gICAgICAgICAgICBhcHBlbmRJbmxpbmVUZXh0SXRlbShk b3duY2FzdDxJbmxpbmVUZXh0SXRlbT4oaW5saW5lSXRlbSksIHJvb3RTdHlsZSwgbV9saW5lLCBj YW5kaWRhdGVDb250ZW50KTsKLSAgICAgICAgZWxzZSBpZiAoaW5saW5lSXRlbS5pc0xpbmVCcmVh aygpKQorICAgICAgICBpZiAoaW5saW5lSXRlbS5pc1RleHQoKSkgeworICAgICAgICAgICAgYXV0 byBjb250ZW50V2lkdGggPSBbJl0geworICAgICAgICAgICAgICAgIGlmIChhdXRvIGxvZ2ljYWxX aWR0aCA9IGRvd25jYXN0PElubGluZVRleHRJdGVtPihpbmxpbmVJdGVtKS53aWR0aCgpKQorICAg ICAgICAgICAgICAgICAgICByZXR1cm4gKmxvZ2ljYWxXaWR0aDsKKyAgICAgICAgICAgICAgICBy ZXR1cm4gbWVhc3VyZWRJbmxpbmVUZXh0SXRlbShkb3duY2FzdDxJbmxpbmVUZXh0SXRlbT4oaW5s aW5lSXRlbSksIHJvb3RTdHlsZSwgY2FuZGlkYXRlQ29udGVudC5sb2dpY2FsV2lkdGgpOworICAg ICAgICAgICAgfTsKKyAgICAgICAgICAgIGNhbmRpZGF0ZUNvbnRlbnQuYXBwZW5kKGNvbnRlbnRX aWR0aCgpKTsKKyAgICAgICAgfSBlbHNlIGlmIChpbmxpbmVJdGVtLmlzTGluZUJyZWFrKCkpCiAg ICAgICAgICAgICB0cmFpbGluZ0xpbmVCcmVha0luZGV4ID0gbmV4dEl0ZW1JbmRleDsKICAgICAg ICAgKytuZXh0SXRlbUluZGV4OwogICAgICAgICBpc0VuZE9mTGluZSA9IG5leHRJdGVtSW5kZXgg Pj0gbGF5b3V0UmFuZ2UuZW5kSW5kZXgoKSB8fCB0cmFpbGluZ0xpbmVCcmVha0luZGV4Lmhhc192 YWx1ZSgpOwogICAgIH0KIAotICAgIGlmICh0cmFpbGluZ0xpbmVCcmVha0luZGV4ICYmIGNhbmRp ZGF0ZUNvbnRlbnQucnVucygpLmlzRW1wdHkoKSkgeworICAgIGlmICh0cmFpbGluZ0xpbmVCcmVh a0luZGV4ICYmIGNhbmRpZGF0ZUNvbnRlbnQuc3RhcnRJbmRleCA9PSBjYW5kaWRhdGVDb250ZW50 LmVuZEluZGV4KSB7CiAgICAgICAgIG1fbGluZS5hcHBlbmQobV9pbmxpbmVJdGVtc1sqdHJhaWxp bmdMaW5lQnJlYWtJbmRleF0sIG1faW5saW5lSXRlbXNbKnRyYWlsaW5nTGluZUJyZWFrSW5kZXhd LnN0eWxlKCksIHsgfSk7CiAgICAgICAgIHJldHVybiB7ICp0cmFpbGluZ0xpbmVCcmVha0luZGV4 ICsgMSwgeyB9IH07CiAgICAgfQogCi0gICAgYXV0byByZXN1bHQgPSBoYW5kbGVPdmVyZmxvd2lu Z1RleHRDb250ZW50KGNhbmRpZGF0ZUNvbnRlbnQsIGxheW91dFJhbmdlKTsKKyAgICBhdXRvIHJl c3VsdCA9IGNvbW1pdENhbmRpZGF0ZUNvbnRlbnQoY2FuZGlkYXRlQ29udGVudCwgbGF5b3V0UmFu Z2UpOwogICAgIG5leHRJdGVtSW5kZXggPSBsYXlvdXRSYW5nZS5zdGFydEluZGV4KCkgKyByZXN1 bHQuY29tbWl0dGVkQ291bnQ7CiAgICAgaWYgKGNvbnN1bWVUcmFpbGluZ0xpbmVCcmVha0lmQXBw bGljYWJsZShyZXN1bHQsIG5leHRJdGVtSW5kZXgsIGxheW91dFJhbmdlLmVuZEluZGV4KCksIG1f bGluZSwgbV9pbmxpbmVJdGVtcykpCiAgICAgICAgICsrbmV4dEl0ZW1JbmRleDsKQEAgLTI2Mywx NyArMjU0LDE4IEBAIFRleHRPbmx5TGluZUJyZWFrUmVzdWx0IFRleHRPbmx5U2ltcGxlTGluZUJ1 aWxkZXI6OmNvbW1pdENhbmRpZGF0ZUNvbnRlbnQoY29uc3QKIHsKICAgICBhdXRvJiByb290U3R5 bGUgPSAhaXNGaXJzdEZvcm1hdHRlZExpbmUoKSA/IHJvb3QoKS5zdHlsZSgpIDogcm9vdCgpLmZp cnN0TGluZVN0eWxlKCk7CiAgICAgYXV0byBoYXNMZWFkaW5nUGFydGlhQ29udGVudCA9IG1fcGFy dGlhbExlYWRpbmdUZXh0SXRlbSAmJiBjYW5kaWRhdGVDb250ZW50LnN0YXJ0SW5kZXggPT0gbGF5 b3V0UmFuZ2Uuc3RhcnRJbmRleCgpOworICAgIGF1dG8gY29udGVudFdpZHRoID0gWyZdIChhdXRv JiBpbmxpbmVUZXh0SXRlbSwgSW5saW5lTGF5b3V0VW5pdCBjb250ZW50T2Zmc2V0KSB7CisgICAg ICAgIGlmIChhdXRvIGxvZ2ljYWxXaWR0aCA9IGlubGluZVRleHRJdGVtLndpZHRoKCkpCisgICAg ICAgICAgICByZXR1cm4gKmxvZ2ljYWxXaWR0aDsKKyAgICAgICAgcmV0dXJuIG1lYXN1cmVkSW5s aW5lVGV4dEl0ZW0oaW5saW5lVGV4dEl0ZW0sIHJvb3RTdHlsZSwgbV9saW5lLmNvbnRlbnRMb2dp Y2FsUmlnaHQoKSArIGNvbnRlbnRPZmZzZXQpOworICAgIH07CiAKICAgICBpZiAoY2FuZGlkYXRl Q29udGVudC5sb2dpY2FsV2lkdGggPD0gYXZhaWxhYmxlV2lkdGgoKSAmJiAhaGFzTGVhZGluZ1Bh cnRpYUNvbnRlbnQpIHsKICAgICAgICAgZm9yIChhdXRvIGluZGV4ID0gY2FuZGlkYXRlQ29udGVu dC5zdGFydEluZGV4OyBpbmRleCA8IGNhbmRpZGF0ZUNvbnRlbnQuZW5kSW5kZXg7ICsraW5kZXgp IHsKICAgICAgICAgICAgIGF1dG8mIGlubGluZVRleHRJdGVtID0gZG93bmNhc3Q8SW5saW5lVGV4 dEl0ZW0+KG1faW5saW5lSXRlbXNbaW5kZXhdKTsKLSAgICAgICAgICAgIGF1dG8gY29udGVudFdp ZHRoID0gWyZdIHsKLSAgICAgICAgICAgICAgICBpZiAoYXV0byBsb2dpY2FsV2lkdGggPSBpbmxp bmVUZXh0SXRlbS53aWR0aCgpKQotICAgICAgICAgICAgICAgICAgICByZXR1cm4gKmxvZ2ljYWxX aWR0aDsKLSAgICAgICAgICAgICAgICByZXR1cm4gbWVhc3VyZWRJbmxpbmVUZXh0SXRlbShpbmxp bmVUZXh0SXRlbSwgcm9vdFN0eWxlLCBtX2xpbmUuY29udGVudExvZ2ljYWxSaWdodCgpKTsKLSAg ICAgICAgICAgIH07Ci0gICAgICAgICAgICBtX2xpbmUuYXBwZW5kVGV4dEZhc3QoaW5saW5lVGV4 dEl0ZW0sIHJvb3RTdHlsZSwgY29udGVudFdpZHRoKCkpOworICAgICAgICAgICAgbV9saW5lLmFw cGVuZFRleHRGYXN0KGlubGluZVRleHRJdGVtLCByb290U3R5bGUsIGNvbnRlbnRXaWR0aChpbmxp bmVUZXh0SXRlbSwgeyB9KSk7CiAgICAgICAgIH0KKwogICAgICAgICBpZiAobV9saW5lLmhhc0Nv bnRlbnRPckxpc3RNYXJrZXIoKSkKICAgICAgICAgICAgIG1fd3JhcE9wcG9ydHVuaXR5TGlzdC5h cHBlbmQoJmRvd25jYXN0PElubGluZVRleHRJdGVtPihtX2lubGluZUl0ZW1zW2NhbmRpZGF0ZUNv bnRlbnQuZW5kSW5kZXggLSAxXSkpOwogICAgICAgICByZXR1cm4geyBJbmxpbmVDb250ZW50QnJl YWtlcjo6SXNFbmRPZkxpbmU6Ok5vLCBjYW5kaWRhdGVDb250ZW50LmVuZEluZGV4IC0gY2FuZGlk YXRlQ29udGVudC5zdGFydEluZGV4IH07CkBAIC0yODEsMTIgKzI3MywxNSBAQCBUZXh0T25seUxp bmVCcmVha1Jlc3VsdCBUZXh0T25seVNpbXBsZUxpbmVCdWlsZGVyOjpjb21taXRDYW5kaWRhdGVD b250ZW50KGNvbnN0CiAKICAgICBhdXRvIGNhbmRpZGF0ZUNvbnRlbnRGb3JMaW5lQnJlYWtpbmcg PSBJbmxpbmVDb250ZW50QnJlYWtlcjo6Q29udGludW91c0NvbnRlbnQgeyB9OwogICAgIGF1dG8g c3RhcnRJbmRleCA9IGNhbmRpZGF0ZUNvbnRlbnQuc3RhcnRJbmRleDsKKwogICAgIGlmIChoYXNM ZWFkaW5nUGFydGlhQ29udGVudCkgewotICAgICAgICBhcHBlbmRJbmxpbmVUZXh0SXRlbSgqbV9w YXJ0aWFsTGVhZGluZ1RleHRJdGVtLCByb290U3R5bGUsIG1fbGluZSwgY2FuZGlkYXRlQ29udGVu dEZvckxpbmVCcmVha2luZyk7CisgICAgICAgIGNhbmRpZGF0ZUNvbnRlbnRGb3JMaW5lQnJlYWtp bmcuYXBwZW5kVGV4dENvbnRlbnQoKm1fcGFydGlhbExlYWRpbmdUZXh0SXRlbSwgcm9vdFN0eWxl LCBjb250ZW50V2lkdGgoKm1fcGFydGlhbExlYWRpbmdUZXh0SXRlbSwgeyB9KSk7CiAgICAgICAg ICsrc3RhcnRJbmRleDsKICAgICB9Ci0gICAgZm9yIChhdXRvIGluZGV4ID0gc3RhcnRJbmRleDsg aW5kZXggPCBjYW5kaWRhdGVDb250ZW50LmVuZEluZGV4OyArK2luZGV4KQotICAgICAgICBhcHBl bmRJbmxpbmVUZXh0SXRlbShkb3duY2FzdDxJbmxpbmVUZXh0SXRlbT4obV9pbmxpbmVJdGVtc1tp bmRleF0pLCByb290U3R5bGUsIG1fbGluZSwgY2FuZGlkYXRlQ29udGVudEZvckxpbmVCcmVha2lu Zyk7CisgICAgZm9yIChhdXRvIGluZGV4ID0gc3RhcnRJbmRleDsgaW5kZXggPCBjYW5kaWRhdGVD b250ZW50LmVuZEluZGV4OyArK2luZGV4KSB7CisgICAgICAgIGF1dG8mIGlubGluZVRleHRJdGVt ID0gZG93bmNhc3Q8SW5saW5lVGV4dEl0ZW0+KG1faW5saW5lSXRlbXNbaW5kZXhdKTsKKyAgICAg ICAgY2FuZGlkYXRlQ29udGVudEZvckxpbmVCcmVha2luZy5hcHBlbmRUZXh0Q29udGVudChpbmxp bmVUZXh0SXRlbSwgcm9vdFN0eWxlLCBjb250ZW50V2lkdGgoaW5saW5lVGV4dEl0ZW0sIGNhbmRp ZGF0ZUNvbnRlbnRGb3JMaW5lQnJlYWtpbmcubG9naWNhbFdpZHRoKCkpKTsKKyAgICB9CiAgICAg cmV0dXJuIGhhbmRsZU92ZXJmbG93aW5nVGV4dENvbnRlbnQoY2FuZGlkYXRlQ29udGVudEZvckxp bmVCcmVha2luZywgbGF5b3V0UmFuZ2UpOwogfQogCg==