204752 2019-12-02 09:43:20 -0800 [LFC][IFC] LineBuilder::InlineItemRun objects don't have vertical geometry 2019-12-02 12:10: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 simon.fraser webkit-bug-importer zalan oldest_to_newest 1594651 0 zalan 2019-12-02 09:43:20 -0800 Height and vertical position are set when the runs are merged and turned into LineBuilder::Runs. 1594653 1 webkit-bug-importer 2019-12-02 09:43:41 -0800 <rdar://problem/57560643> 1594661 2 384636 zalan 2019-12-02 10:01:51 -0800 Created attachment 384636 Patch 1594734 3 zalan 2019-12-02 12:10:20 -0800 Committed r253003: <https://trac.webkit.org/changeset/253003> 384636 2019-12-02 10:01:51 -0800 2019-12-02 10:17:47 -0800 Patch bug-204752-20191202100150.patch text/plain 12565 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjUyOTc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWJlZDM3M2Y4MTE5MmMw NmIzNWQwNGEwNGMyNDA1ZWEzNzFlMjE1MC4uZjFlMzQ2YzRjMzAxZDMxZTQwYTRiZmI3ZGM1ZDYz MTJmOTA5NTZjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDE5LTEyLTAyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBMaW5lQnVp bGRlcjo6SW5saW5lSXRlbVJ1biBvYmplY3RzIGRvbid0IGhhdmUgdmVydGljYWwgZ2VvbWV0cnkK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNDc1Mgor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTc1NjA2NDM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSGVpZ2h0IGFuZCB2ZXJ0aWNhbCBwb3NpdGlvbiBh cmUgY29tcHV0ZWQgd2hlbiB0aGUgSW5saW5lSXRlbVJ1biBvYmplY3RzIGFyZSBtZXJnZWQgYW5k IHRyYW5zZm9ybWVkIGludG8gTGluZUJ1aWxkZXI6OlJ1biBvYmplY3RzLgorCisgICAgICAgICog bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVpbGRlcjo6Q29udGlub3VzQ29udGVudDo6YXBwZW5kKToK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJ1aWxkZXI6OkNvbnRpbm91c0NvbnRlbnQ6 OmNsb3NlKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJ1aWxkZXI6OlJ1bjo6UnVu KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJ1aWxkZXI6OmFwcGVuZE5vbkJyZWFr YWJsZVNwYWNlKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJ1aWxkZXI6OmFwcGVu ZElubGluZUNvbnRhaW5lclN0YXJ0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJ1 aWxkZXI6OmFwcGVuZElubGluZUNvbnRhaW5lckVuZCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OkxpbmVCdWlsZGVyOjphcHBlbmRUZXh0Q29udGVudCk6CisgICAgICAgIChXZWJDb3JlOjpM YXlvdXQ6OkxpbmVCdWlsZGVyOjphcHBlbmROb25SZXBsYWNlZElubGluZUJveCk6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCdWlsZGVyOjphcHBlbmRMaW5lQnJlYWspOgorICAgICAg ICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVpbGRlcjo6aXNWaXN1YWxseU5vbkVtcHR5IGNvbnN0 KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJ1aWxkZXI6OklubGluZUl0ZW1SdW46 OklubGluZUl0ZW1SdW4pOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVpbGRlcjo6 SW5saW5lSXRlbVJ1bjo6c2V0Q29sbGFwc2VzVG9aZXJvQWR2YW5jZVdpZHRoKToKKyAgICAgICAg KFdlYkNvcmU6OkxheW91dDo6TGluZUJ1aWxkZXI6OklubGluZUl0ZW1SdW46OnJlbW92ZVRyYWls aW5nTGV0dGVyU3BhY2luZyk6CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s aW5lTGluZUJ1aWxkZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJ1aWxkZXI6 OklubGluZUl0ZW1SdW46OmxvZ2ljYWxMZWZ0IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dDo6TGluZUJ1aWxkZXI6OklubGluZUl0ZW1SdW46OmxvZ2ljYWxXaWR0aCBjb25zdCk6Cisg ICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCdWlsZGVyOjpJbmxpbmVJdGVtUnVuOjpsb2dp Y2FsUmVjdCBjb25zdCk6IERlbGV0ZWQuCisKIDIwMTktMTItMDEgIFRpbSBIb3J0b24gIDx0aW1v dGh5X2hvcnRvbkBhcHBsZS5jb20+CiAKICAgICAgICAgRGlzYWJsZSBMb2NhbEN1cnJlbnRHcmFw aGljc0NvbnRleHQgd2hlbiBkb2luZyBEaXNwbGF5TGlzdCByZWNvcmRpbmcKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVy LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVC dWlsZGVyLmNwcAppbmRleCBlMWM3ZWZmMjc1NWVhYmZmMTY1NmRkNmUyMmFjZTFmNTdkYTA5NDdk Li5iYzgwMTU5ZjhjMmQ4ODE0YjAxZDFjOGQyZTFlZWQyNDQ4NGUzMDM4IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGlu ZUJ1aWxkZXIuY3BwCkBAIC03NCw3ICs3NCw3IEBAIGJvb2wgTGluZUJ1aWxkZXI6OkNvbnRpbm91 c0NvbnRlbnQ6OmFwcGVuZChjb25zdCBJbmxpbmVJdGVtUnVuJiBpbmxpbmVJdGVtUnVuKQogCiAg ICAgQVNTRVJUKGlubGluZUl0ZW1SdW4uaXNUZXh0KCkpOwogICAgIG1fZXhwYW5kZWRMZW5ndGgg Kz0gaW5saW5lSXRlbVJ1bi50ZXh0Q29udGV4dCgpLT5sZW5ndGgoKTsKLSAgICBtX2V4cGFuZGVk V2lkdGggKz0gaW5saW5lSXRlbVJ1bi5sb2dpY2FsUmVjdCgpLndpZHRoKCk7CisgICAgbV9leHBh bmRlZFdpZHRoICs9IGlubGluZUl0ZW1SdW4ubG9naWNhbFdpZHRoKCk7CiAKICAgICBpZiAobV90 ZXh0SXNBbGlnbkp1c3RpZnkpIHsKICAgICAgICAgbV9oYXNUcmFpbGluZ0V4cGFuc2lvbk9wcG9y dHVuaXR5ID0gaW5saW5lSXRlbVJ1bi5oYXNFeHBhbnNpb25PcHBvcnR1bml0eSgpOwpAQCAtOTAs OSArOTAsNiBAQCBMaW5lQnVpbGRlcjo6UnVuIExpbmVCdWlsZGVyOjpDb250aW5vdXNDb250ZW50 OjpjbG9zZSgpCiAgICAgICAgIHJldHVybiB7IG1faW5pdGlhbElubGluZVJ1biB9OwogICAgIC8v IEV4cGFuZCB0aGUgdGV4dCBjb250ZW50IGFuZCBzZXQgdGhlIGV4cGFuc2lvbiBvcHBvcnR1bml0 aWVzLgogICAgIEFTU0VSVChtX2luaXRpYWxJbmxpbmVSdW4uaXNUZXh0KCkpOwotICAgIGF1dG8g bG9naWNhbFJlY3QgPSBtX2luaXRpYWxJbmxpbmVSdW4ubG9naWNhbFJlY3QoKTsKLSAgICBsb2dp Y2FsUmVjdC5leHBhbmRIb3Jpem9udGFsbHkobV9leHBhbmRlZFdpZHRoKTsKLQogICAgIGF1dG8g dGV4dENvbnRleHQgPSAqbV9pbml0aWFsSW5saW5lUnVuLnRleHRDb250ZXh0KCk7CiAgICAgYXV0 byBsZW5ndGggPSB0ZXh0Q29udGV4dC5sZW5ndGgoKSArIG1fZXhwYW5kZWRMZW5ndGg7CiAgICAg dGV4dENvbnRleHQuZXhwYW5kKGxlbmd0aCk7CkBAIC0xMDQsMTMgKzEwMSwxMyBAQCBMaW5lQnVp bGRlcjo6UnVuIExpbmVCdWlsZGVyOjpDb250aW5vdXNDb250ZW50OjpjbG9zZSgpCiAgICAgICAg ICAgICArK21fZXhwYW5zaW9uT3Bwb3J0dW5pdHlDb3VudDsKICAgICAgICAgdGV4dENvbnRleHQu c2V0RXhwYW5zaW9uKHsgZXhwYW5zaW9uQmVoYXZpb3IsIHsgfSB9KTsKICAgICB9Ci0gICAgcmV0 dXJuIHsgbV9pbml0aWFsSW5saW5lUnVuLCBsb2dpY2FsUmVjdCwgdGV4dENvbnRleHQsIG1fZXhw YW5zaW9uT3Bwb3J0dW5pdHlDb3VudCB9OworICAgIHJldHVybiB7IG1faW5pdGlhbElubGluZVJ1 biwgIERpc3BsYXk6OlJlY3QgeyAwLCBtX2luaXRpYWxJbmxpbmVSdW4ubG9naWNhbExlZnQoKSwg bV9pbml0aWFsSW5saW5lUnVuLmxvZ2ljYWxXaWR0aCgpICsgbV9leHBhbmRlZFdpZHRoLCB7IH0g fSwgdGV4dENvbnRleHQsIG1fZXhwYW5zaW9uT3Bwb3J0dW5pdHlDb3VudCB9OwogfQogCiBMaW5l QnVpbGRlcjo6UnVuOjpSdW4oY29uc3QgSW5saW5lSXRlbVJ1biYgaW5saW5lSXRlbVJ1bikKICAg ICA6IG1fbGF5b3V0Qm94KCZpbmxpbmVJdGVtUnVuLmxheW91dEJveCgpKQogICAgICwgbV90eXBl KGlubGluZUl0ZW1SdW4udHlwZSgpKQotICAgICwgbV9sb2dpY2FsUmVjdChpbmxpbmVJdGVtUnVu LmxvZ2ljYWxSZWN0KCkpCisgICAgLCBtX2xvZ2ljYWxSZWN0KHsgeyB9LCBpbmxpbmVJdGVtUnVu LmxvZ2ljYWxMZWZ0KCksIGlubGluZUl0ZW1SdW4ubG9naWNhbFdpZHRoKCksIHsgfSB9KQogICAg ICwgbV90ZXh0Q29udGV4dChpbmxpbmVJdGVtUnVuLnRleHRDb250ZXh0KCkpCiAgICAgLCBtX2lz Q29sbGFwc2VkVG9WaXN1YWxseUVtcHR5KGlubGluZUl0ZW1SdW4uaXNDb2xsYXBzZWRUb1plcm9B ZHZhbmNlV2lkdGgoKSkKIHsKQEAgLTQ0NiwyMiArNDQzLDIyIEBAIHZvaWQgTGluZUJ1aWxkZXI6 OmFwcGVuZChjb25zdCBJbmxpbmVJdGVtJiBpbmxpbmVJdGVtLCBMYXlvdXRVbml0IGxvZ2ljYWxX aWR0aCkKICAgICAgICAgbV9saW5lQm94LnNldElzQ29uc2lkZXJlZE5vbkVtcHR5KCk7CiB9CiAK LXZvaWQgTGluZUJ1aWxkZXI6OmFwcGVuZE5vbkJyZWFrYWJsZVNwYWNlKGNvbnN0IElubGluZUl0 ZW0mIGlubGluZUl0ZW0sIGNvbnN0IERpc3BsYXk6OlJlY3QmIGxvZ2ljYWxSZWN0KQordm9pZCBM aW5lQnVpbGRlcjo6YXBwZW5kTm9uQnJlYWthYmxlU3BhY2UoY29uc3QgSW5saW5lSXRlbSYgaW5s aW5lSXRlbSwgTGF5b3V0VW5pdCBsb2dpY2FsTGVmdCwgTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgp CiB7Ci0gICAgbV9pbmxpbmVJdGVtUnVucy5hcHBlbmQoeyBpbmxpbmVJdGVtLCBsb2dpY2FsUmVj dCB9KTsKLSAgICBtX2xpbmVCb3guZXhwYW5kSG9yaXpvbnRhbGx5KGxvZ2ljYWxSZWN0LndpZHRo KCkpOworICAgIG1faW5saW5lSXRlbVJ1bnMuYXBwZW5kKHsgaW5saW5lSXRlbSwgbG9naWNhbExl ZnQsIGxvZ2ljYWxXaWR0aCB9KTsKKyAgICBtX2xpbmVCb3guZXhwYW5kSG9yaXpvbnRhbGx5KGxv Z2ljYWxXaWR0aCk7CiB9CiAKIHZvaWQgTGluZUJ1aWxkZXI6OmFwcGVuZElubGluZUNvbnRhaW5l clN0YXJ0KGNvbnN0IElubGluZUl0ZW0mIGlubGluZUl0ZW0sIExheW91dFVuaXQgbG9naWNhbFdp ZHRoKQogewogICAgIC8vIFRoaXMgaXMgcmVhbGx5IGp1c3QgYSBwbGFjZWhvbGRlciB0byBtYXJr IHRoZSBzdGFydCBvZiB0aGUgaW5saW5lIGxldmVsIGNvbnRhaW5lciA8c3Bhbj4uCi0gICAgYXBw ZW5kTm9uQnJlYWthYmxlU3BhY2UoaW5saW5lSXRlbSwgRGlzcGxheTo6UmVjdCB7IDAsIGNvbnRl bnRMb2dpY2FsV2lkdGgoKSwgbG9naWNhbFdpZHRoLCB7IH0gfSk7CisgICAgYXBwZW5kTm9uQnJl YWthYmxlU3BhY2UoaW5saW5lSXRlbSwgY29udGVudExvZ2ljYWxXaWR0aCgpLCBsb2dpY2FsV2lk dGgpOwogfQogCiB2b2lkIExpbmVCdWlsZGVyOjphcHBlbmRJbmxpbmVDb250YWluZXJFbmQoY29u c3QgSW5saW5lSXRlbSYgaW5saW5lSXRlbSwgTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgpCiB7CiAg ICAgLy8gVGhpcyBpcyByZWFsbHkganVzdCBhIHBsYWNlaG9sZGVyIHRvIG1hcmsgdGhlIGVuZCBv ZiB0aGUgaW5saW5lIGxldmVsIGNvbnRhaW5lciA8L3NwYW4+LgotICAgIGFwcGVuZE5vbkJyZWFr YWJsZVNwYWNlKGlubGluZUl0ZW0sIERpc3BsYXk6OlJlY3QgeyAwLCBjb250ZW50TG9naWNhbFJp Z2h0KCksIGxvZ2ljYWxXaWR0aCwgeyB9IH0pOworICAgIGFwcGVuZE5vbkJyZWFrYWJsZVNwYWNl KGlubGluZUl0ZW0sIGNvbnRlbnRMb2dpY2FsUmlnaHQoKSwgbG9naWNhbFdpZHRoKTsKIH0KIAog dm9pZCBMaW5lQnVpbGRlcjo6YXBwZW5kVGV4dENvbnRlbnQoY29uc3QgSW5saW5lVGV4dEl0ZW0m IGlubGluZUl0ZW0sIExheW91dFVuaXQgbG9naWNhbFdpZHRoKQpAQCAtNDk4LDggKzQ5NSw3IEBA IHZvaWQgTGluZUJ1aWxkZXI6OmFwcGVuZFRleHRDb250ZW50KGNvbnN0IElubGluZVRleHRJdGVt JiBpbmxpbmVJdGVtLCBMYXlvdXRVbml0CiAgICAgYXV0byBjb2xsYXBzZWRSdW4gPSBpbmxpbmVJ dGVtLmlzQ29sbGFwc2libGUoKSAmJiBpbmxpbmVJdGVtLmxlbmd0aCgpID4gMTsKICAgICBhdXRv IGNvbnRlbnRTdGFydCA9IGlubGluZUl0ZW0uc3RhcnQoKTsKICAgICBhdXRvIGNvbnRlbnRMZW5n dGggPSAgY29sbGFwc2VkUnVuID8gMSA6IGlubGluZUl0ZW0ubGVuZ3RoKCk7Ci0gICAgYXV0byBs aW5lUnVuID0gSW5saW5lSXRlbVJ1biB7IGlubGluZUl0ZW0sIERpc3BsYXk6OlJlY3QgeyAwLCBj b250ZW50TG9naWNhbFdpZHRoKCksIGxvZ2ljYWxXaWR0aCwgeyB9IH0sCi0gICAgICAgIERpc3Bs YXk6OlJ1bjo6VGV4dENvbnRleHQgeyBjb250ZW50U3RhcnQsIGNvbnRlbnRMZW5ndGgsIGlubGlu ZUl0ZW0ubGF5b3V0Qm94KCkudGV4dENvbnRleHQoKS0+Y29udGVudCB9IH07CisgICAgYXV0byBs aW5lUnVuID0gSW5saW5lSXRlbVJ1biB7IGlubGluZUl0ZW0sIGNvbnRlbnRMb2dpY2FsV2lkdGgo KSwgbG9naWNhbFdpZHRoLCBEaXNwbGF5OjpSdW46OlRleHRDb250ZXh0IHsgY29udGVudFN0YXJ0 LCBjb250ZW50TGVuZ3RoLCBpbmxpbmVJdGVtLmxheW91dEJveCgpLnRleHRDb250ZXh0KCktPmNv bnRlbnQgfSB9OwogCiAgICAgYXV0byBjb2xsYXBzZXNUb1plcm9BZHZhbmNlV2lkdGggPSB3aWxs Q29sbGFwc2VDb21wbGV0ZWx5KCk7CiAgICAgaWYgKGNvbGxhcHNlc1RvWmVyb0FkdmFuY2VXaWR0 aCkKQEAgLTUwOCw3ICs1MDQsNyBAQCB2b2lkIExpbmVCdWlsZGVyOjphcHBlbmRUZXh0Q29udGVu dChjb25zdCBJbmxpbmVUZXh0SXRlbSYgaW5saW5lSXRlbSwgTGF5b3V0VW5pdAogICAgIGlmIChj b2xsYXBzZWRSdW4pCiAgICAgICAgIGxpbmVSdW4uc2V0SXNDb2xsYXBzZWQoKTsKIAotICAgIGF1 dG8gbGluZVJ1bldpZHRoID0gbGluZVJ1bi5sb2dpY2FsUmVjdCgpLndpZHRoKCk7CisgICAgYXV0 byBsaW5lUnVuV2lkdGggPSBsaW5lUnVuLmxvZ2ljYWxXaWR0aCgpOwogICAgIC8vIFRyYWlsaW5n IHdoaXRlc3BhY2UgY29udGVudCBpcyBmdWxseSB0cmltbWFibGUgc28gYXMgdGhlIHRyYWlsaW5n IGxldHRlciBzcGFjZS4KICAgICBhdXRvIGlzRnVsbHlUcmltbWFibGUgPSAhc2hvdWxkUHJlc2Vy dmVUcmFpbGluZ0NvbnRlbnQoaW5saW5lSXRlbSk7CiAgICAgYXV0byBpc1BhcnRpYWxseVRyaW1t YWJsZSA9ICFpbmxpbmVJdGVtLmlzV2hpdGVzcGFjZSgpICYmIGlubGluZUl0ZW0uc3R5bGUoKS5s ZXR0ZXJTcGFjaW5nKCk7CkBAIC01MzMsNyArNTI5LDcgQEAgdm9pZCBMaW5lQnVpbGRlcjo6YXBw ZW5kTm9uUmVwbGFjZWRJbmxpbmVCb3goY29uc3QgSW5saW5lSXRlbSYgaW5saW5lSXRlbSwgTGF5 b3UKICAgICBhdXRvJiBsYXlvdXRCb3ggPSBpbmxpbmVJdGVtLmxheW91dEJveCgpOwogICAgIGF1 dG8mIGJveEdlb21ldHJ5ID0gZm9ybWF0dGluZ0NvbnRleHQoKS5nZW9tZXRyeUZvckJveChsYXlv dXRCb3gpOwogICAgIGF1dG8gaG9yaXpvbnRhbE1hcmdpbiA9IGJveEdlb21ldHJ5Lmhvcml6b250 YWxNYXJnaW4oKTsKLSAgICBtX2lubGluZUl0ZW1SdW5zLmFwcGVuZCh7IGlubGluZUl0ZW0sIERp c3BsYXk6OlJlY3QgeyAwLCBjb250ZW50TG9naWNhbFdpZHRoKCkgKyBob3Jpem9udGFsTWFyZ2lu LnN0YXJ0LCBsb2dpY2FsV2lkdGgsIHsgfSB9IH0pOworICAgIG1faW5saW5lSXRlbVJ1bnMuYXBw ZW5kKHsgaW5saW5lSXRlbSwgY29udGVudExvZ2ljYWxXaWR0aCgpICsgaG9yaXpvbnRhbE1hcmdp bi5zdGFydCwgbG9naWNhbFdpZHRoIH0pOwogICAgIG1fbGluZUJveC5leHBhbmRIb3Jpem9udGFs bHkobG9naWNhbFdpZHRoICsgaG9yaXpvbnRhbE1hcmdpbi5zdGFydCArIGhvcml6b250YWxNYXJn aW4uZW5kKTsKICAgICBtX3RyaW1tYWJsZUNvbnRlbnQuY2xlYXIoKTsKIH0KQEAgLTU0Nyw3ICs1 NDMsNyBAQCB2b2lkIExpbmVCdWlsZGVyOjphcHBlbmRSZXBsYWNlZElubGluZUJveChjb25zdCBJ bmxpbmVJdGVtJiBpbmxpbmVJdGVtLCBMYXlvdXRVbgogCiB2b2lkIExpbmVCdWlsZGVyOjphcHBl bmRMaW5lQnJlYWsoY29uc3QgSW5saW5lSXRlbSYgaW5saW5lSXRlbSkKIHsKLSAgICBtX2lubGlu ZUl0ZW1SdW5zLmFwcGVuZCh7IGlubGluZUl0ZW0sIERpc3BsYXk6OlJlY3QgeyAwLCBjb250ZW50 TG9naWNhbFdpZHRoKCksIHsgfSwgeyB9IH0gfSk7CisgICAgbV9pbmxpbmVJdGVtUnVucy5hcHBl bmQoeyBpbmxpbmVJdGVtLCBjb250ZW50TG9naWNhbFdpZHRoKCksIHsgfSB9KTsKIH0KIAogdm9p ZCBMaW5lQnVpbGRlcjo6YWRqdXN0QmFzZWxpbmVBbmRMaW5lSGVpZ2h0KGNvbnN0IFJ1biYgcnVu KQpAQCAtNjY0LDcgKzY2MCw3IEBAIGJvb2wgTGluZUJ1aWxkZXI6OmlzVmlzdWFsbHlOb25FbXB0 eShjb25zdCBJbmxpbmVJdGVtUnVuJiBydW4pIGNvbnN0CiAKICAgICAvLyBOb3RlIHRoYXQgdGhp cyBkb2VzIG5vdCBjaGVjayB3aGV0aGVyIHRoZSBpbmxpbmUgY29udGFpbmVyIGhhcyBjb250ZW50 LiBJdCBzaW1wbHkgY2hlY2tzIGlmIHRoZSBjb250YWluZXIgaXRzZWxmIGlzIGNvbnNpZGVyZWQg bm9uLWVtcHR5LgogICAgIGlmIChydW4uaXNDb250YWluZXJTdGFydCgpIHx8IHJ1bi5pc0NvbnRh aW5lckVuZCgpKSB7Ci0gICAgICAgIGlmICghcnVuLmxvZ2ljYWxSZWN0KCkud2lkdGgoKSkKKyAg ICAgICAgaWYgKCFydW4ubG9naWNhbFdpZHRoKCkpCiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7 CiAgICAgICAgIC8vIE1hcmdpbiBkb2VzIG5vdCBtYWtlIHRoZSBjb250YWluZXIgdmlzdWFsbHkg bm9uLWVtcHR5LiBDaGVjayBpZiBpdCBoYXMgYm9yZGVyIG9yIHBhZGRpbmcuCiAgICAgICAgIGF1 dG8mIGJveEdlb21ldHJ5ID0gZm9ybWF0dGluZ0NvbnRleHQoKS5nZW9tZXRyeUZvckJveChydW4u bGF5b3V0Qm94KCkpOwpAQCAtNjgwLDcgKzY3Niw3IEBAIGJvb2wgTGluZUJ1aWxkZXI6OmlzVmlz dWFsbHlOb25FbXB0eShjb25zdCBJbmxpbmVJdGVtUnVuJiBydW4pIGNvbnN0CiAgICAgICAgIGlm ICghcnVuLmxheW91dEJveCgpLmVzdGFibGlzaGVzRm9ybWF0dGluZ0NvbnRleHQoKSkKICAgICAg ICAgICAgIHJldHVybiB0cnVlOwogICAgICAgICBBU1NFUlQocnVuLmxheW91dEJveCgpLmlzSW5s aW5lQmxvY2tCb3goKSk7Ci0gICAgICAgIGlmICghcnVuLmxvZ2ljYWxSZWN0KCkud2lkdGgoKSkK KyAgICAgICAgaWYgKCFydW4ubG9naWNhbFdpZHRoKCkpCiAgICAgICAgICAgICByZXR1cm4gZmFs c2U7CiAgICAgICAgIGlmIChtX3NraXBBbGlnbm1lbnQgfHwgZm9ybWF0dGluZ0NvbnRleHQoKS5n ZW9tZXRyeUZvckJveChydW4ubGF5b3V0Qm94KCkpLmhlaWdodCgpKQogICAgICAgICAgICAgcmV0 dXJuIHRydWU7CkBAIC03MjIsOSArNzE4LDEwIEBAIHZvaWQgTGluZUJ1aWxkZXI6OlRyaW1tYWJs ZUNvbnRlbnQ6OmFwcGVuZChMYXlvdXRVbml0IGl0ZW1SdW5XaWR0aCwgc2l6ZV90IHJ1bkluCiAg ICAgbV9ydW5JbmRleGVzLmFwcGVuZChydW5JbmRleCk7CiB9CiAKLUxpbmVCdWlsZGVyOjpJbmxp bmVJdGVtUnVuOjpJbmxpbmVJdGVtUnVuKGNvbnN0IElubGluZUl0ZW0mIGlubGluZUl0ZW0sIGNv bnN0IERpc3BsYXk6OlJlY3QmIGxvZ2ljYWxSZWN0LCBXVEY6Ok9wdGlvbmFsPERpc3BsYXk6OlJ1 bjo6VGV4dENvbnRleHQ+IHRleHRDb250ZXh0KQorTGluZUJ1aWxkZXI6OklubGluZUl0ZW1SdW46 OklubGluZUl0ZW1SdW4oY29uc3QgSW5saW5lSXRlbSYgaW5saW5lSXRlbSwgTGF5b3V0VW5pdCBs b2dpY2FsTGVmdCwgTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgsIFdURjo6T3B0aW9uYWw8RGlzcGxh eTo6UnVuOjpUZXh0Q29udGV4dD4gdGV4dENvbnRleHQpCiAgICAgOiBtX2lubGluZUl0ZW0oaW5s aW5lSXRlbSkKLSAgICAsIG1fbG9naWNhbFJlY3QobG9naWNhbFJlY3QpCisgICAgLCBtX2xvZ2lj YWxMZWZ0KGxvZ2ljYWxMZWZ0KQorICAgICwgbV9sb2dpY2FsV2lkdGgobG9naWNhbFdpZHRoKQog ICAgICwgbV90ZXh0Q29udGV4dCh0ZXh0Q29udGV4dCkKIHsKIH0KQEAgLTczMiwxMyArNzI5LDE0 IEBAIExpbmVCdWlsZGVyOjpJbmxpbmVJdGVtUnVuOjpJbmxpbmVJdGVtUnVuKGNvbnN0IElubGlu ZUl0ZW0mIGlubGluZUl0ZW0sIGNvbnN0IERpCiB2b2lkIExpbmVCdWlsZGVyOjpJbmxpbmVJdGVt UnVuOjpzZXRDb2xsYXBzZXNUb1plcm9BZHZhbmNlV2lkdGgoKQogewogICAgIG1fY29sbGFwc2Vk VG9aZXJvQWR2YW5jZVdpZHRoID0gdHJ1ZTsKLSAgICBtX2xvZ2ljYWxSZWN0LnNldFdpZHRoKHsg fSk7CisgICAgbV9sb2dpY2FsV2lkdGggPSB7IH07CiB9CiAKIHZvaWQgTGluZUJ1aWxkZXI6Oklu bGluZUl0ZW1SdW46OnJlbW92ZVRyYWlsaW5nTGV0dGVyU3BhY2luZygpCiB7CiAgICAgQVNTRVJU KG1faW5saW5lSXRlbS5zdHlsZSgpLmxldHRlclNwYWNpbmcoKSk7Ci0gICAgbV9sb2dpY2FsUmVj dC5leHBhbmRIb3Jpem9udGFsbHkoTGF5b3V0VW5pdCB7IC1tX2lubGluZUl0ZW0uc3R5bGUoKS5s ZXR0ZXJTcGFjaW5nKCkgfSk7CisgICAgbV9sb2dpY2FsV2lkdGggLT0gbV9pbmxpbmVJdGVtLnN0 eWxlKCkubGV0dGVyU3BhY2luZygpOworICAgIEFTU0VSVChtX2xvZ2ljYWxXaWR0aCA+IDApOwog fQogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGlu Zy9JbmxpbmVMaW5lQnVpbGRlci5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1h dHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuaAppbmRleCA4MGQyYjg4ZDc0MDA5NDAxMWMyOWE4ZTQw YzZiNTM4MzNiOTNiMWE4Li45NWU3MjAyNzEzNjZjNDdmODNlYjhhZjc4NTFlYWY5YzUzNjc1NmNh IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9Jbmxp bmVMaW5lQnVpbGRlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0 aW5nL0lubGluZUxpbmVCdWlsZGVyLmgKQEAgLTEzMCw3ICsxMzAsNyBAQCBwcml2YXRlOgogICAg IExheW91dFVuaXQgY29udGVudExvZ2ljYWxSaWdodCgpIGNvbnN0IHsgcmV0dXJuIG1fbGluZUJv eC5sb2dpY2FsUmlnaHQoKTsgfQogICAgIExheW91dFVuaXQgYmFzZWxpbmVPZmZzZXQoKSBjb25z dCB7IHJldHVybiBtX2xpbmVCb3guYmFzZWxpbmVPZmZzZXQoKTsgfQogCi0gICAgdm9pZCBhcHBl bmROb25CcmVha2FibGVTcGFjZShjb25zdCBJbmxpbmVJdGVtJiwgY29uc3QgRGlzcGxheTo6UmVj dCYgbG9naWNhbFJlY3QpOworICAgIHZvaWQgYXBwZW5kTm9uQnJlYWthYmxlU3BhY2UoY29uc3Qg SW5saW5lSXRlbSYsIExheW91dFVuaXQgbG9naWNhbExlZnQsIExheW91dFVuaXQgbG9naWNhbFdp ZHRoKTsKICAgICB2b2lkIGFwcGVuZFRleHRDb250ZW50KGNvbnN0IElubGluZVRleHRJdGVtJiwg TGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgpOwogICAgIHZvaWQgYXBwZW5kTm9uUmVwbGFjZWRJbmxp bmVCb3goY29uc3QgSW5saW5lSXRlbSYsIExheW91dFVuaXQgbG9naWNhbFdpZHRoKTsKICAgICB2 b2lkIGFwcGVuZFJlcGxhY2VkSW5saW5lQm94KGNvbnN0IElubGluZUl0ZW0mLCBMYXlvdXRVbml0 IGxvZ2ljYWxXaWR0aCk7CkBAIC0xNTUsMTAgKzE1NSwxMSBAQCBwcml2YXRlOgogCiAgICAgY2xh c3MgSW5saW5lSXRlbVJ1biB7CiAgICAgcHVibGljOgotICAgICAgICBJbmxpbmVJdGVtUnVuKGNv bnN0IElubGluZUl0ZW0mLCBjb25zdCBEaXNwbGF5OjpSZWN0JiwgV1RGOjpPcHRpb25hbDxEaXNw bGF5OjpSdW46OlRleHRDb250ZXh0PiA9IFdURjo6bnVsbG9wdCk7CisgICAgICAgIElubGluZUl0 ZW1SdW4oY29uc3QgSW5saW5lSXRlbSYsIExheW91dFVuaXQgbG9naWNhbExlZnQsIExheW91dFVu aXQgbG9naWNhbFdpZHRoLCBXVEY6Ok9wdGlvbmFsPERpc3BsYXk6OlJ1bjo6VGV4dENvbnRleHQ+ ID0gV1RGOjpudWxsb3B0KTsKIAogICAgICAgICBjb25zdCBCb3gmIGxheW91dEJveCgpIGNvbnN0 IHsgcmV0dXJuIG1faW5saW5lSXRlbS5sYXlvdXRCb3goKTsgfQotICAgICAgICBjb25zdCBEaXNw bGF5OjpSZWN0JiBsb2dpY2FsUmVjdCgpIGNvbnN0IHsgcmV0dXJuIG1fbG9naWNhbFJlY3Q7IH0K KyAgICAgICAgTGF5b3V0VW5pdCBsb2dpY2FsTGVmdCgpIGNvbnN0IHsgcmV0dXJuIG1fbG9naWNh bExlZnQ7IH0KKyAgICAgICAgTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgoKSBjb25zdCB7IHJldHVy biBtX2xvZ2ljYWxXaWR0aDsgfQogICAgICAgICBjb25zdCBPcHRpb25hbDxEaXNwbGF5OjpSdW46 OlRleHRDb250ZXh0PiYgdGV4dENvbnRleHQoKSBjb25zdCB7IHJldHVybiBtX3RleHRDb250ZXh0 OyB9CiAKICAgICAgICAgYm9vbCBpc1RleHQoKSBjb25zdCB7IHJldHVybiBtX2lubGluZUl0ZW0u aXNUZXh0KCk7IH0KQEAgLTE4Miw3ICsxODMsOCBAQCBwcml2YXRlOgogCiAgICAgcHJpdmF0ZToK ICAgICAgICAgY29uc3QgSW5saW5lSXRlbSYgbV9pbmxpbmVJdGVtOwotICAgICAgICBEaXNwbGF5 OjpSZWN0IG1fbG9naWNhbFJlY3Q7CisgICAgICAgIExheW91dFVuaXQgbV9sb2dpY2FsTGVmdDsK KyAgICAgICAgTGF5b3V0VW5pdCBtX2xvZ2ljYWxXaWR0aDsKICAgICAgICAgY29uc3QgT3B0aW9u YWw8RGlzcGxheTo6UnVuOjpUZXh0Q29udGV4dD4gbV90ZXh0Q29udGV4dDsKICAgICAgICAgYm9v bCBtX2lzQ29sbGFwc2VkIHsgZmFsc2UgfTsKICAgICAgICAgYm9vbCBtX2NvbGxhcHNlZFRvWmVy b0FkdmFuY2VXaWR0aCB7IGZhbHNlIH07Cg==