89974 2012-06-26 05:59:40 -0700 [WK2] Move intent delivery code from the frame to the page 2012-06-29 14:43:51 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 88303 90067 1 cdumez cdumez andersca kenneth sam webkit.review.bot oldest_to_newest 657550 0 cdumez 2012-06-26 05:59:40 -0700 We need to add for following C API to WKFrame: void WKFrameDeliverIntent(WKFrameRef frameRef, WKIntentDataRef intent); Otherwise, the client cannot deliver a Web intent to a frame. 657551 1 149518 cdumez 2012-06-26 06:01:30 -0700 Created attachment 149518 Patch 658275 2 149518 kenneth 2012-06-26 19:49:23 -0700 Comment on attachment 149518 Patch Looks good to me, but please lets Anders or Sam have a look before you commit it. 658291 3 sam 2012-06-26 20:23:53 -0700 I have not been following this too closely, and I apologize for that (things are a bit busy here) but is it necessary for this to be at the frame level? I would love to remove the need for explicit frame objects from the WebKit2 API, so adding things seems like going in the wrong direction. Let me know if there are some other bugs I can look at for context. 658339 4 cdumez 2012-06-26 22:36:56 -0700 (In reply to comment #3) > I have not been following this too closely, and I apologize for that (things are a bit busy here) but is it necessary for this to be at the frame level? I would love to remove the need for explicit frame objects from the WebKit2 API, so adding things seems like going in the wrong direction. Let me know if there are some other bugs I can look at for context. All the WK2 Web Intents patches are marked as dependencies of this meta-bug: Bug 88303. 658350 5 cdumez 2012-06-26 22:53:06 -0700 (In reply to comment #3) > I have not been following this too closely, and I apologize for that (things are a bit busy here) but is it necessary for this to be at the frame level? I would love to remove the need for explicit frame objects from the WebKit2 API, so adding things seems like going in the wrong direction. Let me know if there are some other bugs I can look at for context. I was merely trying to match the WebKit1 implementation. Should I move the intent delivery code to the page then? 658365 6 149686 cdumez 2012-06-26 23:08:24 -0700 Created attachment 149686 Patch Sam, is this what you had in mind? I moved the intent delivery code from the frame to the page. 658722 7 sam 2012-06-27 11:11:42 -0700 (In reply to comment #6) > Created an attachment (id=149686) [details] > Patch > > Sam, is this what you had in mind? > I moved the intent delivery code from the frame to the page. Probably, since I don't understand what this feature is supposed to do from the function name, I am not sure why it needs to take happen with regards to frame. 658753 8 cdumez 2012-06-27 11:52:16 -0700 (In reply to comment #7) > (In reply to comment #6) > > Created an attachment (id=149686) [details] [details] > > Patch > > > > Sam, is this what you had in mind? > > I moved the intent delivery code from the frame to the page. > > Probably, since I don't understand what this feature is supposed to do from the function name, I am not sure why it needs to take happen with regards to frame. The point is to deliver a Web Intent to a service (web page that can handle an intent) by exposing it via DOMWindow.intent attribute [1]. My understanding is that a DOM Window is associated to a frame and a page can contain several frames. For this reason, the deliver method is associated to a frame, thus the FrameID in argument. [1] http://www.w3.org/TR/web-intents/#delivery-and-response-api 660796 9 149686 webkit.review.bot 2012-06-29 14:43:47 -0700 Comment on attachment 149686 Patch Clearing flags on attachment: 149686 Committed r121590: <http://trac.webkit.org/changeset/121590> 660797 10 webkit.review.bot 2012-06-29 14:43:51 -0700 All reviewed patches have been landed. Closing bug. 149518 2012-06-26 06:01:30 -0700 2012-06-26 23:08:24 -0700 Patch 89974_wkframe_deliverintent.patch text/plain 2266 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAwNjdiOTg4Li40YjYzMWY1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTgg QEAKIDIwMTItMDYtMjYgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVs LmNvbT4KIAorICAgICAgICBbV0syXSBBZGQgQyBBUEkgdG8gZGVsaXZlciBhbiBpbnRlbnQgdG8g YSBmcmFtZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 ODk5NzQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBB ZGQgQyBBUEkgdG8gV0tGcmFtZSB0byBkZWxpdmVyIGEgV2ViIGludGVudC4KKworICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvQy9XS0ZyYW1lLmNwcDoKKyAgICAgICAgKFdLRnJhbWVEZWxpdmVySW50 ZW50KToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tGcmFtZS5oOgorCisyMDEyLTA2LTI2 ICBDaHJpc3RvcGhlIER1bWV6ICA8Y2hyaXN0b3BoZS5kdW1lekBpbnRlbC5jb20+CisKICAgICAg ICAgW1dLMl1bR1RLXSBVbmluaXRpYWxpemVkIHZhcmlhYmxlIGluIFRleHRDaGVja2VyR3RrLmNw cAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODk5NDgK IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLRnJhbWUuY3Bw IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLRnJhbWUuY3BwCmluZGV4IDA2N2Mw OTAuLmQ2Yzk1MDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9X S0ZyYW1lLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tGcmFtZS5j cHAKQEAgLTEzNiw2ICsxMzYsMTMgQEAgYm9vbCBXS0ZyYW1lSXNGcmFtZVNldChXS0ZyYW1lUmVm IGZyYW1lUmVmKQogICAgIHJldHVybiB0b0ltcGwoZnJhbWVSZWYpLT5pc0ZyYW1lU2V0KCk7CiB9 CiAKK3ZvaWQgV0tGcmFtZURlbGl2ZXJJbnRlbnQoV0tGcmFtZVJlZiBmcmFtZVJlZiwgV0tJbnRl bnREYXRhUmVmIGludGVudCkKK3sKKyNpZiBFTkFCTEUoV0VCX0lOVEVOVFMpCisgICAgdG9JbXBs KGZyYW1lUmVmKS0+ZGVsaXZlckludGVudCh0b0ltcGwoaW50ZW50KSk7CisjZW5kaWYKK30KKwog dm9pZCBXS0ZyYW1lR2V0TWFpblJlc291cmNlRGF0YShXS0ZyYW1lUmVmIGZyYW1lUmVmLCBXS0Zy YW1lR2V0UmVzb3VyY2VEYXRhRnVuY3Rpb24gY2FsbGJhY2ssIHZvaWQqIGNvbnRleHQpCiB7CiAg ICAgdG9JbXBsKGZyYW1lUmVmKS0+Z2V0TWFpblJlc291cmNlRGF0YShEYXRhQ2FsbGJhY2s6OmNy ZWF0ZShjb250ZXh0LCBjYWxsYmFjaykpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9DL1dLRnJhbWUuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9X S0ZyYW1lLmgKaW5kZXggZWVjOTM5ZS4uMTNhMmZlZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9DL1dLRnJhbWUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL0MvV0tGcmFtZS5oCkBAIC03Miw2ICs3Miw4IEBAIFdLX0VYUE9SVCBib29sIFdLRnJh bWVJc0Rpc3BsYXlpbmdNYXJrdXBEb2N1bWVudChXS0ZyYW1lUmVmIGZyYW1lKTsKIAogV0tfRVhQ T1JUIGJvb2wgV0tGcmFtZUlzRnJhbWVTZXQoV0tGcmFtZVJlZiBmcmFtZSk7CiAKK1dLX0VYUE9S VCB2b2lkIFdLRnJhbWVEZWxpdmVySW50ZW50KFdLRnJhbWVSZWYgZnJhbWUsIFdLSW50ZW50RGF0 YVJlZik7CisKIHR5cGVkZWYgdm9pZCAoKldLRnJhbWVHZXRSZXNvdXJjZURhdGFGdW5jdGlvbiko V0tEYXRhUmVmIGRhdGEsIFdLRXJyb3JSZWYgZXJyb3IsIHZvaWQqIGZ1bmN0aW9uQ29udGV4dCk7 CiBXS19FWFBPUlQgdm9pZCBXS0ZyYW1lR2V0TWFpblJlc291cmNlRGF0YShXS0ZyYW1lUmVmIGZy YW1lLCBXS0ZyYW1lR2V0UmVzb3VyY2VEYXRhRnVuY3Rpb24gZnVuY3Rpb24sIHZvaWQqIGZ1bmN0 aW9uQ29udGV4dCk7CiBXS19FWFBPUlQgdm9pZCBXS0ZyYW1lR2V0UmVzb3VyY2VEYXRhKFdLRnJh bWVSZWYgZnJhbWUsIFdLVVJMUmVmIHJlc291cmNlVVJMLCBXS0ZyYW1lR2V0UmVzb3VyY2VEYXRh RnVuY3Rpb24gZnVuY3Rpb24sIHZvaWQqIGZ1bmN0aW9uQ29udGV4dCk7Cg== 149686 2012-06-26 23:08:24 -0700 2012-06-29 14:43:47 -0700 Patch 89974_intent_delivery.patch text/plain 5841 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAwNjdiOTg4Li5lNDZmNWNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjgg QEAKIDIwMTItMDYtMjYgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVs LmNvbT4KIAorICAgICAgICBbV0syXSBNb3ZlIGludGVudCBkZWxpdmVyeSBjb2RlIGZyb20gdGhl IGZyYW1lIHRvIHRoZSBwYWdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD04OTk3NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIE1vdmUgdGhlIGludGVudCBkZWxpdmVyeSBjb2RlIGZyb20gdGhlIGZyYW1lIHRv IHRoZSBwYWdlCisgICAgICAgIGFuZCBhZGQgdGhlIGNvcnJlc3BvbmRpbmcgQyBBUEkgZm9yIFdL UGFnZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwOgorICAgICAgICAo V0tQYWdlRGVsaXZlckludGVudFRvRnJhbWUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9X S1BhZ2UuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5jcHA6CisgICAgICAg IChXZWJLaXQ6OldlYkZyYW1lUHJveHk6OnN0b3BMb2FkaW5nKToKKyAgICAgICAgKiBVSVByb2Nl c3MvV2ViRnJhbWVQcm94eS5oOgorICAgICAgICAoV2ViS2l0KToKKyAgICAgICAgKiBVSVByb2Nl c3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdCk6CisgICAgICAgIChXZWJLaXQ6 OldlYlBhZ2VQcm94eTo6ZGVsaXZlckludGVudFRvRnJhbWUpOgorICAgICAgICAqIFVJUHJvY2Vz cy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKFdlYlBhZ2VQcm94eSk6CisKKzIwMTItMDYtMjYg IENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVsLmNvbT4KKwogICAgICAg ICBbV0syXVtHVEtdIFVuaW5pdGlhbGl6ZWQgdmFyaWFibGUgaW4gVGV4dENoZWNrZXJHdGsuY3Bw CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04OTk0OAog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmNwcCBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwCmluZGV4IGMyYTIxYjUu LjVjNjAwMzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1Bh Z2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwCkBA IC02ODQsNiArNjg0LDEzIEBAIHZvaWQgV0tQYWdlRW5kUHJpbnRpbmcoV0tQYWdlUmVmIHBhZ2Up CiB9CiAjZW5kaWYKIAordm9pZCBXS1BhZ2VEZWxpdmVySW50ZW50VG9GcmFtZShXS1BhZ2VSZWYg cGFnZSwgV0tGcmFtZVJlZiBmcmFtZSwgV0tJbnRlbnREYXRhUmVmIGludGVudCkKK3sKKyNpZiBF TkFCTEUoV0VCX0lOVEVOVFMpCisgICAgdG9JbXBsKHBhZ2UpLT5kZWxpdmVySW50ZW50VG9GcmFt ZSh0b0ltcGwoZnJhbWUpLCB0b0ltcGwoaW50ZW50KSk7CisjZW5kaWYKK30KKwogV0tJbWFnZVJl ZiBXS1BhZ2VDcmVhdGVTbmFwc2hvdE9mVmlzaWJsZUNvbnRlbnQoV0tQYWdlUmVmKQogewogICAg IHJldHVybiAwOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dL UGFnZS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5oCmluZGV4IDAz NWY1MWQuLjEyYTdiNjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv Qy9XS1BhZ2UuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmgK QEAgLTQ2OCw2ICs0NjgsOCBAQCBXS19FWFBPUlQgdm9pZCBXS1BhZ2VHZXRDb250ZW50c0FzU3Ry aW5nX2IoV0tQYWdlUmVmIHBhZ2UsIFdLUGFnZUdldENvbnRlbnRzQXNTdAogdHlwZWRlZiB2b2lk ICgqV0tQYWdlRm9yY2VSZXBhaW50RnVuY3Rpb24pKFdLRXJyb3JSZWYsIHZvaWQqKTsKIFdLX0VY UE9SVCB2b2lkIFdLUGFnZUZvcmNlUmVwYWludChXS1BhZ2VSZWYgcGFnZSwgdm9pZCogY29udGV4 dCwgV0tQYWdlRm9yY2VSZXBhaW50RnVuY3Rpb24gZnVuY3Rpb24pOwogCitXS19FWFBPUlQgdm9p ZCBXS1BhZ2VEZWxpdmVySW50ZW50VG9GcmFtZShXS1BhZ2VSZWYgcGFnZSwgV0tGcmFtZVJlZiBm cmFtZSwgV0tJbnRlbnREYXRhUmVmIGludGVudCk7CisKIC8qCiAgICAgU29tZSBvZiB0aGUgbW9y ZSBjb21tb24gY29tbWFuZCBuYW1lIHN0cmluZ3MgaW5jbHVkZSB0aGUgZm9sbG93aW5nLCBhbHRo b3VnaCBhbnkgV2ViQ29yZSBFZGl0b3JDb21tYW5kIHN0cmluZyBpcyBzdXBwb3J0ZWQ6CiAgICAg CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5jcHAg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5jcHAKaW5kZXggZjk3ZDg1 Yi4uZjYwZmFiMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkZyYW1l UHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJGcmFtZVByb3h5LmNw cApAQCAtMzcsMTAgKzM3LDYgQEAKICNpbmNsdWRlIDxzdGRpby5oPgogI2luY2x1ZGUgPHd0Zi90 ZXh0L1dURlN0cmluZy5oPgogCi0jaWYgRU5BQkxFKFdFQl9JTlRFTlRTKQotI2luY2x1ZGUgIldl YkludGVudERhdGEuaCIKLSNlbmRpZgotCiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIHVzaW5n IG5hbWVzcGFjZSBzdGQ7CiAKQEAgLTk4LDE5ICs5NCw2IEBAIHZvaWQgV2ViRnJhbWVQcm94eTo6 c3RvcExvYWRpbmcoKSBjb25zdAogCiAgICAgbV9wYWdlLT5wcm9jZXNzKCktPnNlbmQoTWVzc2Fn ZXM6OldlYlBhZ2U6OlN0b3BMb2FkaW5nRnJhbWUobV9mcmFtZUlEKSwgbV9wYWdlLT5wYWdlSUQo KSk7CiB9Ci0KLSNpZiBFTkFCTEUoV0VCX0lOVEVOVFMpCi12b2lkIFdlYkZyYW1lUHJveHk6OmRl bGl2ZXJJbnRlbnQoV2ViSW50ZW50RGF0YSogd2ViSW50ZW50RGF0YSkKLXsKLSAgICBpZiAoIW1f cGFnZSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgaWYgKCFtX3BhZ2UtPmlzVmFsaWQoKSkKLSAg ICAgICAgcmV0dXJuOwotCi0gICAgbV9wYWdlLT5wcm9jZXNzKCktPnNlbmQoTWVzc2FnZXM6Oldl YlBhZ2U6OkRlbGl2ZXJJbnRlbnRUb0ZyYW1lKG1fZnJhbWVJRCwgd2ViSW50ZW50RGF0YS0+c3Rv cmUoKSksIG1fcGFnZS0+cGFnZUlEKCkpOwotfQotI2VuZGlmCiAgICAgCiBib29sIFdlYkZyYW1l UHJveHk6OmNhblByb3ZpZGVTb3VyY2UoKSBjb25zdAogewpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYkZyYW1lUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJGcmFtZVByb3h5LmgKaW5kZXggMWY3MzI5Yi4uZGU1YTU4YyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkZyYW1lUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5oCkBAIC01MCwxMCArNTAsNiBAQCBjbGFzcyBXZWJG b3JtU3VibWlzc2lvbkxpc3RlbmVyUHJveHk7CiBjbGFzcyBXZWJGcmFtZVBvbGljeUxpc3RlbmVy UHJveHk7CiBjbGFzcyBXZWJQYWdlUHJveHk7CiAKLSNpZiBFTkFCTEUoV0VCX0lOVEVOVFMpCi1j bGFzcyBXZWJJbnRlbnREYXRhOwotI2VuZGlmCi0KIHR5cGVkZWYgR2VuZXJpY0NhbGxiYWNrPFdL RGF0YVJlZj4gRGF0YUNhbGxiYWNrOwogCiBjbGFzcyBXZWJGcmFtZVByb3h5IDogcHVibGljIEFQ SU9iamVjdCB7CkBAIC05MCwxMCArODYsNiBAQCBwdWJsaWM6CiAgICAgYm9vbCBpc0ZyYW1lU2V0 KCkgY29uc3QgeyByZXR1cm4gbV9pc0ZyYW1lU2V0OyB9CiAKICAgICBMb2FkU3RhdGUgbG9hZFN0 YXRlKCkgY29uc3QgeyByZXR1cm4gbV9sb2FkU3RhdGU7IH0KLQotI2lmIEVOQUJMRShXRUJfSU5U RU5UUykKLSAgICB2b2lkIGRlbGl2ZXJJbnRlbnQoV2ViSW50ZW50RGF0YSopOwotI2VuZGlmCiAg ICAgCiAgICAgdm9pZCBzdG9wTG9hZGluZygpIGNvbnN0OwogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJQYWdlUHJveHkuY3BwCmluZGV4IGI1MDQ2YjIuLmQ2MDM5ZDcgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCkBAIC0xNjMxLDYgKzE2MzEsMTYgQEAg dm9pZCBXZWJQYWdlUHJveHk6OmdldFNvdXJjZUZvckZyYW1lKFdlYkZyYW1lUHJveHkqIGZyYW1l LCBQYXNzUmVmUHRyPFN0cmluZ0NhbGwKICAgICBwcm9jZXNzKCktPnNlbmQoTWVzc2FnZXM6Oldl YlBhZ2U6OkdldFNvdXJjZUZvckZyYW1lKGZyYW1lLT5mcmFtZUlEKCksIGNhbGxiYWNrSUQpLCBt X3BhZ2VJRCk7CiB9CiAKKyNpZiBFTkFCTEUoV0VCX0lOVEVOVFMpCit2b2lkIFdlYlBhZ2VQcm94 eTo6ZGVsaXZlckludGVudFRvRnJhbWUoV2ViRnJhbWVQcm94eSogZnJhbWUsIFdlYkludGVudERh dGEqIHdlYkludGVudERhdGEpCit7CisgICAgaWYgKCFpc1ZhbGlkKCkpCisgICAgICAgIHJldHVy bjsKKworICAgIHByb2Nlc3MoKS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6RGVsaXZlckludGVu dFRvRnJhbWUoZnJhbWUtPmZyYW1lSUQoKSwgd2ViSW50ZW50RGF0YS0+c3RvcmUoKSksIG1fcGFn ZUlEKTsKK30KKyNlbmRpZgorCiB2b2lkIFdlYlBhZ2VQcm94eTo6Z2V0Q29udGVudHNBc1N0cmlu ZyhQYXNzUmVmUHRyPFN0cmluZ0NhbGxiYWNrPiBwcnBDYWxsYmFjaykKIHsKICAgICBSZWZQdHI8 U3RyaW5nQ2FsbGJhY2s+IGNhbGxiYWNrID0gcHJwQ2FsbGJhY2s7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViUGFnZVByb3h5LmgKaW5kZXggZWQ5OWQwZC4uM2MxYjQxMiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaApAQCAtMTI0LDYgKzEyNCwxMCBAQCB0eXBlZGVm IEd0a1dpZGdldCogUGxhdGZvcm1XaWRnZXQ7CiB0eXBlZGVmIEV2YXNfT2JqZWN0KiBQbGF0Zm9y bVdpZGdldDsKICNlbmRpZgogCisjaWYgRU5BQkxFKFdFQl9JTlRFTlRTKQorY2xhc3MgV2ViSW50 ZW50RGF0YTsKKyNlbmRpZgorCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAogY2xhc3MgTmF0aXZlV2Vi S2V5Ym9hcmRFdmVudDsKQEAgLTUzMCw2ICs1MzQsMTAgQEAgcHVibGljOgogICAgIHZvaWQgcnVu SmF2YVNjcmlwdEluTWFpbkZyYW1lKGNvbnN0IFN0cmluZyYsIFBhc3NSZWZQdHI8U2NyaXB0VmFs dWVDYWxsYmFjaz4pOwogICAgIHZvaWQgZm9yY2VSZXBhaW50KFBhc3NSZWZQdHI8Vm9pZENhbGxi YWNrPik7CiAKKyNpZiBFTkFCTEUoV0VCX0lOVEVOVFMpCisgICAgdm9pZCBkZWxpdmVySW50ZW50 VG9GcmFtZShXZWJGcmFtZVByb3h5KiwgV2ViSW50ZW50RGF0YSopOworI2VuZGlmCisKICAgICBm bG9hdCBoZWFkZXJIZWlnaHQoV2ViRnJhbWVQcm94eSopOwogICAgIGZsb2F0IGZvb3RlckhlaWdo dChXZWJGcmFtZVByb3h5Kik7CiAgICAgdm9pZCBkcmF3SGVhZGVyKFdlYkZyYW1lUHJveHkqLCBj b25zdCBXZWJDb3JlOjpGbG9hdFJlY3QmKTsK