191266 2018-11-05 09:24:25 -0800 Use same limit for page cache and suspended pages 2018-11-05 13:39:23 -0800 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez achristensen beidson commit-queue ggaren koivisto webkit-bug-importer oldest_to_newest 1475110 0 cdumez 2018-11-05 09:24:25 -0800 Use same limit for page cache and suspended pages as they serve the same purpose. 1475116 1 353872 cdumez 2018-11-05 09:26:42 -0800 Created attachment 353872 Patch 1475217 2 353872 ggaren 2018-11-05 11:51:21 -0800 Comment on attachment 353872 Patch r=me 1475251 3 353872 commit-queue 2018-11-05 13:38:13 -0800 Comment on attachment 353872 Patch Clearing flags on attachment: 353872 Committed r237830: <https://trac.webkit.org/changeset/237830> 1475253 4 commit-queue 2018-11-05 13:38:15 -0800 All reviewed patches have been landed. Closing bug. 1475254 5 webkit-bug-importer 2018-11-05 13:39:23 -0800 <rdar://problem/45818374> 353872 2018-11-05 09:26:42 -0800 2018-11-05 13:38:13 -0800 Patch bug-191266-20181105092641.patch text/plain 12072 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjM3NzUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDhiODg1OTc1NjVjZDU1MTA2 YmUzOWFlZDFlOWZlYTJjYzkyYmRiMzYuLjYwMDU4MDU1ZTI0MTM1YTk3ZmE3YjJjYzBiZTA5ZjVi MjBjYjQ3MzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTgtMTEtMDUgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBVc2Ugc2FtZSBsaW1pdCBmb3IgcGFn ZSBjYWNoZSBhbmQgc3VzcGVuZGVkIHBhZ2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xOTEyNjYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBVc2Ugc2FtZSBsaW1pdCBmb3IgcGFnZSBjYWNoZSBhbmQgc3Vz cGVuZGVkIHBhZ2VzIGFzIHRoZXkgc2VydmUgdGhlIHNhbWUgcHVycG9zZS4KKworICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tQcm9jZXNzUG9vbC5tbToKKyAgICAgICAgKC1bV0tQcm9j ZXNzUG9vbCBfbWF4aW11bVN1c3BlbmRlZFBhZ2VDb3VudF0pOgorICAgICAgICAqIFVJUHJvY2Vz cy9BUEkvQ29jb2EvV0tQcm9jZXNzUG9vbFByaXZhdGUuaDoKKyAgICAgICAgKiBVSVByb2Nlc3Mv V2ViUHJvY2Vzc1Bvb2wuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUG9vbDo6dXBk YXRlTWF4U3VzcGVuZGVkUGFnZUNvdW50KToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Bv b2w6OnNldENhY2hlTW9kZWwpOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUG9vbDo6YWRk U3VzcGVuZGVkUGFnZVByb3h5KToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wu aDoKKwogMjAxOC0xMS0wMiAgRGFuaWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBsZS5jb20+CiAKICAg ICAgICAgW2lPU10gV2ViS2l0IHNob3VsZCBkaXNwYXRjaCBET00gZXZlbnRzIHdoZW4gYSBtb2Rp ZmllciBrZXkgaXMgcHJlc3NlZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QVBJL0NvY29hL1dLUHJvY2Vzc1Bvb2wubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkv Q29jb2EvV0tQcm9jZXNzUG9vbC5tbQppbmRleCAxMWJlYmRhNWNjNGIwZmU5MDg1ZjU2MjI3NmNl MTQ2M2I0MzU1ZjIzLi4yMDJjYTdlZjlkMjYwOGEyMWFkZTkxNWViN2EwMGI0ZWY1OTI0YTI5IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tQcm9jZXNzUG9v bC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tQcm9jZXNzUG9v bC5tbQpAQCAtNTA2LDYgKzUwNiwxMSBAQCAtIChzaXplX3QpX3BsdWdpblByb2Nlc3NDb3VudAog I2VuZGlmCiB9CiAKKy0gKE5TVUludGVnZXIpX21heGltdW1TdXNwZW5kZWRQYWdlQ291bnQKK3sK KyAgICByZXR1cm4gX3Byb2Nlc3NQb29sLT5tYXhTdXNwZW5kZWRQYWdlQ291bnQoKTsKK30KKwog LSAoc2l6ZV90KV9zZXJ2aWNlV29ya2VyUHJvY2Vzc0NvdW50CiB7CiAjaWYgRU5BQkxFKFNFUlZJ Q0VfV09SS0VSKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29h L1dLUHJvY2Vzc1Bvb2xQcml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29j b2EvV0tQcm9jZXNzUG9vbFByaXZhdGUuaAppbmRleCAwNzJkYTU5MzQzZWNjZTA2MTI0N2Y1ODRi NzI0NTI2MDAxOTY3NTg2Li5jYzYzM2ExNjY5ZWJmNGVkZmU1NDQ1ZjlkYTllYzZmODkyZDNkNWI1 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tQcm9jZXNz UG9vbFByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tQ cm9jZXNzUG9vbFByaXZhdGUuaApAQCAtMTAwLDYgKzEwMCw3IEBACiAtICh2b2lkKV9zeW5jTmV0 d29ya1Byb2Nlc3NDb29raWVzIFdLX0FQSV9BVkFJTEFCTEUobWFjb3N4KDEwLjEzKSwgaW9zKDEx LjApKTsKIC0gKHZvaWQpX21ha2VOZXh0V2ViUHJvY2Vzc0xhdW5jaEZhaWxGb3JUZXN0aW5nIFdL X0FQSV9BVkFJTEFCTEUobWFjb3N4KDEwLjE0KSwgaW9zKDEyLjApKTsKIC0gKHZvaWQpX21ha2VO ZXh0TmV0d29ya1Byb2Nlc3NMYXVuY2hGYWlsRm9yVGVzdGluZyBXS19BUElfQVZBSUxBQkxFKG1h Y29zeCgxMC4xNCksIGlvcygxMi4wKSk7CistIChOU1VJbnRlZ2VyKV9tYXhpbXVtU3VzcGVuZGVk UGFnZUNvdW50IFdLX0FQSV9BVkFJTEFCTEUobWFjb3N4KFdLX01BQ19UQkEpLCBpb3MoV0tfSU9T X1RCQSkpOwogCiAvLyBUZXN0IG9ubHkuIFJldHVybnMgd2ViIHByb2Nlc3NlcyBydW5uaW5nIHdl YiBwYWdlcyAoZG9lcyBub3QgaW5jbHVkZSB3ZWIgcHJvY2Vzc2VzIHJ1bm5pbmcgc2VydmljZSB3 b3JrZXJzKQogLSAoc2l6ZV90KV93ZWJQYWdlQ29udGVudFByb2Nlc3NDb3VudCBXS19BUElfQVZB SUxBQkxFKG1hY29zeCgxMC4xMy40KSwgaW9zKDExLjMpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1dlYlByb2Nlc3NQb29sLmNwcAppbmRleCAxOTg2MGU4N2ZjNjlmY2FlN2UzMTFjYjRiMWRm NzE2OTFkMjFiMjkxLi5lNGE4NzcwNDc1NzhjNDhmNDBkNzFjNjkyN2M5NjVkYjk2MmI3OTQwIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAKKysr IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCkBAIC0xMjUsNyAr MTI1LDYgQEAgdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiBERUZJTkVfREVCVUdfT05MWV9HTE9C QUwoV1RGOjpSZWZDb3VudGVkTGVha0NvdW50ZXIsIHByb2Nlc3NQb29sQ291bnRlciwgKCJXZWJQ cm9jZXNzUG9vbCIpKTsKIAogY29uc3QgU2Vjb25kcyBzZXJ2aWNlV29ya2VyVGVybWluYXRpb25E ZWxheSB7IDVfcyB9OwotY29uc3QgdW5zaWduZWQgbWF4aW11bVN1c3BlbmRlZFBhZ2VzQ291bnQg eyAzIH07CiAKIHN0YXRpYyB1aW50NjRfdCBnZW5lcmF0ZUxpc3RlbmVySWRlbnRpZmllcigpCiB7 CkBAIC0zMDEsNiArMzAwLDggQEAgV2ViUHJvY2Vzc1Bvb2w6OldlYlByb2Nlc3NQb29sKEFQSTo6 UHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uJiBjb25maWd1cmF0aW9uKQogI2VuZGlmCiAKICAgICBu b3RpZnlUaGlzV2ViUHJvY2Vzc1Bvb2xXYXNDcmVhdGVkKCk7CisKKyAgICB1cGRhdGVNYXhTdXNw ZW5kZWRQYWdlQ291bnQoKTsKIH0KIAogV2ViUHJvY2Vzc1Bvb2w6On5XZWJQcm9jZXNzUG9vbCgp CkBAIC0xNDcwLDkgKzE0NzEsMjQgQEAgdm9pZCBXZWJQcm9jZXNzUG9vbDo6cmVnaXN0ZXJVUkxT Y2hlbWVBc0NhbkRpc3BsYXlPbmx5SWZDYW5SZXF1ZXN0KGNvbnN0IFN0cmluZyYKICAgICBzZW5k VG9OZXR3b3JraW5nUHJvY2VzcyhNZXNzYWdlczo6TmV0d29ya1Byb2Nlc3M6OlJlZ2lzdGVyVVJM U2NoZW1lQXNDYW5EaXNwbGF5T25seUlmQ2FuUmVxdWVzdCh1cmxTY2hlbWUpKTsKIH0KIAordm9p ZCBXZWJQcm9jZXNzUG9vbDo6dXBkYXRlTWF4U3VzcGVuZGVkUGFnZUNvdW50KCkKK3sKKyAgICB1 bnNpZ25lZCBkdW1teSA9IDA7CisgICAgU2Vjb25kcyBkdW1teUludGVydmFsOworICAgIHVuc2ln bmVkIHBhZ2VDYWNoZVNpemUgPSAwOworICAgIGNhbGN1bGF0ZU1lbW9yeUNhY2hlU2l6ZXMobV9j b25maWd1cmF0aW9uLT5jYWNoZU1vZGVsKCksIGR1bW15LCBkdW1teSwgZHVtbXksIGR1bW15SW50 ZXJ2YWwsIHBhZ2VDYWNoZVNpemUpOworCisgICAgbV9tYXhTdXNwZW5kZWRQYWdlQ291bnQgPSBw YWdlQ2FjaGVTaXplOworCisgICAgd2hpbGUgKG1fc3VzcGVuZGVkUGFnZXMuc2l6ZSgpID4gbV9t YXhTdXNwZW5kZWRQYWdlQ291bnQpCisgICAgICAgIG1fc3VzcGVuZGVkUGFnZXMucmVtb3ZlRmly c3QoKTsKK30KKwogdm9pZCBXZWJQcm9jZXNzUG9vbDo6c2V0Q2FjaGVNb2RlbChDYWNoZU1vZGVs IGNhY2hlTW9kZWwpCiB7CiAgICAgbV9jb25maWd1cmF0aW9uLT5zZXRDYWNoZU1vZGVsKGNhY2hl TW9kZWwpOworICAgIHVwZGF0ZU1heFN1c3BlbmRlZFBhZ2VDb3VudCgpOworCiAgICAgc2VuZFRv QWxsUHJvY2Vzc2VzKE1lc3NhZ2VzOjpXZWJQcm9jZXNzOjpTZXRDYWNoZU1vZGVsKGNhY2hlTW9k ZWwpKTsKIAogICAgIGlmIChtX25ldHdvcmtQcm9jZXNzKQpAQCAtMjIzNCw3ICsyMjUwLDcgQEAg UmVmPFdlYlByb2Nlc3NQcm94eT4gV2ViUHJvY2Vzc1Bvb2w6OnByb2Nlc3NGb3JOYXZpZ2F0aW9u SW50ZXJuYWwoV2ViUGFnZVByb3h5JgogCiB2b2lkIFdlYlByb2Nlc3NQb29sOjphZGRTdXNwZW5k ZWRQYWdlUHJveHkoc3RkOjp1bmlxdWVfcHRyPFN1c3BlbmRlZFBhZ2VQcm94eT4mJiBzdXNwZW5k ZWRQYWdlKQogewotICAgIGlmIChtX3N1c3BlbmRlZFBhZ2VzLnNpemUoKSA+PSBtYXhpbXVtU3Vz cGVuZGVkUGFnZXNDb3VudCkKKyAgICBpZiAobV9zdXNwZW5kZWRQYWdlcy5zaXplKCkgPj0gbV9t YXhTdXNwZW5kZWRQYWdlQ291bnQpCiAgICAgICAgIG1fc3VzcGVuZGVkUGFnZXMucmVtb3ZlRmly c3QoKTsKIAogICAgIG1fc3VzcGVuZGVkUGFnZXMuYXBwZW5kKFdURk1vdmUoc3VzcGVuZGVkUGFn ZSkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wu aCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmgKaW5kZXggZGZhY2Y4 MTNmNzA1NjhjMmVmMjRjZjBhNDJmYmFkMThhNzU5OThmZi4uZDcxZTM0NDI0ZmNkZmZhMTY4NjVh ZWI3YTJhYzFiY2Y3YzgyYTAwZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv V2ViUHJvY2Vzc1Bvb2wuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNz UG9vbC5oCkBAIC00NDksNiArNDQ5LDcgQEAgcHVibGljOgogICAgIHZvaWQgcmVtb3ZlQWxsU3Vz cGVuZGVkUGFnZVByb3hpZXNGb3JQYWdlKFdlYlBhZ2VQcm94eSYpOwogICAgIHN0ZDo6dW5pcXVl X3B0cjxTdXNwZW5kZWRQYWdlUHJveHk+IHRha2VTdXNwZW5kZWRQYWdlUHJveHkoU3VzcGVuZGVk UGFnZVByb3h5Jik7CiAgICAgYm9vbCBoYXNTdXNwZW5kZWRQYWdlUHJveHlGb3IoV2ViUHJvY2Vz c1Byb3h5JikgY29uc3Q7CisgICAgdW5zaWduZWQgbWF4U3VzcGVuZGVkUGFnZUNvdW50KCkgY29u c3QgeyByZXR1cm4gbV9tYXhTdXNwZW5kZWRQYWdlQ291bnQ7IH0KIAogICAgIHZvaWQgZGlkUmVh Y2hHb29kVGltZVRvUHJld2FybSgpOwogCkBAIC01MzgsNiArNTM5LDggQEAgcHJpdmF0ZToKIAog ICAgIHZvaWQgdHJ5UHJld2FybVdpdGhEb21haW5JbmZvcm1hdGlvbihXZWJQcm9jZXNzUHJveHkm LCBjb25zdCBXZWJDb3JlOjpVUkwmKTsKIAorICAgIHZvaWQgdXBkYXRlTWF4U3VzcGVuZGVkUGFn ZUNvdW50KCk7CisKICAgICBSZWY8QVBJOjpQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24+IG1fY29u ZmlndXJhdGlvbjsKIAogICAgIElQQzo6TWVzc2FnZVJlY2VpdmVyTWFwIG1fbWVzc2FnZVJlY2Vp dmVyTWFwOwpAQCAtNzEyLDYgKzcxNSw4IEBAIHByaXZhdGU6CiAjZW5kaWYKIAogICAgIERlcXVl PHN0ZDo6dW5pcXVlX3B0cjxTdXNwZW5kZWRQYWdlUHJveHk+PiBtX3N1c3BlbmRlZFBhZ2VzOwor ICAgIHVuc2lnbmVkIG1fbWF4U3VzcGVuZGVkUGFnZUNvdW50IHsgMCB9OworCiAgICAgSGFzaE1h cDxTdHJpbmcsIFJlZlB0cjxXZWJQcm9jZXNzUHJveHk+PiBtX3N3YXBwZWRQcm9jZXNzZXNQZXJS ZWdpc3RyYWJsZURvbWFpbjsKIAogICAgIEhhc2hNYXA8U3RyaW5nLCBzdGQ6OnVuaXF1ZV9wdHI8 V2ViQ29yZTo6UHJld2FybUluZm9ybWF0aW9uPj4gbV9wcmV3YXJtSW5mb3JtYXRpb25QZXJSZWdp c3RyYWJsZURvbWFpbjsKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5n ZUxvZwppbmRleCA4ODcxMDQwMjVlMmJmNDlkZjg3ZWZiNThiYmNiMTVmMDA4MDZiYmY4Li5hNmI2 ODNjOTQxOGU3OWE0ZWM3ODIxZWI5MTYyMWYyM2M0NjEwMmQwIDEwMDY0NAotLS0gYS9Ub29scy9D aGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTgtMTEt MDUgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBVc2Ugc2FtZSBs aW1pdCBmb3IgcGFnZSBjYWNoZSBhbmQgc3VzcGVuZGVkIHBhZ2VzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTEyNjYKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVcGRhdGUgQVBJIHRlc3RzIGFjY29yZGlu Z2x5LgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNz U3dhcE9uTmF2aWdhdGlvbi5tbToKKwogMjAxOC0xMS0wMiAgUGhpbGlwcGUgTm9ybWFuZCAgPHBu b3JtYW5kQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS11bV1BFXSBFbmFibGUgR1NUX0RFQlVH X05PX0NPTE9SIGVudmlyb25tZW50IHZhcmlhYmxlIHBhc3MtdGhyb3VnaApkaWZmIC0tZ2l0IGEv VG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2aWdh dGlvbi5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3 YXBPbk5hdmlnYXRpb24ubW0KaW5kZXggYzY0ZjM1MzkyODllNTdmYjIxMThkODFjNTY5MTc1MTM2 NzQ4NDJhOC4uNGI1YTk0NjI3MGZhOWU1MmM5MzQ4ZDcwMTBiOWEyY2IxZWEyMzQ2OSAxMDA2NDQK LS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dhcE9u TmF2aWdhdGlvbi5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29h L1Byb2Nlc3NTd2FwT25OYXZpZ2F0aW9uLm1tCkBAIC01MjIsNyArNTIyLDYgQEAgVEVTVChQcm9j ZXNzU3dhcCwgTm9Td2FwcGluZ0ZvcmVUTERQbHVzMikKICAgICBFWFBFQ1RfRVEobnVtYmVyT2ZE ZWNpZGVQb2xpY3lDYWxscywgMik7CiB9CiAKLS8vIFdlIGN1cnJlbnRseSBrZWVwIDMgc3VzcGVu ZGVkIHBhZ2VzIGFyb3VuZCBzbyB3ZSBjYW4gZ28gYmFjayAzIHRpbWVzIGFuZCB1c2UgdGhlIHBh Z2UgY2FjaGUgZm9yIGVhY2ggbG9hZC4KIFRFU1QoUHJvY2Vzc1N3YXAsIEJhY2spCiB7CiAgICAg YXV0byBwcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtbX1dLUHJvY2Vzc1Bvb2xD b25maWd1cmF0aW9uIGFsbG9jXSBpbml0XSk7CkBAIC01NDQsNiArNTQzLDggQEAgVEVTVChQcm9j ZXNzU3dhcCwgQmFjaykKICAgICBhdXRvIGRlbGVnYXRlID0gYWRvcHROUyhbW1BTT05OYXZpZ2F0 aW9uRGVsZWdhdGUgYWxsb2NdIGluaXRdKTsKICAgICBbd2ViVmlldyBzZXROYXZpZ2F0aW9uRGVs ZWdhdGU6ZGVsZWdhdGUuZ2V0KCldOwogCisgICAgRVhQRUNUX0dUKFtwcm9jZXNzUG9vbCBfbWF4 aW11bVN1c3BlbmRlZFBhZ2VDb3VudF0sIDBVKTsKKwogICAgIE5TVVJMUmVxdWVzdCAqcmVxdWVz dCA9IFtOU1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6W05TVVJMIFVSTFdpdGhTdHJpbmc6QCJw c29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIl1dOwogICAgIFt3ZWJWaWV3IGxvYWRSZXF1 ZXN0OnJlcXVlc3RdOwogCkBAIC01OTksMzEgKzYwMCwzMCBAQCBURVNUKFByb2Nlc3NTd2FwLCBC YWNrKQogICAgIGRvbmUgPSBmYWxzZTsKIAogICAgIGF1dG8gcGlkQWZ0ZXJTZWNvbmRCYWNrTmF2 aWdhdGlvbiA9IFt3ZWJWaWV3IF93ZWJQcm9jZXNzSWRlbnRpZmllcl07Ci0gICAgRVhQRUNUX0VR KGFwcGxlUElELCBwaWRBZnRlclNlY29uZEJhY2tOYXZpZ2F0aW9uKTsKLQotICAgIFt3ZWJWaWV3 IGdvQmFja107IC8vIEJhY2sgdG8gd2Via2l0Lm9yZy4KLQotICAgIFRlc3RXZWJLaXRBUEk6OlV0 aWw6OnJ1bigmcmVjZWl2ZWRNZXNzYWdlKTsKLSAgICByZWNlaXZlZE1lc3NhZ2UgPSBmYWxzZTsK LSAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRvbmUpOwotICAgIGRvbmUgPSBmYWxzZTsK KyAgICBpZiAoW3Byb2Nlc3NQb29sIF9tYXhpbXVtU3VzcGVuZGVkUGFnZUNvdW50XSA+IDEpCisg ICAgICAgIEVYUEVDVF9FUShhcHBsZVBJRCwgcGlkQWZ0ZXJTZWNvbmRCYWNrTmF2aWdhdGlvbik7 CisgICAgZWxzZSB7CisgICAgICAgIEVYUEVDVF9ORShhcHBsZVBJRCwgcGlkQWZ0ZXJTZWNvbmRC YWNrTmF2aWdhdGlvbik7CisgICAgICAgIEVYUEVDVF9ORShnb29nbGVQSUQsIHBpZEFmdGVyU2Vj b25kQmFja05hdmlnYXRpb24pOworICAgIH0KIAotICAgIGF1dG8gcGlkQWZ0ZXJUaGlyZEJhY2tO YXZpZ2F0aW9uID0gW3dlYlZpZXcgX3dlYlByb2Nlc3NJZGVudGlmaWVyXTsKLSAgICBFWFBFQ1Rf RVEod2Via2l0UElELCBwaWRBZnRlclRoaXJkQmFja05hdmlnYXRpb24pOwogCi0gICAgLy8gNyBs b2FkcywgNyBkZWNpZGVQb2xpY3kgY2FsbHMgKGUuZy4gYW55IGxvYWQgdGhhdCBwZXJmb3JtcyBh IHByb2Nlc3Mgc3dhcCBzaG91bGQgbm90IGhhdmUgZ2VuZXJhdGVkIGFuCisgICAgLy8gNiBsb2Fk cywgNiBkZWNpZGVQb2xpY3kgY2FsbHMgKGUuZy4gYW55IGxvYWQgdGhhdCBwZXJmb3JtcyBhIHBy b2Nlc3Mgc3dhcCBzaG91bGQgbm90IGhhdmUgZ2VuZXJhdGVkIGFuCiAgICAgLy8gYWRkaXRpb25h bCBkZWNpZGVQb2xpY3kgY2FsbCBhcyBhIHJlc3VsdCBvZiB0aGUgcHJvY2VzcyBzd2FwKQotICAg IEVYUEVDVF9FUSg3LCBudW1iZXJPZkRlY2lkZVBvbGljeUNhbGxzKTsKKyAgICBFWFBFQ1RfRVEo NiwgbnVtYmVyT2ZEZWNpZGVQb2xpY3lDYWxscyk7CiAKLSAgICBFWFBFQ1RfRVEoNnUsIFtyZWNl aXZlZE1lc3NhZ2VzIGNvdW50XSk7CisgICAgRVhQRUNUX0VRKDV1LCBbcmVjZWl2ZWRNZXNzYWdl cyBjb3VudF0pOwogICAgIEVYUEVDVF9XS19TVFJFUShAIlBhZ2VTaG93IGNhbGxlZC4gUGVyc2lz dGVkOiBmYWxzZSwgYW5kIHdpbmRvdy5oaXN0b3J5LnN0YXRlIGlzOiBudWxsIiwgcmVjZWl2ZWRN ZXNzYWdlcy5nZXQoKVswXSk7CiAgICAgRVhQRUNUX1dLX1NUUkVRKEAiUGFnZVNob3cgY2FsbGVk LiBQZXJzaXN0ZWQ6IGZhbHNlLCBhbmQgd2luZG93Lmhpc3Rvcnkuc3RhdGUgaXM6IG51bGwiLCBy ZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzFdKTsKICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJQYWdlU2hv dyBjYWxsZWQuIFBlcnNpc3RlZDogZmFsc2UsIGFuZCB3aW5kb3cuaGlzdG9yeS5zdGF0ZSBpczog bnVsbCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbMl0pOwogICAgIEVYUEVDVF9XS19TVFJFUShA IlBhZ2VTaG93IGNhbGxlZC4gUGVyc2lzdGVkOiB0cnVlLCBhbmQgd2luZG93Lmhpc3Rvcnkuc3Rh dGUgaXM6IG9ubG9hZENhbGxlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0KClbM10pOwotICAgIEVY UEVDVF9XS19TVFJFUShAIlBhZ2VTaG93IGNhbGxlZC4gUGVyc2lzdGVkOiB0cnVlLCBhbmQgd2lu ZG93Lmhpc3Rvcnkuc3RhdGUgaXM6IG9ubG9hZENhbGxlZCIsIHJlY2VpdmVkTWVzc2FnZXMuZ2V0 KClbNF0pOwotICAgIEVYUEVDVF9XS19TVFJFUShAIlBhZ2VTaG93IGNhbGxlZC4gUGVyc2lzdGVk OiB0cnVlLCBhbmQgd2luZG93Lmhpc3Rvcnkuc3RhdGUgaXM6IG9ubG9hZENhbGxlZCIsIHJlY2Vp dmVkTWVzc2FnZXMuZ2V0KClbNV0pOwogCi0gICAgRVhQRUNUX0VRKDR1LCBzZWVuUElEcy5zaXpl KCkpOworICAgIC8vIFRoZSBudW1iZXIgb2Ygc3VzcGVuZGVkIHBhZ2VzIHdlIGtlZXAgYXJvdW5k IGlzIGRldGVybWluZWQgYXQgcnVudGltZS4KKyAgICBpZiAoW3Byb2Nlc3NQb29sIF9tYXhpbXVt U3VzcGVuZGVkUGFnZUNvdW50XSA+IDEpIHsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAiUGFn ZVNob3cgY2FsbGVkLiBQZXJzaXN0ZWQ6IHRydWUsIGFuZCB3aW5kb3cuaGlzdG9yeS5zdGF0ZSBp czogb25sb2FkQ2FsbGVkIiwgcmVjZWl2ZWRNZXNzYWdlcy5nZXQoKVs0XSk7CisgICAgICAgIEVY UEVDVF9FUSg0dSwgc2VlblBJRHMuc2l6ZSgpKTsKKyAgICB9IGVsc2UKKyAgICAgICAgRVhQRUNU X0VRKDV1LCBzZWVuUElEcy5zaXplKCkpOwogfQogCiAjaWYgUExBVEZPUk0oTUFDKQpAQCAtMTM0 OCw3ICsxMzQ4LDggQEAgc3RhdGljIHZvaWQgcnVuQ2xpZW50U2lkZVJlZGlyZWN0VGVzdChTaG91 bGRFbmFibGVQU09OIHNob3VsZEVuYWJsZVBTT04pCiAgICAgRVhQRUNUX0ZBTFNFKGRpZFBlcmZv cm1DbGllbnRSZWRpcmVjdCk7CiAKICAgICBhdXRvIHBpZEFmdGVyQmFja05hdmlnYXRpb24gPSBb d2ViVmlldyBfd2ViUHJvY2Vzc0lkZW50aWZpZXJdOwotICAgIEVYUEVDVF9FUSh3ZWJraXRQSUQs IHBpZEFmdGVyQmFja05hdmlnYXRpb24pOworICAgIGlmIChbcHJvY2Vzc1Bvb2wgX21heGltdW1T dXNwZW5kZWRQYWdlQ291bnRdID4gMSkKKyAgICAgICAgRVhQRUNUX0VRKHdlYmtpdFBJRCwgcGlk QWZ0ZXJCYWNrTmF2aWdhdGlvbik7CiAKICAgICAvLyBWYWxpZGF0ZSBCYWNrL0ZvcndhcmQgbGlz dC4KICAgICBjdXJyZW50SXRlbSA9IGJhY2tGb3J3YXJkTGlzdC5jdXJyZW50SXRlbTsKQEAgLTE2 NTgsNyArMTY1OSw3IEBAIFRFU1QoUHJvY2Vzc1N3YXAsIE1haW5GcmFtZXNPbmx5KQogICAgIEVY UEVDVF9FUSgxdSwgc2VlblBJRHMuc2l6ZSgpKTsKIH0KIAotVEVTVChQcm9jZXNzU3dhcCwgVGhy ZWVQcmV2aW91c1Byb2Nlc3Nlc1JlbWFpbnMpCitURVNUKFByb2Nlc3NTd2FwLCBTdXNwZW5kZWRQ YWdlTGltaXQpCiB7CiAgICAgYXV0byBwcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24gPSBhZG9wdE5T KFtbX1dLUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uIGFsbG9jXSBpbml0XSk7CiAgICAgW3Byb2Nl c3NQb29sQ29uZmlndXJhdGlvbiBzZXRQcm9jZXNzU3dhcHNPbk5hdmlnYXRpb246WUVTXTsKQEAg LTE2NzMsNiArMTY3NCw5IEBAIFRFU1QoUHJvY2Vzc1N3YXAsIFRocmVlUHJldmlvdXNQcm9jZXNz ZXNSZW1haW5zKQogICAgIGF1dG8gZGVsZWdhdGUgPSBhZG9wdE5TKFtbUFNPTk5hdmlnYXRpb25E ZWxlZ2F0ZSBhbGxvY10gaW5pdF0pOwogICAgIFt3ZWJWaWV3IHNldE5hdmlnYXRpb25EZWxlZ2F0 ZTpkZWxlZ2F0ZS5nZXQoKV07CiAKKyAgICBhdXRvIG1heGltdW1TdXNwZW5kZWRQYWdlQ291bnQg PSBbcHJvY2Vzc1Bvb2wgX21heGltdW1TdXNwZW5kZWRQYWdlQ291bnRdOworICAgIEVYUEVDVF9H VChtYXhpbXVtU3VzcGVuZGVkUGFnZUNvdW50LCAwVSk7CisKICAgICBOU1VSTFJlcXVlc3QgKnJl cXVlc3QgPSBbTlNVUkxSZXF1ZXN0IHJlcXVlc3RXaXRoVVJMOltOU1VSTCBVUkxXaXRoU3RyaW5n OkAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCJdXTsKICAgICBbd2ViVmlldyBsb2Fk UmVxdWVzdDpyZXF1ZXN0XTsKIApAQCAtMTcwNiw4ICsxNzEwLDggQEAgVEVTVChQcm9jZXNzU3dh cCwgVGhyZWVQcmV2aW91c1Byb2Nlc3Nlc1JlbWFpbnMpCiAgICAgLy8gTmF2aWdhdGlvbnMgdG8g NSBkaWZmZXJlbnQgZG9tYWlucywgd2UgZXhwZWN0IHRvIGhhdmUgc2VlbiA1IGRpZmZlcmVudCBQ SURzCiAgICAgRVhQRUNUX0VRKDV1LCBzZWVuUElEcy5zaXplKCkpOwogCi0gICAgLy8gQnV0IG9u bHkgNCBvZiB0aG9zZSBwcm9jZXNzZXMgc2hvdWxkIHN0aWxsIGJlIGFsaXZlICgxIHZpc2libGUs IDMgc3VzcGVuZGVkKS4KLSAgICBFWFBFQ1RfRVEoNHUsIFtwcm9jZXNzUG9vbCBfd2ViUHJvY2Vz c0NvdW50SWdub3JpbmdQcmV3YXJtZWRdKTsKKyAgICAvLyBCdXQgbm90IGFsbCBvZiB0aG9zZSBw cm9jZXNzZXMgc2hvdWxkIHN0aWxsIGJlIGFsaXZlICgxIHZpc2libGUsIG1heGltdW1TdXNwZW5k ZWRQYWdlQ291bnQgc3VzcGVuZGVkKS4KKyAgICBFWFBFQ1RfRVEoW3Byb2Nlc3NQb29sIF93ZWJQ cm9jZXNzQ291bnRJZ25vcmluZ1ByZXdhcm1lZF0sICgxVSArIG1heGltdW1TdXNwZW5kZWRQYWdl Q291bnQpKTsKIH0KIAogVEVTVChQcm9jZXNzU3dhcCwgUGFnZUNhY2hlMSkK