177968 2017-10-05 14:22:32 -0700 RenderListItem should not hold raw pointers to RenderListMarker. 2017-10-05 15:40:10 -0700 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 1357247 0 zalan 2017-10-05 14:22:32 -0700 there's a better way. 1357249 1 webkit-bug-importer 2017-10-05 14:23:01 -0700 <rdar://problem/34842943> 1357250 2 322917 zalan 2017-10-05 14:25:18 -0700 Created attachment 322917 Patch 1357265 3 322917 koivisto 2017-10-05 14:57:07 -0700 Comment on attachment 322917 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=322917&action=review > Source/WebCore/rendering/RenderListItem.cpp:332 > + RenderBox* renderBox = m_marker.get(); Would this have a more descriptive name? 'markerAncestor' or something? 1357266 4 322922 zalan 2017-10-05 15:05:51 -0700 Created attachment 322922 Patch 1357287 5 322922 commit-queue 2017-10-05 15:40:09 -0700 Comment on attachment 322922 Patch Clearing flags on attachment: 322922 Committed r222936: <http://trac.webkit.org/changeset/222936> 1357288 6 commit-queue 2017-10-05 15:40:10 -0700 All reviewed patches have been landed. Closing bug. 322917 2017-10-05 14:25:18 -0700 2017-10-05 15:05:49 -0700 Patch bug-177968-20171005142517.patch text/plain 7119 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjIyOTExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWRlN2Y4MWMyZDY2ZGRk MTNmMjVkYWZlZDIyNzIxNWUwYzUzN2QzNS4uNjYzOGZlMjgwYjNjYzBiZTMwYTFjMDMwNTY5NDBm MTg1NGQ0MmY0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI3IEBACiAyMDE3LTEwLTA1ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKKyAgICAgICAgUmVuZGVyTGlzdEl0ZW0gc2hv dWxkIG5vdCBob2xkIHJhdyBwb2ludGVycyB0byBSZW5kZXJMaXN0TWFya2VyLgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc3OTY4CisgICAgICAgIDxy ZGFyOi8vcHJvYmxlbS8zNDg0Mjk0Mz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBOb3cgd2UgZG9uJ3QgbmVlZCB0byB1bnJlZ2lzdGVyIHRoZSBtYXJr ZXIgZnJvbSB0aGUgbGlzdCBpdGVtIGV4cGxpY2l0bHkuCisKKyAgICAgICAgQ292ZXJlZCBieSBl eGlzdGluZyB0ZXN0cy4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMaXN0SXRlbS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMaXN0SXRlbTo6UmVuZGVyTGlzdEl0ZW0pOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyTGlzdEl0ZW06OndpbGxCZURlc3Ryb3llZCk6CisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJMaXN0SXRlbTo6cG9zaXRpb25MaXN0TWFya2VyKToKKyAgICAgICAg KiByZW5kZXJpbmcvUmVuZGVyTGlzdEl0ZW0uaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVy TGlzdE1hcmtlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMaXN0TWFya2VyOjp3aWxs QmVEZXN0cm95ZWQpOgorICAgICAgICAqIHN0eWxlL1JlbmRlclRyZWVVcGRhdGVyTGlzdEl0ZW0u Y3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVHJlZVVwZGF0ZXI6Okxpc3RJdGVtOjp1cGRh dGVNYXJrZXIpOgorCisyMDE3LTEwLTA1ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+ CisKICAgICAgICAgTW92ZSBtdWx0aWNvbHVtbiBmbG93IGNsZWFyIHRvIFJlbmRlclRyZWVVcGRh dGVyCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzc4 OTgKICAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzM0ODIwMTU3PgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RJdGVtLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJMaXN0SXRlbS5jcHAKaW5kZXggN2VjZjI1MzhhYmY5YWYzY2NmY2JkNjQw NDQ3Y2U0YmM3YjQ0YzNhOS4uMzYyNzkyYjQyN2RmNzQwZDUxNDEzN2M0MDk1ZTUzYmM2OTZlODEy YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RJdGVtLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlzdEl0ZW0uY3BwCkBAIC00 OCw3ICs0OCw2IEBAIHVzaW5nIG5hbWVzcGFjZSBIVE1MTmFtZXM7CiAKIFJlbmRlckxpc3RJdGVt OjpSZW5kZXJMaXN0SXRlbShFbGVtZW50JiBlbGVtZW50LCBSZW5kZXJTdHlsZSYmIHN0eWxlKQog ICAgIDogUmVuZGVyQmxvY2tGbG93KGVsZW1lbnQsIFdURk1vdmUoc3R5bGUpKQotICAgICwgbV9t YXJrZXIobnVsbHB0cikKICAgICAsIG1faGFzRXhwbGljaXRWYWx1ZShmYWxzZSkKICAgICAsIG1f aXNWYWx1ZVVwVG9EYXRlKGZhbHNlKQogICAgICwgbV9ub3RJbkxpc3QoZmFsc2UpCkBAIC02Mywx MCArNjIsOCBAQCBSZW5kZXJMaXN0SXRlbTo6flJlbmRlckxpc3RJdGVtKCkKIAogdm9pZCBSZW5k ZXJMaXN0SXRlbTo6d2lsbEJlRGVzdHJveWVkKCkKIHsKLSAgICBpZiAobV9tYXJrZXIpIHsKLSAg ICAgICAgbV9tYXJrZXItPmRlc3Ryb3koKTsKLSAgICAgICAgQVNTRVJUKCFtX21hcmtlcik7Ci0g ICAgfQorICAgIGlmIChtX21hcmtlcikKKyAgICAgICAgbV9tYXJrZXItPnJlbW92ZUZyb21QYXJl bnRBbmREZXN0cm95KCk7CiAgICAgUmVuZGVyQmxvY2tGbG93Ojp3aWxsQmVEZXN0cm95ZWQoKTsK IH0KIApAQCAtMzMyLDI1ICszMjksMjUgQEAgdm9pZCBSZW5kZXJMaXN0SXRlbTo6cG9zaXRpb25M aXN0TWFya2VyKCkKICAgICAgICAgTGF5b3V0UmVjdCBtYXJrZXJSZWN0KG1hcmtlckxvZ2ljYWxM ZWZ0ICsgbGluZU9mZnNldCwgYmxvY2tPZmZzZXQsIG1fbWFya2VyLT53aWR0aCgpLCBtX21hcmtl ci0+aGVpZ2h0KCkpOwogICAgICAgICBpZiAoIXN0eWxlKCkuaXNIb3Jpem9udGFsV3JpdGluZ01v ZGUoKSkKICAgICAgICAgICAgIG1hcmtlclJlY3QgPSBtYXJrZXJSZWN0LnRyYW5zcG9zZWRSZWN0 KCk7Ci0gICAgICAgIFJlbmRlckJveCogbyA9IG1fbWFya2VyOworICAgICAgICBSZW5kZXJCb3gq IHJlbmRlckJveCA9IG1fbWFya2VyLmdldCgpOwogICAgICAgICBib29sIHByb3BhZ2F0ZVZpc3Vh bE92ZXJmbG93ID0gdHJ1ZTsKICAgICAgICAgYm9vbCBwcm9wYWdhdGVMYXlvdXRPdmVyZmxvdyA9 IHRydWU7CiAgICAgICAgIGRvIHsKLSAgICAgICAgICAgIG8gPSBvLT5wYXJlbnRCb3goKTsKLSAg ICAgICAgICAgIGlmIChvLT5oYXNPdmVyZmxvd0NsaXAoKSkKKyAgICAgICAgICAgIHJlbmRlckJv eCA9IHJlbmRlckJveC0+cGFyZW50Qm94KCk7CisgICAgICAgICAgICBpZiAocmVuZGVyQm94LT5o YXNPdmVyZmxvd0NsaXAoKSkKICAgICAgICAgICAgICAgICBwcm9wYWdhdGVWaXN1YWxPdmVyZmxv dyA9IGZhbHNlOwotICAgICAgICAgICAgaWYgKGlzPFJlbmRlckJsb2NrPigqbykpIHsKKyAgICAg ICAgICAgIGlmIChpczxSZW5kZXJCbG9jaz4oKnJlbmRlckJveCkpIHsKICAgICAgICAgICAgICAg ICBpZiAocHJvcGFnYXRlVmlzdWFsT3ZlcmZsb3cpCi0gICAgICAgICAgICAgICAgICAgIGRvd25j YXN0PFJlbmRlckJsb2NrPigqbykuYWRkVmlzdWFsT3ZlcmZsb3cobWFya2VyUmVjdCk7CisgICAg ICAgICAgICAgICAgICAgIGRvd25jYXN0PFJlbmRlckJsb2NrPigqcmVuZGVyQm94KS5hZGRWaXN1 YWxPdmVyZmxvdyhtYXJrZXJSZWN0KTsKICAgICAgICAgICAgICAgICBpZiAocHJvcGFnYXRlTGF5 b3V0T3ZlcmZsb3cpCi0gICAgICAgICAgICAgICAgICAgIGRvd25jYXN0PFJlbmRlckJsb2NrPigq bykuYWRkTGF5b3V0T3ZlcmZsb3cobWFya2VyUmVjdCk7CisgICAgICAgICAgICAgICAgICAgIGRv d25jYXN0PFJlbmRlckJsb2NrPigqcmVuZGVyQm94KS5hZGRMYXlvdXRPdmVyZmxvdyhtYXJrZXJS ZWN0KTsKICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIGlmIChvLT5oYXNPdmVyZmxvd0NsaXAo KSkKKyAgICAgICAgICAgIGlmIChyZW5kZXJCb3gtPmhhc092ZXJmbG93Q2xpcCgpKQogICAgICAg ICAgICAgICAgIHByb3BhZ2F0ZUxheW91dE92ZXJmbG93ID0gZmFsc2U7Ci0gICAgICAgICAgICBp ZiAoby0+aGFzU2VsZlBhaW50aW5nTGF5ZXIoKSkKKyAgICAgICAgICAgIGlmIChyZW5kZXJCb3gt Pmhhc1NlbGZQYWludGluZ0xheWVyKCkpCiAgICAgICAgICAgICAgICAgcHJvcGFnYXRlVmlzdWFs T3ZlcmZsb3cgPSBmYWxzZTsKLSAgICAgICAgICAgIG1hcmtlclJlY3QubW92ZUJ5KC1vLT5sb2Nh dGlvbigpKTsKLSAgICAgICAgfSB3aGlsZSAobyAhPSB0aGlzICYmIHByb3BhZ2F0ZVZpc3VhbE92 ZXJmbG93ICYmIHByb3BhZ2F0ZUxheW91dE92ZXJmbG93KTsKKyAgICAgICAgICAgIG1hcmtlclJl Y3QubW92ZUJ5KC1yZW5kZXJCb3gtPmxvY2F0aW9uKCkpOworICAgICAgICB9IHdoaWxlIChyZW5k ZXJCb3ggIT0gdGhpcyAmJiBwcm9wYWdhdGVWaXN1YWxPdmVyZmxvdyAmJiBwcm9wYWdhdGVMYXlv dXRPdmVyZmxvdyk7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTGlzdEl0ZW0uaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJM aXN0SXRlbS5oCmluZGV4IGQ0YmEzZmE2ODYyMmViNzM1MGJhMGFkNWM2YTAxZWVhYTg3OWU2YmUu LjQ3MjUwYzdiZDc5ZDZmZGE5YTU0Yzg2NTdkNTI4YTA3NTVhYTliYmMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaXN0SXRlbS5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMaXN0SXRlbS5oCkBAIC0yMywxMSArMjMsMTEgQEAKICNwcmFn bWEgb25jZQogCiAjaW5jbHVkZSAiUmVuZGVyQmxvY2tGbG93LmgiCisjaW5jbHVkZSAiUmVuZGVy TGlzdE1hcmtlci5oIgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIGNsYXNzIEhUTUxPTGlzdEVs ZW1lbnQ7Ci1jbGFzcyBSZW5kZXJMaXN0TWFya2VyOwogCiBjbGFzcyBSZW5kZXJMaXN0SXRlbSBm aW5hbCA6IHB1YmxpYyBSZW5kZXJCbG9ja0Zsb3cgewogcHVibGljOgpAQCAtNTYsOCArNTYsOCBA QCBwdWJsaWM6CiAKICAgICBSZW5kZXJTdHlsZSBjb21wdXRlTWFya2VyU3R5bGUoKSBjb25zdDsK IAotICAgIFJlbmRlckxpc3RNYXJrZXIqIG1hcmtlclJlbmRlcmVyKCkgeyByZXR1cm4gbV9tYXJr ZXI7IH0KLSAgICB2b2lkIHNldE1hcmtlclJlbmRlcmVyKFJlbmRlckxpc3RNYXJrZXIqIG1hcmtl cikgeyBtX21hcmtlciA9IG1hcmtlcjsgfQorICAgIFJlbmRlckxpc3RNYXJrZXIqIG1hcmtlclJl bmRlcmVyKCkgY29uc3QgeyByZXR1cm4gbV9tYXJrZXIuZ2V0KCk7IH0KKyAgICB2b2lkIHNldE1h cmtlclJlbmRlcmVyKFJlbmRlckxpc3RNYXJrZXImIG1hcmtlcikgeyBtX21hcmtlciA9IG1ha2VX ZWFrUHRyKG1hcmtlcik7IH0KIAogI2lmICFBU1NFUlRfRElTQUJMRUQKICAgICBib29sIGluTGF5 b3V0KCkgY29uc3QgeyByZXR1cm4gbV9pbkxheW91dDsgfQpAQCAtODgsNyArODgsNyBAQCBwcml2 YXRlOgogCiAKICAgICBpbnQgbV9leHBsaWNpdFZhbHVlOwotICAgIFJlbmRlckxpc3RNYXJrZXIq IG1fbWFya2VyOworICAgIFdlYWtQdHI8UmVuZGVyTGlzdE1hcmtlcj4gbV9tYXJrZXI7CiAgICAg bXV0YWJsZSBpbnQgbV92YWx1ZTsKICNpZiAhQVNTRVJUX0RJU0FCTEVECiAgICAgYm9vbCBtX2lu TGF5b3V0IHsgZmFsc2UgfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJMaXN0TWFya2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaXN0 TWFya2VyLmNwcAppbmRleCAzMGI0OTM3YzBmYTQwOGFkMmQ2NmFlOThkYTRlYzg0YTBjYWRlYjg0 Li40NjRlOTMyY2MyZmM5NDY2YjIxYmFlY2YzNTY0MzY5NDkwNTU3ZTkyIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlzdE1hcmtlci5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RNYXJrZXIuY3BwCkBAIC0xMTMzLDEwICsxMTMz LDggQEAgUmVuZGVyTGlzdE1hcmtlcjo6flJlbmRlckxpc3RNYXJrZXIoKQogCiB2b2lkIFJlbmRl ckxpc3RNYXJrZXI6OndpbGxCZURlc3Ryb3llZCgpCiB7Ci0gICAgbV9saXN0SXRlbS5zZXRNYXJr ZXJSZW5kZXJlcihudWxscHRyKTsKICAgICBpZiAobV9pbWFnZSkKICAgICAgICAgbV9pbWFnZS0+ cmVtb3ZlQ2xpZW50KHRoaXMpOwotCiAgICAgUmVuZGVyQm94Ojp3aWxsQmVEZXN0cm95ZWQoKTsK IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3R5bGUvUmVuZGVyVHJlZVVwZGF0ZXJM aXN0SXRlbS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9SZW5kZXJUcmVlVXBkYXRlckxpc3RJ dGVtLmNwcAppbmRleCBjZjBhMDY0NmRiMzljZTI4ZDBmNmFjZDQyNjNlYTFiZDg5NTVkZmJiLi5m YzkwNWEyMjkzODA3NzQ2ZWYzMTQzNTVlN2VkMzFhOTVlZTZhNGJiIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9zdHlsZS9SZW5kZXJUcmVlVXBkYXRlckxpc3RJdGVtLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9zdHlsZS9SZW5kZXJUcmVlVXBkYXRlckxpc3RJdGVtLmNwcApAQCAtNzYsMTAg Kzc2LDggQEAgdm9pZCBSZW5kZXJUcmVlVXBkYXRlcjo6TGlzdEl0ZW06OnVwZGF0ZU1hcmtlcihS ZW5kZXJMaXN0SXRlbSYgbGlzdEl0ZW1SZW5kZXJlcikKICAgICBhdXRvJiBzdHlsZSA9IGxpc3RJ dGVtUmVuZGVyZXIuc3R5bGUoKTsKIAogICAgIGlmIChzdHlsZS5saXN0U3R5bGVUeXBlKCkgPT0g Tm9uZUxpc3RTdHlsZSAmJiAoIXN0eWxlLmxpc3RTdHlsZUltYWdlKCkgfHwgc3R5bGUubGlzdFN0 eWxlSW1hZ2UoKS0+ZXJyb3JPY2N1cnJlZCgpKSkgewotICAgICAgICBpZiAobGlzdEl0ZW1SZW5k ZXJlci5tYXJrZXJSZW5kZXJlcigpKSB7Ci0gICAgICAgICAgICBsaXN0SXRlbVJlbmRlcmVyLm1h cmtlclJlbmRlcmVyKCktPmRlc3Ryb3koKTsKLSAgICAgICAgICAgIEFTU0VSVCghbGlzdEl0ZW1S ZW5kZXJlci5tYXJrZXJSZW5kZXJlcigpKTsKLSAgICAgICAgfQorICAgICAgICBpZiAoYXV0byog bWFya2VyID0gbGlzdEl0ZW1SZW5kZXJlci5tYXJrZXJSZW5kZXJlcigpKQorICAgICAgICAgICAg bWFya2VyLT5yZW1vdmVGcm9tUGFyZW50QW5kRGVzdHJveSgpOwogICAgICAgICByZXR1cm47CiAg ICAgfQogCkBAIC05Miw3ICs5MCw3IEBAIHZvaWQgUmVuZGVyVHJlZVVwZGF0ZXI6Okxpc3RJdGVt Ojp1cGRhdGVNYXJrZXIoUmVuZGVyTGlzdEl0ZW0mIGxpc3RJdGVtUmVuZGVyZXIpCiAgICAgICAg IG5ld01hcmtlclJlbmRlcmVyID0gV2ViQ29yZTo6Y3JlYXRlUmVuZGVyZXI8UmVuZGVyTGlzdE1h cmtlcj4obGlzdEl0ZW1SZW5kZXJlciwgV1RGTW92ZShuZXdTdHlsZSkpOwogICAgICAgICBuZXdN YXJrZXJSZW5kZXJlci0+aW5pdGlhbGl6ZVN0eWxlKCk7CiAgICAgICAgIG1hcmtlclJlbmRlcmVy ID0gbmV3TWFya2VyUmVuZGVyZXIuZ2V0KCk7Ci0gICAgICAgIGxpc3RJdGVtUmVuZGVyZXIuc2V0 TWFya2VyUmVuZGVyZXIobWFya2VyUmVuZGVyZXIpOworICAgICAgICBsaXN0SXRlbVJlbmRlcmVy LnNldE1hcmtlclJlbmRlcmVyKCptYXJrZXJSZW5kZXJlcik7CiAgICAgfQogCiAgICAgUmVuZGVy RWxlbWVudCogY3VycmVudFBhcmVudCA9IG1hcmtlclJlbmRlcmVyLT5wYXJlbnQoKTsK 322922 2017-10-05 15:05:51 -0700 2017-10-05 15:40:09 -0700 Patch bug-177968-20171005150550.patch text/plain 7174 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjIyOTExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWRlN2Y4MWMyZDY2ZGRk MTNmMjVkYWZlZDIyNzIxNWUwYzUzN2QzNS4uYzMyMTk3NmNlMWM1M2QzMDI4Yjg1M2JlMWViMzhm NjY1NmY4ZjVkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI3IEBACiAyMDE3LTEwLTA1ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKKyAgICAgICAgUmVuZGVyTGlzdEl0ZW0gc2hv dWxkIG5vdCBob2xkIHJhdyBwb2ludGVycyB0byBSZW5kZXJMaXN0TWFya2VyLgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc3OTY4CisgICAgICAgIDxy ZGFyOi8vcHJvYmxlbS8zNDg0Mjk0Mz4KKworICAgICAgICBSZXZpZXdlZCBieSBBbnR0aSBLb2l2 aXN0by4KKworICAgICAgICBOb3cgd2UgZG9uJ3QgbmVlZCB0byB1bnJlZ2lzdGVyIHRoZSBtYXJr ZXIgZnJvbSB0aGUgbGlzdCBpdGVtIGV4cGxpY2l0bHkuCisKKyAgICAgICAgQ292ZXJlZCBieSBl eGlzdGluZyB0ZXN0cy4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMaXN0SXRlbS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMaXN0SXRlbTo6UmVuZGVyTGlzdEl0ZW0pOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyTGlzdEl0ZW06OndpbGxCZURlc3Ryb3llZCk6CisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJMaXN0SXRlbTo6cG9zaXRpb25MaXN0TWFya2VyKToKKyAgICAgICAg KiByZW5kZXJpbmcvUmVuZGVyTGlzdEl0ZW0uaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVy TGlzdE1hcmtlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMaXN0TWFya2VyOjp3aWxs QmVEZXN0cm95ZWQpOgorICAgICAgICAqIHN0eWxlL1JlbmRlclRyZWVVcGRhdGVyTGlzdEl0ZW0u Y3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVHJlZVVwZGF0ZXI6Okxpc3RJdGVtOjp1cGRh dGVNYXJrZXIpOgorCisyMDE3LTEwLTA1ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+ CisKICAgICAgICAgTW92ZSBtdWx0aWNvbHVtbiBmbG93IGNsZWFyIHRvIFJlbmRlclRyZWVVcGRh dGVyCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzc4 OTgKICAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzM0ODIwMTU3PgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RJdGVtLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJMaXN0SXRlbS5jcHAKaW5kZXggN2VjZjI1MzhhYmY5YWYzY2NmY2JkNjQw NDQ3Y2U0YmM3YjQ0YzNhOS4uZTJlOTExOTEzNDlhMjE5Yjk2OWI2NzhiYTFmYThiYzBmMzMxNzc2 YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RJdGVtLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlzdEl0ZW0uY3BwCkBAIC00 OCw3ICs0OCw2IEBAIHVzaW5nIG5hbWVzcGFjZSBIVE1MTmFtZXM7CiAKIFJlbmRlckxpc3RJdGVt OjpSZW5kZXJMaXN0SXRlbShFbGVtZW50JiBlbGVtZW50LCBSZW5kZXJTdHlsZSYmIHN0eWxlKQog ICAgIDogUmVuZGVyQmxvY2tGbG93KGVsZW1lbnQsIFdURk1vdmUoc3R5bGUpKQotICAgICwgbV9t YXJrZXIobnVsbHB0cikKICAgICAsIG1faGFzRXhwbGljaXRWYWx1ZShmYWxzZSkKICAgICAsIG1f aXNWYWx1ZVVwVG9EYXRlKGZhbHNlKQogICAgICwgbV9ub3RJbkxpc3QoZmFsc2UpCkBAIC02Mywx MCArNjIsOCBAQCBSZW5kZXJMaXN0SXRlbTo6flJlbmRlckxpc3RJdGVtKCkKIAogdm9pZCBSZW5k ZXJMaXN0SXRlbTo6d2lsbEJlRGVzdHJveWVkKCkKIHsKLSAgICBpZiAobV9tYXJrZXIpIHsKLSAg ICAgICAgbV9tYXJrZXItPmRlc3Ryb3koKTsKLSAgICAgICAgQVNTRVJUKCFtX21hcmtlcik7Ci0g ICAgfQorICAgIGlmIChtX21hcmtlcikKKyAgICAgICAgbV9tYXJrZXItPnJlbW92ZUZyb21QYXJl bnRBbmREZXN0cm95KCk7CiAgICAgUmVuZGVyQmxvY2tGbG93Ojp3aWxsQmVEZXN0cm95ZWQoKTsK IH0KIApAQCAtMzMyLDI1ICszMjksMjUgQEAgdm9pZCBSZW5kZXJMaXN0SXRlbTo6cG9zaXRpb25M aXN0TWFya2VyKCkKICAgICAgICAgTGF5b3V0UmVjdCBtYXJrZXJSZWN0KG1hcmtlckxvZ2ljYWxM ZWZ0ICsgbGluZU9mZnNldCwgYmxvY2tPZmZzZXQsIG1fbWFya2VyLT53aWR0aCgpLCBtX21hcmtl ci0+aGVpZ2h0KCkpOwogICAgICAgICBpZiAoIXN0eWxlKCkuaXNIb3Jpem9udGFsV3JpdGluZ01v ZGUoKSkKICAgICAgICAgICAgIG1hcmtlclJlY3QgPSBtYXJrZXJSZWN0LnRyYW5zcG9zZWRSZWN0 KCk7Ci0gICAgICAgIFJlbmRlckJveCogbyA9IG1fbWFya2VyOworICAgICAgICBSZW5kZXJCb3gq IG1hcmtlckFuY2VzdG9yID0gbV9tYXJrZXIuZ2V0KCk7CiAgICAgICAgIGJvb2wgcHJvcGFnYXRl VmlzdWFsT3ZlcmZsb3cgPSB0cnVlOwogICAgICAgICBib29sIHByb3BhZ2F0ZUxheW91dE92ZXJm bG93ID0gdHJ1ZTsKICAgICAgICAgZG8gewotICAgICAgICAgICAgbyA9IG8tPnBhcmVudEJveCgp OwotICAgICAgICAgICAgaWYgKG8tPmhhc092ZXJmbG93Q2xpcCgpKQorICAgICAgICAgICAgbWFy a2VyQW5jZXN0b3IgPSBtYXJrZXJBbmNlc3Rvci0+cGFyZW50Qm94KCk7CisgICAgICAgICAgICBp ZiAobWFya2VyQW5jZXN0b3ItPmhhc092ZXJmbG93Q2xpcCgpKQogICAgICAgICAgICAgICAgIHBy b3BhZ2F0ZVZpc3VhbE92ZXJmbG93ID0gZmFsc2U7Ci0gICAgICAgICAgICBpZiAoaXM8UmVuZGVy QmxvY2s+KCpvKSkgeworICAgICAgICAgICAgaWYgKGlzPFJlbmRlckJsb2NrPigqbWFya2VyQW5j ZXN0b3IpKSB7CiAgICAgICAgICAgICAgICAgaWYgKHByb3BhZ2F0ZVZpc3VhbE92ZXJmbG93KQot ICAgICAgICAgICAgICAgICAgICBkb3duY2FzdDxSZW5kZXJCbG9jaz4oKm8pLmFkZFZpc3VhbE92 ZXJmbG93KG1hcmtlclJlY3QpOworICAgICAgICAgICAgICAgICAgICBkb3duY2FzdDxSZW5kZXJC bG9jaz4oKm1hcmtlckFuY2VzdG9yKS5hZGRWaXN1YWxPdmVyZmxvdyhtYXJrZXJSZWN0KTsKICAg ICAgICAgICAgICAgICBpZiAocHJvcGFnYXRlTGF5b3V0T3ZlcmZsb3cpCi0gICAgICAgICAgICAg ICAgICAgIGRvd25jYXN0PFJlbmRlckJsb2NrPigqbykuYWRkTGF5b3V0T3ZlcmZsb3cobWFya2Vy UmVjdCk7CisgICAgICAgICAgICAgICAgICAgIGRvd25jYXN0PFJlbmRlckJsb2NrPigqbWFya2Vy QW5jZXN0b3IpLmFkZExheW91dE92ZXJmbG93KG1hcmtlclJlY3QpOwogICAgICAgICAgICAgfQot ICAgICAgICAgICAgaWYgKG8tPmhhc092ZXJmbG93Q2xpcCgpKQorICAgICAgICAgICAgaWYgKG1h cmtlckFuY2VzdG9yLT5oYXNPdmVyZmxvd0NsaXAoKSkKICAgICAgICAgICAgICAgICBwcm9wYWdh dGVMYXlvdXRPdmVyZmxvdyA9IGZhbHNlOwotICAgICAgICAgICAgaWYgKG8tPmhhc1NlbGZQYWlu dGluZ0xheWVyKCkpCisgICAgICAgICAgICBpZiAobWFya2VyQW5jZXN0b3ItPmhhc1NlbGZQYWlu dGluZ0xheWVyKCkpCiAgICAgICAgICAgICAgICAgcHJvcGFnYXRlVmlzdWFsT3ZlcmZsb3cgPSBm YWxzZTsKLSAgICAgICAgICAgIG1hcmtlclJlY3QubW92ZUJ5KC1vLT5sb2NhdGlvbigpKTsKLSAg ICAgICAgfSB3aGlsZSAobyAhPSB0aGlzICYmIHByb3BhZ2F0ZVZpc3VhbE92ZXJmbG93ICYmIHBy b3BhZ2F0ZUxheW91dE92ZXJmbG93KTsKKyAgICAgICAgICAgIG1hcmtlclJlY3QubW92ZUJ5KC1t YXJrZXJBbmNlc3Rvci0+bG9jYXRpb24oKSk7CisgICAgICAgIH0gd2hpbGUgKG1hcmtlckFuY2Vz dG9yICE9IHRoaXMgJiYgcHJvcGFnYXRlVmlzdWFsT3ZlcmZsb3cgJiYgcHJvcGFnYXRlTGF5b3V0 T3ZlcmZsb3cpOwogICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckxpc3RJdGVtLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlz dEl0ZW0uaAppbmRleCBkNGJhM2ZhNjg2MjJlYjczNTBiYTBhZDVjNmEwMWVlYWE4NzllNmJlLi40 NzI1MGM3YmQ3OWQ2ZmRhOWE1NGM4NjU3ZDUyOGEwNzU1YWE5YmJjIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlzdEl0ZW0uaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyTGlzdEl0ZW0uaApAQCAtMjMsMTEgKzIzLDExIEBACiAjcHJhZ21h IG9uY2UKIAogI2luY2x1ZGUgIlJlbmRlckJsb2NrRmxvdy5oIgorI2luY2x1ZGUgIlJlbmRlckxp c3RNYXJrZXIuaCIKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCiBjbGFzcyBIVE1MT0xpc3RFbGVt ZW50OwotY2xhc3MgUmVuZGVyTGlzdE1hcmtlcjsKIAogY2xhc3MgUmVuZGVyTGlzdEl0ZW0gZmlu YWwgOiBwdWJsaWMgUmVuZGVyQmxvY2tGbG93IHsKIHB1YmxpYzoKQEAgLTU2LDggKzU2LDggQEAg cHVibGljOgogCiAgICAgUmVuZGVyU3R5bGUgY29tcHV0ZU1hcmtlclN0eWxlKCkgY29uc3Q7CiAK LSAgICBSZW5kZXJMaXN0TWFya2VyKiBtYXJrZXJSZW5kZXJlcigpIHsgcmV0dXJuIG1fbWFya2Vy OyB9Ci0gICAgdm9pZCBzZXRNYXJrZXJSZW5kZXJlcihSZW5kZXJMaXN0TWFya2VyKiBtYXJrZXIp IHsgbV9tYXJrZXIgPSBtYXJrZXI7IH0KKyAgICBSZW5kZXJMaXN0TWFya2VyKiBtYXJrZXJSZW5k ZXJlcigpIGNvbnN0IHsgcmV0dXJuIG1fbWFya2VyLmdldCgpOyB9CisgICAgdm9pZCBzZXRNYXJr ZXJSZW5kZXJlcihSZW5kZXJMaXN0TWFya2VyJiBtYXJrZXIpIHsgbV9tYXJrZXIgPSBtYWtlV2Vh a1B0cihtYXJrZXIpOyB9CiAKICNpZiAhQVNTRVJUX0RJU0FCTEVECiAgICAgYm9vbCBpbkxheW91 dCgpIGNvbnN0IHsgcmV0dXJuIG1faW5MYXlvdXQ7IH0KQEAgLTg4LDcgKzg4LDcgQEAgcHJpdmF0 ZToKIAogCiAgICAgaW50IG1fZXhwbGljaXRWYWx1ZTsKLSAgICBSZW5kZXJMaXN0TWFya2VyKiBt X21hcmtlcjsKKyAgICBXZWFrUHRyPFJlbmRlckxpc3RNYXJrZXI+IG1fbWFya2VyOwogICAgIG11 dGFibGUgaW50IG1fdmFsdWU7CiAjaWYgIUFTU0VSVF9ESVNBQkxFRAogICAgIGJvb2wgbV9pbkxh eW91dCB7IGZhbHNlIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyTGlzdE1hcmtlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlzdE1h cmtlci5jcHAKaW5kZXggMzBiNDkzN2MwZmE0MDhhZDJkNjZhZTk4ZGE0ZWM4NGEwY2FkZWI4NC4u NDY0ZTkzMmNjMmZjOTQ2NmIyMWJhZWNmMzU2NDM2OTQ5MDU1N2U5MiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RNYXJrZXIuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaXN0TWFya2VyLmNwcApAQCAtMTEzMywxMCArMTEzMyw4 IEBAIFJlbmRlckxpc3RNYXJrZXI6On5SZW5kZXJMaXN0TWFya2VyKCkKIAogdm9pZCBSZW5kZXJM aXN0TWFya2VyOjp3aWxsQmVEZXN0cm95ZWQoKQogewotICAgIG1fbGlzdEl0ZW0uc2V0TWFya2Vy UmVuZGVyZXIobnVsbHB0cik7CiAgICAgaWYgKG1faW1hZ2UpCiAgICAgICAgIG1faW1hZ2UtPnJl bW92ZUNsaWVudCh0aGlzKTsKLQogICAgIFJlbmRlckJveDo6d2lsbEJlRGVzdHJveWVkKCk7CiB9 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1JlbmRlclRyZWVVcGRhdGVyTGlz dEl0ZW0uY3BwIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvUmVuZGVyVHJlZVVwZGF0ZXJMaXN0SXRl bS5jcHAKaW5kZXggY2YwYTA2NDZkYjM5Y2UyOGQwZjZhY2Q0MjYzZWExYmQ4OTU1ZGZiYi4uZmM5 MDVhMjI5MzgwNzc0NmVmMzE0MzU1ZTdlZDMxYTk1ZWU2YTRiYiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvc3R5bGUvUmVuZGVyVHJlZVVwZGF0ZXJMaXN0SXRlbS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvc3R5bGUvUmVuZGVyVHJlZVVwZGF0ZXJMaXN0SXRlbS5jcHAKQEAgLTc2LDEwICs3 Niw4IEBAIHZvaWQgUmVuZGVyVHJlZVVwZGF0ZXI6Okxpc3RJdGVtOjp1cGRhdGVNYXJrZXIoUmVu ZGVyTGlzdEl0ZW0mIGxpc3RJdGVtUmVuZGVyZXIpCiAgICAgYXV0byYgc3R5bGUgPSBsaXN0SXRl bVJlbmRlcmVyLnN0eWxlKCk7CiAKICAgICBpZiAoc3R5bGUubGlzdFN0eWxlVHlwZSgpID09IE5v bmVMaXN0U3R5bGUgJiYgKCFzdHlsZS5saXN0U3R5bGVJbWFnZSgpIHx8IHN0eWxlLmxpc3RTdHls ZUltYWdlKCktPmVycm9yT2NjdXJyZWQoKSkpIHsKLSAgICAgICAgaWYgKGxpc3RJdGVtUmVuZGVy ZXIubWFya2VyUmVuZGVyZXIoKSkgewotICAgICAgICAgICAgbGlzdEl0ZW1SZW5kZXJlci5tYXJr ZXJSZW5kZXJlcigpLT5kZXN0cm95KCk7Ci0gICAgICAgICAgICBBU1NFUlQoIWxpc3RJdGVtUmVu ZGVyZXIubWFya2VyUmVuZGVyZXIoKSk7Ci0gICAgICAgIH0KKyAgICAgICAgaWYgKGF1dG8qIG1h cmtlciA9IGxpc3RJdGVtUmVuZGVyZXIubWFya2VyUmVuZGVyZXIoKSkKKyAgICAgICAgICAgIG1h cmtlci0+cmVtb3ZlRnJvbVBhcmVudEFuZERlc3Ryb3koKTsKICAgICAgICAgcmV0dXJuOwogICAg IH0KIApAQCAtOTIsNyArOTAsNyBAQCB2b2lkIFJlbmRlclRyZWVVcGRhdGVyOjpMaXN0SXRlbTo6 dXBkYXRlTWFya2VyKFJlbmRlckxpc3RJdGVtJiBsaXN0SXRlbVJlbmRlcmVyKQogICAgICAgICBu ZXdNYXJrZXJSZW5kZXJlciA9IFdlYkNvcmU6OmNyZWF0ZVJlbmRlcmVyPFJlbmRlckxpc3RNYXJr ZXI+KGxpc3RJdGVtUmVuZGVyZXIsIFdURk1vdmUobmV3U3R5bGUpKTsKICAgICAgICAgbmV3TWFy a2VyUmVuZGVyZXItPmluaXRpYWxpemVTdHlsZSgpOwogICAgICAgICBtYXJrZXJSZW5kZXJlciA9 IG5ld01hcmtlclJlbmRlcmVyLmdldCgpOwotICAgICAgICBsaXN0SXRlbVJlbmRlcmVyLnNldE1h cmtlclJlbmRlcmVyKG1hcmtlclJlbmRlcmVyKTsKKyAgICAgICAgbGlzdEl0ZW1SZW5kZXJlci5z ZXRNYXJrZXJSZW5kZXJlcigqbWFya2VyUmVuZGVyZXIpOwogICAgIH0KIAogICAgIFJlbmRlckVs ZW1lbnQqIGN1cnJlbnRQYXJlbnQgPSBtYXJrZXJSZW5kZXJlci0+cGFyZW50KCk7Cg==