126577 2014-01-07 06:08:40 -0800 [SOUP] [WK2] - Disable MemoryCache when the DOCUMENT_VIEWER cache model is set 2014-01-15 01:41:22 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 tpopela webkit-unassigned cgarcia commit-queue gustavo gyuyoung.kim ryuan.choi oldest_to_newest 964975 0 tpopela 2014-01-07 06:08:40 -0800 As in http://trac.webkit.org/changeset/152483, but this time for WK2. When WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER is set we need to disable the MemoryCache completely (based on cacheMinDeadCapacity and cacheMaxDeadCapacity values) to prevent caching the resources. 964977 1 220518 tpopela 2014-01-07 06:18:22 -0800 Created attachment 220518 Proposed patch 964980 2 cgarcia 2014-01-07 06:25:57 -0800 In r152483 we also check that cacheTotalCapacity is 0, don't we need that in wk2 as well? 964983 3 220518 cgarcia 2014-01-07 06:27:43 -0800 Comment on attachment 220518 Proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=220518&action=review > Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp:107 > + bool disableCache = !cacheMinDeadCapacity && !cacheMaxDeadCapacity; > + WebCore::memoryCache()->setDisabled(disableCache); This is not specific to GTK, it also affects EFL, so I would confirm with EFL guys that this is the desired behaviour for them too, otherwise we should need to do this inside a platform ifdef. 964986 4 tpopela 2014-01-07 06:33:17 -0800 (In reply to comment #2) > In r152483 we also check that cacheTotalCapacity is 0, don't we need that in wk2 as well? Actually the calculateCacheSizes will return != 0 for cacheTotalCapacity even for WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER. Another solution will be just asking straight for cache model. 966928 5 cgarcia 2014-01-12 01:23:57 -0800 (In reply to comment #4) > (In reply to comment #2) > > In r152483 we also check that cacheTotalCapacity is 0, don't we need that in wk2 as well? > > Actually the calculateCacheSizes will return != 0 for cacheTotalCapacity even for WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER. Another solution will be just asking straight for cache model. Yes, in the end what we want is to make sure that memory cache is disabled for DocumentViewer cache model, because that's what our public API documentation says. So, I would do something like this: #if PLATFORM(GTK) WebCore::memoryCache()->setDisabled(cacheModel == CacheModelDocumentViewer); #endif It's also more obvious and it's the only model that returns cacheMinDeadCapacity = cacheMaxDeadCapacity = 0 after all. 967807 6 221158 tpopela 2014-01-14 06:57:10 -0800 Created attachment 221158 Proposed patch v2 968189 7 221158 svillar 2014-01-14 23:15:04 -0800 Comment on attachment 221158 Proposed patch v2 Same comment, have you checked with the EFL guys if they want this behavior? I'm almost sure they want, so we wouldn't need the ifdef 968191 8 ryuan.choi 2014-01-14 23:39:50 -0800 (In reply to comment #7) > (From update of attachment 221158 [details]) > Same comment, have you checked with the EFL guys if they want this behavior? I'm almost sure they want, so we wouldn't need the ifdef I also think that macro is not necessary. 968200 9 221237 tpopela 2014-01-15 00:45:30 -0800 Created attachment 221237 Proposed patch v3 Disable MemoryCache even for EFL (remove the GTK ifdef) 968203 10 221237 cgarcia 2014-01-15 00:52:14 -0800 Comment on attachment 221237 Proposed patch v3 Thanks 968221 11 221237 commit-queue 2014-01-15 01:41:19 -0800 Comment on attachment 221237 Proposed patch v3 Clearing flags on attachment: 221237 Committed r162059: <http://trac.webkit.org/changeset/162059> 968222 12 commit-queue 2014-01-15 01:41:22 -0800 All reviewed patches have been landed. Closing bug. 220518 2014-01-07 06:18:22 -0800 2014-01-14 06:57:10 -0800 Proposed patch webkit-126577.patch text/plain 2882 tpopela RnJvbSBhYmI0NWIxMmMyNTk4ZTdmNDFiYTgxZjA0OWIwMjM0YTMyYmU1OGEwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUb21hcyBQb3BlbGEgPHRwb3BlbGFAcmVkaGF0LmNvbT4KRGF0 ZTogVHVlLCA3IEphbiAyMDE0IDE1OjE1OjMyICswMTAwClN1YmplY3Q6IFtQQVRDSF0gMjAxNC0w MS0wNyAgVG9tYXMgUG9wZWxhICA8dHBvcGVsYUByZWRoYXQuY29tPgoKICAgICAgICBbR1RLXSBb V0syXSAtIERpc2FibGUgTWVtb3J5Q2FjaGUgd2hlbiB0aGUgRE9DVU1FTlRfVklFV0VSIGNhY2hl IG1vZGVsIGlzIHNldAogICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMjY1NzcKCiAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgogICAgICAg IEFzIGluIGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzE1MjQ4MywgYnV0IHRoaXMg dGltZSBmb3IKICAgICAgICBXZWJLaXQyLiBXaGVuIFdFQktJVF9DQUNIRV9NT0RFTF9ET0NVTUVO VF9WSUVXRVIgaXMgc2V0IHdlIG5lZWQgdG8KICAgICAgICBkaXNhYmxlIHRoZSBNZW1vcnlDYWNo ZSBjb21wbGV0ZWx5IChiYXNlZCBvbiBjYWNoZU1pbkRlYWRDYXBhY2l0eSBhbmQKICAgICAgICBj YWNoZU1heERlYWRDYXBhY2l0eSB2YWx1ZXMpIHRvIHByZXZlbnQgY2FjaGluZyBvZiB0aGUgcmVz b3VyY2VzLgoKICAgICAgICAqIFdlYlByb2Nlc3Mvc291cC9XZWJQcm9jZXNzU291cC5jcHA6CiAg ICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzczo6cGxhdGZvcm1TZXRDYWNoZU1vZGVsKToKLS0tCiBT b3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgIHwgMTUgKysr KysrKysrKysrKysrCiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL3NvdXAvV2ViUHJvY2Vzc1Nv dXAuY3BwIHwgIDIgKysKIDIgZmlsZXMgY2hhbmdlZCwgMTcgaW5zZXJ0aW9ucygrKQoKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxv ZwppbmRleCBjZjVkMDQxLi4zZDY3N2I2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFu Z2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIw MTQtMDEtMDcgIFRvbWFzIFBvcGVsYSAgPHRwb3BlbGFAcmVkaGF0LmNvbT4KKworICAgICAgICBb R1RLXSBbV0syXSAtIERpc2FibGUgTWVtb3J5Q2FjaGUgd2hlbiB0aGUgRE9DVU1FTlRfVklFV0VS IGNhY2hlIG1vZGVsIGlzIHNldAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTI2NTc3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgQXMgaW4gaHR0cDovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvMTUyNDgz LCBidXQgdGhpcyB0aW1lIGZvcgorICAgICAgICBXZWJLaXQyLiBXaGVuIFdFQktJVF9DQUNIRV9N T0RFTF9ET0NVTUVOVF9WSUVXRVIgaXMgc2V0IHdlIG5lZWQgdG8KKyAgICAgICAgZGlzYWJsZSB0 aGUgTWVtb3J5Q2FjaGUgY29tcGxldGVseSAoYmFzZWQgb24gY2FjaGVNaW5EZWFkQ2FwYWNpdHkg YW5kCisgICAgICAgIGNhY2hlTWF4RGVhZENhcGFjaXR5IHZhbHVlcykgdG8gcHJldmVudCBjYWNo aW5nIG9mIHRoZSByZXNvdXJjZXMuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL3NvdXAvV2ViUHJv Y2Vzc1NvdXAuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzOjpwbGF0Zm9ybVNldENh Y2hlTW9kZWwpOgorCiAyMDE0LTAxLTA3ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFA aWdhbGlhLmNvbT4KIAogICAgICAgICBDcmFzaCB3aGVuIHRyeWluZyB0byByZWdpc3RlciBhIGN1 c3RvbSBzY2hlbWUgYmVmb3JlIG5ldHdvcmsgcHJvY2VzcyBoYXMgYmVlbiBsYXVuY2hlZApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9zb3VwL1dlYlByb2Nlc3NTb3VwLmNw cCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mvc291cC9XZWJQcm9jZXNzU291cC5jcHAKaW5k ZXggNzMzMDc4ZC4uZDNlODJjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9zb3VwL1dlYlByb2Nlc3NTb3VwLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L3NvdXAvV2ViUHJvY2Vzc1NvdXAuY3BwCkBAIC0xMDMsNiArMTAzLDggQEAgdm9pZCBXZWJQcm9j ZXNzOjpwbGF0Zm9ybVNldENhY2hlTW9kZWwoQ2FjaGVNb2RlbCBjYWNoZU1vZGVsKQogICAgICAg ICAgICAgICAgICAgICAgICAgY2FjaGVUb3RhbENhcGFjaXR5LCBjYWNoZU1pbkRlYWRDYXBhY2l0 eSwgY2FjaGVNYXhEZWFkQ2FwYWNpdHksIGRlYWREZWNvZGVkRGF0YURlbGV0aW9uSW50ZXJ2YWws CiAgICAgICAgICAgICAgICAgICAgICAgICBwYWdlQ2FjaGVDYXBhY2l0eSwgdXJsQ2FjaGVNZW1v cnlDYXBhY2l0eSwgdXJsQ2FjaGVEaXNrQ2FwYWNpdHkpOwogCisgICAgYm9vbCBkaXNhYmxlQ2Fj aGUgPSAhY2FjaGVNaW5EZWFkQ2FwYWNpdHkgJiYgIWNhY2hlTWF4RGVhZENhcGFjaXR5OworICAg IFdlYkNvcmU6Om1lbW9yeUNhY2hlKCktPnNldERpc2FibGVkKGRpc2FibGVDYWNoZSk7CiAgICAg V2ViQ29yZTo6bWVtb3J5Q2FjaGUoKS0+c2V0Q2FwYWNpdGllcyhjYWNoZU1pbkRlYWRDYXBhY2l0 eSwgY2FjaGVNYXhEZWFkQ2FwYWNpdHksIGNhY2hlVG90YWxDYXBhY2l0eSk7CiAgICAgV2ViQ29y ZTo6bWVtb3J5Q2FjaGUoKS0+c2V0RGVhZERlY29kZWREYXRhRGVsZXRpb25JbnRlcnZhbChkZWFk RGVjb2RlZERhdGFEZWxldGlvbkludGVydmFsKTsKICAgICBXZWJDb3JlOjpwYWdlQ2FjaGUoKS0+ c2V0Q2FwYWNpdHkocGFnZUNhY2hlQ2FwYWNpdHkpOwo= 221158 2014-01-14 06:57:10 -0800 2014-01-15 00:45:30 -0800 Proposed patch v2 webkit-126577v2.patch text/plain 2659 tpopela RnJvbSBkNGE0ZTQ4MjhlYmU4MTEyMjcxODllMGEzYmQwMDZmMjMyMjU1OTUyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUb21hcyBQb3BlbGEgPHRwb3BlbGFAcmVkaGF0LmNvbT4KRGF0 ZTogVHVlLCAxNCBKYW4gMjAxNCAxNTo1NDo0MyArMDEwMApTdWJqZWN0OiBbUEFUQ0hdIDIwMTQt MDEtMTQgIFRvbWFzIFBvcGVsYSAgPHRwb3BlbGFAcmVkaGF0LmNvbT4KCiAgICAgICAgW0dUS10g W1dLMl0gLSBEaXNhYmxlIE1lbW9yeUNhY2hlIHdoZW4gdGhlIERPQ1VNRU5UX1ZJRVdFUiBjYWNo ZSBtb2RlbCBpcyBzZXQKICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTI2NTc3CgogICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKICAgICAg ICBBcyBpbiBodHRwOi8vdHJhYy53ZWJraXQub3JnL2NoYW5nZXNldC8xNTI0ODMsIGJ1dCB0aGlz IHRpbWUgZm9yCiAgICAgICAgV2ViS2l0Mi4gV2hlbiBXRUJLSVRfQ0FDSEVfTU9ERUxfRE9DVU1F TlRfVklFV0VSIGlzIHNldCB3ZSBuZWVkIHRvCiAgICAgICAgZGlzYWJsZSB0aGUgTWVtb3J5Q2Fj aGUgY29tcGxldGVseSB0byBwcmV2ZW50IGNhY2hpbmcgb2YgdGhlIHJlc291cmNlcy4KCiAgICAg ICAgKiBXZWJQcm9jZXNzL3NvdXAvV2ViUHJvY2Vzc1NvdXAuY3BwOgogICAgICAgIChXZWJLaXQ6 OldlYlByb2Nlc3M6OnBsYXRmb3JtU2V0Q2FjaGVNb2RlbCk6Ci0tLQogU291cmNlL1dlYktpdDIv Q2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICB8IDE0ICsrKysrKysrKysrKysrCiBT b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL3NvdXAvV2ViUHJvY2Vzc1NvdXAuY3BwIHwgIDMgKysr CiAyIGZpbGVzIGNoYW5nZWQsIDE3IGluc2VydGlvbnMoKykKCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNzg4MDgy NS4uYzhhZDE1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE0LTAxLTE0ICBUb21h cyBQb3BlbGEgIDx0cG9wZWxhQHJlZGhhdC5jb20+CisKKyAgICAgICAgW0dUS10gW1dLMl0gLSBE aXNhYmxlIE1lbW9yeUNhY2hlIHdoZW4gdGhlIERPQ1VNRU5UX1ZJRVdFUiBjYWNoZSBtb2RlbCBp cyBzZXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEy NjU3NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFz IGluIGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzE1MjQ4MywgYnV0IHRoaXMgdGlt ZSBmb3IKKyAgICAgICAgV2ViS2l0Mi4gV2hlbiBXRUJLSVRfQ0FDSEVfTU9ERUxfRE9DVU1FTlRf VklFV0VSIGlzIHNldCB3ZSBuZWVkIHRvCisgICAgICAgIGRpc2FibGUgdGhlIE1lbW9yeUNhY2hl IGNvbXBsZXRlbHkgdG8gcHJldmVudCBjYWNoaW5nIG9mIHRoZSByZXNvdXJjZXMuCisKKyAgICAg ICAgKiBXZWJQcm9jZXNzL3NvdXAvV2ViUHJvY2Vzc1NvdXAuY3BwOgorICAgICAgICAoV2ViS2l0 OjpXZWJQcm9jZXNzOjpwbGF0Zm9ybVNldENhY2hlTW9kZWwpOgorCiAyMDE0LTAxLTEzICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAgICAgICAgIGlPUyBXZWJLaXQy IGJ1aWxkIGZpeGVzLCBwYXJ0IDEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3Mvc291cC9XZWJQcm9jZXNzU291cC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL3Nv dXAvV2ViUHJvY2Vzc1NvdXAuY3BwCmluZGV4IDgwOWFiZjYuLjVlYzdkYmEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mvc291cC9XZWJQcm9jZXNzU291cC5jcHAKKysrIGIv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9zb3VwL1dlYlByb2Nlc3NTb3VwLmNwcApAQCAtMTAy LDYgKzEwMiw5IEBAIHZvaWQgV2ViUHJvY2Vzczo6cGxhdGZvcm1TZXRDYWNoZU1vZGVsKENhY2hl TW9kZWwgY2FjaGVNb2RlbCkKICAgICAgICAgICAgICAgICAgICAgICAgIGNhY2hlVG90YWxDYXBh Y2l0eSwgY2FjaGVNaW5EZWFkQ2FwYWNpdHksIGNhY2hlTWF4RGVhZENhcGFjaXR5LCBkZWFkRGVj b2RlZERhdGFEZWxldGlvbkludGVydmFsLAogICAgICAgICAgICAgICAgICAgICAgICAgcGFnZUNh Y2hlQ2FwYWNpdHksIHVybENhY2hlTWVtb3J5Q2FwYWNpdHksIHVybENhY2hlRGlza0NhcGFjaXR5 KTsKIAorI2lmIFBMQVRGT1JNKEdUSykKKyAgICBXZWJDb3JlOjptZW1vcnlDYWNoZSgpLT5zZXRE aXNhYmxlZChjYWNoZU1vZGVsID09IENhY2hlTW9kZWxEb2N1bWVudFZpZXdlcik7CisjZW5kaWYK ICAgICBXZWJDb3JlOjptZW1vcnlDYWNoZSgpLT5zZXRDYXBhY2l0aWVzKGNhY2hlTWluRGVhZENh cGFjaXR5LCBjYWNoZU1heERlYWRDYXBhY2l0eSwgY2FjaGVUb3RhbENhcGFjaXR5KTsKICAgICBX ZWJDb3JlOjptZW1vcnlDYWNoZSgpLT5zZXREZWFkRGVjb2RlZERhdGFEZWxldGlvbkludGVydmFs KGRlYWREZWNvZGVkRGF0YURlbGV0aW9uSW50ZXJ2YWwpOwogICAgIFdlYkNvcmU6OnBhZ2VDYWNo ZSgpLT5zZXRDYXBhY2l0eShwYWdlQ2FjaGVDYXBhY2l0eSk7Cg== 221237 2014-01-15 00:45:30 -0800 2014-01-15 01:41:18 -0800 Proposed patch v3 webkit-126577v3.patch text/plain 2632 tpopela RnJvbSAxMTAxYTRlNzhhMjdiNzUzOWRiMjEzNzljNGQyMjVkNTEwMDRhYWI4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUb21hcyBQb3BlbGEgPHRwb3BlbGFAcmVkaGF0LmNvbT4KRGF0 ZTogVHVlLCAxNCBKYW4gMjAxNCAxNTo1NDo0MyArMDEwMApTdWJqZWN0OiBbUEFUQ0hdIDIwMTQt MDEtMTQgIFRvbWFzIFBvcGVsYSAgPHRwb3BlbGFAcmVkaGF0LmNvbT4KCiAgICAgICAgW1NPVVBd IFtXSzJdIC0gRGlzYWJsZSBNZW1vcnlDYWNoZSB3aGVuIHRoZSBET0NVTUVOVF9WSUVXRVIgY2Fj aGUgbW9kZWwgaXMgc2V0CiAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTEyNjU3NwoKICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCiAgICAg ICAgQXMgaW4gaHR0cDovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvMTUyNDgzLCBidXQgdGhp cyB0aW1lIGZvcgogICAgICAgIFdlYktpdDIuIFdoZW4gV0VCS0lUX0NBQ0hFX01PREVMX0RPQ1VN RU5UX1ZJRVdFUiBpcyBzZXQgd2UgbmVlZCB0bwogICAgICAgIGRpc2FibGUgdGhlIE1lbW9yeUNh Y2hlIGNvbXBsZXRlbHkgdG8gcHJldmVudCBjYWNoaW5nIG9mIHRoZSByZXNvdXJjZXMuCgogICAg ICAgICogV2ViUHJvY2Vzcy9zb3VwL1dlYlByb2Nlc3NTb3VwLmNwcDoKICAgICAgICAoV2ViS2l0 OjpXZWJQcm9jZXNzOjpwbGF0Zm9ybVNldENhY2hlTW9kZWwpOgotLS0KIFNvdXJjZS9XZWJLaXQy L0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgfCAxNCArKysrKysrKysrKysrKwog U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9zb3VwL1dlYlByb2Nlc3NTb3VwLmNwcCB8ICAxICsK IDIgZmlsZXMgY2hhbmdlZCwgMTUgaW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCA3ODgwODI1 Li41ZDQzZjRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTQtMDEtMTQgIFRvbWFz IFBvcGVsYSAgPHRwb3BlbGFAcmVkaGF0LmNvbT4KKworICAgICAgICBbU09VUF0gW1dLMl0gLSBE aXNhYmxlIE1lbW9yeUNhY2hlIHdoZW4gdGhlIERPQ1VNRU5UX1ZJRVdFUiBjYWNoZSBtb2RlbCBp cyBzZXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEy NjU3NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFz IGluIGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzE1MjQ4MywgYnV0IHRoaXMgdGlt ZSBmb3IKKyAgICAgICAgV2ViS2l0Mi4gV2hlbiBXRUJLSVRfQ0FDSEVfTU9ERUxfRE9DVU1FTlRf VklFV0VSIGlzIHNldCB3ZSBuZWVkIHRvCisgICAgICAgIGRpc2FibGUgdGhlIE1lbW9yeUNhY2hl IGNvbXBsZXRlbHkgdG8gcHJldmVudCBjYWNoaW5nIG9mIHRoZSByZXNvdXJjZXMuCisKKyAgICAg ICAgKiBXZWJQcm9jZXNzL3NvdXAvV2ViUHJvY2Vzc1NvdXAuY3BwOgorICAgICAgICAoV2ViS2l0 OjpXZWJQcm9jZXNzOjpwbGF0Zm9ybVNldENhY2hlTW9kZWwpOgorCiAyMDE0LTAxLTEzICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAgICAgICAgIGlPUyBXZWJLaXQy IGJ1aWxkIGZpeGVzLCBwYXJ0IDEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3Mvc291cC9XZWJQcm9jZXNzU291cC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL3Nv dXAvV2ViUHJvY2Vzc1NvdXAuY3BwCmluZGV4IDgwOWFiZjYuLjg4NDNmMjAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mvc291cC9XZWJQcm9jZXNzU291cC5jcHAKKysrIGIv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9zb3VwL1dlYlByb2Nlc3NTb3VwLmNwcApAQCAtMTAy LDYgKzEwMiw3IEBAIHZvaWQgV2ViUHJvY2Vzczo6cGxhdGZvcm1TZXRDYWNoZU1vZGVsKENhY2hl TW9kZWwgY2FjaGVNb2RlbCkKICAgICAgICAgICAgICAgICAgICAgICAgIGNhY2hlVG90YWxDYXBh Y2l0eSwgY2FjaGVNaW5EZWFkQ2FwYWNpdHksIGNhY2hlTWF4RGVhZENhcGFjaXR5LCBkZWFkRGVj b2RlZERhdGFEZWxldGlvbkludGVydmFsLAogICAgICAgICAgICAgICAgICAgICAgICAgcGFnZUNh Y2hlQ2FwYWNpdHksIHVybENhY2hlTWVtb3J5Q2FwYWNpdHksIHVybENhY2hlRGlza0NhcGFjaXR5 KTsKIAorICAgIFdlYkNvcmU6Om1lbW9yeUNhY2hlKCktPnNldERpc2FibGVkKGNhY2hlTW9kZWwg PT0gQ2FjaGVNb2RlbERvY3VtZW50Vmlld2VyKTsKICAgICBXZWJDb3JlOjptZW1vcnlDYWNoZSgp LT5zZXRDYXBhY2l0aWVzKGNhY2hlTWluRGVhZENhcGFjaXR5LCBjYWNoZU1heERlYWRDYXBhY2l0 eSwgY2FjaGVUb3RhbENhcGFjaXR5KTsKICAgICBXZWJDb3JlOjptZW1vcnlDYWNoZSgpLT5zZXRE ZWFkRGVjb2RlZERhdGFEZWxldGlvbkludGVydmFsKGRlYWREZWNvZGVkRGF0YURlbGV0aW9uSW50 ZXJ2YWwpOwogICAgIFdlYkNvcmU6OnBhZ2VDYWNoZSgpLT5zZXRDYXBhY2l0eShwYWdlQ2FjaGVD YXBhY2l0eSk7Cg==