219330 2020-11-28 17:04:48 -0800 [LFC][IFC] Remove LineBuilder::availableWidth 2020-11-29 11:11:20 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham koivisto sam simon.fraser webkit-bug-importer zalan oldest_to_newest 1710449 0 zalan 2020-11-28 17:04:48 -0800 there is no "global" available width. it should be recomputed whenever we add a new inline level box to accommodate for intrusive floats. 1710450 1 414982 zalan 2020-11-28 17:10:27 -0800 Created attachment 414982 Patch 1710451 2 414982 sam 2020-11-28 17:13:33 -0800 Comment on attachment 414982 Patch Is this observable? Can this be tested / is this tested already? 1710455 3 414984 zalan 2020-11-28 19:49:01 -0800 Created attachment 414984 Patch 1710480 4 zalan 2020-11-29 10:43:40 -0800 (In reply to Sam Weinig from comment #2) > Comment on attachment 414982 [details] > Patch > > Is this observable? Can this be tested / is this tested already? Not yet, this is in preparation for supporting cases when the inline level box stretches the line vertically and we need to check if floats are in the way (so the line may have different available space values depending on the current line height). 1710483 5 ews-feeder 2020-11-29 11:10:23 -0800 Committed r270228: <https://trac.webkit.org/changeset/270228> All reviewed patches have been landed. Closing bug and clearing flags on attachment 414984. 1710484 6 webkit-bug-importer 2020-11-29 11:11:20 -0800 <rdar://problem/71787245> 414982 2020-11-28 17:10:27 -0800 2020-11-28 19:49:00 -0800 Patch bug-219330-20201128171026.patch text/plain 6164 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwMjE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDYxN2I3YjcwYTk3YzIx YTgxNjU4NDcyN2U2NDk2OTRmZjNhZWRiNi4uYjkwNWEzYzIwYTA4MDMxZmM5ZjJmYjFmZDgwZWMw MGNkNTgyYTQ5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIwLTExLTI4ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBSZW1vdmUg TGluZUJ1aWxkZXI6OmF2YWlsYWJsZVdpZHRoCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMTkzMzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBUaGVyZSBpcyBubyAiZ2xvYmFsIiBhdmFpbGFibGUgd2lkdGgg d2hpbGUgYnVpbGRpbmcgdGhlIGxpbmUuIEl0IG1heSB2ZXJ5IHdlbGwgY2hhbmdlIGFzCisgICAg ICAgIGlubGluZSBsZXZlbCBib3hlcyBzdHJldGNoIHRoZSBsaW5lIGFuZCBhZGRpdGlvbmFsIGZs b2F0cyB0dXJuIHRvIGludHJ1c2l2ZS4KKworICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0 aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGlu ZUJ1aWxkZXI6OmNsb3NlKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJ1aWxkZXI6 OmhhbmRsZUZsb2F0T3JJbmxpbmVDb250ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 TGluZUJ1aWxkZXI6OnJlYnVpbGRMaW5lRm9yVHJhaWxpbmdTb2Z0SHlwaGVuKToKKyAgICAgICAg KiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5oOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVpbGRlcjo6YXZhaWxhYmxlV2lkdGggY29uc3QpOiBEZWxl dGVkLgorCiAyMDIwLTExLTI4ICBEb24gT2xtc3RlYWQgIDxkb24ub2xtc3RlYWRAc29ueS5jb20+ CiAKICAgICAgICAgUmVtb3ZlIGVudW1zIGZvciBHQ0dMZW51bSBjb25zdGFudHMgaW4gR3JhcGhp Y3NDb250ZXh0R0wgYW5kIEV4dGVuc2lvbnNHTApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwCmluZGV4 IDUwNzA4MTBjYzY3Mjc4MzFkMjE3YTEzODM1MjJmOGJkYWYxOWEzNTEuLmQ1YmExNDJmZDEzNTQ3 ZTE2NDc5MmU5MjA5YjM5N2RhYWEzMjYxYmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5jcHAKQEAg LTMzMSwxMSArMzMxLDEyIEBAIExpbmVCdWlsZGVyOjpJbmxpbmVJdGVtUmFuZ2UgTGluZUJ1aWxk ZXI6OmNsb3NlKGNvbnN0IElubGluZUl0ZW1SYW5nZSYgbmVlZHNMYXlvCiAgICAgICAgIC8vIExp bmUgaXMgZW1wdHksIHdlIG9ubHkgbWFuYWdlZCB0byBwbGFjZSBmbG9hdCBib3hlcy4KICAgICAg ICAgcmV0dXJuIGxpbmVSYW5nZTsKICAgICB9Ci0gICAgbV9saW5lLnJlbW92ZUNvbGxhcHNpYmxl Q29udGVudChhdmFpbGFibGVXaWR0aCgpKTsKKyAgICBhdXRvIGF2YWlsYWJsZVdpZHRoID0gbV9o b3Jpem9udGFsU3BhY2VGb3JMaW5lIC0gbV9saW5lLmNvbnRlbnRMb2dpY2FsV2lkdGgoKTsKKyAg ICBtX2xpbmUucmVtb3ZlQ29sbGFwc2libGVDb250ZW50KGF2YWlsYWJsZVdpZHRoKTsKICAgICBh dXRvIGhvcml6b250YWxBbGlnbm1lbnQgPSByb290KCkuc3R5bGUoKS50ZXh0QWxpZ24oKTsKICAg ICBhdXRvIHJ1bnNFeHBhbmRIb3Jpem9udGFsbHkgPSBob3Jpem9udGFsQWxpZ25tZW50ID09IFRl eHRBbGlnbk1vZGU6Okp1c3RpZnkgJiYgIWlzTGFzdExpbmVXaXRoSW5saW5lQ29udGVudChsaW5l UmFuZ2UsIG5lZWRzTGF5b3V0UmFuZ2UuZW5kLCBjb21taXR0ZWRDb250ZW50LnBhcnRpYWxUcmFp bGluZ0NvbnRlbnRMZW5ndGgpOwogICAgIGlmIChydW5zRXhwYW5kSG9yaXpvbnRhbGx5KQotICAg ICAgICBtX2xpbmUuYXBwbHlSdW5FeHBhbnNpb24oYXZhaWxhYmxlV2lkdGgoKSk7CisgICAgICAg IG1fbGluZS5hcHBseVJ1bkV4cGFuc2lvbihhdmFpbGFibGVXaWR0aCk7CiAgICAgYXV0byBsaW5l RW5kc1dpdGhIeXBoZW4gPSBmYWxzZTsKICAgICBpZiAoIW1fbGluZS5pc0NvbnNpZGVyZWRFbXB0 eSgpKSB7CiAgICAgICAgIEFTU0VSVCghbV9saW5lLnJ1bnMoKS5pc0VtcHR5KCkpOwpAQCAtNTMw LDkgKzUzMSwxMCBAQCBMaW5lQnVpbGRlcjo6UmVzdWx0IExpbmVCdWlsZGVyOjpoYW5kbGVGbG9h dE9ySW5saW5lQ29udGVudChJbmxpbmVDb250ZW50QnJlYWtlcgogICAgICAgICBBU1NFUlQoaW5s aW5lQ29udGVudC50cmFpbGluZ0xpbmVCcmVhaygpIHx8IGlubGluZUNvbnRlbnQudHJhaWxpbmdX b3JkQnJlYWtPcHBvcnR1bml0eSgpKTsKICAgICAgICAgcmV0dXJuIHsgaW5saW5lQ29udGVudC50 cmFpbGluZ0xpbmVCcmVhaygpID8gSW5saW5lQ29udGVudEJyZWFrZXI6OklzRW5kT2ZMaW5lOjpZ ZXMgOiBJbmxpbmVDb250ZW50QnJlYWtlcjo6SXNFbmRPZkxpbmU6Ok5vIH07CiAgICAgfQorICAg IGF1dG8gYXZhaWxhYmxlV2lkdGggPSBtX2hvcml6b250YWxTcGFjZUZvckxpbmUgLSBtX2xpbmUu Y29udGVudExvZ2ljYWxXaWR0aCgpOwogICAgIGlmIChsaW5lQ2FuZGlkYXRlLmZsb2F0SXRlbSkg ewogICAgICAgICBhdXRvIGZsb2F0Qm94V2lkdGggPSBpbmxpbmVJdGVtV2lkdGgoKmxpbmVDYW5k aWRhdGUuZmxvYXRJdGVtLCB7IH0pOwotICAgICAgICBpZiAoZmxvYXRCb3hXaWR0aCA+IGF2YWls YWJsZVdpZHRoKCkgJiYgIW1fbGluZS5pc0NvbnNpZGVyZWRFbXB0eSgpKQorICAgICAgICBpZiAo ZmxvYXRCb3hXaWR0aCA+IGF2YWlsYWJsZVdpZHRoICYmICFtX2xpbmUuaXNDb25zaWRlcmVkRW1w dHkoKSkKICAgICAgICAgICAgIHJldHVybiB7IElubGluZUNvbnRlbnRCcmVha2VyOjpJc0VuZE9m TGluZTo6WWVzIH07CiAgICAgICAgIC8vIFRoaXMgZmxvYXQgc2hyaW5rcyB0aGUgY3VycmVudCBs aW5lLgogICAgICAgICBhdXRvJiBmbG9hdEJveCA9IGxpbmVDYW5kaWRhdGUuZmxvYXRJdGVtLT5s YXlvdXRCb3goKTsKQEAgLTU1NSw3ICs1NTcsNyBAQCBMaW5lQnVpbGRlcjo6UmVzdWx0IExpbmVC dWlsZGVyOjpoYW5kbGVGbG9hdE9ySW5saW5lQ29udGVudChJbmxpbmVDb250ZW50QnJlYWtlcgog ICAgIC8vIENoZWNrIGlmIHRoaXMgbmV3IGNvbnRlbnQgZml0cy4KICAgICBhdXRvJiBjb250aW51 b3VzSW5saW5lQ29udGVudCA9IGxpbmVDYW5kaWRhdGUuaW5saW5lQ29udGVudCgpOwogICAgIGF1 dG8gaXNMaW5lQ29uc2lkZXJlZEVtcHR5ID0gbV9saW5lLmlzQ29uc2lkZXJlZEVtcHR5KCkgJiYg IW1fY29udGVudElzQ29uc3RyYWluZWRCeUZsb2F0OwotICAgIGF1dG8gbGluZVN0YXR1cyA9IElu bGluZUNvbnRlbnRCcmVha2VyOjpMaW5lU3RhdHVzIHsgbV9saW5lLmNvbnRlbnRMb2dpY2FsV2lk dGgoKSwgYXZhaWxhYmxlV2lkdGgoKSwgbV9saW5lLnRyaW1tYWJsZVRyYWlsaW5nV2lkdGgoKSwg bV9saW5lLnRyYWlsaW5nU29mdEh5cGhlbldpZHRoKCksIG1fbGluZS5pc1RyYWlsaW5nUnVuRnVs bHlUcmltbWFibGUoKSwgaXNMaW5lQ29uc2lkZXJlZEVtcHR5IH07CisgICAgYXV0byBsaW5lU3Rh dHVzID0gSW5saW5lQ29udGVudEJyZWFrZXI6OkxpbmVTdGF0dXMgeyBtX2xpbmUuY29udGVudExv Z2ljYWxXaWR0aCgpLCBhdmFpbGFibGVXaWR0aCwgbV9saW5lLnRyaW1tYWJsZVRyYWlsaW5nV2lk dGgoKSwgbV9saW5lLnRyYWlsaW5nU29mdEh5cGhlbldpZHRoKCksIG1fbGluZS5pc1RyYWlsaW5n UnVuRnVsbHlUcmltbWFibGUoKSwgaXNMaW5lQ29uc2lkZXJlZEVtcHR5IH07CiAgICAgYXV0byBy ZXN1bHQgPSBpbmxpbmVDb250ZW50QnJlYWtlci5wcm9jZXNzSW5saW5lQ29udGVudChjb250aW51 b3VzSW5saW5lQ29udGVudCwgbGluZVN0YXR1cyk7CiAgICAgaWYgKHJlc3VsdC5sYXN0V3JhcE9w cG9ydHVuaXR5SXRlbSkKICAgICAgICAgbV93cmFwT3Bwb3J0dW5pdHlMaXN0LmFwcGVuZChyZXN1 bHQubGFzdFdyYXBPcHBvcnR1bml0eUl0ZW0pOwpAQCAtNjY2LDkgKzY2OCwxMCBAQCBzaXplX3Qg TGluZUJ1aWxkZXI6OnJlYnVpbGRMaW5lRm9yVHJhaWxpbmdTb2Z0SHlwaGVuKGNvbnN0IElubGlu ZUl0ZW1SYW5nZSYgbGF5bwogICAgICAgICAvLyBGSVhNRTogSWYgdGhpcyB0dXJucyBvdXQgdG8g YmUgYSBwZXJmIGlzc3VlLCB3ZSBjb3VsZCBhbHNvIHRyYXZlcnNlIHRoZSB3cmFwIGxpc3QgYW5k IGtlZXAgYWRkaW5nIHRoZSBpdGVtcwogICAgICAgICAvLyB3aGlsZSB3YXRjaGluZyB0aGUgYXZh aWxhYmxlIHdpZHRoIHZlcnkgY2xvc2VseS4KICAgICAgICAgYXV0byBjb21taXR0ZWRDb3VudCA9 IHJlYnVpbGRMaW5lKGxheW91dFJhbmdlLCBzb2Z0V3JhcE9wcG9ydHVuaXR5SXRlbSk7CisgICAg ICAgIGF1dG8gYXZhaWxhYmxlV2lkdGggPSBtX2hvcml6b250YWxTcGFjZUZvckxpbmUgLSBtX2xp bmUuY29udGVudExvZ2ljYWxXaWR0aCgpOwogICAgICAgICBhdXRvIHRyYWlsaW5nU29mdEh5cGhl bldpZHRoID0gbV9saW5lLnRyYWlsaW5nU29mdEh5cGhlbldpZHRoKCk7CiAgICAgICAgIC8vIENo ZWNrIGlmIHRoZSB0cmFpbGluZyBoeXBoZW4gbm93IGZpdHMgdGhlIGxpbmUgKG9yIHdlIGRvbid0 IG5lZWQgaHloZW4gYW55bW9yZSkuCi0gICAgICAgIGlmICghdHJhaWxpbmdTb2Z0SHlwaGVuV2lk dGggfHwgdHJhaWxpbmdTb2Z0SHlwaGVuV2lkdGggPD0gYXZhaWxhYmxlV2lkdGgoKSkgeworICAg ICAgICBpZiAoIXRyYWlsaW5nU29mdEh5cGhlbldpZHRoIHx8IHRyYWlsaW5nU29mdEh5cGhlbldp ZHRoIDw9IGF2YWlsYWJsZVdpZHRoKSB7CiAgICAgICAgICAgICBpZiAodHJhaWxpbmdTb2Z0SHlw aGVuV2lkdGgpCiAgICAgICAgICAgICAgICAgbV9saW5lLmFkZFRyYWlsaW5nSHlwaGVuKCp0cmFp bGluZ1NvZnRIeXBoZW5XaWR0aCk7CiAgICAgICAgICAgICByZXR1cm4gY29tbWl0dGVkQ291bnQ7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9Jbmxp bmVMaW5lQnVpbGRlci5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcv SW5saW5lTGluZUJ1aWxkZXIuaAppbmRleCAwZWM2ZWNkMjdiNDAyZjZkNDVhNDZjMWY1NTkzNmYx Y2NmNmQ5ODQ3Li5lODgxODNlMzNkZWFkYzYxMDRiOTAwMjMyNDdlYWMwY2RjMjQwMjEyIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5l QnVpbGRlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lu bGluZUxpbmVCdWlsZGVyLmgKQEAgLTEwMSw3ICsxMDEsNiBAQCBwcml2YXRlOgogCiAgICAgSW5s aW5lTGF5b3V0VW5pdCBpbmxpbmVJdGVtV2lkdGgoY29uc3QgSW5saW5lSXRlbSYsIElubGluZUxh eW91dFVuaXQgY29udGVudExvZ2ljYWxMZWZ0KSBjb25zdDsKICAgICBib29sIGlzTGFzdExpbmVX aXRoSW5saW5lQ29udGVudChjb25zdCBJbmxpbmVJdGVtUmFuZ2UmIGxpbmVSYW5nZSwgc2l6ZV90 IGxhc3RJbmxpbmVJdGVtSW5kZXgsIGJvb2wgaGFzUGFydGlhbFRyYWlsaW5nQ29udGVudCkgY29u c3Q7Ci0gICAgSW5saW5lTGF5b3V0VW5pdCBhdmFpbGFibGVXaWR0aCgpIGNvbnN0IHsgcmV0dXJu IG1faG9yaXpvbnRhbFNwYWNlRm9yTGluZSAtIG1fbGluZS5jb250ZW50TG9naWNhbFdpZHRoKCk7 IH0KIAogICAgIGNvbnN0IElubGluZUZvcm1hdHRpbmdDb250ZXh0JiBmb3JtYXR0aW5nQ29udGV4 dCgpIGNvbnN0IHsgcmV0dXJuIG1faW5saW5lRm9ybWF0dGluZ0NvbnRleHQ7IH0KICAgICBjb25z dCBDb250YWluZXJCb3gmIHJvb3QoKSBjb25zdCB7IHJldHVybiBtX2Zvcm1hdHRpbmdDb250ZXh0 Um9vdDsgfQo= 414984 2020-11-28 19:49:01 -0800 2020-11-29 11:10:24 -0800 Patch bug-219330-20201128194900.patch text/plain 6205 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwMjE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDYxN2I3YjcwYTk3YzIx YTgxNjU4NDcyN2U2NDk2OTRmZjNhZWRiNi4uYjkwNWEzYzIwYTA4MDMxZmM5ZjJmYjFmZDgwZWMw MGNkNTgyYTQ5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIwLTExLTI4ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBSZW1vdmUg TGluZUJ1aWxkZXI6OmF2YWlsYWJsZVdpZHRoCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMTkzMzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBUaGVyZSBpcyBubyAiZ2xvYmFsIiBhdmFpbGFibGUgd2lkdGgg d2hpbGUgYnVpbGRpbmcgdGhlIGxpbmUuIEl0IG1heSB2ZXJ5IHdlbGwgY2hhbmdlIGFzCisgICAg ICAgIGlubGluZSBsZXZlbCBib3hlcyBzdHJldGNoIHRoZSBsaW5lIGFuZCBhZGRpdGlvbmFsIGZs b2F0cyB0dXJuIHRvIGludHJ1c2l2ZS4KKworICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0 aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGlu ZUJ1aWxkZXI6OmNsb3NlKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJ1aWxkZXI6 OmhhbmRsZUZsb2F0T3JJbmxpbmVDb250ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 TGluZUJ1aWxkZXI6OnJlYnVpbGRMaW5lRm9yVHJhaWxpbmdTb2Z0SHlwaGVuKToKKyAgICAgICAg KiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5oOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVpbGRlcjo6YXZhaWxhYmxlV2lkdGggY29uc3QpOiBEZWxl dGVkLgorCiAyMDIwLTExLTI4ICBEb24gT2xtc3RlYWQgIDxkb24ub2xtc3RlYWRAc29ueS5jb20+ CiAKICAgICAgICAgUmVtb3ZlIGVudW1zIGZvciBHQ0dMZW51bSBjb25zdGFudHMgaW4gR3JhcGhp Y3NDb250ZXh0R0wgYW5kIEV4dGVuc2lvbnNHTApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwCmluZGV4 IDUwNzA4MTBjYzY3Mjc4MzFkMjE3YTEzODM1MjJmOGJkYWYxOWEzNTEuLjMwMGM5ZjlmZWQ5ZmEz N2U5MmI3MGZkYjgyNDEzODUyZjYxZGU0MzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5jcHAKQEAg LTMzMSwxMSArMzMxLDEyIEBAIExpbmVCdWlsZGVyOjpJbmxpbmVJdGVtUmFuZ2UgTGluZUJ1aWxk ZXI6OmNsb3NlKGNvbnN0IElubGluZUl0ZW1SYW5nZSYgbmVlZHNMYXlvCiAgICAgICAgIC8vIExp bmUgaXMgZW1wdHksIHdlIG9ubHkgbWFuYWdlZCB0byBwbGFjZSBmbG9hdCBib3hlcy4KICAgICAg ICAgcmV0dXJuIGxpbmVSYW5nZTsKICAgICB9Ci0gICAgbV9saW5lLnJlbW92ZUNvbGxhcHNpYmxl Q29udGVudChhdmFpbGFibGVXaWR0aCgpKTsKKyAgICBhdXRvIGF2YWlsYWJsZVdpZHRoID0gbV9o b3Jpem9udGFsU3BhY2VGb3JMaW5lIC0gbV9saW5lLmNvbnRlbnRMb2dpY2FsV2lkdGgoKTsKKyAg ICBtX2xpbmUucmVtb3ZlQ29sbGFwc2libGVDb250ZW50KGF2YWlsYWJsZVdpZHRoKTsKICAgICBh dXRvIGhvcml6b250YWxBbGlnbm1lbnQgPSByb290KCkuc3R5bGUoKS50ZXh0QWxpZ24oKTsKICAg ICBhdXRvIHJ1bnNFeHBhbmRIb3Jpem9udGFsbHkgPSBob3Jpem9udGFsQWxpZ25tZW50ID09IFRl eHRBbGlnbk1vZGU6Okp1c3RpZnkgJiYgIWlzTGFzdExpbmVXaXRoSW5saW5lQ29udGVudChsaW5l UmFuZ2UsIG5lZWRzTGF5b3V0UmFuZ2UuZW5kLCBjb21taXR0ZWRDb250ZW50LnBhcnRpYWxUcmFp bGluZ0NvbnRlbnRMZW5ndGgpOwogICAgIGlmIChydW5zRXhwYW5kSG9yaXpvbnRhbGx5KQotICAg ICAgICBtX2xpbmUuYXBwbHlSdW5FeHBhbnNpb24oYXZhaWxhYmxlV2lkdGgoKSk7CisgICAgICAg IG1fbGluZS5hcHBseVJ1bkV4cGFuc2lvbihtX2hvcml6b250YWxTcGFjZUZvckxpbmUgLSBtX2xp bmUuY29udGVudExvZ2ljYWxXaWR0aCgpKTsKICAgICBhdXRvIGxpbmVFbmRzV2l0aEh5cGhlbiA9 IGZhbHNlOwogICAgIGlmICghbV9saW5lLmlzQ29uc2lkZXJlZEVtcHR5KCkpIHsKICAgICAgICAg QVNTRVJUKCFtX2xpbmUucnVucygpLmlzRW1wdHkoKSk7CkBAIC01MzAsOSArNTMxLDEwIEBAIExp bmVCdWlsZGVyOjpSZXN1bHQgTGluZUJ1aWxkZXI6OmhhbmRsZUZsb2F0T3JJbmxpbmVDb250ZW50 KElubGluZUNvbnRlbnRCcmVha2VyCiAgICAgICAgIEFTU0VSVChpbmxpbmVDb250ZW50LnRyYWls aW5nTGluZUJyZWFrKCkgfHwgaW5saW5lQ29udGVudC50cmFpbGluZ1dvcmRCcmVha09wcG9ydHVu aXR5KCkpOwogICAgICAgICByZXR1cm4geyBpbmxpbmVDb250ZW50LnRyYWlsaW5nTGluZUJyZWFr KCkgPyBJbmxpbmVDb250ZW50QnJlYWtlcjo6SXNFbmRPZkxpbmU6OlllcyA6IElubGluZUNvbnRl bnRCcmVha2VyOjpJc0VuZE9mTGluZTo6Tm8gfTsKICAgICB9CisgICAgYXV0byBhdmFpbGFibGVX aWR0aCA9IG1faG9yaXpvbnRhbFNwYWNlRm9yTGluZSAtIG1fbGluZS5jb250ZW50TG9naWNhbFdp ZHRoKCk7CiAgICAgaWYgKGxpbmVDYW5kaWRhdGUuZmxvYXRJdGVtKSB7CiAgICAgICAgIGF1dG8g ZmxvYXRCb3hXaWR0aCA9IGlubGluZUl0ZW1XaWR0aCgqbGluZUNhbmRpZGF0ZS5mbG9hdEl0ZW0s IHsgfSk7Ci0gICAgICAgIGlmIChmbG9hdEJveFdpZHRoID4gYXZhaWxhYmxlV2lkdGgoKSAmJiAh bV9saW5lLmlzQ29uc2lkZXJlZEVtcHR5KCkpCisgICAgICAgIGlmIChmbG9hdEJveFdpZHRoID4g YXZhaWxhYmxlV2lkdGggJiYgIW1fbGluZS5pc0NvbnNpZGVyZWRFbXB0eSgpKQogICAgICAgICAg ICAgcmV0dXJuIHsgSW5saW5lQ29udGVudEJyZWFrZXI6OklzRW5kT2ZMaW5lOjpZZXMgfTsKICAg ICAgICAgLy8gVGhpcyBmbG9hdCBzaHJpbmtzIHRoZSBjdXJyZW50IGxpbmUuCiAgICAgICAgIGF1 dG8mIGZsb2F0Qm94ID0gbGluZUNhbmRpZGF0ZS5mbG9hdEl0ZW0tPmxheW91dEJveCgpOwpAQCAt NTU1LDcgKzU1Nyw3IEBAIExpbmVCdWlsZGVyOjpSZXN1bHQgTGluZUJ1aWxkZXI6OmhhbmRsZUZs b2F0T3JJbmxpbmVDb250ZW50KElubGluZUNvbnRlbnRCcmVha2VyCiAgICAgLy8gQ2hlY2sgaWYg dGhpcyBuZXcgY29udGVudCBmaXRzLgogICAgIGF1dG8mIGNvbnRpbnVvdXNJbmxpbmVDb250ZW50 ID0gbGluZUNhbmRpZGF0ZS5pbmxpbmVDb250ZW50KCk7CiAgICAgYXV0byBpc0xpbmVDb25zaWRl cmVkRW1wdHkgPSBtX2xpbmUuaXNDb25zaWRlcmVkRW1wdHkoKSAmJiAhbV9jb250ZW50SXNDb25z dHJhaW5lZEJ5RmxvYXQ7Ci0gICAgYXV0byBsaW5lU3RhdHVzID0gSW5saW5lQ29udGVudEJyZWFr ZXI6OkxpbmVTdGF0dXMgeyBtX2xpbmUuY29udGVudExvZ2ljYWxXaWR0aCgpLCBhdmFpbGFibGVX aWR0aCgpLCBtX2xpbmUudHJpbW1hYmxlVHJhaWxpbmdXaWR0aCgpLCBtX2xpbmUudHJhaWxpbmdT b2Z0SHlwaGVuV2lkdGgoKSwgbV9saW5lLmlzVHJhaWxpbmdSdW5GdWxseVRyaW1tYWJsZSgpLCBp c0xpbmVDb25zaWRlcmVkRW1wdHkgfTsKKyAgICBhdXRvIGxpbmVTdGF0dXMgPSBJbmxpbmVDb250 ZW50QnJlYWtlcjo6TGluZVN0YXR1cyB7IG1fbGluZS5jb250ZW50TG9naWNhbFdpZHRoKCksIGF2 YWlsYWJsZVdpZHRoLCBtX2xpbmUudHJpbW1hYmxlVHJhaWxpbmdXaWR0aCgpLCBtX2xpbmUudHJh aWxpbmdTb2Z0SHlwaGVuV2lkdGgoKSwgbV9saW5lLmlzVHJhaWxpbmdSdW5GdWxseVRyaW1tYWJs ZSgpLCBpc0xpbmVDb25zaWRlcmVkRW1wdHkgfTsKICAgICBhdXRvIHJlc3VsdCA9IGlubGluZUNv bnRlbnRCcmVha2VyLnByb2Nlc3NJbmxpbmVDb250ZW50KGNvbnRpbnVvdXNJbmxpbmVDb250ZW50 LCBsaW5lU3RhdHVzKTsKICAgICBpZiAocmVzdWx0Lmxhc3RXcmFwT3Bwb3J0dW5pdHlJdGVtKQog ICAgICAgICBtX3dyYXBPcHBvcnR1bml0eUxpc3QuYXBwZW5kKHJlc3VsdC5sYXN0V3JhcE9wcG9y dHVuaXR5SXRlbSk7CkBAIC02NjYsOSArNjY4LDEwIEBAIHNpemVfdCBMaW5lQnVpbGRlcjo6cmVi dWlsZExpbmVGb3JUcmFpbGluZ1NvZnRIeXBoZW4oY29uc3QgSW5saW5lSXRlbVJhbmdlJiBsYXlv CiAgICAgICAgIC8vIEZJWE1FOiBJZiB0aGlzIHR1cm5zIG91dCB0byBiZSBhIHBlcmYgaXNzdWUs IHdlIGNvdWxkIGFsc28gdHJhdmVyc2UgdGhlIHdyYXAgbGlzdCBhbmQga2VlcCBhZGRpbmcgdGhl IGl0ZW1zCiAgICAgICAgIC8vIHdoaWxlIHdhdGNoaW5nIHRoZSBhdmFpbGFibGUgd2lkdGggdmVy eSBjbG9zZWx5LgogICAgICAgICBhdXRvIGNvbW1pdHRlZENvdW50ID0gcmVidWlsZExpbmUobGF5 b3V0UmFuZ2UsIHNvZnRXcmFwT3Bwb3J0dW5pdHlJdGVtKTsKKyAgICAgICAgYXV0byBhdmFpbGFi bGVXaWR0aCA9IG1faG9yaXpvbnRhbFNwYWNlRm9yTGluZSAtIG1fbGluZS5jb250ZW50TG9naWNh bFdpZHRoKCk7CiAgICAgICAgIGF1dG8gdHJhaWxpbmdTb2Z0SHlwaGVuV2lkdGggPSBtX2xpbmUu dHJhaWxpbmdTb2Z0SHlwaGVuV2lkdGgoKTsKICAgICAgICAgLy8gQ2hlY2sgaWYgdGhlIHRyYWls aW5nIGh5cGhlbiBub3cgZml0cyB0aGUgbGluZSAob3Igd2UgZG9uJ3QgbmVlZCBoeWhlbiBhbnlt b3JlKS4KLSAgICAgICAgaWYgKCF0cmFpbGluZ1NvZnRIeXBoZW5XaWR0aCB8fCB0cmFpbGluZ1Nv ZnRIeXBoZW5XaWR0aCA8PSBhdmFpbGFibGVXaWR0aCgpKSB7CisgICAgICAgIGlmICghdHJhaWxp bmdTb2Z0SHlwaGVuV2lkdGggfHwgdHJhaWxpbmdTb2Z0SHlwaGVuV2lkdGggPD0gYXZhaWxhYmxl V2lkdGgpIHsKICAgICAgICAgICAgIGlmICh0cmFpbGluZ1NvZnRIeXBoZW5XaWR0aCkKICAgICAg ICAgICAgICAgICBtX2xpbmUuYWRkVHJhaWxpbmdIeXBoZW4oKnRyYWlsaW5nU29mdEh5cGhlbldp ZHRoKTsKICAgICAgICAgICAgIHJldHVybiBjb21taXR0ZWRDb3VudDsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmgg Yi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRl ci5oCmluZGV4IDBlYzZlY2QyN2I0MDJmNmQ0NWE0NmMxZjU1OTM2ZjFjY2Y2ZDk4NDcuLmU4ODE4 M2UzM2RlYWRjNjEwNGI5MDAyMzI0N2VhYzBjZGMyNDAyMTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmgKKysrIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIu aApAQCAtMTAxLDcgKzEwMSw2IEBAIHByaXZhdGU6CiAKICAgICBJbmxpbmVMYXlvdXRVbml0IGlu bGluZUl0ZW1XaWR0aChjb25zdCBJbmxpbmVJdGVtJiwgSW5saW5lTGF5b3V0VW5pdCBjb250ZW50 TG9naWNhbExlZnQpIGNvbnN0OwogICAgIGJvb2wgaXNMYXN0TGluZVdpdGhJbmxpbmVDb250ZW50 KGNvbnN0IElubGluZUl0ZW1SYW5nZSYgbGluZVJhbmdlLCBzaXplX3QgbGFzdElubGluZUl0ZW1J bmRleCwgYm9vbCBoYXNQYXJ0aWFsVHJhaWxpbmdDb250ZW50KSBjb25zdDsKLSAgICBJbmxpbmVM YXlvdXRVbml0IGF2YWlsYWJsZVdpZHRoKCkgY29uc3QgeyByZXR1cm4gbV9ob3Jpem9udGFsU3Bh Y2VGb3JMaW5lIC0gbV9saW5lLmNvbnRlbnRMb2dpY2FsV2lkdGgoKTsgfQogCiAgICAgY29uc3Qg SW5saW5lRm9ybWF0dGluZ0NvbnRleHQmIGZvcm1hdHRpbmdDb250ZXh0KCkgY29uc3QgeyByZXR1 cm4gbV9pbmxpbmVGb3JtYXR0aW5nQ29udGV4dDsgfQogICAgIGNvbnN0IENvbnRhaW5lckJveCYg cm9vdCgpIGNvbnN0IHsgcmV0dXJuIG1fZm9ybWF0dGluZ0NvbnRleHRSb290OyB9Cg==