50430 2010-12-02 18:13:50 -0800 [GTK] The webkit cache model needs to be set when WebFrameLoaderClient::didPerformFirstNavigation() is called 2010-12-06 03:20:12 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 50004 0 joone webkit-unassigned gustavo mrobinson xan.lopez oldest_to_newest 316583 0 joone 2010-12-02 18:13:50 -0800 Currently, the webkit cache model is set when webkit_init() is called in WebKitGtk+, but other ports set the cache model when didPerformFirstNavigation() callback is called. I think that it seems better to set the cache model at the explicit time like other ports. Also, we need to consider adding a new property(webview-cache-model) to WebKitWebSettings instead of calling the cache model APIs directly. 316602 1 75449 joone 2010-12-02 18:51:21 -0800 Created attachment 75449 Proposed Patch 316813 2 75449 mrobinson 2010-12-03 07:00:11 -0800 Comment on attachment 75449 Proposed Patch View in context: https://bugs.webkit.org/attachment.cgi?id=75449&action=review > WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp:696 > + if (cacheModel != WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER && cacheModel != WEBKIT_CACHE_MODEL_WEB_BROWSER) I think it makes sense to expalin this logic with a comment. The Mac port explictly tracks whether or not an API consumer has set a cache model via the automaticallyDetectsCacheModel setting. That might provide a self-documenting alternative. 317484 3 75656 joone 2010-12-06 01:18:53 -0800 Created attachment 75656 Proposed Patch2 Martin suggested me to add WEBKIT_CACHE_MODEL_DEFAULT enumeration value in order to check if the cache model is not determined, so I applied this idea to the patch. Thanks! 317489 4 75656 mrobinson 2010-12-06 01:30:52 -0800 Comment on attachment 75656 Proposed Patch2 View in context: https://bugs.webkit.org/attachment.cgi?id=75656&action=review I think some of the comments should be shuffled around and expanded. > WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp:698 > + // Page cache capacity (in pages). Comment from Mac port: > + // (Research indicates that value / page drops substantially after 3 pages.) This can should probably move to the relevant line in webkit_set_cache_model (the one that sets 3 cache size to 3 pages for WEBKIT_CACHE_MODEL_WEB_BROWSER). > WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp:699 > + // FIXME: Expose this with an API and/or calculate based on available resources I think you're right that we can just remove this line now. > WebKit/gtk/webkit/webkitwebview.h:54 > + WEBKIT_CACHE_MODEL_DEFAULT, We should include some documentation with webkit_web_view_set_cache_model explaining that the default is WEB_BROWSER. 317491 5 mrobinson 2010-12-06 01:31:56 -0800 Alternatively, it makes sense to use an enum comment block: http://library.gnome.org/devel/gtk-doc-manual/stable/documenting_symbols.html.en 317509 6 75660 joone 2010-12-06 02:56:30 -0800 Created attachment 75660 Proposed Patch3 The enum comment block has been added. Thanks! 317517 7 mrobinson 2010-12-06 03:18:43 -0800 Committed r73353: <http://trac.webkit.org/changeset/73353> 317518 8 75660 mrobinson 2010-12-06 03:19:31 -0800 Comment on attachment 75660 Proposed Patch3 Landed after some minor changes. 75449 2010-12-02 18:51:21 -0800 2010-12-06 01:18:53 -0800 Proposed Patch didPeformFirstNavigation.patch text/plain 2440 joone ZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvQ2hhbmdlTG9nIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cK aW5kZXggNzQ2MTNkZS4uMjExYzI2MyAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMC0xMi0wMyAg Sm9vbmUgSHVyICA8am9vbmVAa2xkcC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgW0dUS10gVGhlIHdlYmtpdCBjYWNoZSBtb2RlbCBuZWVkcyB0 byBiZSBzZXQgd2hlbiBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlkUGVyZm9ybUZpcnN0TmF2aWdh dGlvbigpIGlzIGNhbGxlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NTA0MzAKKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xp ZW50R3RrLmNwcDoKKyAgICAgICAgKFdlYktpdDo6RnJhbWVMb2FkZXJDbGllbnQ6OmRpZFBlcmZv cm1GaXJzdE5hdmlnYXRpb24pOiBTZXQgdGhlIHdlYnZpZXcgY2FjaGUgbW9kZWwuCisgICAgICAg ICogd2Via2l0L3dlYmtpdHByaXZhdGUuY3BwOgorICAgICAgICAod2Via2l0X2luaXQpOiBSZW1v dmVkIHRoZSBjb2RlIG9mIHNldHRpbmcgdGhlIHdlYnZpZXcgY2FjaGUgbW9kZWwuCisKIDIwMTAt MTItMDIgIE1hcnRpbiBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgogCiAgICAgICAg IFJldmlld2VkIGJ5IFhhbiBMb3Blei4KZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvV2ViQ29yZVN1 cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwIGIvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9y dC9GcmFtZUxvYWRlckNsaWVudEd0ay5jcHAKaW5kZXggZmRlZjlkYy4uNjFjMTY0MCAxMDA2NDQK LS0tIGEvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEd0ay5jcHAK KysrIGIvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEd0ay5jcHAK QEAgLTY5MCw2ICs2OTAsMTEgQEAgdm9pZCBGcmFtZUxvYWRlckNsaWVudDo6ZG9jdW1lbnRFbGVt ZW50QXZhaWxhYmxlKCkKIAogdm9pZCBGcmFtZUxvYWRlckNsaWVudDo6ZGlkUGVyZm9ybUZpcnN0 TmF2aWdhdGlvbigpIGNvbnN0CiB7CisgICAgV2ViS2l0Q2FjaGVNb2RlbCBjYWNoZU1vZGVsID0g d2Via2l0X2dldF9jYWNoZV9tb2RlbCgpOworICAgIC8vIFBhZ2UgY2FjaGUgY2FwYWNpdHkgKGlu IHBhZ2VzKS4gQ29tbWVudCBmcm9tIE1hYyBwb3J0OgorICAgIC8vIChSZXNlYXJjaCBpbmRpY2F0 ZXMgdGhhdCB2YWx1ZSAvIHBhZ2UgZHJvcHMgc3Vic3RhbnRpYWxseSBhZnRlciAzIHBhZ2VzLikK KyAgICBpZiAoY2FjaGVNb2RlbCAhPSBXRUJLSVRfQ0FDSEVfTU9ERUxfRE9DVU1FTlRfVklFV0VS ICYmIGNhY2hlTW9kZWwgIT0gV0VCS0lUX0NBQ0hFX01PREVMX1dFQl9CUk9XU0VSKQorICAgICAg ICB3ZWJraXRfc2V0X2NhY2hlX21vZGVsKFdFQktJVF9DQUNIRV9NT0RFTF9XRUJfQlJPV1NFUik7 CiB9CiAKIHZvaWQgRnJhbWVMb2FkZXJDbGllbnQ6OnJlZ2lzdGVyRm9ySWNvbk5vdGlmaWNhdGlv bihib29sIHNob3VsZFJlZ2lzdGVyKQpkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0ay93ZWJraXQvd2Vi a2l0cHJpdmF0ZS5jcHAgYi9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRwcml2YXRlLmNwcAppbmRl eCA0ZWM2MzYyLi4xZmI0YWNiIDEwMDY0NAotLS0gYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRw cml2YXRlLmNwcAorKysgYi9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRwcml2YXRlLmNwcApAQCAt Mjg0LDExICsyODQsNiBAQCB2b2lkIHdlYmtpdF9pbml0KCkKICAgICAvLyB0aGF0IG1heSBvbmx5 IGJlIGRvbmUgYnkgdGhlIG1haW4gdGhyZWFkLgogICAgIGF0b21pY0Nhbm9uaWNhbFRleHRFbmNv ZGluZ05hbWUoIlVURi04Iik7CiAKLSAgICAvLyBQYWdlIGNhY2hlIGNhcGFjaXR5IChpbiBwYWdl cykuIENvbW1lbnQgZnJvbSBNYWMgcG9ydDoKLSAgICAvLyAoUmVzZWFyY2ggaW5kaWNhdGVzIHRo YXQgdmFsdWUgLyBwYWdlIGRyb3BzIHN1YnN0YW50aWFsbHkgYWZ0ZXIgMyBwYWdlcy4pCi0gICAg Ly8gRklYTUU6IEV4cG9zZSB0aGlzIHdpdGggYW4gQVBJIGFuZC9vciBjYWxjdWxhdGUgYmFzZWQg b24gYXZhaWxhYmxlIHJlc291cmNlcwotICAgIHdlYmtpdF9zZXRfY2FjaGVfbW9kZWwoV0VCS0lU X0NBQ0hFX01PREVMX1dFQl9CUk9XU0VSKTsKLQogI2lmIEVOQUJMRShEQVRBQkFTRSkKICAgICBn Y2hhciogZGF0YWJhc2VEaXJlY3RvcnkgPSBnX2J1aWxkX2ZpbGVuYW1lKGdfZ2V0X3VzZXJfZGF0 YV9kaXIoKSwgIndlYmtpdCIsICJkYXRhYmFzZXMiLCBOVUxMKTsKICAgICB3ZWJraXRfc2V0X3dl Yl9kYXRhYmFzZV9kaXJlY3RvcnlfcGF0aChkYXRhYmFzZURpcmVjdG9yeSk7Cg== 75656 2010-12-06 01:18:53 -0800 2010-12-06 02:56:30 -0800 Proposed Patch2 didPeformFirstNavigation2.patch text/plain 3519 joone ZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvQ2hhbmdlTG9nIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cK aW5kZXggY2IyYTBiMS4uYTYwMmY0YyAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMC0xMi0wNiAg Sm9vbmUgSHVyICA8am9vbmVAa2xkcC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgW0dUS10gVGhlIHdlYmtpdCBjYWNoZSBtb2RlbCBuZWVkcyB0 byBiZSBzZXQgd2hlbiBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlkUGVyZm9ybUZpcnN0TmF2aWdh dGlvbigpIGlzIGNhbGxlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NTA0MzAKKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xp ZW50R3RrLmNwcDoKKyAgICAgICAgKFdlYktpdDo6RnJhbWVMb2FkZXJDbGllbnQ6OmRpZFBlcmZv cm1GaXJzdE5hdmlnYXRpb24pOiBTZXQgdGhlIHdlYnZpZXcgY2FjaGUgbW9kZWwuCisgICAgICAg ICogd2Via2l0L3dlYmtpdHByaXZhdGUuY3BwOgorICAgICAgICAod2Via2l0X2luaXQpOiBSZW1v dmVkIHRoZSBjb2RlIG9mIHNldHRpbmcgdGhlIHdlYnZpZXcgY2FjaGUgbW9kZWwuCisKIDIwMTAt MTEtMDggIEFudG9uaW8gR29tZXMgIDxhZ29tZXNAcmltLmNvbT4KIAogICAgICAgICBSZXZpZXdl ZCBieSBNYXJ0aW4gUm9iaW5zb24uCmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBw b3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmNwcCBiL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQv RnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwCmluZGV4IGZkZWY5ZGMuLjQyMDc5YzMgMTAwNjQ0Ci0t LSBhL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwCisr KyBiL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwCkBA IC02OTAsNiArNjkwLDEzIEBAIHZvaWQgRnJhbWVMb2FkZXJDbGllbnQ6OmRvY3VtZW50RWxlbWVu dEF2YWlsYWJsZSgpCiAKIHZvaWQgRnJhbWVMb2FkZXJDbGllbnQ6OmRpZFBlcmZvcm1GaXJzdE5h dmlnYXRpb24oKSBjb25zdAogeworICAgIFdlYktpdENhY2hlTW9kZWwgY2FjaGVNb2RlbCA9IHdl YmtpdF9nZXRfY2FjaGVfbW9kZWwoKTsKKyAgICAvLyBJZiB1c2VyIGFnZW50cyBkbyBub3QgZGV0 ZXJtaW5lIHRoZSBjYWNoZSBtb2RlbCwgV0VCS0lUX0NBQ0hFX01PREVMX1dFQl9CUk9XU0VSIHdp bGwgYmUgc2V0IGJhc2ljYWxseS4KKyAgICBpZiAoY2FjaGVNb2RlbCA9PSBXRUJLSVRfQ0FDSEVf TU9ERUxfREVGQVVMVCkKKyAgICAgICAgd2Via2l0X3NldF9jYWNoZV9tb2RlbChXRUJLSVRfQ0FD SEVfTU9ERUxfV0VCX0JST1dTRVIpOworICAgIC8vIFBhZ2UgY2FjaGUgY2FwYWNpdHkgKGluIHBh Z2VzKS4gQ29tbWVudCBmcm9tIE1hYyBwb3J0OgorICAgIC8vIChSZXNlYXJjaCBpbmRpY2F0ZXMg dGhhdCB2YWx1ZSAvIHBhZ2UgZHJvcHMgc3Vic3RhbnRpYWxseSBhZnRlciAzIHBhZ2VzLikKKyAg ICAvLyBGSVhNRTogRXhwb3NlIHRoaXMgd2l0aCBhbiBBUEkgYW5kL29yIGNhbGN1bGF0ZSBiYXNl ZCBvbiBhdmFpbGFibGUgcmVzb3VyY2VzCiB9CiAKIHZvaWQgRnJhbWVMb2FkZXJDbGllbnQ6OnJl Z2lzdGVyRm9ySWNvbk5vdGlmaWNhdGlvbihib29sIHNob3VsZFJlZ2lzdGVyKQpkaWZmIC0tZ2l0 IGEvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0cHJpdmF0ZS5jcHAgYi9XZWJLaXQvZ3RrL3dlYmtp dC93ZWJraXRwcml2YXRlLmNwcAppbmRleCA0ZWM2MzYyLi4xZmI0YWNiIDEwMDY0NAotLS0gYS9X ZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRwcml2YXRlLmNwcAorKysgYi9XZWJLaXQvZ3RrL3dlYmtp dC93ZWJraXRwcml2YXRlLmNwcApAQCAtMjg0LDExICsyODQsNiBAQCB2b2lkIHdlYmtpdF9pbml0 KCkKICAgICAvLyB0aGF0IG1heSBvbmx5IGJlIGRvbmUgYnkgdGhlIG1haW4gdGhyZWFkLgogICAg IGF0b21pY0Nhbm9uaWNhbFRleHRFbmNvZGluZ05hbWUoIlVURi04Iik7CiAKLSAgICAvLyBQYWdl IGNhY2hlIGNhcGFjaXR5IChpbiBwYWdlcykuIENvbW1lbnQgZnJvbSBNYWMgcG9ydDoKLSAgICAv LyAoUmVzZWFyY2ggaW5kaWNhdGVzIHRoYXQgdmFsdWUgLyBwYWdlIGRyb3BzIHN1YnN0YW50aWFs bHkgYWZ0ZXIgMyBwYWdlcy4pCi0gICAgLy8gRklYTUU6IEV4cG9zZSB0aGlzIHdpdGggYW4gQVBJ IGFuZC9vciBjYWxjdWxhdGUgYmFzZWQgb24gYXZhaWxhYmxlIHJlc291cmNlcwotICAgIHdlYmtp dF9zZXRfY2FjaGVfbW9kZWwoV0VCS0lUX0NBQ0hFX01PREVMX1dFQl9CUk9XU0VSKTsKLQogI2lm IEVOQUJMRShEQVRBQkFTRSkKICAgICBnY2hhciogZGF0YWJhc2VEaXJlY3RvcnkgPSBnX2J1aWxk X2ZpbGVuYW1lKGdfZ2V0X3VzZXJfZGF0YV9kaXIoKSwgIndlYmtpdCIsICJkYXRhYmFzZXMiLCBO VUxMKTsKICAgICB3ZWJraXRfc2V0X3dlYl9kYXRhYmFzZV9kaXJlY3RvcnlfcGF0aChkYXRhYmFz ZURpcmVjdG9yeSk7CmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3 LmNwcCBiL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwCmluZGV4IDkwYmU5MzUu LjA3ZGU2OWMgMTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3Bw CisrKyBiL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwCkBAIC0xMjUsNyArMTI1 LDcgQEAKICAqLwogCiBzdGF0aWMgY29uc3QgZG91YmxlIGRlZmF1bHREUEkgPSA5Ni4wOwotc3Rh dGljIFdlYktpdENhY2hlTW9kZWwgY2FjaGVNb2RlbDsKK3N0YXRpYyBXZWJLaXRDYWNoZU1vZGVs IGNhY2hlTW9kZWwgPSBXRUJLSVRfQ0FDSEVfTU9ERUxfREVGQVVMVDsKIHN0YXRpYyBJbnRQb2lu dCBnbG9iYWxQb2ludEZvckNsaWVudFBvaW50KEdka1dpbmRvdyogd2luZG93LCBjb25zdCBJbnRQ b2ludCYgY2xpZW50UG9pbnQpOwogCiB1c2luZyBuYW1lc3BhY2UgV2ViS2l0OwpkaWZmIC0tZ2l0 IGEvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5oIGIvV2ViS2l0L2d0ay93ZWJraXQv d2Via2l0d2Vidmlldy5oCmluZGV4IGNmOGU2NjkuLjBkYTNjMzYgMTAwNjQ0Ci0tLSBhL1dlYktp dC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuaAorKysgYi9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJr aXR3ZWJ2aWV3LmgKQEAgLTUxLDcgKzUxLDggQEAgdHlwZWRlZiBlbnVtIHsKIH0gV2ViS2l0TmF2 aWdhdGlvblJlc3BvbnNlOwogCiB0eXBlZGVmIGVudW0gewotICAgIFdFQktJVF9DQUNIRV9NT0RF TF9ET0NVTUVOVF9WSUVXRVIgPSAxLAorICAgIFdFQktJVF9DQUNIRV9NT0RFTF9ERUZBVUxULAor ICAgIFdFQktJVF9DQUNIRV9NT0RFTF9ET0NVTUVOVF9WSUVXRVIsCiAgICAgV0VCS0lUX0NBQ0hF X01PREVMX1dFQl9CUk9XU0VSCiB9IFdlYktpdENhY2hlTW9kZWw7CiAK 75660 2010-12-06 02:56:30 -0800 2010-12-06 03:20:12 -0800 Proposed Patch3 didPerformFirstNavigation3.patch text/plain 3958 joone ZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvQ2hhbmdlTG9nIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cK aW5kZXggY2IyYTBiMS4uYTYwMmY0YyAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMC0xMi0wNiAg Sm9vbmUgSHVyICA8am9vbmVAa2xkcC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgW0dUS10gVGhlIHdlYmtpdCBjYWNoZSBtb2RlbCBuZWVkcyB0 byBiZSBzZXQgd2hlbiBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlkUGVyZm9ybUZpcnN0TmF2aWdh dGlvbigpIGlzIGNhbGxlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NTA0MzAKKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xp ZW50R3RrLmNwcDoKKyAgICAgICAgKFdlYktpdDo6RnJhbWVMb2FkZXJDbGllbnQ6OmRpZFBlcmZv cm1GaXJzdE5hdmlnYXRpb24pOiBTZXQgdGhlIHdlYnZpZXcgY2FjaGUgbW9kZWwuCisgICAgICAg ICogd2Via2l0L3dlYmtpdHByaXZhdGUuY3BwOgorICAgICAgICAod2Via2l0X2luaXQpOiBSZW1v dmVkIHRoZSBjb2RlIG9mIHNldHRpbmcgdGhlIHdlYnZpZXcgY2FjaGUgbW9kZWwuCisKIDIwMTAt MTEtMDggIEFudG9uaW8gR29tZXMgIDxhZ29tZXNAcmltLmNvbT4KIAogICAgICAgICBSZXZpZXdl ZCBieSBNYXJ0aW4gUm9iaW5zb24uCmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBw b3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmNwcCBiL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQv RnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwCmluZGV4IGZkZWY5ZGMuLjQyMDc5YzMgMTAwNjQ0Ci0t LSBhL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwCisr KyBiL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwCkBA IC02OTAsNiArNjkwLDEzIEBAIHZvaWQgRnJhbWVMb2FkZXJDbGllbnQ6OmRvY3VtZW50RWxlbWVu dEF2YWlsYWJsZSgpCiAKIHZvaWQgRnJhbWVMb2FkZXJDbGllbnQ6OmRpZFBlcmZvcm1GaXJzdE5h dmlnYXRpb24oKSBjb25zdAogeworICAgIFdlYktpdENhY2hlTW9kZWwgY2FjaGVNb2RlbCA9IHdl YmtpdF9nZXRfY2FjaGVfbW9kZWwoKTsKKyAgICAvLyBJZiB1c2VyIGFnZW50cyBkbyBub3QgZGV0 ZXJtaW5lIHRoZSBjYWNoZSBtb2RlbCwgV0VCS0lUX0NBQ0hFX01PREVMX1dFQl9CUk9XU0VSIHdp bGwgYmUgc2V0IGJhc2ljYWxseS4KKyAgICBpZiAoY2FjaGVNb2RlbCA9PSBXRUJLSVRfQ0FDSEVf TU9ERUxfREVGQVVMVCkKKyAgICAgICAgd2Via2l0X3NldF9jYWNoZV9tb2RlbChXRUJLSVRfQ0FD SEVfTU9ERUxfV0VCX0JST1dTRVIpOworICAgIC8vIFBhZ2UgY2FjaGUgY2FwYWNpdHkgKGluIHBh Z2VzKS4gQ29tbWVudCBmcm9tIE1hYyBwb3J0OgorICAgIC8vIChSZXNlYXJjaCBpbmRpY2F0ZXMg dGhhdCB2YWx1ZSAvIHBhZ2UgZHJvcHMgc3Vic3RhbnRpYWxseSBhZnRlciAzIHBhZ2VzLikKKyAg ICAvLyBGSVhNRTogRXhwb3NlIHRoaXMgd2l0aCBhbiBBUEkgYW5kL29yIGNhbGN1bGF0ZSBiYXNl ZCBvbiBhdmFpbGFibGUgcmVzb3VyY2VzCiB9CiAKIHZvaWQgRnJhbWVMb2FkZXJDbGllbnQ6OnJl Z2lzdGVyRm9ySWNvbk5vdGlmaWNhdGlvbihib29sIHNob3VsZFJlZ2lzdGVyKQpkaWZmIC0tZ2l0 IGEvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0cHJpdmF0ZS5jcHAgYi9XZWJLaXQvZ3RrL3dlYmtp dC93ZWJraXRwcml2YXRlLmNwcAppbmRleCA0ZWM2MzYyLi4xZmI0YWNiIDEwMDY0NAotLS0gYS9X ZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRwcml2YXRlLmNwcAorKysgYi9XZWJLaXQvZ3RrL3dlYmtp dC93ZWJraXRwcml2YXRlLmNwcApAQCAtMjg0LDExICsyODQsNiBAQCB2b2lkIHdlYmtpdF9pbml0 KCkKICAgICAvLyB0aGF0IG1heSBvbmx5IGJlIGRvbmUgYnkgdGhlIG1haW4gdGhyZWFkLgogICAg IGF0b21pY0Nhbm9uaWNhbFRleHRFbmNvZGluZ05hbWUoIlVURi04Iik7CiAKLSAgICAvLyBQYWdl IGNhY2hlIGNhcGFjaXR5IChpbiBwYWdlcykuIENvbW1lbnQgZnJvbSBNYWMgcG9ydDoKLSAgICAv LyAoUmVzZWFyY2ggaW5kaWNhdGVzIHRoYXQgdmFsdWUgLyBwYWdlIGRyb3BzIHN1YnN0YW50aWFs bHkgYWZ0ZXIgMyBwYWdlcy4pCi0gICAgLy8gRklYTUU6IEV4cG9zZSB0aGlzIHdpdGggYW4gQVBJ IGFuZC9vciBjYWxjdWxhdGUgYmFzZWQgb24gYXZhaWxhYmxlIHJlc291cmNlcwotICAgIHdlYmtp dF9zZXRfY2FjaGVfbW9kZWwoV0VCS0lUX0NBQ0hFX01PREVMX1dFQl9CUk9XU0VSKTsKLQogI2lm IEVOQUJMRShEQVRBQkFTRSkKICAgICBnY2hhciogZGF0YWJhc2VEaXJlY3RvcnkgPSBnX2J1aWxk X2ZpbGVuYW1lKGdfZ2V0X3VzZXJfZGF0YV9kaXIoKSwgIndlYmtpdCIsICJkYXRhYmFzZXMiLCBO VUxMKTsKICAgICB3ZWJraXRfc2V0X3dlYl9kYXRhYmFzZV9kaXJlY3RvcnlfcGF0aChkYXRhYmFz ZURpcmVjdG9yeSk7CmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3 LmNwcCBiL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwCmluZGV4IDkwYmU5MzUu LjA3ZGU2OWMgMTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3Bw CisrKyBiL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwCkBAIC0xMjUsNyArMTI1 LDcgQEAKICAqLwogCiBzdGF0aWMgY29uc3QgZG91YmxlIGRlZmF1bHREUEkgPSA5Ni4wOwotc3Rh dGljIFdlYktpdENhY2hlTW9kZWwgY2FjaGVNb2RlbDsKK3N0YXRpYyBXZWJLaXRDYWNoZU1vZGVs IGNhY2hlTW9kZWwgPSBXRUJLSVRfQ0FDSEVfTU9ERUxfREVGQVVMVDsKIHN0YXRpYyBJbnRQb2lu dCBnbG9iYWxQb2ludEZvckNsaWVudFBvaW50KEdka1dpbmRvdyogd2luZG93LCBjb25zdCBJbnRQ b2ludCYgY2xpZW50UG9pbnQpOwogCiB1c2luZyBuYW1lc3BhY2UgV2ViS2l0OwpkaWZmIC0tZ2l0 IGEvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5oIGIvV2ViS2l0L2d0ay93ZWJraXQv d2Via2l0d2Vidmlldy5oCmluZGV4IGNmOGU2NjkuLjQ1YTU0NDQgMTAwNjQ0Ci0tLSBhL1dlYktp dC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuaAorKysgYi9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJr aXR3ZWJ2aWV3LmgKQEAgLTUwLDggKzUwLDIwIEBAIHR5cGVkZWYgZW51bSB7CiAgICAgV0VCS0lU X05BVklHQVRJT05fUkVTUE9OU0VfRE9XTkxPQUQKIH0gV2ViS2l0TmF2aWdhdGlvblJlc3BvbnNl OwogCisvKiAgCisgKiBXZWJLaXRDYWNoZU1vZGVsOgorICogQFdFQktJVF9DQUNIRV9NT0RFTF9E T0NVTUVOVF9WSUVXRVI6IFJlZHVjZSBtZW1vcnkgdXNhZ2Ugc3Vic3RhbnRpYWxseQorICogICB0 aHJvdWdoIG5vdCBjYWNoaW5nIHByZXZpb3VzbHkgdmlld2VkIGNvbnRlbnQuCisgKiBAV0VCS0lU X0NBQ0hFX01PREVMX1dFQl9CUk9XU0VSOiBJbXByb3ZlIGRvY3VtZW50IGxvYWQgc3BlZWQgc3Vi c3RhbnRpYWxseQorICogICB0aHJvdWdoIGNhY2hpbmcgcHJldmlvdXNseSB2aWV3ZWQgY29udGVu dC4KKyAqIAorICogRW51bSB2YWx1ZXMgdXNlZCBmb3IgZGV0ZXJtaW5pbmcgdGhlIHdlYnZpZXcg Y2FjaGUgbW9kZWwuCisgKi8KIHR5cGVkZWYgZW51bSB7Ci0gICAgV0VCS0lUX0NBQ0hFX01PREVM X0RPQ1VNRU5UX1ZJRVdFUiA9IDEsCisgICAgLyo8IHByaXZhdGUgPiovCisgICAgV0VCS0lUX0NB Q0hFX01PREVMX0RFRkFVTFQsCisgICAgLyo8IHB1YmxpYyA+Ki8KKyAgICBXRUJLSVRfQ0FDSEVf TU9ERUxfRE9DVU1FTlRfVklFV0VSLAogICAgIFdFQktJVF9DQUNIRV9NT0RFTF9XRUJfQlJPV1NF UgogfSBXZWJLaXRDYWNoZU1vZGVsOwogCg==