205693 2020-01-02 14:30:55 -0800 [LFC][Integration] Fix failing text-indent cases when the IFC root is an anonymous box 2020-01-02 16:15:33 -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 1602235 0 zalan 2020-01-02 14:30:55 -0800 ssia 1602236 1 webkit-bug-importer 2020-01-02 14:31:13 -0800 <rdar://problem/58284277> 1602248 2 386633 zalan 2020-01-02 14:42:34 -0800 Created attachment 386633 Patch 1602250 3 zalan 2020-01-02 14:43:17 -0800 Fixes the following cases * css2.1/20110323/text-indent-014.htm * fast/css/text-indent-first-line-001.html * fast/css/text-indent-first-line-004.html * fast/css/text-indent-first-line-005.html * fast/css/text-indent-first-line-006.html 1602252 4 386633 koivisto 2020-01-02 14:58:31 -0800 Comment on attachment 386633 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=386633&action=review > Source/WebCore/layout/LayoutState.h:83 > + bool isIntegratedRootBoxFirstChild() const { return m_layoutTreeContent->isRootFirstChild(); } Can't this bit (and any other integration hacks) just be in LayoutState like the viewport size? 1602256 5 zalan 2020-01-02 15:20:43 -0800 (In reply to Antti Koivisto from comment #4) > Comment on attachment 386633 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=386633&action=review > > > Source/WebCore/layout/LayoutState.h:83 > > + bool isIntegratedRootBoxFirstChild() const { return m_layoutTreeContent->isRootFirstChild(); } > > Can't this bit (and any other integration hacks) just be in LayoutState like > the viewport size? Yeah, let me move it in there. 1602257 6 386636 zalan 2020-01-02 15:21:16 -0800 Created attachment 386636 Patch 1602279 7 386636 commit-queue 2020-01-02 16:15:32 -0800 Comment on attachment 386636 Patch Clearing flags on attachment: 386636 Committed r253985: <https://trac.webkit.org/changeset/253985> 1602280 8 commit-queue 2020-01-02 16:15:33 -0800 All reviewed patches have been landed. Closing bug. 386633 2020-01-02 14:42:34 -0800 2020-01-02 15:21:14 -0800 Patch bug-205693-20200102144233.patch text/plain 8530 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzOTc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzI0ZDJiYjk0NDQwMjlm Zjg3MjE3MmZjZWY4MWZmNmMzZDU2Y2RhMy4uOTQ4YjQ3ZGI5NDQyZTdlNDgxMTk4Njc1NjYxOTJi ZjE2NzgxOTJhNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDIwLTAxLTAyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSW50ZWdyYXRpb25d IEZpeCBmYWlsaW5nIHRleHQtaW5kZW50IGNhc2VzIHdoZW4gdGhlIElGQyByb290IGlzIGFuIGFu b255bW91cyBib3gKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIwNTY5MworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTgyODQyNzc+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRHVyaW5nIHRleHQtaW5kZW50 IGNvbXB1dGF0aW9uIHdlIHdvdWxkIG5vcm1hbGx5IGNoZWNrIGlmIHRoZSBJRkMgcm9vdCBpcyBh bm9ueW1vdXMgYW5kIGlmIHNvLAorICAgICAgICB3aGV0aGVyIGl0J3MgdGhlIGZpcnN0IGNoaWxk IG9mIGl0cyBwYXJlbnQgZWxlbWVudC4KKyAgICAgICAgZS5nLiA8ZGl2PjxkaXY+dGV4dDwvZGl2 PnRoaXMgdGV4dCBpcyB3cmFwcGVkIGluc2lkZSBhbiBhbm9ueW1vdXMgcmVuZGVyZXI8L2Rpdj4K KyAgICAgICAgVGhlIElGQyByb290IG9mIHRoZSAidGhpcyB0ZXh0Li4iIGNvbnRlbnQgaXMgYW4g YW5vbnltb3VzIGNvbnRhaW5lciBhbmQgaXQgaXMgbm90CisgICAgICAgIHRoZSBmaXJzdCBjaGls ZCBvZiBpdHMgcGFyZW50IHJlbmRlcmVyLgorICAgICAgICBIb3dldmVyIGluIHRoZSBMRkMgaW50 ZWdyYXRpb24gY2FzZSwgd2UgY2FuJ3QgZ28gYmV5b25kIHRoZSBJRkMgcm9vdCBhbmQgY2hlY2sg Zm9yIHBhcmVudC1jaGlsZCBzdGF0dXMuIAorCisgICAgICAgICogbGF5b3V0L0xheW91dFN0YXRl Lmg6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxheW91dFN0YXRlOjppc0ludGVncmF0ZWRS b290Qm94Rmlyc3RDaGlsZCBjb25zdCk6CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRp bmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0 OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6Y29uc3RyYWludHNGb3JMaW5lKToKKyAgICAgICAg KiBsYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRCb3guaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6Qm94Ojppc0Fub255bW91cyBjb25zdCk6CisgICAgICAgICogbGF5b3V0L2xheW91dHRyZWUv TGF5b3V0VHJlZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpUcmVlQnVp bGRlcjo6YnVpbGRMYXlvdXRUcmVlRm9ySW50ZWdyYXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6 TGF5b3V0OjpMYXlvdXRUcmVlQ29udGVudDo6c2V0Um9vdElzRmlyc3RDaGlsZCk6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6OkxheW91dFRyZWVDb250ZW50Ojppc1Jvb3RGaXJzdENoaWxkIGNv bnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6VHJlZUJ1aWxkZXI6OmNyZWF0ZUxheW91 dEJveCk6CisgICAgICAgICogbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0VHJlZUJ1aWxkZXIuaDoK KwogMjAyMC0wMS0wMiAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAg IFtMRkNdW0lGQ10gVGV4dC1pbmRlbnQgc2hyaW5rcyB0aGUgYXZhaWxhYmxlIGhvcml6b250YWwg c3BhY2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9MYXlvdXRTdGF0ZS5oIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L0xheW91dFN0YXRlLmgKaW5kZXggOTM5YjdkYTNjYjIwYjQz MjE3ZjQzMjBkZGVkYTYyZjJlOThiODI5Yy4uNDcxZDkyYmM2ZGMxNTY2YTVjNmVlMGNmYjlmYWE2 Yzg5ZjgzZTA2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0xheW91dFN0YXRl LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L0xheW91dFN0YXRlLmgKQEAgLTc3LDkgKzc3 LDEwIEBAIHB1YmxpYzoKICAgICBjb25zdCBSZW5kZXJCb3gmIHJvb3RSZW5kZXJlcigpIGNvbnN0 IHsgcmV0dXJuIG1fbGF5b3V0VHJlZUNvbnRlbnQtPnJvb3RSZW5kZXJlcigpOyB9CiAjZW5kaWYK IAotICAgIC8vIEZJWE1FOiBMRkMgaW50ZWdyYXRpb24gb25seS4gRnVsbCBMRkMgaGFzIHByb3Bl ciBJQ0IgYWNjZXNzLgorICAgIC8vIExGQyBpbnRlZ3JhdGlvbiBvbmx5LiBGdWxsIExGQyBoYXMg cHJvcGVyIElDQiBhY2Nlc3MuCiAgICAgdm9pZCBzZXRWaWV3cG9ydFNpemUoY29uc3QgTGF5b3V0 U2l6ZSYpOwogICAgIExheW91dFNpemUgdmlld3BvcnRTaXplKCkgY29uc3Q7CisgICAgYm9vbCBp c0ludGVncmF0ZWRSb290Qm94Rmlyc3RDaGlsZCgpIGNvbnN0IHsgcmV0dXJuIG1fbGF5b3V0VHJl ZUNvbnRlbnQtPmlzUm9vdEZpcnN0Q2hpbGQoKTsgfQogCiBwcml2YXRlOgogICAgIHZvaWQgc2V0 UXVpcmtzTW9kZShRdWlya3NNb2RlIHF1aXJrc01vZGUpIHsgbV9xdWlya3NNb2RlID0gcXVpcmtz TW9kZTsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRp bmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu bGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4IDY3MzRmZGM3 OWU0OGMxYzYyNzhkNWE0YTE0MjczNmY1NjMyOTJkZTguLjg2ZTJjN2JkNDJiMGQ2MDBmZDI0MzUy NzI0ZWU5NDkwNmVhNTIxMzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAK QEAgLTQxMyw3ICs0MTMsMTQgQEAgTGluZUJ1aWxkZXI6OkNvbnN0cmFpbnRzIElubGluZUZvcm1h dHRpbmdDb250ZXh0Ojpjb25zdHJhaW50c0ZvckxpbmUoY29uc3QgVXNlZEgKICAgICAgICAgLy8g RklYTUU6IEFkZCBzdXBwb3J0IGZvciBlYWNoLWxpbmUuCiAgICAgICAgIC8vIFtJbnRlZ3JhdGlv bl0gcm9vdCgpLT5wYXJlbnQoKSB3b3VsZCBub3JtYWxseSBwcm9kdWNlIGEgdmFsaWQgbGF5b3V0 IGJveC4KICAgICAgICAgYXV0byYgcm9vdCA9IHRoaXMtPnJvb3QoKTsKLSAgICAgICAgYXV0byBp c0Zvcm1hdHRpbmdDb250ZXh0Um9vdENhbmRpZGF0ZVRvVGV4dEluZGVudCA9ICFyb290LmlzQW5v bnltb3VzKCkgfHwgIXJvb3QucGFyZW50KCkgfHwgcm9vdC5wYXJlbnQoKS0+Zmlyc3RJbkZsb3dD aGlsZCgpID09ICZyb290OworICAgICAgICBhdXRvIGlzRm9ybWF0dGluZ0NvbnRleHRSb290Q2Fu ZGlkYXRlVG9UZXh0SW5kZW50ID0gIXJvb3QuaXNBbm9ueW1vdXMoKTsKKyAgICAgICAgaWYgKHJv b3QuaXNBbm9ueW1vdXMoKSkgeworICAgICAgICAgICAgLy8gVW5sZXNzIG90aGVyd2lzZSBzcGVj aWZpZWQgYnkgdGhlIGVhY2gtbGluZSBhbmQvb3IgaGFuZ2luZyBrZXl3b3Jkcywgb25seSBsaW5l cyB0aGF0IGFyZSB0aGUgZmlyc3QgZm9ybWF0dGVkIGxpbmUKKyAgICAgICAgICAgIC8vIG9mIGFu IGVsZW1lbnQgYXJlIGFmZmVjdGVkLgorICAgICAgICAgICAgLy8gRm9yIGV4YW1wbGUsIHRoZSBm aXJzdCBsaW5lIG9mIGFuIGFub255bW91cyBibG9jayBib3ggaXMgb25seSBhZmZlY3RlZCBpZiBp dCBpcyB0aGUgZmlyc3QgY2hpbGQgb2YgaXRzIHBhcmVudCBlbGVtZW50LgorICAgICAgICAgICAg aXNGb3JtYXR0aW5nQ29udGV4dFJvb3RDYW5kaWRhdGVUb1RleHRJbmRlbnQgPSBSdW50aW1lRW5h YmxlZEZlYXR1cmVzOjpzaGFyZWRGZWF0dXJlcygpLmxheW91dEZvcm1hdHRpbmdDb250ZXh0SW50 ZWdyYXRpb25FbmFibGVkKCkgPworICAgICAgICAgICAgbGF5b3V0U3RhdGUoKS5pc0ludGVncmF0 ZWRSb290Qm94Rmlyc3RDaGlsZCgpIDogcm9vdC5wYXJlbnQoKS0+Zmlyc3RJbkZsb3dDaGlsZCgp ID09ICZyb290OworICAgICAgICB9CiAgICAgICAgIGlmICghaXNGb3JtYXR0aW5nQ29udGV4dFJv b3RDYW5kaWRhdGVUb1RleHRJbmRlbnQpCiAgICAgICAgICAgICByZXR1cm4gSW5saW5lTGF5b3V0 VW5pdCB7IH07CiAgICAgICAgIGF1dG8gaW52ZXJ0TGluZVJhbmdlID0gZmFsc2U7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRCb3guaCBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0cmVlL0xheW91dEJveC5oCmluZGV4IDI4YWUxYjg5ZDE0 OTU2NmEwZTNkYTJkOTBjMjg3MzJjZTVhOWEyNjIuLmMzYzgzNGRkZTg2ZTVmOGVlNDM2ZmE5ZWY1 NDZlMzc5MDE1NDRjYmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0 cmVlL0xheW91dEJveC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0cmVlL0xh eW91dEJveC5oCkBAIC05Nyw3ICs5Nyw3IEBAIHB1YmxpYzoKICAgICBib29sIGlzRGVzY2VuZGFu dE9mKGNvbnN0IENvbnRhaW5lciYpIGNvbnN0OwogICAgIGJvb2wgaXNDb250YWluaW5nQmxvY2tE ZXNjZW5kYW50T2YoY29uc3QgQ29udGFpbmVyJikgY29uc3Q7CiAKLSAgICBib29sIGlzQW5vbnlt b3VzKCkgY29uc3QgeyByZXR1cm4gIW1fZWxlbWVudEF0dHJpYnV0ZXM7IH0KKyAgICBib29sIGlz QW5vbnltb3VzKCkgY29uc3QgeyByZXR1cm4gbV9pc0Fub255bW91czsgfQogCiAgICAgYm9vbCBp c0Jsb2NrTGV2ZWxCb3goKSBjb25zdDsKICAgICBib29sIGlzSW5saW5lTGV2ZWxCb3goKSBjb25z dDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0cmVlL0xheW91dFRy ZWVCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0cmVlL0xheW91dFRy ZWVCdWlsZGVyLmNwcAppbmRleCAwZTU2MmY5YjJiZTEzN2Y3ZTMwYmNjY2Y0OGRjMGNlYmM1MDdh NDJkLi45MmJiMzUzYmQxNTIwZTUxMGM3YmQ4ZjhkNjg1NjE0NDQzYmE3MzgwIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRUcmVlQnVpbGRlci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0VHJlZUJ1aWxkZXIu Y3BwCkBAIC01NSw2ICs1NSw3IEBACiAjaW5jbHVkZSAiUmVuZGVyVGFibGVDYXB0aW9uLmgiCiAj aW5jbHVkZSAiUmVuZGVyVGFibGVDZWxsLmgiCiAjaW5jbHVkZSAiUmVuZGVyVmlldy5oIgorI2lu Y2x1ZGUgIlJ1bnRpbWVFbmFibGVkRmVhdHVyZXMuaCIKICNpbmNsdWRlIDx3dGYvSXNvTWFsbG9j SW5saW5lcy5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L1RleHRTdHJlYW0uaD4KIApAQCAtMTU1LDEx ICsxNTYsMzQgQEAgc3RkOjp1bmlxdWVfcHRyPExheW91dDo6TGF5b3V0VHJlZUNvbnRlbnQ+IFRy ZWVCdWlsZGVyOjpidWlsZExheW91dFRyZWVGb3JJbnRlZ3IKICAgICBhdXRvIGNsb25lZFN0eWxl ID0gUmVuZGVyU3R5bGU6OmNsb25lKHJlbmRlckJsb2NrRmxvdy5zdHlsZSgpKTsKICAgICBjbG9u ZWRTdHlsZS5zZXREaXNwbGF5KERpc3BsYXlUeXBlOjpCbG9jayk7CiAKLSAgICBhdXRvIGxheW91 dFRyZWVDb250ZW50ID0gbWFrZVVuaXF1ZTxMYXlvdXRUcmVlQ29udGVudD4ocmVuZGVyQmxvY2tG bG93LCBtYWtlVW5pcXVlPENvbnRhaW5lcj4oV1RGOjpudWxsb3B0LCBXVEZNb3ZlKGNsb25lZFN0 eWxlKSkpOworICAgIGF1dG8gcm9vdExheW91dENvbnRhaW5lciA9IG1ha2VVbmlxdWU8Q29udGFp bmVyPihCb3g6OkVsZW1lbnRBdHRyaWJ1dGVzIHsgQm94OjpFbGVtZW50VHlwZTo6R2VuZXJpY0Vs ZW1lbnQgfSwgV1RGTW92ZShjbG9uZWRTdHlsZSkpOworICAgIGlmIChyZW5kZXJCbG9ja0Zsb3cu aXNBbm9ueW1vdXMoKSkKKyAgICAgICAgcm9vdExheW91dENvbnRhaW5lci0+c2V0SXNBbm9ueW1v dXMoKTsKKworICAgIGF1dG8gbGF5b3V0VHJlZUNvbnRlbnQgPSBtYWtlVW5pcXVlPExheW91dFRy ZWVDb250ZW50PihyZW5kZXJCbG9ja0Zsb3csIFdURk1vdmUocm9vdExheW91dENvbnRhaW5lcikp OwogICAgIFRyZWVCdWlsZGVyKCpsYXlvdXRUcmVlQ29udGVudCkuYnVpbGRUcmVlKCk7CisgICAg QVNTRVJUKHJlbmRlckJsb2NrRmxvdy5wYXJlbnQoKSk7CisgICAgbGF5b3V0VHJlZUNvbnRlbnQt PnNldFJvb3RJc0ZpcnN0Q2hpbGQocmVuZGVyQmxvY2tGbG93LnBhcmVudCgpLT5maXJzdENoaWxk KCkgPT0gJnJlbmRlckJsb2NrRmxvdyk7CiAgICAgcmV0dXJuIGxheW91dFRyZWVDb250ZW50Owog fQogCit2b2lkIExheW91dFRyZWVDb250ZW50OjpzZXRSb290SXNGaXJzdENoaWxkKGJvb2wgcm9v dElzRmlyc3RDaGlsZCkKK3sKKyAgICBpZiAoUnVudGltZUVuYWJsZWRGZWF0dXJlczo6c2hhcmVk RmVhdHVyZXMoKS5sYXlvdXRGb3JtYXR0aW5nQ29udGV4dEludGVncmF0aW9uRW5hYmxlZCgpKSB7 CisgICAgICAgIG1fcm9vdElzRmlyc3RDaGlsZCA9IHJvb3RJc0ZpcnN0Q2hpbGQ7CisgICAgICAg IHJldHVybjsKKyAgICB9CisgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Cit9CisKK2Jvb2wgTGF5 b3V0VHJlZUNvbnRlbnQ6OmlzUm9vdEZpcnN0Q2hpbGQoKSBjb25zdAoreworICAgIGlmIChSdW50 aW1lRW5hYmxlZEZlYXR1cmVzOjpzaGFyZWRGZWF0dXJlcygpLmxheW91dEZvcm1hdHRpbmdDb250 ZXh0SW50ZWdyYXRpb25FbmFibGVkKCkpCisgICAgICAgIHJldHVybiBtX3Jvb3RJc0ZpcnN0Q2hp bGQ7CisgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgcmV0dXJuIGZhbHNlOworfQorCiBU cmVlQnVpbGRlcjo6VHJlZUJ1aWxkZXIoTGF5b3V0VHJlZUNvbnRlbnQmIGxheW91dFRyZWVDb250 ZW50KQogICAgIDogbV9sYXlvdXRUcmVlQ29udGVudChsYXlvdXRUcmVlQ29udGVudCkKIHsKQEAg LTIwMCw2ICsyMjQsNyBAQCBzdGQ6OnVuaXF1ZV9wdHI8Qm94PiBUcmVlQnVpbGRlcjo6Y3JlYXRl TGF5b3V0Qm94KGNvbnN0IENvbnRhaW5lciYgcGFyZW50Q29udGFpbgogICAgICAgICAgICAgY2hp bGRMYXlvdXRCb3ggPSBtYWtlVW5pcXVlPEJveD4oV1RGTW92ZSh0ZXh0Q29udGVudCksIFJlbmRl clN0eWxlOjpjbG9uZShwYXJlbnRDb250YWluZXIuc3R5bGUoKSkpOwogICAgICAgICBlbHNlCiAg ICAgICAgICAgICBjaGlsZExheW91dEJveCA9IG1ha2VVbmlxdWU8Qm94PihXVEZNb3ZlKHRleHRD b250ZW50KSwgUmVuZGVyU3R5bGU6OmNyZWF0ZUFub255bW91c1N0eWxlV2l0aERpc3BsYXkocGFy ZW50Q29udGFpbmVyLnN0eWxlKCksIERpc3BsYXlUeXBlOjpJbmxpbmUpKTsKKyAgICAgICAgY2hp bGRMYXlvdXRCb3gtPnNldElzQW5vbnltb3VzKCk7CiAgICAgfSBlbHNlIHsKICAgICAgICAgYXV0 byYgcmVuZGVyZXIgPSBkb3duY2FzdDxSZW5kZXJFbGVtZW50PihjaGlsZFJlbmRlcmVyKTsKICAg ICAgICAgYXV0byBkaXNwbGF5VHlwZSA9IHJlbmRlcmVyLnN0eWxlKCkuZGlzcGxheSgpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0VHJlZUJ1aWxk ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0cmVlL0xheW91dFRyZWVCdWlsZGVy LmgKaW5kZXggNzRjNDU1MzA3NDRmNjVhYjE1ODM2ZGFkYzYwMzM2N2EwMWFjZTYxYy4uOWZjOTIy NDgyYTZiZTlhOThiYzMyZWI5NDljZWY3ZTdjNzkyODhmNyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0VHJlZUJ1aWxkZXIuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRUcmVlQnVpbGRlci5oCkBAIC02NCw2ICs2 NCwxMCBAQCBwdWJsaWM6CiAKICAgICB2b2lkIGFkZExheW91dEJveEZvclJlbmRlcmVyKGNvbnN0 IFJlbmRlck9iamVjdCYsIEJveCYpOwogCisgICAgLy8gTEZDIGludGVncmF0aW9uIG9ubHkuCisg ICAgdm9pZCBzZXRSb290SXNGaXJzdENoaWxkKGJvb2wpOworICAgIGJvb2wgaXNSb290Rmlyc3RD aGlsZCgpIGNvbnN0OworCiBwcml2YXRlOgogICAgIGNvbnN0IFJlbmRlckJveCYgbV9yb290UmVu ZGVyZXI7CiAgICAgc3RkOjp1bmlxdWVfcHRyPENvbnRhaW5lcj4gbV9yb290TGF5b3V0Qm94OwpA QCAtNzEsNiArNzUsOCBAQCBwcml2YXRlOgogCiAgICAgSGFzaE1hcDxjb25zdCBSZW5kZXJPYmpl Y3QqLCBCb3gqPiBtX3JlbmRlck9iamVjdFRvTGF5b3V0Qm94OwogICAgIEhhc2hNYXA8Y29uc3Qg Qm94KiwgY29uc3QgUmVuZGVyT2JqZWN0Kj4gbV9sYXlvdXRCb3hUb1JlbmRlck9iamVjdDsKKyAg ICAvLyBMRkMgaW50ZWdyYXRpb24gb25seS4KKyAgICBib29sIG1fcm9vdElzRmlyc3RDaGlsZCB7 IGZhbHNlIH07CiB9OwogCiBjbGFzcyBUcmVlQnVpbGRlciB7Cg== 386636 2020-01-02 15:21:16 -0800 2020-01-02 16:15:32 -0800 Patch bug-205693-20200102152115.patch text/plain 7570 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzOTc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzI0ZDJiYjk0NDQwMjlm Zjg3MjE3MmZjZWY4MWZmNmMzZDU2Y2RhMy4uZmFlMDViOTcwMGQ3NWZmNTMwZGViOWE0NjM0MDdi YzBiYTE1NDA4MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDIwLTAxLTAyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSW50ZWdyYXRpb25d IEZpeCBmYWlsaW5nIHRleHQtaW5kZW50IGNhc2VzIHdoZW4gdGhlIElGQyByb290IGlzIGFuIGFu b255bW91cyBib3gKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIwNTY5MworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTgyODQyNzc+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgQW50dGkgS29pdmlzdG8uCisKKyAgICAgICAgRHVyaW5nIHRleHQtaW5kZW50 IGNvbXB1dGF0aW9uIHdlIHdvdWxkIG5vcm1hbGx5IGNoZWNrIGlmIHRoZSBJRkMgcm9vdCBpcyBh bm9ueW1vdXMgYW5kIGlmIHNvLAorICAgICAgICB3aGV0aGVyIGl0J3MgdGhlIGZpcnN0IGNoaWxk IG9mIGl0cyBwYXJlbnQgZWxlbWVudC4KKyAgICAgICAgZS5nLiA8ZGl2PjxkaXY+dGV4dDwvZGl2 PnRoaXMgdGV4dCBpcyB3cmFwcGVkIGluc2lkZSBhbiBhbm9ueW1vdXMgcmVuZGVyZXI8L2Rpdj4K KyAgICAgICAgVGhlIElGQyByb290IG9mIHRoZSAidGhpcyB0ZXh0Li4iIGNvbnRlbnQgaXMgYW4g YW5vbnltb3VzIGNvbnRhaW5lciBhbmQgaXQgaXMgbm90CisgICAgICAgIHRoZSBmaXJzdCBjaGls ZCBvZiBpdHMgcGFyZW50IHJlbmRlcmVyLgorICAgICAgICBIb3dldmVyIGluIHRoZSBMRkMgaW50 ZWdyYXRpb24gY2FzZSwgd2UgY2FuJ3QgZ28gYmV5b25kIHRoZSBJRkMgcm9vdCBhbmQgY2hlY2sg Zm9yIHBhcmVudC1jaGlsZCBzdGF0dXMuIAorCisgICAgICAgICogbGF5b3V0L0xheW91dFN0YXRl Lmg6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxheW91dFN0YXRlOjppc0ludGVncmF0ZWRS b290Qm94Rmlyc3RDaGlsZCBjb25zdCk6CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRp bmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0 OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6Y29uc3RyYWludHNGb3JMaW5lKToKKyAgICAgICAg KiBsYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRCb3guaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6Qm94Ojppc0Fub255bW91cyBjb25zdCk6CisgICAgICAgICogbGF5b3V0L2xheW91dHRyZWUv TGF5b3V0VHJlZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpUcmVlQnVp bGRlcjo6YnVpbGRMYXlvdXRUcmVlRm9ySW50ZWdyYXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6 TGF5b3V0OjpMYXlvdXRUcmVlQ29udGVudDo6c2V0Um9vdElzRmlyc3RDaGlsZCk6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6OkxheW91dFRyZWVDb250ZW50Ojppc1Jvb3RGaXJzdENoaWxkIGNv bnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6VHJlZUJ1aWxkZXI6OmNyZWF0ZUxheW91 dEJveCk6CisgICAgICAgICogbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0VHJlZUJ1aWxkZXIuaDoK KwogMjAyMC0wMS0wMiAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAg IFtMRkNdW0lGQ10gVGV4dC1pbmRlbnQgc2hyaW5rcyB0aGUgYXZhaWxhYmxlIGhvcml6b250YWwg c3BhY2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9MYXlvdXRTdGF0ZS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvTGF5b3V0U3RhdGUuY3BwCmluZGV4IDVhNjc1N2UwNjI1 YjUxM2EzMmY5ODc2ZWE2NGNhNmJlM2EwNDlkN2UuLjUxOTQ5M2ZkOTIzNGI1MDM3YmI4OWMyNzVh NTY3MGU4MjNmZTU5MDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9MYXlvdXRT dGF0ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L0xheW91dFN0YXRlLmNwcApAQCAt MTQ3LDYgKzE0NywxNyBAQCBMYXlvdXRTaXplIExheW91dFN0YXRlOjp2aWV3cG9ydFNpemUoKSBj b25zdAogICAgIHJldHVybiB7IH07CiB9CiAKK2Jvb2wgTGF5b3V0U3RhdGU6OmlzSW50ZWdyYXRl ZFJvb3RCb3hGaXJzdENoaWxkKCkgY29uc3QKK3sKKyAgICBpZiAoUnVudGltZUVuYWJsZWRGZWF0 dXJlczo6c2hhcmVkRmVhdHVyZXMoKS5sYXlvdXRGb3JtYXR0aW5nQ29udGV4dEludGVncmF0aW9u RW5hYmxlZCgpKSB7CisgICAgICAgIGF1dG8mIHJvb3RSZW5kZXJlciA9IG1fbGF5b3V0VHJlZUNv bnRlbnQtPnJvb3RSZW5kZXJlcigpOworICAgICAgICBBU1NFUlQocm9vdFJlbmRlcmVyLnBhcmVu dCgpKTsKKyAgICAgICAgcmV0dXJuIHJvb3RSZW5kZXJlci5wYXJlbnQoKS0+Zmlyc3RDaGlsZCgp ID09ICZyb290UmVuZGVyZXI7CisgICAgfQorICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAg IHJldHVybiBmYWxzZTsKK30KKwogfQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvTGF5b3V0U3RhdGUuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9MYXlvdXRTdGF0ZS5o CmluZGV4IDkzOWI3ZGEzY2IyMGI0MzIxN2Y0MzIwZGRlZGE2MmYyZTk4YjgyOWMuLjg0MDIzZDAz MjE1OWNiY2I3OWQwYmU1OWMwODlhYjFkOGRjZWI5ZjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9MYXlvdXRTdGF0ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9MYXlv dXRTdGF0ZS5oCkBAIC03Nyw5ICs3NywxMCBAQCBwdWJsaWM6CiAgICAgY29uc3QgUmVuZGVyQm94 JiByb290UmVuZGVyZXIoKSBjb25zdCB7IHJldHVybiBtX2xheW91dFRyZWVDb250ZW50LT5yb290 UmVuZGVyZXIoKTsgfQogI2VuZGlmCiAKLSAgICAvLyBGSVhNRTogTEZDIGludGVncmF0aW9uIG9u bHkuIEZ1bGwgTEZDIGhhcyBwcm9wZXIgSUNCIGFjY2Vzcy4KKyAgICAvLyBMRkMgaW50ZWdyYXRp b24gb25seS4gRnVsbCBMRkMgaGFzIHByb3BlciBJQ0IgYWNjZXNzLgogICAgIHZvaWQgc2V0Vmll d3BvcnRTaXplKGNvbnN0IExheW91dFNpemUmKTsKICAgICBMYXlvdXRTaXplIHZpZXdwb3J0U2l6 ZSgpIGNvbnN0OworICAgIGJvb2wgaXNJbnRlZ3JhdGVkUm9vdEJveEZpcnN0Q2hpbGQoKSBjb25z dDsKIAogcHJpdmF0ZToKICAgICB2b2lkIHNldFF1aXJrc01vZGUoUXVpcmtzTW9kZSBxdWlya3NN b2RlKSB7IG1fcXVpcmtzTW9kZSA9IHF1aXJrc01vZGU7IH0KQEAgLTkyLDYgKzkzLDcgQEAgcHJp dmF0ZToKICAgICBRdWlya3NNb2RlIG1fcXVpcmtzTW9kZSB7IFF1aXJrc01vZGU6Ok5vIH07CiAK ICAgICBXZWFrUHRyPGNvbnN0IExheW91dFRyZWVDb250ZW50PiBtX2xheW91dFRyZWVDb250ZW50 OworICAgIC8vIExGQyBpbnRlZ3JhdGlvbiBvbmx5LgogICAgIExheW91dFNpemUgbV92aWV3cG9y dFNpemU7CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9y bWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKaW5kZXggNjcz NGZkYzc5ZTQ4YzFjNjI3OGQ1YTRhMTQyNzM2ZjU2MzI5MmRlOC4uODZlMmM3YmQ0MmIwZDYwMGZk MjQzNTI3MjRlZTk0OTA2ZWE1MjEzOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0 LmNwcApAQCAtNDEzLDcgKzQxMywxNCBAQCBMaW5lQnVpbGRlcjo6Q29uc3RyYWludHMgSW5saW5l Rm9ybWF0dGluZ0NvbnRleHQ6OmNvbnN0cmFpbnRzRm9yTGluZShjb25zdCBVc2VkSAogICAgICAg ICAvLyBGSVhNRTogQWRkIHN1cHBvcnQgZm9yIGVhY2gtbGluZS4KICAgICAgICAgLy8gW0ludGVn cmF0aW9uXSByb290KCktPnBhcmVudCgpIHdvdWxkIG5vcm1hbGx5IHByb2R1Y2UgYSB2YWxpZCBs YXlvdXQgYm94LgogICAgICAgICBhdXRvJiByb290ID0gdGhpcy0+cm9vdCgpOwotICAgICAgICBh dXRvIGlzRm9ybWF0dGluZ0NvbnRleHRSb290Q2FuZGlkYXRlVG9UZXh0SW5kZW50ID0gIXJvb3Qu aXNBbm9ueW1vdXMoKSB8fCAhcm9vdC5wYXJlbnQoKSB8fCByb290LnBhcmVudCgpLT5maXJzdElu Rmxvd0NoaWxkKCkgPT0gJnJvb3Q7CisgICAgICAgIGF1dG8gaXNGb3JtYXR0aW5nQ29udGV4dFJv b3RDYW5kaWRhdGVUb1RleHRJbmRlbnQgPSAhcm9vdC5pc0Fub255bW91cygpOworICAgICAgICBp ZiAocm9vdC5pc0Fub255bW91cygpKSB7CisgICAgICAgICAgICAvLyBVbmxlc3Mgb3RoZXJ3aXNl IHNwZWNpZmllZCBieSB0aGUgZWFjaC1saW5lIGFuZC9vciBoYW5naW5nIGtleXdvcmRzLCBvbmx5 IGxpbmVzIHRoYXQgYXJlIHRoZSBmaXJzdCBmb3JtYXR0ZWQgbGluZQorICAgICAgICAgICAgLy8g b2YgYW4gZWxlbWVudCBhcmUgYWZmZWN0ZWQuCisgICAgICAgICAgICAvLyBGb3IgZXhhbXBsZSwg dGhlIGZpcnN0IGxpbmUgb2YgYW4gYW5vbnltb3VzIGJsb2NrIGJveCBpcyBvbmx5IGFmZmVjdGVk IGlmIGl0IGlzIHRoZSBmaXJzdCBjaGlsZCBvZiBpdHMgcGFyZW50IGVsZW1lbnQuCisgICAgICAg ICAgICBpc0Zvcm1hdHRpbmdDb250ZXh0Um9vdENhbmRpZGF0ZVRvVGV4dEluZGVudCA9IFJ1bnRp bWVFbmFibGVkRmVhdHVyZXM6OnNoYXJlZEZlYXR1cmVzKCkubGF5b3V0Rm9ybWF0dGluZ0NvbnRl eHRJbnRlZ3JhdGlvbkVuYWJsZWQoKSA/CisgICAgICAgICAgICBsYXlvdXRTdGF0ZSgpLmlzSW50 ZWdyYXRlZFJvb3RCb3hGaXJzdENoaWxkKCkgOiByb290LnBhcmVudCgpLT5maXJzdEluRmxvd0No aWxkKCkgPT0gJnJvb3Q7CisgICAgICAgIH0KICAgICAgICAgaWYgKCFpc0Zvcm1hdHRpbmdDb250 ZXh0Um9vdENhbmRpZGF0ZVRvVGV4dEluZGVudCkKICAgICAgICAgICAgIHJldHVybiBJbmxpbmVM YXlvdXRVbml0IHsgfTsKICAgICAgICAgYXV0byBpbnZlcnRMaW5lUmFuZ2UgPSBmYWxzZTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0cmVlL0xheW91dEJveC5oIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0Qm94LmgKaW5kZXggMjhhZTFi ODlkMTQ5NTY2YTBlM2RhMmQ5MGMyODczMmNlNWE5YTI2Mi4uYzNjODM0ZGRlODZlNWY4ZWU0MzZm YTllZjU0NmUzNzkwMTU0NGNiZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2xh eW91dHRyZWUvTGF5b3V0Qm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2xheW91dHRy ZWUvTGF5b3V0Qm94LmgKQEAgLTk3LDcgKzk3LDcgQEAgcHVibGljOgogICAgIGJvb2wgaXNEZXNj ZW5kYW50T2YoY29uc3QgQ29udGFpbmVyJikgY29uc3Q7CiAgICAgYm9vbCBpc0NvbnRhaW5pbmdC bG9ja0Rlc2NlbmRhbnRPZihjb25zdCBDb250YWluZXImKSBjb25zdDsKIAotICAgIGJvb2wgaXNB bm9ueW1vdXMoKSBjb25zdCB7IHJldHVybiAhbV9lbGVtZW50QXR0cmlidXRlczsgfQorICAgIGJv b2wgaXNBbm9ueW1vdXMoKSBjb25zdCB7IHJldHVybiBtX2lzQW5vbnltb3VzOyB9CiAKICAgICBi b29sIGlzQmxvY2tMZXZlbEJveCgpIGNvbnN0OwogICAgIGJvb2wgaXNJbmxpbmVMZXZlbEJveCgp IGNvbnN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2xheW91dHRyZWUvTGF5 b3V0VHJlZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2xheW91dHRyZWUvTGF5 b3V0VHJlZUJ1aWxkZXIuY3BwCmluZGV4IDBlNTYyZjliMmJlMTM3ZjdlMzBiY2NjZjQ4ZGMwY2Vi YzUwN2E0MmQuLjVhZDIxM2E3YmVjMzZiZjY2NmI0YzcyMDdiOTUzYWNiYTdkNDRmYTggMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0cmVlL0xheW91dFRyZWVCdWlsZGVy LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRUcmVlQnVp bGRlci5jcHAKQEAgLTE1NSw3ICsxNTUsMTEgQEAgc3RkOjp1bmlxdWVfcHRyPExheW91dDo6TGF5 b3V0VHJlZUNvbnRlbnQ+IFRyZWVCdWlsZGVyOjpidWlsZExheW91dFRyZWVGb3JJbnRlZ3IKICAg ICBhdXRvIGNsb25lZFN0eWxlID0gUmVuZGVyU3R5bGU6OmNsb25lKHJlbmRlckJsb2NrRmxvdy5z dHlsZSgpKTsKICAgICBjbG9uZWRTdHlsZS5zZXREaXNwbGF5KERpc3BsYXlUeXBlOjpCbG9jayk7 CiAKLSAgICBhdXRvIGxheW91dFRyZWVDb250ZW50ID0gbWFrZVVuaXF1ZTxMYXlvdXRUcmVlQ29u dGVudD4ocmVuZGVyQmxvY2tGbG93LCBtYWtlVW5pcXVlPENvbnRhaW5lcj4oV1RGOjpudWxsb3B0 LCBXVEZNb3ZlKGNsb25lZFN0eWxlKSkpOworICAgIGF1dG8gcm9vdExheW91dENvbnRhaW5lciA9 IG1ha2VVbmlxdWU8Q29udGFpbmVyPihCb3g6OkVsZW1lbnRBdHRyaWJ1dGVzIHsgQm94OjpFbGVt ZW50VHlwZTo6R2VuZXJpY0VsZW1lbnQgfSwgV1RGTW92ZShjbG9uZWRTdHlsZSkpOworICAgIGlm IChyZW5kZXJCbG9ja0Zsb3cuaXNBbm9ueW1vdXMoKSkKKyAgICAgICAgcm9vdExheW91dENvbnRh aW5lci0+c2V0SXNBbm9ueW1vdXMoKTsKKworICAgIGF1dG8gbGF5b3V0VHJlZUNvbnRlbnQgPSBt YWtlVW5pcXVlPExheW91dFRyZWVDb250ZW50PihyZW5kZXJCbG9ja0Zsb3csIFdURk1vdmUocm9v dExheW91dENvbnRhaW5lcikpOwogICAgIFRyZWVCdWlsZGVyKCpsYXlvdXRUcmVlQ29udGVudCku YnVpbGRUcmVlKCk7CiAgICAgcmV0dXJuIGxheW91dFRyZWVDb250ZW50OwogfQpAQCAtMjAwLDYg KzIwNCw3IEBAIHN0ZDo6dW5pcXVlX3B0cjxCb3g+IFRyZWVCdWlsZGVyOjpjcmVhdGVMYXlvdXRC b3goY29uc3QgQ29udGFpbmVyJiBwYXJlbnRDb250YWluCiAgICAgICAgICAgICBjaGlsZExheW91 dEJveCA9IG1ha2VVbmlxdWU8Qm94PihXVEZNb3ZlKHRleHRDb250ZW50KSwgUmVuZGVyU3R5bGU6 OmNsb25lKHBhcmVudENvbnRhaW5lci5zdHlsZSgpKSk7CiAgICAgICAgIGVsc2UKICAgICAgICAg ICAgIGNoaWxkTGF5b3V0Qm94ID0gbWFrZVVuaXF1ZTxCb3g+KFdURk1vdmUodGV4dENvbnRlbnQp LCBSZW5kZXJTdHlsZTo6Y3JlYXRlQW5vbnltb3VzU3R5bGVXaXRoRGlzcGxheShwYXJlbnRDb250 YWluZXIuc3R5bGUoKSwgRGlzcGxheVR5cGU6OklubGluZSkpOworICAgICAgICBjaGlsZExheW91 dEJveC0+c2V0SXNBbm9ueW1vdXMoKTsKICAgICB9IGVsc2UgewogICAgICAgICBhdXRvJiByZW5k ZXJlciA9IGRvd25jYXN0PFJlbmRlckVsZW1lbnQ+KGNoaWxkUmVuZGVyZXIpOwogICAgICAgICBh dXRvIGRpc3BsYXlUeXBlID0gcmVuZGVyZXIuc3R5bGUoKS5kaXNwbGF5KCk7Cg==