79777 2012-02-28 04:15:28 -0800 [GTK] Ignore resources while replacing content in WebKit2 GTK+ API 2012-04-19 23:45:07 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 79667 79775 1 cgarcia webkit-unassigned gustavo pnormand oldest_to_newest 566577 0 cgarcia 2012-02-28 04:15:28 -0800 The same way we ignore load events and progress, resources should be ignored too. 566578 1 129229 cgarcia 2012-02-28 04:21:01 -0800 Created attachment 129229 Patch 579211 2 129229 pnormand 2012-03-15 01:57:57 -0700 Comment on attachment 129229 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=129229&action=review > Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:891 > + if (priv->replaceContentStatus == ReplacingContent || priv->replaceContentStatus == DidReplaceContent) > + return 0; I see this code used in 4 places. Can it be moved to a function? 579214 3 cgarcia 2012-03-15 02:04:09 -0700 (In reply to comment #2) > (From update of attachment 129229 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=129229&action=review > > > Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:891 > > + if (priv->replaceContentStatus == ReplacingContent || priv->replaceContentStatus == DidReplaceContent) > > + return 0; > > I see this code used in 4 places. Can it be moved to a function? Sure! 579646 4 132104 cgarcia 2012-03-15 12:41:22 -0700 Created attachment 132104 Updated patch Rebased to apply on current git master and added helper function as phil suggested. 588808 5 cgarcia 2012-03-27 05:45:34 -0700 Patches blocking this bug landed already. 606071 6 132104 pnormand 2012-04-19 16:02:56 -0700 Comment on attachment 132104 Updated patch Alright, looks good to me! Sorry for the review delay :( 606397 7 cgarcia 2012-04-19 23:42:25 -0700 (In reply to comment #6) > (From update of attachment 132104 [details]) > Alright, looks good to me! Sorry for the review delay :( No problem, thanks for reviewing :-) 606399 8 cgarcia 2012-04-19 23:45:07 -0700 Committed r114719: <http://trac.webkit.org/changeset/114719> 129229 2012-02-28 04:21:01 -0800 2012-03-15 12:41:22 -0700 Patch wk2-resources-replacing-content.diff text/plain 11017 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBmMTYzZDI3Li4wOWFhMDU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEg QEAKKzIwMTItMDItMjggIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIElnbm9yZSByZXNvdXJjZXMgd2hpbGUgcmVwbGFjaW5nIGNvbnRl bnQgaW4gV2ViS2l0MiBHVEsrIEFQSQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9Nzk3NzcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFJlc291cmNlTG9hZENsaWVu dC5jcHA6CisgICAgICAgIChkaWRTZW5kUmVxdWVzdEZvclJlc291cmNlKTogUmV0dXJuIGVhcmx5 IGlmIHJlc291cmNlcyBpcyBOdWxsLgorICAgICAgICAoZGlkUmVjZWl2ZVJlc3BvbnNlRm9yUmVz b3VyY2UpOiBEaXR0by4KKyAgICAgICAgKGRpZFJlY2VpdmVDb250ZW50TGVuZ3RoRm9yUmVzb3Vy Y2UpOiBEaXR0by4KKyAgICAgICAgKGRpZEZpbmlzaExvYWRGb3JSZXNvdXJjZSk6IERpdHRvLgor ICAgICAgICAoZGlkRmFpbExvYWRGb3JSZXNvdXJjZSk6IERpdHRvLgorICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuY3BwOgorICAgICAgICAod2Via2l0V2ViVmlld0xv YWRDaGFuZ2VkKTogQ2xlYXIgcmVzb3VyY2VzIGJlZm9yZSBjaGVja2luZworICAgICAgICB3aGV0 aGVyIHdlIGFyZSByZXBsYWNpbmcgY29udGVudC4KKyAgICAgICAgKHdlYmtpdFdlYlZpZXdSZXNv dXJjZUxvYWRTdGFydGVkKTogRG8gbm90IGNyZWF0ZSByZXNvdXJjZXMgd2hlbgorICAgICAgICBy ZXBsYWNpbmcgY29udGVudC4KKyAgICAgICAgKHdlYmtpdFdlYlZpZXdHZXRMb2FkaW5nV2ViUmVz b3VyY2UpOiBJZ25vcmUgd2hlbiByZXBsYWNpbmcKKyAgICAgICAgY29udGVudC4gQWxzbyBhZGQg YW4gYXNzZXJ0IHdoZW4gZ2V0dGluZyBhIGxvYWRpbmcgcmVzb3VyY2VzIHRvCisgICAgICAgIG1h a2Ugc3VyZSB3ZSBvbmx5IHJldHVybiBOdWxsIHdoZW4gcmVwbGFjaW5nIGNvbnRlbnQuCisgICAg ICAgICh3ZWJraXRXZWJWaWV3UmVtb3ZlTG9hZGluZ1dlYlJlc291cmNlKTogRGl0dG8uCisgICAg ICAgICh3ZWJraXRXZWJWaWV3UmVzb3VyY2VMb2FkRmluaXNoZWQpOiBEaXR0by4KKyAgICAgICAg KiBVSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0UmVzb3VyY2VzLmNwcDoKKyAgICAgICAgKHJl cGxhY2VkQ29udGVudFJlc291cmNlTG9hZFN0YXJ0ZWRDYWxsYmFjayk6CisgICAgICAgICh0ZXN0 V2ViVmlld1Jlc291cmNlc1JlcGxhY2VkQ29udGVudCk6CisgICAgICAgIChiZWZvcmVBbGwpOgor CiAyMDEyLTAyLTI2ICBZb3VuZ1RhZWNrIFNvbmcgIDx5b3VuZ3RhZWNrLnNvbmdAc2Ftc3VuZy5j b20+CiAKICAgICAgICAgW0VGTF1bV0syXSBBZGQgSW5qZWN0ZWRCdW5kbGVFZmwuY3BwCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRSZXNvdXJjZUxv YWRDbGllbnQuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0UmVz b3VyY2VMb2FkQ2xpZW50LmNwcAppbmRleCBhNGJkMDliLi4xY2Q4YWFmIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRSZXNvdXJjZUxvYWRDbGllbnQu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFJlc291cmNl TG9hZENsaWVudC5jcHAKQEAgLTQ0LDYgKzQ0LDkgQEAgc3RhdGljIHZvaWQgZGlkSW5pdGlhdGVM b2FkRm9yUmVzb3VyY2UoV0tQYWdlUmVmLCBXS0ZyYW1lUmVmIHdrRnJhbWUsIHVpbnQ2NF90IHIK IHN0YXRpYyB2b2lkIGRpZFNlbmRSZXF1ZXN0Rm9yUmVzb3VyY2UoV0tQYWdlUmVmLCBXS0ZyYW1l UmVmLCB1aW50NjRfdCByZXNvdXJjZUlkZW50aWZpZXIsIFdLVVJMUmVxdWVzdFJlZiB3a1JlcXVl c3QsIFdLVVJMUmVzcG9uc2VSZWYgd2tSZWRpcmVjdFJlc3BvbnNlLCBjb25zdCB2b2lkKiBjbGll bnRJbmZvKQogewogICAgIEdSZWZQdHI8V2ViS2l0V2ViUmVzb3VyY2U+IHJlc291cmNlID0gd2Vi a2l0V2ViVmlld0dldExvYWRpbmdXZWJSZXNvdXJjZShXRUJLSVRfV0VCX1ZJRVcoY2xpZW50SW5m byksIHJlc291cmNlSWRlbnRpZmllcik7CisgICAgaWYgKCFyZXNvdXJjZSkKKyAgICAgICAgcmV0 dXJuOworCiAgICAgR1JlZlB0cjxXZWJLaXRVUklSZXF1ZXN0PiByZXF1ZXN0ID0gYWRvcHRHUmVm KHdlYmtpdFVSSVJlcXVlc3RDcmVhdGVGb3JSZXNvdXJjZVJlcXVlc3QodG9JbXBsKHdrUmVxdWVz dCktPnJlc291cmNlUmVxdWVzdCgpKSk7CiAgICAgR1JlZlB0cjxXZWJLaXRVUklSZXNwb25zZT4g cmVkaXJlY3RSZXNwb25zZSA9IHdrUmVkaXJlY3RSZXNwb25zZSA/IGFkb3B0R1JlZih3ZWJraXRV UklSZXNwb25zZUNyZWF0ZUZvclJlc291cmNlUmVzcG9uc2UodG9JbXBsKHdrUmVkaXJlY3RSZXNw b25zZSktPnJlc291cmNlUmVzcG9uc2UoKSkpIDogMDsKICAgICB3ZWJraXRXZWJSZXNvdXJjZVNl bnRSZXF1ZXN0KHJlc291cmNlLmdldCgpLCByZXF1ZXN0LmdldCgpLCByZWRpcmVjdFJlc3BvbnNl LmdldCgpKTsKQEAgLTUyLDYgKzU1LDkgQEAgc3RhdGljIHZvaWQgZGlkU2VuZFJlcXVlc3RGb3JS ZXNvdXJjZShXS1BhZ2VSZWYsIFdLRnJhbWVSZWYsIHVpbnQ2NF90IHJlc291cmNlSWQKIHN0YXRp YyB2b2lkIGRpZFJlY2VpdmVSZXNwb25zZUZvclJlc291cmNlKFdLUGFnZVJlZiwgV0tGcmFtZVJl ZiwgdWludDY0X3QgcmVzb3VyY2VJZGVudGlmaWVyLCBXS1VSTFJlc3BvbnNlUmVmIHdrUmVzcG9u c2UsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pCiB7CiAgICAgR1JlZlB0cjxXZWJLaXRXZWJSZXNv dXJjZT4gcmVzb3VyY2UgPSB3ZWJraXRXZWJWaWV3R2V0TG9hZGluZ1dlYlJlc291cmNlKFdFQktJ VF9XRUJfVklFVyhjbGllbnRJbmZvKSwgcmVzb3VyY2VJZGVudGlmaWVyKTsKKyAgICBpZiAoIXJl c291cmNlKQorICAgICAgICByZXR1cm47CisKICAgICBHUmVmUHRyPFdlYktpdFVSSVJlc3BvbnNl PiByZXNwb25zZSA9IGFkb3B0R1JlZih3ZWJraXRVUklSZXNwb25zZUNyZWF0ZUZvclJlc291cmNl UmVzcG9uc2UodG9JbXBsKHdrUmVzcG9uc2UpLT5yZXNvdXJjZVJlc3BvbnNlKCkpKTsKICAgICB3 ZWJraXRXZWJSZXNvdXJjZVNldFJlc3BvbnNlKHJlc291cmNlLmdldCgpLCByZXNwb25zZS5nZXQo KSk7CiB9CkBAIC01OSwxMiArNjUsMTggQEAgc3RhdGljIHZvaWQgZGlkUmVjZWl2ZVJlc3BvbnNl Rm9yUmVzb3VyY2UoV0tQYWdlUmVmLCBXS0ZyYW1lUmVmLCB1aW50NjRfdCByZXNvdXIKIHN0YXRp YyB2b2lkIGRpZFJlY2VpdmVDb250ZW50TGVuZ3RoRm9yUmVzb3VyY2UoV0tQYWdlUmVmLCBXS0Zy YW1lUmVmLCB1aW50NjRfdCByZXNvdXJjZUlkZW50aWZpZXIsIHVpbnQ2NF90IGNvbnRlbnRMZW5n dGgsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pCiB7CiAgICAgR1JlZlB0cjxXZWJLaXRXZWJSZXNv dXJjZT4gcmVzb3VyY2UgPSB3ZWJraXRXZWJWaWV3R2V0TG9hZGluZ1dlYlJlc291cmNlKFdFQktJ VF9XRUJfVklFVyhjbGllbnRJbmZvKSwgcmVzb3VyY2VJZGVudGlmaWVyKTsKKyAgICBpZiAoIXJl c291cmNlKQorICAgICAgICByZXR1cm47CisKICAgICB3ZWJraXRXZWJSZXNvdXJjZU5vdGlmeVBy b2dyZXNzKHJlc291cmNlLmdldCgpLCBjb250ZW50TGVuZ3RoKTsKIH0KIAogc3RhdGljIHZvaWQg ZGlkRmluaXNoTG9hZEZvclJlc291cmNlKFdLUGFnZVJlZiwgV0tGcmFtZVJlZiwgdWludDY0X3Qg cmVzb3VyY2VJZGVudGlmaWVyLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKQogewogICAgIEdSZWZQ dHI8V2ViS2l0V2ViUmVzb3VyY2U+IHJlc291cmNlID0gd2Via2l0V2ViVmlld1Jlc291cmNlTG9h ZEZpbmlzaGVkKFdFQktJVF9XRUJfVklFVyhjbGllbnRJbmZvKSwgcmVzb3VyY2VJZGVudGlmaWVy KTsKKyAgICBpZiAoIXJlc291cmNlKQorICAgICAgICByZXR1cm47CisKICAgICB3ZWJraXRXZWJS ZXNvdXJjZUZpbmlzaGVkKHJlc291cmNlLmdldCgpKTsKIH0KIApAQCAtNzIsNiArODQsOSBAQCBz dGF0aWMgdm9pZCBkaWRGYWlsTG9hZEZvclJlc291cmNlKFdLUGFnZVJlZiwgV0tGcmFtZVJlZiwg dWludDY0X3QgcmVzb3VyY2VJZGVudAogewogICAgIFdlYktpdFdlYlZpZXcqIHdlYlZpZXcgPSBX RUJLSVRfV0VCX1ZJRVcoY2xpZW50SW5mbyk7CiAgICAgR1JlZlB0cjxXZWJLaXRXZWJSZXNvdXJj ZT4gcmVzb3VyY2UgPSB3ZWJraXRXZWJWaWV3R2V0TG9hZGluZ1dlYlJlc291cmNlKHdlYlZpZXcs IHJlc291cmNlSWRlbnRpZmllcik7CisgICAgaWYgKCFyZXNvdXJjZSkKKyAgICAgICAgcmV0dXJu OworCiAgICAgY29uc3QgUmVzb3VyY2VFcnJvciYgcmVzb3VyY2VFcnJvciA9IHRvSW1wbCh3a0Vy cm9yKS0+cGxhdGZvcm1FcnJvcigpOwogICAgIEdPd25QdHI8R0Vycm9yPiB3ZWJFcnJvcihnX2Vy cm9yX25ld19saXRlcmFsKGdfcXVhcmtfZnJvbV9zdHJpbmcocmVzb3VyY2VFcnJvci5kb21haW4o KS51dGY4KCkuZGF0YSgpKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICByZXNvdXJjZUVycm9yLmVycm9yQ29kZSgpLApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5jcHAgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmNwcAppbmRleCA0NDc0ZjIxLi5i MjYwZjRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJL aXRXZWJWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJL aXRXZWJWaWV3LmNwcApAQCAtNzIzLDYgKzcyMywxMiBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfd2Vi X3ZpZXdfY2xhc3NfaW5pdChXZWJLaXRXZWJWaWV3Q2xhc3MqIHdlYlZpZXdDbGFzcykKIAogdm9p ZCB3ZWJraXRXZWJWaWV3TG9hZENoYW5nZWQoV2ViS2l0V2ViVmlldyogd2ViVmlldywgV2ViS2l0 TG9hZEV2ZW50IGxvYWRFdmVudCkKIHsKKyAgICBpZiAobG9hZEV2ZW50ID09IFdFQktJVF9MT0FE X1NUQVJURUQpIHsKKyAgICAgICAgd2ViVmlldy0+cHJpdi0+bG9hZGluZ1Jlc291cmNlc01hcC5j bGVhcigpOworICAgICAgICB3ZWJWaWV3LT5wcml2LT5tYWluUmVzb3VyY2UgPSAwOworICAgIH0g ZWxzZSBpZiAobG9hZEV2ZW50ID09IFdFQktJVF9MT0FEX0NPTU1JVFRFRCkKKyAgICAgICAgd2Vi Vmlldy0+cHJpdi0+c3VicmVzb3VyY2VzTWFwLmNsZWFyKCk7CisKICAgICBpZiAod2ViVmlldy0+ cHJpdi0+cmVwbGFjZUNvbnRlbnRTdGF0dXMgPT0gUmVwbGFjaW5nQ29udGVudCkgewogICAgICAg ICBpZiAobG9hZEV2ZW50ID09IFdFQktJVF9MT0FEX0ZJTklTSEVEKQogICAgICAgICAgICAgd2Vi Vmlldy0+cHJpdi0+cmVwbGFjZUNvbnRlbnRTdGF0dXMgPSBEaWRSZXBsYWNlQ29udGVudDsKQEAg LTczNywxMSArNzQzLDYgQEAgdm9pZCB3ZWJraXRXZWJWaWV3TG9hZENoYW5nZWQoV2ViS2l0V2Vi Vmlldyogd2ViVmlldywgV2ViS2l0TG9hZEV2ZW50IGxvYWRFdmVudCkKICAgICAgICAgd2ViVmll dy0+cHJpdi0+cmVwbGFjZUNvbnRlbnRTdGF0dXMgPSBOb1JlcGxhY2VDb250ZW50OwogICAgIH0K IAotICAgIGlmIChsb2FkRXZlbnQgPT0gV0VCS0lUX0xPQURfU1RBUlRFRCkKLSAgICAgICAgd2Vi Vmlldy0+cHJpdi0+bG9hZGluZ1Jlc291cmNlc01hcC5jbGVhcigpOwotICAgIGVsc2UgaWYgKGxv YWRFdmVudCA9PSBXRUJLSVRfTE9BRF9DT01NSVRURUQpCi0gICAgICAgIHdlYlZpZXctPnByaXYt PnN1YnJlc291cmNlc01hcC5jbGVhcigpOwotCiAgICAgaWYgKGxvYWRFdmVudCAhPSBXRUJLSVRf TE9BRF9GSU5JU0hFRCkKICAgICAgICAgd2Via2l0V2ViVmlld1VwZGF0ZVVSSSh3ZWJWaWV3KTsK ICAgICBnX3NpZ25hbF9lbWl0KHdlYlZpZXcsIHNpZ25hbHNbTE9BRF9DSEFOR0VEXSwgMCwgbG9h ZEV2ZW50KTsKQEAgLTg3Miw5ICs4NzMsMTEgQEAgdm9pZCB3ZWJraXRXZWJWaWV3UHJpbnRGcmFt ZShXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBXS0ZyYW1lUmVmIHdrRnJhbWUpCiAKIHZvaWQgd2Vi a2l0V2ViVmlld1Jlc291cmNlTG9hZFN0YXJ0ZWQoV2ViS2l0V2ViVmlldyogd2ViVmlldywgV0tG cmFtZVJlZiB3a0ZyYW1lLCB1aW50NjRfdCByZXNvdXJjZUlkZW50aWZpZXIsIFdlYktpdFVSSVJl cXVlc3QqIHJlcXVlc3QsIGJvb2wgaXNNYWluUmVzb3VyY2UpCiB7Ci0gICAgLy8gRklYTUU6IGln bm9yZSByZXNvdXJjZXMgd2hlbiByZXBsYWNpbmcgY29udGVudC4KLSAgICBXZWJLaXRXZWJSZXNv dXJjZSogcmVzb3VyY2UgPSB3ZWJraXRXZWJSZXNvdXJjZUNyZWF0ZSh3a0ZyYW1lLCByZXF1ZXN0 LCBpc01haW5SZXNvdXJjZSk7CiAgICAgV2ViS2l0V2ViVmlld1ByaXZhdGUqIHByaXYgPSB3ZWJW aWV3LT5wcml2OworICAgIGlmIChwcml2LT5yZXBsYWNlQ29udGVudFN0YXR1cyA9PSBSZXBsYWNp bmdDb250ZW50IHx8IHByaXYtPnJlcGxhY2VDb250ZW50U3RhdHVzID09IERpZFJlcGxhY2VDb250 ZW50KQorICAgICAgICByZXR1cm47CisKKyAgICBXZWJLaXRXZWJSZXNvdXJjZSogcmVzb3VyY2Ug PSB3ZWJraXRXZWJSZXNvdXJjZUNyZWF0ZSh3a0ZyYW1lLCByZXF1ZXN0LCBpc01haW5SZXNvdXJj ZSk7CiAgICAgaWYgKFdLRnJhbWVJc01haW5GcmFtZSh3a0ZyYW1lKSAmJiBpc01haW5SZXNvdXJj ZSkKICAgICAgICAgcHJpdi0+bWFpblJlc291cmNlID0gcmVzb3VyY2U7CiAgICAgcHJpdi0+bG9h ZGluZ1Jlc291cmNlc01hcC5zZXQocmVzb3VyY2VJZGVudGlmaWVyLCBhZG9wdEdSZWYocmVzb3Vy Y2UpKTsKQEAgLTg4MywxOSArODg2LDMyIEBAIHZvaWQgd2Via2l0V2ViVmlld1Jlc291cmNlTG9h ZFN0YXJ0ZWQoV2ViS2l0V2ViVmlldyogd2ViVmlldywgV0tGcmFtZVJlZiB3a0ZyYW1lCiAKIFdl YktpdFdlYlJlc291cmNlKiB3ZWJraXRXZWJWaWV3R2V0TG9hZGluZ1dlYlJlc291cmNlKFdlYktp dFdlYlZpZXcqIHdlYlZpZXcsIHVpbnQ2NF90IHJlc291cmNlSWRlbnRpZmllcikKIHsKKyAgICBX ZWJLaXRXZWJWaWV3UHJpdmF0ZSogcHJpdiA9IHdlYlZpZXctPnByaXY7CisgICAgaWYgKHByaXYt PnJlcGxhY2VDb250ZW50U3RhdHVzID09IFJlcGxhY2luZ0NvbnRlbnQgfHwgcHJpdi0+cmVwbGFj ZUNvbnRlbnRTdGF0dXMgPT0gRGlkUmVwbGFjZUNvbnRlbnQpCisgICAgICAgIHJldHVybiAwOwor CiAgICAgR1JlZlB0cjxXZWJLaXRXZWJSZXNvdXJjZT4gcmVzb3VyY2UgPSB3ZWJWaWV3LT5wcml2 LT5sb2FkaW5nUmVzb3VyY2VzTWFwLmdldChyZXNvdXJjZUlkZW50aWZpZXIpOworICAgIEFTU0VS VChyZXNvdXJjZS5nZXQoKSk7CiAgICAgcmV0dXJuIHJlc291cmNlLmdldCgpOwogfQogCiB2b2lk IHdlYmtpdFdlYlZpZXdSZW1vdmVMb2FkaW5nV2ViUmVzb3VyY2UoV2ViS2l0V2ViVmlldyogd2Vi VmlldywgdWludDY0X3QgcmVzb3VyY2VJZGVudGlmaWVyKQogewotICAgIHdlYlZpZXctPnByaXYt PmxvYWRpbmdSZXNvdXJjZXNNYXAucmVtb3ZlKHJlc291cmNlSWRlbnRpZmllcik7CisgICAgV2Vi S2l0V2ViVmlld1ByaXZhdGUqIHByaXYgPSB3ZWJWaWV3LT5wcml2OworICAgIGlmIChwcml2LT5y ZXBsYWNlQ29udGVudFN0YXR1cyA9PSBSZXBsYWNpbmdDb250ZW50IHx8IHByaXYtPnJlcGxhY2VD b250ZW50U3RhdHVzID09IERpZFJlcGxhY2VDb250ZW50KQorICAgICAgICByZXR1cm47CisKKyAg ICBBU1NFUlQocHJpdi0+bG9hZGluZ1Jlc291cmNlc01hcC5jb250YWlucyhyZXNvdXJjZUlkZW50 aWZpZXIpKTsKKyAgICBwcml2LT5sb2FkaW5nUmVzb3VyY2VzTWFwLnJlbW92ZShyZXNvdXJjZUlk ZW50aWZpZXIpOwogfQogCiBXZWJLaXRXZWJSZXNvdXJjZSogd2Via2l0V2ViVmlld1Jlc291cmNl TG9hZEZpbmlzaGVkKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcsIHVpbnQ2NF90IHJlc291cmNlSWRl bnRpZmllcikKIHsKLSAgICBXZWJLaXRXZWJSZXNvdXJjZSogcmVzb3VyY2UgPSB3ZWJraXRXZWJW aWV3R2V0TG9hZGluZ1dlYlJlc291cmNlKHdlYlZpZXcsIHJlc291cmNlSWRlbnRpZmllcik7CiAg ICAgV2ViS2l0V2ViVmlld1ByaXZhdGUqIHByaXYgPSB3ZWJWaWV3LT5wcml2OworICAgIGlmIChw cml2LT5yZXBsYWNlQ29udGVudFN0YXR1cyA9PSBSZXBsYWNpbmdDb250ZW50IHx8IHByaXYtPnJl cGxhY2VDb250ZW50U3RhdHVzID09IERpZFJlcGxhY2VDb250ZW50KQorICAgICAgICByZXR1cm4g MDsKKworICAgIFdlYktpdFdlYlJlc291cmNlKiByZXNvdXJjZSA9IHdlYmtpdFdlYlZpZXdHZXRM b2FkaW5nV2ViUmVzb3VyY2Uod2ViVmlldywgcmVzb3VyY2VJZGVudGlmaWVyKTsKICAgICBpZiAo cmVzb3VyY2UgIT0gcHJpdi0+bWFpblJlc291cmNlKQogICAgICAgICBwcml2LT5zdWJyZXNvdXJj ZXNNYXAuc2V0KFN0cmluZzo6ZnJvbVVURjgod2Via2l0X3dlYl9yZXNvdXJjZV9nZXRfdXJpKHJl c291cmNlKSksIHJlc291cmNlKTsKICAgICB3ZWJraXRXZWJWaWV3UmVtb3ZlTG9hZGluZ1dlYlJl c291cmNlKHdlYlZpZXcsIHJlc291cmNlSWRlbnRpZmllcik7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0UmVzb3VyY2VzLmNwcCBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RSZXNvdXJjZXMuY3BwCmluZGV4 IDJjNzY0OGQuLmQzMTNiMTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZ3RrL3Rlc3RzL1Rlc3RSZXNvdXJjZXMuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RSZXNvdXJjZXMuY3BwCkBAIC00ODEsNiArNDgxLDMyIEBA IHN0YXRpYyB2b2lkIHRlc3RXZWJSZXNvdXJjZUdldERhdGEoUmVzb3VyY2VzVGVzdCogdGVzdCwg Z2NvbnN0cG9pbnRlcikKICAgICAgICAgdGVzdC0+Y2hlY2tSZXNvdXJjZURhdGEoV0VCS0lUX1dF Ql9SRVNPVVJDRShpdGVtLT5kYXRhKSk7CiB9CiAKK3N0YXRpYyB2b2lkIHJlcGxhY2VkQ29udGVu dFJlc291cmNlTG9hZFN0YXJ0ZWRDYWxsYmFjaygpCit7CisgICAgZ19hc3NlcnRfbm90X3JlYWNo ZWQoKTsKK30KKworc3RhdGljIHZvaWQgdGVzdFdlYlZpZXdSZXNvdXJjZXNSZXBsYWNlZENvbnRl bnQoUmVzb3VyY2VzVGVzdCogdGVzdCwgZ2NvbnN0cG9pbnRlcikKK3sKKyAgICB0ZXN0LT5sb2Fk VVJJKGtTZXJ2ZXItPmdldFVSSUZvclBhdGgoIi8iKS5kYXRhKCkpOworICAgIC8vIEZJWE1FOiB0 aGlzIHNob3VsZCBiZSA0IGluc3RlYWQgb2YgMywgYnV0IHdlIGRvbid0IGdldCB0aGUgY3NzIGlt YWdlIHJlc291cmNlCisgICAgLy8gZHVlIHRvIGJ1ZyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9Nzg1MTAuCisgICAgdGVzdC0+d2FpdFVudGlsUmVzb3VyY2VzTG9hZGVk KDMpOworCisgICAgc3RhdGljIGNvbnN0IGNoYXIqIHJlcGxhY2VkSHRtbCA9CisgICAgICAgICI8 aHRtbD48aGVhZD4iCisgICAgICAgICIgPHRpdGxlPkNvbnRlbnQgUmVwbGFjZWQ8L3RpdGxlPiIK KyAgICAgICAgIiA8bGluayByZWw9J3N0eWxlc2hlZXQnIGhyZWY9J2RhdGE6dGV4dC9jc3MsYm9k eSB7IG1hcmdpbjogMHB4OyBwYWRkaW5nOiAwcHg7IH0nIHR5cGU9J3RleHQvY3NzJz4iCisgICAg ICAgICIgPHNjcmlwdCBsYW5ndWFnZT0namF2YXNjcmlwdCcgc3JjPSdkYXRhOmFwcGxpY2F0aW9u L2phdmFzY3JpcHQsZnVuY3Rpb24gZm9vICgpIHsgdmFyIGEgPSAxOyB9Jz48L3NjcmlwdD4iCisg ICAgICAgICI8L2hlYWQ+PGJvZHkgb25sb2FkPSdkb2N1bWVudC50aXRsZT1cIkxvYWRlZFwiJz5X ZWJLaXRHVEsrIHJlc291cmNlcyBvbiByZXBsYWNlZCBjb250ZW50IHRlc3Q8L2JvZHk+PC9odG1s PiI7CisgICAgZ19zaWduYWxfY29ubmVjdCh0ZXN0LT5tX3dlYlZpZXcsICJyZXNvdXJjZS1sb2Fk LXN0YXJ0ZWQiLCBHX0NBTExCQUNLKHJlcGxhY2VkQ29udGVudFJlc291cmNlTG9hZFN0YXJ0ZWRD YWxsYmFjayksIHRlc3QpOworICAgIHRlc3QtPnJlcGxhY2VDb250ZW50KHJlcGxhY2VkSHRtbCwg Imh0dHA6Ly9lcnJvci1wYWdlLmZvbyIsIDApOworICAgIHRlc3QtPndhaXRVbnRpbFRpdGxlQ2hh bmdlZCgiTG9hZGVkIik7CisKKyAgICBnX2Fzc2VydCghd2Via2l0X3dlYl92aWV3X2dldF9tYWlu X3Jlc291cmNlKHRlc3QtPm1fd2ViVmlldykpOworICAgIGdfYXNzZXJ0KCF3ZWJraXRfd2ViX3Zp ZXdfZ2V0X3N1YnJlc291cmNlcyh0ZXN0LT5tX3dlYlZpZXcpKTsKK30KKwogc3RhdGljIHZvaWQg YWRkQ2FjaGVIVFRQSGVhZGVyc1RvUmVzcG9zZShTb3VwTWVzc2FnZSogbWVzc2FnZSkKIHsKICAg ICAvLyBUaGUgYWN0dWFsIGRhdGUgZG9lc24ndCByZWFsbHkgbWF0dGVyLgpAQCAtNTYxLDYgKzU4 Nyw3IEBAIHZvaWQgYmVmb3JlQWxsKCkKICAgICBTaW5nbGVSZXNvdXJjZUxvYWRUZXN0OjphZGQo IldlYktpdFdlYlJlc291cmNlIiwgInJlc3BvbnNlIiwgdGVzdFdlYlJlc291cmNlUmVzcG9uc2Up OwogICAgIFJlc291cmNlVVJJVHJhY2tpbmdUZXN0OjphZGQoIldlYktpdFdlYlJlc291cmNlIiwg ImFjdGl2ZS11cmkiLCB0ZXN0V2ViUmVzb3VyY2VBY3RpdmVVUkkpOwogICAgIFJlc291cmNlc1Rl c3Q6OmFkZCgiV2ViS2l0V2ViUmVzb3VyY2UiLCAiZ2V0LWRhdGEiLCB0ZXN0V2ViUmVzb3VyY2VH ZXREYXRhKTsKKyAgICBSZXNvdXJjZXNUZXN0OjphZGQoIldlYktpdFdlYlZpZXciLCAicmVwbGFj ZWQtY29udGVudCIsIHRlc3RXZWJWaWV3UmVzb3VyY2VzUmVwbGFjZWRDb250ZW50KTsKIH0KIAog dm9pZCBhZnRlckFsbCgpCg== 132104 2012-03-15 12:41:22 -0700 2012-04-19 16:02:56 -0700 Updated patch wk2-ignore-resources-replacing2.diff text/plain 11070 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAyYmQzY2Q0Li45NDRhYWViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzYg QEAKIDIwMTItMDMtMTUgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCisgICAgICAgIFtHVEtdIElnbm9yZSByZXNvdXJjZXMgd2hpbGUgcmVwbGFjaW5nIGNvbnRl bnQgaW4gV2ViS2l0MiBHVEsrIEFQSQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9Nzk3NzcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFJlc291cmNlTG9hZENsaWVu dC5jcHA6CisgICAgICAgIChkaWRTZW5kUmVxdWVzdEZvclJlc291cmNlKTogUmV0dXJuIGVhcmx5 IGlmIHJlc291cmNlcyBpcyBOdWxsLgorICAgICAgICAoZGlkUmVjZWl2ZVJlc3BvbnNlRm9yUmVz b3VyY2UpOiBEaXR0by4KKyAgICAgICAgKGRpZFJlY2VpdmVDb250ZW50TGVuZ3RoRm9yUmVzb3Vy Y2UpOiBEaXR0by4KKyAgICAgICAgKGRpZEZpbmlzaExvYWRGb3JSZXNvdXJjZSk6IERpdHRvLgor ICAgICAgICAoZGlkRmFpbExvYWRGb3JSZXNvdXJjZSk6IERpdHRvLgorICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuY3BwOgorICAgICAgICAod2Via2l0V2ViVmlld0xv YWRDaGFuZ2VkKTogQ2xlYXIgcmVzb3VyY2VzIGJlZm9yZSBjaGVja2luZworICAgICAgICB3aGV0 aGVyIHdlIGFyZSByZXBsYWNpbmcgY29udGVudC4KKyAgICAgICAgKHdlYmtpdFdlYlZpZXdJc1Jl cGxhY2luZ0NvbnRlbnRPckRpZFJlcGxhY2VDb250ZW50KTogSGVscGVyCisgICAgICAgIGZ1bmN0 aW9uIHRvIGNoZWNrIHdoZXRoZXIgdmlldyBpcyByZXBsYWNpbmcgY29udGVudCBvciBjdXJyZW50 CisgICAgICAgIGNvbnRlbnQgaXMgcmVwbGFjZWQuCisgICAgICAgICh3ZWJraXRXZWJWaWV3UmVz b3VyY2VMb2FkU3RhcnRlZCk6IERvIG5vdCBjcmVhdGUgcmVzb3VyY2VzIHdoZW4KKyAgICAgICAg cmVwbGFjaW5nIGNvbnRlbnQuCisgICAgICAgICh3ZWJraXRXZWJWaWV3R2V0TG9hZGluZ1dlYlJl c291cmNlKTogSWdub3JlIHdoZW4gcmVwbGFjaW5nCisgICAgICAgIGNvbnRlbnQuIEFsc28gYWRk IGFuIGFzc2VydCB3aGVuIGdldHRpbmcgYSBsb2FkaW5nIHJlc291cmNlcyB0bworICAgICAgICBt YWtlIHN1cmUgd2Ugb25seSByZXR1cm4gTnVsbCB3aGVuIHJlcGxhY2luZyBjb250ZW50LgorICAg ICAgICAod2Via2l0V2ViVmlld1JlbW92ZUxvYWRpbmdXZWJSZXNvdXJjZSk6IERpdHRvLgorICAg ICAgICAod2Via2l0V2ViVmlld1Jlc291cmNlTG9hZEZpbmlzaGVkKTogRGl0dG8uCisgICAgICAg ICogVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVzdFJlc291cmNlcy5jcHA6CisgICAgICAgIChy ZXBsYWNlZENvbnRlbnRSZXNvdXJjZUxvYWRTdGFydGVkQ2FsbGJhY2spOgorICAgICAgICAodGVz dFdlYlZpZXdSZXNvdXJjZXNSZXBsYWNlZENvbnRlbnQpOgorICAgICAgICAoYmVmb3JlQWxsKToK KworMjAxMi0wMy0xNSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+ CisKICAgICAgICAgW0dUS10gSW1wbGVtZW50IHVuaWNvZGUgc3VibWVudSBpdGVtcwogICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODExMTcKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0UmVzb3VyY2VMb2Fk Q2xpZW50LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFJlc291 cmNlTG9hZENsaWVudC5jcHAKaW5kZXggYTRiZDA5Yi4uMWNkOGFhZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0UmVzb3VyY2VMb2FkQ2xpZW50LmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRSZXNvdXJjZUxv YWRDbGllbnQuY3BwCkBAIC00NCw2ICs0NCw5IEBAIHN0YXRpYyB2b2lkIGRpZEluaXRpYXRlTG9h ZEZvclJlc291cmNlKFdLUGFnZVJlZiwgV0tGcmFtZVJlZiB3a0ZyYW1lLCB1aW50NjRfdCByCiBz dGF0aWMgdm9pZCBkaWRTZW5kUmVxdWVzdEZvclJlc291cmNlKFdLUGFnZVJlZiwgV0tGcmFtZVJl ZiwgdWludDY0X3QgcmVzb3VyY2VJZGVudGlmaWVyLCBXS1VSTFJlcXVlc3RSZWYgd2tSZXF1ZXN0 LCBXS1VSTFJlc3BvbnNlUmVmIHdrUmVkaXJlY3RSZXNwb25zZSwgY29uc3Qgdm9pZCogY2xpZW50 SW5mbykKIHsKICAgICBHUmVmUHRyPFdlYktpdFdlYlJlc291cmNlPiByZXNvdXJjZSA9IHdlYmtp dFdlYlZpZXdHZXRMb2FkaW5nV2ViUmVzb3VyY2UoV0VCS0lUX1dFQl9WSUVXKGNsaWVudEluZm8p LCByZXNvdXJjZUlkZW50aWZpZXIpOworICAgIGlmICghcmVzb3VyY2UpCisgICAgICAgIHJldHVy bjsKKwogICAgIEdSZWZQdHI8V2ViS2l0VVJJUmVxdWVzdD4gcmVxdWVzdCA9IGFkb3B0R1JlZih3 ZWJraXRVUklSZXF1ZXN0Q3JlYXRlRm9yUmVzb3VyY2VSZXF1ZXN0KHRvSW1wbCh3a1JlcXVlc3Qp LT5yZXNvdXJjZVJlcXVlc3QoKSkpOwogICAgIEdSZWZQdHI8V2ViS2l0VVJJUmVzcG9uc2U+IHJl ZGlyZWN0UmVzcG9uc2UgPSB3a1JlZGlyZWN0UmVzcG9uc2UgPyBhZG9wdEdSZWYod2Via2l0VVJJ UmVzcG9uc2VDcmVhdGVGb3JSZXNvdXJjZVJlc3BvbnNlKHRvSW1wbCh3a1JlZGlyZWN0UmVzcG9u c2UpLT5yZXNvdXJjZVJlc3BvbnNlKCkpKSA6IDA7CiAgICAgd2Via2l0V2ViUmVzb3VyY2VTZW50 UmVxdWVzdChyZXNvdXJjZS5nZXQoKSwgcmVxdWVzdC5nZXQoKSwgcmVkaXJlY3RSZXNwb25zZS5n ZXQoKSk7CkBAIC01Miw2ICs1NSw5IEBAIHN0YXRpYyB2b2lkIGRpZFNlbmRSZXF1ZXN0Rm9yUmVz b3VyY2UoV0tQYWdlUmVmLCBXS0ZyYW1lUmVmLCB1aW50NjRfdCByZXNvdXJjZUlkCiBzdGF0aWMg dm9pZCBkaWRSZWNlaXZlUmVzcG9uc2VGb3JSZXNvdXJjZShXS1BhZ2VSZWYsIFdLRnJhbWVSZWYs IHVpbnQ2NF90IHJlc291cmNlSWRlbnRpZmllciwgV0tVUkxSZXNwb25zZVJlZiB3a1Jlc3BvbnNl LCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKQogewogICAgIEdSZWZQdHI8V2ViS2l0V2ViUmVzb3Vy Y2U+IHJlc291cmNlID0gd2Via2l0V2ViVmlld0dldExvYWRpbmdXZWJSZXNvdXJjZShXRUJLSVRf V0VCX1ZJRVcoY2xpZW50SW5mbyksIHJlc291cmNlSWRlbnRpZmllcik7CisgICAgaWYgKCFyZXNv dXJjZSkKKyAgICAgICAgcmV0dXJuOworCiAgICAgR1JlZlB0cjxXZWJLaXRVUklSZXNwb25zZT4g cmVzcG9uc2UgPSBhZG9wdEdSZWYod2Via2l0VVJJUmVzcG9uc2VDcmVhdGVGb3JSZXNvdXJjZVJl c3BvbnNlKHRvSW1wbCh3a1Jlc3BvbnNlKS0+cmVzb3VyY2VSZXNwb25zZSgpKSk7CiAgICAgd2Vi a2l0V2ViUmVzb3VyY2VTZXRSZXNwb25zZShyZXNvdXJjZS5nZXQoKSwgcmVzcG9uc2UuZ2V0KCkp OwogfQpAQCAtNTksMTIgKzY1LDE4IEBAIHN0YXRpYyB2b2lkIGRpZFJlY2VpdmVSZXNwb25zZUZv clJlc291cmNlKFdLUGFnZVJlZiwgV0tGcmFtZVJlZiwgdWludDY0X3QgcmVzb3VyCiBzdGF0aWMg dm9pZCBkaWRSZWNlaXZlQ29udGVudExlbmd0aEZvclJlc291cmNlKFdLUGFnZVJlZiwgV0tGcmFt ZVJlZiwgdWludDY0X3QgcmVzb3VyY2VJZGVudGlmaWVyLCB1aW50NjRfdCBjb250ZW50TGVuZ3Ro LCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKQogewogICAgIEdSZWZQdHI8V2ViS2l0V2ViUmVzb3Vy Y2U+IHJlc291cmNlID0gd2Via2l0V2ViVmlld0dldExvYWRpbmdXZWJSZXNvdXJjZShXRUJLSVRf V0VCX1ZJRVcoY2xpZW50SW5mbyksIHJlc291cmNlSWRlbnRpZmllcik7CisgICAgaWYgKCFyZXNv dXJjZSkKKyAgICAgICAgcmV0dXJuOworCiAgICAgd2Via2l0V2ViUmVzb3VyY2VOb3RpZnlQcm9n cmVzcyhyZXNvdXJjZS5nZXQoKSwgY29udGVudExlbmd0aCk7CiB9CiAKIHN0YXRpYyB2b2lkIGRp ZEZpbmlzaExvYWRGb3JSZXNvdXJjZShXS1BhZ2VSZWYsIFdLRnJhbWVSZWYsIHVpbnQ2NF90IHJl c291cmNlSWRlbnRpZmllciwgY29uc3Qgdm9pZCogY2xpZW50SW5mbykKIHsKICAgICBHUmVmUHRy PFdlYktpdFdlYlJlc291cmNlPiByZXNvdXJjZSA9IHdlYmtpdFdlYlZpZXdSZXNvdXJjZUxvYWRG aW5pc2hlZChXRUJLSVRfV0VCX1ZJRVcoY2xpZW50SW5mbyksIHJlc291cmNlSWRlbnRpZmllcik7 CisgICAgaWYgKCFyZXNvdXJjZSkKKyAgICAgICAgcmV0dXJuOworCiAgICAgd2Via2l0V2ViUmVz b3VyY2VGaW5pc2hlZChyZXNvdXJjZS5nZXQoKSk7CiB9CiAKQEAgLTcyLDYgKzg0LDkgQEAgc3Rh dGljIHZvaWQgZGlkRmFpbExvYWRGb3JSZXNvdXJjZShXS1BhZ2VSZWYsIFdLRnJhbWVSZWYsIHVp bnQ2NF90IHJlc291cmNlSWRlbnQKIHsKICAgICBXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3ID0gV0VC S0lUX1dFQl9WSUVXKGNsaWVudEluZm8pOwogICAgIEdSZWZQdHI8V2ViS2l0V2ViUmVzb3VyY2U+ IHJlc291cmNlID0gd2Via2l0V2ViVmlld0dldExvYWRpbmdXZWJSZXNvdXJjZSh3ZWJWaWV3LCBy ZXNvdXJjZUlkZW50aWZpZXIpOworICAgIGlmICghcmVzb3VyY2UpCisgICAgICAgIHJldHVybjsK KwogICAgIGNvbnN0IFJlc291cmNlRXJyb3ImIHJlc291cmNlRXJyb3IgPSB0b0ltcGwod2tFcnJv ciktPnBsYXRmb3JtRXJyb3IoKTsKICAgICBHT3duUHRyPEdFcnJvcj4gd2ViRXJyb3IoZ19lcnJv cl9uZXdfbGl0ZXJhbChnX3F1YXJrX2Zyb21fc3RyaW5nKHJlc291cmNlRXJyb3IuZG9tYWluKCku dXRmOCgpLmRhdGEoKSksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgcmVzb3VyY2VFcnJvci5lcnJvckNvZGUoKSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuY3BwIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5jcHAKaW5kZXggMDhlM2QyZC4uZmRl Zjc0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0 V2ViVmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0 V2ViVmlldy5jcHAKQEAgLTcyNCwxNCArNzI0LDE1IEBAIHN0YXRpYyBib29sIHVwZGF0ZVJlcGxh Y2VDb250ZW50U3RhdHVzKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcsIFdlYktpdExvYWRFdmVudCBs CiAKIHZvaWQgd2Via2l0V2ViVmlld0xvYWRDaGFuZ2VkKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcs IFdlYktpdExvYWRFdmVudCBsb2FkRXZlbnQpCiB7Ci0gICAgaWYgKHVwZGF0ZVJlcGxhY2VDb250 ZW50U3RhdHVzKHdlYlZpZXcsIGxvYWRFdmVudCkpCi0gICAgICAgIHJldHVybjsKLQotICAgIGlm IChsb2FkRXZlbnQgPT0gV0VCS0lUX0xPQURfU1RBUlRFRCkKKyAgICBpZiAobG9hZEV2ZW50ID09 IFdFQktJVF9MT0FEX1NUQVJURUQpIHsKICAgICAgICAgd2ViVmlldy0+cHJpdi0+bG9hZGluZ1Jl c291cmNlc01hcC5jbGVhcigpOwotICAgIGVsc2UgaWYgKGxvYWRFdmVudCA9PSBXRUJLSVRfTE9B RF9DT01NSVRURUQpCisgICAgICAgIHdlYlZpZXctPnByaXYtPm1haW5SZXNvdXJjZSA9IDA7Cisg ICAgfSBlbHNlIGlmIChsb2FkRXZlbnQgPT0gV0VCS0lUX0xPQURfQ09NTUlUVEVEKQogICAgICAg ICB3ZWJWaWV3LT5wcml2LT5zdWJyZXNvdXJjZXNNYXAuY2xlYXIoKTsKIAorICAgIGlmICh1cGRh dGVSZXBsYWNlQ29udGVudFN0YXR1cyh3ZWJWaWV3LCBsb2FkRXZlbnQpKQorICAgICAgICByZXR1 cm47CisKICAgICBpZiAobG9hZEV2ZW50ICE9IFdFQktJVF9MT0FEX0ZJTklTSEVEKQogICAgICAg ICB3ZWJraXRXZWJWaWV3VXBkYXRlVVJJKHdlYlZpZXcpOwogICAgIGdfc2lnbmFsX2VtaXQod2Vi Vmlldywgc2lnbmFsc1tMT0FEX0NIQU5HRURdLCAwLCBsb2FkRXZlbnQpOwpAQCAtODYyLDExICs4 NjMsMTggQEAgdm9pZCB3ZWJraXRXZWJWaWV3UHJpbnRGcmFtZShXZWJLaXRXZWJWaWV3KiB3ZWJW aWV3LCBXS0ZyYW1lUmVmIHdrRnJhbWUpCiAgICAgZ19zaWduYWxfY29ubmVjdChwcmludE9wZXJh dGlvbi5sZWFrUmVmKCksICJmaW5pc2hlZCIsIEdfQ0FMTEJBQ0soZ19vYmplY3RfdW5yZWYpLCAw KTsKIH0KIAorc3RhdGljIGlubGluZSBib29sIHdlYmtpdFdlYlZpZXdJc1JlcGxhY2luZ0NvbnRl bnRPckRpZFJlcGxhY2VDb250ZW50KFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpCit7CisgICAgcmV0 dXJuICh3ZWJWaWV3LT5wcml2LT5yZXBsYWNlQ29udGVudFN0YXR1cyA9PSBSZXBsYWNpbmdDb250 ZW50IHx8IHdlYlZpZXctPnByaXYtPnJlcGxhY2VDb250ZW50U3RhdHVzID09IERpZFJlcGxhY2VD b250ZW50KTsKK30KKwogdm9pZCB3ZWJraXRXZWJWaWV3UmVzb3VyY2VMb2FkU3RhcnRlZChXZWJL aXRXZWJWaWV3KiB3ZWJWaWV3LCBXS0ZyYW1lUmVmIHdrRnJhbWUsIHVpbnQ2NF90IHJlc291cmNl SWRlbnRpZmllciwgV2ViS2l0VVJJUmVxdWVzdCogcmVxdWVzdCwgYm9vbCBpc01haW5SZXNvdXJj ZSkKIHsKLSAgICAvLyBGSVhNRTogaWdub3JlIHJlc291cmNlcyB3aGVuIHJlcGxhY2luZyBjb250 ZW50LgotICAgIFdlYktpdFdlYlJlc291cmNlKiByZXNvdXJjZSA9IHdlYmtpdFdlYlJlc291cmNl Q3JlYXRlKHdrRnJhbWUsIHJlcXVlc3QsIGlzTWFpblJlc291cmNlKTsKKyAgICBpZiAod2Via2l0 V2ViVmlld0lzUmVwbGFjaW5nQ29udGVudE9yRGlkUmVwbGFjZUNvbnRlbnQod2ViVmlldykpCisg ICAgICAgIHJldHVybjsKKwogICAgIFdlYktpdFdlYlZpZXdQcml2YXRlKiBwcml2ID0gd2ViVmll dy0+cHJpdjsKKyAgICBXZWJLaXRXZWJSZXNvdXJjZSogcmVzb3VyY2UgPSB3ZWJraXRXZWJSZXNv dXJjZUNyZWF0ZSh3a0ZyYW1lLCByZXF1ZXN0LCBpc01haW5SZXNvdXJjZSk7CiAgICAgaWYgKFdL RnJhbWVJc01haW5GcmFtZSh3a0ZyYW1lKSAmJiBpc01haW5SZXNvdXJjZSkKICAgICAgICAgcHJp di0+bWFpblJlc291cmNlID0gcmVzb3VyY2U7CiAgICAgcHJpdi0+bG9hZGluZ1Jlc291cmNlc01h cC5zZXQocmVzb3VyY2VJZGVudGlmaWVyLCBhZG9wdEdSZWYocmVzb3VyY2UpKTsKQEAgLTg3NSwx OSArODgzLDMxIEBAIHZvaWQgd2Via2l0V2ViVmlld1Jlc291cmNlTG9hZFN0YXJ0ZWQoV2ViS2l0 V2ViVmlldyogd2ViVmlldywgV0tGcmFtZVJlZiB3a0ZyYW1lCiAKIFdlYktpdFdlYlJlc291cmNl KiB3ZWJraXRXZWJWaWV3R2V0TG9hZGluZ1dlYlJlc291cmNlKFdlYktpdFdlYlZpZXcqIHdlYlZp ZXcsIHVpbnQ2NF90IHJlc291cmNlSWRlbnRpZmllcikKIHsKKyAgICBpZiAod2Via2l0V2ViVmll d0lzUmVwbGFjaW5nQ29udGVudE9yRGlkUmVwbGFjZUNvbnRlbnQod2ViVmlldykpCisgICAgICAg IHJldHVybiAwOworCiAgICAgR1JlZlB0cjxXZWJLaXRXZWJSZXNvdXJjZT4gcmVzb3VyY2UgPSB3 ZWJWaWV3LT5wcml2LT5sb2FkaW5nUmVzb3VyY2VzTWFwLmdldChyZXNvdXJjZUlkZW50aWZpZXIp OworICAgIEFTU0VSVChyZXNvdXJjZS5nZXQoKSk7CiAgICAgcmV0dXJuIHJlc291cmNlLmdldCgp OwogfQogCiB2b2lkIHdlYmtpdFdlYlZpZXdSZW1vdmVMb2FkaW5nV2ViUmVzb3VyY2UoV2ViS2l0 V2ViVmlldyogd2ViVmlldywgdWludDY0X3QgcmVzb3VyY2VJZGVudGlmaWVyKQogewotICAgIHdl YlZpZXctPnByaXYtPmxvYWRpbmdSZXNvdXJjZXNNYXAucmVtb3ZlKHJlc291cmNlSWRlbnRpZmll cik7CisgICAgaWYgKHdlYmtpdFdlYlZpZXdJc1JlcGxhY2luZ0NvbnRlbnRPckRpZFJlcGxhY2VD b250ZW50KHdlYlZpZXcpKQorICAgICAgICByZXR1cm47CisKKyAgICBXZWJLaXRXZWJWaWV3UHJp dmF0ZSogcHJpdiA9IHdlYlZpZXctPnByaXY7CisgICAgQVNTRVJUKHByaXYtPmxvYWRpbmdSZXNv dXJjZXNNYXAuY29udGFpbnMocmVzb3VyY2VJZGVudGlmaWVyKSk7CisgICAgcHJpdi0+bG9hZGlu Z1Jlc291cmNlc01hcC5yZW1vdmUocmVzb3VyY2VJZGVudGlmaWVyKTsKIH0KIAogV2ViS2l0V2Vi UmVzb3VyY2UqIHdlYmtpdFdlYlZpZXdSZXNvdXJjZUxvYWRGaW5pc2hlZChXZWJLaXRXZWJWaWV3 KiB3ZWJWaWV3LCB1aW50NjRfdCByZXNvdXJjZUlkZW50aWZpZXIpCiB7Ci0gICAgV2ViS2l0V2Vi UmVzb3VyY2UqIHJlc291cmNlID0gd2Via2l0V2ViVmlld0dldExvYWRpbmdXZWJSZXNvdXJjZSh3 ZWJWaWV3LCByZXNvdXJjZUlkZW50aWZpZXIpOworICAgIGlmICh3ZWJraXRXZWJWaWV3SXNSZXBs YWNpbmdDb250ZW50T3JEaWRSZXBsYWNlQ29udGVudCh3ZWJWaWV3KSkKKyAgICAgICAgcmV0dXJu IDA7CisKICAgICBXZWJLaXRXZWJWaWV3UHJpdmF0ZSogcHJpdiA9IHdlYlZpZXctPnByaXY7Cisg ICAgV2ViS2l0V2ViUmVzb3VyY2UqIHJlc291cmNlID0gd2Via2l0V2ViVmlld0dldExvYWRpbmdX ZWJSZXNvdXJjZSh3ZWJWaWV3LCByZXNvdXJjZUlkZW50aWZpZXIpOwogICAgIGlmIChyZXNvdXJj ZSAhPSBwcml2LT5tYWluUmVzb3VyY2UpCiAgICAgICAgIHByaXYtPnN1YnJlc291cmNlc01hcC5z ZXQoU3RyaW5nOjpmcm9tVVRGOCh3ZWJraXRfd2ViX3Jlc291cmNlX2dldF91cmkocmVzb3VyY2Up KSwgcmVzb3VyY2UpOwogICAgIHdlYmtpdFdlYlZpZXdSZW1vdmVMb2FkaW5nV2ViUmVzb3VyY2Uo d2ViVmlldywgcmVzb3VyY2VJZGVudGlmaWVyKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RSZXNvdXJjZXMuY3BwIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVzdFJlc291cmNlcy5jcHAKaW5kZXggZDBhNTVm Yi4uZWRjYzdjNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsv dGVzdHMvVGVzdFJlc291cmNlcy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9ndGsvdGVzdHMvVGVzdFJlc291cmNlcy5jcHAKQEAgLTQ4MSw2ICs0ODEsMzIgQEAgc3RhdGlj IHZvaWQgdGVzdFdlYlJlc291cmNlR2V0RGF0YShSZXNvdXJjZXNUZXN0KiB0ZXN0LCBnY29uc3Rw b2ludGVyKQogICAgICAgICB0ZXN0LT5jaGVja1Jlc291cmNlRGF0YShXRUJLSVRfV0VCX1JFU09V UkNFKGl0ZW0tPmRhdGEpKTsKIH0KIAorc3RhdGljIHZvaWQgcmVwbGFjZWRDb250ZW50UmVzb3Vy Y2VMb2FkU3RhcnRlZENhbGxiYWNrKCkKK3sKKyAgICBnX2Fzc2VydF9ub3RfcmVhY2hlZCgpOwor fQorCitzdGF0aWMgdm9pZCB0ZXN0V2ViVmlld1Jlc291cmNlc1JlcGxhY2VkQ29udGVudChSZXNv dXJjZXNUZXN0KiB0ZXN0LCBnY29uc3Rwb2ludGVyKQoreworICAgIHRlc3QtPmxvYWRVUkkoa1Nl cnZlci0+Z2V0VVJJRm9yUGF0aCgiLyIpLmRhdGEoKSk7CisgICAgLy8gRklYTUU6IHRoaXMgc2hv dWxkIGJlIDQgaW5zdGVhZCBvZiAzLCBidXQgd2UgZG9uJ3QgZ2V0IHRoZSBjc3MgaW1hZ2UgcmVz b3VyY2UKKyAgICAvLyBkdWUgdG8gYnVnIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD03ODUxMC4KKyAgICB0ZXN0LT53YWl0VW50aWxSZXNvdXJjZXNMb2FkZWQoMyk7CisK KyAgICBzdGF0aWMgY29uc3QgY2hhciogcmVwbGFjZWRIdG1sID0KKyAgICAgICAgIjxodG1sPjxo ZWFkPiIKKyAgICAgICAgIiA8dGl0bGU+Q29udGVudCBSZXBsYWNlZDwvdGl0bGU+IgorICAgICAg ICAiIDxsaW5rIHJlbD0nc3R5bGVzaGVldCcgaHJlZj0nZGF0YTp0ZXh0L2Nzcyxib2R5IHsgbWFy Z2luOiAwcHg7IHBhZGRpbmc6IDBweDsgfScgdHlwZT0ndGV4dC9jc3MnPiIKKyAgICAgICAgIiA8 c2NyaXB0IGxhbmd1YWdlPSdqYXZhc2NyaXB0JyBzcmM9J2RhdGE6YXBwbGljYXRpb24vamF2YXNj cmlwdCxmdW5jdGlvbiBmb28gKCkgeyB2YXIgYSA9IDE7IH0nPjwvc2NyaXB0PiIKKyAgICAgICAg IjwvaGVhZD48Ym9keSBvbmxvYWQ9J2RvY3VtZW50LnRpdGxlPVwiTG9hZGVkXCInPldlYktpdEdU SysgcmVzb3VyY2VzIG9uIHJlcGxhY2VkIGNvbnRlbnQgdGVzdDwvYm9keT48L2h0bWw+IjsKKyAg ICBnX3NpZ25hbF9jb25uZWN0KHRlc3QtPm1fd2ViVmlldywgInJlc291cmNlLWxvYWQtc3RhcnRl ZCIsIEdfQ0FMTEJBQ0socmVwbGFjZWRDb250ZW50UmVzb3VyY2VMb2FkU3RhcnRlZENhbGxiYWNr KSwgdGVzdCk7CisgICAgdGVzdC0+cmVwbGFjZUNvbnRlbnQocmVwbGFjZWRIdG1sLCAiaHR0cDov L2Vycm9yLXBhZ2UuZm9vIiwgMCk7CisgICAgdGVzdC0+d2FpdFVudGlsVGl0bGVDaGFuZ2VkVG8o IkxvYWRlZCIpOworCisgICAgZ19hc3NlcnQoIXdlYmtpdF93ZWJfdmlld19nZXRfbWFpbl9yZXNv dXJjZSh0ZXN0LT5tX3dlYlZpZXcpKTsKKyAgICBnX2Fzc2VydCghd2Via2l0X3dlYl92aWV3X2dl dF9zdWJyZXNvdXJjZXModGVzdC0+bV93ZWJWaWV3KSk7Cit9CisKIHN0YXRpYyB2b2lkIGFkZENh Y2hlSFRUUEhlYWRlcnNUb1Jlc3BvbnNlKFNvdXBNZXNzYWdlKiBtZXNzYWdlKQogewogICAgIC8v IFRoZSBhY3R1YWwgZGF0ZSBkb2Vzbid0IHJlYWxseSBtYXR0ZXIuCkBAIC01NjEsNiArNTg3LDcg QEAgdm9pZCBiZWZvcmVBbGwoKQogICAgIFNpbmdsZVJlc291cmNlTG9hZFRlc3Q6OmFkZCgiV2Vi S2l0V2ViUmVzb3VyY2UiLCAicmVzcG9uc2UiLCB0ZXN0V2ViUmVzb3VyY2VSZXNwb25zZSk7CiAg ICAgUmVzb3VyY2VVUklUcmFja2luZ1Rlc3Q6OmFkZCgiV2ViS2l0V2ViUmVzb3VyY2UiLCAiYWN0 aXZlLXVyaSIsIHRlc3RXZWJSZXNvdXJjZUFjdGl2ZVVSSSk7CiAgICAgUmVzb3VyY2VzVGVzdDo6 YWRkKCJXZWJLaXRXZWJSZXNvdXJjZSIsICJnZXQtZGF0YSIsIHRlc3RXZWJSZXNvdXJjZUdldERh dGEpOworICAgIFJlc291cmNlc1Rlc3Q6OmFkZCgiV2ViS2l0V2ViVmlldyIsICJyZXBsYWNlZC1j b250ZW50IiwgdGVzdFdlYlZpZXdSZXNvdXJjZXNSZXBsYWNlZENvbnRlbnQpOwogfQogCiB2b2lk IGFmdGVyQWxsKCkK