29731 2009-09-24 20:05:41 -0700 [Qt] [Api] Added a QWebFrame::load(QWebLoadRequest) method 2009-09-28 12:29:16 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) PC All RESOLVED WONTFIX Qt P4 Minor --- 29248 29679 1 tonikitoo tonikitoo ariya.hidayat hausmann kenneth vestbo oldest_to_newest 149925 0 tonikitoo 2009-09-24 20:05:41 -0700 I liked the idea from https://bugs.webkit.org/show_bug.cgi?id=29248#c30 (In reply to comment #30) > Discussing this with Kent just gave me an alternate idea to fix the API: > > setHtml("<html>...", QUrl("file://..."), QUrl("..."); > > is not very readable. I don't know what the difference between the second and > third argument is. I would prefer something slightly more readable: > > QWebLoadRequest request; > request.baseUrl = "file://...."; > request.mimeType = "text/html"; > request.contentData = "<html>.."; > request.historyURl = "about:foo"; > webFrame->load(request); That way we can have a more robust substitution load mechanism, including "dataContent", "mimeType", "encoding", "urlForHistory" and whatever. it helps on a better "error pages" handling , see bug 29679. 149926 1 40097 tonikitoo 2009-09-24 20:18:09 -0700 Created attachment 40097 patch 0.1 Patch does: * Add a QWebLoadRequest (not yet inheriting from QNetworkRequest - maybe no need to). * Add a QWebFrame::load method that take a QWebLoadRequest as parameter * Adap QWebFrame's setHtml and setContent implementation to use QWebLoadRequest. * Make 'Substitution' load to not emit urlChanged. i am requesting review to get comments, since i probably needs a api discussion. 150081 2 tonikitoo 2009-09-25 11:24:35 -0700 clearing r=? flag since it is now clean if we are going to follow this approach ( add a new class specifically to do this ) and also downgrading the importance/priority 150600 3 tonikitoo 2009-09-28 12:29:16 -0700 right, per discussion to tor arne last friday on IRC, there is no need to add this extra / specific class just for it. setting as wontfix 40097 2009-09-24 20:18:09 -0700 2009-09-25 11:22:45 -0700 patch 0.1 0001-2009-09-24-Antonio-Gomes-antonio.gomes-openbossa.patch text/plain 12671 tonikitoo RnJvbSA4ZjAzNDQ4OWRiOTdlYzc3YWRkMTcwN2IxNzM2YTUxOTQ1ZjA5NzY3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnRvbmlvIEdvbWVzICh0b25pa2l0b28pIDxhbnRvbmlvLmdv bWVzQG9wZW5ib3NzYS5vcmc+CkRhdGU6IFRodSwgMjQgU2VwIDIwMDkgMjM6MTI6MTcgLTA0MDAK U3ViamVjdDogW1BBVENIXSAyMDA5LTA5LTI0ICBBbnRvbmlvIEdvbWVzICAgPGFudG9uaW8uZ29t ZXNAb3BlbmJvc3NhLm9yZz4KCiAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgog ICAgICAgIFtRdF0gW0FwaV0gQWRkZWQgYSBRV2ViRnJhbWU6OmxvYWQoUVdlYkxvYWRSZXF1ZXN0 KSBtZXRob2QKICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 Mjk3MzEKCiAgICAgICAgKiBBcGkvcXdlYmZyYW1lLmNwcDoKICAgICAgICAoUVdlYkZyYW1lOjps b2FkKToKICAgICAgICAoUVdlYkZyYW1lOjpzZXRIdG1sKTogbWFrZSBtZXRob2QgYm9keSB0byBt YWtlIHVzZSBvZiBRV2ViTG9hZFJlcXVlc3QgY2xhc3MuCiAgICAgICAgKFFXZWJGcmFtZTo6c2V0 Q29udGVudCk6IGRpdHRvCiAgICAgICAgKiBBcGkvcXdlYmZyYW1lLmg6CiAgICAgICAgKiBBcGkv cXdlYmZyYW1lX3AuaDoKICAgICAgICAoUVdlYkZyYW1lUHJpdmF0ZTo6UVdlYkZyYW1lUHJpdmF0 ZSk6CiAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmNwcDoKICAg ICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXJDbGllbnRRdDo6ZGlzcGF0Y2hEaWRDaGFuZ2VMb2Nh dGlvbldpdGhpblBhZ2UpOgogICAgICAgIEF2b2lkIHVybENoYW5nZWQgc2lnbmFsIHRvIGJlIGVt aXR0ZWQgZm9yIFN1YnN0aXR1dGlvbiBsb2Fkcy4KICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2Fk ZXJDbGllbnRRdDo6ZGlzcGF0Y2hEaWRDb21taXRMb2FkKTogZGl0dG8KICAgICAgICAoV2ViQ29y ZTo6RnJhbWVMb2FkZXJDbGllbnRRdDo6ZGlzcGF0Y2hEaWRGaW5pc2hMb2FkKTogbG9hZE1vZGUg cmVzZXQKICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0luc3BlY3RvckNsaWVudFF0LmNwcDogQnVp bGQgZml4CiAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNsaWVudFF0OjpjcmVhdGVQYWdlKToK ICAgICAgICAqIER1bXBSZW5kZXJUcmVlL3F0L2pzb2JqZWN0cy5jcHA6IGRpdHRvCiAgICAgICAg KExvYWRJdGVtOjppbnZva2UpOgotLS0KIFdlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmNwcCAgICAg ICAgICAgICAgICAgICAgICB8ICAgMzggKysrKysrKysrKysrKysrLS0tLS0tCiBXZWJLaXQvcXQv QXBpL3F3ZWJmcmFtZS5oICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDMxICsrKysrKysrKysr KysrKysrKwogV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWVfcC5oICAgICAgICAgICAgICAgICAgICAg IHwgICAgNyArKysrCiBXZWJLaXQvcXQvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgfCAgIDM0ICsrKysrKysrKysrKysrKysrKysKIFdlYktpdC9xdC9XZWJDb3JlU3VwcG9y dC9GcmFtZUxvYWRlckNsaWVudFF0LmNwcCB8ICAgIDYgKystCiBXZWJLaXQvcXQvV2ViQ29yZVN1 cHBvcnQvSW5zcGVjdG9yQ2xpZW50UXQuY3BwICAgfCAgICAyICstCiBXZWJLaXRUb29scy9DaGFu Z2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDE5ICsrKysrKysrKysrCiBXZWJL aXRUb29scy9EdW1wUmVuZGVyVHJlZS9xdC9qc29iamVjdHMuY3BwICAgICAgfCAgICAyICstCiA4 IGZpbGVzIGNoYW5nZWQsIDEyNCBpbnNlcnRpb25zKCspLCAxNSBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5jcHAgYi9XZWJLaXQvcXQvQXBpL3F3ZWJm cmFtZS5jcHAKaW5kZXggN2E5NjgyYS4uODI3NDc5YiAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L0Fw aS9xd2ViZnJhbWUuY3BwCisrKyBiL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmNwcApAQCAtNjM2 LDYgKzYzNiw3IEBAIHZvaWQgUVdlYkZyYW1lOjpsb2FkKGNvbnN0IFFXZWJOZXR3b3JrUmVxdWVz dCAmcmVxKQogICAgIGlmICghcG9zdERhdGEuaXNFbXB0eSgpKQogICAgICAgICByZXF1ZXN0LnNl dEhUVFBCb2R5KFdlYkNvcmU6OkZvcm1EYXRhOjpjcmVhdGUocG9zdERhdGEuY29uc3REYXRhKCks IHBvc3REYXRhLnNpemUoKSkpOwogCisgICAgZC0+bG9hZE1vZGUgPSBTdGFuZGFyZExvYWQ7CiAg ICAgZC0+ZnJhbWUtPmxvYWRlcigpLT5sb2FkKHJlcXVlc3QsIGZhbHNlKTsKIAogICAgIGlmIChk LT5wYXJlbnRGcmFtZSgpKQpAQCAtNjkyLDYgKzY5Myw3IEBAIHZvaWQgUVdlYkZyYW1lOjpsb2Fk KGNvbnN0IFFOZXR3b3JrUmVxdWVzdCAmcmVxLAogICAgIGlmICghYm9keS5pc0VtcHR5KCkpCiAg ICAgICAgIHJlcXVlc3Quc2V0SFRUUEJvZHkoV2ViQ29yZTo6Rm9ybURhdGE6OmNyZWF0ZShib2R5 LmNvbnN0RGF0YSgpLCBib2R5LnNpemUoKSkpOwogCisgICAgZC0+bG9hZE1vZGUgPSBTdGFuZGFy ZExvYWQ7CiAgICAgZC0+ZnJhbWUtPmxvYWRlcigpLT5sb2FkKHJlcXVlc3QsIGZhbHNlKTsKIAog ICAgIGlmIChkLT5wYXJlbnRGcmFtZSgpKQpAQCAtNzAwLDYgKzcwMiwyNCBAQCB2b2lkIFFXZWJG cmFtZTo6bG9hZChjb25zdCBRTmV0d29ya1JlcXVlc3QgJnJlcSwKICNlbmRpZgogCiAvKiEKKyAg U2V0cyB0aGUgY29udGVudCBvZiB0aGlzIGZyYW1lIGJhc2VkIFxhIHJlcXVlc3QuIEl0IGFjdHMg bGlrZSBzZXRIdG1sIG9yIHNldENvbnRlbnQKKyAgaG93ZXZlciBsb2FkaW5nIGRhdGEgYXJlIGV4 dHJhY3RlZCBmcm9tIFFXZWJMb2FkUmVxdWVzdCBtZW1iZXIgZmllbGRzLgorCisgIFxzYSBzZXRI dG1sKCksIHNldENvbnRlbnQoKQorKi8KK3ZvaWQgUVdlYkZyYW1lOjpsb2FkKGNvbnN0IFFXZWJM b2FkUmVxdWVzdCAmcmVxdWVzdCkKK3sKKyAgICBLVVJMIGt1cmwocmVxdWVzdC5iYXNlVXJsKCkp OworICAgIGNvbnN0IFFCeXRlQXJyYXkgdXRmOCA9IHJlcXVlc3QuZGF0YSgpLnRvVXRmOCgpOwor ICAgIFdURjo6UmVmUHRyPFdlYkNvcmU6OlNoYXJlZEJ1ZmZlcj4gZGF0YSA9IFdlYkNvcmU6OlNo YXJlZEJ1ZmZlcjo6Y3JlYXRlKHV0ZjguY29uc3REYXRhKCksIHV0ZjgubGVuZ3RoKCkpOworICAg IFdlYkNvcmU6OlN1YnN0aXR1dGVEYXRhIHN1YnN0aXR1dGVEYXRhKGRhdGEsIHJlcXVlc3QubWlt ZVR5cGUoKSwgcmVxdWVzdC5lbmNvZGUoKSwgcmVxdWVzdC51cmxGb3JIaXN0b3J5KCkpOworCisg ICAgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0IHdlYmNvcmVSZXF1ZXN0KGt1cmwpOworICAgIGQt PmxvYWRNb2RlID0gU3Vic3RpdHV0aW9uTG9hZDsKKyAgICBkLT5mcmFtZS0+bG9hZGVyKCktPmxv YWQod2ViY29yZVJlcXVlc3QsIHN1YnN0aXR1dGVEYXRhLCBmYWxzZSk7Cit9CisKKy8qIQogICBT ZXRzIHRoZSBjb250ZW50IG9mIHRoaXMgZnJhbWUgdG8gXGEgaHRtbC4gXGEgYmFzZVVybCBpcyBv cHRpb25hbCBhbmQgdXNlZCB0byByZXNvbHZlIHJlbGF0aXZlCiAgIFVSTHMgaW4gdGhlIGRvY3Vt ZW50LCBzdWNoIGFzIHJlZmVyZW5jZWQgaW1hZ2VzIG9yIHN0eWxlc2hlZXRzLgogCkBAIC03MTYs MTIgKzczNiw5IEBAIHZvaWQgUVdlYkZyYW1lOjpsb2FkKGNvbnN0IFFOZXR3b3JrUmVxdWVzdCAm cmVxLAogKi8KIHZvaWQgUVdlYkZyYW1lOjpzZXRIdG1sKGNvbnN0IFFTdHJpbmcgJmh0bWwsIGNv bnN0IFFVcmwgJmJhc2VVcmwpCiB7Ci0gICAgS1VSTCBrdXJsKGJhc2VVcmwpOwotICAgIFdlYkNv cmU6OlJlc291cmNlUmVxdWVzdCByZXF1ZXN0KGt1cmwpOwotICAgIGNvbnN0IFFCeXRlQXJyYXkg dXRmOCA9IGh0bWwudG9VdGY4KCk7Ci0gICAgV1RGOjpSZWZQdHI8V2ViQ29yZTo6U2hhcmVkQnVm ZmVyPiBkYXRhID0gV2ViQ29yZTo6U2hhcmVkQnVmZmVyOjpjcmVhdGUodXRmOC5jb25zdERhdGEo KSwgdXRmOC5sZW5ndGgoKSk7Ci0gICAgV2ViQ29yZTo6U3Vic3RpdHV0ZURhdGEgc3Vic3RpdHV0 ZURhdGEoZGF0YSwgV2ViQ29yZTo6U3RyaW5nKCJ0ZXh0L2h0bWwiKSwgV2ViQ29yZTo6U3RyaW5n KCJ1dGYtOCIpLCBLVVJMKCkpOwotICAgIGQtPmZyYW1lLT5sb2FkZXIoKS0+bG9hZChyZXF1ZXN0 LCBzdWJzdGl0dXRlRGF0YSwgZmFsc2UpOworICAgIFFXZWJMb2FkUmVxdWVzdCByZXF1ZXN0KGh0 bWwsIGJhc2VVcmwsIFFVcmwoKSwgInRleHQvaHRtbCIsICJ1dGYtOCIpOworICAgIGQtPmxvYWRN b2RlID0gU3Vic3RpdHV0aW9uTG9hZDsKKyAgICBsb2FkKHJlcXVlc3QpOwogfQogCiAvKiEKQEAg LTczOSwxNCArNzU2LDEzIEBAIHZvaWQgUVdlYkZyYW1lOjpzZXRIdG1sKGNvbnN0IFFTdHJpbmcg Jmh0bWwsIGNvbnN0IFFVcmwgJmJhc2VVcmwpCiAqLwogdm9pZCBRV2ViRnJhbWU6OnNldENvbnRl bnQoY29uc3QgUUJ5dGVBcnJheSAmZGF0YSwgY29uc3QgUVN0cmluZyAmbWltZVR5cGUsIGNvbnN0 IFFVcmwgJmJhc2VVcmwpCiB7Ci0gICAgS1VSTCBrdXJsKGJhc2VVcmwpOwotICAgIFdlYkNvcmU6 OlJlc291cmNlUmVxdWVzdCByZXF1ZXN0KGt1cmwpOwotICAgIFdURjo6UmVmUHRyPFdlYkNvcmU6 OlNoYXJlZEJ1ZmZlcj4gYnVmZmVyID0gV2ViQ29yZTo6U2hhcmVkQnVmZmVyOjpjcmVhdGUoZGF0 YS5jb25zdERhdGEoKSwgZGF0YS5sZW5ndGgoKSk7CiAgICAgUVN0cmluZyBhY3R1YWxNaW1lVHlw ZSA9IG1pbWVUeXBlOwogICAgIGlmIChhY3R1YWxNaW1lVHlwZS5pc0VtcHR5KCkpCiAgICAgICAg IGFjdHVhbE1pbWVUeXBlID0gUUxhdGluMVN0cmluZygidGV4dC9odG1sIik7Ci0gICAgV2ViQ29y ZTo6U3Vic3RpdHV0ZURhdGEgc3Vic3RpdHV0ZURhdGEoYnVmZmVyLCBXZWJDb3JlOjpTdHJpbmco YWN0dWFsTWltZVR5cGUpLCBXZWJDb3JlOjpTdHJpbmcoKSwgS1VSTCgpKTsKLSAgICBkLT5mcmFt ZS0+bG9hZGVyKCktPmxvYWQocmVxdWVzdCwgc3Vic3RpdHV0ZURhdGEsIGZhbHNlKTsKKworICAg IFFXZWJMb2FkUmVxdWVzdCByZXF1ZXN0KGRhdGEsIGJhc2VVcmwsIFFVcmwoKSwgYWN0dWFsTWlt ZVR5cGUsICIiKTsKKyAgICBkLT5sb2FkTW9kZSA9IFN1YnN0aXR1dGlvbkxvYWQ7CisgICAgbG9h ZChyZXF1ZXN0KTsKIH0KIAogLyohCmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFt ZS5oIGIvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuaAppbmRleCA1NWM3M2I0Li5mNTFkZTgzIDEw MDY0NAotLS0gYS9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5oCisrKyBiL1dlYktpdC9xdC9BcGkv cXdlYmZyYW1lLmgKQEAgLTEwMSw2ICsxMDEsMzUgQEAgcHJpdmF0ZToKICAgICBmcmllbmQgY2xh c3MgUVdlYlBhZ2U7CiB9OwogCitjbGFzcyBRV0VCS0lUX0VYUE9SVCBRV2ViTG9hZFJlcXVlc3Qg eyAvLyA6IHB1YmxpYyBRTmV0d29ya1JlcXVlc3QgeworcHVibGljOgorICAgIFFXZWJMb2FkUmVx dWVzdChjb25zdCBRU3RyaW5nJiBkYXRhLAorICAgICAgICAgICAgICAgICAgICBjb25zdCBRVXJs JiBiYXNlVXJsID0gUVVybCgpLAorICAgICAgICAgICAgICAgICAgICBjb25zdCBRVXJsJiB1cmxG b3JIaXN0b3J5ID0gUVVybCgpLAorICAgICAgICAgICAgICAgICAgICBjb25zdCBRU3RyaW5nJiBt aW1lVHlwZSA9IFFTdHJpbmcoInRleHQvaHRtbCIpLAorICAgICAgICAgICAgICAgICAgICBjb25z dCBRU3RyaW5nJiBlbmNvZGUgPSBRU3RyaW5nKCJ1dGYtOCIpKQorICAgICAgICA6IG1fY29udGVu dERhdGEoZGF0YSkKKyAgICAgICAgLCBtX2Jhc2VVcmwoYmFzZVVybCkKKyAgICAgICAgLCBtX3Vy bEZvckhpc3RvcnkodXJsRm9ySGlzdG9yeSkKKyAgICAgICAgLCBtX21pbWVUeXBlKG1pbWVUeXBl KQorICAgICAgICAsIG1fZW5jb2RlKGVuY29kZSkKKyAgICB7CisgICAgfQorCisgICAgUVN0cmlu ZyBkYXRhKCkgY29uc3QgeyByZXR1cm4gbV9jb250ZW50RGF0YTsgfQorICAgIFFVcmwgYmFzZVVy bCgpIGNvbnN0IHsgcmV0dXJuIG1fYmFzZVVybDsgfQorICAgIFFVcmwgdXJsRm9ySGlzdG9yeSgp IGNvbnN0IHsgcmV0dXJuIG1fdXJsRm9ySGlzdG9yeTsgfQorICAgIFFTdHJpbmcgbWltZVR5cGUo KSBjb25zdCB7IHJldHVybiBtX21pbWVUeXBlOyB9CisgICAgUVN0cmluZyBlbmNvZGUoKSBjb25z dCB7IHJldHVybiBtX2VuY29kZTsgfQorCisgICAgcHJpdmF0ZToKKyAgICAgICAgUVN0cmluZyBt X2NvbnRlbnREYXRhOworICAgICAgICBRVXJsIG1fYmFzZVVybDsKKyAgICAgICAgUVVybCBtX3Vy bEZvckhpc3Rvcnk7CisgICAgICAgIFFTdHJpbmcgbV9taW1lVHlwZTsKKyAgICAgICAgUVN0cmlu ZyBtX2VuY29kZTsKK307CisKIGNsYXNzIFFXRUJLSVRfRVhQT1JUIFFXZWJGcmFtZSA6IHB1Ymxp YyBRT2JqZWN0IHsKICAgICBRX09CSkVDVAogICAgIFFfUFJPUEVSVFkocXJlYWwgdGV4dFNpemVN dWx0aXBsaWVyIFJFQUQgdGV4dFNpemVNdWx0aXBsaWVyIFdSSVRFIHNldFRleHRTaXplTXVsdGlw bGllciBERVNJR05BQkxFIGZhbHNlKQpAQCAtMTMwLDYgKzE1OSw4IEBAIHB1YmxpYzoKICAgICAg ICAgICAgICAgUU5ldHdvcmtBY2Nlc3NNYW5hZ2VyOjpPcGVyYXRpb24gb3BlcmF0aW9uID0gUU5l dHdvcmtBY2Nlc3NNYW5hZ2VyOjpHZXRPcGVyYXRpb24sCiAgICAgICAgICAgICAgIGNvbnN0IFFC eXRlQXJyYXkgJmJvZHkgPSBRQnl0ZUFycmF5KCkpOwogI2VuZGlmCisgICAgdm9pZCBsb2FkKGNv bnN0IFFXZWJMb2FkUmVxdWVzdCAmcmVxdWVzdCk7CisKICAgICB2b2lkIHNldEh0bWwoY29uc3Qg UVN0cmluZyAmaHRtbCwgY29uc3QgUVVybCAmYmFzZVVybCA9IFFVcmwoKSk7CiAgICAgdm9pZCBz ZXRDb250ZW50KGNvbnN0IFFCeXRlQXJyYXkgJmRhdGEsIGNvbnN0IFFTdHJpbmcgJm1pbWVUeXBl ID0gUVN0cmluZygpLCBjb25zdCBRVXJsICZiYXNlVXJsID0gUVVybCgpKTsKIApkaWZmIC0tZ2l0 IGEvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWVfcC5oIGIvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWVf cC5oCmluZGV4IDYzMmY4M2EuLmQwY2I2ZGYgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9BcGkvcXdl YmZyYW1lX3AuaAorKysgYi9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZV9wLmgKQEAgLTU4LDYgKzU4 LDExIEBAIHB1YmxpYzoKICAgICBpbnQgbWFyZ2luSGVpZ2h0OwogfTsKIAorZW51bSBMb2FkTW9k ZSB7CisgICAgU3Vic3RpdHV0aW9uTG9hZCA9IDEsCisgICAgU3RhbmRhcmRMb2FkCit9OworCiBj bGFzcyBRV2ViRnJhbWVQcml2YXRlIHsKIHB1YmxpYzoKICAgICBRV2ViRnJhbWVQcml2YXRlKCkK QEAgLTcxLDYgKzc2LDcgQEAgcHVibGljOgogICAgICAgICAsIG1hcmdpbldpZHRoKC0xKQogICAg ICAgICAsIG1hcmdpbkhlaWdodCgtMSkKICAgICAgICAgLCBjbGlwUmVuZGVyVG9WaWV3cG9ydCh0 cnVlKQorICAgICAgICAsIGxvYWRNb2RlKFN0YW5kYXJkTG9hZCkKICAgICAgICAge30KICAgICB2 b2lkIGluaXQoUVdlYkZyYW1lKiBxZnJhbWUsIFFXZWJGcmFtZURhdGEqIGZyYW1lRGF0YSk7CiAK QEAgLTk1LDYgKzEwMSw3IEBAIHB1YmxpYzoKICAgICBpbnQgbWFyZ2luV2lkdGg7CiAgICAgaW50 IG1hcmdpbkhlaWdodDsKICAgICBib29sIGNsaXBSZW5kZXJUb1ZpZXdwb3J0OworICAgIExvYWRN b2RlIGxvYWRNb2RlOwogfTsKIAogY2xhc3MgUVdlYkhpdFRlc3RSZXN1bHRQcml2YXRlIHsKZGlm ZiAtLWdpdCBhL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4 IGIwZDJlYTQuLmViZDMyYjAgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9DaGFuZ2VMb2cKKysrIGIv V2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAtMSw3ICsxLDQxIEBACisyMDA5LTA5LTI0ICBBbnRvbmlv IEdvbWVzICAgPGFudG9uaW8uZ29tZXNAb3BlbmJvc3NhLm9yZz4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIFtBcGldIEFkZGVkIGEgUVdlYkZy YW1lOjpsb2FkKFFXZWJMb2FkUmVxdWVzdCkgbWV0aG9kCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yOTczMQorCisgICAgICAgICogQXBpL3F3ZWJmcmFt ZS5jcHA6CisgICAgICAgIChRV2ViRnJhbWU6OmxvYWQpOgorICAgICAgICAoUVdlYkZyYW1lOjpz ZXRIdG1sKTogbWFrZSBtZXRob2QgYm9keSB0byBtYWtlIHVzZSBvZiBRV2ViTG9hZFJlcXVlc3Qg Y2xhc3MuCisgICAgICAgIChRV2ViRnJhbWU6OnNldENvbnRlbnQpOiBkaXR0bworICAgICAgICAq IEFwaS9xd2ViZnJhbWUuaDoKKyAgICAgICAgKiBBcGkvcXdlYmZyYW1lX3AuaDoKKyAgICAgICAg KFFXZWJGcmFtZVByaXZhdGU6OlFXZWJGcmFtZVByaXZhdGUpOgorICAgICAgICAqIFdlYkNvcmVT dXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVM b2FkZXJDbGllbnRRdDo6ZGlzcGF0Y2hEaWRDaGFuZ2VMb2NhdGlvbldpdGhpblBhZ2UpOgorICAg ICAgICBBdm9pZCB1cmxDaGFuZ2VkIHNpZ25hbCB0byBiZSBlbWl0dGVkIGZvciBTdWJzdGl0dXRp b24gbG9hZHMuCisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudFF0OjpkaXNwYXRj aERpZENvbW1pdExvYWQpOiBkaXR0bworICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXJDbGll bnRRdDo6ZGlzcGF0Y2hEaWRGaW5pc2hMb2FkKTogbG9hZE1vZGUgcmVzZXQKKyAgICAgICAgKiBX ZWJDb3JlU3VwcG9ydC9JbnNwZWN0b3JDbGllbnRRdC5jcHA6IEJ1aWxkIGZpeAorICAgICAgICAo V2ViQ29yZTo6SW5zcGVjdG9yQ2xpZW50UXQ6OmNyZWF0ZVBhZ2UpOgorCiAyMDA5LTA5LTI1ICBB bnRvbmlvIEdvbWVzICAgPGFudG9uaW8uZ29tZXNAb3BlbmJvc3NhLm9yZz4KIAogICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBBZGRlZCBhIFFXZWJGcmFtZTo6 bG9hZCBtZXRob2QgcmVjZWl2aW5nIGEgUVdlYkxvYWRSZXF1ZXN0IHBhcmFtZXRlci4KKworICAg ICAgICAqIEFwaS9xd2ViZnJhbWUuY3BwOgorICAgICAgICAoUVdlYkZyYW1lOjpsb2FkKToKKyAg ICAgICAgKiBBcGkvcXdlYmZyYW1lLmg6CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvSW5zcGVj dG9yQ2xpZW50UXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ2xpZW50UXQ6OmNy ZWF0ZVBhZ2UpOgorCisyMDA5LTA5LTIyICBBbnRvbmlvIEdvbWVzICAgPGFudG9uaW8uZ29tZXNA b3BlbmJvc3NhLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwog ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjkyNDgKICAg ICAgICAgW1F0XSBbQVBJXSBNYWtlIGl0IHBvc3NpYmxlIHRvIGhhdmUgJ2ludmlzaWJsZScgbG9h ZHMKIApkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xp ZW50UXQuY3BwIGIvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQu Y3BwCmluZGV4IDBjNjM2ZjYuLjY2NTMzZmYgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9XZWJDb3Jl U3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmNwcAorKysgYi9XZWJLaXQvcXQvV2ViQ29yZVN1 cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHAKQEAgLTI5OCw3ICsyOTgsNyBAQCB2b2lkIEZy YW1lTG9hZGVyQ2xpZW50UXQ6OmRpc3BhdGNoRGlkQ2hhbmdlTG9jYXRpb25XaXRoaW5QYWdlKCkK ICAgICBpZiAoZHVtcEZyYW1lTG9hZGVyQ2FsbGJhY2tzKQogICAgICAgICBwcmludGYoIiVzIC0g ZGlkQ2hhbmdlTG9jYXRpb25XaXRoaW5QYWdlRm9yRnJhbWVcbiIsIHFQcmludGFibGUoZHJ0RGVz Y3JpcHRpb25TdWl0YWJsZUZvclRlc3RSZXN1bHQobV9mcmFtZSkpKTsKIAotICAgIGlmICghbV93 ZWJGcmFtZSkKKyAgICBpZiAoIW1fd2ViRnJhbWUgfHwgbV93ZWJGcmFtZS0+ZC0+bG9hZE1vZGUg PT0gU3Vic3RpdHV0aW9uTG9hZCkKICAgICAgICAgcmV0dXJuOwogCiAgICAgZW1pdCBtX3dlYkZy YW1lLT51cmxDaGFuZ2VkKG1fd2ViRnJhbWUtPnVybCgpKTsKQEAgLTM0MCw3ICszNDAsNyBAQCB2 b2lkIEZyYW1lTG9hZGVyQ2xpZW50UXQ6OmRpc3BhdGNoRGlkQ29tbWl0TG9hZCgpCiAgICAgaWYg KGR1bXBGcmFtZUxvYWRlckNhbGxiYWNrcykKICAgICAgICAgcHJpbnRmKCIlcyAtIGRpZENvbW1p dExvYWRGb3JGcmFtZVxuIiwgcVByaW50YWJsZShkcnREZXNjcmlwdGlvblN1aXRhYmxlRm9yVGVz dFJlc3VsdChtX2ZyYW1lKSkpOwogCi0gICAgaWYgKG1fZnJhbWUtPnRyZWUoKS0+cGFyZW50KCkg fHwgIW1fd2ViRnJhbWUpCisgICAgaWYgKG1fZnJhbWUtPnRyZWUoKS0+cGFyZW50KCkgfHwgIW1f d2ViRnJhbWUgfHwgbV93ZWJGcmFtZS0+ZC0+bG9hZE1vZGUgPT0gU3Vic3RpdHV0aW9uTG9hZCkK ICAgICAgICAgcmV0dXJuOwogCiAgICAgZW1pdCBtX3dlYkZyYW1lLT51cmxDaGFuZ2VkKG1fd2Vi RnJhbWUtPnVybCgpKTsKQEAgLTM4MCw2ICszODAsOCBAQCB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50 UXQ6OmRpc3BhdGNoRGlkRmluaXNoTG9hZCgpCiAKICAgICBpZiAoIW1fd2ViRnJhbWUpCiAgICAg ICAgIHJldHVybjsKKworICAgIG1fd2ViRnJhbWUtPmQtPmxvYWRNb2RlID0gU3RhbmRhcmRMb2Fk OwogICAgIG1fd2ViRnJhbWUtPnBhZ2UoKS0+ZC0+dXBkYXRlTmF2aWdhdGlvbkFjdGlvbnMoKTsK IH0KIApkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0luc3BlY3RvckNsaWVu dFF0LmNwcCBiL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9JbnNwZWN0b3JDbGllbnRRdC5jcHAK aW5kZXggMzQwMzI1ZS4uMDc5ZGVhNCAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L1dlYkNvcmVTdXBw b3J0L0luc3BlY3RvckNsaWVudFF0LmNwcAorKysgYi9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQv SW5zcGVjdG9yQ2xpZW50UXQuY3BwCkBAIC05Miw3ICs5Miw3IEBAIFBhZ2UqIEluc3BlY3RvckNs aWVudFF0OjpjcmVhdGVQYWdlKCkKICAgICBpbnNwZWN0b3JWaWV3LT5zZXRQYWdlKGluc3BlY3Rv clBhZ2UpOwogICAgIG1faW5zcGVjdG9yVmlldy5zZXQoaW5zcGVjdG9yVmlldyk7CiAKLSAgICBp bnNwZWN0b3JQYWdlLT5tYWluRnJhbWUoKS0+bG9hZChRU3RyaW5nOjpmcm9tTGF0aW4xKCJxcmM6 L3dlYmtpdC9pbnNwZWN0b3IvaW5zcGVjdG9yLmh0bWwiKSk7CisgICAgaW5zcGVjdG9yUGFnZS0+ bWFpbkZyYW1lKCktPmxvYWQoUVVybChRU3RyaW5nOjpmcm9tTGF0aW4xKCJxcmM6L3dlYmtpdC9p bnNwZWN0b3IvaW5zcGVjdG9yLmh0bWwiKSkpOwogICAgIG1faW5zcGVjdGVkV2ViUGFnZS0+ZC0+ aW5zcGVjdG9yRnJvbnRlbmQgPSBpbnNwZWN0b3JWaWV3OwogICAgIG1faW5zcGVjdGVkV2ViUGFn ZS0+ZC0+Z2V0T3JDcmVhdGVJbnNwZWN0b3IoKS0+ZC0+c2V0RnJvbnRlbmQoaW5zcGVjdG9yVmll dyk7CiAKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0No YW5nZUxvZwppbmRleCA2YWZmMjUyLi4wZWY4M2E4IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9D aGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIw MDktMDktMjQgIEFudG9uaW8gR29tZXMgICA8YW50b25pby5nb21lc0BvcGVuYm9zc2Eub3JnPgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gW0Fw aV0gQWRkZWQgYSBRV2ViRnJhbWU6OmxvYWQoUVdlYkxvYWRSZXF1ZXN0KSBtZXRob2QKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI5NzMxCisKKyAgICAg ICAgKiBEdW1wUmVuZGVyVHJlZS9xdC9qc29iamVjdHMuY3BwOiBCdWlsZCBmaXgKKyAgICAgICAg KExvYWRJdGVtOjppbnZva2UpOgorCisyMDA5LTA5LTI1ICBBbnRvbmlvIEdvbWVzICAgPGFudG9u aW8uZ29tZXNAb3BlbmJvc3NhLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBGaXggOjpsb2FkIG1ldGhvZCBjYWxsIGFjY29yZGluZ2x5IHRvIHRo ZSBuZXcgUVdlYkZyYW1lOjpsb2FkKFFXZWJMb2FkUmVxdWVzdCkgbWV0aG9kLgorCisgICAgICAg ICogRHVtcFJlbmRlclRyZWUvcXQvanNvYmplY3RzLmNwcDoKKyAgICAgICAgKExvYWRJdGVtOjpp bnZva2UpOgorCiAyMDA5LTA5LTI0ICBHdXN0YXZvIE5vcm9uaGEgU2lsdmEgIDxndXN0YXZvLm5v cm9uaGFAY29sbGFib3JhLmNvLnVrPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEphbiBBbG9uem8u CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9xdC9qc29iamVjdHMuY3Bw IGIvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvanNvYmplY3RzLmNwcAppbmRleCA0NzNj ZWQ3Li43NDI3NjJiIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9xdC9q c29iamVjdHMuY3BwCisrKyBiL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L2pzb2JqZWN0 cy5jcHAKQEAgLTc1LDcgKzc1LDcgQEAgYm9vbCBMb2FkSXRlbTo6aW52b2tlKCkgY29uc3QKICAg ICBpZiAoIWZyYW1lKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBmcmFtZS0+bG9hZCh1 cmwoKSk7CisgICAgZnJhbWUtPmxvYWQoUVVybCh1cmwoKSkpOwogICAgIHJldHVybiB0cnVlOwog fQogCi0tIAoxLjYuMC40Cgo=