54036 2011-02-08 14:43:33 -0800 didChangeBackForwardList should include some context about what changed 2011-02-08 15:10:24 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 beidson beidson oldest_to_newest 347701 0 beidson 2011-02-08 14:43:33 -0800 In the WKPage loader client, didChangeBackForwardList should include some context about what changed. In radar as <rdar://problem/8972913> 347706 1 81696 beidson 2011-02-08 14:47:48 -0800 Created attachment 81696 Patch v1 347712 2 81696 darin 2011-02-08 14:53:25 -0800 Comment on attachment 81696 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=81696&action=review > Source/WebKit2/UIProcess/WebBackForwardList.cpp:67 > + Vector<RefPtr<APIObject> > removed; I think removedItems would be a better name. > Source/WebKit2/UIProcess/WebLoaderClient.cpp:214 > -void WebLoaderClient::didChangeBackForwardList(WebPageProxy* page) > +void WebLoaderClient::didChangeBackForwardList(WebPageProxy* page, WebBackForwardListItem* addedItem, Vector<RefPtr<APIObject> >* removedItems) const Vector* would be better. Why APIObject in the vector instead of WebBackForwardListItem? Is that to make it work with ImmutableArray? Why RefPtr in the vector but not for addedItem? Could there be a race where addedItem needs to be ref'd too? > Source/WebKit2/UIProcess/WebLoaderClient.cpp:219 > + RefPtr<ImmutableArray> removed; removedItemsArray is probably a better name than "removed". 347723 3 beidson 2011-02-08 15:02:18 -0800 (In reply to comment #2) > (From update of attachment 81696 [details]) > > > Source/WebKit2/UIProcess/WebLoaderClient.cpp:214 > > -void WebLoaderClient::didChangeBackForwardList(WebPageProxy* page) > > +void WebLoaderClient::didChangeBackForwardList(WebPageProxy* page, WebBackForwardListItem* addedItem, Vector<RefPtr<APIObject> >* removedItems) > > const Vector* would be better. Can't, because ImmutableArray::adopt() actually inherits the vector buffer. > Why APIObject in the vector instead of WebBackForwardListItem? Is that to make it work with ImmutableArray? Yes - ImmutableArray is for WK* API vending, and it only knows how to adopt generic Vector<RefPtr<APIObject> >s. > Why RefPtr in the vector but not for addedItem? RefPtr<> in the Vector because that's what ImmutableArray works with. > Could there be a race where addedItem needs to be ref'd too? Nope, it's solidly reff'ed in the WebBackForwardList itself when this client call is made. Thanks! 347731 4 beidson 2011-02-08 15:10:24 -0800 r77978 81696 2011-02-08 14:47:48 -0800 2011-02-08 14:53:25 -0800 Patch v1 patch.txt text/plain 9879 beidson SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDc3OTczKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTEtMDItMDggIEJyYWR5IEVp ZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84OTcyOTEzPiBhbmQgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU0MDM2CisgICAgICAgIGRpZENoYW5nZUJh Y2tGb3J3YXJkTGlzdCBzaG91bGQgaW5jbHVkZSBzb21lIGNvbnRleHQgYWJvdXQgd2hhdCBjaGFu Z2VkCisKKyAgICAgICAgVXBkYXRlIHRoZSBpbXBsZW1lbnRhdGlvbiBvZiB0aGlzIEFQSSB0byBp bmNsdWRlIHRoZSBuZXcgaXRlbSAoaWYgYW55KSBhbmQgcmVtb3ZlZCBpdGVtcyAoaWYgYW55KToK KyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmg6CisgICAgICAgICogVUlQcm9jZXNz L1dlYkxvYWRlckNsaWVudC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkxvYWRlckNsaWVudDo6 ZGlkQ2hhbmdlQmFja0ZvcndhcmRMaXN0KToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViTG9hZGVy Q2xpZW50Lmg6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAg IChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZGlkQ2hhbmdlQmFja0ZvcndhcmRMaXN0KToKKyAgICAg ICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6CisKKyAgICAgICAgSGF2ZSBXZWJCYWNrRm9y d2FyZExpc3QgcGFzcyB0aGUgbmV3IGl0ZW1zIGFuZC9vciByZW1vdmVkIGl0ZW1zIHdoZW4gY2Fs bGluZyB0aGUgbm90aWZpZXI6CisgICAgICAgICogVUlQcm9jZXNzL1dlYkJhY2tGb3J3YXJkTGlz dC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkJhY2tGb3J3YXJkTGlzdDo6YWRkSXRlbSk6Cisg ICAgICAgIChXZWJLaXQ6OldlYkJhY2tGb3J3YXJkTGlzdDo6Z29Ub0l0ZW0pOgorICAgICAgICAo V2ViS2l0OjpXZWJCYWNrRm9yd2FyZExpc3Q6OmNsZWFyKToKKwogMjAxMS0wMi0wOCAgQW5kZXJz IENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNh bSBXZWluaWcuCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQmFja0ZvcndhcmRM aXN0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQmFja0Zv cndhcmRMaXN0LmNwcAkocmV2aXNpb24gNzc5NjQpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViQmFja0ZvcndhcmRMaXN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjQsMTIgKzY0LDE2 IEBAIHZvaWQgV2ViQmFja0ZvcndhcmRMaXN0OjphZGRJdGVtKFdlYkJhY2sKICAgICBpZiAobV9j YXBhY2l0eSA9PSAwIHx8ICFtX2VuYWJsZWQpCiAgICAgICAgIHJldHVybjsKIAorICAgIFZlY3Rv cjxSZWZQdHI8QVBJT2JqZWN0PiA+IHJlbW92ZWQ7CisgICAgCiAgICAgLy8gVG9zcyBhbnl0aGlu ZyBpbiB0aGUgZm9yd2FyZCBsaXN0ICAgIAogICAgIGlmIChtX2N1cnJlbnQgIT0gTm9DdXJyZW50 SXRlbUluZGV4KSB7CiAgICAgICAgIHVuc2lnbmVkIHRhcmdldFNpemUgPSBtX2N1cnJlbnQgKyAx OworICAgICAgICByZW1vdmVkLnJlc2VydmVDYXBhY2l0eShtX2VudHJpZXMuc2l6ZSgpIC0gdGFy Z2V0U2l6ZSk7CiAgICAgICAgIHdoaWxlIChtX2VudHJpZXMuc2l6ZSgpID4gdGFyZ2V0U2l6ZSkg ewogICAgICAgICAgICAgaWYgKG1fcGFnZSkKICAgICAgICAgICAgICAgICBtX3BhZ2UtPmJhY2tG b3J3YXJkUmVtb3ZlZEl0ZW0obV9lbnRyaWVzLmxhc3QoKS0+aXRlbUlEKCkpOworICAgICAgICAg ICAgcmVtb3ZlZC5hcHBlbmQobV9lbnRyaWVzLmxhc3QoKS5yZWxlYXNlKCkpOwogICAgICAgICAg ICAgbV9lbnRyaWVzLnJlbW92ZUxhc3QoKTsKICAgICAgICAgfQogICAgIH0KQEAgLTc5LDYgKzgz LDcgQEAgdm9pZCBXZWJCYWNrRm9yd2FyZExpc3Q6OmFkZEl0ZW0oV2ViQmFjawogICAgIGlmICht X2VudHJpZXMuc2l6ZSgpID09IG1fY2FwYWNpdHkgJiYgKG1fY3VycmVudCAhPSAwIHx8IG1fY2Fw YWNpdHkgPT0gMSkpIHsKICAgICAgICAgaWYgKG1fcGFnZSkKICAgICAgICAgICAgIG1fcGFnZS0+ YmFja0ZvcndhcmRSZW1vdmVkSXRlbShtX2VudHJpZXNbMF0tPml0ZW1JRCgpKTsKKyAgICAgICAg cmVtb3ZlZC5hcHBlbmQobV9lbnRyaWVzWzBdLnJlbGVhc2UoKSk7CiAgICAgICAgIG1fZW50cmll cy5yZW1vdmUoMCk7CiAgICAgICAgIG1fY3VycmVudC0tOwogICAgIH0KQEAgLTg3LDcgKzkyLDcg QEAgdm9pZCBXZWJCYWNrRm9yd2FyZExpc3Q6OmFkZEl0ZW0oV2ViQmFjawogICAgIG1fY3VycmVu dCsrOwogCiAgICAgaWYgKG1fcGFnZSkKLSAgICAgICAgbV9wYWdlLT5kaWRDaGFuZ2VCYWNrRm9y d2FyZExpc3QoKTsKKyAgICAgICAgbV9wYWdlLT5kaWRDaGFuZ2VCYWNrRm9yd2FyZExpc3QobmV3 SXRlbSwgJnJlbW92ZWQpOwogCiAgICAgQVNTRVJUKG1fY3VycmVudCA9PSBOb0N1cnJlbnRJdGVt SW5kZXggfHwgbV9jdXJyZW50IDwgbV9lbnRyaWVzLnNpemUoKSk7CiB9CkBAIC0xMDcsNyArMTEy LDcgQEAgdm9pZCBXZWJCYWNrRm9yd2FyZExpc3Q6OmdvVG9JdGVtKFdlYkJhYwogICAgIGlmIChp bmRleCA8IG1fZW50cmllcy5zaXplKCkpIHsKICAgICAgICAgbV9jdXJyZW50ID0gaW5kZXg7CiAg ICAgICAgIGlmIChtX3BhZ2UpCi0gICAgICAgICAgICBtX3BhZ2UtPmRpZENoYW5nZUJhY2tGb3J3 YXJkTGlzdCgpOworICAgICAgICAgICAgbV9wYWdlLT5kaWRDaGFuZ2VCYWNrRm9yd2FyZExpc3Qo MCwgMCk7CiAgICAgfQogfQogCkBAIC0yMjEsMTMgKzIyNiwyMCBAQCB2b2lkIFdlYkJhY2tGb3J3 YXJkTGlzdDo6Y2xlYXIoKQogICAgICAgICB9CiAgICAgfQogCisgICAgVmVjdG9yPFJlZlB0cjxB UElPYmplY3Q+ID4gcmVtb3ZlZDsKKyAgICByZW1vdmVkLnJlc2VydmVDYXBhY2l0eShtX2VudHJp ZXMuc2l6ZSgpIC0gMSk7CisgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBtX2VudHJpZXMuc2l6 ZSgpOyArK2kpIHsKKyAgICAgICAgaWYgKGkgIT0gbV9jdXJyZW50KQorICAgICAgICAgICAgcmVt b3ZlZC5hcHBlbmQobV9lbnRyaWVzW2ldLnJlbGVhc2UoKSk7CisgICAgfQorICAgIAogICAgIG1f ZW50cmllcy5zaHJpbmsoMSk7CiAgICAgbV9lbnRyaWVzWzBdID0gY3VycmVudEl0ZW0ucmVsZWFz ZSgpOwogCiAgICAgbV9jdXJyZW50ID0gMDsKIAogICAgIGlmIChtX3BhZ2UpCi0gICAgICAgIG1f cGFnZS0+ZGlkQ2hhbmdlQmFja0ZvcndhcmRMaXN0KCk7CisgICAgICAgIG1fcGFnZS0+ZGlkQ2hh bmdlQmFja0ZvcndhcmRMaXN0KDAsICZyZW1vdmVkKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2Vi S2l0CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViTG9hZGVyQ2xpZW50LmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViTG9hZGVyQ2xpZW50LmNw cAkocmV2aXNpb24gNzc5NjQpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViTG9hZGVy Q2xpZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjYsNiArMjYsOCBAQAogI2luY2x1ZGUgImNv bmZpZy5oIgogI2luY2x1ZGUgIldlYkxvYWRlckNsaWVudC5oIgogCisjaW5jbHVkZSAiSW1tdXRh YmxlQXJyYXkuaCIKKyNpbmNsdWRlICJXZWJCYWNrRm9yd2FyZExpc3RJdGVtLmgiCiAjaW5jbHVk ZSAiV0tBUElDYXN0LmgiCiAjaW5jbHVkZSA8c3RyaW5nLmg+CiAKQEAgLTIwOSwxMiArMjExLDE2 IEBAIHZvaWQgV2ViTG9hZGVyQ2xpZW50Ojpwcm9jZXNzRGlkQ3Jhc2goV2UKICAgICBtX2NsaWVu dC5wcm9jZXNzRGlkQ3Jhc2godG9BUEkocGFnZSksIG1fY2xpZW50LmNsaWVudEluZm8pOwogfQog Ci12b2lkIFdlYkxvYWRlckNsaWVudDo6ZGlkQ2hhbmdlQmFja0ZvcndhcmRMaXN0KFdlYlBhZ2VQ cm94eSogcGFnZSkKK3ZvaWQgV2ViTG9hZGVyQ2xpZW50OjpkaWRDaGFuZ2VCYWNrRm9yd2FyZExp c3QoV2ViUGFnZVByb3h5KiBwYWdlLCBXZWJCYWNrRm9yd2FyZExpc3RJdGVtKiBhZGRlZEl0ZW0s IFZlY3RvcjxSZWZQdHI8QVBJT2JqZWN0PiA+KiByZW1vdmVkSXRlbXMpCiB7CiAgICAgaWYgKCFt X2NsaWVudC5kaWRDaGFuZ2VCYWNrRm9yd2FyZExpc3QpCiAgICAgICAgIHJldHVybjsKIAotICAg IG1fY2xpZW50LmRpZENoYW5nZUJhY2tGb3J3YXJkTGlzdCh0b0FQSShwYWdlKSwgbV9jbGllbnQu Y2xpZW50SW5mbyk7CisgICAgUmVmUHRyPEltbXV0YWJsZUFycmF5PiByZW1vdmVkOworICAgIGlm IChyZW1vdmVkSXRlbXMgJiYgIXJlbW92ZWRJdGVtcy0+aXNFbXB0eSgpKQorICAgICAgICByZW1v dmVkID0gSW1tdXRhYmxlQXJyYXk6OmFkb3B0KCpyZW1vdmVkSXRlbXMpOworCisgICAgbV9jbGll bnQuZGlkQ2hhbmdlQmFja0ZvcndhcmRMaXN0KHRvQVBJKHBhZ2UpLCB0b0FQSShhZGRlZEl0ZW0p LCB0b0FQSShyZW1vdmVkLmdldCgpKSwgbV9jbGllbnQuY2xpZW50SW5mbyk7CiB9CiAKIH0gLy8g bmFtZXNwYWNlIFdlYktpdApJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkxvYWRl ckNsaWVudC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJMb2Fk ZXJDbGllbnQuaAkocmV2aXNpb24gNzc5NjQpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViTG9hZGVyQ2xpZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTMwLDYgKzMwLDggQEAKICNpbmNs dWRlICJTYW1lRG9jdW1lbnROYXZpZ2F0aW9uVHlwZS5oIgogI2luY2x1ZGUgIldLUGFnZS5oIgog I2luY2x1ZGUgPHd0Zi9Gb3J3YXJkLmg+CisjaW5jbHVkZSA8d3RmL1JlZlB0ci5oPgorI2luY2x1 ZGUgPHd0Zi9WZWN0b3IuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewogY2xhc3MgUmVzb3VyY2VF cnJvcjsKQEAgLTQwLDYgKzQyLDcgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiBjbGFzcyBBUElPYmpl Y3Q7CiBjbGFzcyBBdXRoZW50aWNhdGlvbkNoYWxsZW5nZVByb3h5OwogY2xhc3MgQXV0aGVudGlj YXRpb25EZWNpc2lvbkxpc3RlbmVyOworY2xhc3MgV2ViQmFja0ZvcndhcmRMaXN0SXRlbTsKIGNs YXNzIFdlYkZyYW1lUHJveHk7CiBjbGFzcyBXZWJQYWdlUHJveHk7CiBjbGFzcyBXZWJQcm90ZWN0 aW9uU3BhY2U7CkBAIC03Myw3ICs3Niw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHByb2Nlc3NEaWRC ZWNvbWVSZXNwb25zaXZlKFdlYlBhZ2VQcm94eSopOwogICAgIHZvaWQgcHJvY2Vzc0RpZENyYXNo KFdlYlBhZ2VQcm94eSopOwogCi0gICAgdm9pZCBkaWRDaGFuZ2VCYWNrRm9yd2FyZExpc3QoV2Vi UGFnZVByb3h5Kik7CisgICAgdm9pZCBkaWRDaGFuZ2VCYWNrRm9yd2FyZExpc3QoV2ViUGFnZVBy b3h5KiwgV2ViQmFja0ZvcndhcmRMaXN0SXRlbSogYWRkZWRJdGVtLCBWZWN0b3I8UmVmUHRyPEFQ SU9iamVjdD4gPiogcmVtb3ZlZEl0ZW1zKTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApJ bmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHJldmlzaW9u IDc3OTY0KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTQ1Myw5ICs0NTMsOSBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6Z29Ub0Jh Y2tGb3J3YXJkSXRlbShXCiAgICAgcHJvY2VzcygpLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpH b1RvQmFja0ZvcndhcmRJdGVtKGl0ZW0tPml0ZW1JRCgpKSwgbV9wYWdlSUQpOwogfQogCi12b2lk IFdlYlBhZ2VQcm94eTo6ZGlkQ2hhbmdlQmFja0ZvcndhcmRMaXN0KCkKK3ZvaWQgV2ViUGFnZVBy b3h5OjpkaWRDaGFuZ2VCYWNrRm9yd2FyZExpc3QoV2ViQmFja0ZvcndhcmRMaXN0SXRlbSogYWRk ZWQsIFZlY3RvcjxSZWZQdHI8QVBJT2JqZWN0PiA+KiByZW1vdmVkKQogewotICAgIG1fbG9hZGVy Q2xpZW50LmRpZENoYW5nZUJhY2tGb3J3YXJkTGlzdCh0aGlzKTsKKyAgICBtX2xvYWRlckNsaWVu dC5kaWRDaGFuZ2VCYWNrRm9yd2FyZExpc3QodGhpcywgYWRkZWQsIHJlbW92ZWQpOwogfQogCiAg ICAgCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCShyZXZpc2lv biA3Nzk2NCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAkod29y a2luZyBjb3B5KQpAQCAtMTYyLDcgKzE2Miw3IEBAIHB1YmxpYzoKICAgICBib29sIGNhbkdvQmFj aygpIGNvbnN0OwogCiAgICAgdm9pZCBnb1RvQmFja0ZvcndhcmRJdGVtKFdlYkJhY2tGb3J3YXJk TGlzdEl0ZW0qKTsKLSAgICB2b2lkIGRpZENoYW5nZUJhY2tGb3J3YXJkTGlzdCgpOworICAgIHZv aWQgZGlkQ2hhbmdlQmFja0ZvcndhcmRMaXN0KFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0qIGFkZGVk SXRlbSwgVmVjdG9yPFJlZlB0cjxBUElPYmplY3Q+ID4qIHJlbW92ZWRJdGVtcyk7CiAKICAgICBi b29sIGNhblNob3dNSU1FVHlwZShjb25zdCBTdHJpbmcmIG1pbWVUeXBlKSBjb25zdDsKIApJbmRl eDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuaAkocmV2aXNpb24gNzc5NjQp CisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmgJKHdvcmtpbmcgY29w eSkKQEAgLTYwLDYgKzYwLDcgQEAgdHlwZWRlZiB2b2lkICgqV0tQYWdlRGlkRGlzcGxheUluc2Vj dXJlQwogdHlwZWRlZiB2b2lkICgqV0tQYWdlRGlkUnVuSW5zZWN1cmVDb250ZW50Rm9yRnJhbWVD YWxsYmFjaykoV0tQYWdlUmVmIHBhZ2UsIFdLRnJhbWVSZWYgZnJhbWUsIFdLVHlwZVJlZiB1c2Vy RGF0YSwgY29uc3Qgdm9pZCAqY2xpZW50SW5mbyk7CiB0eXBlZGVmIGJvb2wgKCpXS1BhZ2VDYW5B dXRoZW50aWNhdGVBZ2FpbnN0UHJvdGVjdGlvblNwYWNlSW5GcmFtZUNhbGxiYWNrKShXS1BhZ2VS ZWYgcGFnZSwgV0tGcmFtZVJlZiBmcmFtZSwgV0tQcm90ZWN0aW9uU3BhY2VSZWYgcHJvdGVjdGlv blNwYWNlLCBjb25zdCB2b2lkICpjbGllbnRJbmZvKTsKIHR5cGVkZWYgdm9pZCAoKldLUGFnZURp ZFJlY2VpdmVBdXRoZW50aWNhdGlvbkNoYWxsZW5nZUluRnJhbWVDYWxsYmFjaykoV0tQYWdlUmVm IHBhZ2UsIFdLRnJhbWVSZWYgZnJhbWUsIFdLQXV0aGVudGljYXRpb25DaGFsbGVuZ2VSZWYgYXV0 aGVudGljYXRpb25DaGFsbGVuZ2UsIGNvbnN0IHZvaWQgKmNsaWVudEluZm8pOwordHlwZWRlZiB2 b2lkICgqV0tQYWdlRGlkQ2hhbmdlQmFja0ZvcndhcmRMaXN0Q2FsbGJhY2spKFdLUGFnZVJlZiBw YWdlLCBXS0JhY2tGb3J3YXJkTGlzdEl0ZW1SZWYgYWRkZWRJdGVtLCBXS0FycmF5UmVmIHJlbW92 ZWRJdGVtcywgY29uc3Qgdm9pZCAqY2xpZW50SW5mbyk7CiAKIHN0cnVjdCBXS1BhZ2VMb2FkZXJD bGllbnQgewogICAgIGludCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgdmVyc2lvbjsKQEAgLTkxLDcgKzkyLDcgQEAgc3RydWN0 IFdLUGFnZUxvYWRlckNsaWVudCB7CiAgICAgV0tQYWdlQ2FsbGJhY2sgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwcm9jZXNzRGlkQmVjb21lUmVz cG9uc2l2ZTsKICAgICBXS1BhZ2VDYWxsYmFjayAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHByb2Nlc3NEaWRDcmFzaDsKIAotICAgIFdLUGFnZUNh bGxiYWNrICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgZGlkQ2hhbmdlQmFja0ZvcndhcmRMaXN0OworICAgIFdLUGFnZURpZENoYW5nZUJhY2tGb3J3 YXJkTGlzdENhbGxiYWNrICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZGlkQ2hhbmdlQmFj a0ZvcndhcmRMaXN0OwogfTsKIHR5cGVkZWYgc3RydWN0IFdLUGFnZUxvYWRlckNsaWVudCBXS1Bh Z2VMb2FkZXJDbGllbnQ7CiAKSW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBU b29scy9DaGFuZ2VMb2cJKHJldmlzaW9uIDc3OTczKQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDItMDggIEJyYWR5IEVpZHNvbiAgPGJl aWRzb25AYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84OTcyOTEzPiBhbmQgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTU0MDM2CisgICAgICAgIGRpZENoYW5nZUJhY2tGb3J3YXJk TGlzdCBzaG91bGQgaW5jbHVkZSBzb21lIGNvbnRleHQgYWJvdXQgd2hhdCBjaGFuZ2VkCisKKyAg ICAgICAgKiBNaW5pQnJvd3Nlci9tYWMvQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIubToKKyAgICAg ICAgKGRpZENoYW5nZUJhY2tGb3J3YXJkTGlzdCk6CisKIDIwMTEtMDItMDggIE1hcnRpbiBSb2Jp bnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFhhbiBM b3Blei4KSW5kZXg6IFRvb2xzL01pbmlCcm93c2VyL21hYy9Ccm93c2VyV2luZG93Q29udHJvbGxl ci5tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFRvb2xzL01pbmlCcm93c2VyL21hYy9Ccm93c2VyV2luZG93Q29u dHJvbGxlci5tCShyZXZpc2lvbiA3Nzk2NCkKKysrIFRvb2xzL01pbmlCcm93c2VyL21hYy9Ccm93 c2VyV2luZG93Q29udHJvbGxlci5tCSh3b3JraW5nIGNvcHkpCkBAIC0zNTEsNyArMzUxLDcgQEAg c3RhdGljIHZvaWQgcHJvY2Vzc0RpZEV4aXQoV0tQYWdlUmVmIHBhZwogICAgIExPRyhAInByb2Nl c3NEaWRFeGl0Iik7CiB9CiAKLXN0YXRpYyB2b2lkIGRpZENoYW5nZUJhY2tGb3J3YXJkTGlzdChX S1BhZ2VSZWYgcGFnZSwgY29uc3Qgdm9pZCAqY2xpZW50SW5mbykKK3N0YXRpYyB2b2lkIGRpZENo YW5nZUJhY2tGb3J3YXJkTGlzdChXS1BhZ2VSZWYgcGFnZSwgV0tCYWNrRm9yd2FyZExpc3RJdGVt UmVmIGFkZGVkSXRlbSwgV0tBcnJheVJlZiByZW1vdmVkSXRlbXMsIGNvbnN0IHZvaWQgKmNsaWVu dEluZm8pCiB7CiAgICAgWyhCcm93c2VyV2luZG93Q29udHJvbGxlciAqKWNsaWVudEluZm8gdmFs aWRhdGVUb29sYmFyXTsKIH0K