50634 2010-12-07 09:16:07 -0800 [GTK] clears the subresources prematurely 2010-12-07 21:41:40 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED Gtk P2 Normal --- 1 gustavo webkit-unassigned webkit.review.bot oldest_to_newest 318239 0 gustavo 2010-12-07 09:16:07 -0800 We currently clear subresources when a provisional load is started. If that load is stopped, we end up with a WebDataSource with 0 subresources in the page that is already loaded. A simple way to test this: in Epiphany go to debian.org, wait for it to load, try to save the page. You will notice an HTML file is saved, and a directory is created with the subresources. Now, enter gnome.org, hit enter and quickly hit stop so it doesn't actually load. Try saving the page again, and you'll see only the HTML file is saved - no subresources. 318246 1 75823 gustavo 2010-12-07 09:25:56 -0800 Created attachment 75823 proposed fix This fixes the manual test case I mentioned, and adds an API test. 318254 2 75823 mrobinson 2010-12-07 09:36:11 -0800 Comment on attachment 75823 proposed fix Great. Thanks. 318290 3 webkit.review.bot 2010-12-07 10:17:37 -0800 Attachment 75823 did not pass style-queue: Failed to run "[u'git', u'reset', u'--hard', u'refs/remotes/trunk']" exit_code: 128 error: Could not write new index file. fatal: Could not reset index file to revision 'refs/remotes/trunk'. If any of these errors are false positives, please file a bug against check-webkit-style. 318339 4 webkit.review.bot 2010-12-07 11:18:43 -0800 Attachment 75823 did not pass style-queue: Failed to run "[u'git', u'reset', u'--hard', u'refs/remotes/trunk']" exit_code: 128 error: Could not write new index file. fatal: Could not reset index file to revision 'refs/remotes/trunk'. If any of these errors are false positives, please file a bug against check-webkit-style. 318387 5 webkit.review.bot 2010-12-07 12:20:07 -0800 Attachment 75823 did not pass style-queue: Failed to run "[u'git', u'reset', u'--hard', u'refs/remotes/trunk']" exit_code: 128 error: Could not write new index file. fatal: Could not reset index file to revision 'refs/remotes/trunk'. If any of these errors are false positives, please file a bug against check-webkit-style. 318404 6 gustavo 2010-12-07 13:00:48 -0800 Committed r73455: <http://trac.webkit.org/changeset/73455> 318610 7 webkit.review.bot 2010-12-07 21:41:40 -0800 Attachment 75823 did not pass style-queue: Failed to run "['WebKitTools/Scripts/update-webkit']" exit_code: 2 Updating OpenSource Incomplete data: Delta source ended unexpectedly at /usr/lib/git-core/git-svn line 5061 Died at WebKitTools/Scripts/update-webkit line 132. If any of these errors are false positives, please file a bug against check-webkit-style. 75823 2010-12-07 09:25:56 -0800 2010-12-07 09:36:11 -0800 proposed fix 0001-Proposed-patch.patch text/plain 9612 gustavo RnJvbSA3MTNkOGU0YWIyNDRiMzg1YmMyZTkxZTQ2ZTkzZjMxZTI3MTc4ODI2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBHdXN0YXZvIE5vcm9uaGEgU2lsdmEgPGduc0Bnbm9tZS5vcmc+ CkRhdGU6IFR1ZSwgNyBEZWMgMjAxMCAxODoxOTowNSArMDEwMApTdWJqZWN0OiBbUEFUQ0hdIFBy b3Bvc2VkIHBhdGNoCgotLS0KIFdlYktpdC9ndGsvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHwgICAyNiArKysrKysrKwogV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9G cmFtZUxvYWRlckNsaWVudEd0ay5jcHAgfCAgIDI2ICsrKysrKy0tLQogV2ViS2l0L2d0ay90ZXN0 cy90ZXN0d2ViZGF0YXNvdXJjZS5jICAgICAgICAgICAgICAgfCAgIDYxICsrKysrKysrKysrKysr KysrKysrCiBXZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRwcml2YXRlLmggICAgICAgICAgICAgICAg ICB8ICAgIDMgKwogV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAgICAgICAgICAg ICAgICAgfCAgIDE1ICsrLS0tCiA1IGZpbGVzIGNoYW5nZWQsIDExNSBpbnNlcnRpb25zKCspLCAx NiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL0NoYW5nZUxvZyBiL1dlYktp dC9ndGsvQ2hhbmdlTG9nCmluZGV4IGZlOWZhNWEuLmY3ZGY3YmMgMTAwNjQ0Ci0tLSBhL1dlYktp dC9ndGsvQ2hhbmdlTG9nCisrKyBiL1dlYktpdC9ndGsvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzEg QEAKIDIwMTAtMTItMDcgIEd1c3Rhdm8gTm9yb25oYSBTaWx2YSAgPGd1c3Rhdm8ubm9yb25oYUBj b2xsYWJvcmEuY28udWs+CiAKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgW0dUS10gY2xlYXJzIHRoZSBzdWJyZXNvdXJjZXMgcHJlbWF0dXJlbHkKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUwNjM0CisKKyAgICAg ICAgTWFrZSBhZGRpbmcgdGhlIG1haW4gcmVzb3VyY2UgZXhwbGljaXQsIGFuZCBvbmx5IGNsZWFy CisgICAgICAgIHN1YnJlc291cmNlcyB3aGVuIHRoZSBuZXcgbG9hZCBpcyBjb21taXR0ZWQsIGF2 b2lkIGNsZWFyaW5nIHRoZW0KKyAgICAgICAgcHJlbWF0dXJlbHkuCisKKyAgICAgICAgKiBXZWJD b3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEd0ay5jcHA6CisgICAgICAgIChXZWJLaXQ6OkZy YW1lTG9hZGVyQ2xpZW50Ojphc3NpZ25JZGVudGlmaWVyVG9Jbml0aWFsUmVxdWVzdCk6CisgICAg ICAgIChXZWJLaXQ6OkZyYW1lTG9hZGVyQ2xpZW50Ojpwcm92aXNpb25hbExvYWRTdGFydGVkKToK KyAgICAgICAgKFdlYktpdDo6RnJhbWVMb2FkZXJDbGllbnQ6OnByZXBhcmVGb3JEYXRhU291cmNl UmVwbGFjZW1lbnQpOgorICAgICAgICAoV2ViS2l0Ojpwb3N0Q29tbWl0RnJhbWVWaWV3U2V0dXAp OgorICAgICAgICAqIHRlc3RzL3Rlc3R3ZWJkYXRhc291cmNlLmM6CisgICAgICAgIChub3RpZnlf bG9hZF9zdGF0dXNfbGlmZXRpbWVfY2IpOgorICAgICAgICAodGVzdF93ZWJraXRfd2ViX2RhdGFf c291cmNlX2xpZmV0aW1lKToKKyAgICAgICAgKG1haW4pOgorICAgICAgICAqIHdlYmtpdC93ZWJr aXRwcml2YXRlLmg6CisgICAgICAgICogd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwOgorICAgICAg ICAod2Via2l0X3dlYl92aWV3X2FkZF9tYWluX3Jlc291cmNlKToKKyAgICAgICAgKHdlYmtpdF93 ZWJfdmlld19hZGRfcmVzb3VyY2UpOgorICAgICAgICAod2Via2l0X3dlYl92aWV3X2NsZWFyX3Jl c291cmNlcyk6CisKKzIwMTAtMTItMDcgIEd1c3Rhdm8gTm9yb25oYSBTaWx2YSAgPGd1c3Rhdm8u bm9yb25oYUBjb2xsYWJvcmEuY28udWs+CisKICAgICAgICAgUmV2aWV3ZWQgYnkgWGFuIExvcGV6 LgogCiAgICAgICAgIFtHVEtdIHRlc3R3ZWJkYXRhc291cmNlIC0gdW5yZWFjaGFibGUgdGVzdCBp cyBicm9rZW4KZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2Fk ZXJDbGllbnRHdGsuY3BwIGIvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNs aWVudEd0ay5jcHAKaW5kZXggM2RiYmExMi4uMWRlMzdmNCAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0 ay9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEd0ay5jcHAKKysrIGIvV2ViS2l0L2d0 ay9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEd0ay5jcHAKQEAgLTMzMywxMSArMzMz LDE5IEBAIHZvaWQgRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoV2lsbFNlbmRSZXF1ZXN0KFdl YkNvcmU6OkRvY3VtZW50TG9hZGVyKiBsb2FkZXIsCiAgICAgcmVxdWVzdC51cGRhdGVGcm9tU291 cE1lc3NhZ2UobWVzc2FnZSk7CiB9CiAKLXZvaWQgRnJhbWVMb2FkZXJDbGllbnQ6OmFzc2lnbklk ZW50aWZpZXJUb0luaXRpYWxSZXF1ZXN0KHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgV2ViQ29y ZTo6RG9jdW1lbnRMb2FkZXIqLCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QpCit2b2lk IEZyYW1lTG9hZGVyQ2xpZW50Ojphc3NpZ25JZGVudGlmaWVyVG9Jbml0aWFsUmVxdWVzdCh1bnNp Z25lZCBsb25nIGlkZW50aWZpZXIsIFdlYkNvcmU6OkRvY3VtZW50TG9hZGVyKiBsb2FkZXIsIGNv bnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCkKIHsKICAgICBHT3duUHRyPGdjaGFyPiBpZGVu dGlmaWVyU3RyaW5nKHRvU3RyaW5nKGlkZW50aWZpZXIpKTsKLSAgICB3ZWJraXRfd2ViX3ZpZXdf YWRkX3Jlc291cmNlKGdldFZpZXdGcm9tRnJhbWUobV9mcmFtZSksIGlkZW50aWZpZXJTdHJpbmcu Z2V0KCksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBXRUJLSVRfV0VCX1JFU09V UkNFKGdfb2JqZWN0X25ldyhXRUJLSVRfVFlQRV9XRUJfUkVTT1VSQ0UsICJ1cmkiLCByZXF1ZXN0 LnVybCgpLnN0cmluZygpLnV0ZjgoKS5kYXRhKCksIDApKSk7CisKKyAgICBXZWJLaXRXZWJSZXNv dXJjZSogd2ViUmVzb3VyY2UgPSBXRUJLSVRfV0VCX1JFU09VUkNFKGdfb2JqZWN0X25ldyhXRUJL SVRfVFlQRV9XRUJfUkVTT1VSQ0UsICJ1cmkiLCByZXF1ZXN0LnVybCgpLnN0cmluZygpLnV0Zjgo KS5kYXRhKCksIDApKTsKKworICAgIGlmIChsb2FkZXIgPT0gbG9hZGVyLT5mcmFtZUxvYWRlcigp LT5wcm92aXNpb25hbERvY3VtZW50TG9hZGVyKCkKKyAgICAgICAgJiYgbG9hZGVyLT5mcmFtZUxv YWRlcigpLT5pc0xvYWRpbmdNYWluRnJhbWUoKSkgeworICAgICAgICB3ZWJraXRfd2ViX3ZpZXdf YWRkX21haW5fcmVzb3VyY2UoZ2V0Vmlld0Zyb21GcmFtZShtX2ZyYW1lKSwgaWRlbnRpZmllclN0 cmluZy5nZXQoKSwgd2ViUmVzb3VyY2UpOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAg d2Via2l0X3dlYl92aWV3X2FkZF9yZXNvdXJjZShnZXRWaWV3RnJvbUZyYW1lKG1fZnJhbWUpLCBp ZGVudGlmaWVyU3RyaW5nLmdldCgpLCB3ZWJSZXNvdXJjZSk7CiB9CiAKIHZvaWQgRnJhbWVMb2Fk ZXJDbGllbnQ6OnBvc3RQcm9ncmVzc1N0YXJ0ZWROb3RpZmljYXRpb24oKQpAQCAtMTAyOSwxNyAr MTAzNywxNyBAQCB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50OjpmaW5pc2hlZExvYWRpbmcoV2ViQ29y ZTo6RG9jdW1lbnRMb2FkZXIqIGRvY3VtZW50TG9hZGVyKQogCiB2b2lkIEZyYW1lTG9hZGVyQ2xp ZW50Ojpwcm92aXNpb25hbExvYWRTdGFydGVkKCkKIHsKLSAgICBXZWJLaXRXZWJWaWV3KiB3ZWJW aWV3ID0gZ2V0Vmlld0Zyb21GcmFtZShtX2ZyYW1lKTsKLQotICAgIGlmIChtX2ZyYW1lID09IHdl YmtpdF93ZWJfdmlld19nZXRfbWFpbl9mcmFtZSh3ZWJWaWV3KSkKLSAgICAgICAgd2Via2l0X3dl Yl92aWV3X2NsZWFyX3Jlc291cmNlcyh3ZWJWaWV3KTsKKyAgICBub3RJbXBsZW1lbnRlZCgpOwog fQogCiB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50OjpkaWRGaW5pc2hMb2FkKCkgewogICAgIG5vdElt cGxlbWVudGVkKCk7CiB9CiAKLXZvaWQgRnJhbWVMb2FkZXJDbGllbnQ6OnByZXBhcmVGb3JEYXRh U291cmNlUmVwbGFjZW1lbnQoKSB7IG5vdEltcGxlbWVudGVkKCk7IH0KK3ZvaWQgRnJhbWVMb2Fk ZXJDbGllbnQ6OnByZXBhcmVGb3JEYXRhU291cmNlUmVwbGFjZW1lbnQoKSAKK3sKKyAgICBub3RJ bXBsZW1lbnRlZCgpOworfQogCiB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50OjpzZXRUaXRsZShjb25z dCBTdHJpbmcmIHRpdGxlLCBjb25zdCBLVVJMJiB1cmwpCiB7CkBAIC0xMjc5LDYgKzEyODcsOCBA QCB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50OjpzYXZlUGxhdGZvcm1EYXRhVG9DYWNoZWRGcmFtZShD YWNoZWRGcmFtZSogY2FjaGVkRnJhbWUpCiBzdGF0aWMgdm9pZCBwb3N0Q29tbWl0RnJhbWVWaWV3 U2V0dXAoV2ViS2l0V2ViRnJhbWUgKmZyYW1lLCBGcmFtZVZpZXcgKnZpZXcsIGJvb2wgcmVzZXRW YWx1ZXMpCiB7CiAgICAgV2ViS2l0V2ViVmlldyogY29udGFpbmluZ1dpbmRvdyA9IGdldFZpZXdG cm9tRnJhbWUoZnJhbWUpOworICAgIHdlYmtpdF93ZWJfdmlld19jbGVhcl9yZXNvdXJjZXMoY29u dGFpbmluZ1dpbmRvdyk7CisKICAgICBXZWJLaXRXZWJWaWV3UHJpdmF0ZSogcHJpdiA9IFdFQktJ VF9XRUJfVklFV19HRVRfUFJJVkFURShjb250YWluaW5nV2luZG93KTsKICAgICB2aWV3LT5zZXRH dGtBZGp1c3RtZW50cyhwcml2LT5ob3Jpem9udGFsQWRqdXN0bWVudC5nZXQoKSwgcHJpdi0+dmVy dGljYWxBZGp1c3RtZW50LmdldCgpLCByZXNldFZhbHVlcyk7CiAKZGlmZiAtLWdpdCBhL1dlYktp dC9ndGsvdGVzdHMvdGVzdHdlYmRhdGFzb3VyY2UuYyBiL1dlYktpdC9ndGsvdGVzdHMvdGVzdHdl YmRhdGFzb3VyY2UuYwppbmRleCA0Nzk4ODEwLi42MzhmZjEwIDEwMDY0NAotLS0gYS9XZWJLaXQv Z3RrL3Rlc3RzL3Rlc3R3ZWJkYXRhc291cmNlLmMKKysrIGIvV2ViS2l0L2d0ay90ZXN0cy90ZXN0 d2ViZGF0YXNvdXJjZS5jCkBAIC0xMzksNiArMTM5LDY0IEBAIHN0YXRpYyB2b2lkIHRlc3Rfd2Vi a2l0X3dlYl9kYXRhX3NvdXJjZSgpCiAgICAgZ19vYmplY3RfdW5yZWYodmlldyk7CiB9CiAKK3N0 YXRpYyB2b2lkIG5vdGlmeV9sb2FkX3N0YXR1c19saWZldGltZV9jYihXZWJLaXRXZWJWaWV3KiB2 aWV3LCBHUGFyYW1TcGVjKiBwc3BlYywgR01haW5Mb29wKiBsb29wKQoreworICAgIFdlYktpdExv YWRTdGF0dXMgc3RhdHVzID0gd2Via2l0X3dlYl92aWV3X2dldF9sb2FkX3N0YXR1cyAodmlldyk7 CisgICAgV2ViS2l0V2ViRnJhbWUqIGZyYW1lID0gd2Via2l0X3dlYl92aWV3X2dldF9tYWluX2Zy YW1lKHZpZXcpOworICAgIFdlYktpdFdlYkRhdGFTb3VyY2UqIGRhdGFTb3VyY2UgPSB3ZWJraXRf d2ViX2ZyYW1lX2dldF9kYXRhX3NvdXJjZShmcmFtZSk7CisKKyAgICBpZiAoc3RhdHVzID09IFdF QktJVF9MT0FEX0NPTU1JVFRFRCkgeworICAgICAgICBnX2Fzc2VydCh3ZWJraXRfd2ViX2RhdGFf c291cmNlX2lzX2xvYWRpbmcoZGF0YVNvdXJjZSkpOworICAgICAgICByZXR1cm47CisgICAgfSBl bHNlIGlmIChzdGF0dXMgIT0gV0VCS0lUX0xPQURfRklOSVNIRUQpCisgICAgICAgIHJldHVybjsK KworICAgIGdfbWFpbl9sb29wX3F1aXQobG9vcCk7Cit9CisKK3N0YXRpYyB2b2lkIHRlc3Rfd2Vi a2l0X3dlYl9kYXRhX3NvdXJjZV9saWZldGltZSgpCit7CisgICAgV2ViS2l0V2ViVmlldyogdmll dzsKKyAgICBHTWFpbkxvb3AqIGxvb3A7CisKKyAgICB2aWV3ID0gV0VCS0lUX1dFQl9WSUVXKHdl YmtpdF93ZWJfdmlld19uZXcoKSk7CisgICAgZ19vYmplY3RfcmVmX3Npbmsodmlldyk7CisgICAg bG9vcCA9IGdfbWFpbl9sb29wX25ldyhOVUxMLCBUUlVFKTsKKyAgICBnX3NpZ25hbF9jb25uZWN0 KHZpZXcsICJub3RpZnk6OmxvYWQtc3RhdHVzIiwgR19DQUxMQkFDSyhub3RpZnlfbG9hZF9zdGF0 dXNfbGlmZXRpbWVfY2IpLCBsb29wKTsKKyAgICB3ZWJraXRfd2ViX3ZpZXdfbG9hZF91cmkodmll dywgImh0dHA6Ly93ZWJraXQub3JnIik7CisKKyAgICB3YWl0VGltZXIgPSBnX3RpbWVvdXRfYWRk X3NlY29uZHMoZGVmYXVsdFRpbWVvdXQsIChHU291cmNlRnVuYyl3YWl0X3RpbWVyX2ZpcmVkLCBs b29wKTsKKworICAgIGdfbWFpbl9sb29wX3J1bihsb29wKTsKKworICAgIFdlYktpdFdlYkRhdGFT b3VyY2UqIGRhdGFTb3VyY2UgPSB3ZWJraXRfd2ViX2ZyYW1lX2dldF9kYXRhX3NvdXJjZSh3ZWJr aXRfd2ViX3ZpZXdfZ2V0X21haW5fZnJhbWUodmlldykpOworICAgIEdMaXN0KiBzdWJSZXNvdXJj ZXMgPSB3ZWJraXRfd2ViX2RhdGFfc291cmNlX2dldF9zdWJyZXNvdXJjZXMoZGF0YVNvdXJjZSk7 CisgICAgZ2ludCBudW1iZXJPZlJlc291cmNlcyA9IGdfbGlzdF9sZW5ndGgoc3ViUmVzb3VyY2Vz KTsKKyAgICBnX2xpc3RfZnJlZShzdWJSZXNvdXJjZXMpOworCisgICAgZ19hc3NlcnRfY21waW50 KHdlYmtpdF93ZWJfdmlld19nZXRfbG9hZF9zdGF0dXModmlldyksID09LCBXRUJLSVRfTE9BRF9G SU5JU0hFRCk7CisKKyAgICB3ZWJraXRfd2ViX3ZpZXdfbG9hZF91cmkodmlldywgImh0dHA6Ly9n bm9tZS5vcmciKTsKKworICAgIGdfYXNzZXJ0X2NtcGludCh3ZWJraXRfd2ViX3ZpZXdfZ2V0X2xv YWRfc3RhdHVzKHZpZXcpLCA9PSwgV0VCS0lUX0xPQURfUFJPVklTSU9OQUwpOworCisgICAgd2Vi a2l0X3dlYl92aWV3X3N0b3BfbG9hZGluZyh2aWV3KTsKKworICAgIGdfYXNzZXJ0X2NtcGludCh3 ZWJraXRfd2ViX3ZpZXdfZ2V0X2xvYWRfc3RhdHVzKHZpZXcpLCA9PSwgV0VCS0lUX0xPQURfRkFJ TEVEKTsKKworICAgIHN1YlJlc291cmNlcyA9IHdlYmtpdF93ZWJfZGF0YV9zb3VyY2VfZ2V0X3N1 YnJlc291cmNlcyhkYXRhU291cmNlKTsKKyAgICBnX2Fzc2VydF9jbXBpbnQobnVtYmVyT2ZSZXNv dXJjZXMsID09LCBnX2xpc3RfbGVuZ3RoKHN1YlJlc291cmNlcykpOworICAgIGdfbGlzdF9mcmVl KHN1YlJlc291cmNlcyk7CisKKyAgICBpZiAod2FpdFRpbWVyKQorICAgICAgICBnX3NvdXJjZV9y ZW1vdmUod2FpdFRpbWVyKTsKKworICAgIHdhaXRUaW1lciA9IDA7CisKKyAgICBnX21haW5fbG9v cF91bnJlZihsb29wKTsKKyAgICBnX29iamVjdF91bnJlZih2aWV3KTsKK30KKwogc3RhdGljIHZv aWQgdGVzdF93ZWJraXRfd2ViX2RhdGFfc291cmNlX3VucmVhY2hhYmxlX3VyaSgpCiB7CiAgICAg LyogRklYTUU6IHRoaXMgdGVzdCBmYWlscyBjdXJyZW50bHkuICovCkBAIC0xNzksNiArMjM3LDkg QEAgaW50IG1haW4oaW50IGFyZ2MsIGNoYXIqKiBhcmd2KQogICAgICAgICAgICAgICAgICAgICB0 ZXN0X3dlYmtpdF93ZWJfZGF0YV9zb3VyY2UpOwogICAgIGdfdGVzdF9hZGRfZnVuYygiL3dlYmtp dC93ZWJkYXRhc291cmNlL3VucmVhY2hhYmxlX3VyaSIsCiAgICAgICAgICAgICAgICAgICAgIHRl c3Rfd2Via2l0X3dlYl9kYXRhX3NvdXJjZV91bnJlYWNoYWJsZV91cmkpOworICAgIGdfdGVzdF9h ZGRfZnVuYygiL3dlYmtpdC93ZWJkYXRhc291cmNlL2xpZmV0aW1lIiwKKyAgICAgICAgICAgICAg ICAgICAgdGVzdF93ZWJraXRfd2ViX2RhdGFfc291cmNlX2xpZmV0aW1lKTsKKwogICAgIHJldHVy biBnX3Rlc3RfcnVuICgpOwogfQogCmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJr aXRwcml2YXRlLmggYi9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRwcml2YXRlLmgKaW5kZXggMGI1 OTc0Ni4uMGY4ZDcwMCAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0cHJpdmF0 ZS5oCisrKyBiL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHByaXZhdGUuaApAQCAtMjgxLDYgKzI4 MSw5IEBAIGV4dGVybiAiQyIgewogICAgIHdlYmtpdF93ZWJfdmlld19hZGRfcmVzb3VyY2UoV2Vi S2l0V2ViVmlldyosIGNvbnN0IGNoYXIqLCBXZWJLaXRXZWJSZXNvdXJjZSopOwogCiAgICAgdm9p ZAorICAgIHdlYmtpdF93ZWJfdmlld19hZGRfbWFpbl9yZXNvdXJjZShXZWJLaXRXZWJWaWV3Kiwg Y29uc3QgY2hhciosIFdlYktpdFdlYlJlc291cmNlKik7CisKKyAgICB2b2lkCiAgICAgd2Via2l0 X3dlYl92aWV3X3JlbW92ZV9yZXNvdXJjZShXZWJLaXRXZWJWaWV3KiwgY29uc3QgY2hhciopOwog CiAgICAgV2ViS2l0V2ViUmVzb3VyY2UqCmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL3dlYmtpdC93 ZWJraXR3ZWJ2aWV3LmNwcCBiL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwCmlu ZGV4IDU1OTkwNmEuLjkzYTMxODggMTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtp dHdlYnZpZXcuY3BwCisrKyBiL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwCkBA IC00NzU2LDE2ICs0NzU2LDE3IEBAIGdib29sZWFuIHdlYmtpdF93ZWJfdmlld19nZXRfdmlld19z b3VyY2VfbW9kZSAoV2ViS2l0V2ViVmlldyogd2ViVmlldykKIH0KIAogLy8gSW50ZXJuYWwgc3Vi cmVzb3VyY2UgbWFuYWdlbWVudAotdm9pZCB3ZWJraXRfd2ViX3ZpZXdfYWRkX3Jlc291cmNlKFdl YktpdFdlYlZpZXcqIHdlYlZpZXcsIGNvbnN0IGNoYXIqIGlkZW50aWZpZXIsIFdlYktpdFdlYlJl c291cmNlKiB3ZWJSZXNvdXJjZSkKK3ZvaWQgd2Via2l0X3dlYl92aWV3X2FkZF9tYWluX3Jlc291 cmNlKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcsIGNvbnN0IGNoYXIqIGlkZW50aWZpZXIsIFdlYktp dFdlYlJlc291cmNlKiB3ZWJSZXNvdXJjZSkKIHsKICAgICBXZWJLaXRXZWJWaWV3UHJpdmF0ZSog cHJpdiA9IHdlYlZpZXctPnByaXY7CiAKLSAgICBpZiAoIXByaXYtPm1haW5SZXNvdXJjZSkgewot ICAgICAgICBwcml2LT5tYWluUmVzb3VyY2UgPSBhZG9wdFBsYXRmb3JtUmVmKHdlYlJlc291cmNl KTsKLSAgICAgICAgcHJpdi0+bWFpblJlc291cmNlSWRlbnRpZmllciA9IGlkZW50aWZpZXI7Ci0g ICAgICAgIHJldHVybjsKLSAgICB9CisgICAgcHJpdi0+bWFpblJlc291cmNlID0gYWRvcHRQbGF0 Zm9ybVJlZih3ZWJSZXNvdXJjZSk7CisgICAgcHJpdi0+bWFpblJlc291cmNlSWRlbnRpZmllciA9 IGlkZW50aWZpZXI7Cit9CiAKK3ZvaWQgd2Via2l0X3dlYl92aWV3X2FkZF9yZXNvdXJjZShXZWJL aXRXZWJWaWV3KiB3ZWJWaWV3LCBjb25zdCBjaGFyKiBpZGVudGlmaWVyLCBXZWJLaXRXZWJSZXNv dXJjZSogd2ViUmVzb3VyY2UpCit7CisgICAgV2ViS2l0V2ViVmlld1ByaXZhdGUqIHByaXYgPSB3 ZWJWaWV3LT5wcml2OwogICAgIGdfaGFzaF90YWJsZV9pbnNlcnQocHJpdi0+c3ViUmVzb3VyY2Vz LmdldCgpLCBnX3N0cmR1cChpZGVudGlmaWVyKSwgd2ViUmVzb3VyY2UpOwogfQogCkBAIC00ODA2 LDggKzQ4MDcsNiBAQCBXZWJLaXRXZWJSZXNvdXJjZSogd2Via2l0X3dlYl92aWV3X2dldF9tYWlu X3Jlc291cmNlKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpCiB2b2lkIHdlYmtpdF93ZWJfdmlld19j bGVhcl9yZXNvdXJjZXMoV2ViS2l0V2ViVmlldyogd2ViVmlldykKIHsKICAgICBXZWJLaXRXZWJW aWV3UHJpdmF0ZSogcHJpdiA9IHdlYlZpZXctPnByaXY7Ci0gICAgcHJpdi0+bWFpblJlc291cmNl SWRlbnRpZmllciA9ICIiOwotICAgIHByaXYtPm1haW5SZXNvdXJjZSA9IDA7CiAKICAgICBpZiAo cHJpdi0+c3ViUmVzb3VyY2VzKQogICAgICAgICBnX2hhc2hfdGFibGVfcmVtb3ZlX2FsbChwcml2 LT5zdWJSZXNvdXJjZXMuZ2V0KCkpOwotLSAKMS43LjIuMwoK