194269 2019-02-04 19:10:08 -0800 [LFC][IFC] collectInlineContent should use pre-computed margins, paddings and borders 2019-02-05 08:02:40 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1502207 0 zalan 2019-02-04 19:10:08 -0800 This is in preparation for using the same code patch by the preferred width computation (currently broken). 1502209 1 361151 zalan 2019-02-04 19:20:34 -0800 Created attachment 361151 Patch 1502352 2 361151 koivisto 2019-02-05 07:30:53 -0800 Comment on attachment 361151 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=361151&action=review > Source/WebCore/layout/layouttree/LayoutBox.h:158 > - unsigned m_baseTypeFlags : 4; > + unsigned m_baseTypeFlags : 5; OptionSet would avoid these problems too! 1502359 3 361151 commit-queue 2019-02-05 08:01:35 -0800 Comment on attachment 361151 Patch Clearing flags on attachment: 361151 Committed r240975: <https://trac.webkit.org/changeset/240975> 1502360 4 commit-queue 2019-02-05 08:01:37 -0800 All reviewed patches have been landed. Closing bug. 1502361 5 webkit-bug-importer 2019-02-05 08:02:40 -0800 <rdar://problem/47818132> 361151 2019-02-04 19:20:34 -0800 2019-02-05 08:01:35 -0800 Patch bug-194269-20190204192017.patch text/plain 9083 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQwOTQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGNmMjk5ZjNmZTk3MDlm MDBhNTRhNWM4MGNhMWMwMDU0NmQ0MmNmYy4uMDQ3YjZlNzAyZWE0N2IwYTlkNzkxN2I5Y2NiZmE5 NGVjOTQwYTc0ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE5LTAyLTA0ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBjb2xsZWN0 SW5saW5lQ29udGVudCBzaG91bGQgdXNlIHByZS1jb21wdXRlZCBtYXJnaW5zLCBwYWRkaW5ncyBh bmQgYm9yZGVycworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTk0MjY5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgSW4gdGhpcyBwYXRjaCB3ZSBwcmUtY29tcHV0ZSB0aGUgbWFyZ2lucyBwYWRkaW5nIGFuZCBi b3JkZXJzIGZvciBmb3JtYXR0aW5nIGNvbnRleHQgcm9vdHMsIHJlcGxhY2VkIGJveGVzIGFuZCBu b24tcmVwbGFjZWQgY29udGFpbmVycy4KKyAgICAgICAgVGhlc2UgcHJvcGVydHkgdmFsdWVzIGFy ZSBpbnB1dCB0byBjb2xsZWN0SW5saW5lQ29udGVudCdzIGlubGluZSBpdGVtIGRldGFjaGluZyBs b2dpYy4KKworICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRp bmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6bmV4dEluUHJlT3JkZXIp OgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6bGF5 b3V0IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ0Nv bnRleHQ6OmNvbXB1dGVNYXJnaW5Cb3JkZXJBbmRQYWRkaW5nIGNvbnN0KToKKyAgICAgICAgKFdl YkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNvbGxlY3RJbmxpbmVDb250 ZW50IGNvbnN0KToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3Jt YXR0aW5nQ29udGV4dC5oOgorICAgICAgICAqIGxheW91dC9sYXlvdXR0cmVlL0xheW91dEJveC5o OiByYW4gb3V0IGJpdHMuIAorCiAyMDE5LTAyLTA0ICBKdXN0aW4gRmFuICA8anVzdGluX2ZhbkBh cHBsZS5jb20+CiAKICAgICAgICAgW1dlYiBHUFVdIENvZGUgY2xlYW4tdXAgZm9yIFJlbmRlclBp cGVsaW5lIGJhY2tlbmQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVm b3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcAppbmRleCA3 OGYzNGY4YzY4OTkzZDM5ZWQ2YWJhZDlmYmIwZjYyYjhhNTJiZGUwLi4xZDFjYTllY2M3ZjJhYWY2 NjJiNjg4N2U0MGU3MDNkYWY0NzZiNTg0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRl eHQuY3BwCkBAIC01MywzMCArNTMsNDIgQEAgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OklubGlu ZUZvcm1hdHRpbmdDb250ZXh0KGNvbnN0IEJveCYgZm9ybWF0dGluZ0NvbnRleHRSb28KIHsKIH0K IAorc3RhdGljIGlubGluZSBjb25zdCBCb3gqIG5leHRJblByZU9yZGVyKGNvbnN0IEJveCYgbGF5 b3V0Qm94LCBjb25zdCBDb250YWluZXImIHJvb3QpCit7CisgICAgY29uc3QgQm94KiBuZXh0SW5Q cmVPcmRlciA9IG51bGxwdHI7CisgICAgaWYgKCFsYXlvdXRCb3guZXN0YWJsaXNoZXNGb3JtYXR0 aW5nQ29udGV4dCgpICYmIGlzPENvbnRhaW5lcj4obGF5b3V0Qm94KSAmJiBkb3duY2FzdDxDb250 YWluZXI+KGxheW91dEJveCkuaGFzSW5GbG93T3JGbG9hdGluZ0NoaWxkKCkpCisgICAgICAgIHJl dHVybiBkb3duY2FzdDxDb250YWluZXI+KGxheW91dEJveCkuZmlyc3RJbkZsb3dPckZsb2F0aW5n Q2hpbGQoKTsKKworICAgIGZvciAobmV4dEluUHJlT3JkZXIgPSAmbGF5b3V0Qm94OyBuZXh0SW5Q cmVPcmRlciAmJiBuZXh0SW5QcmVPcmRlciAhPSAmcm9vdDsgbmV4dEluUHJlT3JkZXIgPSBuZXh0 SW5QcmVPcmRlci0+cGFyZW50KCkpIHsKKyAgICAgICAgaWYgKGF1dG8qIG5leHRTaWJsaW5nID0g bmV4dEluUHJlT3JkZXItPm5leHRJbkZsb3dPckZsb2F0aW5nU2libGluZygpKQorICAgICAgICAg ICAgcmV0dXJuIG5leHRTaWJsaW5nOworICAgIH0KKyAgICByZXR1cm4gbnVsbHB0cjsKK30KKwog dm9pZCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0KCkgY29uc3QKIHsKICAgICBpZiAo IWlzPENvbnRhaW5lcj4ocm9vdCgpKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgTE9HX1dJVEhf U1RSRUFNKEZvcm1hdHRpbmdDb250ZXh0TGF5b3V0LCBzdHJlYW0gPDwgIltTdGFydF0gLT4gaW5s aW5lIGZvcm1hdHRpbmcgY29udGV4dCAtPiBmb3JtYXR0aW5nIHJvb3QoIiA8PCAmcm9vdCgpIDw8 ICIpIik7CisgICAgYXV0byYgcm9vdCA9IGRvd25jYXN0PENvbnRhaW5lcj4odGhpcy0+cm9vdCgp KTsKKyAgICBhdXRvKiBsYXlvdXRCb3ggPSByb290LmZpcnN0SW5GbG93T3JGbG9hdGluZ0NoaWxk KCk7CisgICAgLy8gQ29tcHV0ZSB3aWR0aC9oZWlnaHQgZm9yIG5vbi10ZXh0IGNvbnRlbnQgYW5k IG1hcmdpbi9ib3JkZXIvcGFkZGluZyBmb3IgaW5saW5lIGNvbnRhaW5lcnMuCisgICAgd2hpbGUg KGxheW91dEJveCkgeworICAgICAgICBpZiAobGF5b3V0Qm94LT5lc3RhYmxpc2hlc0Zvcm1hdHRp bmdDb250ZXh0KCkpCisgICAgICAgICAgICBsYXlvdXRGb3JtYXR0aW5nQ29udGV4dFJvb3QoKmxh eW91dEJveCk7CisgICAgICAgIGVsc2UgaWYgKGlzPENvbnRhaW5lcj4oKmxheW91dEJveCkpCisg ICAgICAgICAgICBjb21wdXRlTWFyZ2luQm9yZGVyQW5kUGFkZGluZyhkb3duY2FzdDxJbmxpbmVD b250YWluZXI+KCpsYXlvdXRCb3gpKTsKKyAgICAgICAgZWxzZSBpZiAobGF5b3V0Qm94LT5pc1Jl cGxhY2VkKCkpCisgICAgICAgICAgICBjb21wdXRlV2lkdGhBbmRIZWlnaHRGb3JSZXBsYWNlZElu bGluZUJveCgqbGF5b3V0Qm94KTsKKyAgICAgICAgbGF5b3V0Qm94ID0gbmV4dEluUHJlT3JkZXIo KmxheW91dEJveCwgcm9vdCk7CisgICAgfQogCiAgICAgSW5saW5lUnVuUHJvdmlkZXIgaW5saW5l UnVuUHJvdmlkZXI7CiAgICAgY29sbGVjdElubGluZUNvbnRlbnQoaW5saW5lUnVuUHJvdmlkZXIp OwotICAgIC8vIENvbXB1dGUgd2lkdGgvaGVpZ2h0IGZvciBub24tdGV4dCBjb250ZW50LgotICAg IGZvciAoYXV0byYgaW5saW5lUnVuIDogaW5saW5lUnVuUHJvdmlkZXIucnVucygpKSB7Ci0gICAg ICAgIGlmIChpbmxpbmVSdW4uaXNUZXh0KCkpCi0gICAgICAgICAgICBjb250aW51ZTsKLQotICAg ICAgICBhdXRvJiBsYXlvdXRCb3ggPSBpbmxpbmVSdW4uaW5saW5lSXRlbSgpLmxheW91dEJveCgp OwotICAgICAgICBpZiAobGF5b3V0Qm94LmVzdGFibGlzaGVzRm9ybWF0dGluZ0NvbnRleHQoKSkg ewotICAgICAgICAgICAgbGF5b3V0Rm9ybWF0dGluZ0NvbnRleHRSb290KGxheW91dEJveCk7Ci0g ICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgfQotICAgICAgICBjb21wdXRlV2lkdGhBbmRI ZWlnaHRGb3JSZXBsYWNlZElubGluZUJveChsYXlvdXRCb3gpOwotICAgIH0KLQogICAgIGxheW91 dElubGluZUNvbnRlbnQoaW5saW5lUnVuUHJvdmlkZXIpOwotICAgIExPR19XSVRIX1NUUkVBTShG b3JtYXR0aW5nQ29udGV4dExheW91dCwgc3RyZWFtIDw8ICJbRW5kXSAtPiBpbmxpbmUgZm9ybWF0 dGluZyBjb250ZXh0IC0+IGZvcm1hdHRpbmcgcm9vdCgiIDw8ICZyb290KCkgPDwgIikiKTsKKyAg ICBMT0dfV0lUSF9TVFJFQU0oRm9ybWF0dGluZ0NvbnRleHRMYXlvdXQsIHN0cmVhbSA8PCAiW0Vu ZF0gLT4gaW5saW5lIGZvcm1hdHRpbmcgY29udGV4dCAtPiBmb3JtYXR0aW5nIHJvb3QoIiA8PCAm cm9vdCA8PCAiKSIpOwogfQogCiBzdGF0aWMgYm9vbCBpc1RyaW1tYWJsZUNvbnRlbnQoY29uc3Qg SW5saW5lTGluZUJyZWFrZXI6OlJ1biYgcnVuKQpAQCAtMzI5LDYgKzM0MSwxOSBAQCB2b2lkIElu bGluZUZvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRJbmxpbmVDb250ZW50KGNvbnN0IElubGluZVJ1 blByb3ZpZGVyJiBpbmxpbgogICAgIGNsb3NlTGluZShsaW5lLCBJc0xhc3RMaW5lOjpZZXMpOwog fQogCit2b2lkIElubGluZUZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlTWFyZ2luQm9yZGVyQW5k UGFkZGluZyhjb25zdCBJbmxpbmVDb250YWluZXImIGlubGluZUNvbnRhaW5lcikgY29uc3QKK3sK KyAgICAvLyBOb24tcmVwbGFjZWQsIG5vbi1mb3JtYXR0aW5nIHJvb3QgY29udGFpbmVycyAoPHNw YW4+PC9zcGFuPikgZG9uJ3QgaGF2ZSB3aWR0aCBwcm9wZXJ0eSAtPiBub24gd2lkdGggY29tcHV0 YXRpb24uIAorICAgIEFTU0VSVCghaW5saW5lQ29udGFpbmVyLnJlcGxhY2VkKCkpOworICAgIEFT U0VSVCghaW5saW5lQ29udGFpbmVyLmVzdGFibGlzaGVzRm9ybWF0dGluZ0NvbnRleHQoKSk7CisK KyAgICBjb21wdXRlQm9yZGVyQW5kUGFkZGluZyhpbmxpbmVDb250YWluZXIpOworICAgIGF1dG8m IGRpc3BsYXlCb3ggPSBsYXlvdXRTdGF0ZSgpLmRpc3BsYXlCb3hGb3JMYXlvdXRCb3goaW5saW5l Q29udGFpbmVyKTsKKyAgICBhdXRvIGNvbXB1dGVkSG9yaXpvbnRhbE1hcmdpbiA9IEdlb21ldHJ5 Ojpjb21wdXRlZEhvcml6b250YWxNYXJnaW4obGF5b3V0U3RhdGUoKSwgaW5saW5lQ29udGFpbmVy KTsKKyAgICBkaXNwbGF5Qm94LnNldEhvcml6b250YWxDb21wdXRlZE1hcmdpbihjb21wdXRlZEhv cml6b250YWxNYXJnaW4pOworICAgIGRpc3BsYXlCb3guc2V0SG9yaXpvbnRhbE1hcmdpbih7IGNv bXB1dGVkSG9yaXpvbnRhbE1hcmdpbi5zdGFydC52YWx1ZU9yKDApLCBjb21wdXRlZEhvcml6b250 YWxNYXJnaW4uZW5kLnZhbHVlT3IoMCkgfSk7Cit9CisKIHZvaWQgSW5saW5lRm9ybWF0dGluZ0Nv bnRleHQ6OmNvbXB1dGVXaWR0aEFuZE1hcmdpbihjb25zdCBCb3gmIGxheW91dEJveCkgY29uc3QK IHsKICAgICBhdXRvJiBsYXlvdXRTdGF0ZSA9IHRoaXMtPmxheW91dFN0YXRlKCk7CkBAIC00NzAs MTQgKzQ5NSwxMCBAQCB2b2lkIElubGluZUZvcm1hdHRpbmdDb250ZXh0Ojpjb2xsZWN0SW5saW5l Q29udGVudChJbmxpbmVSdW5Qcm92aWRlciYgaW5saW5lUnVuUAogCiAgICAgZW51bSBjbGFzcyBO b25CcmVha2FibGVXaWR0aFR5cGUgeyBTdGFydCwgRW5kIH07CiAgICAgYXV0byBub25CcmVha2Fi bGVXaWR0aCA9IFsmXShhdXRvJiBjb250YWluZXIsIGF1dG8gdHlwZSkgewotICAgICAgICBhdXRv IGNvbXB1dGVkSG9yaXpvbnRhbE1hcmdpbiA9IEdlb21ldHJ5Ojpjb21wdXRlZEhvcml6b250YWxN YXJnaW4obGF5b3V0U3RhdGUsIGNvbnRhaW5lcik7Ci0gICAgICAgIGF1dG8gaG9yaXpvbnRhbE1h cmdpbiA9IFVzZWRIb3Jpem9udGFsTWFyZ2luIHsgY29tcHV0ZWRIb3Jpem9udGFsTWFyZ2luLnN0 YXJ0LnZhbHVlT3IoMCksIGNvbXB1dGVkSG9yaXpvbnRhbE1hcmdpbi5lbmQudmFsdWVPcigwKSB9 OwotICAgICAgICBhdXRvIGJvcmRlciA9IEdlb21ldHJ5Ojpjb21wdXRlZEJvcmRlcihsYXlvdXRT dGF0ZSwgY29udGFpbmVyKTsKLSAgICAgICAgYXV0byBwYWRkaW5nID0gR2VvbWV0cnk6OmNvbXB1 dGVkUGFkZGluZyhsYXlvdXRTdGF0ZSwgY29udGFpbmVyKTsKLQorICAgICAgICBhdXRvJiBkaXNw bGF5Qm94ID0gbGF5b3V0U3RhdGUuZGlzcGxheUJveEZvckxheW91dEJveChjb250YWluZXIpOwog ICAgICAgICBpZiAodHlwZSA9PSBOb25CcmVha2FibGVXaWR0aFR5cGU6OlN0YXJ0KQotICAgICAg ICAgICAgcmV0dXJuIGJvcmRlci5ob3Jpem9udGFsLmxlZnQgKyBob3Jpem9udGFsTWFyZ2luLnN0 YXJ0ICsgKHBhZGRpbmcgPyBwYWRkaW5nLT5ob3Jpem9udGFsLmxlZnQgOiBMYXlvdXRVbml0KCkp OwotICAgICAgICByZXR1cm4gYm9yZGVyLmhvcml6b250YWwucmlnaHQgKyBob3Jpem9udGFsTWFy Z2luLmVuZCArIChwYWRkaW5nID8gcGFkZGluZy0+aG9yaXpvbnRhbC5yaWdodCA6IExheW91dFVu aXQoKSk7CisgICAgICAgICAgICByZXR1cm4gZGlzcGxheUJveC5tYXJnaW5TdGFydCgpICsgZGlz cGxheUJveC5ib3JkZXJMZWZ0KCkgKyBkaXNwbGF5Qm94LnBhZGRpbmdMZWZ0KCkudmFsdWVPcigw KTsKKyAgICAgICAgcmV0dXJuIGRpc3BsYXlCb3gubWFyZ2luRW5kKCkgKyBkaXNwbGF5Qm94LmJv cmRlclJpZ2h0KCkgKyBkaXNwbGF5Qm94LnBhZGRpbmdSaWdodCgpLnZhbHVlT3IoMCk7CiAgICAg fTsKIAogICAgIExheW91dFF1ZXVlIGxheW91dFF1ZXVlOwpAQCAtNDk2LDkgKzUxNyw5IEBAIHZv aWQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNvbGxlY3RJbmxpbmVDb250ZW50KElubGluZVJ1 blByb3ZpZGVyJiBpbmxpbmVSdW5QCiAgICAgICAgICAgICBpZiAoY29udGFpbmVyLmVzdGFibGlz aGVzRm9ybWF0dGluZ0NvbnRleHQoKSkgewogICAgICAgICAgICAgICAgIC8vIEZvcm1hdHRpbmcg Y29udGV4dHMgYXJlIHRyZWF0ZWQgYXMgbGVhZiBub2Rlcy4KICAgICAgICAgICAgICAgICBhdXRv JiBpbmxpbmVJdGVtID0gY3JlYXRlQW5kQXBwZW5kSW5saW5lSXRlbShpbmxpbmVSdW5Qcm92aWRl ciwgaW5saW5lQ29udGVudCwgY29udGFpbmVyKTsKLSAgICAgICAgICAgICAgICBhdXRvIGNvbXB1 dGVkSG9yaXpvbnRhbE1hcmdpbiA9IEdlb21ldHJ5Ojpjb21wdXRlZEhvcml6b250YWxNYXJnaW4o bGF5b3V0U3RhdGUsIGNvbnRhaW5lcik7Ci0gICAgICAgICAgICAgICAgYXV0byBjdXJyZW50Tm9u QnJlYWthYmxlU3RhcnRXaWR0aCA9IG5vbkJyZWFrYWJsZVN0YXJ0V2lkdGgudmFsdWVPcigwKSAr IGNvbXB1dGVkSG9yaXpvbnRhbE1hcmdpbi5zdGFydC52YWx1ZU9yKDApICsgbm9uQnJlYWthYmxl RW5kV2lkdGgudmFsdWVPcigwKTsKLSAgICAgICAgICAgICAgICBhZGREZXRhY2hpbmdSdWxlcyhp bmxpbmVJdGVtLCBjdXJyZW50Tm9uQnJlYWthYmxlU3RhcnRXaWR0aCwgY29tcHV0ZWRIb3Jpem9u dGFsTWFyZ2luLmVuZCk7CisgICAgICAgICAgICAgICAgYXV0byYgZGlzcGxheUJveCA9IGxheW91 dFN0YXRlLmRpc3BsYXlCb3hGb3JMYXlvdXRCb3goY29udGFpbmVyKTsKKyAgICAgICAgICAgICAg ICBhdXRvIGN1cnJlbnROb25CcmVha2FibGVTdGFydFdpZHRoID0gbm9uQnJlYWthYmxlU3RhcnRX aWR0aC52YWx1ZU9yKDApICsgZGlzcGxheUJveC5tYXJnaW5TdGFydCgpICsgbm9uQnJlYWthYmxl RW5kV2lkdGgudmFsdWVPcigwKTsKKyAgICAgICAgICAgICAgICBhZGREZXRhY2hpbmdSdWxlcyhp bmxpbmVJdGVtLCBjdXJyZW50Tm9uQnJlYWthYmxlU3RhcnRXaWR0aCwgZGlzcGxheUJveC5tYXJn aW5FbmQoKSk7CiAgICAgICAgICAgICAgICAgbm9uQnJlYWthYmxlU3RhcnRXaWR0aCA9IHsgfTsK ICAgICAgICAgICAgICAgICBub25CcmVha2FibGVFbmRXaWR0aCA9IHsgfTsKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGlu Z0NvbnRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGlu ZUZvcm1hdHRpbmdDb250ZXh0LmgKaW5kZXggM2Y3Y2QzZjUzMjQ3NDRhMjQ5YThiNDZlMmVhMTE3 YTU4OTA0ZGRjYi4uOTdmOGVkNmJhYzczMWNjMDJhMmJmYTBmYTNjNWM2MDU1NWRlZmJhZCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9y bWF0dGluZ0NvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0 dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5oCkBAIC0zNSw2ICszNSw3IEBACiBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiBuYW1lc3BhY2UgTGF5b3V0IHsKIAorY2xhc3MgSW5saW5lQ29udGFpbmVy OwogY2xhc3MgSW5saW5lRm9ybWF0dGluZ1N0YXRlOwogY2xhc3MgSW5saW5lUnVuUHJvdmlkZXI7 CiAKQEAgLTExMiw2ICsxMTMsNyBAQCBwcml2YXRlOgogCiAgICAgdm9pZCBsYXlvdXRGb3JtYXR0 aW5nQ29udGV4dFJvb3QoY29uc3QgQm94JikgY29uc3Q7CiAgICAgdm9pZCBjb21wdXRlV2lkdGhB bmRIZWlnaHRGb3JSZXBsYWNlZElubGluZUJveChjb25zdCBCb3gmKSBjb25zdDsKKyAgICB2b2lk IGNvbXB1dGVNYXJnaW5Cb3JkZXJBbmRQYWRkaW5nKGNvbnN0IElubGluZUNvbnRhaW5lciYpIGNv bnN0OwogICAgIHZvaWQgY29tcHV0ZUhlaWdodEFuZE1hcmdpbihjb25zdCBCb3gmKSBjb25zdDsK ICAgICB2b2lkIGNvbXB1dGVXaWR0aEFuZE1hcmdpbihjb25zdCBCb3gmKSBjb25zdDsKICAgICB2 b2lkIGNvbXB1dGVGbG9hdFBvc2l0aW9uKGNvbnN0IEZsb2F0aW5nQ29udGV4dCYsIExpbmUmLCBj b25zdCBCb3gmKSBjb25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlv dXR0cmVlL0xheW91dEJveC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2xheW91dHRyZWUvTGF5 b3V0Qm94LmgKaW5kZXggYmEwNTM5MmQ4MWNlMjY2YmQ3YTZkMzJkMThmMzczYjY2YmUyZGE1Ni4u NjJmYjBkMTQ4MDgxYzFiNGMzZjI4ZDA3ZTA5OGI3YTY1YmJhODEyMSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0Qm94LmgKKysrIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0Qm94LmgKQEAgLTE1NSw3ICsxNTUsNyBAQCBw cml2YXRlOgogCiAgICAgc3RkOjp1bmlxdWVfcHRyPFJlcGxhY2VkPiBtX3JlcGxhY2VkOwogCi0g ICAgdW5zaWduZWQgbV9iYXNlVHlwZUZsYWdzIDogNDsKKyAgICB1bnNpZ25lZCBtX2Jhc2VUeXBl RmxhZ3MgOiA1OwogfTsKIAogfQo=