144357 2015-04-28 14:16:45 -0700 Provide contentsToView() and viewToContents() functions on ScrollView, and use them 2015-04-28 14:52:51 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser bdakin simon.fraser thorton oldest_to_newest 1089736 0 simon.fraser 2015-04-28 14:16:45 -0700 Provide contentsToView() and viewToContents() functions on ScrollView, and use them 1089738 1 251887 simon.fraser 2015-04-28 14:19:10 -0700 Created attachment 251887 Patch 1089740 2 251887 thorton 2015-04-28 14:23:01 -0700 Comment on attachment 251887 Patch Would these help with the "It's a little crazy" comment in ServicesOverlayController? 1089751 3 simon.fraser 2015-04-28 14:52:51 -0700 https://trac.webkit.org/r183510 251887 2015-04-28 14:19:10 -0700 2015-04-28 14:23:01 -0700 Patch bug-144357-20150428141801.patch text/plain 10324 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTgzMzk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWU4OGY2Nzg2YzJkZmY5 Nzc5ZTQ5Nzg1OTlkNTY4ZWUwYjNmMzcxZC4uZmJiNzRjNDg2YjI2MjkyY2E3NjJkZWFmNDllNmY5 NDFkODEyYTg0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDE1LTA0LTI4ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFByb3ZpZGUgY29u dGVudHNUb1ZpZXcoKSBhbmQgdmlld1RvQ29udGVudHMoKSBmdW5jdGlvbnMgb24gU2Nyb2xsVmll dywgYW5kIHVzZSB0aGVtCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNDQzNTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBUb28gbXVjaCBjb2RlIHdhcyBjb25zdWx0aW5nIHRvcENvbnRlbnRJbnNldCgpIGFu ZCBoZWFkZXJIZWlnaHQoKSBkaXJlY3RseS4gUmVwbGFjZQorICAgICAgICB3aXRoIGNhbGxzIHRv IG5ldyBjb250ZW50c1RvVmlldygpIGFuZCB2aWV3VG9Db250ZW50cygpIGZ1bmN0aW9ucywgd2hp Y2ggd3JhcCB0aGUKKyAgICAgICAgZXhpc2l0aW5nIGRvY3VtZW50U2Nyb2xsT2Zmc2V0UmVsYXRp dmVUb1ZpZXdPcmlnaW4oKS4KKyAgICAgICAgCisgICAgICAgIFVzZSB0aGUgbmV3IGZ1bmN0aW9u cyBpbiBGcmFtZVZpZXcgYW5kIFNjcm9sbFZpZXcgY29vcmRpbmF0ZSBtYXBwaW5nIGZ1bmN0aW9u cy4KKyAgICAgICAgCisgICAgICAgIE5vIGJlaGF2aW9yIGNoYW5nZS4KKworICAgICAgICAqIHBh Z2UvRnJhbWVWaWV3LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6Y29udmVydEZy b21SZW5kZXJlclRvQ29udGFpbmluZ1ZpZXcpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3 Ojpjb252ZXJ0RnJvbUNvbnRhaW5pbmdWaWV3VG9SZW5kZXJlcik6CisgICAgICAgICogcGxhdGZv cm0vU2Nyb2xsVmlldy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxWaWV3Ojp2aWV3VG9D b250ZW50cyk6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxWaWV3Ojpjb250ZW50c1RvVmlldyk6 CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxWaWV3Ojpyb290Vmlld1RvQ29udGVudHMpOgorICAg ICAgICAoV2ViQ29yZTo6U2Nyb2xsVmlldzo6Y29udGVudHNUb1Jvb3RWaWV3KToKKyAgICAgICAg KFdlYkNvcmU6OlNjcm9sbFZpZXc6OnJvb3RWaWV3VG9Ub3RhbENvbnRlbnRzKToKKyAgICAgICAg KFdlYkNvcmU6OlNjcm9sbFZpZXc6OndpbmRvd1RvQ29udGVudHMpOgorICAgICAgICAoV2ViQ29y ZTo6U2Nyb2xsVmlldzo6Y29udGVudHNUb1dpbmRvdyk6CisgICAgICAgICogcGxhdGZvcm0vU2Ny b2xsVmlldy5oOgorCiAyMDE1LTA0LTI3ICBYYWJpZXIgUm9kcmlndWV6IENhbHZhciAgPGNhbHZh cmlzQGlnYWxpYS5jb20+IGFuZCBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uLmZhYmxldEBjcmYuY2Fu b24uZnI+CiAKICAgICAgICAgW1N0cmVhbXMgQVBJXSBSZWFkYWJsZVN0cmVhbSBjb25zdHJ1Y3Rv ciBzdGFydCBmdW5jdGlvbiBzaG91bGQgYmUgYWJsZSB0byBjbG9zZSB0aGUgc3RyZWFtCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9wYWdlL0ZyYW1lVmlldy5jcHAKaW5kZXggY2Q5ZTY0MWZlMmQ5ZmI5NmNmZmVkZGJkMjIyMmIy NmQ4ZjBlNGJjMi4uOGU0MmE2MGFjM2YwNzRlNDY5ZWZhNzdjZDZhYjEyOGFlY2YxZjEzMiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcApAQCAtNDE5OSw5ICs0MTk5LDggQEAgSW50UmVjdCBG cmFtZVZpZXc6OmNvbnZlcnRGcm9tUmVuZGVyZXJUb0NvbnRhaW5pbmdWaWV3KGNvbnN0IFJlbmRl ckVsZW1lbnQqIHJlbmQKIHsKICAgICBJbnRSZWN0IHJlY3QgPSBzbmFwcGVkSW50UmVjdChlbmNs b3NpbmdMYXlvdXRSZWN0KHJlbmRlcmVyLT5sb2NhbFRvQWJzb2x1dGVRdWFkKEZsb2F0UmVjdChy ZW5kZXJlclJlY3QpKS5ib3VuZGluZ0JveCgpKSk7CiAKLSAgICAvLyBDb252ZXJ0IGZyb20gcGFn ZSAoImFic29sdXRlIikgdG8gRnJhbWVWaWV3IGNvb3JkaW5hdGVzLgogICAgIGlmICghZGVsZWdh dGVzU2Nyb2xsaW5nKCkpCi0gICAgICAgIHJlY3QubW92ZUJ5KC1zY3JvbGxQb3NpdGlvbigpICsg SW50UG9pbnQoMCwgaGVhZGVySGVpZ2h0KCkgKyB0b3BDb250ZW50SW5zZXQoVG9wQ29udGVudElu c2V0VHlwZTo6V2ViQ29yZU9yUGxhdGZvcm1Db250ZW50SW5zZXQpKSk7CisgICAgICAgIHJlY3Qg PSBjb250ZW50c1RvVmlldyhyZWN0KTsKIAogICAgIHJldHVybiByZWN0OwogfQpAQCAtNDIxMiw3 ICs0MjExLDcgQEAgSW50UmVjdCBGcmFtZVZpZXc6OmNvbnZlcnRGcm9tQ29udGFpbmluZ1ZpZXdU b1JlbmRlcmVyKGNvbnN0IFJlbmRlckVsZW1lbnQqIHJlbmQKICAgICAKICAgICAvLyBDb252ZXJ0 IGZyb20gRnJhbWVWaWV3IGNvb3JkcyBpbnRvIHBhZ2UgKCJhYnNvbHV0ZSIpIGNvb3JkaW5hdGVz LgogICAgIGlmICghZGVsZWdhdGVzU2Nyb2xsaW5nKCkpCi0gICAgICAgIHJlY3QubW92ZUJ5KGRv Y3VtZW50U2Nyb2xsUG9zaXRpb25SZWxhdGl2ZVRvVmlld09yaWdpbigpKTsKKyAgICAgICAgcmVj dCA9IHZpZXdUb0NvbnRlbnRzKHJlY3QpOwogCiAgICAgLy8gRklYTUU6IHdlIGRvbid0IGhhdmUg YSB3YXkgdG8gbWFwIGFuIGFic29sdXRlIHJlY3QgZG93biB0byBhIGxvY2FsIHF1YWQsIHNvIGp1 c3QKICAgICAvLyBtb3ZlIHRoZSByZWN0IGZvciBub3cuCkBAIC00MjI2LDcgKzQyMjUsOCBAQCBJ bnRQb2ludCBGcmFtZVZpZXc6OmNvbnZlcnRGcm9tUmVuZGVyZXJUb0NvbnRhaW5pbmdWaWV3KGNv bnN0IFJlbmRlckVsZW1lbnQqIHJlbgogCiAgICAgLy8gQ29udmVydCBmcm9tIHBhZ2UgKCJhYnNv bHV0ZSIpIHRvIEZyYW1lVmlldyBjb29yZGluYXRlcy4KICAgICBpZiAoIWRlbGVnYXRlc1Njcm9s bGluZygpKQotICAgICAgICBwb2ludC5tb3ZlQnkoLXNjcm9sbFBvc2l0aW9uKCkgKyBJbnRQb2lu dCgwLCBoZWFkZXJIZWlnaHQoKSArIHRvcENvbnRlbnRJbnNldChUb3BDb250ZW50SW5zZXRUeXBl OjpXZWJDb3JlT3JQbGF0Zm9ybUNvbnRlbnRJbnNldCkpKTsKKyAgICAgICAgcG9pbnQgPSBjb250 ZW50c1RvVmlldyhwb2ludCk7CisKICAgICByZXR1cm4gcG9pbnQ7CiB9CiAKQEAgLTQyMzYsNyAr NDIzNiw3IEBAIEludFBvaW50IEZyYW1lVmlldzo6Y29udmVydEZyb21Db250YWluaW5nVmlld1Rv UmVuZGVyZXIoY29uc3QgUmVuZGVyRWxlbWVudCogcmVuCiAKICAgICAvLyBDb252ZXJ0IGZyb20g RnJhbWVWaWV3IGNvb3JkcyBpbnRvIHBhZ2UgKCJhYnNvbHV0ZSIpIGNvb3JkaW5hdGVzLgogICAg IGlmICghZGVsZWdhdGVzU2Nyb2xsaW5nKCkpCi0gICAgICAgIHBvaW50ID0gcG9pbnQgKyBkb2N1 bWVudFNjcm9sbFBvc2l0aW9uUmVsYXRpdmVUb1ZpZXdPcmlnaW4oKTsKKyAgICAgICAgcG9pbnQg PSB2aWV3VG9Db250ZW50cyhwb2ludCk7CiAKICAgICByZXR1cm4gcm91bmRlZEludFBvaW50KHJl bmRlcmVyLT5hYnNvbHV0ZVRvTG9jYWwocG9pbnQsIFVzZVRyYW5zZm9ybXMpKTsKIH0KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuY3BwIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5jcHAKaW5kZXggM2M4MjY3YTQzNTVmZDdkZWIxNzJi NzE4NWVkY2Y1OTA4Yjc1ZjhhOC4uY2QwZTEzYjlhMmEwYjBiNDE4ZTAyNWRkOGYwNzAxZjI2YzE1 MTFjMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5jcHAKQEAgLTg2NCwxMyAr ODY0LDM0IEBAIHZvaWQgU2Nyb2xsVmlldzo6c2Nyb2xsQ29udGVudHNTbG93UGF0aChjb25zdCBJ bnRSZWN0JiB1cGRhdGVSZWN0KQogICAgIGhvc3RXaW5kb3coKS0+aW52YWxpZGF0ZUNvbnRlbnRz Rm9yU2xvd1Njcm9sbCh1cGRhdGVSZWN0KTsKIH0KIAorSW50UG9pbnQgU2Nyb2xsVmlldzo6dmll d1RvQ29udGVudHMoY29uc3QgSW50UG9pbnQmIHBvaW50KSBjb25zdAoreworICAgIHJldHVybiBw b2ludCArIGRvY3VtZW50U2Nyb2xsT2Zmc2V0UmVsYXRpdmVUb1ZpZXdPcmlnaW4oKTsKK30KKwor SW50UG9pbnQgU2Nyb2xsVmlldzo6Y29udGVudHNUb1ZpZXcoY29uc3QgSW50UG9pbnQmIHBvaW50 KSBjb25zdAoreworICAgIHJldHVybiBwb2ludCAtIGRvY3VtZW50U2Nyb2xsT2Zmc2V0UmVsYXRp dmVUb1ZpZXdPcmlnaW4oKTsKK30KKworSW50UmVjdCBTY3JvbGxWaWV3Ojp2aWV3VG9Db250ZW50 cyhJbnRSZWN0IHJlY3QpIGNvbnN0Cit7CisgICAgcmVjdC5tb3ZlKGRvY3VtZW50U2Nyb2xsT2Zm c2V0UmVsYXRpdmVUb1ZpZXdPcmlnaW4oKSk7CisgICAgcmV0dXJuIHJlY3Q7Cit9CisKK0ludFJl Y3QgU2Nyb2xsVmlldzo6Y29udGVudHNUb1ZpZXcoSW50UmVjdCByZWN0KSBjb25zdAoreworICAg IHJlY3QubW92ZSgtZG9jdW1lbnRTY3JvbGxPZmZzZXRSZWxhdGl2ZVRvVmlld09yaWdpbigpKTsK KyAgICByZXR1cm4gcmVjdDsKK30KKwogSW50UG9pbnQgU2Nyb2xsVmlldzo6cm9vdFZpZXdUb0Nv bnRlbnRzKGNvbnN0IEludFBvaW50JiByb290Vmlld1BvaW50KSBjb25zdAogewogICAgIGlmIChk ZWxlZ2F0ZXNTY3JvbGxpbmcoKSkKICAgICAgICAgcmV0dXJuIGNvbnZlcnRGcm9tUm9vdFZpZXco cm9vdFZpZXdQb2ludCk7CiAKLSAgICBJbnRQb2ludCB2aWV3UG9pbnQgPSBjb252ZXJ0RnJvbVJv b3RWaWV3KHJvb3RWaWV3UG9pbnQpOwotICAgIHJldHVybiB2aWV3UG9pbnQgKyBkb2N1bWVudFNj cm9sbE9mZnNldFJlbGF0aXZlVG9WaWV3T3JpZ2luKCk7CisgICAgcmV0dXJuIHZpZXdUb0NvbnRl bnRzKGNvbnZlcnRGcm9tUm9vdFZpZXcocm9vdFZpZXdQb2ludCkpOwogfQogCiBJbnRQb2ludCBT Y3JvbGxWaWV3Ojpjb250ZW50c1RvUm9vdFZpZXcoY29uc3QgSW50UG9pbnQmIGNvbnRlbnRzUG9p bnQpIGNvbnN0CkBAIC04NzgsOCArODk5LDcgQEAgSW50UG9pbnQgU2Nyb2xsVmlldzo6Y29udGVu dHNUb1Jvb3RWaWV3KGNvbnN0IEludFBvaW50JiBjb250ZW50c1BvaW50KSBjb25zdAogICAgIGlm IChkZWxlZ2F0ZXNTY3JvbGxpbmcoKSkKICAgICAgICAgcmV0dXJuIGNvbnZlcnRUb1Jvb3RWaWV3 KGNvbnRlbnRzUG9pbnQpOwogCi0gICAgSW50UG9pbnQgdmlld1BvaW50ID0gY29udGVudHNQb2lu dCArIEludFNpemUoMCwgaGVhZGVySGVpZ2h0KCkgKyB0b3BDb250ZW50SW5zZXQoVG9wQ29udGVu dEluc2V0VHlwZTo6V2ViQ29yZU9yUGxhdGZvcm1Db250ZW50SW5zZXQpKSAtIHNjcm9sbE9mZnNl dCgpOwotICAgIHJldHVybiBjb252ZXJ0VG9Sb290Vmlldyh2aWV3UG9pbnQpOyAgCisgICAgcmV0 dXJuIGNvbnZlcnRUb1Jvb3RWaWV3KGNvbnRlbnRzVG9WaWV3KGNvbnRlbnRzUG9pbnQpKTsKIH0K IAogSW50UmVjdCBTY3JvbGxWaWV3Ojpyb290Vmlld1RvQ29udGVudHMoY29uc3QgSW50UmVjdCYg cm9vdFZpZXdSZWN0KSBjb25zdApAQCAtODg3LDI4ICs5MDcsMjUgQEAgSW50UmVjdCBTY3JvbGxW aWV3Ojpyb290Vmlld1RvQ29udGVudHMoY29uc3QgSW50UmVjdCYgcm9vdFZpZXdSZWN0KSBjb25z dAogICAgIGlmIChkZWxlZ2F0ZXNTY3JvbGxpbmcoKSkKICAgICAgICAgcmV0dXJuIGNvbnZlcnRG cm9tUm9vdFZpZXcocm9vdFZpZXdSZWN0KTsKIAotICAgIEludFJlY3Qgdmlld1JlY3QgPSBjb252 ZXJ0RnJvbVJvb3RWaWV3KHJvb3RWaWV3UmVjdCk7Ci0gICAgdmlld1JlY3QubW92ZShkb2N1bWVu dFNjcm9sbE9mZnNldFJlbGF0aXZlVG9WaWV3T3JpZ2luKCkpOwotICAgIHJldHVybiB2aWV3UmVj dDsKKyAgICByZXR1cm4gdmlld1RvQ29udGVudHMoY29udmVydEZyb21Sb290Vmlldyhyb290Vmll d1JlY3QpKTsKIH0KIAotSW50UmVjdCBTY3JvbGxWaWV3Ojpjb250ZW50c1RvUm9vdFZpZXcoY29u c3QgSW50UmVjdCYgY29udGVudHNSZWN0KSBjb25zdAorSW50UG9pbnQgU2Nyb2xsVmlldzo6cm9v dFZpZXdUb1RvdGFsQ29udGVudHMoY29uc3QgSW50UG9pbnQmIHJvb3RWaWV3UG9pbnQpIGNvbnN0 CiB7CiAgICAgaWYgKGRlbGVnYXRlc1Njcm9sbGluZygpKQotICAgICAgICByZXR1cm4gY29udmVy dFRvUm9vdFZpZXcoY29udGVudHNSZWN0KTsKKyAgICAgICAgcmV0dXJuIGNvbnZlcnRGcm9tUm9v dFZpZXcocm9vdFZpZXdQb2ludCk7CiAKLSAgICBJbnRSZWN0IHZpZXdSZWN0ID0gY29udGVudHNS ZWN0OwotICAgIHZpZXdSZWN0Lm1vdmUoLXNjcm9sbE9mZnNldCgpICsgSW50U2l6ZSgwLCBoZWFk ZXJIZWlnaHQoKSArIHRvcENvbnRlbnRJbnNldChUb3BDb250ZW50SW5zZXRUeXBlOjpXZWJDb3Jl T3JQbGF0Zm9ybUNvbnRlbnRJbnNldCkpKTsKLSAgICByZXR1cm4gY29udmVydFRvUm9vdFZpZXco dmlld1JlY3QpOworICAgIEludFBvaW50IHZpZXdQb2ludCA9IGNvbnZlcnRGcm9tUm9vdFZpZXco cm9vdFZpZXdQb2ludCk7CisgICAgLy8gTGlrZSByb290Vmlld1RvQ29udGVudHMoKSwgYnV0IGln bm9yZXMgaGVhZGVySGVpZ2h0LgorICAgIHJldHVybiB2aWV3UG9pbnQgKyBzY3JvbGxPZmZzZXQo KSAtIEludFNpemUoMCwgdG9wQ29udGVudEluc2V0KFRvcENvbnRlbnRJbnNldFR5cGU6OldlYkNv cmVPclBsYXRmb3JtQ29udGVudEluc2V0KSk7CiB9CiAKLUludFBvaW50IFNjcm9sbFZpZXc6OnJv b3RWaWV3VG9Ub3RhbENvbnRlbnRzKGNvbnN0IEludFBvaW50JiByb290Vmlld1BvaW50KSBjb25z dAorSW50UmVjdCBTY3JvbGxWaWV3Ojpjb250ZW50c1RvUm9vdFZpZXcoY29uc3QgSW50UmVjdCYg Y29udGVudHNSZWN0KSBjb25zdAogewogICAgIGlmIChkZWxlZ2F0ZXNTY3JvbGxpbmcoKSkKLSAg ICAgICAgcmV0dXJuIGNvbnZlcnRGcm9tUm9vdFZpZXcocm9vdFZpZXdQb2ludCk7CisgICAgICAg IHJldHVybiBjb252ZXJ0VG9Sb290Vmlldyhjb250ZW50c1JlY3QpOwogCi0gICAgSW50UG9pbnQg dmlld1BvaW50ID0gY29udmVydEZyb21Sb290Vmlldyhyb290Vmlld1BvaW50KTsKLSAgICByZXR1 cm4gdmlld1BvaW50ICsgc2Nyb2xsT2Zmc2V0KCkgLSBJbnRTaXplKDAsIHRvcENvbnRlbnRJbnNl dChUb3BDb250ZW50SW5zZXRUeXBlOjpXZWJDb3JlT3JQbGF0Zm9ybUNvbnRlbnRJbnNldCkpOwor ICAgIHJldHVybiBjb252ZXJ0VG9Sb290Vmlldyhjb250ZW50c1RvVmlldyhjb250ZW50c1JlY3Qp KTsKIH0KIAogSW50UG9pbnQgU2Nyb2xsVmlldzo6d2luZG93VG9Db250ZW50cyhjb25zdCBJbnRQ b2ludCYgd2luZG93UG9pbnQpIGNvbnN0CkBAIC05MTYsOCArOTMzLDcgQEAgSW50UG9pbnQgU2Ny b2xsVmlldzo6d2luZG93VG9Db250ZW50cyhjb25zdCBJbnRQb2ludCYgd2luZG93UG9pbnQpIGNv bnN0CiAgICAgaWYgKGRlbGVnYXRlc1Njcm9sbGluZygpKQogICAgICAgICByZXR1cm4gY29udmVy dEZyb21Db250YWluaW5nV2luZG93KHdpbmRvd1BvaW50KTsKIAotICAgIEludFBvaW50IHZpZXdQ b2ludCA9IGNvbnZlcnRGcm9tQ29udGFpbmluZ1dpbmRvdyh3aW5kb3dQb2ludCk7Ci0gICAgcmV0 dXJuIHZpZXdQb2ludCArIGRvY3VtZW50U2Nyb2xsT2Zmc2V0UmVsYXRpdmVUb1ZpZXdPcmlnaW4o KTsKKyAgICByZXR1cm4gdmlld1RvQ29udGVudHMoY29udmVydEZyb21Db250YWluaW5nV2luZG93 KHdpbmRvd1BvaW50KSk7CiB9CiAKIEludFBvaW50IFNjcm9sbFZpZXc6OmNvbnRlbnRzVG9XaW5k b3coY29uc3QgSW50UG9pbnQmIGNvbnRlbnRzUG9pbnQpIGNvbnN0CkBAIC05MjUsOCArOTQxLDcg QEAgSW50UG9pbnQgU2Nyb2xsVmlldzo6Y29udGVudHNUb1dpbmRvdyhjb25zdCBJbnRQb2ludCYg Y29udGVudHNQb2ludCkgY29uc3QKICAgICBpZiAoZGVsZWdhdGVzU2Nyb2xsaW5nKCkpCiAgICAg ICAgIHJldHVybiBjb252ZXJ0VG9Db250YWluaW5nV2luZG93KGNvbnRlbnRzUG9pbnQpOwogCi0g ICAgSW50UG9pbnQgdmlld1BvaW50ID0gY29udGVudHNQb2ludCArIEludFNpemUoMCwgaGVhZGVy SGVpZ2h0KCkgKyB0b3BDb250ZW50SW5zZXQoVG9wQ29udGVudEluc2V0VHlwZTo6V2ViQ29yZU9y UGxhdGZvcm1Db250ZW50SW5zZXQpKSAtIHNjcm9sbE9mZnNldCgpOwotICAgIHJldHVybiBjb252 ZXJ0VG9Db250YWluaW5nV2luZG93KHZpZXdQb2ludCk7ICAKKyAgICByZXR1cm4gY29udmVydFRv Q29udGFpbmluZ1dpbmRvdyhjb250ZW50c1RvVmlldyhjb250ZW50c1BvaW50KSk7CiB9CiAKIElu dFJlY3QgU2Nyb2xsVmlldzo6d2luZG93VG9Db250ZW50cyhjb25zdCBJbnRSZWN0JiB3aW5kb3dS ZWN0KSBjb25zdApAQCAtOTM0LDkgKzk0OSw3IEBAIEludFJlY3QgU2Nyb2xsVmlldzo6d2luZG93 VG9Db250ZW50cyhjb25zdCBJbnRSZWN0JiB3aW5kb3dSZWN0KSBjb25zdAogICAgIGlmIChkZWxl Z2F0ZXNTY3JvbGxpbmcoKSkKICAgICAgICAgcmV0dXJuIGNvbnZlcnRGcm9tQ29udGFpbmluZ1dp bmRvdyh3aW5kb3dSZWN0KTsKIAotICAgIEludFJlY3Qgdmlld1JlY3QgPSBjb252ZXJ0RnJvbUNv bnRhaW5pbmdXaW5kb3cod2luZG93UmVjdCk7Ci0gICAgdmlld1JlY3QubW92ZShkb2N1bWVudFNj cm9sbE9mZnNldFJlbGF0aXZlVG9WaWV3T3JpZ2luKCkpOwotICAgIHJldHVybiB2aWV3UmVjdDsK KyAgICByZXR1cm4gdmlld1RvQ29udGVudHMoY29udmVydEZyb21Db250YWluaW5nV2luZG93KHdp bmRvd1JlY3QpKTsKIH0KIAogSW50UmVjdCBTY3JvbGxWaWV3Ojpjb250ZW50c1RvV2luZG93KGNv bnN0IEludFJlY3QmIGNvbnRlbnRzUmVjdCkgY29uc3QKQEAgLTk0NCw5ICs5NTcsNyBAQCBJbnRS ZWN0IFNjcm9sbFZpZXc6OmNvbnRlbnRzVG9XaW5kb3coY29uc3QgSW50UmVjdCYgY29udGVudHNS ZWN0KSBjb25zdAogICAgIGlmIChkZWxlZ2F0ZXNTY3JvbGxpbmcoKSkKICAgICAgICAgcmV0dXJu IGNvbnZlcnRUb0NvbnRhaW5pbmdXaW5kb3coY29udGVudHNSZWN0KTsKIAotICAgIEludFJlY3Qg dmlld1JlY3QgPSBjb250ZW50c1JlY3Q7Ci0gICAgdmlld1JlY3QubW92ZSgtc2Nyb2xsT2Zmc2V0 KCkgKyBJbnRTaXplKDAsIGhlYWRlckhlaWdodCgpICsgdG9wQ29udGVudEluc2V0KFRvcENvbnRl bnRJbnNldFR5cGU6OldlYkNvcmVPclBsYXRmb3JtQ29udGVudEluc2V0KSkpOwotICAgIHJldHVy biBjb252ZXJ0VG9Db250YWluaW5nV2luZG93KHZpZXdSZWN0KTsKKyAgICByZXR1cm4gY29udmVy dFRvQ29udGFpbmluZ1dpbmRvdyhjb250ZW50c1RvVmlldyhjb250ZW50c1JlY3QpKTsKIH0KIAog SW50UmVjdCBTY3JvbGxWaWV3Ojpjb250ZW50c1RvU2NyZWVuKGNvbnN0IEludFJlY3QmIHJlY3Qp IGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3Lmgg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmgKaW5kZXggYjdlODk5ZDU4MjM4 OTdmZjdkMjE4ODVjN2RmZDQ2MDMwMDE4ZGI1ZS4uMjhlODY3NjM1ZmZlMzhlNDRhNWE5ZDE3MTMy ODY5NGE3Y2FmYmNmYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xs Vmlldy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuaApAQCAtMjky LDYgKzI5MiwxMiBAQCBwdWJsaWM6CiAgICAgSW50UmVjdCByb290Vmlld1RvQ29udGVudHMoY29u c3QgSW50UmVjdCYpIGNvbnN0OwogICAgIFdFQkNPUkVfRVhQT1JUIEludFJlY3QgY29udGVudHNU b1Jvb3RWaWV3KGNvbnN0IEludFJlY3QmKSBjb25zdDsKIAorICAgIEludFBvaW50IHZpZXdUb0Nv bnRlbnRzKGNvbnN0IEludFBvaW50JikgY29uc3Q7CisgICAgSW50UG9pbnQgY29udGVudHNUb1Zp ZXcoY29uc3QgSW50UG9pbnQmKSBjb25zdDsKKworICAgIEludFJlY3Qgdmlld1RvQ29udGVudHMo SW50UmVjdCkgY29uc3Q7CisgICAgSW50UmVjdCBjb250ZW50c1RvVmlldyhJbnRSZWN0KSBjb25z dDsKKwogICAgIFdFQkNPUkVfRVhQT1JUIEludFBvaW50IHJvb3RWaWV3VG9Ub3RhbENvbnRlbnRz KGNvbnN0IEludFBvaW50JikgY29uc3Q7CiAKICAgICAvLyBFdmVudCBjb29yZGluYXRlcyBhcmUg YXNzdW1lZCB0byBiZSBpbiB0aGUgY29vcmRpbmF0ZSBzcGFjZSBvZiBhIHdpbmRvdyB0aGF0IGNv bnRhaW5zCg==