191011 2018-10-27 21:40:23 -0700 [LFC] Add support for inflow non replaced content height when the box is an inline formatting root. 2018-10-29 13:32:41 -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 1472796 0 zalan 2018-10-27 21:40:23 -0700 ssia. 1472797 1 353252 zalan 2018-10-27 21:46:19 -0700 Created attachment 353252 Patch. 1472911 2 zalan 2018-10-29 07:48:17 -0700 Committed r237551: <https://trac.webkit.org/changeset/237551> 1473028 3 webkit-bug-importer 2018-10-29 13:32:41 -0700 <rdar://problem/45647202> 353252 2018-10-27 21:46:19 -0700 2018-10-29 05:44:25 -0700 Patch. Patch.txt text/plain 12069 zalan ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAzYWY3YmI5Y2E0Zi4uZjUyZDU1NDQ3ZDkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAor MjAxOC0xMC0yNyAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgorCisgICAgICAgIFtM RkNdIEFkZCBzdXBwb3J0IGZvciBpbmZsb3cgbm9uIHJlcGxhY2VkIGNvbnRlbnQgaGVpZ2h0IHdo ZW4gdGhlIGJveCBpcyBhbiBpbmxpbmUgZm9ybWF0dGluZyByb290LgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkxMDExCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBmYXN0L2lubGluZS9zaW1wbGUtaW50 cnVkaW5nLWZsb2F0czItZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2lubGlu ZS9zaW1wbGUtaW50cnVkaW5nLWZsb2F0czIuaHRtbDogQWRkZWQuCisgICAgICAgICogcGxhdGZv cm0vaW9zL1Rlc3RFeHBlY3RhdGlvbnM6CisKIDIwMTgtMTAtMjcgIFphbGFuIEJ1anRhcyAgPHph bGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtJRkNdIElubGluZSBsYXlvdXQgcHJvZHVj ZXMgc2VwYXJhdGUgcnVucyB3aGVuIGZsb2F0IGlzIHByZXNlbnQuCmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9mYXN0L2lubGluZS9zaW1wbGUtaW50cnVkaW5nLWZsb2F0czItZXhwZWN0ZWQudHh0 IGIvTGF5b3V0VGVzdHMvZmFzdC9pbmxpbmUvc2ltcGxlLWludHJ1ZGluZy1mbG9hdHMyLWV4cGVj dGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMC4uM2VhYjFjZDQ2 NWYKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2lubGluZS9zaW1wbGUtaW50 cnVkaW5nLWZsb2F0czItZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMzAgQEAKK2xheWVyIGF0ICgw LDApIHNpemUgODAweDYwMAorICBSZW5kZXJWaWV3IGF0ICgwLDApIHNpemUgODAweDYwMAorbGF5 ZXIgYXQgKDAsMCkgc2l6ZSA4MDB4NjAwCisgIFJlbmRlckJsb2NrIHtIVE1MfSBhdCAoMCwwKSBz aXplIDgwMHg2MDAKKyAgICBSZW5kZXJCb2R5IHtCT0RZfSBhdCAoOCw4KSBzaXplIDc4NHg1ODQK KyAgICAgIFJlbmRlckltYWdlIHtJTUd9IGF0ICgwLDApIHNpemUgMjB4MTAwCisgICAgICBSZW5k ZXJCbG9jayB7RElWfSBhdCAoMCwwKSBzaXplIDMwMHg1NAorICAgICAgICBSZW5kZXJUZXh0IHsj dGV4dH0gYXQgKDQwLDApIHNpemUgMzR4MTgKKyAgICAgICAgICB0ZXh0IHJ1biBhdCAoNDAsMCkg d2lkdGggMzQ6ICJ0aGlzaXMiCisgICAgICAgIFJlbmRlckltYWdlIHtJTUd9IGF0ICgyMCwwKSBz aXplIDIweDc1CisgICAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAoNzMsMCkgc2l6ZSAyMTZ4 MzYKKyAgICAgICAgICB0ZXh0IHJ1biBhdCAoNzMsMCkgd2lkdGggMTgzOiAib25lcnVuLCBuZXh0 IHRvIDIgZmxvYXRzLiBPbmUiCisgICAgICAgICAgdGV4dCBydW4gYXQgKDQwLDE4KSB3aWR0aCAx Mzg6ICJpbnRydWRpbmcsIG9uZSBpbiB0aGlzICIKKyAgICAgICAgUmVuZGVySW5saW5lIHtTUEFO fSBhdCAoMCwwKSBzaXplIDI0NngzNgorICAgICAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAo MTc3LDE4KSBzaXplIDI0NngzNgorICAgICAgICAgICAgdGV4dCBydW4gYXQgKDE3NywxOCkgd2lk dGggMTA5OiAiaW5saW5lIGZvcm1hdHRpbmciCisgICAgICAgICAgICB0ZXh0IHJ1biBhdCAoNDAs MzYpIHdpZHRoIDQ4OiAiY29udGV4dCIKKyAgICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgw LDApIHNpemUgMHgwCisgICAgICBSZW5kZXJCbG9jayB7RElWfSBhdCAoMCw1NCkgc2l6ZSAzMDB4 NTQKKyAgICAgICAgUmVuZGVySW5saW5lIHtTUEFOfSBhdCAoMCwwKSBzaXplIDI1OHg1NAorICAg ICAgICAgIFJlbmRlckltYWdlIHtJTUd9IGF0ICg0MCwwKSBzaXplIDIweDE1CisgICAgICAgICAg UmVuZGVyVGV4dCB7I3RleHR9IGF0ICg2MCwwKSBzaXplIDI1OHg1NAorICAgICAgICAgICAgdGV4 dCBydW4gYXQgKDYwLDApIHdpZHRoIDIxODogInRoaXMgbmV4dCBpbmxpbmUgZm9ybWF0dGluZyBj b250ZXh0IgorICAgICAgICAgICAgdGV4dCBydW4gYXQgKDQwLDE4KSB3aWR0aCAyMDQ6ICJoYXMg MyBmbG9hdHMuIDIgb3V0IG9mIHRob3NlIDMgYXJlIgorICAgICAgICAgICAgdGV4dCBydW4gYXQg KDIwLDM2KSB3aWR0aCA1OTogImludHJ1ZGluZyIKKyAgICAgIFJlbmRlckJsb2NrIChhbm9ueW1v dXMpIGF0ICgwLDEwOCkgc2l6ZSA3ODR4MTgKKyAgICAgICAgUmVuZGVySW5saW5lIHtTUEFOfSBh dCAoMCwwKSBzaXplIDQzMHgxOAorICAgICAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAoMCww KSBzaXplIDQzMHgxOAorICAgICAgICAgICAgdGV4dCBydW4gYXQgKDAsMCkgd2lkdGggNDMwOiAi YW5kIG5vdyB3ZSBhcmUgYmFjayB0byB0aGUgbGVmdCBlZGdlLiBubyBpbnRydWRpbmdzIGF0IHRo aXMgcG9zaXRpb24uIgorICAgICAgICBSZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDAsMCkgc2l6ZSAw eDAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvaW5saW5lL3NpbXBsZS1pbnRydWRpbmct ZmxvYXRzMi5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9pbmxpbmUvc2ltcGxlLWludHJ1ZGluZy1m bG9hdHMyLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAuLmUyOGQ4 YTVhYjhlCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9pbmxpbmUvc2ltcGxl LWludHJ1ZGluZy1mbG9hdHMyLmh0bWwKQEAgLTAsMCArMSw1IEBACis8aW1nIHN0eWxlPSJmbG9h dDogbGVmdDsiIHNyYz0iZm9vYmFyLmpwZyIgaGVpZ2h0PSIxMDAiIHdpZHRoPSIyMCI+Cis8ZGl2 IHN0eWxlPSJ0ZXh0LWFsaWduOiBsZWZ0OyB3aWR0aDogMzAwcHg7Ij50aGlzaXM8aW1nIHN0eWxl PSJmbG9hdDogbGVmdDsiIHNyYz0iZm9vYmFyLmpwZyIgaGVpZ2h0PSI3NSIgd2lkdGg9IjIwIj5v bmVydW4sIG5leHQgdG8gMiBmbG9hdHMuIE9uZSBpbnRydWRpbmcsIG9uZSBpbiB0aGlzCis8c3Bh bj5pbmxpbmUgZm9ybWF0dGluZyBjb250ZXh0PC9zcGFuPgorPC9kaXY+Cis8ZGl2IHN0eWxlPSJ3 aWR0aDogMzAwcHgiPjxzcGFuPjxpbWcgc3R5bGU9ImZsb2F0OiBsZWZ0OyIgc3JjPSJmb29iYXIu anBnIiBoZWlnaHQ9IjE1IiB3aWR0aD0iMjAiPnRoaXMgbmV4dCBpbmxpbmUgZm9ybWF0dGluZyBj b250ZXh0IGhhcyAzIGZsb2F0cy4gMiBvdXQgb2YgdGhvc2UgMyBhcmUgaW50cnVkaW5nIDwvc3Bh bj48L2Rpdj48c3Bhbj5hbmQgbm93IHdlIGFyZSBiYWNrIHRvIHRoZSBsZWZ0IGVkZ2UuIG5vIGlu dHJ1ZGluZ3MgYXQgdGhpcyBwb3NpdGlvbi48L3NwYW4+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9wbGF0Zm9ybS9pb3MvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2lv cy9UZXN0RXhwZWN0YXRpb25zCmluZGV4IGVlMzdjNzQ3NWJlLi5iNzIxNjBjYjg5ZSAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5 b3V0VGVzdHMvcGxhdGZvcm0vaW9zL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTMxMTAsNiArMzExMCw3 IEBAIGZhc3QvYmxvY2svYmxvY2stb25seS9hYnNvbHV0ZS1wb3NpdGlvbi1taW4tbWF4LWhlaWdo dC5odG1sIFsgRmFpbHVyZSBdCiBmYXN0L2Jsb2NrL2Jhc2ljL2lubGluZS1jb250ZW50LXdpdGgt ZmxvYXRpbmctaW1hZ2UuaHRtbCBbIEZhaWx1cmUgXQogZmFzdC9ibG9jay9iYXNpYy9pbmxpbmUt Y29udGVudC13aXRoLWZsb2F0aW5nLWltYWdlczIuaHRtbCBbIEZhaWx1cmUgXQogZmFzdC9pbmxp bmUvc2ltcGxlLWludHJ1ZGluZy1mbG9hdDEuaHRtbCBbIEZhaWx1cmUgXQorZmFzdC9pbmxpbmUv c2ltcGxlLWludHJ1ZGluZy1mbG9hdHMyLmh0bWwgWyBGYWlsdXJlIF0KIAogIyBEYXRhbGlzdAog d2Via2l0Lm9yZy9iLzE4NjcxNCBmYXN0L2Zvcm1zL2RhdGFsaXN0L2RhdGFsaXN0LXRleHRpbnB1 dC1rZXlkb3duLmh0bWwgWyBTa2lwIF0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBlYjQ4ODRhYmFlYy4uZmQ1ZGM1 MmFmMGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2Uv V2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzNCBAQAorMjAxOC0xMC0yNyAgWmFsYW4gQnVq dGFzICA8emFsYW5AYXBwbGUuY29tPgorCisgICAgICAgIFtMRkNdIEFkZCBzdXBwb3J0IGZvciBp bmZsb3cgbm9uIHJlcGxhY2VkIGNvbnRlbnQgaGVpZ2h0IHdoZW4gdGhlIGJveCBpcyBhbiBpbmxp bmUgZm9ybWF0dGluZyByb290LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTkxMDExCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgLy8gMTAuNi4zIEJsb2NrLWxldmVsIG5vbi1yZXBsYWNlZCBlbGVtZW50cyBp biBub3JtYWwgZmxvdyB3aGVuICdvdmVyZmxvdycgY29tcHV0ZXMgdG8gJ3Zpc2libGUnCisgICAg ICAgIC8vIEhlaWdodCBpcyB0aGUgYm90dG9tIGVkZ2Ugb2YgdGhlIGxhc3QgbGluZSBib3gsIGlm IHRoZSBib3ggZXN0YWJsaXNoZXMgYSBpbmxpbmUgZm9ybWF0dGluZyBjb250ZXh0IHdpdGggb25l IG9yIG1vcmUgbGluZXMKKworICAgICAgICBUaGlzIGlzIHRlbXBvcmFyeSB1bnRpbCBhZnRlciBp bmxpbmUgcnVucyB0cmFuc2l0aW9uIHRvIHRoZSBkaXNwbGF5IHRyZWUuCisKKyAgICAgICAgVGVz dDogZmFzdC9pbmxpbmUvc2ltcGxlLWludHJ1ZGluZy1mbG9hdHMyLmh0bWwKKworICAgICAgICAq IGxheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6R2Vv bWV0cnk6OmluRmxvd05vblJlcGxhY2VkSGVpZ2h0QW5kTWFyZ2luKToKKyAgICAgICAgKiBsYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVSdW4uaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6SW5saW5lUnVuOjpsb2dpY2FsTGVmdCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OklubGluZVJ1bjo6bG9naWNhbFJpZ2h0IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dDo6SW5saW5lUnVuOjpsb2dpY2FsVG9wIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dDo6SW5saW5lUnVuOjpsb2dpY2FsQm90dG9tIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6 OkxheW91dDo6SW5saW5lUnVuOjp3aWR0aCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OklubGluZVJ1bjo6aGVpZ2h0IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 SW5saW5lUnVuOjpzZXRXaWR0aCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZVJ1 bjo6c2V0TG9naWNhbExlZnQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVSdW46 OnNldExvZ2ljYWxSaWdodCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZVJ1bjo6 bW92ZUhvcml6b250YWxseSk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZVJ1bjo6 SW5saW5lUnVuKToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9MaW5lLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OkxpbmU6 OmFwcGVuZENvbnRlbnQpOgorCiAyMDE4LTEwLTI3ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBs ZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZDXSBJbmxpbmUgbGF5b3V0IHByb2R1Y2VzIHNlcGFy YXRlIHJ1bnMgd2hlbiBmbG9hdCBpcyBwcmVzZW50LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnku Y3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRp bmdDb250ZXh0R2VvbWV0cnkuY3BwCmluZGV4IDgzZjliOTdiYTU2Li5mYzcyZjkwNWE1NyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1h dHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9j a2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcApAQCAtMjksNiAr MjksNyBAQAogI2lmIEVOQUJMRShMQVlPVVRfRk9STUFUVElOR19DT05URVhUKQogCiAjaW5jbHVk ZSAiRm9ybWF0dGluZ0NvbnRleHQuaCIKKyNpbmNsdWRlICJJbmxpbmVGb3JtYXR0aW5nU3RhdGUu aCIKICNpbmNsdWRlICJMYXlvdXRDaGlsZEl0ZXJhdG9yLmgiCiAjaW5jbHVkZSAiTG9nZ2luZy5o IgogI2luY2x1ZGUgPHd0Zi90ZXh0L1RleHRTdHJlYW0uaD4KQEAgLTEyMCw4ICsxMjEsOSBAQCBI ZWlnaHRBbmRNYXJnaW4gQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmluRmxvd05v blJlcGxhY2VkSGVpZ2h0QW5kTWFyZwogCiAgICAgICAgIC8vIDEuIHRoZSBib3R0b20gZWRnZSBv ZiB0aGUgbGFzdCBsaW5lIGJveCwgaWYgdGhlIGJveCBlc3RhYmxpc2hlcyBhIGlubGluZSBmb3Jt YXR0aW5nIGNvbnRleHQgd2l0aCBvbmUgb3IgbW9yZSBsaW5lcwogICAgICAgICBpZiAobGF5b3V0 Qm94LmVzdGFibGlzaGVzSW5saW5lRm9ybWF0dGluZ0NvbnRleHQoKSkgewotICAgICAgICAgICAg Ly8gaGVpZ2h0ID0gbGFzdExpbmVCb3goKS5ib3R0b20oKTsKLSAgICAgICAgICAgIHJldHVybiB7 IDAsIG5vbkNvbGxhcHNlZE1hcmdpbiwgY29sbGFwc2VkTWFyZ2luIH07CisgICAgICAgICAgICAv LyBUaGlzIGlzIHRlbXAgYW5kIHdpbGwgYmUgcmVwbGFjZWQgYnkgdGhlIGNvcnJlY3QgZGlzcGxh eSBib3ggb25jZSBpbmxpbmUgcnVucyBtb3ZlIG92ZXIgdG8gdGhlIGRpc3BsYXkgdHJlZS4KKyAg ICAgICAgICAgIGF1dG8mIGxhc3RJbmxpbmVSdW4gPSBkb3duY2FzdDxJbmxpbmVGb3JtYXR0aW5n U3RhdGU+KGxheW91dENvbnRleHQuZXN0YWJsaXNoZWRGb3JtYXR0aW5nU3RhdGUobGF5b3V0Qm94 KSkuaW5saW5lUnVucygpLmxhc3QoKTsKKyAgICAgICAgICAgIHJldHVybiB7IGxhc3RJbmxpbmVS dW4ubG9naWNhbEJvdHRvbSgpLCBub25Db2xsYXBzZWRNYXJnaW4sIGNvbGxhcHNlZE1hcmdpbiB9 OwogICAgICAgICB9CiAKICAgICAgICAgLy8gMi4gdGhlIGJvdHRvbSBlZGdlIG9mIHRoZSBib3R0 b20gKHBvc3NpYmx5IGNvbGxhcHNlZCkgbWFyZ2luIG9mIGl0cyBsYXN0IGluLWZsb3cgY2hpbGQs IGlmIHRoZSBjaGlsZCdzIGJvdHRvbSBtYXJnaW4uLi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZVJ1bi5oIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lUnVuLmgKaW5kZXggOTUxYmIwMGMxODUuLjVm MGU1NTgwYzRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0 dGluZy9JbmxpbmVSdW4uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0 dGluZy9JbmxpbmVSdW4uaApAQCAtMzQsMTYgKzM0LDIwIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsK IG5hbWVzcGFjZSBMYXlvdXQgewogCiBzdHJ1Y3QgSW5saW5lUnVuIHsKLSAgICBJbmxpbmVSdW4o TGF5b3V0VW5pdCBsb2djaWFsTGVmdCwgTGF5b3V0VW5pdCB3aWR0aCwgY29uc3QgSW5saW5lSXRl bSYpOworICAgIElubGluZVJ1bihEaXNwbGF5OjpCb3g6OlJlY3QgbG9naWNhbFJlY3QsIGNvbnN0 IElubGluZUl0ZW0mKTsKIAotICAgIExheW91dFVuaXQgbG9naWNhbExlZnQoKSBjb25zdCB7IHJl dHVybiBtX2xvZ2ljYWxMZWZ0OyB9Ci0gICAgTGF5b3V0VW5pdCBsb2dpY2FsUmlnaHQoKSBjb25z dCB7IHJldHVybiBsb2dpY2FsTGVmdCgpICsgd2lkdGgoKTsgfQotICAgIExheW91dFVuaXQgd2lk dGgoKSBjb25zdCB7IHJldHVybiBtX3dpZHRoOyB9CisgICAgTGF5b3V0VW5pdCBsb2dpY2FsTGVm dCgpIGNvbnN0IHsgcmV0dXJuIG1fbG9naWNhbFJlY3QubGVmdCgpOyB9CisgICAgTGF5b3V0VW5p dCBsb2dpY2FsUmlnaHQoKSBjb25zdCB7IHJldHVybiBtX2xvZ2ljYWxSZWN0LnJpZ2h0KCk7IH0K KyAgICBMYXlvdXRVbml0IGxvZ2ljYWxUb3AoKSBjb25zdCB7IHJldHVybiBtX2xvZ2ljYWxSZWN0 LnRvcCgpOyB9CisgICAgTGF5b3V0VW5pdCBsb2dpY2FsQm90dG9tKCkgY29uc3QgeyByZXR1cm4g bV9sb2dpY2FsUmVjdC5ib3R0b20oKTsgfQogCi0gICAgdm9pZCBzZXRXaWR0aChMYXlvdXRVbml0 IHdpZHRoKSB7IG1fd2lkdGggPSB3aWR0aDsgfQotICAgIHZvaWQgc2V0TG9naWNhbExlZnQoTGF5 b3V0VW5pdCBsb2dpY2FsTGVmdCkgeyBtX2xvZ2ljYWxMZWZ0ID0gbG9naWNhbExlZnQ7IH0KLSAg ICB2b2lkIHNldExvZ2ljYWxSaWdodChMYXlvdXRVbml0IGxvZ2ljYWxSaWdodCkgeyBtX3dpZHRo IC09ICh0aGlzLT5sb2dpY2FsUmlnaHQoKSAtIGxvZ2ljYWxSaWdodCk7IH0KLSAgICB2b2lkIG1v dmVIb3Jpem9udGFsbHkoTGF5b3V0VW5pdCBkZWx0YSkgeyBtX2xvZ2ljYWxMZWZ0ICs9IGRlbHRh OyB9CisgICAgTGF5b3V0VW5pdCB3aWR0aCgpIGNvbnN0IHsgcmV0dXJuIG1fbG9naWNhbFJlY3Qu d2lkdGgoKTsgfQorICAgIExheW91dFVuaXQgaGVpZ2h0KCkgY29uc3QgeyByZXR1cm4gbV9sb2dp Y2FsUmVjdC5oZWlnaHQoKTsgfQorCisgICAgdm9pZCBzZXRXaWR0aChMYXlvdXRVbml0IHdpZHRo KSB7IG1fbG9naWNhbFJlY3Quc2V0V2lkdGgod2lkdGgpOyB9CisgICAgdm9pZCBzZXRMb2dpY2Fs TGVmdChMYXlvdXRVbml0IGxvZ2ljYWxMZWZ0KSB7IG1fbG9naWNhbFJlY3Quc2V0TGVmdChsb2dp Y2FsTGVmdCk7IH0KKyAgICB2b2lkIHNldExvZ2ljYWxSaWdodChMYXlvdXRVbml0IGxvZ2ljYWxS aWdodCkgeyBtX2xvZ2ljYWxSZWN0LnNoaWZ0UmlnaHRUbyhsb2dpY2FsUmlnaHQpOyB9CisgICAg dm9pZCBtb3ZlSG9yaXpvbnRhbGx5KExheW91dFVuaXQgZGVsdGEpIHsgbV9sb2dpY2FsUmVjdC5t b3ZlSG9yaXpvbnRhbGx5KGRlbHRhKTsgfQogCiAgICAgc3RydWN0IEV4cGFuc2lvbk9wcG9ydHVu aXR5IHsKICAgICAgICAgdW5zaWduZWQgY291bnQgeyAwIH07CkBAIC03Myw4ICs3Nyw3IEBAIHN0 cnVjdCBJbmxpbmVSdW4gewogICAgIGNvbnN0IElubGluZUl0ZW0mIGlubGluZUl0ZW0oKSBjb25z dCB7IHJldHVybiBtX2lubGluZUl0ZW07IH0KIAogcHJpdmF0ZToKLSAgICBMYXlvdXRVbml0IG1f bG9naWNhbExlZnQ7Ci0gICAgTGF5b3V0VW5pdCBtX3dpZHRoOworICAgIERpc3BsYXk6OkJveDo6 UmVjdCBtX2xvZ2ljYWxSZWN0OwogICAgIEV4cGFuc2lvbk9wcG9ydHVuaXR5IG1fZXhwYW5zaW9u T3Bwb3J0dW5pdHk7CiAKICAgICBjb25zdCBJbmxpbmVJdGVtJiBtX2lubGluZUl0ZW07CkBAIC04 Myw5ICs4Niw4IEBAIHByaXZhdGU6CiAKIHVzaW5nIElubGluZVJ1bnMgPSBWZWN0b3I8SW5saW5l UnVuPjsKIAotaW5saW5lIElubGluZVJ1bjo6SW5saW5lUnVuKExheW91dFVuaXQgbG9naWNhbExl ZnQsIExheW91dFVuaXQgd2lkdGgsIGNvbnN0IElubGluZUl0ZW0mIGlubGluZUl0ZW0pCi0gICAg OiBtX2xvZ2ljYWxMZWZ0KGxvZ2ljYWxMZWZ0KQotICAgICwgbV93aWR0aCh3aWR0aCkKK2lubGlu ZSBJbmxpbmVSdW46OklubGluZVJ1bihEaXNwbGF5OjpCb3g6OlJlY3QgbG9naWNhbFJlY3QsIGNv bnN0IElubGluZUl0ZW0mIGlubGluZUl0ZW0pCisgICAgOiBtX2xvZ2ljYWxSZWN0KGxvZ2ljYWxS ZWN0KQogICAgICwgbV9pbmxpbmVJdGVtKGlubGluZUl0ZW0pCiB7CiB9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9MaW5lLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0xpbmUuY3BwCmluZGV4IGFjNzJmMzIxMmU1 Li5mMWFkZjdhOTEzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZv cm1hdHRpbmcvTGluZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1h dHRpbmcvTGluZS5jcHAKQEAgLTE1MSw3ICsxNTEsOCBAQCB2b2lkIElubGluZUZvcm1hdHRpbmdD b250ZXh0OjpMaW5lOjphcHBlbmRDb250ZW50KGNvbnN0IElubGluZUxpbmVCcmVha2VyOjpSdW4m CiAKICAgICBhdXRvIHJlcXVpcmVzTmV3SW5saW5lUnVuID0gIWhhc0NvbnRlbnQoKSB8fCAhY29u dGVudC5pc1RleHQoKSB8fCAhbV9sYXN0UnVuQ2FuRXhwYW5kOwogICAgIGlmIChyZXF1aXJlc05l d0lubGluZVJ1bikgewotICAgICAgICBhdXRvIGlubGluZVJ1biA9IElubGluZVJ1biB7IGNvbnRl bnRMb2dpY2FsUmlnaHQoKSwgcnVuLndpZHRoLCBjb250ZW50LmlubGluZUl0ZW0oKSB9OworICAg ICAgICAvLyBGSVhNRTogVGhpcyBuZWVkcyBwcm9wZXIgYmFzZWxpbmUgaGFuZGxpbmcKKyAgICAg ICAgYXV0byBpbmxpbmVSdW4gPSBJbmxpbmVSdW4geyB7IGxvZ2ljYWxUb3AoKSwgY29udGVudExv Z2ljYWxSaWdodCgpLCBydW4ud2lkdGgsIGxvZ2ljYWxCb3R0b20oKSAtIGxvZ2ljYWxUb3AoKSB9 LCBjb250ZW50LmlubGluZUl0ZW0oKSB9OwogICAgICAgICBpZiAodGV4dFJ1bikKICAgICAgICAg ICAgIGlubGluZVJ1bi5zZXRUZXh0Q29udGV4dCh7IHRleHRSdW4tPnN0YXJ0KCksIHRleHRSdW4t Pmxlbmd0aCgpIH0pOwogICAgICAgICBtX2Zvcm1hdHRpbmdTdGF0ZS5hcHBlbmRJbmxpbmVSdW4o aW5saW5lUnVuKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxv ZwppbmRleCA5ZmI0OGM2OTM5Ni4uODYwNWYyNzgwZWYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5n ZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAxOC0xMC0yNyAg WmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgorCisgICAgICAgIFtMRkNdIEFkZCBzdXBw b3J0IGZvciBpbmZsb3cgbm9uIHJlcGxhY2VkIGNvbnRlbnQgaGVpZ2h0IHdoZW4gdGhlIGJveCBp cyBhbiBpbmxpbmUgZm9ybWF0dGluZyByb290LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkxMDExCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBMYXlvdXRSZWxvYWRlZC9taXNjL0xGQy1wYXNzaW5nLXRl c3RzLnR4dDoKKwogMjAxOC0xMC0yNyAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgog CiAgICAgICAgIFtMRkNdW0lGQ10gSW5saW5lIGxheW91dCBwcm9kdWNlcyBzZXBhcmF0ZSBydW5z IHdoZW4gZmxvYXQgaXMgcHJlc2VudC4KZGlmZiAtLWdpdCBhL1Rvb2xzL0xheW91dFJlbG9hZGVk L21pc2MvTEZDLXBhc3NpbmctdGVzdHMudHh0IGIvVG9vbHMvTGF5b3V0UmVsb2FkZWQvbWlzYy9M RkMtcGFzc2luZy10ZXN0cy50eHQKaW5kZXggMjU3Y2RiOWQ5ZWMuLjVjNzI5ZmM1ZDBlIDEwMDY0 NAotLS0gYS9Ub29scy9MYXlvdXRSZWxvYWRlZC9taXNjL0xGQy1wYXNzaW5nLXRlc3RzLnR4dAor KysgYi9Ub29scy9MYXlvdXRSZWxvYWRlZC9taXNjL0xGQy1wYXNzaW5nLXRlc3RzLnR4dApAQCAt NjUsMyArNjUsNCBAQCBmYXN0L2Jsb2NrL2Jsb2NrLW9ubHkvbWluLW1heC1oZWlnaHQtcGVyY2Vu dGFnZS5odG1sCiBmYXN0L2Jsb2NrL2Jhc2ljL2lubGluZS1jb250ZW50LXdpdGgtZmxvYXRpbmct aW1hZ2UuaHRtbAogZmFzdC9ibG9jay9iYXNpYy9pbmxpbmUtY29udGVudC13aXRoLWZsb2F0aW5n LWltYWdlczIuaHRtbAogZmFzdC9pbmxpbmUvc2ltcGxlLWludHJ1ZGluZy1mbG9hdDEuaHRtbAor ZmFzdC9pbmxpbmUvc2ltcGxlLWludHJ1ZGluZy1mbG9hdHMyLmh0bWwK