179269 2017-11-03 15:14:29 -0700 Remove redundant LayoutStateMaintainer argument. 2017-11-03 15:42:18 -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 simon.fraser webkit-bug-importer zalan oldest_to_newest 1368185 0 zalan 2017-11-03 15:14:29 -0700 RenderView& is redundant. 1368186 1 webkit-bug-importer 2017-11-03 15:14:50 -0700 <rdar://problem/35344397> 1368190 2 325971 zalan 2017-11-03 15:18:19 -0700 Created attachment 325971 Patch 1368203 3 325971 commit-queue 2017-11-03 15:42:17 -0700 Comment on attachment 325971 Patch Clearing flags on attachment: 325971 Committed r224436: <https://trac.webkit.org/changeset/224436> 1368204 4 commit-queue 2017-11-03 15:42:18 -0700 All reviewed patches have been landed. Closing bug. 325971 2017-11-03 15:18:19 -0700 2017-11-03 15:42:17 -0700 Patch bug-179269-20171103151819.patch text/plain 14083 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjI0NDA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTVmZGIzNTQyY2Q4NWJm YWZjYmJlNmMwNDA3ZjIzMzA5MWUwMjBiNS4uNDMzMTYyZDU3ZDI2OGRjYTZkMDM4NTUyNGQwMGY5 YzM2MTY5OWJlNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQxIEBACisyMDE3LTExLTAzICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIHJlZHVuZGFudCBM YXlvdXRTdGF0ZU1haW50YWluZXIgYXJndW1lbnQgKFJlbmRlclZpZXcmKQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc5MjY5CisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS8zNTM0NDM5Nz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBObyBjaGFuZ2UgaW4gZnVuY3Rpb25hbGl0eS4KKworICAgICAgICAqIHJl bmRlcmluZy9SZW5kZXJCbG9jay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6 c2ltcGxpZmllZExheW91dCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5j cHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9ja0Zsb3c6OmxheW91dEJsb2NrKToKKyAg ICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckJveDo6bGF5b3V0KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRGVwcmVjYXRlZEZsZXhp YmxlQm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJv eDo6bGF5b3V0QmxvY2spOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJFbWJlZGRlZE9iamVj dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJFbWJlZGRlZE9iamVjdDo6bGF5b3V0KToK KyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyRmxleGlibGVCb3g6OmxheW91dEJsb2NrKToKKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVyR3JpZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJHcmlkOjpsYXlvdXRC bG9jayk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckltYWdlLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckltYWdlOjpsYXlvdXRTaGFkb3dDb250cm9scyk6CisgICAgICAgICogcmVu ZGVyaW5nL1JlbmRlclRhYmxlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRhYmxlOjps YXlvdXQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUYWJsZVJvdy5jcHA6CisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJUYWJsZVJvdzo6bGF5b3V0KToKKyAgICAgICAgKiByZW5kZXJpbmcv UmVuZGVyVGFibGVTZWN0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRhYmxlU2Vj dGlvbjo6bGF5b3V0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRhYmxlU2VjdGlvbjo6bGF5 b3V0Um93cyk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclZUVEN1ZS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJWVFRDdWU6OmxheW91dCk6CisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlclZpZXcuaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dFN0YXRlTWFpbnRhaW5lcjo6TGF5 b3V0U3RhdGVNYWludGFpbmVyKToKKwogMjAxNy0xMS0wMyAgWmFsYW4gQnVqdGFzICA8emFsYW5A YXBwbGUuY29tPgogCiAgICAgICAgIFJlbmRlck9iamVjdDo6KnBvc2l0aW9uZWQoKSBuYW1pbmcg Y2xlYW51cApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2Nr LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKaW5kZXggNGQ5 Yzc4MTlhZTkxOGQ4ZTA4ODZhMGZlZWQxM2FkZWE4MjM5OWExMi4uMmU0MTBhZjVjNWY0NWQ5NTMy M2Y2MTI4YjBjYmVhYTlmNGIzZjU3OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckJsb2NrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy QmxvY2suY3BwCkBAIC0xMzE3LDcgKzEzMTcsNyBAQCBib29sIFJlbmRlckJsb2NrOjpzaW1wbGlm aWVkTGF5b3V0KCkKICAgICBpZiAoIWNhblBlcmZvcm1TaW1wbGlmaWVkTGF5b3V0KCkpCiAgICAg ICAgIHJldHVybiBmYWxzZTsKIAotICAgIExheW91dFN0YXRlTWFpbnRhaW5lciBzdGF0ZVB1c2hl cih2aWV3KCksICp0aGlzLCBsb2NhdGlvbk9mZnNldCgpLCBoYXNUcmFuc2Zvcm0oKSB8fCBoYXNS ZWZsZWN0aW9uKCkgfHwgc3R5bGUoKS5pc0ZsaXBwZWRCbG9ja3NXcml0aW5nTW9kZSgpKTsKKyAg ICBMYXlvdXRTdGF0ZU1haW50YWluZXIgc3RhdGVQdXNoZXIoKnRoaXMsIGxvY2F0aW9uT2Zmc2V0 KCksIGhhc1RyYW5zZm9ybSgpIHx8IGhhc1JlZmxlY3Rpb24oKSB8fCBzdHlsZSgpLmlzRmxpcHBl ZEJsb2Nrc1dyaXRpbmdNb2RlKCkpOwogICAgIGlmIChuZWVkc1Bvc2l0aW9uZWRNb3ZlbWVudExh eW91dCgpICYmICF0cnlMYXlvdXREb2luZ1Bvc2l0aW9uZWRNb3ZlbWVudE9ubHkoKSkgewogICAg ICAgICBzdGF0ZVB1c2hlci5wb3AoKTsKICAgICAgICAgcmV0dXJuIGZhbHNlOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcAppbmRleCBlMmExYjE1Nzk4NDJm ODJkNGUwODdhMmFhMzIxNmI4NmExZWNiYmNjLi5mNDdhNmQ2ZDk1NDExOTIwYTQ3YWMxOWYyZjlh NzhlZWQzMzQ1YWNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy QmxvY2tGbG93LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tG bG93LmNwcApAQCAtNDkyLDcgKzQ5Miw3IEBAIHZvaWQgUmVuZGVyQmxvY2tGbG93OjpsYXlvdXRC bG9jayhib29sIHJlbGF5b3V0Q2hpbGRyZW4sIExheW91dFVuaXQgcGFnZUxvZ2ljYWxICiAgICAg Y2hlY2tGb3JQYWdpbmF0aW9uTG9naWNhbEhlaWdodENoYW5nZShyZWxheW91dENoaWxkcmVuLCBw YWdlTG9naWNhbEhlaWdodCwgcGFnZUxvZ2ljYWxIZWlnaHRDaGFuZ2VkKTsKIAogICAgIGNvbnN0 IFJlbmRlclN0eWxlJiBzdHlsZVRvVXNlID0gc3R5bGUoKTsKLSAgICBMYXlvdXRTdGF0ZU1haW50 YWluZXIgc3RhdGVQdXNoZXIodmlldygpLCAqdGhpcywgbG9jYXRpb25PZmZzZXQoKSwgaGFzVHJh bnNmb3JtKCkgfHwgaGFzUmVmbGVjdGlvbigpIHx8IHN0eWxlVG9Vc2UuaXNGbGlwcGVkQmxvY2tz V3JpdGluZ01vZGUoKSwgcGFnZUxvZ2ljYWxIZWlnaHQsIHBhZ2VMb2dpY2FsSGVpZ2h0Q2hhbmdl ZCk7CisgICAgTGF5b3V0U3RhdGVNYWludGFpbmVyIHN0YXRlUHVzaGVyKCp0aGlzLCBsb2NhdGlv bk9mZnNldCgpLCBoYXNUcmFuc2Zvcm0oKSB8fCBoYXNSZWZsZWN0aW9uKCkgfHwgc3R5bGVUb1Vz ZS5pc0ZsaXBwZWRCbG9ja3NXcml0aW5nTW9kZSgpLCBwYWdlTG9naWNhbEhlaWdodCwgcGFnZUxv Z2ljYWxIZWlnaHRDaGFuZ2VkKTsKIAogICAgIHByZXBhcmVQYWdpbmF0aW9uQmVmb3JlQmxvY2tM YXlvdXQocmVsYXlvdXRDaGlsZHJlbik7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJv eC5jcHAKaW5kZXggZTVmMjU0MDcwNTZmYzg5MGM3YjhiNDU4MTNiZTRmM2Y3ZDU3Mjg0Yi4uMDdl MzE0MmRhNDkxOWI2YTcxNjczMzRjMGRkNDE3YTJlODU1MDczNCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckJveC5jcHAKQEAgLTUwNyw3ICs1MDcsNyBAQCB2b2lkIFJlbmRlckJveDo6 bGF5b3V0KCkKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIExheW91dFN0YXRlTWFpbnRh aW5lciBzdGF0ZVB1c2hlcih2aWV3KCksICp0aGlzLCBsb2NhdGlvbk9mZnNldCgpLCBzdHlsZSgp LmlzRmxpcHBlZEJsb2Nrc1dyaXRpbmdNb2RlKCkpOworICAgIExheW91dFN0YXRlTWFpbnRhaW5l ciBzdGF0ZVB1c2hlcigqdGhpcywgbG9jYXRpb25PZmZzZXQoKSwgc3R5bGUoKS5pc0ZsaXBwZWRC bG9ja3NXcml0aW5nTW9kZSgpKTsKICAgICB3aGlsZSAoY2hpbGQpIHsKICAgICAgICAgaWYgKGNo aWxkLT5uZWVkc0xheW91dCgpKQogICAgICAgICAgICAgZG93bmNhc3Q8UmVuZGVyRWxlbWVudD4o KmNoaWxkKS5sYXlvdXQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveC5jcHAKaW5kZXggNWE0MjVhYTI3ZmQ3NWRmMWZj MWUxNjA2NGZiMDNmOGJjYWRkMTkyMi4uZTMyNjc5NzUwMWM4Y2U5OTE5YzVjY2Y1YTQ0YTg3ZWU2 ZjM4ZTAxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckRlcHJl Y2F0ZWRGbGV4aWJsZUJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckRlcHJlY2F0ZWRGbGV4aWJsZUJveC5jcHAKQEAgLTI3OCw3ICsyNzgsNyBAQCB2b2lkIFJlbmRl ckRlcHJlY2F0ZWRGbGV4aWJsZUJveDo6bGF5b3V0QmxvY2soYm9vbCByZWxheW91dENoaWxkcmVu LCBMYXlvdXRVbml0KQogICAgICAgICByZXR1cm47CiAKICAgICBMYXlvdXRSZXBhaW50ZXIgcmVw YWludGVyKCp0aGlzLCBjaGVja0ZvclJlcGFpbnREdXJpbmdMYXlvdXQoKSk7Ci0gICAgTGF5b3V0 U3RhdGVNYWludGFpbmVyIHN0YXRlUHVzaGVyKHZpZXcoKSwgKnRoaXMsIGxvY2F0aW9uT2Zmc2V0 KCksIGhhc1RyYW5zZm9ybSgpIHx8IGhhc1JlZmxlY3Rpb24oKSB8fCBzdHlsZSgpLmlzRmxpcHBl ZEJsb2Nrc1dyaXRpbmdNb2RlKCkpOworICAgIExheW91dFN0YXRlTWFpbnRhaW5lciBzdGF0ZVB1 c2hlcigqdGhpcywgbG9jYXRpb25PZmZzZXQoKSwgaGFzVHJhbnNmb3JtKCkgfHwgaGFzUmVmbGVj dGlvbigpIHx8IHN0eWxlKCkuaXNGbGlwcGVkQmxvY2tzV3JpdGluZ01vZGUoKSk7CiAKICAgICBw cmVwYXJlUGFnaW5hdGlvbkJlZm9yZUJsb2NrTGF5b3V0KHJlbGF5b3V0Q2hpbGRyZW4pOwogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRW1iZWRkZWRPYmplY3Qu Y3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVtYmVkZGVkT2JqZWN0LmNwcApp bmRleCA3YjMxNmQwYmNmYWE2MjUyZTc0ODQ4YjllMDA1NmVmYmMwYjE4YzI3Li43ODk3MjJjMGI1 ZWQ3YWNjYjkwZmQ4YmNhZTAyZjhjYWI2ZDVhNjkwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyRW1iZWRkZWRPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJFbWJlZGRlZE9iamVjdC5jcHAKQEAgLTQ1Miw3ICs0NTIsNyBAQCB2 b2lkIFJlbmRlckVtYmVkZGVkT2JqZWN0OjpsYXlvdXQoKQogICAgIC8vIFdoZW4gY2FsbGluZyBs YXlvdXQoKSBvbiBhIGNoaWxkIG5vZGUsIGEgcGFyZW50IG11c3QgZWl0aGVyIHB1c2ggYSBMYXlv dXRTdGF0ZU1haW50YWludGVyLCBvcgogICAgIC8vIGluc3RhbnRpYXRlIExheW91dFN0YXRlRGlz YWJsZXIuIFNpbmNlIHVzaW5nIGEgTGF5b3V0U3RhdGVNYWludGFpbmVyIGlzIHNsaWdodGx5IG1v cmUgZWZmaWNpZW50LAogICAgIC8vIGFuZCB0aGlzIG1ldGhvZCB3aWxsIGJlIGNhbGxlZCBtYW55 IHRpbWVzIHBlciBzZWNvbmQgZHVyaW5nIHBsYXliYWNrLCB1c2UgYSBMYXlvdXRTdGF0ZU1haW50 YWluZXI6Ci0gICAgTGF5b3V0U3RhdGVNYWludGFpbmVyIHN0YXRlUHVzaGVyKHZpZXcoKSwgKnRo aXMsIGxvY2F0aW9uT2Zmc2V0KCksIGhhc1RyYW5zZm9ybSgpIHx8IGhhc1JlZmxlY3Rpb24oKSB8 fCBzdHlsZSgpLmlzRmxpcHBlZEJsb2Nrc1dyaXRpbmdNb2RlKCkpOworICAgIExheW91dFN0YXRl TWFpbnRhaW5lciBzdGF0ZVB1c2hlcigqdGhpcywgbG9jYXRpb25PZmZzZXQoKSwgaGFzVHJhbnNm b3JtKCkgfHwgaGFzUmVmbGVjdGlvbigpIHx8IHN0eWxlKCkuaXNGbGlwcGVkQmxvY2tzV3JpdGlu Z01vZGUoKSk7CiAgICAgCiAgICAgY2hpbGRCb3guc2V0TG9jYXRpb24oTGF5b3V0UG9pbnQoYm9y ZGVyTGVmdCgpLCBib3JkZXJUb3AoKSkgKyBMYXlvdXRTaXplKHBhZGRpbmdMZWZ0KCksIHBhZGRp bmdUb3AoKSkpOwogICAgIGNoaWxkQm94Lm11dGFibGVTdHlsZSgpLnNldEhlaWdodChMZW5ndGgo bmV3U2l6ZS5oZWlnaHQoKSwgRml4ZWQpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyRmxleGlibGVCb3guY3BwCmluZGV4IGY5YjE1M2MyZWY4M2NlOTBmYWRiNWM5OGE4MDU0 ODBlN2RkNzdmYzUuLjk2ZDk0ZmE2NTY3ZWVmNWQ5NTUwNjVmY2QzNTY0Yzc3OTk3MmRlYzMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcApAQCAt MjczLDcgKzI3Myw3IEBAIHZvaWQgUmVuZGVyRmxleGlibGVCb3g6OmxheW91dEJsb2NrKGJvb2wg cmVsYXlvdXRDaGlsZHJlbiwgTGF5b3V0VW5pdCkKICAgICBMYXlvdXRVbml0IHByZXZpb3VzSGVp Z2h0ID0gbG9naWNhbEhlaWdodCgpOwogICAgIHNldExvZ2ljYWxIZWlnaHQoYm9yZGVyQW5kUGFk ZGluZ0xvZ2ljYWxIZWlnaHQoKSArIHNjcm9sbGJhckxvZ2ljYWxIZWlnaHQoKSk7CiAKLSAgICBM YXlvdXRTdGF0ZU1haW50YWluZXIgc3RhdGVQdXNoZXIodmlldygpLCAqdGhpcywgbG9jYXRpb25P ZmZzZXQoKSwgaGFzVHJhbnNmb3JtKCkgfHwgaGFzUmVmbGVjdGlvbigpIHx8IHN0eWxlKCkuaXNG bGlwcGVkQmxvY2tzV3JpdGluZ01vZGUoKSk7CisgICAgTGF5b3V0U3RhdGVNYWludGFpbmVyIHN0 YXRlUHVzaGVyKCp0aGlzLCBsb2NhdGlvbk9mZnNldCgpLCBoYXNUcmFuc2Zvcm0oKSB8fCBoYXNS ZWZsZWN0aW9uKCkgfHwgc3R5bGUoKS5pc0ZsaXBwZWRCbG9ja3NXcml0aW5nTW9kZSgpKTsKIAog ICAgIHByZXBhcmVQYWdpbmF0aW9uQmVmb3JlQmxvY2tMYXlvdXQocmVsYXlvdXRDaGlsZHJlbik7 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcAppbmRleCA1MWRhZGY1YTIw YmZiODJkNWM3ZTQzNDJiMDY5MjlkZDQxMjFkMTVmLi5hMDMxNzI3N2MyMWI1YjRkMmFlMmI0NjI5 NTI2MDdhZDcyMTUwOGYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyR3JpZC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuY3Bw CkBAIC0yMjksNyArMjI5LDcgQEAgdm9pZCBSZW5kZXJHcmlkOjpsYXlvdXRCbG9jayhib29sIHJl bGF5b3V0Q2hpbGRyZW4sIExheW91dFVuaXQpCiAgICAgICAgIHJldHVybjsKIAogICAgIExheW91 dFJlcGFpbnRlciByZXBhaW50ZXIoKnRoaXMsIGNoZWNrRm9yUmVwYWludER1cmluZ0xheW91dCgp KTsKLSAgICBMYXlvdXRTdGF0ZU1haW50YWluZXIgc3RhdGVQdXNoZXIodmlldygpLCAqdGhpcywg bG9jYXRpb25PZmZzZXQoKSwgaGFzVHJhbnNmb3JtKCkgfHwgaGFzUmVmbGVjdGlvbigpIHx8IHN0 eWxlKCkuaXNGbGlwcGVkQmxvY2tzV3JpdGluZ01vZGUoKSk7CisgICAgTGF5b3V0U3RhdGVNYWlu dGFpbmVyIHN0YXRlUHVzaGVyKCp0aGlzLCBsb2NhdGlvbk9mZnNldCgpLCBoYXNUcmFuc2Zvcm0o KSB8fCBoYXNSZWZsZWN0aW9uKCkgfHwgc3R5bGUoKS5pc0ZsaXBwZWRCbG9ja3NXcml0aW5nTW9k ZSgpKTsKIAogICAgIHByZXBhcmVQYWdpbmF0aW9uQmVmb3JlQmxvY2tMYXlvdXQocmVsYXlvdXRD aGlsZHJlbik7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJ bWFnZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW1hZ2UuY3BwCmluZGV4 IGNiZTMxNTI5MzM0MDcxMDJmNDk2OWRjMDZjZmYxNGE5ZGEzOWMwZjQuLjQ5ZGE5NTc3Njg5ZjNk MTU2ZTNjNGU4ZjRhMTE0ZmYzZGJmNzcwYTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJJbWFnZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckltYWdlLmNwcApAQCAtNzMyLDcgKzczMiw3IEBAIHZvaWQgUmVuZGVySW1hZ2U6OmxheW91 dFNoYWRvd0NvbnRyb2xzKGNvbnN0IExheW91dFNpemUmIG9sZFNpemUpCiAgICAgLy8gV2hlbiBj YWxsaW5nIGxheW91dCgpIG9uIGEgY2hpbGQgbm9kZSwgYSBwYXJlbnQgbXVzdCBlaXRoZXIgcHVz aCBhIExheW91dFN0YXRlTWFpbnRhaW50ZXIsIG9yIAogICAgIC8vIGluc3RhbnRpYXRlIExheW91 dFN0YXRlRGlzYWJsZXIuIFNpbmNlIHVzaW5nIGEgTGF5b3V0U3RhdGVNYWludGFpbmVyIGlzIHNs aWdodGx5IG1vcmUgZWZmaWNpZW50LAogICAgIC8vIGFuZCB0aGlzIG1ldGhvZCBtaWdodCBiZSBj YWxsZWQgbWFueSB0aW1lcyBwZXIgc2Vjb25kIGR1cmluZyB2aWRlbyBwbGF5YmFjaywgdXNlIGEg TGF5b3V0U3RhdGVNYWludGFpbmVyOgotICAgIExheW91dFN0YXRlTWFpbnRhaW5lciBzdGF0ZVB1 c2hlcih2aWV3KCksICp0aGlzLCBsb2NhdGlvbk9mZnNldCgpLCBoYXNUcmFuc2Zvcm0oKSB8fCBo YXNSZWZsZWN0aW9uKCkgfHwgc3R5bGUoKS5pc0ZsaXBwZWRCbG9ja3NXcml0aW5nTW9kZSgpKTsK KyAgICBMYXlvdXRTdGF0ZU1haW50YWluZXIgc3RhdGVQdXNoZXIoKnRoaXMsIGxvY2F0aW9uT2Zm c2V0KCksIGhhc1RyYW5zZm9ybSgpIHx8IGhhc1JlZmxlY3Rpb24oKSB8fCBzdHlsZSgpLmlzRmxp cHBlZEJsb2Nrc1dyaXRpbmdNb2RlKCkpOwogCiAgICAgaWYgKHNoYWRvd0NvbnRyb2xzTmVlZEN1 c3RvbUxheW91dE1ldHJpY3MoKSkgewogICAgICAgICBjb250cm9sc1JlbmRlcmVyLT5zZXRMb2Nh dGlvbihMYXlvdXRQb2ludChib3JkZXJMZWZ0KCksIGJvcmRlclRvcCgpKSArIExheW91dFNpemUo cGFkZGluZ0xlZnQoKSwgcGFkZGluZ1RvcCgpKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyVGFibGUuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlclRhYmxlLmNwcAppbmRleCAwMGEwNTIxZWNkNjM0YzJhZThmMmFkMjY2MWYwMTY4NDRjODQ0 NzU2Li42ZTdiMTk1MTI1NzkxNGZkZjQ1ODFlNmZiMGQ4NTQ2MDlmNjE4ZjMzIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGUuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZS5jcHAKQEAgLTQ0Nyw3ICs0NDcsNyBAQCB2b2lk IFJlbmRlclRhYmxlOjpsYXlvdXQoKQogICAgIHJlY2FsY0JvcmRlcnNJblJvd0RpcmVjdGlvbigp OwogCiAgICAgTGF5b3V0UmVwYWludGVyIHJlcGFpbnRlcigqdGhpcywgY2hlY2tGb3JSZXBhaW50 RHVyaW5nTGF5b3V0KCkpOwotICAgIExheW91dFN0YXRlTWFpbnRhaW5lciBzdGF0ZVB1c2hlcih2 aWV3KCksICp0aGlzLCBsb2NhdGlvbk9mZnNldCgpLCBoYXNUcmFuc2Zvcm0oKSB8fCBoYXNSZWZs ZWN0aW9uKCkgfHwgc3R5bGUoKS5pc0ZsaXBwZWRCbG9ja3NXcml0aW5nTW9kZSgpKTsKKyAgICBM YXlvdXRTdGF0ZU1haW50YWluZXIgc3RhdGVQdXNoZXIoKnRoaXMsIGxvY2F0aW9uT2Zmc2V0KCks IGhhc1RyYW5zZm9ybSgpIHx8IGhhc1JlZmxlY3Rpb24oKSB8fCBzdHlsZSgpLmlzRmxpcHBlZEJs b2Nrc1dyaXRpbmdNb2RlKCkpOwogCiAgICAgTGF5b3V0VW5pdCBvbGRMb2dpY2FsV2lkdGggPSBs b2dpY2FsV2lkdGgoKTsKICAgICBMYXlvdXRVbml0IG9sZExvZ2ljYWxIZWlnaHQgPSBsb2dpY2Fs SGVpZ2h0KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFi bGVSb3cuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlUm93LmNwcApp bmRleCBkM2RlNjNkMWE5NTgzZDkyNGY5YjE0ZjY4NGU2MGE3ZmQ1Yzg2Y2Y5Li45MDBhYmQwODYy NjUxYWUzMDRjNGFjZWE0YWRmMGYyMWY3NDFjMjA0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyVGFibGVSb3cuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJUYWJsZVJvdy5jcHAKQEAgLTE3Niw3ICsxNzYsNyBAQCB2b2lkIFJlbmRlclRh YmxlUm93OjpsYXlvdXQoKQogICAgIEFTU0VSVChuZWVkc0xheW91dCgpKTsKIAogICAgIC8vIFRh YmxlIHJvd3MgZG8gbm90IGFkZCB0cmFuc2xhdGlvbi4KLSAgICBMYXlvdXRTdGF0ZU1haW50YWlu ZXIgc3RhdGVQdXNoZXIodmlldygpLCAqdGhpcywgTGF5b3V0U2l6ZSgpLCBoYXNUcmFuc2Zvcm0o KSB8fCBoYXNSZWZsZWN0aW9uKCkgfHwgc3R5bGUoKS5pc0ZsaXBwZWRCbG9ja3NXcml0aW5nTW9k ZSgpKTsKKyAgICBMYXlvdXRTdGF0ZU1haW50YWluZXIgc3RhdGVQdXNoZXIoKnRoaXMsIExheW91 dFNpemUoKSwgaGFzVHJhbnNmb3JtKCkgfHwgaGFzUmVmbGVjdGlvbigpIHx8IHN0eWxlKCkuaXNG bGlwcGVkQmxvY2tzV3JpdGluZ01vZGUoKSk7CiAKICAgICBib29sIHBhZ2luYXRlZCA9IHZpZXco KS5sYXlvdXRTdGF0ZSgpLT5pc1BhZ2luYXRlZCgpOwogICAgICAgICAgICAgICAgIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlU2VjdGlvbi5jcHAgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGVTZWN0aW9uLmNwcAppbmRleCBhYmRl MjEzODA3N2FmYzA4ZDBmMTBiOTFlZTAwZjhmOGYzYzUzM2IxLi5mN2U5MzZkZGMxMzVhZjljNzhl YjFlZDg3NjQ4N2M2ODQ2ODU4YmRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyVGFibGVTZWN0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyVGFibGVTZWN0aW9uLmNwcApAQCAtMzg1LDcgKzM4NSw3IEBAIHZvaWQgUmVuZGVyVGFi bGVTZWN0aW9uOjpsYXlvdXQoKQogICAgIC8vIGNhbiBiZSBjYWxsZWQgaW4gYSBsb29wIChlLmcg ZHVyaW5nIHBhcnNpbmcpLiBEb2luZyBpdCBub3cgZW5zdXJlcyB3ZSBoYXZlIGEgc3RhYmxlLWVu b3VnaCBzdHJ1Y3R1cmUuCiAgICAgbV9ncmlkLnNocmlua1RvRml0KCk7CiAKLSAgICBMYXlvdXRT dGF0ZU1haW50YWluZXIgc3RhdGVQdXNoZXIodmlldygpLCAqdGhpcywgbG9jYXRpb25PZmZzZXQo KSwgaGFzVHJhbnNmb3JtKCkgfHwgaGFzUmVmbGVjdGlvbigpIHx8IHN0eWxlKCkuaXNGbGlwcGVk QmxvY2tzV3JpdGluZ01vZGUoKSk7CisgICAgTGF5b3V0U3RhdGVNYWludGFpbmVyIHN0YXRlUHVz aGVyKCp0aGlzLCBsb2NhdGlvbk9mZnNldCgpLCBoYXNUcmFuc2Zvcm0oKSB8fCBoYXNSZWZsZWN0 aW9uKCkgfHwgc3R5bGUoKS5pc0ZsaXBwZWRCbG9ja3NXcml0aW5nTW9kZSgpKTsKICAgICBib29s IHBhZ2luYXRlZCA9IHZpZXcoKS5sYXlvdXRTdGF0ZSgpLT5pc1BhZ2luYXRlZCgpOwogICAgIAog ICAgIGNvbnN0IFZlY3RvcjxMYXlvdXRVbml0PiYgY29sdW1uUG9zID0gdGFibGUoKS0+Y29sdW1u UG9zaXRpb25zKCk7CkBAIC02MDEsNyArNjAxLDcgQEAgdm9pZCBSZW5kZXJUYWJsZVNlY3Rpb246 OmxheW91dFJvd3MoKQogICAgIExheW91dFVuaXQgdnNwYWNpbmcgPSB0YWJsZSgpLT52Qm9yZGVy U3BhY2luZygpOwogICAgIHVuc2lnbmVkIG5FZmZDb2xzID0gdGFibGUoKS0+bnVtRWZmQ29scygp OwogCi0gICAgTGF5b3V0U3RhdGVNYWludGFpbmVyIHN0YXRlUHVzaGVyKHZpZXcoKSwgKnRoaXMs IGxvY2F0aW9uT2Zmc2V0KCksIGhhc1RyYW5zZm9ybSgpIHx8IHN0eWxlKCkuaXNGbGlwcGVkQmxv Y2tzV3JpdGluZ01vZGUoKSk7CisgICAgTGF5b3V0U3RhdGVNYWludGFpbmVyIHN0YXRlUHVzaGVy KCp0aGlzLCBsb2NhdGlvbk9mZnNldCgpLCBoYXNUcmFuc2Zvcm0oKSB8fCBzdHlsZSgpLmlzRmxp cHBlZEJsb2Nrc1dyaXRpbmdNb2RlKCkpOwogCiAgICAgZm9yICh1bnNpZ25lZCByID0gMDsgciA8 IHRvdGFsUm93czsgcisrKSB7CiAgICAgICAgIC8vIFNldCB0aGUgcm93J3MgeC95IHBvc2l0aW9u IGFuZCB3aWR0aC9oZWlnaHQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyVlRUQ3VlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWVFRDdWUu Y3BwCmluZGV4IDVjNDk4ZDE2MjUyZjUxNGJkNTEyZjRmMDk4YWM3NzE3MjE2NjdmZWYuLjc1ZTFl OTdiNTAxZjJhM2QzOGU1NzZlYjhkY2UzNTNhYzRmMDY5YzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWVFRDdWUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJWVFRDdWUuY3BwCkBAIC01NSw3ICs1NSw3IEBAIHZvaWQgUmVuZGVyVlRU Q3VlOjpsYXlvdXQoKQogICAgIGlmICghbV9jdWUtPnJlZ2lvbklkKCkuaXNFbXB0eSgpKQogICAg ICAgICByZXR1cm47CiAKLSAgICBMYXlvdXRTdGF0ZU1haW50YWluZXIgc3RhdGVQdXNoZXIodmll dygpLCAqdGhpcywgbG9jYXRpb25PZmZzZXQoKSwgaGFzVHJhbnNmb3JtKCkgfHwgaGFzUmVmbGVj dGlvbigpIHx8IHN0eWxlKCkuaXNGbGlwcGVkQmxvY2tzV3JpdGluZ01vZGUoKSk7CisgICAgTGF5 b3V0U3RhdGVNYWludGFpbmVyIHN0YXRlUHVzaGVyKCp0aGlzLCBsb2NhdGlvbk9mZnNldCgpLCBo YXNUcmFuc2Zvcm0oKSB8fCBoYXNSZWZsZWN0aW9uKCkgfHwgc3R5bGUoKS5pc0ZsaXBwZWRCbG9j a3NXcml0aW5nTW9kZSgpKTsKICAgICAKICAgICBpZiAobV9jdWUtPmN1ZVR5cGUoKT09IFRleHRU cmFja0N1ZTo6V2ViVlRUKSB7CiAgICAgICAgIGlmICh0b1ZUVEN1ZShtX2N1ZSktPnNuYXBUb0xp bmVzKCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5o IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuaAppbmRleCA4MjJhM2FkNjgz MDdhN2U2MjU5NDRhOGRiNjQ5NTgzZGMxNDE4MzQ3Li41YzQ2OTRlMjMwNzc5MTc0ODJmNGY5YjY5 NjQyZTA1ZjkzZWMyMmI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyVmlldy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmgKQEAg LTM0Niw4ICszNDYsOCBAQCBjbGFzcyBMYXlvdXRTdGF0ZU1haW50YWluZXIgewogICAgIFdURl9N QUtFX05PTkNPUFlBQkxFKExheW91dFN0YXRlTWFpbnRhaW5lcik7CiBwdWJsaWM6CiAgICAgLy8g Q29uc3RydWN0b3IgdG8gcHVzaCBub3cuCi0gICAgZXhwbGljaXQgTGF5b3V0U3RhdGVNYWludGFp bmVyKFJlbmRlclZpZXcmIHZpZXcsIFJlbmRlckJveCYgcm9vdCwgTGF5b3V0U2l6ZSBvZmZzZXQs IGJvb2wgZGlzYWJsZVN0YXRlID0gZmFsc2UsIExheW91dFVuaXQgcGFnZUhlaWdodCA9IDAsIGJv b2wgcGFnZUhlaWdodENoYW5nZWQgPSBmYWxzZSkKLSAgICAgICAgOiBtX3ZpZXcodmlldykKKyAg ICBleHBsaWNpdCBMYXlvdXRTdGF0ZU1haW50YWluZXIoUmVuZGVyQm94JiByb290LCBMYXlvdXRT aXplIG9mZnNldCwgYm9vbCBkaXNhYmxlU3RhdGUgPSBmYWxzZSwgTGF5b3V0VW5pdCBwYWdlSGVp Z2h0ID0gMCwgYm9vbCBwYWdlSGVpZ2h0Q2hhbmdlZCA9IGZhbHNlKQorICAgICAgICA6IG1fdmll dyhyb290LnZpZXcoKSkKICAgICAgICAgLCBtX2Rpc2FibGVkKGRpc2FibGVTdGF0ZSkKICAgICB7 CiAgICAgICAgIHB1c2gocm9vdCwgb2Zmc2V0LCBwYWdlSGVpZ2h0LCBwYWdlSGVpZ2h0Q2hhbmdl ZCk7Cg==