187536 2018-07-10 15:53:59 -0700 [IOS] We should prevent WebProcess suspension while the UIProcess is waiting for a reply from its injected bundle 2018-07-10 17:09:19 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez beidson commit-queue ggaren webkit-bug-importer oldest_to_newest 1440997 0 cdumez 2018-07-10 15:53:59 -0700 We should prevent WebProcess suspension while the UIProcess is waiting for a reply from its injected bundle (RemoteObjectRegistry API). Otherwise, the reply block may end up never getting called because the WebProcess was suspended on iOS. We already do this for callbacks on the WebPageProxy, however, RemoteObjectRegistry has is own mechanism which currently does not take any process assertions. 1440998 1 cdumez 2018-07-10 15:54:16 -0700 <rdar://problem/41931912> 1441002 2 344729 cdumez 2018-07-10 16:05:17 -0700 Created attachment 344729 Patch 1441024 3 344729 commit-queue 2018-07-10 17:09:18 -0700 Comment on attachment 344729 Patch Clearing flags on attachment: 344729 Committed r233713: <https://trac.webkit.org/changeset/233713> 1441025 4 commit-queue 2018-07-10 17:09:19 -0700 All reviewed patches have been landed. Closing bug. 344729 2018-07-10 16:05:17 -0700 2018-07-10 17:09:18 -0700 Patch bug-187536-20180710160514.patch text/plain 11020 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzNjg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDQ1N2ZkMmVhZGNjYTkyYTVi ZGZjNzNlNWY1MGFmODdhYzljMjk3MzAuLjQzZTNjZWU1YTYyMWExNjU4ZjI0ZGVjMmRhMjhmNWNk NGMwMWMzYjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzQgQEAKKzIwMTgtMDctMTAgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBbSU9TXSBXZSBzaG91bGQgcHJldmVu dCBXZWJQcm9jZXNzIHN1c3BlbnNpb24gd2hpbGUgdGhlIFVJUHJvY2VzcyBpcyB3YWl0aW5nIGZv ciBhIHJlcGx5IGZyb20gaXRzIGluamVjdGVkIGJ1bmRsZQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg3NTM2CisgICAgICAgIDxyZGFyOi8vcHJvYmxl bS80MTkzMTkxMj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBVcGRhdGUgUmVtb3RlT2JqZWN0UmVnaXN0cnkgdG8gdGFrZSBhIGJhY2tncm91bmQgcHJv Y2VzcyBhc3NlcnRpb24gZm9yIGVhY2ggcGVuZGluZyByZXBseSBvbiB0aGUKKyAgICAgICAgVUlQ cm9jZXNzIHNpZGUuIE90aGVyd2lzZSwgdGhlIGRlc3RpbmF0aW9uIHdlYiBwcm9jZXNzIG1heSBn ZXQgc3VzcGVuZGVkIGFuZCB0aGUgcmVwbHkgYmxvY2sgd291bGQKKyAgICAgICAgbm90IGdldCBj YWxsZWQuIFdlIGFscmVhZHkgZG8gdGhpcyBpbiBXZWJQYWdlUHJveHkgZm9yIGNhbGxiYWNrcyB3 YWl0aW5nIGZvciBhbiBJUEMgZnJvbSB0aGUKKyAgICAgICAgV2ViUHJvY2Vzcy4KKworICAgICAg ICAqIFNoYXJlZC9BUEkvQ29jb2EvUmVtb3RlT2JqZWN0UmVnaXN0cnkuaDoKKyAgICAgICAgKiBT aGFyZWQvQVBJL0NvY29hL1JlbW90ZU9iamVjdFJlZ2lzdHJ5Lm1tOgorICAgICAgICAoV2ViS2l0 OjpSZW1vdGVPYmplY3RSZWdpc3RyeTo6UmVtb3RlT2JqZWN0UmVnaXN0cnkpOgorICAgICAgICAo V2ViS2l0OjpSZW1vdGVPYmplY3RSZWdpc3RyeTo6c2VuZEludm9jYXRpb24pOgorICAgICAgICAo V2ViS2l0OjpSZW1vdGVPYmplY3RSZWdpc3RyeTo6Y2FsbFJlcGx5QmxvY2spOgorICAgICAgICAo V2ViS2l0OjpSZW1vdGVPYmplY3RSZWdpc3RyeTo6cmVsZWFzZVVudXNlZFJlcGx5QmxvY2spOgor ICAgICAgICAqIFNoYXJlZC9BUEkvQ29jb2EvX1dLUmVtb3RlT2JqZWN0UmVnaXN0cnkubW06Cisg ICAgICAgICgtW19XS1JlbW90ZU9iamVjdFJlZ2lzdHJ5IF9pbml0V2l0aFdlYlBhZ2U6XSk6Cisg ICAgICAgICgtW19XS1JlbW90ZU9iamVjdFJlZ2lzdHJ5IF9pbml0V2l0aFdlYlBhZ2VQcm94eTpd KToKKyAgICAgICAgKC1bX1dLUmVtb3RlT2JqZWN0UmVnaXN0cnkgX2luaXRXaXRoTWVzc2FnZVNl bmRlcjpdKTogRGVsZXRlZC4KKyAgICAgICAgKiBTaGFyZWQvQVBJL0NvY29hL19XS1JlbW90ZU9i amVjdFJlZ2lzdHJ5SW50ZXJuYWwuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dL V2ViVmlldy5tbToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9yZW1vdGVPYmplY3RSZWdpc3RyeV0p OgorICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1wbC5tbToKKyAgICAgICAgKFdl YktpdDo6V2ViVmlld0ltcGw6OnJlbW90ZU9iamVjdFJlZ2lzdHJ5KToKKyAgICAgICAgKiBXZWJQ cm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9tYWMvV0tXZWJQcm9jZXNzUGx1Z0luQnJvd3NlckNv bnRleHRDb250cm9sbGVyLm1tOgorICAgICAgICAoLVtXS1dlYlByb2Nlc3NQbHVnSW5Ccm93c2Vy Q29udGV4dENvbnRyb2xsZXIgX3JlbW90ZU9iamVjdFJlZ2lzdHJ5XSk6CisKIDIwMTgtMDctMDkg IFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVT U0lPTiAocjIzMjQxNik6IEZsaWNrZXJpbmcgd2hlbiBnb2luZyBiYWNrIHRvIEdvb2dsZSBzZWFy Y2ggcmVzdWx0cyBvbiBiYWNrIHN3aXBlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJl ZC9BUEkvQ29jb2EvUmVtb3RlT2JqZWN0UmVnaXN0cnkuaCBiL1NvdXJjZS9XZWJLaXQvU2hhcmVk L0FQSS9Db2NvYS9SZW1vdGVPYmplY3RSZWdpc3RyeS5oCmluZGV4IDEyZjk2ZjQ3MmU4OWVmYmZh YjU4NzI4Mjc1OTE3ZjIzNzllZDcyNDEuLjJjOWQ5OWJlN2Q2OWI2ZmM4OTJiY2MwM2IyZTQ3N2E5 OTdkOTNmMDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0FQSS9Db2NvYS9SZW1v dGVPYmplY3RSZWdpc3RyeS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0FQSS9Db2NvYS9S ZW1vdGVPYmplY3RSZWdpc3RyeS5oCkBAIC0yNyw2ICsyNyw4IEBACiAjZGVmaW5lIFJlbW90ZU9i amVjdFJlZ2lzdHJ5X2gKIAogI2luY2x1ZGUgIk1lc3NhZ2VSZWNlaXZlci5oIgorI2luY2x1ZGUg IlByb2Nlc3NUaHJvdHRsZXIuaCIKKyNpbmNsdWRlIDx3dGYvRnVuY3Rpb24uaD4KIAogT0JKQ19D TEFTUyBfV0tSZW1vdGVPYmplY3RSZWdpc3RyeTsKIApAQCAtMzgsMTAgKzQwLDE0IEBAIG5hbWVz cGFjZSBXZWJLaXQgewogCiBjbGFzcyBSZW1vdGVPYmplY3RJbnZvY2F0aW9uOwogY2xhc3MgVXNl ckRhdGE7CitjbGFzcyBXZWJQYWdlOworY2xhc3MgV2ViUGFnZVByb3h5OwogCiBjbGFzcyBSZW1v dGVPYmplY3RSZWdpc3RyeSBmaW5hbCA6IHB1YmxpYyBJUEM6Ok1lc3NhZ2VSZWNlaXZlciB7CiBw dWJsaWM6Ci0gICAgUmVtb3RlT2JqZWN0UmVnaXN0cnkoX1dLUmVtb3RlT2JqZWN0UmVnaXN0cnkg KiwgSVBDOjpNZXNzYWdlU2VuZGVyJik7CisgICAgUmVtb3RlT2JqZWN0UmVnaXN0cnkoX1dLUmVt b3RlT2JqZWN0UmVnaXN0cnkgKiwgV2ViUGFnZSYpOworICAgIFJlbW90ZU9iamVjdFJlZ2lzdHJ5 KF9XS1JlbW90ZU9iamVjdFJlZ2lzdHJ5ICosIFdlYlBhZ2VQcm94eSYpOworCiAgICAgflJlbW90 ZU9iamVjdFJlZ2lzdHJ5KCk7CiAKICAgICB2b2lkIHNlbmRJbnZvY2F0aW9uKGNvbnN0IFJlbW90 ZU9iamVjdEludm9jYXRpb24mKTsKQEAgLTU5LDYgKzY1LDggQEAgcHJpdmF0ZToKIAogICAgIF9X S1JlbW90ZU9iamVjdFJlZ2lzdHJ5ICptX3JlbW90ZU9iamVjdFJlZ2lzdHJ5OwogICAgIElQQzo6 TWVzc2FnZVNlbmRlciYgbV9tZXNzYWdlU2VuZGVyOworICAgIFdURjo6RnVuY3Rpb248UHJvY2Vz c1Rocm90dGxlcjo6QmFja2dyb3VuZEFjdGl2aXR5VG9rZW4oKT4gbV90YWtlQmFja2dyb3VuZEFj dGl2aXR5VG9rZW47CisgICAgSGFzaE1hcDx1aW50NjRfdCwgUHJvY2Vzc1Rocm90dGxlcjo6QmFj a2dyb3VuZEFjdGl2aXR5VG9rZW4+IG1fcGVuZGluZ1JlcGxpZXM7CiB9OwogCiB9IC8vIG5hbWVz cGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0FQSS9Db2NvYS9S ZW1vdGVPYmplY3RSZWdpc3RyeS5tbSBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0FQSS9Db2NvYS9S ZW1vdGVPYmplY3RSZWdpc3RyeS5tbQppbmRleCBhMGYzMzIzNTRmY2I0ODVkOWNhOTQzNWViNjI2 ZTc1NTgwYTdiNmYxLi44MGRjZWY3MDg0NWVlNWYwYTNmYWE4N2JkZTEyOTg3ZWEzM2ZiZWJhIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9BUEkvQ29jb2EvUmVtb3RlT2JqZWN0UmVn aXN0cnkubW0KKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvQVBJL0NvY29hL1JlbW90ZU9iamVj dFJlZ2lzdHJ5Lm1tCkBAIC0yNywyNSArMjcsNDMgQEAKICNpbXBvcnQgIlJlbW90ZU9iamVjdFJl Z2lzdHJ5LmgiCiAKICNpbXBvcnQgIk1lc3NhZ2VTZW5kZXIuaCIKKyNpbXBvcnQgIlByb2Nlc3NU aHJvdHRsZXIuaCIKICNpbXBvcnQgIlJlbW90ZU9iamVjdEludm9jYXRpb24uaCIKICNpbXBvcnQg IlJlbW90ZU9iamVjdFJlZ2lzdHJ5TWVzc2FnZXMuaCIKICNpbXBvcnQgIlVzZXJEYXRhLmgiCisj aW1wb3J0ICJXZWJQYWdlLmgiCisjaW1wb3J0ICJXZWJQYWdlUHJveHkuaCIKKyNpbXBvcnQgIldl YlByb2Nlc3NQcm94eS5oIgogI2ltcG9ydCAiX1dLUmVtb3RlT2JqZWN0UmVnaXN0cnlJbnRlcm5h bC5oIgogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAotUmVtb3RlT2JqZWN0UmVnaXN0cnk6OlJlbW90 ZU9iamVjdFJlZ2lzdHJ5KF9XS1JlbW90ZU9iamVjdFJlZ2lzdHJ5ICpyZW1vdGVPYmplY3RSZWdp c3RyeSwgSVBDOjpNZXNzYWdlU2VuZGVyJiBtZXNzYWdlU2VuZGVyKQorUmVtb3RlT2JqZWN0UmVn aXN0cnk6OlJlbW90ZU9iamVjdFJlZ2lzdHJ5KF9XS1JlbW90ZU9iamVjdFJlZ2lzdHJ5ICpyZW1v dGVPYmplY3RSZWdpc3RyeSwgV2ViUGFnZSYgcGFnZSkKICAgICA6IG1fcmVtb3RlT2JqZWN0UmVn aXN0cnkocmVtb3RlT2JqZWN0UmVnaXN0cnkpCi0gICAgLCBtX21lc3NhZ2VTZW5kZXIobWVzc2Fn ZVNlbmRlcikKKyAgICAsIG1fbWVzc2FnZVNlbmRlcihwYWdlKQorICAgICwgbV90YWtlQmFja2dy b3VuZEFjdGl2aXR5VG9rZW4oW10geyByZXR1cm4gUHJvY2Vzc1Rocm90dGxlcjo6QmFja2dyb3Vu ZEFjdGl2aXR5VG9rZW4oKTsgfSkKIHsKIH0KIAorUmVtb3RlT2JqZWN0UmVnaXN0cnk6OlJlbW90 ZU9iamVjdFJlZ2lzdHJ5KF9XS1JlbW90ZU9iamVjdFJlZ2lzdHJ5ICpyZW1vdGVPYmplY3RSZWdp c3RyeSwgV2ViUGFnZVByb3h5JiBwYWdlKQorICAgIDogbV9yZW1vdGVPYmplY3RSZWdpc3RyeShy ZW1vdGVPYmplY3RSZWdpc3RyeSkKKyAgICAsIG1fbWVzc2FnZVNlbmRlcihwYWdlKQorICAgICwg bV90YWtlQmFja2dyb3VuZEFjdGl2aXR5VG9rZW4oWyZwYWdlXSB7IHJldHVybiBwYWdlLnByb2Nl c3MoKS50aHJvdHRsZXIoKS5iYWNrZ3JvdW5kQWN0aXZpdHlUb2tlbigpOyB9KQoreworfQorCisK IFJlbW90ZU9iamVjdFJlZ2lzdHJ5Ojp+UmVtb3RlT2JqZWN0UmVnaXN0cnkoKQogewogfQogCiB2 b2lkIFJlbW90ZU9iamVjdFJlZ2lzdHJ5OjpzZW5kSW52b2NhdGlvbihjb25zdCBSZW1vdGVPYmpl Y3RJbnZvY2F0aW9uJiBpbnZvY2F0aW9uKQogeworICAgIGlmIChhdXRvKiByZXBseUluZm8gPSBp bnZvY2F0aW9uLnJlcGx5SW5mbygpKSB7CisgICAgICAgIEFTU0VSVCghbV9wZW5kaW5nUmVwbGll cy5jb250YWlucyhyZXBseUluZm8tPnJlcGx5SUQpKTsKKyAgICAgICAgbV9wZW5kaW5nUmVwbGll cy5hZGQocmVwbHlJbmZvLT5yZXBseUlELCBtX3Rha2VCYWNrZ3JvdW5kQWN0aXZpdHlUb2tlbigp KTsKKyAgICB9CisKICAgICBtX21lc3NhZ2VTZW5kZXIuc2VuZChNZXNzYWdlczo6UmVtb3RlT2Jq ZWN0UmVnaXN0cnk6Okludm9rZU1ldGhvZChpbnZvY2F0aW9uKSk7CiB9CiAKQEAgLTY4LDYgKzg2 LDkgQEAgdm9pZCBSZW1vdGVPYmplY3RSZWdpc3RyeTo6aW52b2tlTWV0aG9kKGNvbnN0IFJlbW90 ZU9iamVjdEludm9jYXRpb24mIGludm9jYXRpb24KIAogdm9pZCBSZW1vdGVPYmplY3RSZWdpc3Ry eTo6Y2FsbFJlcGx5QmxvY2sodWludDY0X3QgcmVwbHlJRCwgY29uc3QgVXNlckRhdGEmIGJsb2Nr SW52b2NhdGlvbikKIHsKKyAgICBib29sIHdhc1JlbW92ZWQgPSBtX3BlbmRpbmdSZXBsaWVzLnJl bW92ZShyZXBseUlEKTsKKyAgICBBU1NFUlRfVU5VU0VEKHdhc1JlbW92ZWQsIHdhc1JlbW92ZWQp OworCiAjaWYgV0tfQVBJX0VOQUJMRUQKICAgICBbbV9yZW1vdGVPYmplY3RSZWdpc3RyeSBfY2Fs bFJlcGx5V2l0aElEOnJlcGx5SUQgYmxvY2tJbnZvY2F0aW9uOmJsb2NrSW52b2NhdGlvbl07CiAj ZW5kaWYKQEAgLTc1LDYgKzk2LDkgQEAgdm9pZCBSZW1vdGVPYmplY3RSZWdpc3RyeTo6Y2FsbFJl cGx5QmxvY2sodWludDY0X3QgcmVwbHlJRCwgY29uc3QgVXNlckRhdGEmIGJsb2MKIAogdm9pZCBS ZW1vdGVPYmplY3RSZWdpc3RyeTo6cmVsZWFzZVVudXNlZFJlcGx5QmxvY2sodWludDY0X3QgcmVw bHlJRCkKIHsKKyAgICBib29sIHdhc1JlbW92ZWQgPSBtX3BlbmRpbmdSZXBsaWVzLnJlbW92ZShy ZXBseUlEKTsKKyAgICBBU1NFUlRfVU5VU0VEKHdhc1JlbW92ZWQsIHdhc1JlbW92ZWQpOworCiAj aWYgV0tfQVBJX0VOQUJMRUQKICAgICBbbV9yZW1vdGVPYmplY3RSZWdpc3RyeSBfcmVsZWFzZVJl cGx5V2l0aElEOnJlcGx5SURdOwogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1No YXJlZC9BUEkvQ29jb2EvX1dLUmVtb3RlT2JqZWN0UmVnaXN0cnkubW0gYi9Tb3VyY2UvV2ViS2l0 L1NoYXJlZC9BUEkvQ29jb2EvX1dLUmVtb3RlT2JqZWN0UmVnaXN0cnkubW0KaW5kZXggMzkyMTZi Mzc1ZDI2YTUyMGIyNzY0ZDg2NDIyMTVmNjgzYTBjNmExYi4uYjY0YTMzYmQxYmQxNmEzN2M4NjEw ZWEyMjk1NWQ1NmZmYjQzOWNkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvQVBJ L0NvY29hL19XS1JlbW90ZU9iamVjdFJlZ2lzdHJ5Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hh cmVkL0FQSS9Db2NvYS9fV0tSZW1vdGVPYmplY3RSZWdpc3RyeS5tbQpAQCAtMTA2LDEyICsxMDYs MjIgQEAgLSAoaWQpcmVtb3RlT2JqZWN0UHJveHlXaXRoSW50ZXJmYWNlOihfV0tSZW1vdGVPYmpl Y3RJbnRlcmZhY2UgKilpbnRlcmZhY2UKICAgICByZXR1cm4gcmVtb3RlT2JqZWN0LmF1dG9yZWxl YXNlKCk7CiB9CiAKLS0gKGlkKV9pbml0V2l0aE1lc3NhZ2VTZW5kZXI6KElQQzo6TWVzc2FnZVNl bmRlciYpbWVzc2FnZVNlbmRlcgorLSAoaWQpX2luaXRXaXRoV2ViUGFnZTooV2ViS2l0OjpXZWJQ YWdlJilwYWdlCiB7CiAgICAgaWYgKCEoc2VsZiA9IFtzdXBlciBpbml0XSkpCiAgICAgICAgIHJl dHVybiBuaWw7CiAKLSAgICBfcmVtb3RlT2JqZWN0UmVnaXN0cnkgPSBzdGQ6Om1ha2VfdW5pcXVl PFJlbW90ZU9iamVjdFJlZ2lzdHJ5PihzZWxmLCBtZXNzYWdlU2VuZGVyKTsKKyAgICBfcmVtb3Rl T2JqZWN0UmVnaXN0cnkgPSBzdGQ6Om1ha2VfdW5pcXVlPFJlbW90ZU9iamVjdFJlZ2lzdHJ5Pihz ZWxmLCBwYWdlKTsKKworICAgIHJldHVybiBzZWxmOworfQorCistIChpZClfaW5pdFdpdGhXZWJQ YWdlUHJveHk6KFdlYktpdDo6V2ViUGFnZVByb3h5JilwYWdlCit7CisgICAgaWYgKCEoc2VsZiA9 IFtzdXBlciBpbml0XSkpCisgICAgICAgIHJldHVybiBuaWw7CisKKyAgICBfcmVtb3RlT2JqZWN0 UmVnaXN0cnkgPSBzdGQ6Om1ha2VfdW5pcXVlPFJlbW90ZU9iamVjdFJlZ2lzdHJ5PihzZWxmLCBw YWdlKTsKIAogICAgIHJldHVybiBzZWxmOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9T aGFyZWQvQVBJL0NvY29hL19XS1JlbW90ZU9iamVjdFJlZ2lzdHJ5SW50ZXJuYWwuaCBiL1NvdXJj ZS9XZWJLaXQvU2hhcmVkL0FQSS9Db2NvYS9fV0tSZW1vdGVPYmplY3RSZWdpc3RyeUludGVybmFs LmgKaW5kZXggODZhMWMyMjI4ZjY0MmUzZDk4ZjMzZGZhNjQzNzM3MDNkNzgyOTEyYS4uNzcwZTkz MTJjNjQ4YTI0YWUxZDM0M2VhMWMwYmZkMzY3MzI0MmZjMiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9TaGFyZWQvQVBJL0NvY29hL19XS1JlbW90ZU9iamVjdFJlZ2lzdHJ5SW50ZXJuYWwuaAor KysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9BUEkvQ29jb2EvX1dLUmVtb3RlT2JqZWN0UmVnaXN0 cnlJbnRlcm5hbC5oCkBAIC0zNSwxMyArMzUsMTYgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiBjbGFz cyBSZW1vdGVPYmplY3RJbnZvY2F0aW9uOwogY2xhc3MgUmVtb3RlT2JqZWN0UmVnaXN0cnk7CiBj bGFzcyBVc2VyRGF0YTsKK2NsYXNzIFdlYlBhZ2U7CitjbGFzcyBXZWJQYWdlUHJveHk7CiB9CiAK IEBpbnRlcmZhY2UgX1dLUmVtb3RlT2JqZWN0UmVnaXN0cnkgKCkKIAogQHByb3BlcnR5IChub25h dG9taWMsIHJlYWRvbmx5KSBXZWJLaXQ6OlJlbW90ZU9iamVjdFJlZ2lzdHJ5JiByZW1vdGVPYmpl Y3RSZWdpc3RyeTsKIAotLSAoaWQpX2luaXRXaXRoTWVzc2FnZVNlbmRlcjooSVBDOjpNZXNzYWdl U2VuZGVyJiltZXNzYWdlU2VuZGVyOworLSAoaWQpX2luaXRXaXRoV2ViUGFnZTooV2ViS2l0OjpX ZWJQYWdlJiltZXNzYWdlU2VuZGVyOworLSAoaWQpX2luaXRXaXRoV2ViUGFnZVByb3h5OihXZWJL aXQ6OldlYlBhZ2VQcm94eSYpbWVzc2FnZVNlbmRlcjsKIC0gKHZvaWQpX2ludmFsaWRhdGU7CiAK IC0gKHZvaWQpX3NlbmRJbnZvY2F0aW9uOihOU0ludm9jYXRpb24gKilpbnZvY2F0aW9uIGludGVy ZmFjZTooX1dLUmVtb3RlT2JqZWN0SW50ZXJmYWNlICopaW50ZXJmYWNlOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbSBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KaW5kZXggMDI0ZDM0Y2QwMDA2 MzdlMDEzNjJlN2IzYTY0MWFlZDRmNWYxMTFmMC4uYTY0M2RhZWVmZjIxZjU5NDIyN2ZmODhiZjYy ZmFkMDFjY2FhYjczYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0Nv Y29hL1dLV2ViVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2Ev V0tXZWJWaWV3Lm1tCkBAIC00MTc4LDcgKzQxNzgsNyBAQCAtIChfV0tSZW1vdGVPYmplY3RSZWdp c3RyeSAqKV9yZW1vdGVPYmplY3RSZWdpc3RyeQogICAgIHJldHVybiBfaW1wbC0+cmVtb3RlT2Jq ZWN0UmVnaXN0cnkoKTsKICNlbHNlCiAgICAgaWYgKCFfcmVtb3RlT2JqZWN0UmVnaXN0cnkpIHsK LSAgICAgICAgX3JlbW90ZU9iamVjdFJlZ2lzdHJ5ID0gYWRvcHROUyhbW19XS1JlbW90ZU9iamVj dFJlZ2lzdHJ5IGFsbG9jXSBfaW5pdFdpdGhNZXNzYWdlU2VuZGVyOipfcGFnZV0pOworICAgICAg ICBfcmVtb3RlT2JqZWN0UmVnaXN0cnkgPSBhZG9wdE5TKFtbX1dLUmVtb3RlT2JqZWN0UmVnaXN0 cnkgYWxsb2NdIF9pbml0V2l0aFdlYlBhZ2VQcm94eToqX3BhZ2VdKTsKICAgICAgICAgX3BhZ2Ut PnByb2Nlc3MoKS5wcm9jZXNzUG9vbCgpLmFkZE1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6UmVt b3RlT2JqZWN0UmVnaXN0cnk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgX3BhZ2UtPnBhZ2VJRCgp LCBbX3JlbW90ZU9iamVjdFJlZ2lzdHJ5IHJlbW90ZU9iamVjdFJlZ2lzdHJ5XSk7CiAgICAgfQog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1wbC5t bSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJbXBsLm1tCmluZGV4IDE2 YzE5ODIyMGM0ZmNkZDNkNTdkMWIzYWYwNmUwNGM2OWQ4OTkzOGMuLjg2YWNiYjc1ZDNlNjI0NDc0 OGMwZjY4ODk5MDNmZGM1YzczMTFmNzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0NvY29hL1dlYlZpZXdJbXBsLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0Nv Y29hL1dlYlZpZXdJbXBsLm1tCkBAIC0zNjA4LDcgKzM2MDgsNyBAQCBOU1ZpZXcgKldlYlZpZXdJ bXBsOjppbnNwZWN0b3JBdHRhY2htZW50VmlldygpCiBfV0tSZW1vdGVPYmplY3RSZWdpc3RyeSAq V2ViVmlld0ltcGw6OnJlbW90ZU9iamVjdFJlZ2lzdHJ5KCkKIHsKICAgICBpZiAoIW1fcmVtb3Rl T2JqZWN0UmVnaXN0cnkpIHsKLSAgICAgICAgbV9yZW1vdGVPYmplY3RSZWdpc3RyeSA9IGFkb3B0 TlMoW1tfV0tSZW1vdGVPYmplY3RSZWdpc3RyeSBhbGxvY10gX2luaXRXaXRoTWVzc2FnZVNlbmRl cjptX3BhZ2VdKTsKKyAgICAgICAgbV9yZW1vdGVPYmplY3RSZWdpc3RyeSA9IGFkb3B0TlMoW1tf V0tSZW1vdGVPYmplY3RSZWdpc3RyeSBhbGxvY10gX2luaXRXaXRoV2ViUGFnZVByb3h5Om1fcGFn ZV0pOwogICAgICAgICBtX3BhZ2UtPnByb2Nlc3MoKS5wcm9jZXNzUG9vbCgpLmFkZE1lc3NhZ2VS ZWNlaXZlcihNZXNzYWdlczo6UmVtb3RlT2JqZWN0UmVnaXN0cnk6Om1lc3NhZ2VSZWNlaXZlck5h bWUoKSwgbV9wYWdlLT5wYWdlSUQoKSwgW21fcmVtb3RlT2JqZWN0UmVnaXN0cnkgcmVtb3RlT2Jq ZWN0UmVnaXN0cnldKTsKICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvbWFjL1dLV2ViUHJvY2Vzc1BsdWdJbkJyb3dzZXJDb250 ZXh0Q29udHJvbGxlci5tbSBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRs ZS9BUEkvbWFjL1dLV2ViUHJvY2Vzc1BsdWdJbkJyb3dzZXJDb250ZXh0Q29udHJvbGxlci5tbQpp bmRleCBkNWUwOTM2M2I1NDVkZjlmOWM0OTdhNjMwOWJiYjY1ZTQ5YWVhMTRiLi41NzczOThhYTVk MjI1ZmFkMzA4ZjFjMGRiODIyYmJmMjVkMGUwMGY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL21hYy9XS1dlYlByb2Nlc3NQbHVnSW5Ccm93 c2VyQ29udGV4dENvbnRyb2xsZXIubW0KKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0lu amVjdGVkQnVuZGxlL0FQSS9tYWMvV0tXZWJQcm9jZXNzUGx1Z0luQnJvd3NlckNvbnRleHRDb250 cm9sbGVyLm1tCkBAIC00MzAsNyArNDMwLDcgQEAgKyAoaW5zdGFuY2V0eXBlKWxvb2tVcEJyb3dz aW5nQ29udGV4dEZyb21IYW5kbGU6KFdLQnJvd3NpbmdDb250ZXh0SGFuZGxlICopaGFuZGwKIC0g KF9XS1JlbW90ZU9iamVjdFJlZ2lzdHJ5ICopX3JlbW90ZU9iamVjdFJlZ2lzdHJ5CiB7CiAgICAg aWYgKCFfcmVtb3RlT2JqZWN0UmVnaXN0cnkpIHsKLSAgICAgICAgX3JlbW90ZU9iamVjdFJlZ2lz dHJ5ID0gYWRvcHROUyhbW19XS1JlbW90ZU9iamVjdFJlZ2lzdHJ5IGFsbG9jXSBfaW5pdFdpdGhN ZXNzYWdlU2VuZGVyOipfcGFnZV0pOworICAgICAgICBfcmVtb3RlT2JqZWN0UmVnaXN0cnkgPSBh ZG9wdE5TKFtbX1dLUmVtb3RlT2JqZWN0UmVnaXN0cnkgYWxsb2NdIF9pbml0V2l0aFdlYlBhZ2U6 Kl9wYWdlXSk7CiAgICAgICAgIFdlYlByb2Nlc3M6OnNpbmdsZXRvbigpLmFkZE1lc3NhZ2VSZWNl aXZlcihNZXNzYWdlczo6UmVtb3RlT2JqZWN0UmVnaXN0cnk6Om1lc3NhZ2VSZWNlaXZlck5hbWUo KSwgX3BhZ2UtPnBhZ2VJRCgpLCBbX3JlbW90ZU9iamVjdFJlZ2lzdHJ5IHJlbW90ZU9iamVjdFJl Z2lzdHJ5XSk7CiAgICAgfQogCg==