113445 2013-03-27 14:41:07 -0700 Going full screen and cancelling gets system into a weird state 2013-03-27 15:42:12 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jer.noble jer.noble oldest_to_newest 864874 0 jer.noble 2013-03-27 14:41:07 -0700 Going full screen and cancelling gets system into a weird state 864883 1 jer.noble 2013-03-27 14:54:10 -0700 <rdar://problem/13472830> 864888 2 195403 jer.noble 2013-03-27 14:55:51 -0700 Created attachment 195403 Patch 864908 3 195403 eric.carlson 2013-03-27 15:20:03 -0700 Comment on attachment 195403 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=195403&action=review > Source/WebKit2/ChangeLog:11 > + messages. Also only set the placeholder view's target once full in full screen mode. Nit: "once full in full screen"? 864929 4 jer.noble 2013-03-27 15:42:12 -0700 Committed r147013: <http://trac.webkit.org/changeset/147013> 195403 2013-03-27 14:55:51 -0700 2013-03-27 15:20:02 -0700 Patch bug-113445-20130327145550.patch text/plain 10770 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2OTkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZjZhZGNlMDk1Y2FkZTU3 NjJhZDIxZGE2OTJmY2QwZmQzZGY4YzdhMy4uMzc3NGJiNjkzZjg2MjJiNjZiNmMzMWMzYzRkZGQ2 ZDRkOTE0ZjBmMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDEzLTAzLTI3ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIEdvaW5nIGZ1bGwgc2NyZWVu IGFuZCBjYW5jZWxsaW5nIGdldHMgc3lzdGVtIGludG8gYSB3ZWlyZCBzdGF0ZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEzNDQ1CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVwbGFjZSBhbiBhcnJheSBv ZiBCT09MIG1lbWJlciB2YXJpYWJsZXMgdG8gdHJhY2sgZnVsbCBzY3JlZW4gc3RhdGUgd2l0aCBh IHNpbmdsZSBlbnVtLCBhbmQKKyAgICAgICAgYWRkIHN0YXRlIHRyYWNraW5nIGZvciB0aGUgIndh aXRpbmcgdG8gZW50ZXIiIGFuZCAid2FpdGluZyB0byBleGl0IiBzdGF0ZXMuIFVzZSB0aGlzIG5l dywKKyAgICAgICAgbW9yZSBzcGVjaWZpYyBlbnVtIHRvIGJlIG1vcmUgc3RyaW5nZW50IGFib3V0 IHRoZSBzdGF0ZSB3aGVuIHJlc3BvbmRpbmcgdG8gV2ViUHJvY2VzcworICAgICAgICBtZXNzYWdl cy4gQWxzbyBvbmx5IHNldCB0aGUgcGxhY2Vob2xkZXIgdmlldydzIHRhcmdldCBvbmNlIGZ1bGwg aW4gZnVsbCBzY3JlZW4gbW9kZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9tYWMvV0tGdWxsU2Ny ZWVuV2luZG93Q29udHJvbGxlci5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9tYWMvV0tGdWxsU2Ny ZWVuV2luZG93Q29udHJvbGxlci5tbToKKyAgICAgICAgKC1bV0tGdWxsU2NyZWVuV2luZG93Q29u dHJvbGxlciBpc0Z1bGxTY3JlZW5dKTogWWVzIHdoZW4gaW4gZnVsbCBzY3JlZW4sIGVudGVyaW5n IGZ1bGwgc2NyZWVuLAorICAgICAgICAgICAgb3Igd2FpdGluZyB0byBlbnRlciBmdWxsIHNjcmVl bi4KKyAgICAgICAgKC1bV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxlciBjYW5jZWxPcGVyYXRp b246XSk6IE9ubHkgcmVxdWVzdEV4aXRGdWxsU2NyZWVuKCkgaWYgYSB3YXRjaGRvZworICAgICAg ICAgICAgaGFzIG5vdCBhbHJlYWR5IGJlZW4gbWFkZSBhY3RpdmUuCisgICAgICAgICgtW1dLRnVs bFNjcmVlbldpbmRvd0NvbnRyb2xsZXIgZW50ZXJGdWxsU2NyZWVuOl0pOiBVc2UgdGhlIG5ldyBz dGF0ZSB2YXJpYWJsZS4KKyAgICAgICAgKC1bV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxlciBi ZWdhbkVudGVyRnVsbFNjcmVlbldpdGhJbml0aWFsRnJhbWU6V2ViQ29yZTo6ZmluYWxGcmFtZTpX ZWJDb3JlOjpdKTogRGl0dG8uCisgICAgICAgICgtW1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xs ZXIgZmluaXNoZWRFbnRlckZ1bGxTY3JlZW5BbmltYXRpb246XSk6IERpdHRvLiBTZXQgdGhlIHBs YWNlaG9sZGVyIHRhcmdldC4KKyAgICAgICAgKC1bV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxl ciBleGl0RnVsbFNjcmVlbl0pOiBEaXR0by4gQ2xlYXIgdGhlIHBsYWNlaG9sZGVyIHRhcmdldC4K KyAgICAgICAgKC1bV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxlciBiZWdhbkV4aXRGdWxsU2Ny ZWVuV2l0aEluaXRpYWxGcmFtZTpXZWJDb3JlOjpmaW5hbEZyYW1lOldlYkNvcmU6Ol0pOiBEaXR0 by4KKyAgICAgICAgKC1bV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxlciBjb21wbGV0ZUZpbmlz aEV4aXRGdWxsU2NyZWVuQW5pbWF0aW9uQWZ0ZXJSZXBhaW50XSk6IERpdHRvLgorICAgICAgICAo LVtXS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyIHBlcmZvcm1DbG9zZTpdKTogRGl0dG8uCisg ICAgICAgICgtW1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIgY2xvc2VdKTogRGl0dG8uCisg ICAgICAgICgtW1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIgX3N0YXJ0RW50ZXJGdWxsU2Ny ZWVuQW5pbWF0aW9uV2l0aER1cmF0aW9uOl0pOiBEaXR0by4KKwogMjAxMy0wMy0yNyAgS29uZGFw YWxseSBLYWx5YW4gIDxrYWx5YW4ua29uZGFwYWxseUBpbnRlbC5jb20+CiAKICAgICAgICAgW0Nv b3JkR2Z4XSBTdXBwb3J0IHRvIHNoYXJlIEdyYXBoaWNzU3VyZmFjZSBmbGFncyB3aXRoIGNsaWVu dC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV0tGdWxsU2NyZWVu V2luZG93Q29udHJvbGxlci5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XS0Z1bGxT Y3JlZW5XaW5kb3dDb250cm9sbGVyLmgKaW5kZXggMTc2NTU4MWFmNGRmMDdmNzJhN2M0YjhhMjFl ZTQzOWUzYzY3NmRlOS4uYzE3NGE3YTc5Mjk0YThlMThmYmFkZGM1MGU2ZDVhZTg1YzM4N2FhNCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XS0Z1bGxTY3JlZW5XaW5k b3dDb250cm9sbGVyLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XS0Z1bGxT Y3JlZW5XaW5kb3dDb250cm9sbGVyLmgKQEAgLTQyLDYgKzQyLDggQEAgY2xhc3MgSW50UmVjdDsK IEBjbGFzcyBXZWJXaW5kb3dTY2FsZUFuaW1hdGlvbjsKIEBjbGFzcyBXZWJXaW5kb3dGYWRlQW5p bWF0aW9uOwogCit0eXBlZGVmIGVudW0gRnVsbFNjcmVlblN0YXRlIDogTlNJbnRlZ2VyIEZ1bGxT Y3JlZW5TdGF0ZTsKKwogQGludGVyZmFjZSBXS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyIDog TlNXaW5kb3dDb250cm9sbGVyPE5TV2luZG93RGVsZWdhdGU+IHsKIEBwcml2YXRlCiAgICAgV0tW aWV3ICpfd2ViVmlldzsKQEAgLTUyLDExICs1NCw4IEBAIGNsYXNzIEludFJlY3Q7CiAgICAgTlNS ZWN0IF9pbml0aWFsRnJhbWU7CiAgICAgTlNSZWN0IF9maW5hbEZyYW1lOwogICAgIFJldGFpblB0 cjxOU1RpbWVyPiBfd2F0Y2hkb2dUaW1lcjsKLSAgICAKLSAgICBCT09MIF9pc0VudGVyaW5nRnVs bFNjcmVlbjsKLSAgICBCT09MIF9pc0V4aXRpbmdGdWxsU2NyZWVuOwotICAgIEJPT0wgX2lzRnVs bFNjcmVlbjsKLSAgICBCT09MIF9pc1BsYXlpbmc7CisKKyAgICBGdWxsU2NyZWVuU3RhdGUgX2Z1 bGxTY3JlZW5TdGF0ZTsKIAogICAgIGRvdWJsZSBfc2F2ZWRTY2FsZTsKIH0KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxl ci5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV0tGdWxsU2NyZWVuV2luZG93Q29u dHJvbGxlci5tbQppbmRleCA3Y2NhZWYxOTg0ZTQ4ZjQ1ZjBkMTliMGRhNTRkNDg5YmQ3YTVjM2Rl Li44Y2FmYTRiMTRkYmVkMWQ2OWQ1OWI1OThjYTRlOGJkOGI4NDFhYzZjIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIu bW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XS0Z1bGxTY3JlZW5XaW5kb3dD b250cm9sbGVyLm1tCkBAIC01NSw2ICs1NSwxNSBAQCBzdGF0aWMgUmV0YWluUHRyPE5TV2luZG93 PiBjcmVhdGVCYWNrZ3JvdW5kRnVsbHNjcmVlbldpbmRvdyhOU1JlY3QgZnJhbWUpOwogc3RhdGlj IGNvbnN0IENGVGltZUludGVydmFsIGRlZmF1bHRBbmltYXRpb25EdXJhdGlvbiA9IDAuNTsKIHN0 YXRpYyBjb25zdCBOU1RpbWVJbnRlcnZhbCBEZWZhdWx0V2F0Y2hkb2dUaW1lckludGVydmFsID0g MTsKIAorZW51bSBGdWxsU2NyZWVuU3RhdGUgOiBOU0ludGVnZXIgeworICAgIE5vdEluRnVsbFNj cmVlbiwKKyAgICBXYWl0aW5nVG9FbnRlckZ1bGxTY3JlZW4sCisgICAgRW50ZXJpbmdGdWxsU2Ny ZWVuLAorICAgIEluRnVsbFNjcmVlbiwKKyAgICBXYWl0aW5nVG9FeGl0RnVsbFNjcmVlbiwKKyAg ICBFeGl0aW5nRnVsbFNjcmVlbiwKK307CisKIEBpbnRlcmZhY2UgTlNXaW5kb3cgKFdlYk5TV2lu ZG93RGV0YWlscykKIC0gKHZvaWQpZXhpdEZ1bGxTY3JlZW5Nb2RlOihpZClzZW5kZXI7CiAtICh2 b2lkKWVudGVyRnVsbFNjcmVlbk1vZGU6KGlkKXNlbmRlcjsKQEAgLTEyOSw3ICsxMzgsOSBAQCBz dGF0aWMgTlNSZWN0IGNvbnZlcnRSZWN0VG9TY3JlZW4oTlNXaW5kb3cgKndpbmRvdywgTlNSZWN0 IHJlY3QpCiAKIC0gKEJPT0wpaXNGdWxsU2NyZWVuCiB7Ci0gICAgcmV0dXJuIF9pc0Z1bGxTY3Jl ZW47CisgICAgcmV0dXJuIF9mdWxsU2NyZWVuU3RhdGUgPT0gV2FpdGluZ1RvRW50ZXJGdWxsU2Ny ZWVuCisgICAgICAgIHx8IF9mdWxsU2NyZWVuU3RhdGUgPT0gRW50ZXJpbmdGdWxsU2NyZWVuCisg ICAgICAgIHx8IF9mdWxsU2NyZWVuU3RhdGUgPT0gSW5GdWxsU2NyZWVuOwogfQogCiAtIChXZWJD b3JlRnVsbFNjcmVlblBsYWNlaG9sZGVyVmlldyopd2ViVmlld1BsYWNlaG9sZGVyCkBAIC0xNDIs MTEgKzE1MywxMCBAQCBzdGF0aWMgTlNSZWN0IGNvbnZlcnRSZWN0VG9TY3JlZW4oTlNXaW5kb3cg KndpbmRvdywgTlNSZWN0IHJlY3QpCiAKIC0gKHZvaWQpY2FuY2VsT3BlcmF0aW9uOihpZClzZW5k ZXIKIHsKLSAgICBbc2VsZiBfbWFuYWdlcl0tPnJlcXVlc3RFeGl0RnVsbFNjcmVlbigpOwotCiAg ICAgLy8gSWYgdGhlIHBhZ2UgZG9lc24ndCByZXNwb25kIGluIERlZmF1bHRXYXRjaGRvZ1RpbWVy SW50ZXJ2YWwgc2Vjb25kcywgaXQgY291bGQgYmUgYmVjYXVzZQogICAgIC8vIHRoZSBXZWJQcm9j ZXNzIGhhcyBodW5nLCBzbyBleGl0IGFueXdheS4KICAgICBpZiAoIV93YXRjaGRvZ1RpbWVyKSB7 CisgICAgICAgIFtzZWxmIF9tYW5hZ2VyXS0+cmVxdWVzdEV4aXRGdWxsU2NyZWVuKCk7CiAgICAg ICAgIF93YXRjaGRvZ1RpbWVyID0gYWRvcHROUyhbW05TVGltZXIgYWxsb2NdIGluaXRXaXRoRmly ZURhdGU6bmlsIGludGVydmFsOkRlZmF1bHRXYXRjaGRvZ1RpbWVySW50ZXJ2YWwgdGFyZ2V0OnNl bGYgc2VsZWN0b3I6QHNlbGVjdG9yKGV4aXRGdWxsU2NyZWVuKSB1c2VySW5mbzpuaWwgcmVwZWF0 czpOT10pOwogICAgICAgICBbW05TUnVuTG9vcCBtYWluUnVuTG9vcF0gYWRkVGltZXI6X3dhdGNo ZG9nVGltZXIuZ2V0KCkgZm9yTW9kZTpOU0RlZmF1bHRSdW5Mb29wTW9kZV07CiAgICAgfQpAQCAt MTk0LDkgKzIwNCw5IEBAIHN0YXRpYyBSZXRhaW5QdHI8Q0dJbWFnZVJlZj4gY3JlYXRlSW1hZ2VX aXRoQ29waWVkRGF0YShDR0ltYWdlUmVmIHNvdXJjZUltYWdlKQogCiAtICh2b2lkKWVudGVyRnVs bFNjcmVlbjooTlNTY3JlZW4gKilzY3JlZW4KIHsKLSAgICBpZiAoX2lzRnVsbFNjcmVlbikKKyAg ICBpZiAoW3NlbGYgaXNGdWxsU2NyZWVuXSkKICAgICAgICAgcmV0dXJuOwotICAgIF9pc0Z1bGxT Y3JlZW4gPSBZRVM7CisgICAgX2Z1bGxTY3JlZW5TdGF0ZSA9IFdhaXRpbmdUb0VudGVyRnVsbFNj cmVlbjsKIAogICAgIGlmICghc2NyZWVuKQogICAgICAgICBzY3JlZW4gPSBbTlNTY3JlZW4gbWFp blNjcmVlbl07CkBAIC0yMzEsOSArMjQxLDkgQEAgc3RhdGljIFJldGFpblB0cjxDR0ltYWdlUmVm PiBjcmVhdGVJbWFnZVdpdGhDb3BpZWREYXRhKENHSW1hZ2VSZWYgc291cmNlSW1hZ2UpCiAgICAg Ly8gU3dhcCB0aGUgd2ViVmlldyBwbGFjZWhvbGRlciBpbnRvIHBsYWNlLgogICAgIGlmICghX3dl YlZpZXdQbGFjZWhvbGRlcikgewogICAgICAgICBfd2ViVmlld1BsYWNlaG9sZGVyLmFkb3B0TlMo W1tXZWJDb3JlRnVsbFNjcmVlblBsYWNlaG9sZGVyVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpb X3dlYlZpZXcgZnJhbWVdXSk7Ci0gICAgICAgIFtfd2ViVmlld1BsYWNlaG9sZGVyLmdldCgpIHNl dFRhcmdldDpzZWxmXTsKICAgICAgICAgW193ZWJWaWV3UGxhY2Vob2xkZXIuZ2V0KCkgc2V0QWN0 aW9uOkBzZWxlY3RvcihjYW5jZWxPcGVyYXRpb246KV07CiAgICAgfQorICAgIFtfd2ViVmlld1Bs YWNlaG9sZGVyLmdldCgpIHNldFRhcmdldDpuaWxdOwogICAgIFtfd2ViVmlld1BsYWNlaG9sZGVy LmdldCgpIHNldENvbnRlbnRzOihpZCl3ZWJWaWV3Q29udGVudHMuZ2V0KCldOwogICAgIFtzZWxm IF9yZXBsYWNlVmlldzpfd2ViVmlldyB3aXRoOl93ZWJWaWV3UGxhY2Vob2xkZXIuZ2V0KCldOwog ICAgIApAQCAtMjUyLDkgKzI2Miw5IEBAIHN0YXRpYyBSZXRhaW5QdHI8Q0dJbWFnZVJlZj4gY3Jl YXRlSW1hZ2VXaXRoQ29waWVkRGF0YShDR0ltYWdlUmVmIHNvdXJjZUltYWdlKQogCiAtICh2b2lk KWJlZ2FuRW50ZXJGdWxsU2NyZWVuV2l0aEluaXRpYWxGcmFtZTooY29uc3QgV2ViQ29yZTo6SW50 UmVjdCYpaW5pdGlhbEZyYW1lIGZpbmFsRnJhbWU6KGNvbnN0IFdlYkNvcmU6OkludFJlY3QmKWZp bmFsRnJhbWUKIHsKLSAgICBpZiAoX2lzRW50ZXJpbmdGdWxsU2NyZWVuKQorICAgIGlmIChfZnVs bFNjcmVlblN0YXRlICE9IFdhaXRpbmdUb0VudGVyRnVsbFNjcmVlbikKICAgICAgICAgcmV0dXJu OwotICAgIF9pc0VudGVyaW5nRnVsbFNjcmVlbiA9IFlFUzsKKyAgICBfZnVsbFNjcmVlblN0YXRl ID0gRW50ZXJpbmdGdWxsU2NyZWVuOwogCiAgICAgX2luaXRpYWxGcmFtZSA9IGluaXRpYWxGcmFt ZTsKICAgICBfZmluYWxGcmFtZSA9IGZpbmFsRnJhbWU7CkBAIC0yNjcsOSArMjc3LDkgQEAgc3Rh dGljIFJldGFpblB0cjxDR0ltYWdlUmVmPiBjcmVhdGVJbWFnZVdpdGhDb3BpZWREYXRhKENHSW1h Z2VSZWYgc291cmNlSW1hZ2UpCiAKIC0gKHZvaWQpZmluaXNoZWRFbnRlckZ1bGxTY3JlZW5Bbmlt YXRpb246KGJvb2wpY29tcGxldGVkCiB7Ci0gICAgaWYgKCFfaXNFbnRlcmluZ0Z1bGxTY3JlZW4p CisgICAgaWYgKF9mdWxsU2NyZWVuU3RhdGUgIT0gRW50ZXJpbmdGdWxsU2NyZWVuKQogICAgICAg ICByZXR1cm47Ci0gICAgX2lzRW50ZXJpbmdGdWxsU2NyZWVuID0gTk87CisgICAgX2Z1bGxTY3Jl ZW5TdGF0ZSA9IEluRnVsbFNjcmVlbjsKIAogICAgIGlmIChjb21wbGV0ZWQpIHsKICAgICAgICAg Ly8gU2NyZWVuIHVwZGF0ZXMgdG8gYmUgcmUtZW5hYmxlZCB0YSB0aGUgZW5kIG9mIHRoZSBjdXJy ZW50IGJsb2NrLgpAQCAtMjg5LDYgKzI5OSw3IEBAIHN0YXRpYyBSZXRhaW5QdHI8Q0dJbWFnZVJl Zj4gY3JlYXRlSW1hZ2VXaXRoQ29waWVkRGF0YShDR0ltYWdlUmVmIHNvdXJjZUltYWdlKQogICAg ICAgICBbX2JhY2tncm91bmRXaW5kb3cuZ2V0KCkgc2V0RnJhbWU6TlNaZXJvUmVjdCBkaXNwbGF5 OllFU107CiAKICAgICAgICAgW193ZWJWaWV3UGxhY2Vob2xkZXIuZ2V0KCkgc2V0RXhpdFdhcm5p bmdWaXNpYmxlOllFU107CisgICAgICAgIFtfd2ViVmlld1BsYWNlaG9sZGVyLmdldCgpIHNldFRh cmdldDpzZWxmXTsKICAgICAgICAgTlNFbmFibGVTY3JlZW5VcGRhdGVzKCk7CiAgICAgfSBlbHNl CiAgICAgICAgIFtfc2NhbGVBbmltYXRpb24uZ2V0KCkgc3RvcEFuaW1hdGlvbl07CkBAIC0zMDEs OSArMzEyLDkgQEAgc3RhdGljIFJldGFpblB0cjxDR0ltYWdlUmVmPiBjcmVhdGVJbWFnZVdpdGhD b3BpZWREYXRhKENHSW1hZ2VSZWYgc291cmNlSW1hZ2UpCiAgICAgICAgIF93YXRjaGRvZ1RpbWVy LmNsZWFyKCk7CiAgICAgfQogCi0gICAgaWYgKCFfaXNGdWxsU2NyZWVuKQorICAgIGlmICghW3Nl bGYgaXNGdWxsU2NyZWVuXSkKICAgICAgICAgcmV0dXJuOwotICAgIF9pc0Z1bGxTY3JlZW4gPSBO TzsKKyAgICBfZnVsbFNjcmVlblN0YXRlID0gV2FpdGluZ1RvRXhpdEZ1bGxTY3JlZW47CiAKICAg ICBbX3dlYlZpZXdQbGFjZWhvbGRlci5nZXQoKSBzZXRFeGl0V2FybmluZ1Zpc2libGU6Tk9dOwog CkBAIC0zMTQsNiArMzI1LDcgQEAgc3RhdGljIFJldGFpblB0cjxDR0ltYWdlUmVmPiBjcmVhdGVJ bWFnZVdpdGhDb3BpZWREYXRhKENHSW1hZ2VSZWYgc291cmNlSW1hZ2UpCiAgICAgLy8gU2VlIHRo ZSByZWxhdGVkIGNvbW1lbnQgaW4gZW50ZXJGdWxsU2NyZWVuOgogICAgIC8vIFdlIHdpbGwgcmVz dW1lIHRoZSBub3JtYWwgYmVoYXZpb3IgaW4gX3N0YXJ0RXhpdEZ1bGxTY3JlZW5BbmltYXRpb25X aXRoRHVyYXRpb246CiAgICAgW193ZWJWaWV3IF9zZXRTdXBwcmVzc1Zpc2liaWxpdHlVcGRhdGVz OllFU107CisgICAgW193ZWJWaWV3UGxhY2Vob2xkZXIuZ2V0KCkgc2V0VGFyZ2V0Om5pbF07CiAK ICAgICBbc2VsZiBfbWFuYWdlcl0tPnNldEFuaW1hdGluZ0Z1bGxTY3JlZW4odHJ1ZSk7CiAgICAg W3NlbGYgX21hbmFnZXJdLT53aWxsRXhpdEZ1bGxTY3JlZW4oKTsKQEAgLTMyMSwxMiArMzMzLDEw IEBAIHN0YXRpYyBSZXRhaW5QdHI8Q0dJbWFnZVJlZj4gY3JlYXRlSW1hZ2VXaXRoQ29waWVkRGF0 YShDR0ltYWdlUmVmIHNvdXJjZUltYWdlKQogCiAtICh2b2lkKWJlZ2FuRXhpdEZ1bGxTY3JlZW5X aXRoSW5pdGlhbEZyYW1lOihjb25zdCBXZWJDb3JlOjpJbnRSZWN0Jilpbml0aWFsRnJhbWUgZmlu YWxGcmFtZTooY29uc3QgV2ViQ29yZTo6SW50UmVjdCYpZmluYWxGcmFtZQogewotICAgIGlmIChf aXNFeGl0aW5nRnVsbFNjcmVlbikKLSAgICAgICAgcmV0dXJuOwotICAgIF9pc0V4aXRpbmdGdWxs U2NyZWVuID0gWUVTOwogCi0gICAgaWYgKF9pc0VudGVyaW5nRnVsbFNjcmVlbikKLSAgICAgICAg W3NlbGYgZmluaXNoZWRFbnRlckZ1bGxTY3JlZW5BbmltYXRpb246Tk9dOworICAgIGlmIChfZnVs bFNjcmVlblN0YXRlICE9IFdhaXRpbmdUb0V4aXRGdWxsU2NyZWVuKQorICAgICAgICByZXR1cm47 CisgICAgX2Z1bGxTY3JlZW5TdGF0ZSA9IEV4aXRpbmdGdWxsU2NyZWVuOwogCiAgICAgaWYgKCFb W3NlbGYgd2luZG93XSBpc09uQWN0aXZlU3BhY2VdKSB7CiAgICAgICAgIC8vIElmIHRoZSBmdWxs IHNjcmVlbiB3aW5kb3cgaXMgbm90IGluIHRoZSBhY3RpdmUgc3BhY2UsIHRoZSBOU1dpbmRvdyBm dWxsIHNjcmVlbiBhbmltYXRpb24gZGVsZWdhdGUgbWV0aG9kcwpAQCAtMzQ2LDkgKzM1Niw5IEBA IHN0YXRpYyB2b2lkIGNvbXBsZXRlRmluaXNoRXhpdEZ1bGxTY3JlZW5BbmltYXRpb25BZnRlclJl cGFpbnQoV0tFcnJvclJlZiwgdm9pZCopCiAKIC0gKHZvaWQpZmluaXNoZWRFeGl0RnVsbFNjcmVl bkFuaW1hdGlvbjooYm9vbCljb21wbGV0ZWQKIHsKLSAgICBpZiAoIV9pc0V4aXRpbmdGdWxsU2Ny ZWVuKQorICAgIGlmIChfZnVsbFNjcmVlblN0YXRlICE9IEV4aXRpbmdGdWxsU2NyZWVuKQogICAg ICAgICByZXR1cm47Ci0gICAgX2lzRXhpdGluZ0Z1bGxTY3JlZW4gPSBOTzsKKyAgICBfZnVsbFNj cmVlblN0YXRlID0gTm90SW5GdWxsU2NyZWVuOwogCiAgICAgLy8gU2NyZWVuIHVwZGF0ZXMgdG8g YmUgcmUtZW5hYmxlZCBpbiBjb21wbGV0ZUZpbmlzaEV4aXRGdWxsU2NyZWVuQW5pbWF0aW9uQWZ0 ZXJSZXBhaW50LgogICAgIE5TRGlzYWJsZVNjcmVlblVwZGF0ZXMoKTsKQEAgLTM5NSw3ICs0MDUs NyBAQCBzdGF0aWMgdm9pZCBjb21wbGV0ZUZpbmlzaEV4aXRGdWxsU2NyZWVuQW5pbWF0aW9uQWZ0 ZXJSZXBhaW50KFdLRXJyb3JSZWYsIHZvaWQqCiAKIC0gKHZvaWQpcGVyZm9ybUNsb3NlOihpZClz ZW5kZXIKIHsKLSAgICBpZiAoX2lzRnVsbFNjcmVlbikKKyAgICBpZiAoW3NlbGYgaXNGdWxsU2Ny ZWVuXSkKICAgICAgICAgW3NlbGYgY2FuY2VsT3BlcmF0aW9uOnNlbmRlcl07CiB9CiAKQEAgLTQw NSwxMCArNDE1LDEwIEBAIHN0YXRpYyB2b2lkIGNvbXBsZXRlRmluaXNoRXhpdEZ1bGxTY3JlZW5B bmltYXRpb25BZnRlclJlcGFpbnQoV0tFcnJvclJlZiwgdm9pZCoKICAgICAvLyBoYXMgY2xvc2Vk IG9yIHRoZSB3ZWIgcHJvY2VzcyBoYXMgY3Jhc2hlZC4gIEp1c3Qgd2FsayB0aHJvdWdoIG91cgog ICAgIC8vIG5vcm1hbCBleGl0IGZ1bGwgc2NyZWVuIHNlcXVlbmNlLCBidXQgZG9uJ3Qgd2FpdCB0 byBiZSBjYWxsZWQgYmFjawogICAgIC8vIGluIHJlc3BvbnNlLgotICAgIGlmIChfaXNGdWxsU2Ny ZWVuKQorICAgIGlmIChbc2VsZiBpc0Z1bGxTY3JlZW5dKQogICAgICAgICBbc2VsZiBleGl0RnVs bFNjcmVlbl07CiAgICAgCi0gICAgaWYgKF9pc0V4aXRpbmdGdWxsU2NyZWVuKQorICAgIGlmIChf ZnVsbFNjcmVlblN0YXRlID09IEV4aXRpbmdGdWxsU2NyZWVuKQogICAgICAgICBbc2VsZiBmaW5p c2hlZEV4aXRGdWxsU2NyZWVuQW5pbWF0aW9uOllFU107CiAKICAgICBbc3VwZXIgY2xvc2VdOwpA QCAtNTY0LDEyICs1NzQsMTIgQEAgc3RhdGljIE5TUmVjdCB3aW5kb3dGcmFtZUZyb21BcHBhcmVu dEZyYW1lcyhOU1JlY3Qgc2NyZWVuRnJhbWUsIE5TUmVjdCBpbml0aWFsRnIKIAogLSAodm9pZClf c3RhcnRFeGl0RnVsbFNjcmVlbkFuaW1hdGlvbldpdGhEdXJhdGlvbjooTlNUaW1lSW50ZXJ2YWwp ZHVyYXRpb24KIHsKLSAgICBpZiAoX2lzRnVsbFNjcmVlbikgeworICAgIGlmIChbc2VsZiBpc0Z1 bGxTY3JlZW5dKSB7CiAgICAgICAgIC8vIFdlIHN0aWxsIGJlbGlldmUgd2UncmUgaW4gZnVsbCBz Y3JlZW4gbW9kZSwgc28gd2UgbXVzdCBoYXZlIGJlZW4gYXNrZWQgdG8gZXhpdCBmdWxsCiAgICAg ICAgIC8vIHNjcmVlbiBieSB0aGUgc3lzdGVtIGZ1bGwgc2NyZWVuIGJ1dHRvbi4KICAgICAgICAg W3NlbGYgX21hbmFnZXJdLT5yZXF1ZXN0RXhpdEZ1bGxTY3JlZW4oKTsKICAgICAgICAgW3NlbGYg ZXhpdEZ1bGxTY3JlZW5dOwotICAgICAgICBfaXNFeGl0aW5nRnVsbFNjcmVlbiA9IFlFUzsKKyAg ICAgICAgX2Z1bGxTY3JlZW5TdGF0ZSA9IEV4aXRpbmdGdWxsU2NyZWVuOwogICAgIH0KIAogICAg IE5TUmVjdCBzY3JlZW5GcmFtZSA9IFtbW3NlbGYgd2luZG93XSBzY3JlZW5dIGZyYW1lXTsK