150191 2015-10-15 15:07:03 -0700 Store the context menu data and user data in the WebContextMenuProxy object 2015-10-15 16:18:03 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1133615 0 andersca 2015-10-15 15:07:03 -0700 Store the context menu data and user data in the WebContextMenuProxy object 1133618 1 263196 andersca 2015-10-15 15:11:15 -0700 Created attachment 263196 Patch 1133621 2 andersca 2015-10-15 15:16:20 -0700 Committed r191141: <http://trac.webkit.org/changeset/191141> 1133662 3 263196 darin 2015-10-15 16:18:03 -0700 Comment on attachment 263196 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=263196&action=review > Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm:156 > + : WebContextMenuProxy(context, userData) > + > + , m_webView(webView) What’s with this blank line? 263196 2015-10-15 15:11:15 -0700 2015-10-15 15:11:48 -0700 Patch bug-150191-20151015151037.patch text/plain 9942 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTkxMTQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggODIwMTA1YTIwYTNiN2Q3 MjQ2ZGMyZDcyMmE3MDkxYWIyZWNmMzdkYS4uNWQ2OTc4YWQzYjMzZmExN2VjN2FjMmU0NmI2MWYx ZDkzZDI2Yzk2NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE1LTEwLTE1ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgU3RvcmUgdGhlIGNv bnRleHQgbWVudSBkYXRhIGFuZCB1c2VyIGRhdGEgaW4gdGhlIFdlYkNvbnRleHRNZW51UHJveHkg b2JqZWN0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x NTAxOTEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IFVJUHJvY2Vzcy9QYWdlQ2xpZW50Lmg6CisgICAgICAgICogVUlQcm9jZXNzL1dlYkNvbnRleHRN ZW51UHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJDb250ZXh0TWVudVByb3h5OjpXZWJD b250ZXh0TWVudVByb3h5KToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViQ29udGV4dE1lbnVQcm94 eS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2Vi S2l0OjpXZWJQYWdlUHJveHk6OmludGVybmFsU2hvd0NvbnRleHRNZW51KToKKyAgICAgICAgKiBV SVByb2Nlc3MvaW9zL1BhZ2VDbGllbnRJbXBsSU9TLmg6CisgICAgICAgICogVUlQcm9jZXNzL2lv cy9QYWdlQ2xpZW50SW1wbElPUy5tbToKKyAgICAgICAgKFdlYktpdDo6UGFnZUNsaWVudEltcGw6 OmNyZWF0ZUNvbnRleHRNZW51UHJveHkpOgorICAgICAgICAqIFVJUHJvY2Vzcy9tYWMvUGFnZUNs aWVudEltcGwuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1BhZ2VDbGllbnRJbXBsLm1tOgor ICAgICAgICAoV2ViS2l0OjpQYWdlQ2xpZW50SW1wbDo6Y3JlYXRlQ29udGV4dE1lbnVQcm94eSk6 CisgICAgICAgICogVUlQcm9jZXNzL21hYy9XZWJDb250ZXh0TWVudVByb3h5TWFjLmg6CisgICAg ICAgIChXZWJLaXQ6OldlYkNvbnRleHRNZW51UHJveHlNYWM6OmNyZWF0ZSk6CisgICAgICAgICog VUlQcm9jZXNzL21hYy9XZWJDb250ZXh0TWVudVByb3h5TWFjLm1tOgorICAgICAgICAoV2ViS2l0 OjpXZWJDb250ZXh0TWVudVByb3h5TWFjOjpXZWJDb250ZXh0TWVudVByb3h5TWFjKToKKwogMjAx NS0xMC0xNSAgRGFuIEJlcm5zdGVpbiAgPG1pdHpAYXBwbGUuY29tPgogCiAgICAgICAgIFtDb2Nv YV0gU3RvcCB1c2luZyBXS1NldE5TVVJMQ29ubmVjdGlvbkRlZmVyc0NhbGxiYWNrcwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BhZ2VDbGllbnQuaCBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9QYWdlQ2xpZW50LmgKaW5kZXggZGYxY2RjYjhhMDNlZDJlOTAxYWY2ZDMx NTE0NmYyMmUyNzVhMzkzYy4uNTg3ODdlY2E3MWFmOGFiMWJhMDVmNTZjODgxODhjNTJlM2QyZDRk YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BhZ2VDbGllbnQuaAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZUNsaWVudC5oCkBAIC0yMjAsNyArMjIwLDcg QEAgcHVibGljOgogI2VuZGlmCiAKICAgICB2aXJ0dWFsIFJlZlB0cjxXZWJQb3B1cE1lbnVQcm94 eT4gY3JlYXRlUG9wdXBNZW51UHJveHkoV2ViUGFnZVByb3h5JikgPSAwOwotICAgIHZpcnR1YWwg UmVmUHRyPFdlYkNvbnRleHRNZW51UHJveHk+IGNyZWF0ZUNvbnRleHRNZW51UHJveHkoV2ViUGFn ZVByb3h5JikgPSAwOworICAgIHZpcnR1YWwgUmVmUHRyPFdlYkNvbnRleHRNZW51UHJveHk+IGNy ZWF0ZUNvbnRleHRNZW51UHJveHkoV2ViUGFnZVByb3h5JiwgY29uc3QgQ29udGV4dE1lbnVDb250 ZXh0RGF0YSYsIGNvbnN0IFVzZXJEYXRhJikgPSAwOwogCiAjaWYgRU5BQkxFKElOUFVUX1RZUEVf Q09MT1IpCiAgICAgdmlydHVhbCBSZWZQdHI8V2ViQ29sb3JQaWNrZXI+IGNyZWF0ZUNvbG9yUGlj a2VyKFdlYlBhZ2VQcm94eSosIGNvbnN0IFdlYkNvcmU6OkNvbG9yJiBpbml0aWFsQ29sb3IsIGNv bnN0IFdlYkNvcmU6OkludFJlY3QmKSA9IDA7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvV2ViQ29udGV4dE1lbnVQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViQ29udGV4dE1lbnVQcm94eS5jcHAKaW5kZXggNGM0Y2IyNmMwM2JjZGM2ZWJjOTk2Yzk3 NzZlMTVkYzc3ZjQxM2NkMC4uYmZmYTNlYmJmYjkzZmIwMmEyNGUxNzY2NzZkN2QwZjkxYTQ0OTEy OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHRNZW51UHJv eHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0TWVudVByb3h5 LmNwcApAQCAtMjgsNyArMjgsOSBAQAogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAotV2ViQ29udGV4 dE1lbnVQcm94eTo6V2ViQ29udGV4dE1lbnVQcm94eSgpCitXZWJDb250ZXh0TWVudVByb3h5OjpX ZWJDb250ZXh0TWVudVByb3h5KGNvbnN0IENvbnRleHRNZW51Q29udGV4dERhdGEmIGNvbnRleHQs IGNvbnN0IFVzZXJEYXRhJiB1c2VyRGF0YSkKKyAgICA6IG1fY29udGV4dChjb250ZXh0KQorICAg ICwgbV91c2VyRGF0YSh1c2VyRGF0YSkKIHsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1dlYkNvbnRleHRNZW51UHJveHkuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJDb250ZXh0TWVudVByb3h5LmgKaW5kZXggYTEyZDU0MDFkNmM2OGY3ODIyNDhkMDFj MWQwM2EyOTQzMDU1ZGRmZS4uOGEyNGNhMjVmMjUzYzc4MzQ4MjEyYWMzZGRhODU1NTkzMjVkNDA5 MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHRNZW51UHJv eHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4dE1lbnVQcm94eS5o CkBAIC0yNiwxMyArMjYsOSBAQAogI2lmbmRlZiBXZWJDb250ZXh0TWVudVByb3h5X2gKICNkZWZp bmUgV2ViQ29udGV4dE1lbnVQcm94eV9oCiAKLSNpbmNsdWRlIDx3dGYvUGFzc1JlZlB0ci5oPgor I2luY2x1ZGUgIkNvbnRleHRNZW51Q29udGV4dERhdGEuaCIKKyNpbmNsdWRlICJVc2VyRGF0YS5o IgogI2luY2x1ZGUgPHd0Zi9SZWZDb3VudGVkLmg+Ci0jaW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgot Ci1uYW1lc3BhY2UgV2ViQ29yZSB7Ci0gICAgY2xhc3MgSW50UG9pbnQ7Ci19CiAKIG5hbWVzcGFj ZSBXZWJLaXQgewogCkBAIC00OCw3ICs0NCwxMCBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lk IGNhbmNlbFRyYWNraW5nKCkgeyB9CiAKIHByb3RlY3RlZDoKLSAgICBXZWJDb250ZXh0TWVudVBy b3h5KCk7CisgICAgV2ViQ29udGV4dE1lbnVQcm94eShjb25zdCBDb250ZXh0TWVudUNvbnRleHRE YXRhJiwgY29uc3QgVXNlckRhdGEmKTsKKworICAgIGNvbnN0IENvbnRleHRNZW51Q29udGV4dERh dGEgbV9jb250ZXh0OworICAgIGNvbnN0IFVzZXJEYXRhIG1fdXNlckRhdGE7CiB9OwogCiB9IC8v IG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5j cHAKaW5kZXggOWIxZjMwNDMyMGYzNmRlNDYwYTliMmIwMjU5OTk5MTFmZmZlZjBjOS4uYThlYzUz OTY3MWEwNWNlMzRkMWViMjVhNjZkZmMzODA5YjAxNWNhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKQEAgLTQyMDIsNyArNDIwMiw3IEBAIHZvaWQgV2ViUGFn ZVByb3h5OjppbnRlcm5hbFNob3dDb250ZXh0TWVudShjb25zdCBDb250ZXh0TWVudUNvbnRleHRE YXRhJiBjb250ZXh0CiAgICAgICAgIG1fYWN0aXZlQ29udGV4dE1lbnUgPSBudWxscHRyOwogICAg IH0KIAotICAgIG1fYWN0aXZlQ29udGV4dE1lbnUgPSBtX3BhZ2VDbGllbnQuY3JlYXRlQ29udGV4 dE1lbnVQcm94eSgqdGhpcyk7CisgICAgbV9hY3RpdmVDb250ZXh0TWVudSA9IG1fcGFnZUNsaWVu dC5jcmVhdGVDb250ZXh0TWVudVByb3h5KCp0aGlzLCBjb250ZXh0TWVudUNvbnRleHREYXRhLCB1 c2VyRGF0YSk7CiAgICAgaWYgKCFtX2FjdGl2ZUNvbnRleHRNZW51KQogICAgICAgICByZXR1cm47 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvUGFnZUNsaWVudElt cGxJT1MuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvUGFnZUNsaWVudEltcGxJT1Mu aAppbmRleCAwMzVkOWYwNTFjODNjNTMwNWYzOWRhZGQ3YjlmMzAwZTRkMDUzMzJlLi41MWUxMTZk YTcxZjNlYWVjYzdkNzk5ZmNmMDAyMmMzZjk4OGI4ODFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvaW9zL1BhZ2VDbGllbnRJbXBsSU9TLmgKKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL2lvcy9QYWdlQ2xpZW50SW1wbElPUy5oCkBAIC05Niw3ICs5Niw3IEBAIHBy aXZhdGU6CiAgICAgdmlydHVhbCB2b2lkIGRvbmVXaXRoVG91Y2hFdmVudChjb25zdCBOYXRpdmVX ZWJUb3VjaEV2ZW50JiwgYm9vbCB3YXNFdmVudEhhbmRsZWQpIG92ZXJyaWRlOwogI2VuZGlmCiAg ICAgdmlydHVhbCBSZWZQdHI8V2ViUG9wdXBNZW51UHJveHk+IGNyZWF0ZVBvcHVwTWVudVByb3h5 KFdlYlBhZ2VQcm94eSYpIG92ZXJyaWRlOwotICAgIHZpcnR1YWwgUmVmUHRyPFdlYkNvbnRleHRN ZW51UHJveHk+IGNyZWF0ZUNvbnRleHRNZW51UHJveHkoV2ViUGFnZVByb3h5Kikgb3ZlcnJpZGU7 CisgICAgdmlydHVhbCBSZWZQdHI8V2ViQ29udGV4dE1lbnVQcm94eT4gY3JlYXRlQ29udGV4dE1l bnVQcm94eShXZWJQYWdlUHJveHkmLCBjb25zdCBDb250ZXh0TWVudUNvbnRleHREYXRhJiwgY29u c3QgVXNlckRhdGEmKSBvdmVycmlkZTsKICAgICB2aXJ0dWFsIHZvaWQgc2V0VGV4dEluZGljYXRv cihSZWY8V2ViQ29yZTo6VGV4dEluZGljYXRvcj4sIFdlYkNvcmU6OlRleHRJbmRpY2F0b3JXaW5k b3dMaWZldGltZSkgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCB2b2lkIGNsZWFyVGV4dEluZGljYXRv cihXZWJDb3JlOjpUZXh0SW5kaWNhdG9yV2luZG93RGlzbWlzc2FsQW5pbWF0aW9uKSBvdmVycmlk ZTsKICAgICB2aXJ0dWFsIHZvaWQgc2V0VGV4dEluZGljYXRvckFuaW1hdGlvblByb2dyZXNzKGZs b2F0KSBvdmVycmlkZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3Mv UGFnZUNsaWVudEltcGxJT1MubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1BhZ2VD bGllbnRJbXBsSU9TLm1tCmluZGV4IDZjMjhlZDBiNGE4ZDNjMmJjOGU0ZWE2N2FjYjNkN2UyODU1 ZTlhODMuLmM0YmUwODJkNGUwMzVkMDc0MGM4MGRiMTA4MzNiZTQ3NzVhMGMzNDggMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvUGFnZUNsaWVudEltcGxJT1MubW0KKysr IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9QYWdlQ2xpZW50SW1wbElPUy5tbQpAQCAt NDM1LDcgKzQzNSw3IEBAIFJlZlB0cjxXZWJQb3B1cE1lbnVQcm94eT4gUGFnZUNsaWVudEltcGw6 OmNyZWF0ZVBvcHVwTWVudVByb3h5KFdlYlBhZ2VQcm94eSYpCiAgICAgcmV0dXJuIG51bGxwdHI7 CiB9CiAKLVJlZlB0cjxXZWJDb250ZXh0TWVudVByb3h5PiBQYWdlQ2xpZW50SW1wbDo6Y3JlYXRl Q29udGV4dE1lbnVQcm94eShXZWJQYWdlUHJveHkqKQorUmVmUHRyPFdlYkNvbnRleHRNZW51UHJv eHk+IFBhZ2VDbGllbnRJbXBsOjpjcmVhdGVDb250ZXh0TWVudVByb3h5KFdlYlBhZ2VQcm94eSYs IGNvbnN0IFVzZXJEYXRhJikKIHsKICAgICByZXR1cm4gbnVsbHB0cjsKIH0KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvUGFnZUNsaWVudEltcGwuaCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9tYWMvUGFnZUNsaWVudEltcGwuaAppbmRleCA4YWI4YTRlMjJjYmQx NTc2NTA5ODYwMDg4OTFkOTJiZWI5ZjgyNGVhLi5mOThmOTkxMDI2NWJlMjdlMWFmNmIxZjcyZTgx NTBlMWNmYjgyMjYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1Bh Z2VDbGllbnRJbXBsLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9QYWdlQ2xp ZW50SW1wbC5oCkBAIC0xMjEsNyArMTIxLDcgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIHZvaWQg ZG9uZVdpdGhLZXlFdmVudChjb25zdCBOYXRpdmVXZWJLZXlib2FyZEV2ZW50JiwgYm9vbCB3YXNF dmVudEhhbmRsZWQpIG92ZXJyaWRlOwogCiAgICAgdmlydHVhbCBSZWZQdHI8V2ViUG9wdXBNZW51 UHJveHk+IGNyZWF0ZVBvcHVwTWVudVByb3h5KFdlYlBhZ2VQcm94eSYpIG92ZXJyaWRlOwotICAg IHZpcnR1YWwgUmVmUHRyPFdlYkNvbnRleHRNZW51UHJveHk+IGNyZWF0ZUNvbnRleHRNZW51UHJv eHkoV2ViUGFnZVByb3h5Jikgb3ZlcnJpZGU7CisgICAgdmlydHVhbCBSZWZQdHI8V2ViQ29udGV4 dE1lbnVQcm94eT4gY3JlYXRlQ29udGV4dE1lbnVQcm94eShXZWJQYWdlUHJveHkmLCBjb25zdCBD b250ZXh0TWVudUNvbnRleHREYXRhJiwgY29uc3QgVXNlckRhdGEmKSBvdmVycmlkZTsKIAogI2lm IEVOQUJMRShJTlBVVF9UWVBFX0NPTE9SKQogICAgIHZpcnR1YWwgUmVmUHRyPFdlYkNvbG9yUGlj a2VyPiBjcmVhdGVDb2xvclBpY2tlcihXZWJQYWdlUHJveHkqLCBjb25zdCBXZWJDb3JlOjpDb2xv ciYgaW5pdGlhbENvbG9yLCBjb25zdCBXZWJDb3JlOjpJbnRSZWN0Jikgb3ZlcnJpZGU7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1BhZ2VDbGllbnRJbXBsLm1tIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9QYWdlQ2xpZW50SW1wbC5tbQppbmRleCA0ZWVm ZDkwNDgwMDY1NzJhYmZkM2Y1MmIzNzZmMGE2ZGNmZjEwYmE0Li5kMWNhOGQyOTc4NGU2MmFhMDll MjgwOWRlMzk5Mzg2ZjMyMzU3ZmYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvbWFjL1BhZ2VDbGllbnRJbXBsLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9t YWMvUGFnZUNsaWVudEltcGwubW0KQEAgLTQ5Miw5ICs0OTIsOSBAQCBSZWZQdHI8V2ViUG9wdXBN ZW51UHJveHk+IFBhZ2VDbGllbnRJbXBsOjpjcmVhdGVQb3B1cE1lbnVQcm94eShXZWJQYWdlUHJv eHkmIHBhZwogICAgIHJldHVybiBXZWJQb3B1cE1lbnVQcm94eU1hYzo6Y3JlYXRlKG1fd2tWaWV3 LCBwYWdlKTsKIH0KIAotUmVmUHRyPFdlYkNvbnRleHRNZW51UHJveHk+IFBhZ2VDbGllbnRJbXBs OjpjcmVhdGVDb250ZXh0TWVudVByb3h5KFdlYlBhZ2VQcm94eSYgcGFnZSkKK1JlZlB0cjxXZWJD b250ZXh0TWVudVByb3h5PiBQYWdlQ2xpZW50SW1wbDo6Y3JlYXRlQ29udGV4dE1lbnVQcm94eShX ZWJQYWdlUHJveHkmIHBhZ2UsIGNvbnN0IENvbnRleHRNZW51Q29udGV4dERhdGEmIGNvbnRleHQs IGNvbnN0IFVzZXJEYXRhJiB1c2VyRGF0YSkKIHsKLSAgICByZXR1cm4gV2ViQ29udGV4dE1lbnVQ cm94eU1hYzo6Y3JlYXRlKG1fd2tWaWV3LCBwYWdlKTsKKyAgICByZXR1cm4gV2ViQ29udGV4dE1l bnVQcm94eU1hYzo6Y3JlYXRlKG1fd2tWaWV3LCBwYWdlLCBjb250ZXh0LCB1c2VyRGF0YSk7CiB9 CiAKICNpZiBFTkFCTEUoSU5QVVRfVFlQRV9DT0xPUikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9tYWMvV2ViQ29udGV4dE1lbnVQcm94eU1hYy5oIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL21hYy9XZWJDb250ZXh0TWVudVByb3h5TWFjLmgKaW5kZXggYTk0MmNmZDlj MTNkN2E1MTg3NDg0MGIyNGVhYzIyYWY2NTEwZDJjZi4uZTRmYjRhNGEyMDk3OWY1OGEzMzgwYWJl ZjM0ZDA4NDQ5MDQ5MDhhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21h Yy9XZWJDb250ZXh0TWVudVByb3h5TWFjLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L21hYy9XZWJDb250ZXh0TWVudVByb3h5TWFjLmgKQEAgLTM4LDE0ICszOCwxNSBAQCBPQkpDX0NM QVNTIFdLVmlldzsKIG5hbWVzcGFjZSBXZWJLaXQgewogCiBjbGFzcyBTaGFyZWFibGVCaXRtYXA7 CitjbGFzcyBVc2VyRGF0YTsKIGNsYXNzIFdlYkNvbnRleHRNZW51SXRlbURhdGE7CiBjbGFzcyBX ZWJQYWdlUHJveHk7CiAKIGNsYXNzIFdlYkNvbnRleHRNZW51UHJveHlNYWMgOiBwdWJsaWMgV2Vi Q29udGV4dE1lbnVQcm94eSB7CiBwdWJsaWM6Ci0gICAgc3RhdGljIFJlZjxXZWJDb250ZXh0TWVu dVByb3h5TWFjPiBjcmVhdGUoV0tWaWV3KiB3ZWJWaWV3LCBXZWJQYWdlUHJveHkmIHBhZ2UpCisg ICAgc3RhdGljIFJlZjxXZWJDb250ZXh0TWVudVByb3h5TWFjPiBjcmVhdGUoV0tWaWV3KiB3ZWJW aWV3LCBXZWJQYWdlUHJveHkmIHBhZ2UsIGNvbnN0IENvbnRleHRNZW51Q29udGV4dERhdGEmIGNv bnRleHQsIGNvbnN0IFVzZXJEYXRhJiB1c2VyRGF0YSkKICAgICB7Ci0gICAgICAgIHJldHVybiBh ZG9wdFJlZigqbmV3IFdlYkNvbnRleHRNZW51UHJveHlNYWMod2ViVmlldywgcGFnZSkpOworICAg ICAgICByZXR1cm4gYWRvcHRSZWYoKm5ldyBXZWJDb250ZXh0TWVudVByb3h5TWFjKHdlYlZpZXcs IHBhZ2UsIGNvbnRleHQsIHVzZXJEYXRhKSk7CiAgICAgfQogICAgIH5XZWJDb250ZXh0TWVudVBy b3h5TWFjKCk7CiAKQEAgLTY0LDcgKzY1LDcgQEAgcHVibGljOgogICAgIE5TV2luZG93ICp3aW5k b3coKSBjb25zdDsKIAogcHJpdmF0ZToKLSAgICBXZWJDb250ZXh0TWVudVByb3h5TWFjKFdLVmll dyosIFdlYlBhZ2VQcm94eSYpOworICAgIFdlYkNvbnRleHRNZW51UHJveHlNYWMoV0tWaWV3Kiwg V2ViUGFnZVByb3h5JiwgY29uc3QgQ29udGV4dE1lbnVDb250ZXh0RGF0YSYsIGNvbnN0IFVzZXJE YXRhJik7CiAKICAgICB2b2lkIHBvcHVsYXRlKGNvbnN0IFZlY3RvcjxSZWZQdHI8V2ViQ29udGV4 dE1lbnVJdGVtPj4mLCBjb25zdCBDb250ZXh0TWVudUNvbnRleHREYXRhJik7CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2ViQ29udGV4dE1lbnVQcm94eU1hYy5t bSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2ViQ29udGV4dE1lbnVQcm94eU1hYy5t bQppbmRleCA3YjhmN2M5MDRmYmYxNDMwYmUwYjE5NTVjMmZmY2Q3ODNlNzQ3Yjk4Li44MDc4YjA1 YzhjM2RlZmY0ZWUzYTY0YjljMGM1YzU5NzI4MWY3YjMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNZW51UHJveHlNYWMubW0KKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJDb250ZXh0TWVudVByb3h5TWFjLm1tCkBAIC0xNTAs OCArMTUwLDEwIEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCiBuYW1lc3BhY2UgV2ViS2l0 IHsKIAotV2ViQ29udGV4dE1lbnVQcm94eU1hYzo6V2ViQ29udGV4dE1lbnVQcm94eU1hYyhXS1Zp ZXcqIHdlYlZpZXcsIFdlYlBhZ2VQcm94eSYgcGFnZSkKLSAgICA6IG1fd2ViVmlldyh3ZWJWaWV3 KQorV2ViQ29udGV4dE1lbnVQcm94eU1hYzo6V2ViQ29udGV4dE1lbnVQcm94eU1hYyhXS1ZpZXcq IHdlYlZpZXcsIFdlYlBhZ2VQcm94eSYgcGFnZSwgY29uc3QgQ29udGV4dE1lbnVDb250ZXh0RGF0 YSYgY29udGV4dCwgY29uc3QgVXNlckRhdGEmIHVzZXJEYXRhKQorICAgIDogV2ViQ29udGV4dE1l bnVQcm94eShjb250ZXh0LCB1c2VyRGF0YSkKKworICAgICwgbV93ZWJWaWV3KHdlYlZpZXcpCiAg ICAgLCBtX3BhZ2UocGFnZSkKIHsKIH0K