22988 2008-12-24 22:03:40 -0800 [GTK] Need a public method to add a WebKitWebHistoryItem to WebKitWebBackForwardList. 2009-02-03 12:02:43 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Enhancement --- 0 poincare webkit-unassigned oldest_to_newest 103395 0 poincare 2008-12-24 22:03:40 -0800 Nee a public method to manipulate history item in back-forward list for restoring session or something. 103396 1 26245 poincare 2008-12-24 22:07:19 -0800 Created attachment 26245 Proposed patch Wrap WebCore::BackForwardList::addItem. 103419 2 zecke 2008-12-25 12:35:24 -0800 Technically it looks sane, I assume the null check is not necessary though. Could you explain why this method is needed? E.g. why do you need to inject items to the back forward list? What do you need to control? order...? What you currently can do is, is create a WebKitHistoryItem (this will be added to the history) and then you should be able to navigate to this item? Do you try to do something else? 103423 3 poincare 2008-12-25 14:59:09 -0800 (In reply to comment #2) > Could you explain why this method is needed? E.g. why do you need to inject > items to the back forward list? What do you need to control? order...? Example Restoring session 1) I read a web site. 2) And click a link on the web site, read it. 3) And go back the first page and I think that I read rest links on the page tomorrow. 4) Closing webkit. 5) Next day I can go on reading the rest links. The important thing is that I can confirm the last link I read by forwarding the back forward list on the next day. 103424 4 26248 poincare 2008-12-25 15:46:11 -0800 Created attachment 26248 Revised patch Remove NULL check. 103448 5 zecke 2008-12-26 06:51:14 -0800 (In reply to comment #4) > Created an attachment (id=26248) [review] > Revised patch > > Remove NULL check. Cool. I fear I still need an explanation why this is needed? Could you try to explain that? 104811 6 zecke 2009-01-07 16:40:06 -0800 (In reply to comment #5) > (In reply to comment #4) > > Created an attachment (id=26248) [review] [review] > > Revised patch > > > > Remove NULL check. > > Cool. I fear I still need an explanation why this is needed? Could you try to > explain that? Oops I missed the explanation. Looks like a good reason, I will take another look tomorrow. 105216 7 zecke 2009-01-11 08:07:29 -0800 Okay I think we want that. Could you come up with a test case (put it in WebKit/gtk/tests) defining the behavior of this new method? E.g. the impact on webkit_webview_can_go*, webkit_web_back_forward_list_get_current_item, webkit_web_back_forward_list_get_forward_item, webkit_web_back_forward_list_get_back_item? thanks 105427 8 26657 poincare 2009-01-12 18:17:20 -0800 Created attachment 26657 Added test code. 105540 9 26657 zecke 2009-01-13 11:56:46 -0800 Comment on attachment 26657 Added test code. You might not set r=+ yourself, this is the second time you do it. Please pay more attention to that. 105633 10 poincare 2009-01-13 19:04:39 -0800 (In reply to comment #9) > (From update of attachment 26657 [review]) > You might not set r=+ yourself, this is the second time you do it. Please pay > more attention to that. I am sorry for my carelessness. I will keep my eye wide open next time. 107954 11 26657 zecke 2009-02-02 05:48:58 -0800 Comment on attachment 26657 Added test code. The patch looks good. 108140 12 zecke 2009-02-03 12:02:43 -0800 Landed in r40540. 26245 2008-12-24 22:07:19 -0800 2008-12-25 15:46:11 -0800 Proposed patch webkit_web_back_forward_list_add_item.diff text/plain 2651 poincare SW5kZXg6IFdlYktpdC9ndGsvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9ndGsvQ2hh bmdlTG9nCShyZXZpc2lvbiAzOTQ3MSkKKysrIFdlYktpdC9ndGsvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMDgtMTItMjQgIEhpcm95dWtpIElrZXpvZSAgPHBv aW5jYXJlQGlrZXpvZS5uZXQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyOTg4 CisgICAgICAgIFtHVEtdIE5lZWQgYSBwdWJsaWMgbWV0aG9kIHRvIGFkZCBhIFdlYktpdFdlYkhp c3RvcnlJdGVtIHRvCisJV2ViS2l0V2ViQmFja0ZvcndhcmRMaXN0LgorCisgICAgICAgIFdyYXAg V2ViQ29yZTo6QmFja0ZvcndhcmRMaXN0OjphZGRJdGVtLgorCisgICAgICAgICogd2Via2l0L3dl YmtpdHdlYmJhY2tmb3J3YXJkbGlzdC5jcHA6CisgICAgICAgIChfV2ViS2l0V2ViQmFja0Zvcndh cmRMaXN0UHJpdmF0ZTo6d2Via2l0X3dlYl9iYWNrX2ZvcndhcmRfbGlzdF9hZGRfaXRlbSk6Cisg ICAgICAgICogd2Via2l0L3dlYmtpdHdlYmJhY2tmb3J3YXJkbGlzdC5oOgorCiAyMDA4LTEyLTIx ICBYYW4gTG9wZXogIDx4YW5AZ25vbWUub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEhvbGdl ciBGcmV5dGhlci4KSW5kZXg6IFdlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYmJhY2tmb3J3YXJk bGlzdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2ViYmFja2Zv cndhcmRsaXN0LmNwcAkocmV2aXNpb24gMzk0NjkpCisrKyBXZWJLaXQvZ3RrL3dlYmtpdC93ZWJr aXR3ZWJiYWNrZm9yd2FyZGxpc3QuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNjksNiArMzY5LDI0 IEBAIHZvaWQgd2Via2l0X3dlYl9iYWNrX2ZvcndhcmRfbGlzdF9zZXRfbGkKICAgICAgICAgYmFj a0ZvcndhcmRMaXN0LT5zZXRDYXBhY2l0eShsaW1pdCk7CiB9CiAKKy8qKgorICogd2Via2l0X3dl Yl9iYWNrX2ZvcndhcmRfbGlzdF9hZGRfaXRlbToKKyAqIEB3ZWJfYmFja19mb3J3YXJkX2xpc3Q6 IGEgI1dlYktpdFdlYkJhY2tGb3J3YXJkTGlzdAorICogQGhpc3RvcnlfaXRlbTogdGhlICNXZWJL aXRXZWJIaXN0b3J5SXRlbSB0byBhZGQgCisgKgorICogQWRkcyB0aGUgaXRlbSB0byB0aGUgI1dl YktpdFdlYkJhY2tGb3J3YXJkTGlzdC4KKyAqLwordm9pZCB3ZWJraXRfd2ViX2JhY2tfZm9yd2Fy ZF9saXN0X2FkZF9pdGVtKFdlYktpdFdlYkJhY2tGb3J3YXJkTGlzdCAqd2ViQmFja0ZvcndhcmRM aXN0LCBXZWJLaXRXZWJIaXN0b3J5SXRlbSAqd2ViSGlzdG9yeUl0ZW0pCit7CisgICAgZ19yZXR1 cm5faWZfZmFpbChXRUJLSVRfSVNfV0VCX0JBQ0tfRk9SV0FSRF9MSVNUKHdlYkJhY2tGb3J3YXJk TGlzdCkpOworCisgICAgV2ViQ29yZTo6QmFja0ZvcndhcmRMaXN0KiBiYWNrRm9yd2FyZExpc3Qg PSBjb3JlKHdlYkJhY2tGb3J3YXJkTGlzdCk7CisgICAgV2ViQ29yZTo6SGlzdG9yeUl0ZW0qIGhp c3RvcnlJdGVtID0gY29yZSh3ZWJIaXN0b3J5SXRlbSk7CisKKyAgICBpZiAoYmFja0ZvcndhcmRM aXN0KQorICAgICAgICBiYWNrRm9yd2FyZExpc3QtPmFkZEl0ZW0oaGlzdG9yeUl0ZW0pOworfQor CiB9IC8qIGVuZCBleHRlcm4gIkMiICovCiAKIFdlYkNvcmU6OkJhY2tGb3J3YXJkTGlzdCogV2Vi S2l0Ojpjb3JlKFdlYktpdFdlYkJhY2tGb3J3YXJkTGlzdCogd2ViQmFja0ZvcndhcmRMaXN0KQpJ bmRleDogV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2ViYmFja2ZvcndhcmRsaXN0LmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2ViYmFja2ZvcndhcmRsaXN0LmgJKHJl dmlzaW9uIDM5NDY5KQorKysgV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2ViYmFja2ZvcndhcmRs aXN0LmgJKHdvcmtpbmcgY29weSkKQEAgLTEwMSw2ICsxMDEsOSBAQCB3ZWJraXRfd2ViX2JhY2tf Zm9yd2FyZF9saXN0X2dldF9saW1pdCAgCiBXRUJLSVRfQVBJIHZvaWQKIHdlYmtpdF93ZWJfYmFj a19mb3J3YXJkX2xpc3Rfc2V0X2xpbWl0ICAgICAgICAgICAgICAgICAgIChXZWJLaXRXZWJCYWNr Rm9yd2FyZExpc3QgKndlYl9iYWNrX2ZvcndhcmRfbGlzdCwKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBnaW50ICAgICAgICAgICAgICAg ICAgICAgIGxpbWl0KTsKK1dFQktJVF9BUEkgdm9pZAord2Via2l0X3dlYl9iYWNrX2ZvcndhcmRf bGlzdF9hZGRfaXRlbSAgICAgICAgICAgICAgICAgICAgKFdlYktpdFdlYkJhY2tGb3J3YXJkTGlz dCAqd2ViX2JhY2tfZm9yd2FyZF9saXN0LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIFdlYktpdFdlYkhpc3RvcnlJdGVtICAgICAqaGlz dG9yeV9pdGVtKTsKIAogR19FTkRfREVDTFMKIAo= 26248 2008-12-25 15:46:11 -0800 2009-01-12 18:17:20 -0800 Revised patch webkit_web_back_forward_list_add_item.diff text/plain 2621 poincare SW5kZXg6IFdlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYmJhY2tmb3J3YXJkbGlzdC5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2ViYmFja2ZvcndhcmRsaXN0LmNw cAkocmV2aXNpb24gMzk0NzQpCisrKyBXZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJiYWNrZm9y d2FyZGxpc3QuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNjksNiArMzY5LDIzIEBAIHZvaWQgd2Vi a2l0X3dlYl9iYWNrX2ZvcndhcmRfbGlzdF9zZXRfbGkKICAgICAgICAgYmFja0ZvcndhcmRMaXN0 LT5zZXRDYXBhY2l0eShsaW1pdCk7CiB9CiAKKy8qKgorICogd2Via2l0X3dlYl9iYWNrX2Zvcndh cmRfbGlzdF9hZGRfaXRlbToKKyAqIEB3ZWJfYmFja19mb3J3YXJkX2xpc3Q6IGEgI1dlYktpdFdl YkJhY2tGb3J3YXJkTGlzdAorICogQGhpc3RvcnlfaXRlbTogdGhlICNXZWJLaXRXZWJIaXN0b3J5 SXRlbSB0byBhZGQgCisgKgorICogQWRkcyB0aGUgaXRlbSB0byB0aGUgI1dlYktpdFdlYkJhY2tG b3J3YXJkTGlzdC4KKyAqLwordm9pZCB3ZWJraXRfd2ViX2JhY2tfZm9yd2FyZF9saXN0X2FkZF9p dGVtKFdlYktpdFdlYkJhY2tGb3J3YXJkTGlzdCAqd2ViQmFja0ZvcndhcmRMaXN0LCBXZWJLaXRX ZWJIaXN0b3J5SXRlbSAqd2ViSGlzdG9yeUl0ZW0pCit7CisgICAgZ19yZXR1cm5faWZfZmFpbChX RUJLSVRfSVNfV0VCX0JBQ0tfRk9SV0FSRF9MSVNUKHdlYkJhY2tGb3J3YXJkTGlzdCkpOworCisg ICAgV2ViQ29yZTo6QmFja0ZvcndhcmRMaXN0KiBiYWNrRm9yd2FyZExpc3QgPSBjb3JlKHdlYkJh Y2tGb3J3YXJkTGlzdCk7CisgICAgV2ViQ29yZTo6SGlzdG9yeUl0ZW0qIGhpc3RvcnlJdGVtID0g Y29yZSh3ZWJIaXN0b3J5SXRlbSk7CisKKyAgICBiYWNrRm9yd2FyZExpc3QtPmFkZEl0ZW0oaGlz dG9yeUl0ZW0pOworfQorCiB9IC8qIGVuZCBleHRlcm4gIkMiICovCiAKIFdlYkNvcmU6OkJhY2tG b3J3YXJkTGlzdCogV2ViS2l0Ojpjb3JlKFdlYktpdFdlYkJhY2tGb3J3YXJkTGlzdCogd2ViQmFj a0ZvcndhcmRMaXN0KQpJbmRleDogV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2ViYmFja2Zvcndh cmRsaXN0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2ViYmFja2Zv cndhcmRsaXN0LmgJKHJldmlzaW9uIDM5NDc0KQorKysgV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0 d2ViYmFja2ZvcndhcmRsaXN0LmgJKHdvcmtpbmcgY29weSkKQEAgLTEwMSw2ICsxMDEsOSBAQCB3 ZWJraXRfd2ViX2JhY2tfZm9yd2FyZF9saXN0X2dldF9saW1pdCAgCiBXRUJLSVRfQVBJIHZvaWQK IHdlYmtpdF93ZWJfYmFja19mb3J3YXJkX2xpc3Rfc2V0X2xpbWl0ICAgICAgICAgICAgICAgICAg IChXZWJLaXRXZWJCYWNrRm9yd2FyZExpc3QgKndlYl9iYWNrX2ZvcndhcmRfbGlzdCwKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBnaW50 ICAgICAgICAgICAgICAgICAgICAgIGxpbWl0KTsKK1dFQktJVF9BUEkgdm9pZAord2Via2l0X3dl Yl9iYWNrX2ZvcndhcmRfbGlzdF9hZGRfaXRlbSAgICAgICAgICAgICAgICAgICAgKFdlYktpdFdl YkJhY2tGb3J3YXJkTGlzdCAqd2ViX2JhY2tfZm9yd2FyZF9saXN0LAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFdlYktpdFdlYkhpc3Rv cnlJdGVtICAgICAqaGlzdG9yeV9pdGVtKTsKIAogR19FTkRfREVDTFMKIApJbmRleDogV2ViS2l0 L2d0ay9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2d0ay9DaGFuZ2VMb2cJKHJldmlz aW9uIDM5NDc0KQorKysgV2ViS2l0L2d0ay9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEs MyArMSwxNyBAQAorMjAwOC0xMi0yNSAgSGlyb3l1a2kgSWtlem9lICA8cG9pbmNhcmVAaWtlem9l Lm5ldD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI5ODgKKyAgICAgICAgW0dU S10gTmVlZCBhIHB1YmxpYyBtZXRob2QgdG8gYWRkIGEgV2ViS2l0V2ViSGlzdG9yeUl0ZW0gdG8K KwlXZWJLaXRXZWJCYWNrRm9yd2FyZExpc3QuCisKKyAgICAgICAgV3JhcCBXZWJDb3JlOjpCYWNr Rm9yd2FyZExpc3Q6OmFkZEl0ZW0uCisKKyAgICAgICAgKiB3ZWJraXQvd2Via2l0d2ViYmFja2Zv cndhcmRsaXN0LmNwcDoKKyAgICAgICAgKF9XZWJLaXRXZWJCYWNrRm9yd2FyZExpc3RQcml2YXRl Ojp3ZWJraXRfd2ViX2JhY2tfZm9yd2FyZF9saXN0X2FkZF9pdGVtKToKKyAgICAgICAgKiB3ZWJr aXQvd2Via2l0d2ViYmFja2ZvcndhcmRsaXN0Lmg6CisKIDIwMDgtMTItMjEgIFhhbiBMb3BleiAg PHhhbkBnbm9tZS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgSG9sZ2VyIEZyZXl0aGVyLgo= 26657 2009-01-12 18:17:20 -0800 2009-02-02 05:48:58 -0800 Added test code. webkit_web_back_forward_list_add_item.diff text/plain 7189 poincare SW5kZXg6IFdlYktpdC9ndGsvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9ndGsvQ2hh bmdlTG9nCShyZXZpc2lvbiAzOTg0OSkKKysrIFdlYktpdC9ndGsvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMDktMDEtMTIgIEhpcm95dWtpIElrZXpvZSAgPHBv aW5jYXJlQGlrZXpvZS5uZXQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyOTg4 CisgICAgICAgIFtHVEtdIE5lZWQgYSBwdWJsaWMgbWV0aG9kIHRvIGFkZCBhIFdlYktpdFdlYkhp c3RvcnlJdGVtIHRvCisgICAgICAgIFdlYktpdFdlYkJhY2tGb3J3YXJkTGlzdC4KKworICAgICAg ICBXcmFwIFdlYkNvcmU6OkJhY2tGb3J3YXJkTGlzdDo6YWRkSXRlbS4KKworICAgICAgICAqIHRl c3RzL21haW4uYzoKKyAgICAgICAgKHRlc3Rfd2Via2l0X3dlYl9iYWNrX2ZvcndhcmRfbGlzdF9h ZGRfaXRlbSk6CisgICAgICAgIChtYWluKToKKyAgICAgICAgKiB3ZWJraXQvd2Via2l0d2ViYmFj a2ZvcndhcmRsaXN0LmNwcDoKKyAgICAgICAgKF9XZWJLaXRXZWJCYWNrRm9yd2FyZExpc3RQcml2 YXRlOjp3ZWJraXRfd2ViX2JhY2tfZm9yd2FyZF9saXN0X2FkZF9pdGVtKToKKyAgICAgICAgKiB3 ZWJraXQvd2Via2l0d2ViYmFja2ZvcndhcmRsaXN0Lmg6CisKIDIwMDktMDEtMTEgIFhhbiBMb3Bl eiAgPHhhbkBnbm9tZS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgSG9sZ2VyIEZyZXl0aGVy LgpJbmRleDogV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2ViYmFja2ZvcndhcmRsaXN0LmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJiYWNrZm9yd2FyZGxpc3Qu Y3BwCShyZXZpc2lvbiAzOTgzNCkKKysrIFdlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYmJhY2tm b3J3YXJkbGlzdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM4OSw2ICszODksMjMgQEAgdm9pZCB3 ZWJraXRfd2ViX2JhY2tfZm9yd2FyZF9saXN0X3NldF9saQogICAgICAgICBiYWNrRm9yd2FyZExp c3QtPnNldENhcGFjaXR5KGxpbWl0KTsKIH0KIAorLyoqCisgKiB3ZWJraXRfd2ViX2JhY2tfZm9y d2FyZF9saXN0X2FkZF9pdGVtOgorICogQHdlYl9iYWNrX2ZvcndhcmRfbGlzdDogYSAjV2ViS2l0 V2ViQmFja0ZvcndhcmRMaXN0CisgKiBAaGlzdG9yeV9pdGVtOiB0aGUgI1dlYktpdFdlYkhpc3Rv cnlJdGVtIHRvIGFkZCAKKyAqCisgKiBBZGRzIHRoZSBpdGVtIHRvIHRoZSAjV2ViS2l0V2ViQmFj a0ZvcndhcmRMaXN0LgorICovCit2b2lkIHdlYmtpdF93ZWJfYmFja19mb3J3YXJkX2xpc3RfYWRk X2l0ZW0oV2ViS2l0V2ViQmFja0ZvcndhcmRMaXN0ICp3ZWJCYWNrRm9yd2FyZExpc3QsIFdlYktp dFdlYkhpc3RvcnlJdGVtICp3ZWJIaXN0b3J5SXRlbSkKK3sKKyAgICBnX3JldHVybl9pZl9mYWls KFdFQktJVF9JU19XRUJfQkFDS19GT1JXQVJEX0xJU1Qod2ViQmFja0ZvcndhcmRMaXN0KSk7CisK KyAgICBXZWJDb3JlOjpCYWNrRm9yd2FyZExpc3QqIGJhY2tGb3J3YXJkTGlzdCA9IGNvcmUod2Vi QmFja0ZvcndhcmRMaXN0KTsKKyAgICBXZWJDb3JlOjpIaXN0b3J5SXRlbSogaGlzdG9yeUl0ZW0g PSBjb3JlKHdlYkhpc3RvcnlJdGVtKTsKKworICAgIGJhY2tGb3J3YXJkTGlzdC0+YWRkSXRlbSho aXN0b3J5SXRlbSk7Cit9CisKIH0gLyogZW5kIGV4dGVybiAiQyIgKi8KIAogV2ViQ29yZTo6QmFj a0ZvcndhcmRMaXN0KiBXZWJLaXQ6OmNvcmUoV2ViS2l0V2ViQmFja0ZvcndhcmRMaXN0KiB3ZWJC YWNrRm9yd2FyZExpc3QpCkluZGV4OiBXZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJiYWNrZm9y d2FyZGxpc3QuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJiYWNr Zm9yd2FyZGxpc3QuaAkocmV2aXNpb24gMzk4MzQpCisrKyBXZWJLaXQvZ3RrL3dlYmtpdC93ZWJr aXR3ZWJiYWNrZm9yd2FyZGxpc3QuaAkod29ya2luZyBjb3B5KQpAQCAtMTA3LDYgKzEwNyw5IEBA IHdlYmtpdF93ZWJfYmFja19mb3J3YXJkX2xpc3RfZ2V0X2xpbWl0ICAKIFdFQktJVF9BUEkgdm9p ZAogd2Via2l0X3dlYl9iYWNrX2ZvcndhcmRfbGlzdF9zZXRfbGltaXQgICAgICAgICAgICAgICAg ICAgKFdlYktpdFdlYkJhY2tGb3J3YXJkTGlzdCAqd2ViX2JhY2tfZm9yd2FyZF9saXN0LAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdp bnQgICAgICAgICAgICAgICAgICAgICAgbGltaXQpOworV0VCS0lUX0FQSSB2b2lkCit3ZWJraXRf d2ViX2JhY2tfZm9yd2FyZF9saXN0X2FkZF9pdGVtICAgICAgICAgICAgICAgICAgICAoV2ViS2l0 V2ViQmFja0ZvcndhcmRMaXN0ICp3ZWJfYmFja19mb3J3YXJkX2xpc3QsCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgV2ViS2l0V2ViSGlz dG9yeUl0ZW0gICAgICpoaXN0b3J5X2l0ZW0pOwogCiBHX0VORF9ERUNMUwogCkluZGV4OiBXZWJL aXQvZ3RrL3Rlc3RzL21haW4uYwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvZ3RrL3Rlc3RzL21haW4u YwkocmV2aXNpb24gMzk4MzQpCisrKyBXZWJLaXQvZ3RrL3Rlc3RzL21haW4uYwkod29ya2luZyBj b3B5KQpAQCAtNjIsNiArNjIsNzggQEAgc3RhdGljIHZvaWQgdGVzdF93ZWJraXRfd2ViX2ZyYW1l X2xpZmV0aQogICAgIGdfb2JqZWN0X3VucmVmKHdlYkZyYW1lKTsKIH0KIAorc3RhdGljIHZvaWQK K3Rlc3Rfd2Via2l0X3dlYl9iYWNrX2ZvcndhcmRfbGlzdF9hZGRfaXRlbSh2b2lkKQoreworICAg IFdlYktpdFdlYlZpZXcqIHdlYlZpZXc7CisgICAgV2ViS2l0V2ViQmFja0ZvcndhcmRMaXN0KiB3 ZWJCYWNrRm9yd2FyZExpc3Q7CisgICAgV2ViS2l0V2ViSGlzdG9yeUl0ZW0qIGFkZEl0ZW0xOwor ICAgIFdlYktpdFdlYkhpc3RvcnlJdGVtKiBhZGRJdGVtMjsKKyAgICBXZWJLaXRXZWJIaXN0b3J5 SXRlbSogYmFja0l0ZW07CisgICAgV2ViS2l0V2ViSGlzdG9yeUl0ZW0qIGN1cnJlbnRJdGVtOwor ICAgIGdfdGVzdF9idWcoIjIyOTg4Iik7CisKKyAgICB3ZWJWaWV3ID0gV0VCS0lUX1dFQl9WSUVX KHdlYmtpdF93ZWJfdmlld19uZXcoKSk7CisgICAgZ19vYmplY3RfcmVmX3Npbmsod2ViVmlldyk7 CisKKyAgICB3ZWJraXRfd2ViX3ZpZXdfc2V0X21haW50YWluc19iYWNrX2ZvcndhcmRfbGlzdCh3 ZWJWaWV3LCBUUlVFKTsKKyAgICB3ZWJCYWNrRm9yd2FyZExpc3QgPSB3ZWJraXRfd2ViX3ZpZXdf Z2V0X2JhY2tfZm9yd2FyZF9saXN0KHdlYlZpZXcpOworICAgIGdfYXNzZXJ0KHdlYkJhY2tGb3J3 YXJkTGlzdCk7CisKKyAgICAvLyBDaGVjayB0aGF0IHRoZXJlIGlzIG5vIGl0ZW0uCisgICAgZ19h c3NlcnQoIXdlYmtpdF93ZWJfYmFja19mb3J3YXJkX2xpc3RfZ2V0X2N1cnJlbnRfaXRlbSh3ZWJC YWNrRm9yd2FyZExpc3QpKTsKKyAgICBnX2Fzc2VydF9jbXBpbnQod2Via2l0X3dlYl9iYWNrX2Zv cndhcmRfbGlzdF9nZXRfZm9yd2FyZF9sZW5ndGgod2ViQmFja0ZvcndhcmRMaXN0KSwgPT0sIDAp OworICAgIGdfYXNzZXJ0X2NtcGludCh3ZWJraXRfd2ViX2JhY2tfZm9yd2FyZF9saXN0X2dldF9i YWNrX2xlbmd0aCh3ZWJCYWNrRm9yd2FyZExpc3QpLCA9PSwgMCk7CisgICAgZ19hc3NlcnQoIXdl YmtpdF93ZWJfdmlld19jYW5fZ29fZm9yd2FyZCh3ZWJWaWV3KSk7CisgICAgZ19hc3NlcnQoIXdl YmtpdF93ZWJfdmlld19jYW5fZ29fYmFjayh3ZWJWaWV3KSk7CisKKyAgICAvLyBBZGQgYSBuZXcg aXRlbQorICAgIGFkZEl0ZW0xID0gd2Via2l0X3dlYl9oaXN0b3J5X2l0ZW1fbmV3X3dpdGhfZGF0 YSgiaHR0cDovL2V4YW1wbGUuY29tLyIsICJBZGRlZCBzaXRlIik7CisgICAgd2Via2l0X3dlYl9i YWNrX2ZvcndhcmRfbGlzdF9hZGRfaXRlbSh3ZWJCYWNrRm9yd2FyZExpc3QsIGFkZEl0ZW0xKTsK KyAgICBnX2Fzc2VydCh3ZWJraXRfd2ViX2JhY2tfZm9yd2FyZF9saXN0X2NvbnRhaW5zX2l0ZW0o d2ViQmFja0ZvcndhcmRMaXN0LCBhZGRJdGVtMSkpOworCisgICAgLy8gQ2hlY2sgdGhhdCB0aGUg YWRkZWQgaXRlbSBpcyB0aGUgY3VycmVudCBpdGVtLgorICAgIGN1cnJlbnRJdGVtID0gd2Via2l0 X3dlYl9iYWNrX2ZvcndhcmRfbGlzdF9nZXRfY3VycmVudF9pdGVtKHdlYkJhY2tGb3J3YXJkTGlz dCk7CisgICAgZ19hc3NlcnQoY3VycmVudEl0ZW0pOworICAgIGdfYXNzZXJ0X2NtcGludCh3ZWJr aXRfd2ViX2JhY2tfZm9yd2FyZF9saXN0X2dldF9mb3J3YXJkX2xlbmd0aCh3ZWJCYWNrRm9yd2Fy ZExpc3QpLCA9PSwgMCk7CisgICAgZ19hc3NlcnRfY21waW50KHdlYmtpdF93ZWJfYmFja19mb3J3 YXJkX2xpc3RfZ2V0X2JhY2tfbGVuZ3RoKHdlYkJhY2tGb3J3YXJkTGlzdCksID09LCAwKTsKKyAg ICBnX2Fzc2VydCghd2Via2l0X3dlYl92aWV3X2Nhbl9nb19mb3J3YXJkKHdlYlZpZXcpKTsKKyAg ICBnX2Fzc2VydCghd2Via2l0X3dlYl92aWV3X2Nhbl9nb19iYWNrKHdlYlZpZXcpKTsKKyAgICBn X2Fzc2VydF9jbXBzdHIod2Via2l0X3dlYl9oaXN0b3J5X2l0ZW1fZ2V0X3VyaShjdXJyZW50SXRl bSksID09LCAiaHR0cDovL2V4YW1wbGUuY29tLyIpOworICAgIGdfYXNzZXJ0X2NtcHN0cih3ZWJr aXRfd2ViX2hpc3RvcnlfaXRlbV9nZXRfdGl0bGUoY3VycmVudEl0ZW0pLCA9PSwgIkFkZGVkIHNp dGUiKTsKKworICAgIC8vIEFkZCBhbm90aGVyIGl0ZW0uCisgICAgYWRkSXRlbTIgPSB3ZWJraXRf d2ViX2hpc3RvcnlfaXRlbV9uZXdfd2l0aF9kYXRhKCJodHRwOi8vZXhhbXBsZS5jb20vMi8iLCAi QWRkZWQgc2l0ZSAyIik7CisgICAgd2Via2l0X3dlYl9iYWNrX2ZvcndhcmRfbGlzdF9hZGRfaXRl bSh3ZWJCYWNrRm9yd2FyZExpc3QsIGFkZEl0ZW0yKTsKKyAgICBnX2Fzc2VydCh3ZWJraXRfd2Vi X2JhY2tfZm9yd2FyZF9saXN0X2NvbnRhaW5zX2l0ZW0od2ViQmFja0ZvcndhcmRMaXN0LCBhZGRJ dGVtMikpOworICAgIGdfb2JqZWN0X3VucmVmKGFkZEl0ZW0yKTsKKworICAgIC8vIENoZWNrIHRo YXQgdGhlIGFkZGVkIGl0ZW0gaXMgbmV3IGN1cnJlbnQgaXRlbS4KKyAgICBjdXJyZW50SXRlbSA9 IHdlYmtpdF93ZWJfYmFja19mb3J3YXJkX2xpc3RfZ2V0X2N1cnJlbnRfaXRlbSh3ZWJCYWNrRm9y d2FyZExpc3QpOworICAgIGdfYXNzZXJ0KGN1cnJlbnRJdGVtKTsKKyAgICBnX2Fzc2VydF9jbXBp bnQod2Via2l0X3dlYl9iYWNrX2ZvcndhcmRfbGlzdF9nZXRfZm9yd2FyZF9sZW5ndGgod2ViQmFj a0ZvcndhcmRMaXN0KSwgPT0sIDApOworICAgIGdfYXNzZXJ0X2NtcGludCh3ZWJraXRfd2ViX2Jh Y2tfZm9yd2FyZF9saXN0X2dldF9iYWNrX2xlbmd0aCh3ZWJCYWNrRm9yd2FyZExpc3QpLCA9PSwg MSk7CisgICAgZ19hc3NlcnQoIXdlYmtpdF93ZWJfdmlld19jYW5fZ29fZm9yd2FyZCh3ZWJWaWV3 KSk7CisgICAgZ19hc3NlcnQod2Via2l0X3dlYl92aWV3X2Nhbl9nb19iYWNrKHdlYlZpZXcpKTsK KyAgICBnX2Fzc2VydF9jbXBzdHIod2Via2l0X3dlYl9oaXN0b3J5X2l0ZW1fZ2V0X3VyaShjdXJy ZW50SXRlbSksID09LCAiaHR0cDovL2V4YW1wbGUuY29tLzIvIik7CisgICAgZ19hc3NlcnRfY21w c3RyKHdlYmtpdF93ZWJfaGlzdG9yeV9pdGVtX2dldF90aXRsZShjdXJyZW50SXRlbSksID09LCAi QWRkZWQgc2l0ZSAyIik7CisKKyAgICBiYWNrSXRlbSA9IHdlYmtpdF93ZWJfYmFja19mb3J3YXJk X2xpc3RfZ2V0X2JhY2tfaXRlbSh3ZWJCYWNrRm9yd2FyZExpc3QpOworICAgIGdfYXNzZXJ0KGJh Y2tJdGVtKTsKKyAgICBnX2Fzc2VydF9jbXBzdHIod2Via2l0X3dlYl9oaXN0b3J5X2l0ZW1fZ2V0 X3VyaShiYWNrSXRlbSksID09LCAiaHR0cDovL2V4YW1wbGUuY29tLyIpOworICAgIGdfYXNzZXJ0 X2NtcHN0cih3ZWJraXRfd2ViX2hpc3RvcnlfaXRlbV9nZXRfdGl0bGUoYmFja0l0ZW0pLCA9PSwg IkFkZGVkIHNpdGUiKTsKKworICAgIC8vIEdvIHRvIHRoZSBmaXJzdCBhZGRlZCBpdGVtLgorICAg IGdfYXNzZXJ0KHdlYmtpdF93ZWJfdmlld19nb190b19iYWNrX2ZvcndhcmRfaXRlbSh3ZWJWaWV3 LCBhZGRJdGVtMSkpOworICAgIGdfYXNzZXJ0X2NtcGludCh3ZWJraXRfd2ViX2JhY2tfZm9yd2Fy ZF9saXN0X2dldF9mb3J3YXJkX2xlbmd0aCh3ZWJCYWNrRm9yd2FyZExpc3QpLCA9PSwgMSk7Cisg ICAgZ19hc3NlcnRfY21waW50KHdlYmtpdF93ZWJfYmFja19mb3J3YXJkX2xpc3RfZ2V0X2JhY2tf bGVuZ3RoKHdlYkJhY2tGb3J3YXJkTGlzdCksID09LCAwKTsKKyAgICBnX2Fzc2VydCh3ZWJraXRf d2ViX3ZpZXdfY2FuX2dvX2ZvcndhcmQod2ViVmlldykpOworICAgIGdfYXNzZXJ0KCF3ZWJraXRf d2ViX3ZpZXdfY2FuX2dvX2JhY2sod2ViVmlldykpOworCisgICAgZ19vYmplY3RfdW5yZWYoYWRk SXRlbTEpOworICAgIGdfb2JqZWN0X3VucmVmKHdlYlZpZXcpOworfQorCiBpbnQgbWFpbihpbnQg YXJnYywgY2hhcioqIGFyZ3YpCiB7CiAgICAgZ190aHJlYWRfaW5pdChOVUxMKTsKQEAgLTcwLDYg KzE0Miw3IEBAIGludCBtYWluKGludCBhcmdjLCBjaGFyKiogYXJndikKICAgICBnX3Rlc3RfYnVn X2Jhc2UoImh0dHBzOi8vYnVncy53ZWJraXQub3JnLyIpOwogICAgIGdfdGVzdF9hZGRfZnVuYygi L3dlYmtpdC93ZWJ2aWV3L2NyZWF0ZV9kZXN0cm95IiwgdGVzdF93ZWJraXRfd2ViX2ZyYW1lX2Ny ZWF0ZV9kZXN0cm95KTsKICAgICBnX3Rlc3RfYWRkX2Z1bmMoIi93ZWJraXQvd2ViZnJhbWUvbGlm ZXRpbWUiLCB0ZXN0X3dlYmtpdF93ZWJfZnJhbWVfbGlmZXRpbWUpOworICAgIGdfdGVzdF9hZGRf ZnVuYygiL3dlYmtpdC93ZWJiYWNrZm9yd2FyZGxpc3QvYWRkX2l0ZW0iLCB0ZXN0X3dlYmtpdF93 ZWJfYmFja19mb3J3YXJkX2xpc3RfYWRkX2l0ZW0pOwogCiAgICAgcmV0dXJuIGdfdGVzdF9ydW4g KCk7CiB9Cg==