91478 2012-07-17 02:16:14 -0700 [GTK] No main resource in WebView when page has been loaded from history cache 2012-07-18 06:27:30 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Normal --- 91495 1 cgarcia webkit-unassigned gustavo mrobinson philn webkit.review.bot xan.lopez oldest_to_newest 671102 0 cgarcia 2012-07-17 02:16:14 -0700 We are assuming that a resource loaded for the main frame that is provisionally loaded is the main resource of the web view. However that's not true for pages loaded from history cache, so when you go back/forward webkit_web_view_get_main_resource() always returns NULL. 671105 1 152722 cgarcia 2012-07-17 02:30:39 -0700 Created attachment 152722 Patch 671106 2 webkit.review.bot 2012-07-17 02:32:51 -0700 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 671120 3 152722 xan.lopez 2012-07-17 03:13:24 -0700 Comment on attachment 152722 Patch OK, I'm going to make the obvious naive question. Why is WK lying to us when the page is loaded from the history cache? It does not make sense to try to fix that? (Also, mixing typo fixes with the bug fix, noooo) 671124 4 cgarcia 2012-07-17 03:19:20 -0700 (In reply to comment #3) > (From update of attachment 152722 [details]) > OK, I'm going to make the obvious naive question. Why is WK lying to us when the page is loaded from the history cache? It does not make sense to try to fix that? I don't think WK is lying, it's just that pages loaded from the history cache are not provisionally loaded, but go directly to the committed state. I'm not loader expert, though. > (Also, mixing typo fixes with the bug fix, noooo) Oooooook, I'll split the patch :-) 671193 5 152741 cgarcia 2012-07-17 05:18:55 -0700 Created attachment 152741 Updated patch Split the patch as suggested by Xan. 671271 6 cgarcia 2012-07-17 07:47:13 -0700 Build issue is because it depends on bug #91495 672315 7 cgarcia 2012-07-18 06:27:30 -0700 Committed r122960: <http://trac.webkit.org/changeset/122960> 152722 2012-07-17 02:30:39 -0700 2012-07-17 05:18:55 -0700 Patch wk2-main-resource-history-cache.diff text/plain 9691 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA5YjYzZmE3Li4wNTkxMDU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAg QEAKKzIwMTItMDctMTcgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIE5vIG1haW4gcmVzb3VyY2UgaW4gV2ViVmlldyB3aGVuIHBhZ2Ug aGFzIGJlZW4gbG9hZGVkIGZyb20gaGlzdG9yeSBjYWNoZQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTE0NzgKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZSBhcmUgYXNzdW1pbmcgdGhhdCBhIHJlc291cmNl IGxvYWRlZCBmb3IgdGhlIG1haW4gZnJhbWUgdGhhdCBpcworICAgICAgICBwcm92aXNpb25hbGx5 IGxvYWRpbmcgaXMgdGhlIG1haW4gcmVzb3VyY2Ugb2YgdGhlIHdlYiB2aWV3LiBIb3dldmVyCisg ICAgICAgIHRoYXQncyBub3QgdHJ1ZSBmb3IgcGFnZXMgbG9hZGVkIGZyb20gaGlzdG9yeSBjYWNo ZSwgc28gd2hlbiB5b3UKKyAgICAgICAgZ28gYmFjay9mb3J3YXJkIHdlYmtpdF93ZWJfdmlld19n ZXRfbWFpbl9yZXNvdXJjZSgpIGFsd2F5cyByZXR1cm5zCisgICAgICAgIE5VTEwuIFdlIGNhbiBh c3N1bWUgdGhhdCB0aGUgZmlyc3QgcmVzb3VyY2UgbG9hZGVkIGZvciB0aGUgbWFpbgorICAgICAg ICBmcmFtZSBpcyB0aGUgbWFpbiByZXNvdXJjZSBvZiB0aGUgd2ViIHZpZXcgd2hlbgorICAgICAg ICBwYWdlSXNQcm92aXNpb25hbGx5TG9hZGluZyBpcyBmYWxzZS4KKworICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuY3BwOgorICAgICAgICAod2Via2l0V2ViVmlld1Jl c291cmNlTG9hZFN0YXJ0ZWQpOiBNYWtlIHN1cmUgd2UgYWx3YXlzIGhhdmUgYQorICAgICAgICBt YWluIHJlc291cmNlIGZvciB0aGUgd2ViIHZpZXcuCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9n dGsvdGVzdHMvVGVzdFJlc291cmNlcy5jcHA6CisgICAgICAgICh0ZXN0V2ViUmVzb3VyY2VMb2Fk aW5nKTogRml4IGEgdHlwby4KKyAgICAgICAgKHRlc3RXZWJSZXNvdXJjZVJlc3BvbnNlKTogRGl0 dG8uCisgICAgICAgICh0ZXN0V2ViUmVzb3VyY2VNaW1lVHlwZSk6IERpdHRvLgorICAgICAgICAo dGVzdFdlYlJlc291cmNlQWN0aXZlVVJJKTogRGl0dG8uCisgICAgICAgICh0ZXN0V2ViVmlld1Jl c291cmNlc0hpc3RvcnlDYWNoZSk6IFRlc3Qgd2UgYWx3YXlzIGhhdmUgYSBtYWluCisgICAgICAg IHJlc291cmNlIGV2ZW4gYWZ0ZXIgZ29pbmcgYmFjay9mb3J3YXJkLgorICAgICAgICAoYmVmb3Jl QWxsKTogQWRkIG5ldyB0ZXN0IGNhc2UuCisKIDIwMTItMDctMTYgIEd5dXlvdW5nIEtpbSAgPGd5 dXlvdW5nLmtpbUBzYW1zdW5nLmNvbT4KIAogICAgICAgICBBZGQgUmVnaXN0ZXJQcm90b2NvbEhh bmRsZXJDbGllbnQgdG8gdGhlIE1vZHVsZXMvcHJvdG9jb2xoYW5kbGVyCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmNwcCBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuY3BwCmluZGV4IDhiZmFi ZWUuLmEyMDY1NzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3Rr L1dlYktpdFdlYlZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3Rr L1dlYktpdFdlYlZpZXcuY3BwCkBAIC0xMjUwLDcgKzEyNTAsNyBAQCB2b2lkIHdlYmtpdFdlYlZp ZXdSZXNvdXJjZUxvYWRTdGFydGVkKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcsIFdLRnJhbWVSZWYg d2tGcmFtZQogCiAgICAgV2ViS2l0V2ViVmlld1ByaXZhdGUqIHByaXYgPSB3ZWJWaWV3LT5wcml2 OwogICAgIFdlYktpdFdlYlJlc291cmNlKiByZXNvdXJjZSA9IHdlYmtpdFdlYlJlc291cmNlQ3Jl YXRlKHdrRnJhbWUsIHJlcXVlc3QsIGlzTWFpblJlc291cmNlKTsKLSAgICBpZiAoV0tGcmFtZUlz TWFpbkZyYW1lKHdrRnJhbWUpICYmIGlzTWFpblJlc291cmNlKQorICAgIGlmIChXS0ZyYW1lSXNN YWluRnJhbWUod2tGcmFtZSkgJiYgKGlzTWFpblJlc291cmNlIHx8ICFwcml2LT5tYWluUmVzb3Vy Y2UpKQogICAgICAgICBwcml2LT5tYWluUmVzb3VyY2UgPSByZXNvdXJjZTsKICAgICBwcml2LT5s b2FkaW5nUmVzb3VyY2VzTWFwLnNldChyZXNvdXJjZUlkZW50aWZpZXIsIGFkb3B0R1JlZihyZXNv dXJjZSkpOwogICAgIGdfc2lnbmFsX2VtaXQod2ViVmlldywgc2lnbmFsc1tSRVNPVVJDRV9MT0FE X1NUQVJURURdLCAwLCByZXNvdXJjZSwgcmVxdWVzdCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0UmVzb3VyY2VzLmNwcCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RSZXNvdXJjZXMuY3BwCmluZGV4IDdk ZTk1ZTAuLjg0MjBhOTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv Z3RrL3Rlc3RzL1Rlc3RSZXNvdXJjZXMuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvZ3RrL3Rlc3RzL1Rlc3RSZXNvdXJjZXMuY3BwCkBAIC0yOTMsMTYgKzI5MywxNiBAQCBw dWJsaWM6CiAgICAgICAgICAgICBtX2xvYWRFdmVudHMuYXBwZW5kKEZhaWxlZCk7CiAgICAgfQog Ci0gICAgdm9pZCB3YWl0VW50aWxSZXNvdXJjZUxvYWRGaW5zaWhlZCgpCisgICAgdm9pZCB3YWl0 VW50aWxSZXNvdXJjZUxvYWRGaW5pc2hlZCgpCiAgICAgewogICAgICAgICBtX3Jlc291cmNlID0g MDsKICAgICAgICAgbV9yZXNvdXJjZXNMb2FkZWQgPSAwOwogICAgICAgICBnX21haW5fbG9vcF9y dW4obV9tYWluTG9vcCk7CiAgICAgfQogCi0gICAgV2ViS2l0VVJJUmVzcG9uc2UqIHdhaXRVbnRp bFJlc291cmNlTG9hZEZpbnNpaGVkQW5kUmV0dXJuVVJJUmVzcG9uc2UoKQorICAgIFdlYktpdFVS SVJlc3BvbnNlKiB3YWl0VW50aWxSZXNvdXJjZUxvYWRGaW5pc2hlZEFuZFJldHVyblVSSVJlc3Bv bnNlKCkKICAgICB7Ci0gICAgICAgIHdhaXRVbnRpbFJlc291cmNlTG9hZEZpbnNpaGVkKCk7Cisg ICAgICAgIHdhaXRVbnRpbFJlc291cmNlTG9hZEZpbmlzaGVkKCk7CiAgICAgICAgIGdfYXNzZXJ0 KG1fcmVzb3VyY2UpOwogICAgICAgICByZXR1cm4gd2Via2l0X3dlYl9yZXNvdXJjZV9nZXRfcmVz cG9uc2UobV9yZXNvdXJjZS5nZXQoKSk7CiAgICAgfQpAQCAtMzE1LDcgKzMxNSw3IEBAIHB1Ymxp YzoKIHN0YXRpYyB2b2lkIHRlc3RXZWJSZXNvdXJjZUxvYWRpbmcoU2luZ2xlUmVzb3VyY2VMb2Fk VGVzdCogdGVzdCwgZ2NvbnN0cG9pbnRlcikKIHsKICAgICB0ZXN0LT5sb2FkVVJJKGtTZXJ2ZXIt PmdldFVSSUZvclBhdGgoIi9qYXZhc2NyaXB0Lmh0bWwiKS5kYXRhKCkpOwotICAgIHRlc3QtPndh aXRVbnRpbFJlc291cmNlTG9hZEZpbnNpaGVkKCk7CisgICAgdGVzdC0+d2FpdFVudGlsUmVzb3Vy Y2VMb2FkRmluaXNoZWQoKTsKICAgICBnX2Fzc2VydCh0ZXN0LT5tX3Jlc291cmNlKTsKICAgICBW ZWN0b3I8U2luZ2xlUmVzb3VyY2VMb2FkVGVzdDo6TG9hZEV2ZW50cz4mIGV2ZW50cyA9IHRlc3Qt Pm1fbG9hZEV2ZW50czsKICAgICBnX2Fzc2VydF9jbXBpbnQoZXZlbnRzLnNpemUoKSwgPT0sIDUp OwpAQCAtMzI3LDcgKzMyNyw3IEBAIHN0YXRpYyB2b2lkIHRlc3RXZWJSZXNvdXJjZUxvYWRpbmco U2luZ2xlUmVzb3VyY2VMb2FkVGVzdCogdGVzdCwgZ2NvbnN0cG9pbnRlcikKICAgICBldmVudHMu Y2xlYXIoKTsKIAogICAgIHRlc3QtPmxvYWRVUkkoa1NlcnZlci0+Z2V0VVJJRm9yUGF0aCgiL3Jl ZGlyZWN0ZWQtY3NzLmh0bWwiKS5kYXRhKCkpOwotICAgIHRlc3QtPndhaXRVbnRpbFJlc291cmNl TG9hZEZpbnNpaGVkKCk7CisgICAgdGVzdC0+d2FpdFVudGlsUmVzb3VyY2VMb2FkRmluaXNoZWQo KTsKICAgICBnX2Fzc2VydCh0ZXN0LT5tX3Jlc291cmNlKTsKICAgICBnX2Fzc2VydF9jbXBpbnQo ZXZlbnRzLnNpemUoKSwgPT0sIDYpOwogICAgIGdfYXNzZXJ0X2NtcGludChldmVudHNbMF0sID09 LCBTaW5nbGVSZXNvdXJjZUxvYWRUZXN0OjpTdGFydGVkKTsKQEAgLTMzOSw3ICszMzksNyBAQCBz dGF0aWMgdm9pZCB0ZXN0V2ViUmVzb3VyY2VMb2FkaW5nKFNpbmdsZVJlc291cmNlTG9hZFRlc3Qq IHRlc3QsIGdjb25zdHBvaW50ZXIpCiAgICAgZXZlbnRzLmNsZWFyKCk7CiAKICAgICB0ZXN0LT5s b2FkVVJJKGtTZXJ2ZXItPmdldFVSSUZvclBhdGgoIi9pbnZhbGlkLWNzcy5odG1sIikuZGF0YSgp KTsKLSAgICB0ZXN0LT53YWl0VW50aWxSZXNvdXJjZUxvYWRGaW5zaWhlZCgpOworICAgIHRlc3Qt PndhaXRVbnRpbFJlc291cmNlTG9hZEZpbmlzaGVkKCk7CiAgICAgZ19hc3NlcnQodGVzdC0+bV9y ZXNvdXJjZSk7CiAgICAgZ19hc3NlcnRfY21waW50KGV2ZW50cy5zaXplKCksID09LCA0KTsKICAg ICBnX2Fzc2VydF9jbXBpbnQoZXZlbnRzWzBdLCA9PSwgU2luZ2xlUmVzb3VyY2VMb2FkVGVzdDo6 U3RhcnRlZCk7CkBAIC0zNTMsNDcgKzM1Myw0NyBAQCBzdGF0aWMgdm9pZCB0ZXN0V2ViUmVzb3Vy Y2VSZXNwb25zZShTaW5nbGVSZXNvdXJjZUxvYWRUZXN0KiB0ZXN0LCBnY29uc3Rwb2ludGVyKQog ewogICAgIC8vIE5vIGNhY2hlZCByZXNvdXJjZTogRmlyc3QgbG9hZC4KICAgICB0ZXN0LT5sb2Fk VVJJKGtTZXJ2ZXItPmdldFVSSUZvclBhdGgoIi9qYXZhc2NyaXB0Lmh0bWwiKS5kYXRhKCkpOwot ICAgIFdlYktpdFVSSVJlc3BvbnNlKiByZXNwb25zZSA9IHRlc3QtPndhaXRVbnRpbFJlc291cmNl TG9hZEZpbnNpaGVkQW5kUmV0dXJuVVJJUmVzcG9uc2UoKTsKKyAgICBXZWJLaXRVUklSZXNwb25z ZSogcmVzcG9uc2UgPSB0ZXN0LT53YWl0VW50aWxSZXNvdXJjZUxvYWRGaW5pc2hlZEFuZFJldHVy blVSSVJlc3BvbnNlKCk7CiAgICAgZ19hc3NlcnRfY21waW50KHdlYmtpdF91cmlfcmVzcG9uc2Vf Z2V0X3N0YXR1c19jb2RlKHJlc3BvbnNlKSwgPT0sIFNPVVBfU1RBVFVTX09LKTsKIAogICAgIC8v IE5vIGNhY2hlZCByZXNvdXJjZTogU2Vjb25kIGxvYWQuCiAgICAgdGVzdC0+bG9hZFVSSShrU2Vy dmVyLT5nZXRVUklGb3JQYXRoKCIvamF2YXNjcmlwdC5odG1sIikuZGF0YSgpKTsKLSAgICByZXNw b25zZSA9IHRlc3QtPndhaXRVbnRpbFJlc291cmNlTG9hZEZpbnNpaGVkQW5kUmV0dXJuVVJJUmVz cG9uc2UoKTsKKyAgICByZXNwb25zZSA9IHRlc3QtPndhaXRVbnRpbFJlc291cmNlTG9hZEZpbmlz aGVkQW5kUmV0dXJuVVJJUmVzcG9uc2UoKTsKICAgICBnX2Fzc2VydF9jbXBpbnQod2Via2l0X3Vy aV9yZXNwb25zZV9nZXRfc3RhdHVzX2NvZGUocmVzcG9uc2UpLCA9PSwgU09VUF9TVEFUVVNfT0sp OwogCiAgICAgLy8gTm8gY2FjaGVkIHJlc291cmNlOiBSZWxvYWQuCiAgICAgd2Via2l0X3dlYl92 aWV3X3JlbG9hZCh0ZXN0LT5tX3dlYlZpZXcpOwotICAgIHJlc3BvbnNlID0gdGVzdC0+d2FpdFVu dGlsUmVzb3VyY2VMb2FkRmluc2loZWRBbmRSZXR1cm5VUklSZXNwb25zZSgpOworICAgIHJlc3Bv bnNlID0gdGVzdC0+d2FpdFVudGlsUmVzb3VyY2VMb2FkRmluaXNoZWRBbmRSZXR1cm5VUklSZXNw b25zZSgpOwogICAgIGdfYXNzZXJ0X2NtcGludCh3ZWJraXRfdXJpX3Jlc3BvbnNlX2dldF9zdGF0 dXNfY29kZShyZXNwb25zZSksID09LCBTT1VQX1NUQVRVU19PSyk7CiAKICAgICAvLyBDYWNoZWQg cmVzb3VyY2U6IEZpcnN0IGxvYWQuCiAgICAgdGVzdC0+bG9hZFVSSShrU2VydmVyLT5nZXRVUklG b3JQYXRoKCIvaW1hZ2UuaHRtbCIpLmRhdGEoKSk7Ci0gICAgcmVzcG9uc2UgPSB0ZXN0LT53YWl0 VW50aWxSZXNvdXJjZUxvYWRGaW5zaWhlZEFuZFJldHVyblVSSVJlc3BvbnNlKCk7CisgICAgcmVz cG9uc2UgPSB0ZXN0LT53YWl0VW50aWxSZXNvdXJjZUxvYWRGaW5pc2hlZEFuZFJldHVyblVSSVJl c3BvbnNlKCk7CiAgICAgZ19hc3NlcnRfY21waW50KHdlYmtpdF91cmlfcmVzcG9uc2VfZ2V0X3N0 YXR1c19jb2RlKHJlc3BvbnNlKSwgPT0sIFNPVVBfU1RBVFVTX09LKTsKIAogICAgIC8vIENhY2hl ZCByZXNvdXJjZTogU2Vjb25kIGxvYWQuCiAgICAgdGVzdC0+bG9hZFVSSShrU2VydmVyLT5nZXRV UklGb3JQYXRoKCIvaW1hZ2UuaHRtbCIpLmRhdGEoKSk7Ci0gICAgcmVzcG9uc2UgPSB0ZXN0LT53 YWl0VW50aWxSZXNvdXJjZUxvYWRGaW5zaWhlZEFuZFJldHVyblVSSVJlc3BvbnNlKCk7CisgICAg cmVzcG9uc2UgPSB0ZXN0LT53YWl0VW50aWxSZXNvdXJjZUxvYWRGaW5pc2hlZEFuZFJldHVyblVS SVJlc3BvbnNlKCk7CiAgICAgZ19hc3NlcnRfY21waW50KHdlYmtpdF91cmlfcmVzcG9uc2VfZ2V0 X3N0YXR1c19jb2RlKHJlc3BvbnNlKSwgPT0sIFNPVVBfU1RBVFVTX09LKTsKIAogICAgIC8vIENh Y2hlZCByZXNvdXJjZTogUmVsb2FkLgogICAgIHdlYmtpdF93ZWJfdmlld19yZWxvYWQodGVzdC0+ bV93ZWJWaWV3KTsKLSAgICByZXNwb25zZSA9IHRlc3QtPndhaXRVbnRpbFJlc291cmNlTG9hZEZp bnNpaGVkQW5kUmV0dXJuVVJJUmVzcG9uc2UoKTsKKyAgICByZXNwb25zZSA9IHRlc3QtPndhaXRV bnRpbFJlc291cmNlTG9hZEZpbmlzaGVkQW5kUmV0dXJuVVJJUmVzcG9uc2UoKTsKICAgICBnX2Fz c2VydF9jbXBpbnQod2Via2l0X3VyaV9yZXNwb25zZV9nZXRfc3RhdHVzX2NvZGUocmVzcG9uc2Up LCA9PSwgU09VUF9TVEFUVVNfTk9UX01PRElGSUVEKTsKIH0KIAogc3RhdGljIHZvaWQgdGVzdFdl YlJlc291cmNlTWltZVR5cGUoU2luZ2xlUmVzb3VyY2VMb2FkVGVzdCogdGVzdCwgZ2NvbnN0cG9p bnRlcikKIHsKICAgICB0ZXN0LT5sb2FkVVJJKGtTZXJ2ZXItPmdldFVSSUZvclBhdGgoIi9qYXZh c2NyaXB0Lmh0bWwiKS5kYXRhKCkpOwotICAgIFdlYktpdFVSSVJlc3BvbnNlKiByZXNwb25zZSA9 IHRlc3QtPndhaXRVbnRpbFJlc291cmNlTG9hZEZpbnNpaGVkQW5kUmV0dXJuVVJJUmVzcG9uc2Uo KTsKKyAgICBXZWJLaXRVUklSZXNwb25zZSogcmVzcG9uc2UgPSB0ZXN0LT53YWl0VW50aWxSZXNv dXJjZUxvYWRGaW5pc2hlZEFuZFJldHVyblVSSVJlc3BvbnNlKCk7CiAgICAgZ19hc3NlcnRfY21w c3RyKHdlYmtpdF91cmlfcmVzcG9uc2VfZ2V0X21pbWVfdHlwZShyZXNwb25zZSksID09LCAidGV4 dC9qYXZhc2NyaXB0Iik7CiAKICAgICB0ZXN0LT5sb2FkVVJJKGtTZXJ2ZXItPmdldFVSSUZvclBh dGgoIi9pbWFnZS5odG1sIikuZGF0YSgpKTsKLSAgICByZXNwb25zZSA9IHRlc3QtPndhaXRVbnRp bFJlc291cmNlTG9hZEZpbnNpaGVkQW5kUmV0dXJuVVJJUmVzcG9uc2UoKTsKKyAgICByZXNwb25z ZSA9IHRlc3QtPndhaXRVbnRpbFJlc291cmNlTG9hZEZpbmlzaGVkQW5kUmV0dXJuVVJJUmVzcG9u c2UoKTsKICAgICBnX2Fzc2VydF9jbXBzdHIod2Via2l0X3VyaV9yZXNwb25zZV9nZXRfbWltZV90 eXBlKHJlc3BvbnNlKSwgPT0sICJpbWFnZS92bmQubWljcm9zb2Z0Lmljb24iKTsKIAogICAgIHRl c3QtPmxvYWRVUkkoa1NlcnZlci0+Z2V0VVJJRm9yUGF0aCgiL3JlZGlyZWN0ZWQtY3NzLmh0bWwi KS5kYXRhKCkpOwotICAgIHJlc3BvbnNlID0gdGVzdC0+d2FpdFVudGlsUmVzb3VyY2VMb2FkRmlu c2loZWRBbmRSZXR1cm5VUklSZXNwb25zZSgpOworICAgIHJlc3BvbnNlID0gdGVzdC0+d2FpdFVu dGlsUmVzb3VyY2VMb2FkRmluaXNoZWRBbmRSZXR1cm5VUklSZXNwb25zZSgpOwogICAgIGdfYXNz ZXJ0X2NtcHN0cih3ZWJraXRfdXJpX3Jlc3BvbnNlX2dldF9taW1lX3R5cGUocmVzcG9uc2UpLCA9 PSwgInRleHQvY3NzIik7CiB9CiAKQEAgLTQ3NSw3ICs0NzUsNyBAQCBwcml2YXRlOgogc3RhdGlj IHZvaWQgdGVzdFdlYlJlc291cmNlQWN0aXZlVVJJKFJlc291cmNlVVJJVHJhY2tpbmdUZXN0KiB0 ZXN0LCBnY29uc3Rwb2ludGVyKQogewogICAgIHRlc3QtPmxvYWRVUkkoa1NlcnZlci0+Z2V0VVJJ Rm9yUGF0aCgiL3JlZGlyZWN0ZWQtY3NzLmh0bWwiKS5kYXRhKCkpOwotICAgIHRlc3QtPndhaXRV bnRpbFJlc291cmNlTG9hZEZpbnNpaGVkKCk7CisgICAgdGVzdC0+d2FpdFVudGlsUmVzb3VyY2VM b2FkRmluaXNoZWQoKTsKIH0KIAogc3RhdGljIHZvaWQgdGVzdFdlYlJlc291cmNlR2V0RGF0YShS ZXNvdXJjZXNUZXN0KiB0ZXN0LCBnY29uc3Rwb2ludGVyKQpAQCAtNTIwLDYgKzUyMCwyNSBAQCBz dGF0aWMgdm9pZCB0ZXN0V2ViVmlld1Jlc291cmNlc1JlcGxhY2VkQ29udGVudChSZXNvdXJjZXNU ZXN0KiB0ZXN0LCBnY29uc3Rwb2ludAogICAgIGdfYXNzZXJ0KCF3ZWJraXRfd2ViX3ZpZXdfZ2V0 X3N1YnJlc291cmNlcyh0ZXN0LT5tX3dlYlZpZXcpKTsKIH0KIAorc3RhdGljIHZvaWQgdGVzdFdl YlZpZXdSZXNvdXJjZXNIaXN0b3J5Q2FjaGUoU2luZ2xlUmVzb3VyY2VMb2FkVGVzdCogdGVzdCwg Z2NvbnN0cG9pbnRlcikKK3sKKyAgICB0ZXN0LT5sb2FkVVJJKGtTZXJ2ZXItPmdldFVSSUZvclBh dGgoIi8iKS5kYXRhKCkpOworICAgIHRlc3QtPndhaXRVbnRpbFJlc291cmNlTG9hZEZpbmlzaGVk KCk7CisgICAgZ19hc3NlcnQod2Via2l0X3dlYl92aWV3X2dldF9tYWluX3Jlc291cmNlKHRlc3Qt Pm1fd2ViVmlldykpOworCisgICAgdGVzdC0+bG9hZFVSSShrU2VydmVyLT5nZXRVUklGb3JQYXRo KCIvamF2YXNjcmlwdC5odG1sIikuZGF0YSgpKTsKKyAgICB0ZXN0LT53YWl0VW50aWxSZXNvdXJj ZUxvYWRGaW5pc2hlZCgpOworICAgIGdfYXNzZXJ0KHdlYmtpdF93ZWJfdmlld19nZXRfbWFpbl9y ZXNvdXJjZSh0ZXN0LT5tX3dlYlZpZXcpKTsKKworICAgIHRlc3QtPmdvQmFjaygpOworICAgIHRl c3QtPndhaXRVbnRpbFJlc291cmNlTG9hZEZpbmlzaGVkKCk7CisgICAgZ19hc3NlcnQod2Via2l0 X3dlYl92aWV3X2dldF9tYWluX3Jlc291cmNlKHRlc3QtPm1fd2ViVmlldykpOworCisgICAgdGVz dC0+Z29Gb3J3YXJkKCk7CisgICAgdGVzdC0+d2FpdFVudGlsUmVzb3VyY2VMb2FkRmluaXNoZWQo KTsKKyAgICBnX2Fzc2VydCh3ZWJraXRfd2ViX3ZpZXdfZ2V0X21haW5fcmVzb3VyY2UodGVzdC0+ bV93ZWJWaWV3KSk7Cit9CisKIHN0YXRpYyB2b2lkIGFkZENhY2hlSFRUUEhlYWRlcnNUb1Jlc3Bv bnNlKFNvdXBNZXNzYWdlKiBtZXNzYWdlKQogewogICAgIC8vIFRoZSBhY3R1YWwgZGF0ZSBkb2Vz bid0IHJlYWxseSBtYXR0ZXIuCkBAIC02MDQsNiArNjIzLDcgQEAgdm9pZCBiZWZvcmVBbGwoKQog ICAgIFJlc291cmNlVVJJVHJhY2tpbmdUZXN0OjphZGQoIldlYktpdFdlYlJlc291cmNlIiwgImFj dGl2ZS11cmkiLCB0ZXN0V2ViUmVzb3VyY2VBY3RpdmVVUkkpOwogICAgIFJlc291cmNlc1Rlc3Q6 OmFkZCgiV2ViS2l0V2ViUmVzb3VyY2UiLCAiZ2V0LWRhdGEiLCB0ZXN0V2ViUmVzb3VyY2VHZXRE YXRhKTsKICAgICBSZXNvdXJjZXNUZXN0OjphZGQoIldlYktpdFdlYlZpZXciLCAicmVwbGFjZWQt Y29udGVudCIsIHRlc3RXZWJWaWV3UmVzb3VyY2VzUmVwbGFjZWRDb250ZW50KTsKKyAgICBTaW5n bGVSZXNvdXJjZUxvYWRUZXN0OjphZGQoIldlYktpdFdlYlZpZXciLCAiaGlzdG9yeS1jYWNoZSIs IHRlc3RXZWJWaWV3UmVzb3VyY2VzSGlzdG9yeUNhY2hlKTsKIH0KIAogdm9pZCBhZnRlckFsbCgp Cg== 152741 2012-07-17 05:18:55 -0700 2012-07-18 06:20:53 -0700 Updated patch wk2-main-resource-history-cache2.diff text/plain 4045 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBlZTc4OGU0OS4uN2M2ZjQyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI4 IEBACiAyMDEyLTA3LTE3ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNv bT4KIAorICAgICAgICBbR1RLXSBObyBtYWluIHJlc291cmNlIGluIFdlYlZpZXcgd2hlbiBwYWdl IGhhcyBiZWVuIGxvYWRlZCBmcm9tIGhpc3RvcnkgY2FjaGUKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkxNDc4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2UgYXJlIGFzc3VtaW5nIHRoYXQgYSByZXNvdXJj ZSBsb2FkZWQgZm9yIHRoZSBtYWluIGZyYW1lIHRoYXQgaXMKKyAgICAgICAgcHJvdmlzaW9uYWxs eSBsb2FkaW5nIGlzIHRoZSBtYWluIHJlc291cmNlIG9mIHRoZSB3ZWIgdmlldy4gSG93ZXZlcgor ICAgICAgICB0aGF0J3Mgbm90IHRydWUgZm9yIHBhZ2VzIGxvYWRlZCBmcm9tIGhpc3RvcnkgY2Fj aGUsIHNvIHdoZW4geW91CisgICAgICAgIGdvIGJhY2svZm9yd2FyZCB3ZWJraXRfd2ViX3ZpZXdf Z2V0X21haW5fcmVzb3VyY2UoKSBhbHdheXMgcmV0dXJucworICAgICAgICBOVUxMLiBXZSBjYW4g YXNzdW1lIHRoYXQgdGhlIGZpcnN0IHJlc291cmNlIGxvYWRlZCBmb3IgdGhlIG1haW4KKyAgICAg ICAgZnJhbWUgaXMgdGhlIG1haW4gcmVzb3VyY2Ugb2YgdGhlIHdlYiB2aWV3IHdoZW4KKyAgICAg ICAgcGFnZUlzUHJvdmlzaW9uYWxseUxvYWRpbmcgaXMgZmFsc2UuCisKKyAgICAgICAgKiBVSVBy b2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmNwcDoKKyAgICAgICAgKHdlYmtpdFdlYlZpZXdS ZXNvdXJjZUxvYWRTdGFydGVkKTogTWFrZSBzdXJlIHdlIGFsd2F5cyBoYXZlIGEKKyAgICAgICAg bWFpbiByZXNvdXJjZSBmb3IgdGhlIHdlYiB2aWV3LgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkv Z3RrL3Rlc3RzL1Rlc3RSZXNvdXJjZXMuY3BwOgorICAgICAgICAodGVzdFdlYlZpZXdSZXNvdXJj ZXNIaXN0b3J5Q2FjaGUpOiBUZXN0IHdlIGFsd2F5cyBoYXZlIGEgbWFpbgorICAgICAgICByZXNv dXJjZSBldmVuIGFmdGVyIGdvaW5nIGJhY2svZm9yd2FyZC4KKyAgICAgICAgKGJlZm9yZUFsbCk6 IEFkZCBuZXcgdGVzdCBjYXNlLgorCisyMDEyLTA3LTE3ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAg PGNnYXJjaWFAaWdhbGlhLmNvbT4KKwogICAgICAgICBbR1RLXSBQYXN0ZSBwcmltYXJ5IHNlbGVj dGlvbiB3aGVuIG1pZGRsZSBjbGlja2luZyBpbiBYMTEgV2ViS2l0MgogICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTE0MTEKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5jcHAgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmNwcAppbmRleCA4YmZhYmVl Li5hMjA2NTczIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9X ZWJLaXRXZWJWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9X ZWJLaXRXZWJWaWV3LmNwcApAQCAtMTI1MCw3ICsxMjUwLDcgQEAgdm9pZCB3ZWJraXRXZWJWaWV3 UmVzb3VyY2VMb2FkU3RhcnRlZChXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBXS0ZyYW1lUmVmIHdr RnJhbWUKIAogICAgIFdlYktpdFdlYlZpZXdQcml2YXRlKiBwcml2ID0gd2ViVmlldy0+cHJpdjsK ICAgICBXZWJLaXRXZWJSZXNvdXJjZSogcmVzb3VyY2UgPSB3ZWJraXRXZWJSZXNvdXJjZUNyZWF0 ZSh3a0ZyYW1lLCByZXF1ZXN0LCBpc01haW5SZXNvdXJjZSk7Ci0gICAgaWYgKFdLRnJhbWVJc01h aW5GcmFtZSh3a0ZyYW1lKSAmJiBpc01haW5SZXNvdXJjZSkKKyAgICBpZiAoV0tGcmFtZUlzTWFp bkZyYW1lKHdrRnJhbWUpICYmIChpc01haW5SZXNvdXJjZSB8fCAhcHJpdi0+bWFpblJlc291cmNl KSkKICAgICAgICAgcHJpdi0+bWFpblJlc291cmNlID0gcmVzb3VyY2U7CiAgICAgcHJpdi0+bG9h ZGluZ1Jlc291cmNlc01hcC5zZXQocmVzb3VyY2VJZGVudGlmaWVyLCBhZG9wdEdSZWYocmVzb3Vy Y2UpKTsKICAgICBnX3NpZ25hbF9lbWl0KHdlYlZpZXcsIHNpZ25hbHNbUkVTT1VSQ0VfTE9BRF9T VEFSVEVEXSwgMCwgcmVzb3VyY2UsIHJlcXVlc3QpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVzdFJlc291cmNlcy5jcHAgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0UmVzb3VyY2VzLmNwcAppbmRleCAxNDIz YzlmLi44NDIwYTk5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0 ay90ZXN0cy9UZXN0UmVzb3VyY2VzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2d0ay90ZXN0cy9UZXN0UmVzb3VyY2VzLmNwcApAQCAtNTIwLDYgKzUyMCwyNSBAQCBzdGF0 aWMgdm9pZCB0ZXN0V2ViVmlld1Jlc291cmNlc1JlcGxhY2VkQ29udGVudChSZXNvdXJjZXNUZXN0 KiB0ZXN0LCBnY29uc3Rwb2ludAogICAgIGdfYXNzZXJ0KCF3ZWJraXRfd2ViX3ZpZXdfZ2V0X3N1 YnJlc291cmNlcyh0ZXN0LT5tX3dlYlZpZXcpKTsKIH0KIAorc3RhdGljIHZvaWQgdGVzdFdlYlZp ZXdSZXNvdXJjZXNIaXN0b3J5Q2FjaGUoU2luZ2xlUmVzb3VyY2VMb2FkVGVzdCogdGVzdCwgZ2Nv bnN0cG9pbnRlcikKK3sKKyAgICB0ZXN0LT5sb2FkVVJJKGtTZXJ2ZXItPmdldFVSSUZvclBhdGgo Ii8iKS5kYXRhKCkpOworICAgIHRlc3QtPndhaXRVbnRpbFJlc291cmNlTG9hZEZpbmlzaGVkKCk7 CisgICAgZ19hc3NlcnQod2Via2l0X3dlYl92aWV3X2dldF9tYWluX3Jlc291cmNlKHRlc3QtPm1f d2ViVmlldykpOworCisgICAgdGVzdC0+bG9hZFVSSShrU2VydmVyLT5nZXRVUklGb3JQYXRoKCIv amF2YXNjcmlwdC5odG1sIikuZGF0YSgpKTsKKyAgICB0ZXN0LT53YWl0VW50aWxSZXNvdXJjZUxv YWRGaW5pc2hlZCgpOworICAgIGdfYXNzZXJ0KHdlYmtpdF93ZWJfdmlld19nZXRfbWFpbl9yZXNv dXJjZSh0ZXN0LT5tX3dlYlZpZXcpKTsKKworICAgIHRlc3QtPmdvQmFjaygpOworICAgIHRlc3Qt PndhaXRVbnRpbFJlc291cmNlTG9hZEZpbmlzaGVkKCk7CisgICAgZ19hc3NlcnQod2Via2l0X3dl Yl92aWV3X2dldF9tYWluX3Jlc291cmNlKHRlc3QtPm1fd2ViVmlldykpOworCisgICAgdGVzdC0+ Z29Gb3J3YXJkKCk7CisgICAgdGVzdC0+d2FpdFVudGlsUmVzb3VyY2VMb2FkRmluaXNoZWQoKTsK KyAgICBnX2Fzc2VydCh3ZWJraXRfd2ViX3ZpZXdfZ2V0X21haW5fcmVzb3VyY2UodGVzdC0+bV93 ZWJWaWV3KSk7Cit9CisKIHN0YXRpYyB2b2lkIGFkZENhY2hlSFRUUEhlYWRlcnNUb1Jlc3BvbnNl KFNvdXBNZXNzYWdlKiBtZXNzYWdlKQogewogICAgIC8vIFRoZSBhY3R1YWwgZGF0ZSBkb2Vzbid0 IHJlYWxseSBtYXR0ZXIuCkBAIC02MDQsNiArNjIzLDcgQEAgdm9pZCBiZWZvcmVBbGwoKQogICAg IFJlc291cmNlVVJJVHJhY2tpbmdUZXN0OjphZGQoIldlYktpdFdlYlJlc291cmNlIiwgImFjdGl2 ZS11cmkiLCB0ZXN0V2ViUmVzb3VyY2VBY3RpdmVVUkkpOwogICAgIFJlc291cmNlc1Rlc3Q6OmFk ZCgiV2ViS2l0V2ViUmVzb3VyY2UiLCAiZ2V0LWRhdGEiLCB0ZXN0V2ViUmVzb3VyY2VHZXREYXRh KTsKICAgICBSZXNvdXJjZXNUZXN0OjphZGQoIldlYktpdFdlYlZpZXciLCAicmVwbGFjZWQtY29u dGVudCIsIHRlc3RXZWJWaWV3UmVzb3VyY2VzUmVwbGFjZWRDb250ZW50KTsKKyAgICBTaW5nbGVS ZXNvdXJjZUxvYWRUZXN0OjphZGQoIldlYktpdFdlYlZpZXciLCAiaGlzdG9yeS1jYWNoZSIsIHRl c3RXZWJWaWV3UmVzb3VyY2VzSGlzdG9yeUNhY2hlKTsKIH0KIAogdm9pZCBhZnRlckFsbCgpCg==