26452 2009-06-16 11:50:11 -0700 [Qt] Add ability to prepend an item to the history list 2009-11-24 07:48:06 -0800 1 1 1 Unclassified WebKit History 528+ (Nightly build) Other All RESOLVED DUPLICATE 30710 Qt P2 Normal --- 1 manyoso webkit-unassigned jedrzej.nowacki rick oldest_to_newest 126248 0 manyoso 2009-06-16 11:50:11 -0700 Hi, and thanks. I would like to be able to prepend items to the history list (i.e. put items in the browser's history list before the first one). The reason is that I am using WebKit as a plug-in. I want to shut down and restart WebKit, re-loading it with the history that I've kept track of. To keep it simple, I propose adding a simple "prependItem" to QWebHistory, so that I can do this. 126255 1 31362 manyoso 2009-06-16 12:02:04 -0700 Created attachment 31362 Adds prependItem 126256 2 manyoso 2009-06-16 12:05:09 -0700 To be clear, the attached patch is from Rick Passeto, not me. 126328 3 rick 2009-06-16 15:33:36 -0700 From an IRC chat with Kenneth: - change prpItem to newItem in both addItem() and prependItem() - He also asked if ASSERT(newItem) was okay. It looks like it is - Also, in qwebhistory.cpp, he asked if WebCore should be namespaced in the file. 126334 4 31386 rick 2009-06-16 15:39:56 -0700 Created attachment 31386 updated patch with requested changes This is an updated patch based on feedback from kenneth. 126851 5 31386 eric 2009-06-18 18:20:36 -0700 Comment on attachment 31386 updated patch with requested changes ChangeLogs are missing. 127435 6 31670 rick 2009-06-22 13:32:13 -0700 Created attachment 31670 Updated WebKit patch for adding prepend API Another attempt at uploading the patch properly... 127633 7 31721 ben 2009-06-23 08:22:28 -0700 Created attachment 31721 minor cleanups + changelog 127807 8 mjs 2009-06-23 20:44:37 -0700 The core code looks ok to me, but since the patch adds Qt API, a Qt person may want to review it. 127913 9 manyoso 2009-06-24 08:08:00 -0700 I am ok with the API except for one thing I'd like to see addressed first: 1) What is wrong with storing the history like other clients do? Arora also has need to shut down and re-open from time to time with an intact history list. What is different about your situation as compared to Arora or other Qt clients that already do this with the existing API? 127916 10 manyoso 2009-06-24 08:23:49 -0700 Ok, scratch my last question. Arora and other clients *do not* restore history in this sense. There is the QWebHistoryInterface::historyContains method, but that is only for visited links. You are looking to make the back/forward list persistent across restarts. However, I have another question... Can't you achieve the same thing with simple 'addItem'? Why do you need to add 'prependItem' to WebCore? 127984 11 rick 2009-06-24 13:50:53 -0700 The problem is that addItem() *appends* history items, so if there are already URLs in the history, they come after the current URL. Even if this weren't so: in the case of re-initializing the history, if you call addItem(URL1), addItem(URL2), ... addItem(URLn), the problem is that the "current URL" is wrong (it will be URL1). There isn't API for "make this history item the current item" (there is a "goto this history item", but that's not the same. Admittedly there are probably alternatives to prependItem, but this seemed simplest. 128005 12 manyoso 2009-06-24 14:21:36 -0700 It seems to me your specific use case is to restore the history on restarting the plugin. Given this, there should be no prior URLS in the back/forward list, right? If true, then it seems you could simply append your items in reverse order, no? 128175 13 31721 manyoso 2009-06-25 06:24:59 -0700 Comment on attachment 31721 minor cleanups + changelog Take this out of the review queue as it seems things will need to be changed. For instance, s/addItem/prependItem/ to QWebHistory and also s/const QString &urlString/const QUrl &url/ etc, etc. 158858 14 jedrzej.nowacki 2009-10-29 04:32:50 -0700 Functionality of saving and restoring the QWebHistory should be in Qt 4.6. The bug is similar to bug 30710. I suppose, this one may be closed as duplicated. Please, verify if am I correct. 166077 15 jedrzej.nowacki 2009-11-24 07:48:06 -0800 I'm closing as duplicate of bug 30710. *** This bug has been marked as a duplicate of bug 30710 *** 31362 2009-06-16 12:02:04 -0700 2009-06-23 08:27:06 -0700 Adds prependItem 26452.patch text/plain 3808 manyoso ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZDUxMTViMC4uMzRkYjExNiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAwOS0wNi0xNiAgUmljayBQYXNzZXRv ICA8cmlja0BsaW5kZW5sYWIuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEFkZCBmdW5jdGlvbiBmb3IgcHJlcGVuZGluZyBhbiBpdGVtIHRvIHRo ZSBoaXN0b3J5LgorCisgICAgICAgICogaGlzdG9yeS9CYWNrRm9yd2FyZExpc3QuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6QmFja0ZvcndhcmRMaXN0OjpwcmVwZW5kSXRlbSk6CisgICAgICAgICog aGlzdG9yeS9CYWNrRm9yd2FyZExpc3QuaDoKKwogMjAwOS0wNi0xNSAgU2ltb24gSGF1c21hbm4g IDxzaW1vbi5oYXVzbWFubkBub2tpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgYW5kIGRv bmUgd2l0aCBUb3IgQXJuZSBWZXN0YsO4LgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9oaXN0b3J5L0Jh Y2tGb3J3YXJkTGlzdC5jcHAgYi9XZWJDb3JlL2hpc3RvcnkvQmFja0ZvcndhcmRMaXN0LmNwcApp bmRleCAxYjdjODBlLi5kODY5ODI1IDEwMDY0NAotLS0gYS9XZWJDb3JlL2hpc3RvcnkvQmFja0Zv cndhcmRMaXN0LmNwcAorKysgYi9XZWJDb3JlL2hpc3RvcnkvQmFja0ZvcndhcmRMaXN0LmNwcApA QCAtODQsNiArODQsMjcgQEAgdm9pZCBCYWNrRm9yd2FyZExpc3Q6OmFkZEl0ZW0oUGFzc1JlZlB0 cjxIaXN0b3J5SXRlbT4gcHJwSXRlbSkKICAgICBtX2N1cnJlbnQrKzsKIH0KIAordm9pZCBCYWNr Rm9yd2FyZExpc3Q6OnByZXBlbmRJdGVtKFBhc3NSZWZQdHI8SGlzdG9yeUl0ZW0+IHBycEl0ZW0p Cit7CisgICAgQVNTRVJUKHBycEl0ZW0pOworICAgIGlmIChtX2NhcGFjaXR5ID09IDAgfHwgIW1f ZW5hYmxlZCkKKyAgICAgICAgcmV0dXJuOworCisgICAgLy8gVG9zcyB0aGUgZmlyc3QgaXRlbSBp ZiB0aGUgbGlzdCBpcyBnZXR0aW5nIHRvbyBiaWcsIGFzIGxvbmcgYXMgd2UncmUgbm90IHVzaW5n IGl0CisgICAgLy8gKG9yIGV2ZW4gaWYgd2UgYXJlLCBpZiB3ZSBvbmx5IHdhbnQgMSBlbnRyeSku CisgICAgaWYgKG1fZW50cmllcy5zaXplKCkgPT0gbV9jYXBhY2l0eSAmJiAobV9jdXJyZW50ICE9 IDAgfHwgbV9jYXBhY2l0eSA9PSAxKSkgeworICAgICAgICBSZWZQdHI8SGlzdG9yeUl0ZW0+IGl0 ZW0gPSBtX2VudHJpZXNbMF07CisgICAgICAgIG1fZW50cmllcy5yZW1vdmUoMCk7CisgICAgICAg IG1fZW50cnlIYXNoLnJlbW92ZShpdGVtKTsKKyAgICAgICAgcGFnZUNhY2hlKCktPnJlbW92ZShp dGVtLmdldCgpKTsKKyAgICAgICAgbV9jdXJyZW50LS07CisgICAgfQorCisgICAgbV9lbnRyaWVz LnByZXBlbmQocHJwSXRlbSk7CisgICAgbV9lbnRyeUhhc2guYWRkKHBycEl0ZW0pOworICAgIG1f Y3VycmVudCsrOworfQorCiB2b2lkIEJhY2tGb3J3YXJkTGlzdDo6Z29CYWNrKCkKIHsKICAgICBB U1NFUlQobV9jdXJyZW50ID4gMCk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2hpc3RvcnkvQmFja0Zv cndhcmRMaXN0LmggYi9XZWJDb3JlL2hpc3RvcnkvQmFja0ZvcndhcmRMaXN0LmgKaW5kZXggYTk5 ZDM4Ny4uNmY0NTg0NyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9oaXN0b3J5L0JhY2tGb3J3YXJkTGlz dC5oCisrKyBiL1dlYkNvcmUvaGlzdG9yeS9CYWNrRm9yd2FyZExpc3QuaApAQCAtNzAsNiArNzAs NyBAQCBwdWJsaWM6CiAgICAgUGFnZSogcGFnZSgpIHsgcmV0dXJuIG1fcGFnZTsgfQogICAgIAog ICAgIHZvaWQgYWRkSXRlbShQYXNzUmVmUHRyPEhpc3RvcnlJdGVtPik7CisgICAgdm9pZCBwcmVw ZW5kSXRlbShQYXNzUmVmUHRyPEhpc3RvcnlJdGVtPik7CiAgICAgdm9pZCBnb0JhY2soKTsKICAg ICB2b2lkIGdvRm9yd2FyZCgpOwogICAgIHZvaWQgZ29Ub0l0ZW0oSGlzdG9yeUl0ZW0qKTsKZGlm ZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcXdlYmhpc3RvcnkuY3BwIGIvV2ViS2l0L3F0L0FwaS9x d2ViaGlzdG9yeS5jcHAKaW5kZXggMDdkMDI3ZC4uODc5ZWMzYSAxMDA2NDQKLS0tIGEvV2ViS2l0 L3F0L0FwaS9xd2ViaGlzdG9yeS5jcHAKKysrIGIvV2ViS2l0L3F0L0FwaS9xd2ViaGlzdG9yeS5j cHAKQEAgLTI0OCw2ICsyNDgsMjIgQEAgdm9pZCBRV2ViSGlzdG9yeTo6Y2xlYXIoKQogfQogCiAv KiEKKyAgUHJlcGVuZHMgaGlzdG9yeSBpdGVtIGdpdmVuIHVybCwgdGl0bGUsIGFuZCBsYXN0Vmlz aXRlZCB0aW1lCisKKyAgXHNhIGNvdW50KCksIGNsZWFyKCkKKyovCit2b2lkIFFXZWJIaXN0b3J5 OjpwcmVwZW5kSXRlbShjb25zdCBRU3RyaW5nICZ1cmxTdHJpbmcsIGNvbnN0IFFTdHJpbmcgJnRp dGxlLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgUURhdGVUaW1lICZsYXN0 VmlzaXRlZCkKK3sKKyAgICBSZWZQdHI8V2ViQ29yZTo6SGlzdG9yeUl0ZW0+IGl0ZW0gPQorICAg ICAgICBXZWJDb3JlOjpIaXN0b3J5SXRlbTo6Y3JlYXRlKFdlYkNvcmU6OlN0cmluZyh1cmxTdHJp bmcpLCBXZWJDb3JlOjpTdHJpbmcodGl0bGUpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIChkb3VibGUpbGFzdFZpc2l0ZWQudG9UaW1lX3QoKSk7CisKKyAgICBkLT5sc3Qt PnByZXBlbmRJdGVtKGl0ZW0pOworfQorCisKKy8qIQogICBSZXR1cm5zIGEgbGlzdCBvZiBhbGwg aXRlbXMgY3VycmVudGx5IGluIHRoZSBoaXN0b3J5LgogCiAgIFxzYSBjb3VudCgpLCBjbGVhcigp CmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQXBpL3F3ZWJoaXN0b3J5LmggYi9XZWJLaXQvcXQvQXBp L3F3ZWJoaXN0b3J5LmgKaW5kZXggYzM5MDc3ZC4uZjM0MzQwOCAxMDA2NDQKLS0tIGEvV2ViS2l0 L3F0L0FwaS9xd2ViaGlzdG9yeS5oCisrKyBiL1dlYktpdC9xdC9BcGkvcXdlYmhpc3RvcnkuaApA QCAtNjksNiArNjksOCBAQCBjbGFzcyBRV0VCS0lUX0VYUE9SVCBRV2ViSGlzdG9yeQogcHVibGlj OgogICAgIHZvaWQgY2xlYXIoKTsKIAorICAgIHZvaWQgcHJlcGVuZEl0ZW0oY29uc3QgUVN0cmlu ZyAmdXJsU3RyaW5nLCBjb25zdCBRU3RyaW5nICZ0aXRsZSwgY29uc3QgUURhdGVUaW1lICZsYXN0 VmlzaXRlZCk7CisKICAgICBRTGlzdDxRV2ViSGlzdG9yeUl0ZW0+IGl0ZW1zKCkgY29uc3Q7CiAg ICAgUUxpc3Q8UVdlYkhpc3RvcnlJdGVtPiBiYWNrSXRlbXMoaW50IG1heEl0ZW1zKSBjb25zdDsK ICAgICBRTGlzdDxRV2ViSGlzdG9yeUl0ZW0+IGZvcndhcmRJdGVtcyhpbnQgbWF4SXRlbXMpIGNv bnN0OwpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L0NoYW5nZUxvZyBiL1dlYktpdC9xdC9DaGFuZ2VM b2cKaW5kZXggZjVmMDUxNS4uZTc2MGY0MyAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L0NoYW5nZUxv ZworKysgYi9XZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMDktMDYtMTYg IFJpY2sgUGFzc2V0byAgPHJpY2tAbGluZGVubGFiLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgQVBJIGZvciBwcmVwZW5kaW5nIGFuIGl0 ZW0gdG8gdGhlIGhpc3RvcnkuCisKKyAgICAgICAgKiBBcGkvcXdlYmhpc3RvcnkuY3BwOgorICAg ICAgICAoUVdlYkhpc3Rvcnk6OnByZXBlbmRJdGVtKToKKyAgICAgICAgKiBBcGkvcXdlYmhpc3Rv cnkuaDoKKwogMjAwOS0wNi0xNSAgQW5kcmUgUGVkcmFsaG8gIDxhbmRyZS5wZWRyYWxob0BvcGVu Ym9zc2Eub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFkYW0gVHJlYXQuCg== 31386 2009-06-16 15:39:56 -0700 2009-06-22 13:32:13 -0700 updated patch with requested changes qt2.patch text/plain 3704 rick ZGlmZiAtcnVwIGEvc3JjLzNyZHBhcnR5L3dlYmtpdC9XZWJDb3JlL2hpc3RvcnkvQmFja0Zvcndh cmRMaXN0LmNwcCBiL3NyYy8zcmRwYXJ0eS93ZWJraXQvV2ViQ29yZS9oaXN0b3J5L0JhY2tGb3J3 YXJkTGlzdC5jcHAKLS0tIGEvc3JjLzNyZHBhcnR5L3dlYmtpdC9XZWJDb3JlL2hpc3RvcnkvQmFj a0ZvcndhcmRMaXN0LmNwcAkyMDA5LTAyLTI1IDEyOjMyOjM0LjAwMDAwMDAwMCAtMDgwMAorKysg Yi9zcmMvM3JkcGFydHkvd2Via2l0L1dlYkNvcmUvaGlzdG9yeS9CYWNrRm9yd2FyZExpc3QuY3Bw CTIwMDktMDYtMTYgMTQ6Mzk6MjIuMDA3MjUwMDAwIC0wNzAwCkBAIC01Miw5ICs1Miw5IEBAIEJh Y2tGb3J3YXJkTGlzdDo6fkJhY2tGb3J3YXJkTGlzdCgpDQogICAgIEFTU0VSVChtX2Nsb3NlZCk7 DQogfQ0KIA0KLXZvaWQgQmFja0ZvcndhcmRMaXN0OjphZGRJdGVtKFBhc3NSZWZQdHI8SGlzdG9y eUl0ZW0+IHBycEl0ZW0pDQordm9pZCBCYWNrRm9yd2FyZExpc3Q6OmFkZEl0ZW0oUGFzc1JlZlB0 cjxIaXN0b3J5SXRlbT4gbmV3SXRlbSkNCiB7DQotICAgIEFTU0VSVChwcnBJdGVtKTsNCisgICAg QVNTRVJUKG5ld0l0ZW0pOw0KICAgICBpZiAobV9jYXBhY2l0eSA9PSAwIHx8ICFtX2VuYWJsZWQp DQogICAgICAgICByZXR1cm47DQogICAgIA0KQEAgLTc5LDEwICs3OSwzMSBAQCB2b2lkIEJhY2tG b3J3YXJkTGlzdDo6YWRkSXRlbShQYXNzUmVmUHRyCiAgICAgICAgIG1fY3VycmVudC0tOw0KICAg ICB9DQogICAgIA0KLSAgICBtX2VudHJpZXMuYXBwZW5kKHBycEl0ZW0pOw0KKyAgICBtX2VudHJp ZXMuYXBwZW5kKG5ld0l0ZW0pOw0KICAgICBtX2VudHJ5SGFzaC5hZGQobV9lbnRyaWVzLmxhc3Qo KSk7DQogICAgIG1fY3VycmVudCsrOw0KIH0NCisgICAgDQordm9pZCBCYWNrRm9yd2FyZExpc3Q6 OnByZXBlbmRJdGVtKFBhc3NSZWZQdHI8SGlzdG9yeUl0ZW0+IG5ld0l0ZW0pDQorew0KKyAgICBB U1NFUlQobmV3SXRlbSk7DQorICAgIGlmIChtX2NhcGFjaXR5ID09IDAgfHwgIW1fZW5hYmxlZCkN CisgICAgICAgIHJldHVybjsNCisNCisgICAgLy8gVG9zcyB0aGUgZmlyc3QgaXRlbSBpZiB0aGUg bGlzdCBpcyBnZXR0aW5nIHRvbyBiaWcsIGFzIGxvbmcgYXMgd2UncmUgbm90IHVzaW5nIGl0DQor ICAgIC8vIChvciBldmVuIGlmIHdlIGFyZSwgaWYgd2Ugb25seSB3YW50IDEgZW50cnkpLg0KKyAg ICBpZiAobV9lbnRyaWVzLnNpemUoKSA9PSBtX2NhcGFjaXR5ICYmIChtX2N1cnJlbnQgIT0gMCB8 fCBtX2NhcGFjaXR5ID09IDEpKSB7DQorICAgICAgICBSZWZQdHI8SGlzdG9yeUl0ZW0+IGl0ZW0g PSBtX2VudHJpZXNbMF07DQorICAgICAgICBtX2VudHJpZXMucmVtb3ZlKDApOw0KKyAgICAgICAg bV9lbnRyeUhhc2gucmVtb3ZlKGl0ZW0pOw0KKyAgICAgICAgcGFnZUNhY2hlKCktPnJlbW92ZShp dGVtLmdldCgpKTsNCisgICAgICAgIG1fY3VycmVudC0tOw0KKyAgICB9DQorDQorICAgIG1fZW50 cmllcy5wcmVwZW5kKG5ld0l0ZW0pOw0KKyAgICBtX2VudHJ5SGFzaC5hZGQobmV3SXRlbSk7DQor ICAgIG1fY3VycmVudCsrOw0KK30NCiANCiB2b2lkIEJhY2tGb3J3YXJkTGlzdDo6Z29CYWNrKCkN CiB7DQpkaWZmIC1ydXAgYS9zcmMvM3JkcGFydHkvd2Via2l0L1dlYkNvcmUvaGlzdG9yeS9CYWNr Rm9yd2FyZExpc3QuaCBiL3NyYy8zcmRwYXJ0eS93ZWJraXQvV2ViQ29yZS9oaXN0b3J5L0JhY2tG b3J3YXJkTGlzdC5oCi0tLSBhL3NyYy8zcmRwYXJ0eS93ZWJraXQvV2ViQ29yZS9oaXN0b3J5L0Jh Y2tGb3J3YXJkTGlzdC5oCTIwMDktMDItMjUgMTI6MzI6MzQuMDAwMDAwMDAwIC0wODAwCisrKyBi L3NyYy8zcmRwYXJ0eS93ZWJraXQvV2ViQ29yZS9oaXN0b3J5L0JhY2tGb3J3YXJkTGlzdC5oCTIw MDktMDYtMTEgMTM6MzE6MTIuMDc4MTI1MDAwIC0wNzAwCkBAIC00OCw2ICs0OCw3IEBAIHB1Ymxp YzogDQogICAgIFBhZ2UqIHBhZ2UoKSB7IHJldHVybiBtX3BhZ2U7IH0NCiAgICAgDQogICAgIHZv aWQgYWRkSXRlbShQYXNzUmVmUHRyPEhpc3RvcnlJdGVtPik7DQorICAgIHZvaWQgcHJlcGVuZEl0 ZW0oUGFzc1JlZlB0cjxIaXN0b3J5SXRlbT4pOw0KICAgICB2b2lkIGdvQmFjaygpOw0KICAgICB2 b2lkIGdvRm9yd2FyZCgpOw0KICAgICB2b2lkIGdvVG9JdGVtKEhpc3RvcnlJdGVtKik7DQpkaWZm IC1ydXAgYS9zcmMvM3JkcGFydHkvd2Via2l0L1dlYktpdC9xdC9BcGkvcXdlYmhpc3RvcnkuY3Bw IGIvc3JjLzNyZHBhcnR5L3dlYmtpdC9XZWJLaXQvcXQvQXBpL3F3ZWJoaXN0b3J5LmNwcAotLS0g YS9zcmMvM3JkcGFydHkvd2Via2l0L1dlYktpdC9xdC9BcGkvcXdlYmhpc3RvcnkuY3BwCTIwMDkt MDItMjUgMTI6MzI6MzQuMDAwMDAwMDAwIC0wODAwCisrKyBiL3NyYy8zcmRwYXJ0eS93ZWJraXQv V2ViS2l0L3F0L0FwaS9xd2ViaGlzdG9yeS5jcHAJMjAwOS0wNi0xMiAxMDoyMzo0Mi44OTA2MjUw MDAgLTA3MDAKQEAgLTI0OCw2ICsyNDgsMjIgQEAgdm9pZCBRV2ViSGlzdG9yeTo6Y2xlYXIoKQ0K IH0NCiANCiAvKiENCisgIFByZXBlbmRzIGhpc3RvcnkgaXRlbSBnaXZlbiB1cmwsIHRpdGxlLCBh bmQgbGFzdFZpc2l0ZWQgdGltZQ0KKw0KKyAgXHNhIGNvdW50KCksIGNsZWFyKCkNCisqLw0KK3Zv aWQgUVdlYkhpc3Rvcnk6OnByZXBlbmRJdGVtKGNvbnN0IFFTdHJpbmcgJnVybFN0cmluZywgY29u c3QgUVN0cmluZyAmdGl0bGUsIA0KKwkJCQkJCQkgIGNvbnN0IFFEYXRlVGltZSAmbGFzdFZpc2l0 ZWQpDQorew0KKyAgICBSZWZQdHI8V2ViQ29yZTo6SGlzdG9yeUl0ZW0+IGl0ZW0gPQ0KKyAgICAg IFdlYkNvcmU6Okhpc3RvcnlJdGVtOjpjcmVhdGUoV2ViQ29yZTo6U3RyaW5nKHVybFN0cmluZyks IFdlYkNvcmU6OlN0cmluZyh0aXRsZSksIA0KKwkJCQkgICAoZG91YmxlKWxhc3RWaXNpdGVkLnRv VGltZV90KCkpOw0KKw0KKyAgICBkLT5sc3QtPnByZXBlbmRJdGVtKGl0ZW0pOw0KK30NCisNCisN CisvKiENCiAgIFJldHVybnMgYSBsaXN0IG9mIGFsbCBpdGVtcyBjdXJyZW50bHkgaW4gdGhlIGhp c3RvcnkuDQogDQogICBcc2EgY291bnQoKSwgY2xlYXIoKQ0KZGlmZiAtcnVwIGEvc3JjLzNyZHBh cnR5L3dlYmtpdC9XZWJLaXQvcXQvQXBpL3F3ZWJoaXN0b3J5LmggYi9zcmMvM3JkcGFydHkvd2Vi a2l0L1dlYktpdC9xdC9BcGkvcXdlYmhpc3RvcnkuaAotLS0gYS9zcmMvM3JkcGFydHkvd2Via2l0 L1dlYktpdC9xdC9BcGkvcXdlYmhpc3RvcnkuaAkyMDA5LTAyLTI1IDEyOjMyOjM0LjAwMDAwMDAw MCAtMDgwMAorKysgYi9zcmMvM3JkcGFydHkvd2Via2l0L1dlYktpdC9xdC9BcGkvcXdlYmhpc3Rv cnkuaAkyMDA5LTA2LTEyIDEwOjIzOjI5LjIxODc1MDAwMCAtMDcwMApAQCAtNjksNiArNjksOCBA QCBjbGFzcyBRV0VCS0lUX0VYUE9SVCBRV2ViSGlzdG9yeQ0KIHB1YmxpYzoNCiAgICAgdm9pZCBj bGVhcigpOw0KIA0KKyAgICB2b2lkIHByZXBlbmRJdGVtKGNvbnN0IFFTdHJpbmcgJnVybFN0cmlu ZywgY29uc3QgUVN0cmluZyAmdGl0bGUsIGNvbnN0IFFEYXRlVGltZSAmbGFzdFZpc2l0ZWQpOw0K Kw0KICAgICBRTGlzdDxRV2ViSGlzdG9yeUl0ZW0+IGl0ZW1zKCkgY29uc3Q7DQogICAgIFFMaXN0 PFFXZWJIaXN0b3J5SXRlbT4gYmFja0l0ZW1zKGludCBtYXhJdGVtcykgY29uc3Q7DQogICAgIFFM aXN0PFFXZWJIaXN0b3J5SXRlbT4gZm9yd2FyZEl0ZW1zKGludCBtYXhJdGVtcykgY29uc3Q7DQo= 31670 2009-06-22 13:32:13 -0700 2009-06-23 08:27:18 -0700 Updated WebKit patch for adding prepend API qtwebkit-004-add-prepend-API.patch text/plain 4021 rick RnJvbTogUmljayBMaW5kZW4gKHJpY2tAbGluZGVubGFiLmNvbSkKRGF0ZTogVHVlIEp1biAxNiAx NTo1MzozOCBQRFQgMjAwOQpTdWJqZWN0OiBBZGQgQVBJIGZvciBwcmVwZW5kaW5nIFVSTHMgdG8g aGlzdG9yeQoKVGhpcyBwYXRjaCBhZGRzIGEgbmV3IEFQSSB0byBXZWJLaXQgdG8gYWRkIGEgInBy ZXBlbmQgVVJMIiBBUEksIHRvIGZhY2lsaXRhdGUKYWRkaW5nIGhpc3RvcnkgaXRlbXMgc28gdGhh dCB0aGUgYnJvd3NlciBoaXN0b3J5IGNhbiBiZSBwcmUtbG9hZGVkIHVwb24gc3RhcnR1cC4KClNl ZSBodHRwczovL2ppcmEubGluZGVubGFiLmNvbS9qaXJhL2Jyb3dzZS9ERVYtMzM2NDAKYW5kIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNjQ1Mgpmb3IgbW9yZSBpbmZv CgpkaWZmIC1ydXAgYS9zcmMvM3JkcGFydHkvd2Via2l0L1dlYkNvcmUvaGlzdG9yeS9CYWNrRm9y d2FyZExpc3QuY3BwIGIvc3JjLzNyZHBhcnR5L3dlYmtpdC9XZWJDb3JlL2hpc3RvcnkvQmFja0Zv cndhcmRMaXN0LmNwcAotLS0gYS9zcmMvM3JkcGFydHkvd2Via2l0L1dlYkNvcmUvaGlzdG9yeS9C YWNrRm9yd2FyZExpc3QuY3BwCTIwMDktMDItMjUgMTI6MzI6MzQuMDAwMDAwMDAwIC0wODAwCisr KyBiL3NyYy8zcmRwYXJ0eS93ZWJraXQvV2ViQ29yZS9oaXN0b3J5L0JhY2tGb3J3YXJkTGlzdC5j cHAJMjAwOS0wNi0xNiAxNDozOToyMi4wMDcyNTAwMDAgLTA3MDAKQEAgLTUyLDkgKzUyLDkgQEAg QmFja0ZvcndhcmRMaXN0Ojp+QmFja0ZvcndhcmRMaXN0KCkKICAgICBBU1NFUlQobV9jbG9zZWQp OwogfQogCi12b2lkIEJhY2tGb3J3YXJkTGlzdDo6YWRkSXRlbShQYXNzUmVmUHRyPEhpc3RvcnlJ dGVtPiBwcnBJdGVtKQordm9pZCBCYWNrRm9yd2FyZExpc3Q6OmFkZEl0ZW0oUGFzc1JlZlB0cjxI aXN0b3J5SXRlbT4gbmV3SXRlbSkKIHsKLSAgICBBU1NFUlQocHJwSXRlbSk7CisgICAgQVNTRVJU KG5ld0l0ZW0pOwogICAgIGlmIChtX2NhcGFjaXR5ID09IDAgfHwgIW1fZW5hYmxlZCkKICAgICAg ICAgcmV0dXJuOwogICAgIApAQCAtNzksMTAgKzc5LDMxIEBAIHZvaWQgQmFja0ZvcndhcmRMaXN0 OjphZGRJdGVtKFBhc3NSZWZQdHIKICAgICAgICAgbV9jdXJyZW50LS07CiAgICAgfQogICAgIAot ICAgIG1fZW50cmllcy5hcHBlbmQocHJwSXRlbSk7CisgICAgbV9lbnRyaWVzLmFwcGVuZChuZXdJ dGVtKTsKICAgICBtX2VudHJ5SGFzaC5hZGQobV9lbnRyaWVzLmxhc3QoKSk7CiAgICAgbV9jdXJy ZW50Kys7CiB9CisgICAgCit2b2lkIEJhY2tGb3J3YXJkTGlzdDo6cHJlcGVuZEl0ZW0oUGFzc1Jl ZlB0cjxIaXN0b3J5SXRlbT4gbmV3SXRlbSkKK3sKKyAgICBBU1NFUlQobmV3SXRlbSk7CisgICAg aWYgKG1fY2FwYWNpdHkgPT0gMCB8fCAhbV9lbmFibGVkKQorICAgICAgICByZXR1cm47CisKKyAg ICAvLyBUb3NzIHRoZSBmaXJzdCBpdGVtIGlmIHRoZSBsaXN0IGlzIGdldHRpbmcgdG9vIGJpZywg YXMgbG9uZyBhcyB3ZSdyZSBub3QgdXNpbmcgaXQKKyAgICAvLyAob3IgZXZlbiBpZiB3ZSBhcmUs IGlmIHdlIG9ubHkgd2FudCAxIGVudHJ5KS4KKyAgICBpZiAobV9lbnRyaWVzLnNpemUoKSA9PSBt X2NhcGFjaXR5ICYmIChtX2N1cnJlbnQgIT0gMCB8fCBtX2NhcGFjaXR5ID09IDEpKSB7CisgICAg ICAgIFJlZlB0cjxIaXN0b3J5SXRlbT4gaXRlbSA9IG1fZW50cmllc1swXTsKKyAgICAgICAgbV9l bnRyaWVzLnJlbW92ZSgwKTsKKyAgICAgICAgbV9lbnRyeUhhc2gucmVtb3ZlKGl0ZW0pOworICAg ICAgICBwYWdlQ2FjaGUoKS0+cmVtb3ZlKGl0ZW0uZ2V0KCkpOworICAgICAgICBtX2N1cnJlbnQt LTsKKyAgICB9CisKKyAgICBtX2VudHJpZXMucHJlcGVuZChuZXdJdGVtKTsKKyAgICBtX2VudHJ5 SGFzaC5hZGQobmV3SXRlbSk7CisgICAgbV9jdXJyZW50Kys7Cit9CiAKIHZvaWQgQmFja0Zvcndh cmRMaXN0Ojpnb0JhY2soKQogewpkaWZmIC1ydXAgYS9zcmMvM3JkcGFydHkvd2Via2l0L1dlYkNv cmUvaGlzdG9yeS9CYWNrRm9yd2FyZExpc3QuaCBiL3NyYy8zcmRwYXJ0eS93ZWJraXQvV2ViQ29y ZS9oaXN0b3J5L0JhY2tGb3J3YXJkTGlzdC5oCi0tLSBhL3NyYy8zcmRwYXJ0eS93ZWJraXQvV2Vi Q29yZS9oaXN0b3J5L0JhY2tGb3J3YXJkTGlzdC5oCTIwMDktMDItMjUgMTI6MzI6MzQuMDAwMDAw MDAwIC0wODAwCisrKyBiL3NyYy8zcmRwYXJ0eS93ZWJraXQvV2ViQ29yZS9oaXN0b3J5L0JhY2tG b3J3YXJkTGlzdC5oCTIwMDktMDYtMTEgMTM6MzE6MTIuMDc4MTI1MDAwIC0wNzAwCkBAIC00OCw2 ICs0OCw3IEBAIHB1YmxpYzogCiAgICAgUGFnZSogcGFnZSgpIHsgcmV0dXJuIG1fcGFnZTsgfQog ICAgIAogICAgIHZvaWQgYWRkSXRlbShQYXNzUmVmUHRyPEhpc3RvcnlJdGVtPik7CisgICAgdm9p ZCBwcmVwZW5kSXRlbShQYXNzUmVmUHRyPEhpc3RvcnlJdGVtPik7CiAgICAgdm9pZCBnb0JhY2so KTsKICAgICB2b2lkIGdvRm9yd2FyZCgpOwogICAgIHZvaWQgZ29Ub0l0ZW0oSGlzdG9yeUl0ZW0q KTsKZGlmZiAtcnVwIGEvc3JjLzNyZHBhcnR5L3dlYmtpdC9XZWJLaXQvcXQvQXBpL3F3ZWJoaXN0 b3J5LmNwcCBiL3NyYy8zcmRwYXJ0eS93ZWJraXQvV2ViS2l0L3F0L0FwaS9xd2ViaGlzdG9yeS5j cHAKLS0tIGEvc3JjLzNyZHBhcnR5L3dlYmtpdC9XZWJLaXQvcXQvQXBpL3F3ZWJoaXN0b3J5LmNw cAkyMDA5LTAyLTI1IDEyOjMyOjM0LjAwMDAwMDAwMCAtMDgwMAorKysgYi9zcmMvM3JkcGFydHkv d2Via2l0L1dlYktpdC9xdC9BcGkvcXdlYmhpc3RvcnkuY3BwCTIwMDktMDYtMTIgMTA6MjM6NDIu ODkwNjI1MDAwIC0wNzAwCkBAIC0yNDgsNiArMjQ4LDIyIEBAIHZvaWQgUVdlYkhpc3Rvcnk6OmNs ZWFyKCkKIH0KIAogLyohCisgIFByZXBlbmRzIGhpc3RvcnkgaXRlbSBnaXZlbiB1cmwsIHRpdGxl LCBhbmQgbGFzdFZpc2l0ZWQgdGltZQorCisgIFxzYSBjb3VudCgpLCBjbGVhcigpCisqLwordm9p ZCBRV2ViSGlzdG9yeTo6cHJlcGVuZEl0ZW0oY29uc3QgUVN0cmluZyAmdXJsU3RyaW5nLCBjb25z dCBRU3RyaW5nICZ0aXRsZSwgCisJCQkJCQkJICBjb25zdCBRRGF0ZVRpbWUgJmxhc3RWaXNpdGVk KQoreworICAgIFJlZlB0cjxXZWJDb3JlOjpIaXN0b3J5SXRlbT4gaXRlbSA9CisgICAgICBXZWJD b3JlOjpIaXN0b3J5SXRlbTo6Y3JlYXRlKFdlYkNvcmU6OlN0cmluZyh1cmxTdHJpbmcpLCBXZWJD b3JlOjpTdHJpbmcodGl0bGUpLCAKKwkJCQkgICAoZG91YmxlKWxhc3RWaXNpdGVkLnRvVGltZV90 KCkpOworCisgICAgZC0+bHN0LT5wcmVwZW5kSXRlbShpdGVtKTsKK30KKworCisvKiEKICAgUmV0 dXJucyBhIGxpc3Qgb2YgYWxsIGl0ZW1zIGN1cnJlbnRseSBpbiB0aGUgaGlzdG9yeS4KIAogICBc c2EgY291bnQoKSwgY2xlYXIoKQpkaWZmIC1ydXAgYS9zcmMvM3JkcGFydHkvd2Via2l0L1dlYktp dC9xdC9BcGkvcXdlYmhpc3RvcnkuaCBiL3NyYy8zcmRwYXJ0eS93ZWJraXQvV2ViS2l0L3F0L0Fw aS9xd2ViaGlzdG9yeS5oCi0tLSBhL3NyYy8zcmRwYXJ0eS93ZWJraXQvV2ViS2l0L3F0L0FwaS9x d2ViaGlzdG9yeS5oCTIwMDktMDItMjUgMTI6MzI6MzQuMDAwMDAwMDAwIC0wODAwCisrKyBiL3Ny Yy8zcmRwYXJ0eS93ZWJraXQvV2ViS2l0L3F0L0FwaS9xd2ViaGlzdG9yeS5oCTIwMDktMDYtMTIg MTA6MjM6MjkuMjE4NzUwMDAwIC0wNzAwCkBAIC02OSw2ICs2OSw4IEBAIGNsYXNzIFFXRUJLSVRf RVhQT1JUIFFXZWJIaXN0b3J5CiBwdWJsaWM6CiAgICAgdm9pZCBjbGVhcigpOwogCisgICAgdm9p ZCBwcmVwZW5kSXRlbShjb25zdCBRU3RyaW5nICZ1cmxTdHJpbmcsIGNvbnN0IFFTdHJpbmcgJnRp dGxlLCBjb25zdCBRRGF0ZVRpbWUgJmxhc3RWaXNpdGVkKTsKKwogICAgIFFMaXN0PFFXZWJIaXN0 b3J5SXRlbT4gaXRlbXMoKSBjb25zdDsKICAgICBRTGlzdDxRV2ViSGlzdG9yeUl0ZW0+IGJhY2tJ dGVtcyhpbnQgbWF4SXRlbXMpIGNvbnN0OwogICAgIFFMaXN0PFFXZWJIaXN0b3J5SXRlbT4gZm9y d2FyZEl0ZW1zKGludCBtYXhJdGVtcykgY29uc3Q7Cg== 31721 2009-06-23 08:22:28 -0700 2009-06-25 06:24:59 -0700 minor cleanups + changelog 0001-Add-API-for-prepending-URLs-to-history.patch text/plain 5965 ben RnJvbSA5MjU4MDE0NTI4YjllZDU0ODVkMTliMTgxYjFkNWU4NmFjY2YwNzAwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSaWNrIExpbmRlbiA8KHJpY2tAbGluZGVubGFiLmNvbSk+CkRh dGU6IFR1ZSwgMTYgSnVuIDIwMDkgMTU6NTM6MzggLTA3MDAKU3ViamVjdDogW1BBVENIXSBBZGQg QVBJIGZvciBwcmVwZW5kaW5nIFVSTHMgdG8gaGlzdG9yeQoKVGhpcyBwYXRjaCBhZGRzIGEgbmV3 IEFQSSB0byBXZWJLaXQgdG8gYWRkIGEgInByZXBlbmQgVVJMIiBBUEksIHRvIGZhY2lsaXRhdGUK YWRkaW5nIGhpc3RvcnkgaXRlbXMgc28gdGhhdCB0aGUgYnJvd3NlciBoaXN0b3J5IGNhbiBiZSBw cmUtbG9hZGVkIHVwb24gc3RhcnR1cC4KClNlZSBodHRwczovL2ppcmEubGluZGVubGFiLmNvbS9q aXJhL2Jyb3dzZS9ERVYtMzM2NDAKYW5kIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yNjQ1Mgpmb3IgbW9yZSBpbmZvCi0tLQogV2ViQ29yZS9DaGFuZ2VMb2cgICAgICAg ICAgICAgICAgICAgfCAgIDIwICsrKysrKysrKysrKysrKysrKysrCiBXZWJDb3JlL2hpc3Rvcnkv QmFja0ZvcndhcmRMaXN0LmNwcCB8ICAgMjcgKysrKysrKysrKysrKysrKysrKysrKysrLS0tCiBX ZWJDb3JlL2hpc3RvcnkvQmFja0ZvcndhcmRMaXN0LmggICB8ICAgIDEgKwogV2ViS2l0L3F0L0Fw aS9xd2ViaGlzdG9yeS5jcHAgICAgICAgfCAgIDE4ICsrKysrKysrKysrKysrKysrLQogV2ViS2l0 L3F0L0FwaS9xd2ViaGlzdG9yeS5oICAgICAgICAgfCAgICAyICsrCiBXZWJLaXQvcXQvQ2hhbmdl TG9nICAgICAgICAgICAgICAgICB8ICAgMTcgKysrKysrKysrKysrKysrKysKIDYgZmlsZXMgY2hh bmdlZCwgODEgaW5zZXJ0aW9ucygrKSwgNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9XZWJD b3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDQwMDljNjIuLmYzYjMwYTkg MTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjMgQEAKKzIwMDktMDYtMjMgIFJpY2sgTGluZGVuICA8KHJpY2tAbGluZGVubGFi LmNvbSk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg QWRkIEFQSSBmb3IgcHJlcGVuZGluZyBVUkxzIHRvIGhpc3RvcnkKKyAgICAgICAgCisgICAgICAg IFRoaXMgcGF0Y2ggYWRkcyBhIG5ldyBBUEkgdG8gV2ViS2l0IHRvIGFkZCBhICJwcmVwZW5kIFVS TCIgQVBJLCB0byBmYWNpbGl0YXRlCisgICAgICAgIGFkZGluZyBoaXN0b3J5IGl0ZW1zIHNvIHRo YXQgdGhlIGJyb3dzZXIgaGlzdG9yeSBjYW4gYmUgcHJlLWxvYWRlZCB1cG9uIHN0YXJ0dXAuCisg ICAgICAgIAorICAgICAgICBTZWUgaHR0cHM6Ly9qaXJhLmxpbmRlbmxhYi5jb20vamlyYS9icm93 c2UvREVWLTMzNjQwCisgICAgICAgIGFuZCBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjY0NTIKKyAgICAgICAgZm9yIG1vcmUgaW5mbworCisgICAgICAgIFdBUk5JTkc6 IE5PIFRFU1QgQ0FTRVMgQURERUQgT1IgQ0hBTkdFRAorCisgICAgICAgICogaGlzdG9yeS9CYWNr Rm9yd2FyZExpc3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QmFja0ZvcndhcmRMaXN0OjphZGRJ dGVtKToKKyAgICAgICAgKFdlYkNvcmU6OkJhY2tGb3J3YXJkTGlzdDo6cHJlcGVuZEl0ZW0pOgor ICAgICAgICAqIGhpc3RvcnkvQmFja0ZvcndhcmRMaXN0Lmg6CisKIDIwMDktMDYtMjMgIEVyaWMg Q2FybHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg RGFyaW4gQWRsZXIuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2hpc3RvcnkvQmFja0ZvcndhcmRMaXN0 LmNwcCBiL1dlYkNvcmUvaGlzdG9yeS9CYWNrRm9yd2FyZExpc3QuY3BwCmluZGV4IDFiN2M4MGUu LjAyMjFmMzQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaGlzdG9yeS9CYWNrRm9yd2FyZExpc3QuY3Bw CisrKyBiL1dlYkNvcmUvaGlzdG9yeS9CYWNrRm9yd2FyZExpc3QuY3BwCkBAIC01Miw5ICs1Miw5 IEBAIEJhY2tGb3J3YXJkTGlzdDo6fkJhY2tGb3J3YXJkTGlzdCgpCiAgICAgQVNTRVJUKG1fY2xv c2VkKTsKIH0KIAotdm9pZCBCYWNrRm9yd2FyZExpc3Q6OmFkZEl0ZW0oUGFzc1JlZlB0cjxIaXN0 b3J5SXRlbT4gcHJwSXRlbSkKK3ZvaWQgQmFja0ZvcndhcmRMaXN0OjphZGRJdGVtKFBhc3NSZWZQ dHI8SGlzdG9yeUl0ZW0+IG5ld0l0ZW0pCiB7Ci0gICAgQVNTRVJUKHBycEl0ZW0pOworICAgIEFT U0VSVChuZXdJdGVtKTsKICAgICBpZiAobV9jYXBhY2l0eSA9PSAwIHx8ICFtX2VuYWJsZWQpCiAg ICAgICAgIHJldHVybjsKICAgICAKQEAgLTc5LDExICs3OSwzMiBAQCB2b2lkIEJhY2tGb3J3YXJk TGlzdDo6YWRkSXRlbShQYXNzUmVmUHRyPEhpc3RvcnlJdGVtPiBwcnBJdGVtKQogICAgICAgICBt X2N1cnJlbnQtLTsKICAgICB9CiAgICAgCi0gICAgbV9lbnRyaWVzLmFwcGVuZChwcnBJdGVtKTsK KyAgICBtX2VudHJpZXMuYXBwZW5kKG5ld0l0ZW0pOwogICAgIG1fZW50cnlIYXNoLmFkZChtX2Vu dHJpZXMubGFzdCgpKTsKICAgICBtX2N1cnJlbnQrKzsKIH0KIAordm9pZCBCYWNrRm9yd2FyZExp c3Q6OnByZXBlbmRJdGVtKFBhc3NSZWZQdHI8SGlzdG9yeUl0ZW0+IG5ld0l0ZW0pCit7CisgICAg QVNTRVJUKG5ld0l0ZW0pOworICAgIGlmIChtX2NhcGFjaXR5ID09IDAgfHwgIW1fZW5hYmxlZCkK KyAgICAgICAgcmV0dXJuOworCisgICAgLy8gVG9zcyB0aGUgZmlyc3QgaXRlbSBpZiB0aGUgbGlz dCBpcyBnZXR0aW5nIHRvbyBiaWcsIGFzIGxvbmcgYXMgd2UncmUgbm90IHVzaW5nIGl0CisgICAg Ly8gKG9yIGV2ZW4gaWYgd2UgYXJlLCBpZiB3ZSBvbmx5IHdhbnQgMSBlbnRyeSkuCisgICAgaWYg KG1fZW50cmllcy5zaXplKCkgPT0gbV9jYXBhY2l0eSAmJiAobV9jdXJyZW50ICE9IDAgfHwgbV9j YXBhY2l0eSA9PSAxKSkgeworICAgICAgICBSZWZQdHI8SGlzdG9yeUl0ZW0+IGl0ZW0gPSBtX2Vu dHJpZXNbMF07CisgICAgICAgIG1fZW50cmllcy5yZW1vdmUoMCk7CisgICAgICAgIG1fZW50cnlI YXNoLnJlbW92ZShpdGVtKTsKKyAgICAgICAgcGFnZUNhY2hlKCktPnJlbW92ZShpdGVtLmdldCgp KTsKKyAgICAgICAgbV9jdXJyZW50LS07CisgICAgfQorCisgICAgbV9lbnRyaWVzLnByZXBlbmQo bmV3SXRlbSk7CisgICAgbV9lbnRyeUhhc2guYWRkKG5ld0l0ZW0pOworICAgIG1fY3VycmVudCsr OworfQorCiB2b2lkIEJhY2tGb3J3YXJkTGlzdDo6Z29CYWNrKCkKIHsKICAgICBBU1NFUlQobV9j dXJyZW50ID4gMCk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2hpc3RvcnkvQmFja0ZvcndhcmRMaXN0 LmggYi9XZWJDb3JlL2hpc3RvcnkvQmFja0ZvcndhcmRMaXN0LmgKaW5kZXggYTk5ZDM4Ny4uNmY0 NTg0NyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9oaXN0b3J5L0JhY2tGb3J3YXJkTGlzdC5oCisrKyBi L1dlYkNvcmUvaGlzdG9yeS9CYWNrRm9yd2FyZExpc3QuaApAQCAtNzAsNiArNzAsNyBAQCBwdWJs aWM6CiAgICAgUGFnZSogcGFnZSgpIHsgcmV0dXJuIG1fcGFnZTsgfQogICAgIAogICAgIHZvaWQg YWRkSXRlbShQYXNzUmVmUHRyPEhpc3RvcnlJdGVtPik7CisgICAgdm9pZCBwcmVwZW5kSXRlbShQ YXNzUmVmUHRyPEhpc3RvcnlJdGVtPik7CiAgICAgdm9pZCBnb0JhY2soKTsKICAgICB2b2lkIGdv Rm9yd2FyZCgpOwogICAgIHZvaWQgZ29Ub0l0ZW0oSGlzdG9yeUl0ZW0qKTsKZGlmZiAtLWdpdCBh L1dlYktpdC9xdC9BcGkvcXdlYmhpc3RvcnkuY3BwIGIvV2ViS2l0L3F0L0FwaS9xd2ViaGlzdG9y eS5jcHAKaW5kZXggMDdkMDI3ZC4uOGJhMDY1NCAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L0FwaS9x d2ViaGlzdG9yeS5jcHAKKysrIGIvV2ViS2l0L3F0L0FwaS9xd2ViaGlzdG9yeS5jcHAKQEAgLTI0 OCw5ICsyNDgsMjUgQEAgdm9pZCBRV2ViSGlzdG9yeTo6Y2xlYXIoKQogfQogCiAvKiEKKyAgUHJl cGVuZCBhIGhpc3RvcnkgaXRlbSB3aXRoIGEgZ2l2ZW4gdXJsLCB0aXRsZSwgYW5kIGxhc3RWaXNp dGVkIHRpbWUuCisKKyAgXHNhIGl0ZW1zKCksIGNvdW50KCksIGNsZWFyKCkKKyovCit2b2lkIFFX ZWJIaXN0b3J5OjpwcmVwZW5kSXRlbShjb25zdCBRU3RyaW5nICZ1cmxTdHJpbmcsIGNvbnN0IFFT dHJpbmcgJnRpdGxlLAorCQkJCQkJCSAgY29uc3QgUURhdGVUaW1lICZsYXN0VmlzaXRlZCkKK3sK KyAgICBSZWZQdHI8V2ViQ29yZTo6SGlzdG9yeUl0ZW0+IGl0ZW0gPQorICAgICAgV2ViQ29yZTo6 SGlzdG9yeUl0ZW06OmNyZWF0ZShXZWJDb3JlOjpTdHJpbmcodXJsU3RyaW5nKSwgV2ViQ29yZTo6 U3RyaW5nKHRpdGxlKSwKKwkJCQkgICAoZG91YmxlKWxhc3RWaXNpdGVkLnRvVGltZV90KCkpOwor CisgICAgZC0+bHN0LT5wcmVwZW5kSXRlbShpdGVtKTsKK30KKworCisvKiEKICAgUmV0dXJucyBh IGxpc3Qgb2YgYWxsIGl0ZW1zIGN1cnJlbnRseSBpbiB0aGUgaGlzdG9yeS4KIAotICBcc2EgY291 bnQoKSwgY2xlYXIoKQorICBcc2EgcHJlcGVuZEl0ZW0oKSwgY291bnQoKSwgY2xlYXIoKQogKi8K IFFMaXN0PFFXZWJIaXN0b3J5SXRlbT4gUVdlYkhpc3Rvcnk6Oml0ZW1zKCkgY29uc3QKIHsKZGlm ZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcXdlYmhpc3RvcnkuaCBiL1dlYktpdC9xdC9BcGkvcXdl Ymhpc3RvcnkuaAppbmRleCBjMzkwNzdkLi5mMzQzNDA4IDEwMDY0NAotLS0gYS9XZWJLaXQvcXQv QXBpL3F3ZWJoaXN0b3J5LmgKKysrIGIvV2ViS2l0L3F0L0FwaS9xd2ViaGlzdG9yeS5oCkBAIC02 OSw2ICs2OSw4IEBAIGNsYXNzIFFXRUJLSVRfRVhQT1JUIFFXZWJIaXN0b3J5CiBwdWJsaWM6CiAg ICAgdm9pZCBjbGVhcigpOwogCisgICAgdm9pZCBwcmVwZW5kSXRlbShjb25zdCBRU3RyaW5nICZ1 cmxTdHJpbmcsIGNvbnN0IFFTdHJpbmcgJnRpdGxlLCBjb25zdCBRRGF0ZVRpbWUgJmxhc3RWaXNp dGVkKTsKKwogICAgIFFMaXN0PFFXZWJIaXN0b3J5SXRlbT4gaXRlbXMoKSBjb25zdDsKICAgICBR TGlzdDxRV2ViSGlzdG9yeUl0ZW0+IGJhY2tJdGVtcyhpbnQgbWF4SXRlbXMpIGNvbnN0OwogICAg IFFMaXN0PFFXZWJIaXN0b3J5SXRlbT4gZm9yd2FyZEl0ZW1zKGludCBtYXhJdGVtcykgY29uc3Q7 CmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQ2hhbmdlTG9nIGIvV2ViS2l0L3F0L0NoYW5nZUxvZwpp bmRleCBjMmVkNDc1Li43NjI4MjNiIDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQ2hhbmdlTG9nCisr KyBiL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAwOS0wNi0yMyAgUmlj ayBMaW5kZW4gIDwocmlja0BsaW5kZW5sYWIuY29tKT4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgQVBJIGZvciBwcmVwZW5kaW5nIFVSTHMgdG8g aGlzdG9yeQorICAgICAgICAKKyAgICAgICAgVGhpcyBwYXRjaCBhZGRzIGEgbmV3IEFQSSB0byBX ZWJLaXQgdG8gYWRkIGEgInByZXBlbmQgVVJMIiBBUEksIHRvIGZhY2lsaXRhdGUKKyAgICAgICAg YWRkaW5nIGhpc3RvcnkgaXRlbXMgc28gdGhhdCB0aGUgYnJvd3NlciBoaXN0b3J5IGNhbiBiZSBw cmUtbG9hZGVkIHVwb24gc3RhcnR1cC4KKyAgICAgICAgCisgICAgICAgIFNlZSBodHRwczovL2pp cmEubGluZGVubGFiLmNvbS9qaXJhL2Jyb3dzZS9ERVYtMzM2NDAKKyAgICAgICAgYW5kIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNjQ1MgorICAgICAgICBmb3IgbW9y ZSBpbmZvCisKKyAgICAgICAgKiBBcGkvcXdlYmhpc3RvcnkuY3BwOgorICAgICAgICAoUVdlYkhp c3Rvcnk6OnByZXBlbmRJdGVtKToKKyAgICAgICAgKiBBcGkvcXdlYmhpc3RvcnkuaDoKKwogMjAw OS0wNi0xOSAgRGFuaWVsIFRlc2tlIDxxdC1pbmZvQG5va2lhLmNvbT4KIAogICAgICAgICBSZXZp ZXdlZCBieSBTaW1vbiBIYXVzbWFubi4KLS0gCjEuNi4wLjQKCg==