128523 2014-02-10 02:26:23 -0800 [iOS][wk2] WebKit2 View Gestures (Swipe): Forward swipe gesture 2014-02-10 10:04:58 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton andersca commit-queue sam oldest_to_newest 978794 0 thorton 2014-02-10 02:26:23 -0800 We have back swipe, but not forwards. Turns out this is because the gesture recognizer, which is on the WKView, is cancelled when the swipe starts and the WKView is reparented. We should be swiping the scrollview instead, anyway. <rdar://problem/16020378> 978797 1 223686 thorton 2014-02-10 02:31:40 -0800 Created attachment 223686 patch 978941 2 223686 commit-queue 2014-02-10 10:04:56 -0800 Comment on attachment 223686 patch Clearing flags on attachment: 223686 Committed r163795: <http://trac.webkit.org/changeset/163795> 978942 3 commit-queue 2014-02-10 10:04:58 -0800 All reviewed patches have been landed. Closing bug. 223686 2014-02-10 02:31:40 -0800 2014-02-10 10:04:55 -0800 patch forward.diff text/plain 10454 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBmNGM0ODg1Li5iOTIyMWY1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzcg QEAKKzIwMTQtMDItMTAgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgW2lPU11bd2syXSBXZWJLaXQyIFZpZXcgR2VzdHVyZXMgKFN3aXBlKTogRm9yd2Fy ZCBzd2lwZSBnZXN0dXJlIAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTI4NTIzCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNjAyMDM3OD4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZSBjYW4ndCBpbnN0 YWxsIHRoZSBnZXN0dXJlIHJlY29nbml6ZXIgb24gYSB2aWV3IHRoYXQncyBnb2luZyB0byBiZQor ICAgICAgICByZXBhcmVudGVkIGR1cmluZyB0aGUgc3dpcGUsIGJlY2F1c2UgdGhlIGdlc3R1cmUg d2lsbCBiZSBjYW5jZWxsZWQuCisgICAgICAgIEluc3RhbGwgdGhlIHJlY29nbml6ZXIgb24gdGhl IFdLVmlldyBhbmQgbW92ZSB0aGUgV0tWaWV3J3Mgc2Nyb2xsdmlldworICAgICAgICBjaGlsZCBh cm91bmQgaW5zdGVhZC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvaW9zL1dLVmlld0lPUy5t bToKKyAgICAgICAgKC1bV0tWaWV3IHNldEFsbG93c0JhY2tGb3J3YXJkTmF2aWdhdGlvbkdlc3R1 cmVzOl0pOgorICAgICAgICBXZSdsbCBpbnN0YWxsIHRoZSBnZXN0dXJlIHJlY29nbml6ZXIgb24g dGhlIFdLVmlldywgYnV0IHN3aXBlIHRoZSBzY3JvbGx2aWV3LgorCisgICAgICAgICogVUlQcm9j ZXNzL2lvcy9WaWV3R2VzdHVyZUNvbnRyb2xsZXJJT1MubW06CisgICAgICAgICgtW1dLU3dpcGVU cmFuc2l0aW9uQ29udHJvbGxlciBpbml0V2l0aFZpZXdHZXN0dXJlQ29udHJvbGxlcjpnZXN0dXJl UmVjb2duaXplclZpZXc6XSk6CisgICAgICAgIENsYXJpZnkgdGhhdCBXS1N3aXBlVHJhbnNpdGlv bkNvbnRyb2xsZXIgZ2V0cyBoYW5kZWQgb25seSB0aGUgdmlldyB0byBpbnN0YWxsIHRoZSBnZXN0 dXJlIHJlY29nbml6ZXIgb24uCisgICAgICAgICgtW1dLU3dpcGVUcmFuc2l0aW9uQ29udHJvbGxl ciBnZXN0dXJlUmVjb2duaXplckZvckludGVyYWN0aXZlVHJhbnNpdGlvbjpXaXRoVGFyZ2V0OmFj dGlvbjpdKToKKyAgICAgICAgVXNlIHB1YmxpYyBlbnVtIHZhbHVlcyBzbyB3ZSBjYW4gZ2V0IHJp ZCBvZiBvbmUgcHJpdmF0ZSBoZWFkZXIuCisKKyAgICAgICAgKFdlYktpdDo6Vmlld0dlc3R1cmVD b250cm9sbGVyOjppbnN0YWxsU3dpcGVIYW5kbGVyKToKKyAgICAgICAgU2VwYXJhdGUgb3V0IHRo ZSBnZXN0dXJlIHJlY29nbml6ZXIgdmlldyBmcm9tIHRoZSBvbmUgdGhhdCBnZXRzIHN3aXBlZC4K KworICAgICAgICAoV2ViS2l0OjpWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OmJlZ2luU3dpcGVHZXN0 dXJlKToKKyAgICAgICAgUmVjb3JkIGEgc25hcHNob3QgYmVmb3JlIGJlZ2lubmluZyB0aGUgc3dp cGUuIFRoaXMgaXMgaW1wb3J0YW50IGZvciB0aGUgYmFjay10aGVuLWZvcndhcmQKKyAgICAgICAg c3dpcGUgY2FzZSwgYW5kIG1hdGNoZXMgdGhlIGJlaGF2aW9yIG9mIHRoZSBNYWMgaW1wbGVtZW50 YXRpb24uCisKKyAgICAgICAgKFdlYktpdDo6Vmlld0dlc3R1cmVDb250cm9sbGVyOjplbmRTd2lw ZUdlc3R1cmUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9tYWMvVmlld0dlc3R1cmVDb250cm9sbGVy Lmg6CisgICAgICAgIFNsaWdodCBnZW9tZXRyeSBhZGp1c3RtZW50cyBkdWUgdG8gdGhlIGNoYW5n ZSBpbiB0YXJnZXR0ZWQgdmlldy4KKwogMjAxNC0wMi0wOSAgQ2FybG9zIEdhcm5hY2hvICA8Y2Fy bG9zZ0Bnbm9tZS5vcmc+CiAKICAgICAgICAgW0dUS10gSW1wbGVtZW50IHN1cHBvcnQgdG91Y2gg ZXZlbnRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2lvcy9XS1Zp ZXdJT1MubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2lvcy9XS1ZpZXdJT1MubW0K aW5kZXggOGM3ZDc1Zi4uMGI5OWQ5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9pb3MvV0tWaWV3SU9TLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvaW9zL1dLVmlld0lPUy5tbQpAQCAtMTE2LDcgKzExNiw3IEBAIHVzaW5nIG5hbWVzcGFjZSBX ZWJLaXQ7CiAgICAgCiAgICAgaWYgKGFsbG93c0JhY2tGb3J3YXJkTmF2aWdhdGlvbkdlc3R1cmVz ICYmICFfZ2VzdHVyZUNvbnRyb2xsZXIpIHsKICAgICAgICAgX2dlc3R1cmVDb250cm9sbGVyID0g c3RkOjptYWtlX3VuaXF1ZTxWaWV3R2VzdHVyZUNvbnRyb2xsZXI+KCp3ZWJQYWdlUHJveHkpOwot ICAgICAgICBfZ2VzdHVyZUNvbnRyb2xsZXItPmluc3RhbGxTd2lwZUhhbmRsZXIoc2VsZik7Cisg ICAgICAgIF9nZXN0dXJlQ29udHJvbGxlci0+aW5zdGFsbFN3aXBlSGFuZGxlcihzZWxmLCBbc2Vs ZiBzY3JvbGxWaWV3XSk7CiAgICAgfSBlbHNlCiAgICAgICAgIF9nZXN0dXJlQ29udHJvbGxlciA9 IG51bGxwdHI7CiAgICAgCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9z L1ZpZXdHZXN0dXJlQ29udHJvbGxlcklPUy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9p b3MvVmlld0dlc3R1cmVDb250cm9sbGVySU9TLm1tCmluZGV4IDhjYThjM2QuLjJlMDNiMDEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvVmlld0dlc3R1cmVDb250cm9s bGVySU9TLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvVmlld0dlc3R1cmVD b250cm9sbGVySU9TLm1tCkBAIC0zNSw3ICszNSw2IEBACiAjaW1wb3J0ICJXZWJQYWdlUHJveHku aCIKICNpbXBvcnQgIldlYlByb2Nlc3NQcm94eS5oIgogI2ltcG9ydCA8UXVhcnR6Q29yZS9RdWFy dHpDb3JlLmg+Ci0jaW1wb3J0IDxVSUtpdC9VSUFwcGxpY2F0aW9uX1ByaXZhdGUuaD4KICNpbXBv cnQgPFVJS2l0L1VJU2NyZWVuRWRnZVBhbkdlc3R1cmVSZWNvZ25pemVyLmg+CiAjaW1wb3J0IDxV SUtpdC9VSVZpZXdDb250cm9sbGVyVHJhbnNpdGlvbmluZ19Qcml2YXRlLmg+CiAjaW1wb3J0IDxV SUtpdC9VSVdlYlRvdWNoRXZlbnRzR2VzdHVyZVJlY29nbml6ZXIuaD4KQEAgLTUwLDI2ICs0OSwz MSBAQAogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKIEBpbnRlcmZhY2UgV0tTd2lwZVRyYW5z aXRpb25Db250cm9sbGVyIDogTlNPYmplY3QgPF9VSU5hdmlnYXRpb25JbnRlcmFjdGl2ZVRyYW5z aXRpb25CYXNlRGVsZWdhdGU+Ci0tIChpbnN0YW5jZXR5cGUpaW5pdFdpdGhWaWV3R2VzdHVyZUNv bnRyb2xsZXI6KFdlYktpdDo6Vmlld0dlc3R1cmVDb250cm9sbGVyKilnZXN0dXJlQ29udHJvbGxl ciBzd2lwaW5nVmlldzooVUlWaWV3ICopdmlldzsKKy0gKGluc3RhbmNldHlwZSlpbml0V2l0aFZp ZXdHZXN0dXJlQ29udHJvbGxlcjooV2ViS2l0OjpWaWV3R2VzdHVyZUNvbnRyb2xsZXIqKWdlc3R1 cmVDb250cm9sbGVyIGdlc3R1cmVSZWNvZ25pemVyVmlldzooVUlWaWV3ICopZ2VzdHVyZVJlY29n bml6ZXJWaWV3OwogQGVuZAogCiBAaW1wbGVtZW50YXRpb24gV0tTd2lwZVRyYW5zaXRpb25Db250 cm9sbGVyCiB7CiAgICAgV2ViS2l0OjpWaWV3R2VzdHVyZUNvbnRyb2xsZXIgKl9nZXN0dXJlQ29u dHJvbGxlcjsKICAgICBSZXRhaW5QdHI8X1VJTmF2aWdhdGlvbkludGVyYWN0aXZlVHJhbnNpdGlv bkJhc2U+IF9iYWNrVHJhbnNpdGlvbkNvbnRyb2xsZXI7CisgICAgUmV0YWluUHRyPF9VSU5hdmln YXRpb25JbnRlcmFjdGl2ZVRyYW5zaXRpb25CYXNlPiBfZm9yd2FyZFRyYW5zaXRpb25Db250cm9s bGVyOwogfQogCiBzdGF0aWMgY29uc3QgZmxvYXQgc3dpcGVTbmFwc2hvdFJlbW92YWxSZW5kZXJU cmVlU2l6ZVRhcmdldEZyYWN0aW9uID0gMC41Owogc3RhdGljIGNvbnN0IHN0ZDo6Y2hyb25vOjpz ZWNvbmRzIHN3aXBlU25hcHNob3RSZW1vdmFsV2F0Y2hkb2dEdXJhdGlvbiA9IDNfczsKIAotLSAo aW5zdGFuY2V0eXBlKWluaXRXaXRoVmlld0dlc3R1cmVDb250cm9sbGVyOihXZWJLaXQ6OlZpZXdH ZXN0dXJlQ29udHJvbGxlciopZ2VzdHVyZUNvbnRyb2xsZXIgc3dpcGluZ1ZpZXc6KFVJVmlldyAq KXZpZXcKKy0gKGluc3RhbmNldHlwZSlpbml0V2l0aFZpZXdHZXN0dXJlQ29udHJvbGxlcjooV2Vi S2l0OjpWaWV3R2VzdHVyZUNvbnRyb2xsZXIqKWdlc3R1cmVDb250cm9sbGVyIGdlc3R1cmVSZWNv Z25pemVyVmlldzooVUlWaWV3ICopZ2VzdHVyZVJlY29nbml6ZXJWaWV3CiB7CiAgICAgc2VsZiA9 IFtzdXBlciBpbml0XTsKICAgICBpZiAoc2VsZikgewogICAgICAgICBfZ2VzdHVyZUNvbnRyb2xs ZXIgPSBnZXN0dXJlQ29udHJvbGxlcjsKIAogICAgICAgICBfYmFja1RyYW5zaXRpb25Db250cm9s bGVyID0gYWRvcHROUyhbX1VJTmF2aWdhdGlvbkludGVyYWN0aXZlVHJhbnNpdGlvbkJhc2UgYWxs b2NdKTsKLSAgICAgICAgX2JhY2tUcmFuc2l0aW9uQ29udHJvbGxlciA9IFtfYmFja1RyYW5zaXRp b25Db250cm9sbGVyIGluaXRXaXRoR2VzdHVyZVJlY29nbml6ZXJWaWV3OnZpZXcgYW5pbWF0b3I6 bmlsIGRlbGVnYXRlOnNlbGZdOworICAgICAgICBfYmFja1RyYW5zaXRpb25Db250cm9sbGVyID0g W19iYWNrVHJhbnNpdGlvbkNvbnRyb2xsZXIgaW5pdFdpdGhHZXN0dXJlUmVjb2duaXplclZpZXc6 Z2VzdHVyZVJlY29nbml6ZXJWaWV3IGFuaW1hdG9yOm5pbCBkZWxlZ2F0ZTpzZWxmXTsKKyAgICAg ICAgCisgICAgICAgIF9mb3J3YXJkVHJhbnNpdGlvbkNvbnRyb2xsZXIgPSBhZG9wdE5TKFtfVUlO YXZpZ2F0aW9uSW50ZXJhY3RpdmVUcmFuc2l0aW9uQmFzZSBhbGxvY10pOworICAgICAgICBfZm9y d2FyZFRyYW5zaXRpb25Db250cm9sbGVyID0gW19mb3J3YXJkVHJhbnNpdGlvbkNvbnRyb2xsZXIg aW5pdFdpdGhHZXN0dXJlUmVjb2duaXplclZpZXc6Z2VzdHVyZVJlY29nbml6ZXJWaWV3IGFuaW1h dG9yOm5pbCBkZWxlZ2F0ZTpzZWxmXTsKKyAgICAgICAgW19mb3J3YXJkVHJhbnNpdGlvbkNvbnRy b2xsZXIgc2V0U2hvdWxkUmV2ZXJzZVRyYW5zbGF0aW9uOllFU107CiAgICAgfQogICAgIHJldHVy biBzZWxmOwogfQpAQCAtMTA0LDEwICsxMDgsMTAgQEAgc3RhdGljIGNvbnN0IHN0ZDo6Y2hyb25v OjpzZWNvbmRzIHN3aXBlU25hcHNob3RSZW1vdmFsV2F0Y2hkb2dEdXJhdGlvbiA9IDNfczsKICAg ICBVSVNjcmVlbkVkZ2VQYW5HZXN0dXJlUmVjb2duaXplciAqcmVjb2duaXplciA9IFtbVUlTY3Jl ZW5FZGdlUGFuR2VzdHVyZVJlY29nbml6ZXIgYWxsb2NdIGluaXRXaXRoVGFyZ2V0OnRhcmdldCBh Y3Rpb246YWN0aW9uXTsKICAgICBzd2l0Y2ggKFtzZWxmIGRpcmVjdGlvbkZvclRyYW5zaXRpb246 dHJhbnNpdGlvbl0pIHsKICAgICBjYXNlIFdlYktpdDo6Vmlld0dlc3R1cmVDb250cm9sbGVyOjpT d2lwZURpcmVjdGlvbjo6TGVmdDoKLSAgICAgICAgW3JlY29nbml6ZXIgc2V0RWRnZXM6VUlNaW5Y RWRnZV07CisgICAgICAgIFtyZWNvZ25pemVyIHNldEVkZ2VzOlVJUmVjdEVkZ2VMZWZ0XTsKICAg ICAgICAgYnJlYWs7CiAgICAgY2FzZSBXZWJLaXQ6OlZpZXdHZXN0dXJlQ29udHJvbGxlcjo6U3dp cGVEaXJlY3Rpb246OlJpZ2h0OgotICAgICAgICBbcmVjb2duaXplciBzZXRFZGdlczpVSU1heFhF ZGdlXTsKKyAgICAgICAgW3JlY29nbml6ZXIgc2V0RWRnZXM6VUlSZWN0RWRnZVJpZ2h0XTsKICAg ICAgICAgYnJlYWs7CiAgICAgfQogICAgIHJldHVybiByZWNvZ25pemVyOwpAQCAtMTI5LDI0ICsx MzMsMjYgQEAgVmlld0dlc3R1cmVDb250cm9sbGVyOjp+Vmlld0dlc3R1cmVDb250cm9sbGVyKCkK IHsKIH0KIAotdm9pZCBWaWV3R2VzdHVyZUNvbnRyb2xsZXI6Omluc3RhbGxTd2lwZUhhbmRsZXIo VUlWaWV3ICp2aWV3KQordm9pZCBWaWV3R2VzdHVyZUNvbnRyb2xsZXI6Omluc3RhbGxTd2lwZUhh bmRsZXIoVUlWaWV3ICpnZXN0dXJlUmVjb2duaXplclZpZXcsIFVJVmlldyAqc3dpcGluZ1ZpZXcp CiB7CiAgICAgQVNTRVJUKCFtX3N3aXBlSW50ZXJhY3RpdmVUcmFuc2l0aW9uRGVsZWdhdGUpOwot ICAgIG1fc3dpcGVJbnRlcmFjdGl2ZVRyYW5zaXRpb25EZWxlZ2F0ZSA9IGFkb3B0TlMoW1tXS1N3 aXBlVHJhbnNpdGlvbkNvbnRyb2xsZXIgYWxsb2NdIGluaXRXaXRoVmlld0dlc3R1cmVDb250cm9s bGVyOnRoaXMgc3dpcGluZ1ZpZXc6dmlld10pOwotICAgIG1fbGl2ZVN3aXBlVmlldyA9IHZpZXc7 CisgICAgbV9zd2lwZUludGVyYWN0aXZlVHJhbnNpdGlvbkRlbGVnYXRlID0gYWRvcHROUyhbW1dL U3dpcGVUcmFuc2l0aW9uQ29udHJvbGxlciBhbGxvY10gaW5pdFdpdGhWaWV3R2VzdHVyZUNvbnRy b2xsZXI6dGhpcyBnZXN0dXJlUmVjb2duaXplclZpZXc6Z2VzdHVyZVJlY29nbml6ZXJWaWV3XSk7 CisgICAgbV9saXZlU3dpcGVWaWV3ID0gc3dpcGluZ1ZpZXc7CiB9CiAKIHZvaWQgVmlld0dlc3R1 cmVDb250cm9sbGVyOjpiZWdpblN3aXBlR2VzdHVyZShfVUlOYXZpZ2F0aW9uSW50ZXJhY3RpdmVU cmFuc2l0aW9uQmFzZSAqdHJhbnNpdGlvbiwgU3dpcGVEaXJlY3Rpb24gZGlyZWN0aW9uKQogewog ICAgIGlmIChtX2FjdGl2ZUdlc3R1cmVUeXBlICE9IFZpZXdHZXN0dXJlVHlwZTo6Tm9uZSkKICAg ICAgICAgcmV0dXJuOworICAgIAorICAgIFZpZXdTbmFwc2hvdFN0b3JlOjpzaGFyZWQoKS5yZWNv cmRTbmFwc2hvdChtX3dlYlBhZ2VQcm94eSk7CiAKICAgICBXZWJLaXQ6OldlYkJhY2tGb3J3YXJk TGlzdEl0ZW0qIHRhcmdldEl0ZW0gPSBkaXJlY3Rpb24gPT0gU3dpcGVEaXJlY3Rpb246OkxlZnQg PyBtX3dlYlBhZ2VQcm94eS5iYWNrRm9yd2FyZExpc3QoKS5iYWNrSXRlbSgpIDogbV93ZWJQYWdl UHJveHkuYmFja0ZvcndhcmRMaXN0KCkuZm9yd2FyZEl0ZW0oKTsKIAogICAgIGF1dG8gc25hcHNo b3QgPSBXZWJLaXQ6OlZpZXdTbmFwc2hvdFN0b3JlOjpzaGFyZWQoKS5zbmFwc2hvdEFuZFJlbmRl clRyZWVTaXplKHRhcmdldEl0ZW0pLmZpcnN0OwogCiAgICAgUmV0YWluUHRyPFVJVmlld0NvbnRy b2xsZXI+IHNuYXBzaG90Vmlld0NvbnRyb2xsZXIgPSBhZG9wdE5TKFtbVUlWaWV3Q29udHJvbGxl ciBhbGxvY10gaW5pdF0pOwotICAgIG1fc25hcHNob3RWaWV3ID0gYWRvcHROUyhbW1VJVmlldyBh bGxvY10gaW5pdFdpdGhGcmFtZTpbbV9saXZlU3dpcGVWaWV3IGJvdW5kc11dKTsKKyAgICBtX3Nu YXBzaG90VmlldyA9IGFkb3B0TlMoW1tVSVZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6W21fbGl2 ZVN3aXBlVmlldyBmcmFtZV1dKTsKICAgICBpZiAoc25hcHNob3QpIHsKICNpZiBVU0UoSU9TVVJG QUNFKQogICAgICAgICB1aW50MzJfdCBwdXJnZWFiaWxpdHlTdGF0ZSA9IGtJT1N1cmZhY2VQdXJn ZWFibGVOb25Wb2xhdGlsZTsKQEAgLTE3MSw5ICsxNzcsNiBAQCB2b2lkIFZpZXdHZXN0dXJlQ29u dHJvbGxlcjo6YmVnaW5Td2lwZUdlc3R1cmUoX1VJTmF2aWdhdGlvbkludGVyYWN0aXZlVHJhbnNp dGlvbgogICAgIFJldGFpblB0cjxVSVZpZXdDb250cm9sbGVyPiB0YXJnZXR0ZWRWaWV3Q29udHJv bGxlciA9IGFkb3B0TlMoW1tVSVZpZXdDb250cm9sbGVyIGFsbG9jXSBpbml0XSk7CiAgICAgW3Rh cmdldHRlZFZpZXdDb250cm9sbGVyIHNldFZpZXc6bV9saXZlU3dpcGVWaWV3XTsKIAotICAgIG1f b3JpZ2luYWxMaXZlU3dpcGVWaWV3RnJhbWUgPSBtX2xpdmVTd2lwZVZpZXcuZnJhbWU7Ci0gICAg bV9saXZlU3dpcGVWaWV3LmZyYW1lID0gbV9saXZlU3dpcGVWaWV3LmJvdW5kczsKLSAgICAKICAg ICBVSU5hdmlnYXRpb25Db250cm9sbGVyT3BlcmF0aW9uIHRyYW5zaXRpb25PcGVyYXRpb24gPSBk aXJlY3Rpb24gPT0gU3dpcGVEaXJlY3Rpb246OkxlZnQgPyBVSU5hdmlnYXRpb25Db250cm9sbGVy T3BlcmF0aW9uUG9wIDogVUlOYXZpZ2F0aW9uQ29udHJvbGxlck9wZXJhdGlvblB1c2g7CiAgICAg UmV0YWluUHRyPF9VSU5hdmlnYXRpb25QYXJhbGxheFRyYW5zaXRpb24+IGFuaW1hdGlvbkNvbnRy b2xsZXIgPSBhZG9wdE5TKFtbX1VJTmF2aWdhdGlvblBhcmFsbGF4VHJhbnNpdGlvbiBhbGxvY10g aW5pdFdpdGhDdXJyZW50T3BlcmF0aW9uOnRyYW5zaXRpb25PcGVyYXRpb25dKTsKIApAQCAtMTgx LDggKzE4NCw4IEBAIHZvaWQgVmlld0dlc3R1cmVDb250cm9sbGVyOjpiZWdpblN3aXBlR2VzdHVy ZShfVUlOYXZpZ2F0aW9uSW50ZXJhY3RpdmVUcmFuc2l0aW9uCiAgICAgW3RyYW5zaXRpb25Db250 ZXh0IF9zZXRGcm9tVmlld0NvbnRyb2xsZXI6dGFyZ2V0dGVkVmlld0NvbnRyb2xsZXIuZ2V0KCld OwogICAgIFt0cmFuc2l0aW9uQ29udGV4dCBfc2V0VG9WaWV3Q29udHJvbGxlcjpzbmFwc2hvdFZp ZXdDb250cm9sbGVyLmdldCgpXTsKICAgICBbdHJhbnNpdGlvbkNvbnRleHQgX3NldENvbnRhaW5l clZpZXc6bV90cmFuc2l0aW9uQ29udGFpbmVyVmlldy5nZXQoKV07Ci0gICAgW3RyYW5zaXRpb25D b250ZXh0IF9zZXRGcm9tU3RhcnRGcmFtZTpbbV9saXZlU3dpcGVWaWV3IGJvdW5kc11dOwotICAg IFt0cmFuc2l0aW9uQ29udGV4dCBfc2V0VG9FbmRGcmFtZTpbbV9saXZlU3dpcGVWaWV3IGJvdW5k c11dOworICAgIFt0cmFuc2l0aW9uQ29udGV4dCBfc2V0RnJvbVN0YXJ0RnJhbWU6W21fbGl2ZVN3 aXBlVmlldyBmcmFtZV1dOworICAgIFt0cmFuc2l0aW9uQ29udGV4dCBfc2V0VG9FbmRGcmFtZTpb bV9saXZlU3dpcGVWaWV3IGZyYW1lXV07CiAgICAgW3RyYW5zaXRpb25Db250ZXh0IF9zZXRUb1N0 YXJ0RnJhbWU6Q0dSZWN0WmVyb107CiAgICAgW3RyYW5zaXRpb25Db250ZXh0IF9zZXRGcm9tRW5k RnJhbWU6Q0dSZWN0WmVyb107CiAgICAgW3RyYW5zaXRpb25Db250ZXh0IF9zZXRBbmltYXRvcjph bmltYXRpb25Db250cm9sbGVyLmdldCgpXTsKQEAgLTIxNCw5ICsyMTcsNiBAQCB2b2lkIFZpZXdH ZXN0dXJlQ29udHJvbGxlcjo6ZW5kU3dpcGVHZXN0dXJlKFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0q IHRhcmdldEl0ZW0sCiAgICAgW21fdHJhbnNpdGlvbkNvbnRhaW5lclZpZXcgcmVtb3ZlRnJvbVN1 cGVydmlld107CiAgICAgbV90cmFuc2l0aW9uQ29udGFpbmVyVmlldyA9IG51bGxwdHI7CiAgICAg Ci0gICAgW21fbGl2ZVN3aXBlVmlldyBzZXRGcmFtZTptX29yaWdpbmFsTGl2ZVN3aXBlVmlld0Zy YW1lXTsKLSAgICBbbV9zbmFwc2hvdFZpZXcgc2V0RnJhbWU6bV9vcmlnaW5hbExpdmVTd2lwZVZp ZXdGcmFtZV07Ci0gICAgCiAgICAgaWYgKGNhbmNlbGxlZCkgewogICAgICAgICByZW1vdmVTd2lw ZVNuYXBzaG90KCk7CiAgICAgICAgIHJldHVybjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9tYWMvVmlld0dlc3R1cmVDb250cm9sbGVyLmggYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvbWFjL1ZpZXdHZXN0dXJlQ29udHJvbGxlci5oCmluZGV4IGM1Yzg1YWEuLmM2NDlj NjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvVmlld0dlc3R1cmVD b250cm9sbGVyLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9WaWV3R2VzdHVy ZUNvbnRyb2xsZXIuaApAQCAtODcsNyArODcsNyBAQCBwdWJsaWM6CiAKICAgICB2b2lkIGVuZEFj dGl2ZUdlc3R1cmUoKTsKICNlbHNlCi0gICAgdm9pZCBpbnN0YWxsU3dpcGVIYW5kbGVyKFVJVmll dyAqKTsKKyAgICB2b2lkIGluc3RhbGxTd2lwZUhhbmRsZXIoVUlWaWV3ICpnZXN0dXJlUmVjb2du aXplclZpZXcsIFVJVmlldyAqc3dpcGluZ1ZpZXcpOwogICAgIGJvb2wgY2FuU3dpcGVJbkRpcmVj dGlvbihTd2lwZURpcmVjdGlvbik7CiAgICAgdm9pZCBiZWdpblN3aXBlR2VzdHVyZShfVUlOYXZp Z2F0aW9uSW50ZXJhY3RpdmVUcmFuc2l0aW9uQmFzZSAqLCBTd2lwZURpcmVjdGlvbik7CiAgICAg dm9pZCBlbmRTd2lwZUdlc3R1cmUoV2ViQmFja0ZvcndhcmRMaXN0SXRlbSogdGFyZ2V0SXRlbSwg X1VJVmlld0NvbnRyb2xsZXJUcmFuc2l0aW9uQ29udGV4dCAqLCBib29sIGNhbmNlbGxlZCk7CkBA IC0xNDQsOSArMTQ0LDcgQEAgcHJpdmF0ZToKICAgICAvLyB0aGUgc2Nyb2xsIGV2ZW50IHRoYXQg d291bGQgaGF2ZSBzdGFydGVkIGEgc3dpcGUsIHdlJ2xsIGZpbGwgdGhlc2UgaW4uCiAgICAgYm9v bCBtX2hhc1BlbmRpbmdTd2lwZTsKICAgICBTd2lwZURpcmVjdGlvbiBtX3BlbmRpbmdTd2lwZURp cmVjdGlvbjsKLSNlbHNlCi0gICAgQ0dSZWN0IG1fb3JpZ2luYWxMaXZlU3dpcGVWaWV3RnJhbWU7 Ci0gICAgCisjZWxzZSAgICAKICAgICBVSVZpZXcgKm1fbGl2ZVN3aXBlVmlldzsKICAgICBSZXRh aW5QdHI8VUlWaWV3PiBtX3NuYXBzaG90VmlldzsKICAgICBSZXRhaW5QdHI8VUlWaWV3PiBtX3Ry YW5zaXRpb25Db250YWluZXJWaWV3Owo=