212154 2020-05-20 11:09:50 -0700 RenderObject::VisibleRectContext members should not be prefixed with m_ 2020-05-20 13:00:18 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham changseok dino esprehn+autocc ews-watchlist fmalita glenn gyuyoung.kim kondapallykalyan pdr sabouhallawa schenney sergio simon.fraser webkit-bug-importer zalan oldest_to_newest 1654534 0 zalan 2020-05-20 11:09:50 -0700 ssia 1654535 1 399858 zalan 2020-05-20 11:10:43 -0700 Created attachment 399858 Patch 1654599 2 ews-feeder 2020-05-20 12:59:56 -0700 Committed r261941: <https://trac.webkit.org/changeset/261941> All reviewed patches have been landed. Closing bug and clearing flags on attachment 399858. 1654600 3 webkit-bug-importer 2020-05-20 13:00:18 -0700 <rdar://problem/63460069> 399858 2020-05-20 11:10:43 -0700 2020-05-20 12:59:57 -0700 Patch bug-212154-20200520111042.patch text/plain 13471 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjYxOTI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmYyMGRiZjZjNDM4YTFm Y2ZiNDY2ZDA3OWVmYjBkMDdjZGM0ODEzYy4uZDA5ZjM4ODU0NWZmMWYzN2RkN2M1OWI4ZTFkYWUy OWUzMThhMTMyNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIwLTA1LTIwICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmVuZGVyT2JqZWN0OjpWaXNp YmxlUmVjdENvbnRleHQgbWVtYmVycyBzaG91bGQgbm90IGJlIHByZWZpeGVkIHdpdGggbV8KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMjE1NAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcmVuZGVyaW5n L1JlbmRlckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmFwcGx5Q2FjaGVk Q2xpcEFuZFNjcm9sbFBvc2l0aW9uIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJv eDo6Y29tcHV0ZVZpc2libGVSZWN0SW5Db250YWluZXIgY29uc3QpOgorICAgICAgICAqIHJlbmRl cmluZy9SZW5kZXJJbmxpbmUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVySW5saW5lOjpj b21wdXRlVmlzaWJsZVJlY3RJbkNvbnRhaW5lciBjb25zdCk6CisgICAgICAgICogcmVuZGVyaW5n L1JlbmRlck9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJPYmplY3Q6OmNvbXB1 dGVWaXNpYmxlUmVjdEluQ29udGFpbmVyIGNvbnN0KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVu ZGVyT2JqZWN0Lmg6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRhYmxlQ2VsbC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJUYWJsZUNlbGw6OmNvbXB1dGVWaXNpYmxlUmVjdEluQ29u dGFpbmVyIGNvbnN0KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVmlldy5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJWaWV3Ojpjb21wdXRlVmlzaWJsZVJlY3RJbkNvbnRhaW5lciBj b25zdCk6CisgICAgICAgICogcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSb290LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlclNWR1Jvb3Q6OmNvbXB1dGVGbG9hdFZpc2libGVSZWN0SW5Db250 YWluZXIgY29uc3QpOgorCiAyMDIwLTA1LTIwICBBbnRvaW5lIFF1aW50ICA8Z3Jhb3V0c0BhcHBs ZS5jb20+CiAKICAgICAgICAgW1dlYiBBbmltYXRpb25zXSBBbmltYXRpb24gZW5naW5lIHNob3Vs ZCBub3Qgd2FrZSB1cCBldmVyeSB0aWNrIGZvciBzdGVwcyB0aW1pbmcgZnVuY3Rpb25zCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCmluZGV4IGJhMGFjZDY0MTZkZWU0Y2U2MjY2 MGQzZjU3YTYwYzk1MWFiNWIwNWYuLjdhMTAxMTc2Yjg0NDYxMGM5NmY0YzFkNTE1YTk3NGUwOTMy ZGIyMmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCkBAIC0xMDI5LDEy ICsxMDI5LDEyIEBAIGJvb2wgUmVuZGVyQm94OjphcHBseUNhY2hlZENsaXBBbmRTY3JvbGxQb3Np dGlvbihMYXlvdXRSZWN0JiByZWN0LCBjb25zdCBSZW5kZXJMCiB7CiAgICAgZmxpcEZvcldyaXRp bmdNb2RlKHJlY3QpOwogCi0gICAgaWYgKGNvbnRleHQubV9vcHRpb25zLmNvbnRhaW5zKFZpc2li bGVSZWN0Q29udGV4dE9wdGlvbjo6QXBwbHlDb21wb3NpdGVkQ29udGFpbmVyU2Nyb2xscykgfHwg dGhpcyAhPSBjb250YWluZXIgfHwgIXVzZXNDb21wb3NpdGVkU2Nyb2xsaW5nKCkpCisgICAgaWYg KGNvbnRleHQub3B0aW9ucy5jb250YWlucyhWaXNpYmxlUmVjdENvbnRleHRPcHRpb246OkFwcGx5 Q29tcG9zaXRlZENvbnRhaW5lclNjcm9sbHMpIHx8IHRoaXMgIT0gY29udGFpbmVyIHx8ICF1c2Vz Q29tcG9zaXRlZFNjcm9sbGluZygpKQogICAgICAgICByZWN0Lm1vdmVCeSgtc2Nyb2xsUG9zaXRp b24oKSk7IC8vIEZvciBvdmVyZmxvdzphdXRvL3Njcm9sbC9oaWRkZW4uCiAKICAgICAvLyBEbyBu b3QgY2xpcCBzY3JvbGwgbGF5ZXIgY29udGVudHMgdG8gcmVkdWNlIHRoZSBudW1iZXIgb2YgcmVw YWludHMgd2hpbGUgc2Nyb2xsaW5nLgotICAgIGlmICgoIWNvbnRleHQubV9vcHRpb25zLmNvbnRh aW5zKFZpc2libGVSZWN0Q29udGV4dE9wdGlvbjo6QXBwbHlDb21wb3NpdGVkQ2xpcHMpICYmIHVz ZXNDb21wb3NpdGVkU2Nyb2xsaW5nKCkpCi0gICAgICAgIHx8ICghY29udGV4dC5tX29wdGlvbnMu Y29udGFpbnMoVmlzaWJsZVJlY3RDb250ZXh0T3B0aW9uOjpBcHBseUNvbnRhaW5lckNsaXApICYm IHRoaXMgPT0gY29udGFpbmVyKSkgeworICAgIGlmICgoIWNvbnRleHQub3B0aW9ucy5jb250YWlu cyhWaXNpYmxlUmVjdENvbnRleHRPcHRpb246OkFwcGx5Q29tcG9zaXRlZENsaXBzKSAmJiB1c2Vz Q29tcG9zaXRlZFNjcm9sbGluZygpKQorICAgICAgICB8fCAoIWNvbnRleHQub3B0aW9ucy5jb250 YWlucyhWaXNpYmxlUmVjdENvbnRleHRPcHRpb246OkFwcGx5Q29udGFpbmVyQ2xpcCkgJiYgdGhp cyA9PSBjb250YWluZXIpKSB7CiAgICAgICAgIGZsaXBGb3JXcml0aW5nTW9kZShyZWN0KTsKICAg ICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQpAQCAtMTA0NCw3ICsxMDQ0LDcgQEAgYm9vbCBSZW5k ZXJCb3g6OmFwcGx5Q2FjaGVkQ2xpcEFuZFNjcm9sbFBvc2l0aW9uKExheW91dFJlY3QmIHJlY3Qs IGNvbnN0IFJlbmRlckwKICAgICAvLyBhbnl3YXkgaWYgaXRzIHNpemUgZG9lcyBjaGFuZ2UuCiAg ICAgTGF5b3V0UmVjdCBjbGlwUmVjdChMYXlvdXRQb2ludCgpLCBjYWNoZWRTaXplRm9yT3ZlcmZs b3dDbGlwKCkpOwogICAgIGJvb2wgaW50ZXJzZWN0czsKLSAgICBpZiAoY29udGV4dC5tX29wdGlv bnMuY29udGFpbnMoVmlzaWJsZVJlY3RDb250ZXh0T3B0aW9uOjpVc2VFZGdlSW5jbHVzaXZlSW50 ZXJzZWN0aW9uKSkKKyAgICBpZiAoY29udGV4dC5vcHRpb25zLmNvbnRhaW5zKFZpc2libGVSZWN0 Q29udGV4dE9wdGlvbjo6VXNlRWRnZUluY2x1c2l2ZUludGVyc2VjdGlvbikpCiAgICAgICAgIGlu dGVyc2VjdHMgPSByZWN0LmVkZ2VJbmNsdXNpdmVJbnRlcnNlY3QoY2xpcFJlY3QpOwogICAgIGVs c2UgewogICAgICAgICByZWN0LmludGVyc2VjdChjbGlwUmVjdCk7CkBAIC0yMjY3LDcgKzIyNjcs NyBAQCBPcHRpb25hbDxMYXlvdXRSZWN0PiBSZW5kZXJCb3g6OmNvbXB1dGVWaXNpYmxlUmVjdElu Q29udGFpbmVyKGNvbnN0IExheW91dFJlY3QmCiAgICAgLy8gcGh5c2ljYWwgY29vcmRpbmF0ZSBz cGFjZSBvZiB0aGUgY29udGFpbmVyLgogICAgIGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZVRvVXNl ID0gc3R5bGUoKTsKICAgICAvLyBQYWludCBvZmZzZXQgY2FjaGUgaXMgb25seSB2YWxpZCBmb3Ig cm9vdC1yZWxhdGl2ZSwgbm9uLWZpeGVkIHBvc2l0aW9uIHJlcGFpbnRpbmcKLSAgICBpZiAodmll dygpLmZyYW1lVmlldygpLmxheW91dENvbnRleHQoKS5pc1BhaW50T2Zmc2V0Q2FjaGVFbmFibGVk KCkgJiYgIWNvbnRhaW5lciAmJiBzdHlsZVRvVXNlLnBvc2l0aW9uKCkgIT0gUG9zaXRpb25UeXBl OjpGaXhlZCAmJiAhY29udGV4dC5tX29wdGlvbnMuY29udGFpbnMoVmlzaWJsZVJlY3RDb250ZXh0 T3B0aW9uOjpVc2VFZGdlSW5jbHVzaXZlSW50ZXJzZWN0aW9uKSkKKyAgICBpZiAodmlldygpLmZy YW1lVmlldygpLmxheW91dENvbnRleHQoKS5pc1BhaW50T2Zmc2V0Q2FjaGVFbmFibGVkKCkgJiYg IWNvbnRhaW5lciAmJiBzdHlsZVRvVXNlLnBvc2l0aW9uKCkgIT0gUG9zaXRpb25UeXBlOjpGaXhl ZCAmJiAhY29udGV4dC5vcHRpb25zLmNvbnRhaW5zKFZpc2libGVSZWN0Q29udGV4dE9wdGlvbjo6 VXNlRWRnZUluY2x1c2l2ZUludGVyc2VjdGlvbikpCiAgICAgICAgIHJldHVybiBjb21wdXRlVmlz aWJsZVJlY3RVc2luZ1BhaW50T2Zmc2V0KHJlY3QpOwogCiAgICAgTGF5b3V0UmVjdCBhZGp1c3Rl ZFJlY3QgPSByZWN0OwpAQCAtMjMwMSw5ICsyMzAxLDkgQEAgT3B0aW9uYWw8TGF5b3V0UmVjdD4g UmVuZGVyQm94Ojpjb21wdXRlVmlzaWJsZVJlY3RJbkNvbnRhaW5lcihjb25zdCBMYXlvdXRSZWN0 JgogICAgIH0KIAogICAgIGlmIChpc1dyaXRpbmdNb2RlUm9vdCgpKSB7Ci0gICAgICAgIGlmICgh aXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkgfHwgIWNvbnRleHQubV9kaXJ0eVJlY3RJc0ZsaXBwZWQp IHsKKyAgICAgICAgaWYgKCFpc091dE9mRmxvd1Bvc2l0aW9uZWQoKSB8fCAhY29udGV4dC5kaXJ0 eVJlY3RJc0ZsaXBwZWQpIHsKICAgICAgICAgICAgIGZsaXBGb3JXcml0aW5nTW9kZShhZGp1c3Rl ZFJlY3QpOwotICAgICAgICAgICAgY29udGV4dC5tX2RpcnR5UmVjdElzRmxpcHBlZCA9IHRydWU7 CisgICAgICAgICAgICBjb250ZXh0LmRpcnR5UmVjdElzRmxpcHBlZCA9IHRydWU7CiAgICAgICAg IH0KICAgICB9CiAKQEAgLTIzMzUsMTIgKzIzMzUsMTIgQEAgT3B0aW9uYWw8TGF5b3V0UmVjdD4g UmVuZGVyQm94Ojpjb21wdXRlVmlzaWJsZVJlY3RJbkNvbnRhaW5lcihjb25zdCBMYXlvdXRSZWN0 JgogICAgIC8vIFdlIGFyZSBub3cgaW4gb3VyIHBhcmVudCBjb250YWluZXIncyBjb29yZGluYXRl IHNwYWNlLiBBcHBseSBvdXIgdHJhbnNmb3JtIHRvIG9idGFpbiBhIGJvdW5kaW5nIGJveAogICAg IC8vIGluIHRoZSBwYXJlbnQncyBjb29yZGluYXRlIHNwYWNlIHRoYXQgZW5jbG9zZXMgdXMuCiAg ICAgaWYgKGhhc0xheWVyKCkgJiYgbGF5ZXIoKS0+dHJhbnNmb3JtKCkpIHsKLSAgICAgICAgY29u dGV4dC5tX2hhc1Bvc2l0aW9uRml4ZWREZXNjZW5kYW50ID0gcG9zaXRpb24gPT0gUG9zaXRpb25U eXBlOjpGaXhlZDsKKyAgICAgICAgY29udGV4dC5oYXNQb3NpdGlvbkZpeGVkRGVzY2VuZGFudCA9 IHBvc2l0aW9uID09IFBvc2l0aW9uVHlwZTo6Rml4ZWQ7CiAgICAgICAgIGFkanVzdGVkUmVjdCA9 IExheW91dFJlY3QoZW5jbG9zZVJlY3RUb0RldmljZVBpeGVscyhsYXllcigpLT50cmFuc2Zvcm0o KS0+bWFwUmVjdChhZGp1c3RlZFJlY3QpLCBkb2N1bWVudCgpLmRldmljZVNjYWxlRmFjdG9yKCkp KTsKICAgICAgICAgdG9wTGVmdCA9IGFkanVzdGVkUmVjdC5sb2NhdGlvbigpOwogICAgICAgICB0 b3BMZWZ0Lm1vdmUobG9jYXRpb25PZmZzZXQpOwogICAgIH0gZWxzZSBpZiAocG9zaXRpb24gPT0g UG9zaXRpb25UeXBlOjpGaXhlZCkKLSAgICAgICAgY29udGV4dC5tX2hhc1Bvc2l0aW9uRml4ZWRE ZXNjZW5kYW50ID0gdHJ1ZTsKKyAgICAgICAgY29udGV4dC5oYXNQb3NpdGlvbkZpeGVkRGVzY2Vu ZGFudCA9IHRydWU7CiAKICAgICBpZiAocG9zaXRpb24gPT0gUG9zaXRpb25UeXBlOjpBYnNvbHV0 ZSAmJiBsb2NhbENvbnRhaW5lci0+aXNJbkZsb3dQb3NpdGlvbmVkKCkgJiYgaXM8UmVuZGVySW5s aW5lPigqbG9jYWxDb250YWluZXIpKQogICAgICAgICB0b3BMZWZ0ICs9IGRvd25jYXN0PFJlbmRl cklubGluZT4oKmxvY2FsQ29udGFpbmVyKS5vZmZzZXRGb3JJbkZsb3dQb3NpdGlvbmVkSW5saW5l KHRoaXMpOwpAQCAtMjM1OSw3ICsyMzU5LDcgQEAgT3B0aW9uYWw8TGF5b3V0UmVjdD4gUmVuZGVy Qm94Ojpjb21wdXRlVmlzaWJsZVJlY3RJbkNvbnRhaW5lcihjb25zdCBMYXlvdXRSZWN0JgogICAg ICAgICBSZW5kZXJCb3gmIGNvbnRhaW5lckJveCA9IGRvd25jYXN0PFJlbmRlckJveD4oKmxvY2Fs Q29udGFpbmVyKTsKICAgICAgICAgYm9vbCBpc0VtcHR5ID0gIWNvbnRhaW5lckJveC5hcHBseUNh Y2hlZENsaXBBbmRTY3JvbGxQb3NpdGlvbihhZGp1c3RlZFJlY3QsIGNvbnRhaW5lciwgY29udGV4 dCk7CiAgICAgICAgIGlmIChpc0VtcHR5KSB7Ci0gICAgICAgICAgICBpZiAoY29udGV4dC5tX29w dGlvbnMuY29udGFpbnMoVmlzaWJsZVJlY3RDb250ZXh0T3B0aW9uOjpVc2VFZGdlSW5jbHVzaXZl SW50ZXJzZWN0aW9uKSkKKyAgICAgICAgICAgIGlmIChjb250ZXh0Lm9wdGlvbnMuY29udGFpbnMo VmlzaWJsZVJlY3RDb250ZXh0T3B0aW9uOjpVc2VFZGdlSW5jbHVzaXZlSW50ZXJzZWN0aW9uKSkK ICAgICAgICAgICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwogICAgICAgICAgICAgcmV0dXJu IGFkanVzdGVkUmVjdDsKICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlcklubGluZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy SW5saW5lLmNwcAppbmRleCA2ZGJmNTM5ZmQ5NmU0MzExMjg3ZjRhZmFhYmUxZjlkNTZlNDMzZGZm Li42ZDhhZWJhYWE4ZTMzNmU2ZmE2MWMwNTQ0ZWY1ODA3OWNiZjc2YTJmIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW5saW5lLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVySW5saW5lLmNwcApAQCAtODg3LDcgKzg4Nyw3IEBAIExheW91 dFJlY3QgUmVuZGVySW5saW5lOjpjb21wdXRlVmlzaWJsZVJlY3RVc2luZ1BhaW50T2Zmc2V0KGNv bnN0IExheW91dFJlY3QmIHJlCiBPcHRpb25hbDxMYXlvdXRSZWN0PiBSZW5kZXJJbmxpbmU6OmNv bXB1dGVWaXNpYmxlUmVjdEluQ29udGFpbmVyKGNvbnN0IExheW91dFJlY3QmIHJlY3QsIGNvbnN0 IFJlbmRlckxheWVyTW9kZWxPYmplY3QqIGNvbnRhaW5lciwgVmlzaWJsZVJlY3RDb250ZXh0IGNv bnRleHQpIGNvbnN0CiB7CiAgICAgLy8gUmVwYWludCBvZmZzZXQgY2FjaGUgaXMgb25seSB2YWxp ZCBmb3Igcm9vdC1yZWxhdGl2ZSByZXBhaW50aW5nCi0gICAgaWYgKHZpZXcoKS5mcmFtZVZpZXco KS5sYXlvdXRDb250ZXh0KCkuaXNQYWludE9mZnNldENhY2hlRW5hYmxlZCgpICYmICFjb250YWlu ZXIgJiYgIWNvbnRleHQubV9vcHRpb25zLmNvbnRhaW5zKFZpc2libGVSZWN0Q29udGV4dE9wdGlv bjo6VXNlRWRnZUluY2x1c2l2ZUludGVyc2VjdGlvbikpCisgICAgaWYgKHZpZXcoKS5mcmFtZVZp ZXcoKS5sYXlvdXRDb250ZXh0KCkuaXNQYWludE9mZnNldENhY2hlRW5hYmxlZCgpICYmICFjb250 YWluZXIgJiYgIWNvbnRleHQub3B0aW9ucy5jb250YWlucyhWaXNpYmxlUmVjdENvbnRleHRPcHRp b246OlVzZUVkZ2VJbmNsdXNpdmVJbnRlcnNlY3Rpb24pKQogICAgICAgICByZXR1cm4gY29tcHV0 ZVZpc2libGVSZWN0VXNpbmdQYWludE9mZnNldChyZWN0KTsKIAogICAgIGlmIChjb250YWluZXIg PT0gdGhpcykKQEAgLTkxMywxMSArOTEzLDExIEBAIE9wdGlvbmFsPExheW91dFJlY3Q+IFJlbmRl cklubGluZTo6Y29tcHV0ZVZpc2libGVSZWN0SW5Db250YWluZXIoY29uc3QgTGF5b3V0UmVjCiAg ICAgLy8gaXRzIGNvbnRyb2xDbGlwUmVjdCB3aWxsIGJlIHdyb25nLiBGb3Igb3ZlcmZsb3cgY2xp cCB3ZSB1c2UgdGhlIHZhbHVlcyBjYWNoZWQgYnkgdGhlIGxheWVyLgogICAgIGFkanVzdGVkUmVj dC5zZXRMb2NhdGlvbih0b3BMZWZ0KTsKICAgICBpZiAobG9jYWxDb250YWluZXItPmhhc092ZXJm bG93Q2xpcCgpKSB7Ci0gICAgICAgIC8vIEZJWE1FOiBSZXNwZWN0IHRoZSB2YWx1ZSBvZiBjb250 ZXh0Lm1fb3B0aW9ucy4KLSAgICAgICAgU2V0Rm9yU2NvcGU8T3B0aW9uU2V0PFZpc2libGVSZWN0 Q29udGV4dE9wdGlvbj4+IGNoYW5nZShjb250ZXh0Lm1fb3B0aW9ucywgY29udGV4dC5tX29wdGlv bnMgfCBWaXNpYmxlUmVjdENvbnRleHRPcHRpb246OkFwcGx5Q29tcG9zaXRlZENvbnRhaW5lclNj cm9sbHMpOworICAgICAgICAvLyBGSVhNRTogUmVzcGVjdCB0aGUgdmFsdWUgb2YgY29udGV4dC5v cHRpb25zLgorICAgICAgICBTZXRGb3JTY29wZTxPcHRpb25TZXQ8VmlzaWJsZVJlY3RDb250ZXh0 T3B0aW9uPj4gY2hhbmdlKGNvbnRleHQub3B0aW9ucywgY29udGV4dC5vcHRpb25zIHwgVmlzaWJs ZVJlY3RDb250ZXh0T3B0aW9uOjpBcHBseUNvbXBvc2l0ZWRDb250YWluZXJTY3JvbGxzKTsKICAg ICAgICAgYm9vbCBpc0VtcHR5ID0gIWRvd25jYXN0PFJlbmRlckJveD4oKmxvY2FsQ29udGFpbmVy KS5hcHBseUNhY2hlZENsaXBBbmRTY3JvbGxQb3NpdGlvbihhZGp1c3RlZFJlY3QsIGNvbnRhaW5l ciwgY29udGV4dCk7CiAgICAgICAgIGlmIChpc0VtcHR5KSB7Ci0gICAgICAgICAgICBpZiAoY29u dGV4dC5tX29wdGlvbnMuY29udGFpbnMoVmlzaWJsZVJlY3RDb250ZXh0T3B0aW9uOjpVc2VFZGdl SW5jbHVzaXZlSW50ZXJzZWN0aW9uKSkKKyAgICAgICAgICAgIGlmIChjb250ZXh0Lm9wdGlvbnMu Y29udGFpbnMoVmlzaWJsZVJlY3RDb250ZXh0T3B0aW9uOjpVc2VFZGdlSW5jbHVzaXZlSW50ZXJz ZWN0aW9uKSkKICAgICAgICAgICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwogICAgICAgICAg ICAgcmV0dXJuIGFkanVzdGVkUmVjdDsKICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyT2JqZWN0LmNwcAppbmRleCA0MjY5MmFiMjY1NTk2YjIzZmM2MzE0NzQzM2MzMDBk YjY2MWVkMGM5Li5mYzQ0ODBhMjM2ZDQ3MTAzMTI4Yzg2NjU3YzBlYTkzMGU5OTliNjY2IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcApAQCAtOTcyLDcgKzk3Miw3 IEBAIE9wdGlvbmFsPExheW91dFJlY3Q+IFJlbmRlck9iamVjdDo6Y29tcHV0ZVZpc2libGVSZWN0 SW5Db250YWluZXIoY29uc3QgTGF5b3V0UmVjCiAgICAgaWYgKHBhcmVudC0+aGFzT3ZlcmZsb3dD bGlwKCkpIHsKICAgICAgICAgYm9vbCBpc0VtcHR5ID0gIWRvd25jYXN0PFJlbmRlckJveD4oKnBh cmVudCkuYXBwbHlDYWNoZWRDbGlwQW5kU2Nyb2xsUG9zaXRpb24oYWRqdXN0ZWRSZWN0LCBjb250 YWluZXIsIGNvbnRleHQpOwogICAgICAgICBpZiAoaXNFbXB0eSkgewotICAgICAgICAgICAgaWYg KGNvbnRleHQubV9vcHRpb25zLmNvbnRhaW5zKFZpc2libGVSZWN0Q29udGV4dE9wdGlvbjo6VXNl RWRnZUluY2x1c2l2ZUludGVyc2VjdGlvbikpCisgICAgICAgICAgICBpZiAoY29udGV4dC5vcHRp b25zLmNvbnRhaW5zKFZpc2libGVSZWN0Q29udGV4dE9wdGlvbjo6VXNlRWRnZUluY2x1c2l2ZUlu dGVyc2VjdGlvbikpCiAgICAgICAgICAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKICAgICAg ICAgICAgIHJldHVybiBhZGp1c3RlZFJlY3Q7CiAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJPYmplY3QuaAppbmRleCBjOGY3ZTJlY2ZhOTJkZGI1ODYyNGYyZTdkYTMzNTcy MmY2ZDdkOTk1Li5iM2VjYmI4MzA4MjUwYjAyYjJiYjFiOGUwZDYxYjEyZmVjNmMzMWY2IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oCkBAIC02MTksMTQgKzYxOSwxNCBA QCBwdWJsaWM6CiAgICAgfTsKICAgICBzdHJ1Y3QgVmlzaWJsZVJlY3RDb250ZXh0IHsKICAgICAg ICAgVmlzaWJsZVJlY3RDb250ZXh0KGJvb2wgaGFzUG9zaXRpb25GaXhlZERlc2NlbmRhbnQgPSBm YWxzZSwgYm9vbCBkaXJ0eVJlY3RJc0ZsaXBwZWQgPSBmYWxzZSwgT3B0aW9uU2V0PFZpc2libGVS ZWN0Q29udGV4dE9wdGlvbj4gb3B0aW9ucyA9IHsgfSkKLSAgICAgICAgICAgIDogbV9oYXNQb3Np dGlvbkZpeGVkRGVzY2VuZGFudChoYXNQb3NpdGlvbkZpeGVkRGVzY2VuZGFudCkKLSAgICAgICAg ICAgICwgbV9kaXJ0eVJlY3RJc0ZsaXBwZWQoZGlydHlSZWN0SXNGbGlwcGVkKQotICAgICAgICAg ICAgLCBtX29wdGlvbnMob3B0aW9ucykKKyAgICAgICAgICAgIDogaGFzUG9zaXRpb25GaXhlZERl c2NlbmRhbnQoaGFzUG9zaXRpb25GaXhlZERlc2NlbmRhbnQpCisgICAgICAgICAgICAsIGRpcnR5 UmVjdElzRmxpcHBlZChkaXJ0eVJlY3RJc0ZsaXBwZWQpCisgICAgICAgICAgICAsIG9wdGlvbnMo b3B0aW9ucykKICAgICAgICAgICAgIHsKICAgICAgICAgICAgIH0KLSAgICAgICAgYm9vbCBtX2hh c1Bvc2l0aW9uRml4ZWREZXNjZW5kYW50OwotICAgICAgICBib29sIG1fZGlydHlSZWN0SXNGbGlw cGVkOwotICAgICAgICBPcHRpb25TZXQ8VmlzaWJsZVJlY3RDb250ZXh0T3B0aW9uPiBtX29wdGlv bnM7CisgICAgICAgIGJvb2wgaGFzUG9zaXRpb25GaXhlZERlc2NlbmRhbnQ7CisgICAgICAgIGJv b2wgZGlydHlSZWN0SXNGbGlwcGVkOworICAgICAgICBPcHRpb25TZXQ8VmlzaWJsZVJlY3RDb250 ZXh0T3B0aW9uPiBvcHRpb25zOwogICAgIH07CiAgICAgdmlydHVhbCBPcHRpb25hbDxMYXlvdXRS ZWN0PiBjb21wdXRlVmlzaWJsZVJlY3RJbkNvbnRhaW5lcihjb25zdCBMYXlvdXRSZWN0JiwgY29u c3QgUmVuZGVyTGF5ZXJNb2RlbE9iamVjdCogcmVwYWludENvbnRhaW5lciwgVmlzaWJsZVJlY3RD b250ZXh0KSBjb25zdDsKICAgICB2aXJ0dWFsIE9wdGlvbmFsPEZsb2F0UmVjdD4gY29tcHV0ZUZs b2F0VmlzaWJsZVJlY3RJbkNvbnRhaW5lcihjb25zdCBGbG9hdFJlY3QmLCBjb25zdCBSZW5kZXJM YXllck1vZGVsT2JqZWN0KiByZXBhaW50Q29udGFpbmVyLCBWaXNpYmxlUmVjdENvbnRleHQpIGNv bnN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlQ2Vs bC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGVDZWxsLmNwcAppbmRl eCBjNzM5MDgyNzg2NzdlNjI5NDZmODY0MWRmOTg2ZTg0NTljZjQzZmYwLi5lOTU3MjZiMzdkODQy ZGM1NmJhMTJiZWVjMTU4MWUzYTI1MmQwY2YwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyVGFibGVDZWxsLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyVGFibGVDZWxsLmNwcApAQCAtNDAwLDcgKzQwMCw3IEBAIE9wdGlvbmFsPExheW91 dFJlY3Q+IFJlbmRlclRhYmxlQ2VsbDo6Y29tcHV0ZVZpc2libGVSZWN0SW5Db250YWluZXIoY29u c3QgTGF5b3V0CiAgICAgaWYgKGNvbnRhaW5lciA9PSB0aGlzKQogICAgICAgICByZXR1cm4gcmVj dDsKICAgICBMYXlvdXRSZWN0IGFkanVzdGVkUmVjdCA9IHJlY3Q7Ci0gICAgaWYgKCghdmlldygp LmZyYW1lVmlldygpLmxheW91dENvbnRleHQoKS5pc1BhaW50T2Zmc2V0Q2FjaGVFbmFibGVkKCkg fHwgY29udGFpbmVyIHx8IGNvbnRleHQubV9vcHRpb25zLmNvbnRhaW5zKFZpc2libGVSZWN0Q29u dGV4dE9wdGlvbjo6VXNlRWRnZUluY2x1c2l2ZUludGVyc2VjdGlvbikpICYmIHBhcmVudCgpKQor ICAgIGlmICgoIXZpZXcoKS5mcmFtZVZpZXcoKS5sYXlvdXRDb250ZXh0KCkuaXNQYWludE9mZnNl dENhY2hlRW5hYmxlZCgpIHx8IGNvbnRhaW5lciB8fCBjb250ZXh0Lm9wdGlvbnMuY29udGFpbnMo VmlzaWJsZVJlY3RDb250ZXh0T3B0aW9uOjpVc2VFZGdlSW5jbHVzaXZlSW50ZXJzZWN0aW9uKSkg JiYgcGFyZW50KCkpCiAgICAgICAgIGFkanVzdGVkUmVjdC5tb3ZlQnkoLXBhcmVudEJveCgpLT5s b2NhdGlvbigpKTsgLy8gUm93cyBhcmUgaW4gdGhlIHNhbWUgY29vcmRpbmF0ZSBzcGFjZSwgc28g ZG9uJ3QgYWRkIHRoZWlyIG9mZnNldCBpbi4KICAgICByZXR1cm4gUmVuZGVyQmxvY2tGbG93Ojpj b21wdXRlVmlzaWJsZVJlY3RJbkNvbnRhaW5lcihhZGp1c3RlZFJlY3QsIGNvbnRhaW5lciwgY29u dGV4dCk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmll dy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5jcHAKaW5kZXggZWQw NWRhMzg2Y2JiYTRkZGZhZTMwMzRkNTg4MTA2NTJkOTdlNWRkMC4uODg3M2JlOTk2ZDIyOTVlMmQz Y2I4YWMxZGEzYzc2N2NiOTFiZjNiNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlclZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJW aWV3LmNwcApAQCAtNTMzLDcgKzUzMyw3IEBAIE9wdGlvbmFsPExheW91dFJlY3Q+IFJlbmRlclZp ZXc6OmNvbXB1dGVWaXNpYmxlUmVjdEluQ29udGFpbmVyKGNvbnN0IExheW91dFJlY3QmCiAgICAg ICAgICAgICBhZGp1c3RlZFJlY3Quc2V0WCh2aWV3V2lkdGgoKSAtIGFkanVzdGVkUmVjdC5tYXhY KCkpOwogICAgIH0KIAotICAgIGlmIChjb250ZXh0Lm1faGFzUG9zaXRpb25GaXhlZERlc2NlbmRh bnQpCisgICAgaWYgKGNvbnRleHQuaGFzUG9zaXRpb25GaXhlZERlc2NlbmRhbnQpCiAgICAgICAg IGFkanVzdGVkUmVjdC5tb3ZlQnkoZnJhbWVWaWV3KCkuc2Nyb2xsUG9zaXRpb25SZXNwZWN0aW5n Q3VzdG9tRml4ZWRQb3NpdGlvbigpKTsKICAgICAKICAgICAvLyBBcHBseSBvdXIgdHJhbnNmb3Jt IGlmIHdlIGhhdmUgb25lIChiZWNhdXNlIG9mIGZ1bGwgcGFnZSB6b29taW5nKS4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUm9vdC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jvb3QuY3BwCmluZGV4IGFkNzFlOTBi YjBmZWViODFhMGNhZDA5MWM3MDEwYjNlNzM5MThkZmMuLjJjMTVlNGY2OWUwZTI4Nzg2MzM2OGJk MzU1OTkxOTIzYTVlNjQ5MDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9z dmcvUmVuZGVyU1ZHUm9vdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9S ZW5kZXJTVkdSb290LmNwcApAQCAtMzY1LDcgKzM2NSw3IEBAIE9wdGlvbmFsPEZsb2F0UmVjdD4g UmVuZGVyU1ZHUm9vdDo6Y29tcHV0ZUZsb2F0VmlzaWJsZVJlY3RJbkNvbnRhaW5lcihjb25zdCBG bG9hCiAKICAgICAvLyBBcHBseSBpbml0aWFsIHZpZXdwb3J0IGNsaXAKICAgICBpZiAoc2hvdWxk QXBwbHlWaWV3cG9ydENsaXAoKSkgewotICAgICAgICBpZiAoY29udGV4dC5tX29wdGlvbnMuY29u dGFpbnMoVmlzaWJsZVJlY3RDb250ZXh0T3B0aW9uOjpVc2VFZGdlSW5jbHVzaXZlSW50ZXJzZWN0 aW9uKSkgeworICAgICAgICBpZiAoY29udGV4dC5vcHRpb25zLmNvbnRhaW5zKFZpc2libGVSZWN0 Q29udGV4dE9wdGlvbjo6VXNlRWRnZUluY2x1c2l2ZUludGVyc2VjdGlvbikpIHsKICAgICAgICAg ICAgIGlmICghYWRqdXN0ZWRSZWN0LmVkZ2VJbmNsdXNpdmVJbnRlcnNlY3Qoc25hcHBlZEludFJl Y3QoYm9yZGVyQm94UmVjdCgpKSkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9w dDsKICAgICAgICAgfSBlbHNlCg==