205372 2019-12-17 19:24:20 -0800 Remove iOS #ifdefs around unobscuredContentSize 2019-12-17 23:01:23 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser commit-queue sam simon.fraser thorton webkit-bug-importer oldest_to_newest 1599678 0 simon.fraser 2019-12-17 19:24:20 -0800 Remove iOS #ifdefs around unobscuredContentSize 1599679 1 385936 simon.fraser 2019-12-17 19:27:21 -0800 Created attachment 385936 Patch 1599689 2 385936 commit-queue 2019-12-17 23:00:35 -0800 Comment on attachment 385936 Patch Clearing flags on attachment: 385936 Committed r253673: <https://trac.webkit.org/changeset/253673> 1599690 3 commit-queue 2019-12-17 23:00:37 -0800 All reviewed patches have been landed. Closing bug. 1599691 4 webkit-bug-importer 2019-12-17 23:01:23 -0800 <rdar://problem/58034298> 385936 2019-12-17 19:27:21 -0800 2019-12-17 23:00:35 -0800 Patch bug-205372-20191217192721.patch text/plain 12255 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzNjQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDc1MTBjNDU0NjUwOGM3 YWMzODExNWVlYzEwMWZlMDAxOWJiNmM4ZC4uZWNjNzA1NDRlNGUxYTViMTJhMTExY2JlMzliNjdk MjRiOWEyNjA4YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQyIEBACisyMDE5LTEyLTE3ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJlbW92ZSBpT1Mg I2lmZGVmcyBhcm91bmQgdW5vYnNjdXJlZENvbnRlbnRTaXplCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDUzNzIKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBMb25nLXRlcm0sIGFsbCBvZiB0aGUgU2Nyb2xs VmlldyBnZW9tZXRyeSBkYXRhIHJlbGF0ZWQgdG8gZGVsZWdhdGVkIHNjcm9sbGluZworICAgICAg ICB3aWxsIG1vdmUgdG8gT3B0aW9uYWw8RGVsZWdhdGVkU2Nyb2xsaW5nR2VvbWV0cnk+IG1fZGVs ZWdhdGVkU2Nyb2xsaW5nR2VvbWV0cnkKKyAgICAgICAgYW5kIG5vdCBiZSB3cmFwcGVkIGluIHBs YXRmb3JtICNpZmRlZnMuCisKKyAgICAgICAgVGFrZSB0aGUgZmlyc3Qgc3RlcCBvZiBtb3Zpbmcg dW5vYnNjdXJlZENvbnRlbnRTaXplIGludG8gdGhhdCBzdHJ1Y3QuCisKKyAgICAgICAgSSBhZGRl ZCBwbGF0Zm9ybVVub2JzY3VyZWRDb250ZW50UmVjdCgpIHRvIGhhbmRsZSB0aGUgaU9TIFdLMSBj YXNlLCBjYWxsZWQgCisgICAgICAgIHdoZW4gdGhlcmUgaXMgYSBwbGF0Zm9ybSB3aWRnZXQuCisg ICAgICAgIAorICAgICAgICBtX2ZpeGVkVmlzaWJsZUNvbnRlbnRSZWN0IGlzIG9ubHkgdXNlZCBi eSBjb8O2cmRpbmF0ZWQgZ3JhcGhpY3MuCisKKyAgICAgICAgKiBwYWdlL0ZyYW1lVmlldy5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OnVub2JzY3VyZWRDb250ZW50U2l6ZUNoYW5n ZWQpOgorICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3Lmg6CisgICAgICAgICogcGxhdGZvcm0vU2Ny b2xsVmlldy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxWaWV3Ojp1bm9ic2N1cmVkQ29u dGVudFNpemUgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsVmlldzo6c2V0VW5vYnNj dXJlZENvbnRlbnRTaXplKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbFZpZXc6OnVub2JzY3Vy ZWRDb250ZW50UmVjdCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxWaWV3OjpwbGF0 Zm9ybVZpc2libGVDb250ZW50UmVjdCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxW aWV3OjpwbGF0Zm9ybVZpc2libGVDb250ZW50U2l6ZSBjb25zdCk6CisgICAgICAgIChXZWJDb3Jl OjpTY3JvbGxWaWV3OjpwbGF0Zm9ybVZpc2libGVDb250ZW50UmVjdEluY2x1ZGluZ09ic2N1cmVk QXJlYSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxWaWV3OjpwbGF0Zm9ybVZpc2li bGVDb250ZW50U2l6ZUluY2x1ZGluZ09ic2N1cmVkQXJlYSBjb25zdCk6CisgICAgICAgIChXZWJD b3JlOjpTY3JvbGxWaWV3OjpwbGF0Zm9ybVVub2JzY3VyZWRDb250ZW50UmVjdCBjb25zdCk6Cisg ICAgICAgICogcGxhdGZvcm0vU2Nyb2xsVmlldy5oOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xs Vmlldzo6dW5vYnNjdXJlZENvbnRlbnRTaXplIGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKiBw bGF0Zm9ybS9pb3MvU2Nyb2xsVmlld0lPUy5tbToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbFZp ZXc6OnBsYXRmb3JtVW5vYnNjdXJlZENvbnRlbnRSZWN0IGNvbnN0KToKKyAgICAgICAgKFdlYkNv cmU6OlNjcm9sbFZpZXc6OnVub2JzY3VyZWRDb250ZW50UmVjdCBjb25zdCk6IERlbGV0ZWQuCisg ICAgICAgIChXZWJDb3JlOjpTY3JvbGxWaWV3OjpzZXRVbm9ic2N1cmVkQ29udGVudFNpemUpOiBE ZWxldGVkLgorICAgICAgICAqIHBsYXRmb3JtL21hYy9TY3JvbGxWaWV3TWFjLm1tOgorICAgICAg ICAoV2ViQ29yZTo6U2Nyb2xsVmlldzo6cGxhdGZvcm1Vbm9ic2N1cmVkQ29udGVudFJlY3QgY29u c3QpOgorCiAyMDE5LTEyLTE3ICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29t PgogCiAgICAgICAgIG1hY0NhdGFseXN0OiBDdXJzb3Igc2hvdWxkIHVwZGF0ZSBvbiBtb3VzZSBt b3ZlbWVudCBhbmQgc3R5bGUgY2hhbmdlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdl L0ZyYW1lVmlldy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKaW5kZXgg ZWE3NTExYjMzMTI2YmNlZjkzNDllZjk0M2MzYTY5YzBjMDYzNzk3Yy4uOTIyOWQ1NWUyMjkwMTBl MjAwNmY4MDFkOGUyOTI4YmViYmJhNjM3NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFn ZS9GcmFtZVZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcApA QCAtMjgwNywxNCArMjgwNywxMiBAQCB2b2lkIEZyYW1lVmlldzo6bGF5b3V0T3JWaXN1YWxWaWV3 cG9ydENoYW5nZWQoKQogICAgIH0KIH0KIAotI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCi0KIHZv aWQgRnJhbWVWaWV3Ojp1bm9ic2N1cmVkQ29udGVudFNpemVDaGFuZ2VkKCkKIHsKKyNpZiBQTEFU Rk9STShJT1NfRkFNSUxZKQogICAgIHVwZGF0ZVRpbGVkQmFja2luZ0FkYXB0aXZlU2l6aW5nKCk7 Ci19Ci0KICNlbmRpZgorfQogCiBzdGF0aWMgTGF5ZXJGbHVzaFRocm90dGxlU3RhdGU6OkZsYWdz IGRldGVybWluZUxheWVyRmx1c2hUaHJvdHRsZVN0YXRlKFBhZ2UmIHBhZ2UpCiB7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oIGIvU291cmNlL1dlYkNvcmUvcGFn ZS9GcmFtZVZpZXcuaAppbmRleCBlMzZmOTk2ODA0NjA4Yzc0MDIzOThlN2FkODgzNDQyMGI5YjI4 OTIwLi5mMzQ5NDBkNDMxOGIyYzIzMWEzNDU0MDAyZmYxMWI1MzUyYjZjNjQzIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvRnJhbWVWaWV3LmgKQEAgLTcyMiw2ICs3MjIsOCBAQCBwcml2YXRlOgogCiAgICAgdm9pZCBk ZWxlZ2F0ZXNTY3JvbGxpbmdEaWRDaGFuZ2UoKSBmaW5hbDsKIAorICAgIHZvaWQgdW5vYnNjdXJl ZENvbnRlbnRTaXplQ2hhbmdlZCgpIGZpbmFsOworCiAgICAgLy8gU2Nyb2xsYWJsZUFyZWEgaW50 ZXJmYWNlCiAgICAgdm9pZCBpbnZhbGlkYXRlU2Nyb2xsYmFyUmVjdChTY3JvbGxiYXImLCBjb25z dCBJbnRSZWN0JikgZmluYWw7CiAgICAgdm9pZCBzY3JvbGxUbyhjb25zdCBTY3JvbGxQb3NpdGlv biYpIGZpbmFsOwpAQCAtNzM1LDEwICs3MzcsNiBAQCBwcml2YXRlOgogI2VuZGlmCiAgICAgdm9p ZCBjb250ZW50c1Jlc2l6ZWQoKSBmaW5hbDsKIAotI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCi0g ICAgdm9pZCB1bm9ic2N1cmVkQ29udGVudFNpemVDaGFuZ2VkKCkgZmluYWw7Ci0jZW5kaWYKLQog I2lmIEVOQUJMRShEQVJLX01PREVfQ1NTKQogICAgIFJlbmRlck9iamVjdCogcmVuZGVyZXJGb3JD b2xvclNjaGVtZSgpIGNvbnN0OwogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9TY3JvbGxWaWV3LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZp ZXcuY3BwCmluZGV4IDdkMmQyZTEyM2Q1YjE0MTk1ZGVmNmZhYmEwMmMwNmRmYzU2N2Q1ODEuLjE3 ODUyM2FkZmMzNmQzNTY1ODA0OGMwOGY4OTM2MjIyMjdhMDM2MTUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL1Njcm9sbFZpZXcuY3BwCkBAIC0yMjAsMTIgKzIyMCwzNyBAQCB2b2lkIFNjcm9sbFZp ZXc6OnNldENvbnRlbnRzU2Nyb2xsUG9zaXRpb24oY29uc3QgSW50UG9pbnQmIHBvc2l0aW9uKQog ICAgIHNldFNjcm9sbFBvc2l0aW9uKHBvc2l0aW9uKTsKIH0KIAotI2lmICFQTEFURk9STShJT1Nf RkFNSUxZKQorRmxvYXRTaXplIFNjcm9sbFZpZXc6OnVub2JzY3VyZWRDb250ZW50U2l6ZSgpIGNv bnN0Cit7CisgICAgQVNTRVJUKG1fZGVsZWdhdGVkU2Nyb2xsaW5nR2VvbWV0cnkpOworICAgIGlm IChtX2RlbGVnYXRlZFNjcm9sbGluZ0dlb21ldHJ5KQorICAgICAgICByZXR1cm4gbV9kZWxlZ2F0 ZWRTY3JvbGxpbmdHZW9tZXRyeS0+dW5vYnNjdXJlZENvbnRlbnRTaXplOworICAgIHJldHVybiB7 IH07Cit9CisKK3ZvaWQgU2Nyb2xsVmlldzo6c2V0VW5vYnNjdXJlZENvbnRlbnRTaXplKGNvbnN0 IEZsb2F0U2l6ZSYgc2l6ZSkKK3sKKyAgICBBU1NFUlQoIXBsYXRmb3JtV2lkZ2V0KCkpOworICAg IGlmIChtX2RlbGVnYXRlZFNjcm9sbGluZ0dlb21ldHJ5ICYmIHNpemUgPT0gbV9kZWxlZ2F0ZWRT Y3JvbGxpbmdHZW9tZXRyeS0+dW5vYnNjdXJlZENvbnRlbnRTaXplKQorICAgICAgICByZXR1cm47 CisKKyAgICBpZiAoIW1fZGVsZWdhdGVkU2Nyb2xsaW5nR2VvbWV0cnkpCisgICAgICAgIG1fZGVs ZWdhdGVkU2Nyb2xsaW5nR2VvbWV0cnkgPSBEZWxlZ2F0ZWRTY3JvbGxpbmdHZW9tZXRyeSgpOwor CisgICAgbV9kZWxlZ2F0ZWRTY3JvbGxpbmdHZW9tZXRyeS0+dW5vYnNjdXJlZENvbnRlbnRTaXpl ID0gc2l6ZTsKKyAgICB1bm9ic2N1cmVkQ29udGVudFNpemVDaGFuZ2VkKCk7Cit9CisKIEludFJl Y3QgU2Nyb2xsVmlldzo6dW5vYnNjdXJlZENvbnRlbnRSZWN0KFZpc2libGVDb250ZW50UmVjdElu Y2x1ZGVzU2Nyb2xsYmFycyBzY3JvbGxiYXJJbmNsdXNpb24pIGNvbnN0CiB7CisgICAgaWYgKHBs YXRmb3JtV2lkZ2V0KCkpCisgICAgICAgIHJldHVybiBwbGF0Zm9ybVVub2JzY3VyZWRDb250ZW50 UmVjdChzY3JvbGxiYXJJbmNsdXNpb24pOworCisgICAgaWYgKG1fZGVsZWdhdGVkU2Nyb2xsaW5n R2VvbWV0cnkpCisgICAgICAgIHJldHVybiBJbnRSZWN0KG1fc2Nyb2xsUG9zaXRpb24sIHJvdW5k ZWRJbnRTaXplKG1fZGVsZWdhdGVkU2Nyb2xsaW5nR2VvbWV0cnktPnVub2JzY3VyZWRDb250ZW50 U2l6ZSkpOworCiAgICAgcmV0dXJuIHVub2JzY3VyZWRDb250ZW50UmVjdEludGVybmFsKHNjcm9s bGJhckluY2x1c2lvbik7CiB9Ci0jZW5kaWYKIAogSW50UmVjdCBTY3JvbGxWaWV3Ojp1bm9ic2N1 cmVkQ29udGVudFJlY3RJbnRlcm5hbChWaXNpYmxlQ29udGVudFJlY3RJbmNsdWRlc1Njcm9sbGJh cnMgc2Nyb2xsYmFySW5jbHVzaW9uKSBjb25zdAogewpAQCAtMTUzMyw3ICsxNTU4LDcgQEAgYm9v bCBTY3JvbGxWaWV3OjpwbGF0Zm9ybUNhbkJsaXRPblNjcm9sbCgpIGNvbnN0CiAKIEludFJlY3Qg U2Nyb2xsVmlldzo6cGxhdGZvcm1WaXNpYmxlQ29udGVudFJlY3QoYm9vbCkgY29uc3QKIHsKLSAg ICByZXR1cm4gSW50UmVjdCgpOworICAgIHJldHVybiB7IH07CiB9CiAKIGZsb2F0IFNjcm9sbFZp ZXc6OnBsYXRmb3JtVG9wQ29udGVudEluc2V0KCkgY29uc3QKQEAgLTE1NDcsMTcgKzE1NzIsMjIg QEAgdm9pZCBTY3JvbGxWaWV3OjpwbGF0Zm9ybVNldFRvcENvbnRlbnRJbnNldChmbG9hdCkKIAog SW50U2l6ZSBTY3JvbGxWaWV3OjpwbGF0Zm9ybVZpc2libGVDb250ZW50U2l6ZShib29sKSBjb25z dAogewotICAgIHJldHVybiBJbnRTaXplKCk7CisgICAgcmV0dXJuIHsgfTsKIH0KIAogSW50UmVj dCBTY3JvbGxWaWV3OjpwbGF0Zm9ybVZpc2libGVDb250ZW50UmVjdEluY2x1ZGluZ09ic2N1cmVk QXJlYShib29sKSBjb25zdAogewotICAgIHJldHVybiBJbnRSZWN0KCk7CisgICAgcmV0dXJuIHsg fTsKIH0KIAogSW50U2l6ZSBTY3JvbGxWaWV3OjpwbGF0Zm9ybVZpc2libGVDb250ZW50U2l6ZUlu Y2x1ZGluZ09ic2N1cmVkQXJlYShib29sKSBjb25zdAogewotICAgIHJldHVybiBJbnRTaXplKCk7 CisgICAgcmV0dXJuIHsgfTsKK30KKworSW50UmVjdCBTY3JvbGxWaWV3OjpwbGF0Zm9ybVVub2Jz Y3VyZWRDb250ZW50UmVjdChWaXNpYmxlQ29udGVudFJlY3RJbmNsdWRlc1Njcm9sbGJhcnMpIGNv bnN0Cit7CisgICAgcmV0dXJuIHsgfTsKIH0KIAogdm9pZCBTY3JvbGxWaWV3OjpwbGF0Zm9ybVNl dENvbnRlbnRzU2l6ZSgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3Jv bGxWaWV3LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmgKaW5kZXggMmZm MjZkNzQyOGEyYzI5MWNiZWQ0NDM0ODNjNWUyYjZkZGNlNGZkNi4uMDg0Mjg1OWY3MjgzZmIxYTky NTA1MWZlZTIxYmNlNTY3ZmZiZWU5MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vU2Nyb2xsVmlldy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcu aApAQCAtMTc5LDIxICsxNzksMjMgQEAgcHVibGljOgogICAgIC8vIGNvbnRyaWJ1dGUgdG8gcGFp bnRpbmcgYnV0IG5vdCB0byB0aGUgc2Nyb2xsYWJsZSBhcmVhLgogICAgIC8vIFRoZSB1bm9ic2N1 cmVkQ29udGVudFJlY3QgaXMgdGhlIGFyZWEgdGhhdCBpcyBub3QgY292ZXJlZCBieSBVSSBlbGVt ZW50cy4KICAgICBXRUJDT1JFX0VYUE9SVCBJbnRSZWN0IHVub2JzY3VyZWRDb250ZW50UmVjdChW aXNpYmxlQ29udGVudFJlY3RJbmNsdWRlc1Njcm9sbGJhcnMgPSBFeGNsdWRlU2Nyb2xsYmFycykg Y29uc3Q7CisKICNpZiBQTEFURk9STShJT1NfRkFNSUxZKQogICAgIEludFJlY3QgdW5vYnNjdXJl ZENvbnRlbnRSZWN0SW5jbHVkaW5nU2Nyb2xsYmFycygpIGNvbnN0IHsgcmV0dXJuIHVub2JzY3Vy ZWRDb250ZW50UmVjdChJbmNsdWRlU2Nyb2xsYmFycyk7IH0KICNlbHNlCiAgICAgSW50UmVjdCB1 bm9ic2N1cmVkQ29udGVudFJlY3RJbmNsdWRpbmdTY3JvbGxiYXJzKCkgY29uc3QgeyByZXR1cm4g dmlzaWJsZUNvbnRlbnRSZWN0SW5jbHVkaW5nU2Nyb2xsYmFycygpOyB9CiAjZW5kaWYKIAotI2lm IFBMQVRGT1JNKElPU19GQU1JTFkpCiAgICAgLy8gVGhpcyBpcyB0aGUgYXJlYSB0aGF0IGlzIHBh cnRpYWxseSBvciBmdWxseSBleHBvc2VkLCBhbmQgbWF5IGV4dGVuZCB1bmRlciBvdmVybGFwcGlu ZyBVSSBlbGVtZW50cy4KICAgICBXRUJDT1JFX0VYUE9SVCBGbG9hdFJlY3QgZXhwb3NlZENvbnRl bnRSZWN0KCkgY29uc3Q7CiAKICAgICAvLyBUaGUgZ2l2ZW4gcmVjdHMgYXJlIG9ubHkgdXNlZCBp ZiB0aGVyZSBpcyBubyBwbGF0Zm9ybSB3aWRnZXQuCiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBz ZXRFeHBvc2VkQ29udGVudFJlY3QoY29uc3QgRmxvYXRSZWN0Jik7Ci0gICAgY29uc3QgRmxvYXRT aXplJiB1bm9ic2N1cmVkQ29udGVudFNpemUoKSBjb25zdCB7IHJldHVybiBtX3Vub2JzY3VyZWRD b250ZW50U2l6ZTsgfQorCisgICAgV0VCQ09SRV9FWFBPUlQgRmxvYXRTaXplIHVub2JzY3VyZWRD b250ZW50U2l6ZSgpIGNvbnN0OwogICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgc2V0VW5vYnNjdXJl ZENvbnRlbnRTaXplKGNvbnN0IEZsb2F0U2l6ZSYpOwogCisjaWYgUExBVEZPUk0oSU9TX0ZBTUlM WSkKICAgICB2b2lkIHNldEFjdHVhbFNjcm9sbFBvc2l0aW9uKGNvbnN0IEludFBvaW50Jik7CiAg ICAgTGVnYWN5VGlsZUNhY2hlKiBsZWdhY3lUaWxlQ2FjaGUoKTsKICNlbmRpZgpAQCAtNDI4LDkg KzQzMCw3IEBAIHByb3RlY3RlZDoKIAogICAgIHZpcnR1YWwgdm9pZCBzY3JvbGxPZmZzZXRDaGFu Z2VkVmlhUGxhdGZvcm1XaWRnZXRJbXBsKGNvbnN0IFNjcm9sbE9mZnNldCYsIGNvbnN0IFNjcm9s bE9mZnNldCYpID0gMDsKIAotI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCiAgICAgdmlydHVhbCB2 b2lkIHVub2JzY3VyZWRDb250ZW50U2l6ZUNoYW5nZWQoKSA9IDA7Ci0jZW5kaWYKIAogI2lmIFBM QVRGT1JNKENPQ09BKSAmJiBkZWZpbmVkIF9fT0JKQ19fCiBwdWJsaWM6CkBAIC00NjgsMTMgKzQ2 OCwxOSBAQCBwcml2YXRlOgogICAgIHZvaWQgcGxhdGZvcm1TY3JvbGxiYXJNb2RlcyhTY3JvbGxi YXJNb2RlJiBob3Jpem9udGFsLCBTY3JvbGxiYXJNb2RlJiB2ZXJ0aWNhbCkgY29uc3Q7CiAgICAg dm9pZCBwbGF0Zm9ybVNldENhbkJsaXRPblNjcm9sbChib29sKTsKICAgICBib29sIHBsYXRmb3Jt Q2FuQmxpdE9uU2Nyb2xsKCkgY29uc3Q7CisgICAgCiAgICAgSW50UmVjdCBwbGF0Zm9ybVZpc2li bGVDb250ZW50UmVjdChib29sIGluY2x1ZGVTY3JvbGxiYXJzKSBjb25zdDsKICAgICBJbnRTaXpl IHBsYXRmb3JtVmlzaWJsZUNvbnRlbnRTaXplKGJvb2wgaW5jbHVkZVNjcm9sbGJhcnMpIGNvbnN0 OwogICAgIEludFJlY3QgcGxhdGZvcm1WaXNpYmxlQ29udGVudFJlY3RJbmNsdWRpbmdPYnNjdXJl ZEFyZWEoYm9vbCBpbmNsdWRlU2Nyb2xsYmFycykgY29uc3Q7CiAgICAgSW50U2l6ZSBwbGF0Zm9y bVZpc2libGVDb250ZW50U2l6ZUluY2x1ZGluZ09ic2N1cmVkQXJlYShib29sIGluY2x1ZGVTY3Jv bGxiYXJzKSBjb25zdDsKKworICAgIEludFJlY3QgcGxhdGZvcm1Vbm9ic2N1cmVkQ29udGVudFJl Y3QoVmlzaWJsZUNvbnRlbnRSZWN0SW5jbHVkZXNTY3JvbGxiYXJzKSBjb25zdDsKKwogICAgIHZv aWQgcGxhdGZvcm1TZXRDb250ZW50c1NpemUoKTsKKwogICAgIEludFJlY3QgcGxhdGZvcm1Db250 ZW50c1RvU2NyZWVuKGNvbnN0IEludFJlY3QmKSBjb25zdDsKICAgICBJbnRQb2ludCBwbGF0Zm9y bVNjcmVlblRvQ29udGVudHMoY29uc3QgSW50UG9pbnQmKSBjb25zdDsKKwogICAgIHZvaWQgcGxh dGZvcm1TZXRTY3JvbGxQb3NpdGlvbihjb25zdCBJbnRQb2ludCYpOwogICAgIGJvb2wgcGxhdGZv cm1TY3JvbGwoU2Nyb2xsRGlyZWN0aW9uLCBTY3JvbGxHcmFudWxhcml0eSk7CiAgICAgdm9pZCBw bGF0Zm9ybVNldFNjcm9sbGJhcnNTdXBwcmVzc2VkKGJvb2wgcmVwYWludE9uVW5zdXBwcmVzcyk7 CkBAIC00OTMsMTMgKzQ5OSwxNyBAQCBwcml2YXRlOgogICAgIFNjcm9sbGJhck1vZGUgbV9ob3Jp em9udGFsU2Nyb2xsYmFyTW9kZSB7IFNjcm9sbGJhckF1dG8gfTsKICAgICBTY3JvbGxiYXJNb2Rl IG1fdmVydGljYWxTY3JvbGxiYXJNb2RlIHsgU2Nyb2xsYmFyQXV0byB9OwogCi0jaWYgUExBVEZP Uk0oSU9TX0ZBTUlMWSkKKyAgICBGbG9hdFJlY3QgbV9leHBvc2VkQ29udGVudFJlY3Q7CisKKyAg ICAvLyBGSVhNRTogTW9yZSB0aGluZ3Mgd2lsbCBtb3ZlIGludG8gaGVyZS4KKyAgICBzdHJ1Y3Qg RGVsZWdhdGVkU2Nyb2xsaW5nR2VvbWV0cnkgeworICAgICAgICBGbG9hdFNpemUgdW5vYnNjdXJl ZENvbnRlbnRTaXplOworICAgIH07CisgICAgT3B0aW9uYWw8RGVsZWdhdGVkU2Nyb2xsaW5nR2Vv bWV0cnk+IG1fZGVsZWdhdGVkU2Nyb2xsaW5nR2VvbWV0cnk7CisKKyNpZiBVU0UoQ09PUkRJTkFU RURfR1JBUEhJQ1MpCiAgICAgLy8gRklYTUU6IGV4cG9zZWRDb250ZW50UmVjdCBpcyBhIHZlcnkg c2ltaWxhciBjb25jZXB0IHRvIGZpeGVkVmlzaWJsZUNvbnRlbnRSZWN0IGV4Y2VwdCBpdCBkb2Vz IG5vdCBkaWZmZXJlbnRpYXRlCiAgICAgLy8gYmV0d2VlbiBleHBvc2VkIGFuZCB1bm9ic2N1cmVk IGFyZWFzLiBUaGUgdHdvIGF0dHJpYnV0ZXMgc2hvdWxkIGV2ZW50dWFsbHkgYmUgbWVyZ2VkLgot ICAgIEZsb2F0UmVjdCBtX2V4cG9zZWRDb250ZW50UmVjdDsKLSAgICBGbG9hdFNpemUgbV91bm9i c2N1cmVkQ29udGVudFNpemU7Ci0gICAgLy8gVGhpcyBpcyBvbmx5IHVzZWQgZm9yIGhpc3Rvcnkg c2Nyb2xsIHBvc2l0aW9uIHJlc3RvcmF0aW9uLgotI2Vsc2UKICAgICBJbnRSZWN0IG1fZml4ZWRW aXNpYmxlQ29udGVudFJlY3Q7CiAjZW5kaWYKICAgICBTY3JvbGxQb3NpdGlvbiBtX3Njcm9sbFBv c2l0aW9uOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1Njcm9sbFZp ZXdJT1MubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvU2Nyb2xsVmlld0lPUy5tbQpp bmRleCA4NWNjZTJlNGM4MTNlMDRhNzEwYzM5OGQ1YTViNWYyMThkZDk5NGEzLi5jODFkYTY0ZTE3 YjE4MDVkMTljZmJhYmVhMzAzYzUxNDliMmI2N2MxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9pb3MvU2Nyb2xsVmlld0lPUy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9pb3MvU2Nyb2xsVmlld0lPUy5tbQpAQCAtMTAyLDMwICsxMDIsMTUgQEAgYm9vbCBTY3Jv bGxWaWV3OjpwbGF0Zm9ybUNhbkJsaXRPblNjcm9sbCgpIGNvbnN0CiAgICAgQUxMT1dfREVQUkVD QVRFRF9ERUNMQVJBVElPTlNfRU5ECiB9CiAKLUludFJlY3QgU2Nyb2xsVmlldzo6dW5vYnNjdXJl ZENvbnRlbnRSZWN0KFZpc2libGVDb250ZW50UmVjdEluY2x1ZGVzU2Nyb2xsYmFycykgY29uc3QK K0ludFJlY3QgU2Nyb2xsVmlldzo6cGxhdGZvcm1Vbm9ic2N1cmVkQ29udGVudFJlY3QoVmlzaWJs ZUNvbnRlbnRSZWN0SW5jbHVkZXNTY3JvbGxiYXJzKSBjb25zdAogewotICAgIGlmIChXQUtTY3Jv bGxWaWV3ICp2aWV3ID0gc3RhdGljX2Nhc3Q8V0FLU2Nyb2xsVmlldyAqPihwbGF0Zm9ybVdpZGdl dCgpKSkgewotICAgICAgICBDR1JlY3QgciA9IENHUmVjdFplcm87Ci0gICAgICAgIEJFR0lOX0JM T0NLX09CSkNfRVhDRVBUSU9OUzsKLSAgICAgICAgciA9IFt2aWV3IHVub2JzY3VyZWRDb250ZW50 UmVjdF07Ci0gICAgICAgIEVORF9CTE9DS19PQkpDX0VYQ0VQVElPTlM7Ci0gICAgICAgIHJldHVy biBlbmNsb3NpbmdJbnRSZWN0KHIpOwotICAgIH0KLQotICAgIGlmICghbV91bm9ic2N1cmVkQ29u dGVudFNpemUuaXNFbXB0eSgpKQotICAgICAgICByZXR1cm4gSW50UmVjdChtX3Njcm9sbFBvc2l0 aW9uLCByb3VuZGVkSW50U2l6ZShtX3Vub2JzY3VyZWRDb250ZW50U2l6ZSkpOwotCi0gICAgcmV0 dXJuIHVub2JzY3VyZWRDb250ZW50UmVjdEludGVybmFsKCk7Ci19Ci0KLXZvaWQgU2Nyb2xsVmll dzo6c2V0VW5vYnNjdXJlZENvbnRlbnRTaXplKGNvbnN0IEZsb2F0U2l6ZSYgc2l6ZSkKLXsKLSAg ICBBU1NFUlQoIXBsYXRmb3JtV2lkZ2V0KCkpOwotICAgIGlmIChzaXplID09IG1fdW5vYnNjdXJl ZENvbnRlbnRTaXplKQotICAgICAgICByZXR1cm47Ci0KLSAgICBtX3Vub2JzY3VyZWRDb250ZW50 U2l6ZSA9IHNpemU7Ci0gICAgdW5vYnNjdXJlZENvbnRlbnRTaXplQ2hhbmdlZCgpOworICAgIEFT U0VSVChwbGF0Zm9ybVdpZGdldCgpKTsKKyAgICBXQUtTY3JvbGxWaWV3ICp2aWV3ID0gc3RhdGlj X2Nhc3Q8V0FLU2Nyb2xsVmlldyAqPihwbGF0Zm9ybVdpZGdldCgpKTsKKyAgICBDR1JlY3QgciA9 IENHUmVjdFplcm87CisgICAgQkVHSU5fQkxPQ0tfT0JKQ19FWENFUFRJT05TOworICAgIHIgPSBb dmlldyB1bm9ic2N1cmVkQ29udGVudFJlY3RdOworICAgIEVORF9CTE9DS19PQkpDX0VYQ0VQVElP TlM7CisgICAgcmV0dXJuIGVuY2xvc2luZ0ludFJlY3Qocik7CiB9CiAKIEZsb2F0UmVjdCBTY3Jv bGxWaWV3OjpleHBvc2VkQ29udGVudFJlY3QoKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbWFjL1Njcm9sbFZpZXdNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9tYWMvU2Nyb2xsVmlld01hYy5tbQppbmRleCBiOGI1MzMxMGZhYjdlYTE4ZWI2OWIzYjU1 MWU4OWNhOTQyYzZjM2ExLi4zMzQxZDRkYmU4YjUzNmVmYWE5Njg3OTVhNDY5NGI5NWE4MWVmNTI0 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsVmlld01hYy5t bQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsVmlld01hYy5tbQpAQCAt MTc3LDYgKzE3NywxMSBAQCBJbnRTaXplIFNjcm9sbFZpZXc6OnBsYXRmb3JtVmlzaWJsZUNvbnRl bnRTaXplSW5jbHVkaW5nT2JzY3VyZWRBcmVhKGJvb2wgaW5jbHVkZQogICAgIHJldHVybiBwbGF0 Zm9ybVZpc2libGVDb250ZW50UmVjdEluY2x1ZGluZ09ic2N1cmVkQXJlYShpbmNsdWRlU2Nyb2xs YmFycykuc2l6ZSgpOwogfQogCitJbnRSZWN0IFNjcm9sbFZpZXc6OnBsYXRmb3JtVW5vYnNjdXJl ZENvbnRlbnRSZWN0KFZpc2libGVDb250ZW50UmVjdEluY2x1ZGVzU2Nyb2xsYmFycyBzY3JvbGxi YXJJbmNsdXNpb24pIGNvbnN0Cit7CisgICAgcmV0dXJuIHVub2JzY3VyZWRDb250ZW50UmVjdElu dGVybmFsKHNjcm9sbGJhckluY2x1c2lvbik7Cit9CisKIHZvaWQgU2Nyb2xsVmlldzo6cGxhdGZv cm1TZXRDb250ZW50c1NpemUoKQogewogICAgIEJFR0lOX0JMT0NLX09CSkNfRVhDRVBUSU9OUzsK