55842 2011-03-06 06:49:17 -0800 [Qt] Simplify how QWebFrame::requestedUrl() is obtained 2011-03-10 14:54:25 -0800 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) PC All RESOLVED FIXED Qt, QtTriaged P3 Normal --- 1 cmarcelo webkit-unassigned benjamin commit-queue tonikitoo oldest_to_newest 363066 0 cmarcelo 2011-03-06 06:49:17 -0800 The idea here is to always store the requested url once frame loader start the provisional load. And clears it when the load is finished -- since it is available in the document loader. The stored value is useful for the error cases, when the load wasn't successful. The idea is similar to the old implementation, but simpler. This change is related to bug 32723. There, I want to decouple the clearing of the frame from the URL passed in setUrl(), by removing the argument url from the call to DocumentWriter::begin(), and having the value stored in case of fail is useful to implement QWebFrame::url(). 363067 1 84888 cmarcelo 2011-03-06 07:00:18 -0800 Created attachment 84888 patch 363068 2 84888 kenneth 2011-03-06 07:03:21 -0800 Comment on attachment 84888 patch View in context: https://bugs.webkit.org/attachment.cgi?id=84888&action=review Your changelog does not explain why this new code is equal to the old code, or why the old code is wrong. Are these edge cases not valid anymore? > Source/WebKit/qt/ChangeLog:9 > + so we now it'll be available in the DocumentLoader. know? 363072 3 84889 cmarcelo 2011-03-06 07:51:32 -0800 Created attachment 84889 patch with improved ChangeLog 363073 4 cmarcelo 2011-03-06 07:59:34 -0800 Antonio, added you to CC since most of the requestedUrl() was implemented by you back in time. Would be very helpful if you could take a look / review this patch, or point some one who would be able to review it. :-) 365554 5 84889 commit-queue 2011-03-10 14:54:20 -0800 Comment on attachment 84889 patch with improved ChangeLog Clearing flags on attachment: 84889 Committed r80768: <http://trac.webkit.org/changeset/80768> 365555 6 commit-queue 2011-03-10 14:54:25 -0800 All reviewed patches have been landed. Closing bug. 84888 2011-03-06 07:00:18 -0800 2011-03-06 07:51:32 -0800 patch 0001-Simplify-how-QWebFrame-requestedUrl-is-obtained.patch text/plain 5475 cmarcelo RnJvbSBkOTllM2U3ZWIwNjAwNzU3MWIzNzk1M2I2YWMyZmRmODAxZTQ1N2NiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBDYWlvIE1hcmNlbG8gZGUgT2xpdmVpcmEgRmlsaG8gPGNhaW8u b2xpdmVpcmFAb3BlbmJvc3NhLm9yZz4KRGF0ZTogU3VuLCA2IE1hciAyMDExIDExOjUzOjU1IC0w MzAwClN1YmplY3Q6IFtQQVRDSF0gU2ltcGxpZnkgaG93IFFXZWJGcmFtZTo6cmVxdWVzdGVkVXJs KCkgaXMgb2J0YWluZWQKIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01 NTg0MgoKUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgpTdG9yZSB0aGUgcmVxdWVzdGVkIFVS TCBhbmQgaG9sZCBpdCB1bnRpbCB0aGUgbmV3IGRvY3VtZW50IGlzIGxvYWRlciwKc28gd2Ugbm93 IGl0J2xsIGJlIGF2YWlsYWJsZSBpbiB0aGUgRG9jdW1lbnRMb2FkZXIuCgoqIEFwaS9xd2ViZnJh bWUuY3BwOgooUVdlYkZyYW1lOjpyZXF1ZXN0ZWRVcmwpOgoqIFdlYkNvcmVTdXBwb3J0L0ZyYW1l TG9hZGVyQ2xpZW50UXQuY3BwOgooV2ViQ29yZTo6RnJhbWVMb2FkZXJDbGllbnRRdDo6ZGlzcGF0 Y2hEaWRTdGFydFByb3Zpc2lvbmFsTG9hZCk6CihXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudFF0 OjpkaXNwYXRjaERpZEZpbmlzaExvYWQpOgoqIFdlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xp ZW50UXQuaDoKKFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50UXQ6Omxhc3RSZXF1ZXN0ZWRVcmwp OgotLS0KIFNvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5jcHAgICAgICAgICAgICAgICAg IHwgICAyNCArKystLS0tLS0tLS0tLS0tLS0tCiBTb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZyAg ICAgICAgICAgICAgICAgICAgICAgICB8ICAgMTggKysrKysrKysrKysrKysrCiAuLi4vcXQvV2Vi Q29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHAgICAgICB8ICAgIDYgKysrKysKIC4u Li9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5oIHwgICAgMyAr KwogNCBmaWxlcyBjaGFuZ2VkLCAzMSBpbnNlcnRpb25zKCspLCAyMCBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuY3BwIGIvU291cmNlL1dl YktpdC9xdC9BcGkvcXdlYmZyYW1lLmNwcAppbmRleCA2Zjk4YmNhLi43NGEyYmQyIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvcXQvQXBpL3F3ZWJmcmFtZS5jcHAKQEAgLTc4MCwyNiArNzgwLDEwIEBAIFFVcmwgUVdlYkZy YW1lOjp1cmwoKSBjb25zdAogKi8KIFFVcmwgUVdlYkZyYW1lOjpyZXF1ZXN0ZWRVcmwoKSBjb25z dAogewotICAgIC8vIFRoZXJlIGFyZSBzb21lIHBvc3NpYmxlIGVkZ2UgY2FzZXMgdG8gYmUgaGFu ZGxlZCBoZXJlLAotICAgIC8vIGFwYXJ0IGZyb20gY2hlY2tpbmcgaWYgYWN0aXZlRG9jdW1lbnRM b2FkZXIgaXMgdmFsaWQ6Ci0gICAgLy8KLSAgICAvLyAqIE1ldGhvZCBjYW4gYmUgY2FsbGVkIHdo aWxlIHByb2Nlc3NpbmcgYW4gdW5zdWNlc3NmdWwgbG9hZC4KLSAgICAvLyAgIEluIHRoaXMgY2Fz ZSwgZnJhbWVMb2FkZXJDbGllbnQgd2lsbCBob2xkIHRoZSBjdXJyZW50IGVycm9yCi0gICAgLy8g ICAobV9sb2FkRXJyb3IpLCBhbmQgd2Ugd2lsbCBtYWtlIHVzZSBvZiBpdCB0byByZWNvdmVyIHRo ZSAnZmFpbGluZ1VSTCcuCi0gICAgLy8gKiBJZiB0aGUgJ2ZhaWxpbmdVUkwnIGhvbGRzIGEgbnVs bCdlZCBzdHJpbmcgdGhvdWdoLCB3ZSBmYWxsYmFjawotICAgIC8vICAgdG8gJ291dGdvaW5nUmVm ZXJyZXInIChpdCB5ZXQgaXMgc2FmZXIgdGhhbiBvcmlnaW5hbFJlcXVlc3QpLgotICAgIEZyYW1l TG9hZGVyKiBsb2FkZXIgPSBkLT5mcmFtZS0+bG9hZGVyKCk7Ci0gICAgRnJhbWVMb2FkZXJDbGll bnRRdCogbG9hZGVyQ2xpZW50ID0gZC0+ZnJhbWVMb2FkZXJDbGllbnQ7Ci0KLSAgICBpZiAoIWxv YWRlci0+YWN0aXZlRG9jdW1lbnRMb2FkZXIoKQotICAgICAgICB8fCAhbG9hZGVyQ2xpZW50LT5t X2xvYWRFcnJvci5pc051bGwoKSkgewotICAgICAgICBpZiAoIWxvYWRlckNsaWVudC0+bV9sb2Fk RXJyb3IuZmFpbGluZ1VSTCgpLmlzTnVsbCgpKQotICAgICAgICAgICAgcmV0dXJuIFFVcmwobG9h ZGVyQ2xpZW50LT5tX2xvYWRFcnJvci5mYWlsaW5nVVJMKCkpOwotICAgICAgICBlbHNlIGlmICgh bG9hZGVyLT5vdXRnb2luZ1JlZmVycmVyKCkuaXNFbXB0eSgpKQotICAgICAgICAgICAgcmV0dXJu IFFVcmwobG9hZGVyLT5vdXRnb2luZ1JlZmVycmVyKCkpOwotICAgIH0KLQotICAgIHJldHVybiBs b2FkZXItPm9yaWdpbmFsUmVxdWVzdCgpLnVybCgpOworICAgIGNvbnN0IEtVUkwmIGxhc3RSZXF1 ZXN0ZWRVcmwgPSBkLT5mcmFtZUxvYWRlckNsaWVudC0+bGFzdFJlcXVlc3RlZFVybCgpOworICAg IGlmIChsYXN0UmVxdWVzdGVkVXJsLmlzVmFsaWQoKSkKKyAgICAgICAgcmV0dXJuIGxhc3RSZXF1 ZXN0ZWRVcmw7CisgICAgcmV0dXJuIGQtPmZyYW1lLT5sb2FkZXIoKS0+b3JpZ2luYWxSZXF1ZXN0 KCkudXJsKCk7CiB9CiAvKiEKICAgICBcc2luY2UgNC42CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L3F0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IDYzM2U3 N2UuLjgyNzJkOGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDMtMDYg IENhaW8gTWFyY2VsbyBkZSBPbGl2ZWlyYSBGaWxobyAgPGNhaW8ub2xpdmVpcmFAb3BlbmJvc3Nh Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBT aW1wbGlmeSBob3cgUVdlYkZyYW1lOjpyZXF1ZXN0ZWRVcmwoKSBpcyBvYnRhaW5lZAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTU4NDIKKworICAgICAg ICBTdG9yZSB0aGUgcmVxdWVzdGVkIFVSTCBhbmQgaG9sZCBpdCB1bnRpbCB0aGUgbmV3IGRvY3Vt ZW50IGlzIGxvYWRlciwKKyAgICAgICAgc28gd2Ugbm93IGl0J2xsIGJlIGF2YWlsYWJsZSBpbiB0 aGUgRG9jdW1lbnRMb2FkZXIuCisKKyAgICAgICAgKiBBcGkvcXdlYmZyYW1lLmNwcDoKKyAgICAg ICAgKFFXZWJGcmFtZTo6cmVxdWVzdGVkVXJsKToKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9G cmFtZUxvYWRlckNsaWVudFF0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xp ZW50UXQ6OmRpc3BhdGNoRGlkU3RhcnRQcm92aXNpb25hbExvYWQpOgorICAgICAgICAoV2ViQ29y ZTo6RnJhbWVMb2FkZXJDbGllbnRRdDo6ZGlzcGF0Y2hEaWRGaW5pc2hMb2FkKToKKyAgICAgICAg KiBXZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0Lmg6CisgICAgICAgIChXZWJDb3Jl OjpGcmFtZUxvYWRlckNsaWVudFF0OjpsYXN0UmVxdWVzdGVkVXJsKToKKwogMjAxMS0wMy0wMyAg TWFoZXNoIEt1bGthcm5pICA8bWFoZXNoLmt1bGthcm5pQG5va2lhLmNvbT4KIAogICAgICAgICBS ZXZpZXdlZCBieSBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbi4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHAgYi9Tb3Vy Y2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQuY3BwCmluZGV4 IDgwMjQyZmMuLjY2YzE5ZmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1 cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9xdC9XZWJD b3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmNwcApAQCAtNDM3LDYgKzQzNyw4IEBAIHZv aWQgRnJhbWVMb2FkZXJDbGllbnRRdDo6ZGlzcGF0Y2hEaWRTdGFydFByb3Zpc2lvbmFsTG9hZCgp CiAgICAgaWYgKGR1bXBVc2VyR2VzdHVyZUluRnJhbWVMb2FkZXJDYWxsYmFja3MpCiAgICAgICAg IHByaW50ZigiJXMgLSBpbiBkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lXG4iLCBxUHJp bnRhYmxlKGRydFByaW50RnJhbWVVc2VyR2VzdHVyZVN0YXR1cyhtX2ZyYW1lKSkpOwogCisgICAg bV9sYXN0UmVxdWVzdGVkVXJsID0gbV9mcmFtZS0+bG9hZGVyKCktPmFjdGl2ZURvY3VtZW50TG9h ZGVyKCktPnJlcXVlc3RVUkwoKTsKKwogICAgIGlmIChtX3dlYkZyYW1lKQogICAgICAgICBlbWl0 IG1fd2ViRnJhbWUtPnByb3Zpc2lvbmFsTG9hZCgpOwogfQpAQCAtNTE3LDYgKzUxOSwxMCBAQCB2 b2lkIEZyYW1lTG9hZGVyQ2xpZW50UXQ6OmRpc3BhdGNoRGlkRmluaXNoTG9hZCgpCiAgICAgLy8g Q2xlYXJzIHRoZSBwcmV2aW91cyBlcnJvci4KICAgICBtX2xvYWRFcnJvciA9IFJlc291cmNlRXJy b3IoKTsKIAorICAgIC8vIFRoZSByZXF1ZXN0ZWQgVVJMIHdpbGwgYmUgYXZhaWxhYmxlIGluIHRo ZSBkb2N1bWVudCBsb2FkZXIgdGhhdCBqdXN0IGZpbmlzaGVkLCBzbyB3ZQorICAgIC8vIGRvbid0 IG5lZWQgdG8ga2VlcCBpdCBhbnltb3JlLgorICAgIG1fbGFzdFJlcXVlc3RlZFVybCA9IEtVUkwo KTsKKwogICAgIGlmICghbV93ZWJGcmFtZSkKICAgICAgICAgcmV0dXJuOwogICAgIG1fd2ViRnJh bWUtPnBhZ2UoKS0+ZC0+dXBkYXRlTmF2aWdhdGlvbkFjdGlvbnMoKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5oIGIvU291 cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmgKaW5kZXgg OGFhNGZlYy4uZmFlNjcyOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3Vw cG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmgKKysrIGIvU291cmNlL1dlYktpdC9xdC9XZWJDb3Jl U3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmgKQEAgLTIzOSw2ICsyMzksOCBAQCBwdWJsaWM6 CiAKICAgICB2aXJ0dWFsIFBhc3NSZWZQdHI8RnJhbWVOZXR3b3JraW5nQ29udGV4dD4gY3JlYXRl TmV0d29ya2luZ0NvbnRleHQoKTsKIAorICAgIGNvbnN0IEtVUkwmIGxhc3RSZXF1ZXN0ZWRVcmwo KSBjb25zdCB7IHJldHVybiBtX2xhc3RSZXF1ZXN0ZWRVcmw7IH0KKwogICAgIHN0YXRpYyBib29s IGR1bXBGcmFtZUxvYWRlckNhbGxiYWNrczsKICAgICBzdGF0aWMgYm9vbCBkdW1wVXNlckdlc3R1 cmVJbkZyYW1lTG9hZGVyQ2FsbGJhY2tzOwogICAgIHN0YXRpYyBib29sIGR1bXBSZXNvdXJjZUxv YWRDYWxsYmFja3M7CkBAIC0yNjcsNiArMjY5LDcgQEAgcHJpdmF0ZToKICAgICAvLyBTZWUgZmlu aXNoZWRMb2FkaW5nKCkuCiAgICAgYm9vbCBtX2hhc1JlcHJlc2VudGF0aW9uOwogCisgICAgS1VS TCBtX2xhc3RSZXF1ZXN0ZWRVcmw7CiAgICAgUmVzb3VyY2VFcnJvciBtX2xvYWRFcnJvcjsKIH07 CiAK 84889 2011-03-06 07:51:32 -0800 2011-03-10 14:54:20 -0800 patch with improved ChangeLog 0001-Simplify-how-QWebFrame-requestedUrl-is-obtained.patch text/plain 6456 cmarcelo RnJvbSAxMWFjODA4YTY3OGQ1ZmE0NzhlNzZmYzFjZDA2YmMwM2M4OTFjNzVlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBDYWlvIE1hcmNlbG8gZGUgT2xpdmVpcmEgRmlsaG8gPGNhaW8u b2xpdmVpcmFAb3BlbmJvc3NhLm9yZz4KRGF0ZTogU3VuLCA2IE1hciAyMDExIDEyOjQ5OjU2IC0w MzAwClN1YmplY3Q6IFtQQVRDSF0gU2ltcGxpZnkgaG93IFFXZWJGcmFtZTo6cmVxdWVzdGVkVXJs KCkgaXMgb2J0YWluZWQKIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01 NTg0MgoKUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgpXaGVuIGEgbG9hZCBzdGFydHMsIHN0 b3JlIHRoZSByZXF1ZXN0ZWQgVVJMIHVudGlsIHdlIGtub3cgdGhhdCBpdCdsbCBiZQphdmFpbGFi bGUgZm9yIHVzIGluIHRoZSBkb2N1bWVudCBsb2FkZXIgLS0gYWZ0ZXIgbG9hZCBmaW5pc2hlZC4K ClRoZSBleGlzdGluZyBhdXRvIHRlc3RzIGNvdmVyIHRoZSB0aHJlZSBkaWZmZXJlbnQgY29kZSBw YXRocyBpbgpyZXF1ZXN0ZWRVcmwoKSBhbmQgdGhlIG5ldyBjb2RlIHBhc3NlcyB0aGUgYXV0b3Rl c3RzLiBJbiBlYWNoIG9mIHRob3NlCmNhc2VzLCB3ZSBsb29rZWQgZm9yIHRoZSBpbmZvcm1hdGlv biBpbiBhIGRpZmZlcmVudCBwbGFjZSwgYnV0IGluIGFsbApvZiB0aGVtLCBkaXNwYXRjaERpZFN0 YXJ0UHJvdmlzaW9uYWxMb2FkIHdhcyBjYWxsZWQuCgpUaGlzIHNpbXBsaWZpY2F0aW9uIHdpbGwg YmUgdXNlZnVsIHRvIGZpeCBidWcgMzI3MjMuIFRoZSB3YXkgcmVxdWVzdGVkVXJsKCkKaXMgaW1w bGVtZW50ZW50LCB3ZSBjYW4ndCB1c2UgaXQgYXMgYSBmYWxsYmFjayBmb3IgdXJsKCkgd2hlbiB0 aGUgc2V0VXJsKCkKd2FzIGNhbGxlZCB3aXRoIGFuIGludmFsaWQgVVJMLgoKKiBBcGkvcXdlYmZy YW1lLmNwcDoKKFFXZWJGcmFtZTo6cmVxdWVzdGVkVXJsKToKKiBXZWJDb3JlU3VwcG9ydC9GcmFt ZUxvYWRlckNsaWVudFF0LmNwcDoKKFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50UXQ6OmRpc3Bh dGNoRGlkU3RhcnRQcm92aXNpb25hbExvYWQpOgooV2ViQ29yZTo6RnJhbWVMb2FkZXJDbGllbnRR dDo6ZGlzcGF0Y2hEaWRGaW5pc2hMb2FkKToKKiBXZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNs aWVudFF0Lmg6CihXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudFF0OjpsYXN0UmVxdWVzdGVkVXJs KToKLS0tCiBTb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuY3BwICAgICAgICAgICAgICAg ICB8ICAgMjQgKysrLS0tLS0tLS0tLS0tLS0KIFNvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nICAg ICAgICAgICAgICAgICAgICAgICAgIHwgICAyNyArKysrKysrKysrKysrKysrKysrKwogLi4uL3F0 L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQuY3BwICAgICAgfCAgICA2ICsrKysK IC4uLi9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5oIHwgICAg MyArKwogNCBmaWxlcyBjaGFuZ2VkLCA0MCBpbnNlcnRpb25zKCspLCAyMCBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuY3BwIGIvU291cmNl L1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmNwcAppbmRleCA2Zjk4YmNhLi43NGEyYmQyIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5jcHAKQEAgLTc4MCwyNiArNzgwLDEwIEBAIFFVcmwgUVdl YkZyYW1lOjp1cmwoKSBjb25zdAogKi8KIFFVcmwgUVdlYkZyYW1lOjpyZXF1ZXN0ZWRVcmwoKSBj b25zdAogewotICAgIC8vIFRoZXJlIGFyZSBzb21lIHBvc3NpYmxlIGVkZ2UgY2FzZXMgdG8gYmUg aGFuZGxlZCBoZXJlLAotICAgIC8vIGFwYXJ0IGZyb20gY2hlY2tpbmcgaWYgYWN0aXZlRG9jdW1l bnRMb2FkZXIgaXMgdmFsaWQ6Ci0gICAgLy8KLSAgICAvLyAqIE1ldGhvZCBjYW4gYmUgY2FsbGVk IHdoaWxlIHByb2Nlc3NpbmcgYW4gdW5zdWNlc3NmdWwgbG9hZC4KLSAgICAvLyAgIEluIHRoaXMg Y2FzZSwgZnJhbWVMb2FkZXJDbGllbnQgd2lsbCBob2xkIHRoZSBjdXJyZW50IGVycm9yCi0gICAg Ly8gICAobV9sb2FkRXJyb3IpLCBhbmQgd2Ugd2lsbCBtYWtlIHVzZSBvZiBpdCB0byByZWNvdmVy IHRoZSAnZmFpbGluZ1VSTCcuCi0gICAgLy8gKiBJZiB0aGUgJ2ZhaWxpbmdVUkwnIGhvbGRzIGEg bnVsbCdlZCBzdHJpbmcgdGhvdWdoLCB3ZSBmYWxsYmFjawotICAgIC8vICAgdG8gJ291dGdvaW5n UmVmZXJyZXInIChpdCB5ZXQgaXMgc2FmZXIgdGhhbiBvcmlnaW5hbFJlcXVlc3QpLgotICAgIEZy YW1lTG9hZGVyKiBsb2FkZXIgPSBkLT5mcmFtZS0+bG9hZGVyKCk7Ci0gICAgRnJhbWVMb2FkZXJD bGllbnRRdCogbG9hZGVyQ2xpZW50ID0gZC0+ZnJhbWVMb2FkZXJDbGllbnQ7Ci0KLSAgICBpZiAo IWxvYWRlci0+YWN0aXZlRG9jdW1lbnRMb2FkZXIoKQotICAgICAgICB8fCAhbG9hZGVyQ2xpZW50 LT5tX2xvYWRFcnJvci5pc051bGwoKSkgewotICAgICAgICBpZiAoIWxvYWRlckNsaWVudC0+bV9s b2FkRXJyb3IuZmFpbGluZ1VSTCgpLmlzTnVsbCgpKQotICAgICAgICAgICAgcmV0dXJuIFFVcmwo bG9hZGVyQ2xpZW50LT5tX2xvYWRFcnJvci5mYWlsaW5nVVJMKCkpOwotICAgICAgICBlbHNlIGlm ICghbG9hZGVyLT5vdXRnb2luZ1JlZmVycmVyKCkuaXNFbXB0eSgpKQotICAgICAgICAgICAgcmV0 dXJuIFFVcmwobG9hZGVyLT5vdXRnb2luZ1JlZmVycmVyKCkpOwotICAgIH0KLQotICAgIHJldHVy biBsb2FkZXItPm9yaWdpbmFsUmVxdWVzdCgpLnVybCgpOworICAgIGNvbnN0IEtVUkwmIGxhc3RS ZXF1ZXN0ZWRVcmwgPSBkLT5mcmFtZUxvYWRlckNsaWVudC0+bGFzdFJlcXVlc3RlZFVybCgpOwor ICAgIGlmIChsYXN0UmVxdWVzdGVkVXJsLmlzVmFsaWQoKSkKKyAgICAgICAgcmV0dXJuIGxhc3RS ZXF1ZXN0ZWRVcmw7CisgICAgcmV0dXJuIGQtPmZyYW1lLT5sb2FkZXIoKS0+b3JpZ2luYWxSZXF1 ZXN0KCkudXJsKCk7CiB9CiAvKiEKICAgICBcc2luY2UgNC42CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L3F0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IDYz M2U3N2UuLjZlOTIyZjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMTEtMDMt MDYgIENhaW8gTWFyY2VsbyBkZSBPbGl2ZWlyYSBGaWxobyAgPGNhaW8ub2xpdmVpcmFAb3BlbmJv c3NhLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBTaW1wbGlmeSBob3cgUVdlYkZyYW1lOjpyZXF1ZXN0ZWRVcmwoKSBpcyBvYnRhaW5lZAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTU4NDIKKworICAg ICAgICBXaGVuIGEgbG9hZCBzdGFydHMsIHN0b3JlIHRoZSByZXF1ZXN0ZWQgVVJMIHVudGlsIHdl IGtub3cgdGhhdCBpdCdsbCBiZQorICAgICAgICBhdmFpbGFibGUgZm9yIHVzIGluIHRoZSBkb2N1 bWVudCBsb2FkZXIgLS0gYWZ0ZXIgbG9hZCBmaW5pc2hlZC4KKworICAgICAgICBUaGUgZXhpc3Rp bmcgYXV0byB0ZXN0cyBjb3ZlciB0aGUgdGhyZWUgZGlmZmVyZW50IGNvZGUgcGF0aHMgaW4KKyAg ICAgICAgcmVxdWVzdGVkVXJsKCkgYW5kIHRoZSBuZXcgY29kZSBwYXNzZXMgdGhlIGF1dG90ZXN0 cy4gSW4gZWFjaCBvZiB0aG9zZQorICAgICAgICBjYXNlcywgd2UgbG9va2VkIGZvciB0aGUgaW5m b3JtYXRpb24gaW4gYSBkaWZmZXJlbnQgcGxhY2UsIGJ1dCBpbiBhbGwKKyAgICAgICAgb2YgdGhl bSwgZGlzcGF0Y2hEaWRTdGFydFByb3Zpc2lvbmFsTG9hZCB3YXMgY2FsbGVkLgorCisgICAgICAg IFRoaXMgc2ltcGxpZmljYXRpb24gd2lsbCBiZSB1c2VmdWwgdG8gZml4IGJ1ZyAzMjcyMy4gVGhl IHdheSByZXF1ZXN0ZWRVcmwoKQorICAgICAgICBpcyBpbXBsZW1lbnRlbnQsIHdlIGNhbid0IHVz ZSBpdCBhcyBhIGZhbGxiYWNrIGZvciB1cmwoKSB3aGVuIHRoZSBzZXRVcmwoKQorICAgICAgICB3 YXMgY2FsbGVkIHdpdGggYW4gaW52YWxpZCBVUkwuCisKKyAgICAgICAgKiBBcGkvcXdlYmZyYW1l LmNwcDoKKyAgICAgICAgKFFXZWJGcmFtZTo6cmVxdWVzdGVkVXJsKToKKyAgICAgICAgKiBXZWJD b3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZy YW1lTG9hZGVyQ2xpZW50UXQ6OmRpc3BhdGNoRGlkU3RhcnRQcm92aXNpb25hbExvYWQpOgorICAg ICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXJDbGllbnRRdDo6ZGlzcGF0Y2hEaWRGaW5pc2hMb2Fk KToKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0Lmg6CisgICAg ICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudFF0OjpsYXN0UmVxdWVzdGVkVXJsKToKKwog MjAxMS0wMy0wMyAgTWFoZXNoIEt1bGthcm5pICA8bWFoZXNoLmt1bGthcm5pQG5va2lhLmNvbT4K IAogICAgICAgICBSZXZpZXdlZCBieSBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbi4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRR dC5jcHAgYi9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50 UXQuY3BwCmluZGV4IDgwMjQyZmMuLjY2YzE5ZmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv cXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHAKKysrIGIvU291cmNlL1dl YktpdC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmNwcApAQCAtNDM3LDYg KzQzNyw4IEBAIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRRdDo6ZGlzcGF0Y2hEaWRTdGFydFByb3Zp c2lvbmFsTG9hZCgpCiAgICAgaWYgKGR1bXBVc2VyR2VzdHVyZUluRnJhbWVMb2FkZXJDYWxsYmFj a3MpCiAgICAgICAgIHByaW50ZigiJXMgLSBpbiBkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZy YW1lXG4iLCBxUHJpbnRhYmxlKGRydFByaW50RnJhbWVVc2VyR2VzdHVyZVN0YXR1cyhtX2ZyYW1l KSkpOwogCisgICAgbV9sYXN0UmVxdWVzdGVkVXJsID0gbV9mcmFtZS0+bG9hZGVyKCktPmFjdGl2 ZURvY3VtZW50TG9hZGVyKCktPnJlcXVlc3RVUkwoKTsKKwogICAgIGlmIChtX3dlYkZyYW1lKQog ICAgICAgICBlbWl0IG1fd2ViRnJhbWUtPnByb3Zpc2lvbmFsTG9hZCgpOwogfQpAQCAtNTE3LDYg KzUxOSwxMCBAQCB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50UXQ6OmRpc3BhdGNoRGlkRmluaXNoTG9h ZCgpCiAgICAgLy8gQ2xlYXJzIHRoZSBwcmV2aW91cyBlcnJvci4KICAgICBtX2xvYWRFcnJvciA9 IFJlc291cmNlRXJyb3IoKTsKIAorICAgIC8vIFRoZSByZXF1ZXN0ZWQgVVJMIHdpbGwgYmUgYXZh aWxhYmxlIGluIHRoZSBkb2N1bWVudCBsb2FkZXIgdGhhdCBqdXN0IGZpbmlzaGVkLCBzbyB3ZQor ICAgIC8vIGRvbid0IG5lZWQgdG8ga2VlcCBpdCBhbnltb3JlLgorICAgIG1fbGFzdFJlcXVlc3Rl ZFVybCA9IEtVUkwoKTsKKwogICAgIGlmICghbV93ZWJGcmFtZSkKICAgICAgICAgcmV0dXJuOwog ICAgIG1fd2ViRnJhbWUtPnBhZ2UoKS0+ZC0+dXBkYXRlTmF2aWdhdGlvbkFjdGlvbnMoKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGll bnRRdC5oIGIvU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVu dFF0LmgKaW5kZXggOGFhNGZlYy4uZmFlNjcyOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9x dC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmgKKysrIGIvU291cmNlL1dlYktp dC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmgKQEAgLTIzOSw2ICsyMzks OCBAQCBwdWJsaWM6CiAKICAgICB2aXJ0dWFsIFBhc3NSZWZQdHI8RnJhbWVOZXR3b3JraW5nQ29u dGV4dD4gY3JlYXRlTmV0d29ya2luZ0NvbnRleHQoKTsKIAorICAgIGNvbnN0IEtVUkwmIGxhc3RS ZXF1ZXN0ZWRVcmwoKSBjb25zdCB7IHJldHVybiBtX2xhc3RSZXF1ZXN0ZWRVcmw7IH0KKwogICAg IHN0YXRpYyBib29sIGR1bXBGcmFtZUxvYWRlckNhbGxiYWNrczsKICAgICBzdGF0aWMgYm9vbCBk dW1wVXNlckdlc3R1cmVJbkZyYW1lTG9hZGVyQ2FsbGJhY2tzOwogICAgIHN0YXRpYyBib29sIGR1 bXBSZXNvdXJjZUxvYWRDYWxsYmFja3M7CkBAIC0yNjcsNiArMjY5LDcgQEAgcHJpdmF0ZToKICAg ICAvLyBTZWUgZmluaXNoZWRMb2FkaW5nKCkuCiAgICAgYm9vbCBtX2hhc1JlcHJlc2VudGF0aW9u OwogCisgICAgS1VSTCBtX2xhc3RSZXF1ZXN0ZWRVcmw7CiAgICAgUmVzb3VyY2VFcnJvciBtX2xv YWRFcnJvcjsKIH07CiAK