197736 2019-05-09 05:39:25 -0700 Limit number of prefetches of a given page 2019-05-09 23:45:18 -0700 1 1 1 Unclassified WebKit Page Loading Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 rbuis rbuis beidson cdumez cgarcia commit-queue darin ews-watchlist webkit-bug-importer oldest_to_newest 1534711 0 rbuis 2019-05-09 05:39:25 -0700 For now a first approach is to just allow one unique url. 1534715 1 369487 rbuis 2019-05-09 05:50:01 -0700 Created attachment 369487 Patch 1534720 2 369489 rbuis 2019-05-09 06:49:27 -0700 Created attachment 369489 Patch 1534768 3 369489 darin 2019-05-09 10:25:38 -0700 Comment on attachment 369489 Patch It’s unnecessary to design this so that it requires two separate functions in PrefetchCache and extra hash table lookups. Instead we could simply implement this policy in the prefetch cache itself. We would use add instead of set inside PrefetchCache::store, check the return value and return early if there’s already a prefetch for the URL. Currently, the single caller doesn’t even need to know whether the prefetch was done or not so we wouldn’t have to change anything outside that function. 1534794 4 369500 rbuis 2019-05-09 11:33:50 -0700 Created attachment 369500 Patch 1534795 5 rbuis 2019-05-09 11:36:03 -0700 (In reply to Darin Adler from comment #3) > It’s unnecessary to design this so that it requires two separate functions > in PrefetchCache and extra hash table lookups. Instead we could simply > implement this policy in the prefetch cache itself. We would use add instead > of set inside PrefetchCache::store, check the return value and return early > if there’s already a prefetch for the URL. Currently, the single caller > doesn’t even need to know whether the prefetch was done or not so we > wouldn’t have to change anything outside that function. Much better, thanks! I updated the patch. 1534955 6 369500 commit-queue 2019-05-09 23:44:19 -0700 Comment on attachment 369500 Patch Clearing flags on attachment: 369500 Committed r245171: <https://trac.webkit.org/changeset/245171> 1534956 7 commit-queue 2019-05-09 23:44:21 -0700 All reviewed patches have been landed. Closing bug. 1534957 8 webkit-bug-importer 2019-05-09 23:45:18 -0700 <rdar://problem/50653992> 369487 2019-05-09 05:50:01 -0700 2019-05-09 06:49:23 -0700 Patch bug-197736-20190509145001.patch text/plain 3448 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ1MTI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGI4MDgyMTgxMDEwYmFlYTYw YWUyNDc2MjRjOTE2NWRiY2FkNjY0NTcuLmI0NWM5Y2ZlODE2NTQ4YjE0MWE5Zjk3ZjBhMGJhMzRi MzMwMWMwYWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTktMDUtMDkgIFJvYiBCdWlz ICA8cmJ1aXNAaWdhbGlhLmNvbT4KKworICAgICAgICBMaW1pdCBudW1iZXIgb2YgcHJlZmV0Y2hl cyBvZiBhIGdpdmVuIHBhZ2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE5NzczNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIExpbWl0IHByZWZldGNoZXMgZm9yIHNhbWUgdXJsIHRvIDEuCisKKyAgICAgICAg KiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuY3BwOgorICAgICAgICAoV2Vi S2l0OjpOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OnRyeVN0b3JlQXNDYWNoZUVudHJ5KToKKyAgICAg ICAgKiBOZXR3b3JrUHJvY2Vzcy9jYWNoZS9QcmVmZXRjaENhY2hlLmNwcDoKKyAgICAgICAgKFdl YktpdDo6UHJlZmV0Y2hDYWNoZTo6Y29udGFpbnMgY29uc3QpOgorICAgICAgICAqIE5ldHdvcmtQ cm9jZXNzL2NhY2hlL1ByZWZldGNoQ2FjaGUuaDoKKwogMjAxOS0wNS0wOCAgQW50b2luZSBRdWlu dCAgPGdyYW91dHNAYXBwbGUuY29tPgogCiAgICAgICAgIFtpT1NdIENvcnJlY3RseSBoYW5kbGUg b3ZlcmxhcHBpbmcgcmVnaW9ucyBmb3IgZWxlbWVudHMgd2l0aCBhIHRvdWNoLWFjdGlvbiBwcm9w ZXJ0eQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVz b3VyY2VMb2FkZXIuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVz b3VyY2VMb2FkZXIuY3BwCmluZGV4IDQ1MTBlOTI2OGEyMmMyMDVjOGM2YjAzNWE3YjBmY2ZlNDc4 ZTA2ZTIuLmFjYjAzZWVkYTUzMGVmNzQ4NjVhNzc1MGU2ZjFkYjcyNGUyNWQxZDQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRl ci5jcHAKQEAgLTgxMCw4ICs4MTAsMTIgQEAgdm9pZCBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OnRy eVN0b3JlQXNDYWNoZUVudHJ5KCkKICAgICAgICAgcmV0dXJuOwogCiAgICAgaWYgKGlzQ3Jvc3NP cmlnaW5QcmVmZXRjaCgpKSB7Ci0gICAgICAgIGlmIChhdXRvIHNlc3Npb24gPSBtX2Nvbm5lY3Rp b24tPm5ldHdvcmtQcm9jZXNzKCkubmV0d29ya1Nlc3Npb24oc2Vzc2lvbklEKCkpKQorICAgICAg ICBpZiAoYXV0byBzZXNzaW9uID0gbV9jb25uZWN0aW9uLT5uZXR3b3JrUHJvY2VzcygpLm5ldHdv cmtTZXNzaW9uKHNlc3Npb25JRCgpKSkgeworICAgICAgICAgICAgLy8gTGltaXQgcHJlZmV0Y2hl cyBmb3Igc2FtZSB1cmwgdG8gMS4KKyAgICAgICAgICAgIGlmIChzZXNzaW9uLT5wcmVmZXRjaENh Y2hlKCkuY29udGFpbnMobV9uZXR3b3JrTG9hZC0+Y3VycmVudFJlcXVlc3QoKS51cmwoKSkpCisg ICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgc2Vzc2lvbi0+cHJlZmV0Y2hDYWNo ZSgpLnN0b3JlKG1fbmV0d29ya0xvYWQtPmN1cnJlbnRSZXF1ZXN0KCkudXJsKCksIFdURk1vdmUo bV9yZXNwb25zZSksIFdURk1vdmUobV9idWZmZXJlZERhdGFGb3JDYWNoZSkpOworICAgICAgICB9 CiAgICAgICAgIHJldHVybjsKICAgICB9CiAgICAgbV9jYWNoZS0+c3RvcmUobV9uZXR3b3JrTG9h ZC0+Y3VycmVudFJlcXVlc3QoKSwgbV9yZXNwb25zZSwgV1RGTW92ZShtX2J1ZmZlcmVkRGF0YUZv ckNhY2hlKSwgW2xvYWRlciA9IG1ha2VSZWYoKnRoaXMpXShhdXRvJiBtYXBwZWRCb2R5KSBtdXRh YmxlIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvUHJl ZmV0Y2hDYWNoZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL1ByZWZl dGNoQ2FjaGUuY3BwCmluZGV4IDczY2FiNDdmOTFlZTc0MjQxZjIzMmZmZmJlM2Y5OTJkZjljNTZj ZmMuLjFhZTExMmFmNjM1NGIyOTc4NjgwNzNlYmMwMzRiNzY5Y2QxOTI1OGEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvUHJlZmV0Y2hDYWNoZS5jcHAKKysr IGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9QcmVmZXRjaENhY2hlLmNwcApA QCAtNjMsNiArNjMsMTQgQEAgc3RkOjp1bmlxdWVfcHRyPFByZWZldGNoQ2FjaGU6OkVudHJ5PiBQ cmVmZXRjaENhY2hlOjp0YWtlKGNvbnN0IFVSTCYgdXJsKQogICAgIHJldHVybiByZXNvdXJjZXMt PnRha2UodXJsKTsKIH0KIAorYm9vbCBQcmVmZXRjaENhY2hlOjpjb250YWlucyhjb25zdCBVUkwm IHVybCkgY29uc3QKK3sKKyAgICBhdXRvKiByZXNvdXJjZXMgPSBtX3Nlc3Npb25QcmVmZXRjaGVz LmdldCgpOworICAgIGlmICghcmVzb3VyY2VzKQorICAgICAgICByZXR1cm4gbnVsbHB0cjsKKyAg ICByZXR1cm4gcmVzb3VyY2VzLT5jb250YWlucyh1cmwpOworfQorCiBzdGF0aWMgY29uc3QgU2Vj b25kcyBleHBpcmF0aW9uVGltZW91dCB7IDVfcyB9OwogCiB2b2lkIFByZWZldGNoQ2FjaGU6OnN0 b3JlKGNvbnN0IFVSTCYgcmVxdWVzdFVybCwgV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZSYmIHJl c3BvbnNlLCBSZWZQdHI8V2ViQ29yZTo6U2hhcmVkQnVmZmVyPiYmIGJ1ZmZlcikKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvUHJlZmV0Y2hDYWNoZS5oIGIv U291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9QcmVmZXRjaENhY2hlLmgKaW5kZXgg Yzg4OTVmZTI0Yjc2ZjhkMDRhZGI2MzhjNzNiMWExYzg0YjJhOWM0MC4uYjk1YjNhNWNmZjljZGNm Yjk1ZTI2NzYxMjA5NTI1MGQwNDZkOTFiZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3 b3JrUHJvY2Vzcy9jYWNoZS9QcmVmZXRjaENhY2hlLmgKKysrIGIvU291cmNlL1dlYktpdC9OZXR3 b3JrUHJvY2Vzcy9jYWNoZS9QcmVmZXRjaENhY2hlLmgKQEAgLTU0LDYgKzU0LDcgQEAgcHVibGlj OgogICAgIH07CiAKICAgICBzdGQ6OnVuaXF1ZV9wdHI8RW50cnk+IHRha2UoY29uc3QgVVJMJik7 CisgICAgYm9vbCBjb250YWlucyhjb25zdCBVUkwmKSBjb25zdDsKICAgICB2b2lkIHN0b3JlKGNv bnN0IFVSTCYsIFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2UmJiwgUmVmUHRyPFdlYkNvcmU6OlNo YXJlZEJ1ZmZlcj4mJik7CiAKIHByaXZhdGU6Cg== 369489 2019-05-09 06:49:27 -0700 2019-05-09 11:33:45 -0700 Patch bug-197736-20190509154928.patch text/plain 3446 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ1MTI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGI4MDgyMTgxMDEwYmFlYTYw YWUyNDc2MjRjOTE2NWRiY2FkNjY0NTcuLmI0NWM5Y2ZlODE2NTQ4YjE0MWE5Zjk3ZjBhMGJhMzRi MzMwMWMwYWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTktMDUtMDkgIFJvYiBCdWlz ICA8cmJ1aXNAaWdhbGlhLmNvbT4KKworICAgICAgICBMaW1pdCBudW1iZXIgb2YgcHJlZmV0Y2hl cyBvZiBhIGdpdmVuIHBhZ2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE5NzczNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIExpbWl0IHByZWZldGNoZXMgZm9yIHNhbWUgdXJsIHRvIDEuCisKKyAgICAgICAg KiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuY3BwOgorICAgICAgICAoV2Vi S2l0OjpOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OnRyeVN0b3JlQXNDYWNoZUVudHJ5KToKKyAgICAg ICAgKiBOZXR3b3JrUHJvY2Vzcy9jYWNoZS9QcmVmZXRjaENhY2hlLmNwcDoKKyAgICAgICAgKFdl YktpdDo6UHJlZmV0Y2hDYWNoZTo6Y29udGFpbnMgY29uc3QpOgorICAgICAgICAqIE5ldHdvcmtQ cm9jZXNzL2NhY2hlL1ByZWZldGNoQ2FjaGUuaDoKKwogMjAxOS0wNS0wOCAgQW50b2luZSBRdWlu dCAgPGdyYW91dHNAYXBwbGUuY29tPgogCiAgICAgICAgIFtpT1NdIENvcnJlY3RseSBoYW5kbGUg b3ZlcmxhcHBpbmcgcmVnaW9ucyBmb3IgZWxlbWVudHMgd2l0aCBhIHRvdWNoLWFjdGlvbiBwcm9w ZXJ0eQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVz b3VyY2VMb2FkZXIuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVz b3VyY2VMb2FkZXIuY3BwCmluZGV4IDQ1MTBlOTI2OGEyMmMyMDVjOGM2YjAzNWE3YjBmY2ZlNDc4 ZTA2ZTIuLmFjYjAzZWVkYTUzMGVmNzQ4NjVhNzc1MGU2ZjFkYjcyNGUyNWQxZDQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRl ci5jcHAKQEAgLTgxMCw4ICs4MTAsMTIgQEAgdm9pZCBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OnRy eVN0b3JlQXNDYWNoZUVudHJ5KCkKICAgICAgICAgcmV0dXJuOwogCiAgICAgaWYgKGlzQ3Jvc3NP cmlnaW5QcmVmZXRjaCgpKSB7Ci0gICAgICAgIGlmIChhdXRvIHNlc3Npb24gPSBtX2Nvbm5lY3Rp b24tPm5ldHdvcmtQcm9jZXNzKCkubmV0d29ya1Nlc3Npb24oc2Vzc2lvbklEKCkpKQorICAgICAg ICBpZiAoYXV0byBzZXNzaW9uID0gbV9jb25uZWN0aW9uLT5uZXR3b3JrUHJvY2VzcygpLm5ldHdv cmtTZXNzaW9uKHNlc3Npb25JRCgpKSkgeworICAgICAgICAgICAgLy8gTGltaXQgcHJlZmV0Y2hl cyBmb3Igc2FtZSB1cmwgdG8gMS4KKyAgICAgICAgICAgIGlmIChzZXNzaW9uLT5wcmVmZXRjaENh Y2hlKCkuY29udGFpbnMobV9uZXR3b3JrTG9hZC0+Y3VycmVudFJlcXVlc3QoKS51cmwoKSkpCisg ICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgc2Vzc2lvbi0+cHJlZmV0Y2hDYWNo ZSgpLnN0b3JlKG1fbmV0d29ya0xvYWQtPmN1cnJlbnRSZXF1ZXN0KCkudXJsKCksIFdURk1vdmUo bV9yZXNwb25zZSksIFdURk1vdmUobV9idWZmZXJlZERhdGFGb3JDYWNoZSkpOworICAgICAgICB9 CiAgICAgICAgIHJldHVybjsKICAgICB9CiAgICAgbV9jYWNoZS0+c3RvcmUobV9uZXR3b3JrTG9h ZC0+Y3VycmVudFJlcXVlc3QoKSwgbV9yZXNwb25zZSwgV1RGTW92ZShtX2J1ZmZlcmVkRGF0YUZv ckNhY2hlKSwgW2xvYWRlciA9IG1ha2VSZWYoKnRoaXMpXShhdXRvJiBtYXBwZWRCb2R5KSBtdXRh YmxlIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvUHJl ZmV0Y2hDYWNoZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL1ByZWZl dGNoQ2FjaGUuY3BwCmluZGV4IDczY2FiNDdmOTFlZTc0MjQxZjIzMmZmZmJlM2Y5OTJkZjljNTZj ZmMuLjhkZThiNjQ4YzEzZmI3OTg5YzE2YWYwZDU4Yjk4ZjAyNDA3Mjc5ZjMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvUHJlZmV0Y2hDYWNoZS5jcHAKKysr IGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9QcmVmZXRjaENhY2hlLmNwcApA QCAtNjMsNiArNjMsMTQgQEAgc3RkOjp1bmlxdWVfcHRyPFByZWZldGNoQ2FjaGU6OkVudHJ5PiBQ cmVmZXRjaENhY2hlOjp0YWtlKGNvbnN0IFVSTCYgdXJsKQogICAgIHJldHVybiByZXNvdXJjZXMt PnRha2UodXJsKTsKIH0KIAorYm9vbCBQcmVmZXRjaENhY2hlOjpjb250YWlucyhjb25zdCBVUkwm IHVybCkgY29uc3QKK3sKKyAgICBhdXRvKiByZXNvdXJjZXMgPSBtX3Nlc3Npb25QcmVmZXRjaGVz LmdldCgpOworICAgIGlmICghcmVzb3VyY2VzKQorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAg cmV0dXJuIHJlc291cmNlcy0+Y29udGFpbnModXJsKTsKK30KKwogc3RhdGljIGNvbnN0IFNlY29u ZHMgZXhwaXJhdGlvblRpbWVvdXQgeyA1X3MgfTsKIAogdm9pZCBQcmVmZXRjaENhY2hlOjpzdG9y ZShjb25zdCBVUkwmIHJlcXVlc3RVcmwsIFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2UmJiByZXNw b25zZSwgUmVmUHRyPFdlYkNvcmU6OlNoYXJlZEJ1ZmZlcj4mJiBidWZmZXIpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL1ByZWZldGNoQ2FjaGUuaCBiL1Nv dXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvUHJlZmV0Y2hDYWNoZS5oCmluZGV4IGM4 ODk1ZmUyNGI3NmY4ZDA0YWRiNjM4YzczYjFhMWM4NGIyYTljNDAuLmI5NWIzYTVjZmY5Y2RjZmI5 NWUyNjc2MTIwOTUyNTBkMDQ2ZDkxYmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29y a1Byb2Nlc3MvY2FjaGUvUHJlZmV0Y2hDYWNoZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29y a1Byb2Nlc3MvY2FjaGUvUHJlZmV0Y2hDYWNoZS5oCkBAIC01NCw2ICs1NCw3IEBAIHB1YmxpYzoK ICAgICB9OwogCiAgICAgc3RkOjp1bmlxdWVfcHRyPEVudHJ5PiB0YWtlKGNvbnN0IFVSTCYpOwor ICAgIGJvb2wgY29udGFpbnMoY29uc3QgVVJMJikgY29uc3Q7CiAgICAgdm9pZCBzdG9yZShjb25z dCBVUkwmLCBXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlJiYsIFJlZlB0cjxXZWJDb3JlOjpTaGFy ZWRCdWZmZXI+JiYpOwogCiBwcml2YXRlOgo= 369500 2019-05-09 11:33:50 -0700 2019-05-09 23:44:19 -0700 Patch bug-197736-20190509203350.patch text/plain 1813 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ1MTI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGI4MDgyMTgxMDEwYmFlYTYw YWUyNDc2MjRjOTE2NWRiY2FkNjY0NTcuLmFlNzVmNjAyZThkOTU2M2M3ZWZiNDRlOWZiNGE4Mjcx Y2M2MWNiNDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTktMDUtMDkgIFJvYiBCdWlz ICA8cmJ1aXNAaWdhbGlhLmNvbT4KKworICAgICAgICBMaW1pdCBudW1iZXIgb2YgcHJlZmV0Y2hl cyBvZiBhIGdpdmVuIHBhZ2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE5NzczNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIExpbWl0IHByZWZldGNoZXMgZm9yIHNhbWUgdXJsIHRvIDEuCisKKyAgICAgICAg KiBOZXR3b3JrUHJvY2Vzcy9jYWNoZS9QcmVmZXRjaENhY2hlLmNwcDoKKyAgICAgICAgKFdlYktp dDo6UHJlZmV0Y2hDYWNoZTo6c3RvcmUpOgorCiAyMDE5LTA1LTA4ICBBbnRvaW5lIFF1aW50ICA8 Z3Jhb3V0c0BhcHBsZS5jb20+CiAKICAgICAgICAgW2lPU10gQ29ycmVjdGx5IGhhbmRsZSBvdmVy bGFwcGluZyByZWdpb25zIGZvciBlbGVtZW50cyB3aXRoIGEgdG91Y2gtYWN0aW9uIHByb3BlcnR5 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL1ByZWZldGNo Q2FjaGUuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9QcmVmZXRjaENh Y2hlLmNwcAppbmRleCA3M2NhYjQ3ZjkxZWU3NDI0MWYyMzJmZmZiZTNmOTkyZGY5YzU2Y2ZjLi4w NDAxZmM5OGI0MTZjZTBhOWFjZDA5NWMzYzNhMjNlYTJhMzhmZGJiIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL1ByZWZldGNoQ2FjaGUuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvUHJlZmV0Y2hDYWNoZS5jcHAKQEAgLTY5 LDcgKzY5LDEwIEBAIHZvaWQgUHJlZmV0Y2hDYWNoZTo6c3RvcmUoY29uc3QgVVJMJiByZXF1ZXN0 VXJsLCBXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlJiYgcmVzCiB7CiAgICAgaWYgKCFtX3Nlc3Np b25QcmVmZXRjaGVzKQogICAgICAgICBtX3Nlc3Npb25QcmVmZXRjaGVzID0gc3RkOjptYWtlX3Vu aXF1ZTxQcmVmZXRjaEVudHJpZXNNYXA+KCk7Ci0gICAgbV9zZXNzaW9uUHJlZmV0Y2hlcy0+c2V0 KHJlcXVlc3RVcmwsIHN0ZDo6bWFrZV91bmlxdWU8UHJlZmV0Y2hDYWNoZTo6RW50cnk+KFdURk1v dmUocmVzcG9uc2UpLCBXVEZNb3ZlKGJ1ZmZlcikpKTsKKyAgICBhdXRvIGFkZFJlc3VsdCA9IG1f c2Vzc2lvblByZWZldGNoZXMtPmFkZChyZXF1ZXN0VXJsLCBzdGQ6Om1ha2VfdW5pcXVlPFByZWZl dGNoQ2FjaGU6OkVudHJ5PihXVEZNb3ZlKHJlc3BvbnNlKSwgV1RGTW92ZShidWZmZXIpKSk7Cisg ICAgLy8gTGltaXQgcHJlZmV0Y2hlcyBmb3Igc2FtZSB1cmwgdG8gMS4KKyAgICBpZiAoIWFkZFJl c3VsdC5pc05ld0VudHJ5KQorICAgICAgICByZXR1cm47CiAgICAgbV9zZXNzaW9uRXhwaXJhdGlv bkxpc3QuYXBwZW5kKHN0ZDo6bWFrZV90dXBsZShyZXF1ZXN0VXJsLCBXYWxsVGltZTo6bm93KCkp KTsKICAgICBpZiAoIW1fZXhwaXJhdGlvblRpbWVyLmlzQWN0aXZlKCkpCiAgICAgICAgIG1fZXhw aXJhdGlvblRpbWVyLnN0YXJ0T25lU2hvdChleHBpcmF0aW9uVGltZW91dCk7Cg==