77968 2012-02-07 04:56:33 -0800 [WK2] Text notifications should have an iconURL 2012-02-08 04:14:13 -0800 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 77969 1 yael webkit-unassigned andersca jonlee webkit.review.bot oldest_to_newest 550867 0 yael 2012-02-07 04:56:33 -0800 Per http://www.w3.org/TR/notifications/ a simple text notification should have an iconURL. A patch is coming soon. 550909 1 125828 yael 2012-02-07 05:54:12 -0800 Created attachment 125828 Patch Add an iconURL to WebNotification and add a public API to access it. 551076 2 125828 jonlee 2012-02-07 10:01:28 -0800 Comment on attachment 125828 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=125828&action=review I do not have reviewer status, but this otherwise looks good to me. > Source/WebKit2/UIProcess/API/C/WKNotification.cpp:50 > +WKStringRef WKNotificationCopyiconURL(WKNotificationRef notification) icon should be capitalized. > Source/WebKit2/UIProcess/API/C/WKNotification.h:39 > +WK_EXPORT WKStringRef WKNotificationCopyiconURL(WKNotificationRef notification); Ditto here. 551081 3 yael 2012-02-07 10:03:33 -0800 (In reply to comment #2) > (From update of attachment 125828 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=125828&action=review > > I do not have reviewer status, but this otherwise looks good to me. > Thanks for reviewing :) > > Source/WebKit2/UIProcess/API/C/WKNotification.cpp:50 > > +WKStringRef WKNotificationCopyiconURL(WKNotificationRef notification) > > icon should be capitalized. Sorry, will fix it. > > > Source/WebKit2/UIProcess/API/C/WKNotification.h:39 > > +WK_EXPORT WKStringRef WKNotificationCopyiconURL(WKNotificationRef notification); > > Ditto here. Sorry, will fix it. 551090 4 125870 yael 2012-02-07 10:13:48 -0800 Created attachment 125870 Patch. Fix case of IconURL. 552007 5 125870 webkit.review.bot 2012-02-08 04:14:08 -0800 Comment on attachment 125870 Patch. Clearing flags on attachment: 125870 Committed r107068: <http://trac.webkit.org/changeset/107068> 552008 6 webkit.review.bot 2012-02-08 04:14:13 -0800 All reviewed patches have been landed. Closing bug. 125828 2012-02-07 05:54:12 -0800 2012-02-07 10:13:48 -0800 Patch 77968.patch text/plain 11123 yael SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwNjkzMSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM0IEBACisyMDEyLTAyLTA3ICBZYWVsIEFo YXJvbiAgPHlhZWwuYWhhcm9uQG5va2lhLmNvbT4KKworICAgICAgICBbV0syXSBUZXh0IG5vdGlm aWNhdGlvbnMgc2hvdWxkIGhhdmUgYW4gaWNvblVSTAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Nzc5NjgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKyAgICAgICAgCisgICAgICAgIFBlciBodHRwOi8vd3d3LnczLm9yZy9UUi9u b3RpZmljYXRpb25zIHNpbXBsZSB0ZXh0IG5vdGlmaWNhdGlvbnMgc2hvdWxkIGhhdmUgYW4gaWNv blVSTC4KKyAgICAgICAgQWRkIGFuIGljb25VUkwgdG8gV2ViTm90aWZpY2F0aW9uIGFuZCBhZGQg YSBwdWJsaWMgQVBJIHRvIGFjY2VzcyBpdC4KKyAgICAgICAKKyAgICAgICAgKiBVSVByb2Nlc3Mv QVBJL0MvV0tOb3RpZmljYXRpb24uY3BwOgorICAgICAgICAoV0tOb3RpZmljYXRpb25Db3B5aWNv blVSTCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL1dLTm90aWZpY2F0aW9uLmg6CisgICAg ICAgICogVUlQcm9jZXNzL05vdGlmaWNhdGlvbnMvV2ViTm90aWZpY2F0aW9uLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViTm90aWZpY2F0aW9uOjpXZWJOb3RpZmljYXRpb24pOgorICAgICAgICAq IFVJUHJvY2Vzcy9Ob3RpZmljYXRpb25zL1dlYk5vdGlmaWNhdGlvbi5oOgorICAgICAgICAoV2Vi S2l0OjpXZWJOb3RpZmljYXRpb246OmNyZWF0ZSk6CisgICAgICAgIChXZWJLaXQ6OldlYk5vdGlm aWNhdGlvbjo6aWNvblVSTCk6CisgICAgICAgIChXZWJOb3RpZmljYXRpb24pOgorICAgICAgICAq IFVJUHJvY2Vzcy9Ob3RpZmljYXRpb25zL1dlYk5vdGlmaWNhdGlvbk1hbmFnZXJQcm94eS5jcHA6 CisgICAgICAgIChXZWJLaXQ6OldlYk5vdGlmaWNhdGlvbk1hbmFnZXJQcm94eTo6c2hvdyk6Cisg ICAgICAgICogVUlQcm9jZXNzL05vdGlmaWNhdGlvbnMvV2ViTm90aWZpY2F0aW9uTWFuYWdlclBy b3h5Lmg6CisgICAgICAgIChXZWJOb3RpZmljYXRpb25NYW5hZ2VyUHJveHkpOgorICAgICAgICAq IFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJv eHk6OnNob3dOb3RpZmljYXRpb24pOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHku aDoKKyAgICAgICAgKFdlYlBhZ2VQcm94eSk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQ cm94eS5tZXNzYWdlcy5pbjoKKyAgICAgICAgKiBXZWJQcm9jZXNzL05vdGlmaWNhdGlvbnMvV2Vi Tm90aWZpY2F0aW9uTWFuYWdlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYk5vdGlmaWNhdGlv bk1hbmFnZXI6OnNob3cpOgorCiAyMDEyLTAyLTAzICBBbmRyYXMgQmVjc2kgIDxhbmRyYXMuYmVj c2lAbm9raWEuY29tPgogCiAgICAgICAgIFtRdF1bV0syXSBBZGQgdGhlIGNvbXBvbmVudENvbXBs ZXRlIG1ldGhvZCB0byBXZWJWaWV3CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi UGFnZVByb3h5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi UGFnZVByb3h5LmNwcAkocmV2aXNpb24gMTA2OTAzKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMzNzcsOSArMzM3Nyw5IEBA IHZvaWQgV2ViUGFnZVByb3h5OjpyZXF1ZXN0Tm90aWZpY2F0aW9uUGUKICAgICAgICAgcmVxdWVz dC0+ZGVueSgpOwogfQogCi12b2lkIFdlYlBhZ2VQcm94eTo6c2hvd05vdGlmaWNhdGlvbihjb25z dCBTdHJpbmcmIHRpdGxlLCBjb25zdCBTdHJpbmcmIGJvZHksIGNvbnN0IFN0cmluZyYgb3JpZ2lu U3RyaW5nLCB1aW50NjRfdCBub3RpZmljYXRpb25JRCkKK3ZvaWQgV2ViUGFnZVByb3h5OjpzaG93 Tm90aWZpY2F0aW9uKGNvbnN0IFN0cmluZyYgdGl0bGUsIGNvbnN0IFN0cmluZyYgYm9keSwgY29u c3QgU3RyaW5nJiBpY29uVVJMLCBjb25zdCBTdHJpbmcmIG9yaWdpblN0cmluZywgdWludDY0X3Qg bm90aWZpY2F0aW9uSUQpCiB7Ci0gICAgbV9wcm9jZXNzLT5jb250ZXh0KCktPm5vdGlmaWNhdGlv bk1hbmFnZXJQcm94eSgpLT5zaG93KHRoaXMsIHRpdGxlLCBib2R5LCBvcmlnaW5TdHJpbmcsIG5v dGlmaWNhdGlvbklEKTsKKyAgICBtX3Byb2Nlc3MtPmNvbnRleHQoKS0+bm90aWZpY2F0aW9uTWFu YWdlclByb3h5KCktPnNob3codGhpcywgdGl0bGUsIGJvZHksIGljb25VUkwsIG9yaWdpblN0cmlu Zywgbm90aWZpY2F0aW9uSUQpOwogfQogCiBmbG9hdCBXZWJQYWdlUHJveHk6OmhlYWRlckhlaWdo dChXZWJGcmFtZVByb3h5KiBmcmFtZSkKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJQYWdlUHJveHkuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi UGFnZVByb3h5LmgJKHJldmlzaW9uIDEwNjkwMykKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJQYWdlUHJveHkuaAkod29ya2luZyBjb3B5KQpAQCAtNzI1LDcgKzcyNSw3IEBAIHByaXZh dGU6CiAgICAgdm9pZCByZWF0dGFjaFRvV2ViUHJvY2Vzc1dpdGhJdGVtKFdlYkJhY2tGb3J3YXJk TGlzdEl0ZW0qKTsKIAogICAgIHZvaWQgcmVxdWVzdE5vdGlmaWNhdGlvblBlcm1pc3Npb24odWlu dDY0X3Qgbm90aWZpY2F0aW9uSUQsIGNvbnN0IFN0cmluZyYgb3JpZ2luU3RyaW5nKTsKLSAgICB2 b2lkIHNob3dOb3RpZmljYXRpb24oY29uc3QgU3RyaW5nJiB0aXRsZSwgY29uc3QgU3RyaW5nJiBi b2R5LCBjb25zdCBTdHJpbmcmIG9yaWdpblN0cmluZywgdWludDY0X3Qgbm90aWZpY2F0aW9uSUQp OworICAgIHZvaWQgc2hvd05vdGlmaWNhdGlvbihjb25zdCBTdHJpbmcmIHRpdGxlLCBjb25zdCBT dHJpbmcmIGJvZHksIGNvbnN0IFN0cmluZyYgaWNvblVSTCwgY29uc3QgU3RyaW5nJiBvcmlnaW5T dHJpbmcsIHVpbnQ2NF90IG5vdGlmaWNhdGlvbklEKTsKICAgICAKICNpZiBVU0UoVElMRURfQkFD S0lOR19TVE9SRSkKICAgICB2b2lkIHBhZ2VEaWRSZXF1ZXN0U2Nyb2xsKGNvbnN0IFdlYkNvcmU6 OkludFBvaW50Jik7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5 Lm1lc3NhZ2VzLmluCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQ YWdlUHJveHkubWVzc2FnZXMuaW4JKHJldmlzaW9uIDEwNjkwMykKKysrIFNvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW4JKHdvcmtpbmcgY29weSkKQEAgLTIw Niw3ICsyMDYsNyBAQCBtZXNzYWdlcyAtPiBXZWJQYWdlUHJveHkgewogICAgIAogICAgICMgTm90 aWZpY2F0aW9uIG1lc3NhZ2VzCiAgICAgUmVxdWVzdE5vdGlmaWNhdGlvblBlcm1pc3Npb24odWlu dDY0X3QgcmVxdWVzdElELCBXVEY6OlN0cmluZyBvcmlnaW5JZGVudGlmaWVyKQotICAgIFNob3dO b3RpZmljYXRpb24oV1RGOjpTdHJpbmcgdGl0bGUsIFdURjo6U3RyaW5nIGJvZHksIFdURjo6U3Ry aW5nIG9yaWdpbklkZW50aWZpZXIsIHVpbnQ2NF90IG5vdGlmaWNhdGlvbklEKQorICAgIFNob3dO b3RpZmljYXRpb24oV1RGOjpTdHJpbmcgdGl0bGUsIFdURjo6U3RyaW5nIGJvZHksIFdURjo6U3Ry aW5nIGljb25VUkwsIFdURjo6U3RyaW5nIG9yaWdpbklkZW50aWZpZXIsIHVpbnQ2NF90IG5vdGlm aWNhdGlvbklEKQogCiAgICAgIyBTcGVsbGluZyBhbmQgZ3JhbW1hciBtZXNzYWdlcwogI2lmIFVT RShVTklGSUVEX1RFWFRfQ0hFQ0tJTkcpICAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvQy9XS05vdGlmaWNhdGlvbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9DL1dLTm90aWZpY2F0aW9uLmNwcAkocmV2aXNpb24gMTA2OTAzKQorKysg U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLTm90aWZpY2F0aW9uLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtNDcsNiArNDcsMTEgQEAgV0tTdHJpbmdSZWYgV0tOb3RpZmljYXRpb25Db3B5 Qm9keShXS05vdAogICAgIHJldHVybiB0b0NvcGllZEFQSSh0b0ltcGwobm90aWZpY2F0aW9uKS0+ Ym9keSgpKTsKIH0KIAorV0tTdHJpbmdSZWYgV0tOb3RpZmljYXRpb25Db3B5aWNvblVSTChXS05v dGlmaWNhdGlvblJlZiBub3RpZmljYXRpb24pCit7CisgICAgcmV0dXJuIHRvQ29waWVkQVBJKHRv SW1wbChub3RpZmljYXRpb24pLT5pY29uVVJMKCkpOworfQorCiBXS1NlY3VyaXR5T3JpZ2luUmVm IFdLTm90aWZpY2F0aW9uR2V0U2VjdXJpdHlPcmlnaW4oV0tOb3RpZmljYXRpb25SZWYgbm90aWZp Y2F0aW9uKQogewogICAgIHJldHVybiB0b0FQSSh0b0ltcGwobm90aWZpY2F0aW9uKS0+b3JpZ2lu KCkpOwpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLTm90aWZpY2F0aW9u LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLTm90aWZp Y2F0aW9uLmgJKHJldmlzaW9uIDEwNjkwMykKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvQy9XS05vdGlmaWNhdGlvbi5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNiw2ICszNiw3IEBAIFdL X0VYUE9SVCBXS1R5cGVJRCBXS05vdGlmaWNhdGlvbkdldFR5cGUKIAogV0tfRVhQT1JUIFdLU3Ry aW5nUmVmIFdLTm90aWZpY2F0aW9uQ29weVRpdGxlKFdLTm90aWZpY2F0aW9uUmVmIG5vdGlmaWNh dGlvbik7CiBXS19FWFBPUlQgV0tTdHJpbmdSZWYgV0tOb3RpZmljYXRpb25Db3B5Qm9keShXS05v dGlmaWNhdGlvblJlZiBub3RpZmljYXRpb24pOworV0tfRVhQT1JUIFdLU3RyaW5nUmVmIFdLTm90 aWZpY2F0aW9uQ29weWljb25VUkwoV0tOb3RpZmljYXRpb25SZWYgbm90aWZpY2F0aW9uKTsKIFdL X0VYUE9SVCBXS1NlY3VyaXR5T3JpZ2luUmVmIFdLTm90aWZpY2F0aW9uR2V0U2VjdXJpdHlPcmln aW4oV0tOb3RpZmljYXRpb25SZWYgbm90aWZpY2F0aW9uKTsKIFdLX0VYUE9SVCB1aW50NjRfdCBX S05vdGlmaWNhdGlvbkdldElEKFdLTm90aWZpY2F0aW9uUmVmIG5vdGlmaWNhdGlvbik7CiAKSW5k ZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Ob3RpZmljYXRpb25zL1dlYk5vdGlmaWNhdGlv bi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL05vdGlmaWNhdGlv bnMvV2ViTm90aWZpY2F0aW9uLmNwcAkocmV2aXNpb24gMTA2OTAzKQorKysgU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL05vdGlmaWNhdGlvbnMvV2ViTm90aWZpY2F0aW9uLmNwcAkod29ya2luZyBj b3B5KQpAQCAtMzMsOSArMzMsMTAgQEAKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLVdlYk5vdGlm aWNhdGlvbjo6V2ViTm90aWZpY2F0aW9uKGNvbnN0IFN0cmluZyYgdGl0bGUsIGNvbnN0IFN0cmlu ZyYgYm9keSwgY29uc3QgU3RyaW5nJiBvcmlnaW5TdHJpbmcsIHVpbnQ2NF90IG5vdGlmaWNhdGlv bklEKQorV2ViTm90aWZpY2F0aW9uOjpXZWJOb3RpZmljYXRpb24oY29uc3QgU3RyaW5nJiB0aXRs ZSwgY29uc3QgU3RyaW5nJiBib2R5LCBjb25zdCBTdHJpbmcmIGljb25VUkwsIGNvbnN0IFN0cmlu ZyYgb3JpZ2luU3RyaW5nLCB1aW50NjRfdCBub3RpZmljYXRpb25JRCkKICAgICA6IG1fdGl0bGUo dGl0bGUpCiAgICAgLCBtX2JvZHkoYm9keSkKKyAgICAsIG1faWNvblVSTChpY29uVVJMKQogICAg ICwgbV9vcmlnaW4oV2ViU2VjdXJpdHlPcmlnaW46OmNyZWF0ZUZyb21TdHJpbmcob3JpZ2luU3Ry aW5nKSkKICAgICAsIG1fbm90aWZpY2F0aW9uSUQobm90aWZpY2F0aW9uSUQpCiB7CkluZGV4OiBT b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTm90aWZpY2F0aW9ucy9XZWJOb3RpZmljYXRpb24uaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTm90aWZpY2F0aW9ucy9XZWJO b3RpZmljYXRpb24uaAkocmV2aXNpb24gMTA2OTAzKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL05vdGlmaWNhdGlvbnMvV2ViTm90aWZpY2F0aW9uLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ1 LDI0ICs0NSwyNiBAQCBjbGFzcyBXZWJOb3RpZmljYXRpb24gOiBwdWJsaWMgQVBJT2JqZWN0CiBw dWJsaWM6CiAgICAgc3RhdGljIGNvbnN0IFR5cGUgQVBJVHlwZSA9IFR5cGVOb3RpZmljYXRpb247 CiAgICAgCi0gICAgc3RhdGljIFBhc3NSZWZQdHI8V2ViTm90aWZpY2F0aW9uPiBjcmVhdGUoY29u c3QgU3RyaW5nJiB0aXRsZSwgY29uc3QgU3RyaW5nJiBib2R5LCBjb25zdCBTdHJpbmcmIG9yaWdp blN0cmluZywgdWludDY0X3Qgbm90aWZpY2F0aW9uSUQpCisgICAgc3RhdGljIFBhc3NSZWZQdHI8 V2ViTm90aWZpY2F0aW9uPiBjcmVhdGUoY29uc3QgU3RyaW5nJiB0aXRsZSwgY29uc3QgU3RyaW5n JiBib2R5LCBjb25zdCBTdHJpbmcmIGljb25VUkwsIGNvbnN0IFN0cmluZyYgb3JpZ2luU3RyaW5n LCB1aW50NjRfdCBub3RpZmljYXRpb25JRCkKICAgICB7Ci0gICAgICAgIHJldHVybiBhZG9wdFJl ZihuZXcgV2ViTm90aWZpY2F0aW9uKHRpdGxlLCBib2R5LCBvcmlnaW5TdHJpbmcsIG5vdGlmaWNh dGlvbklEKSk7CisgICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcgV2ViTm90aWZpY2F0aW9uKHRp dGxlLCBib2R5LCBpY29uVVJMLCBvcmlnaW5TdHJpbmcsIG5vdGlmaWNhdGlvbklEKSk7CiAgICAg fQogICAgIAogICAgIGNvbnN0IFN0cmluZyYgdGl0bGUoKSBjb25zdCB7IHJldHVybiBtX3RpdGxl OyB9CiAgICAgY29uc3QgU3RyaW5nJiBib2R5KCkgY29uc3QgeyByZXR1cm4gbV9ib2R5OyB9Cisg ICAgY29uc3QgU3RyaW5nJiBpY29uVVJMKCkgY29uc3QgeyByZXR1cm4gbV9pY29uVVJMOyB9CiAg ICAgV2ViU2VjdXJpdHlPcmlnaW4qIG9yaWdpbigpIGNvbnN0IHsgcmV0dXJuIG1fb3JpZ2luLmdl dCgpOyB9CiAgICAgCiAgICAgdWludDY0X3Qgbm90aWZpY2F0aW9uSUQoKSBjb25zdCB7IHJldHVy biBtX25vdGlmaWNhdGlvbklEOyB9CiAKIHByaXZhdGU6Ci0gICAgV2ViTm90aWZpY2F0aW9uKGNv bnN0IFN0cmluZyYgdGl0bGUsIGNvbnN0IFN0cmluZyYgYm9keSwgY29uc3QgU3RyaW5nJiBvcmln aW5TdHJpbmcsIHVpbnQ2NF90IG5vdGlmaWNhdGlvbklEKTsKKyAgICBXZWJOb3RpZmljYXRpb24o Y29uc3QgU3RyaW5nJiB0aXRsZSwgY29uc3QgU3RyaW5nJiBib2R5LCBjb25zdCBTdHJpbmcmIGlj b25VUkwsIGNvbnN0IFN0cmluZyYgb3JpZ2luU3RyaW5nLCB1aW50NjRfdCBub3RpZmljYXRpb25J RCk7CiAKICAgICB2aXJ0dWFsIFR5cGUgdHlwZSgpIGNvbnN0IHsgcmV0dXJuIEFQSVR5cGU7IH0K ICAgICAKICAgICBTdHJpbmcgbV90aXRsZTsKICAgICBTdHJpbmcgbV9ib2R5OworICAgIFN0cmlu ZyBtX2ljb25VUkw7CiAgICAgUmVmUHRyPFdlYlNlY3VyaXR5T3JpZ2luPiBtX29yaWdpbjsKICAg ICB1aW50NjRfdCBtX25vdGlmaWNhdGlvbklEOwogfTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9Ob3RpZmljYXRpb25zL1dlYk5vdGlmaWNhdGlvbk1hbmFnZXJQcm94eS5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL05vdGlmaWNhdGlvbnMvV2ViTm90 aWZpY2F0aW9uTWFuYWdlclByb3h5LmNwcAkocmV2aXNpb24gMTA2OTAzKQorKysgU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL05vdGlmaWNhdGlvbnMvV2ViTm90aWZpY2F0aW9uTWFuYWdlclByb3h5 LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzcsMTIgKzc3LDEyIEBAIHZvaWQgV2ViTm90aWZpY2F0 aW9uTWFuYWdlclByb3h5OjpkaWRSZWMKICAgICBkaWRSZWNlaXZlV2ViTm90aWZpY2F0aW9uTWFu YWdlclByb3h5TWVzc2FnZShjb25uZWN0aW9uLCBtZXNzYWdlSUQsIGFyZ3VtZW50cyk7CiB9CiAK LXZvaWQgV2ViTm90aWZpY2F0aW9uTWFuYWdlclByb3h5OjpzaG93KFdlYlBhZ2VQcm94eSogcGFn ZSwgY29uc3QgU3RyaW5nJiB0aXRsZSwgY29uc3QgU3RyaW5nJiBib2R5LCBjb25zdCBTdHJpbmcm IG9yaWdpblN0cmluZywgdWludDY0X3Qgbm90aWZpY2F0aW9uSUQpCit2b2lkIFdlYk5vdGlmaWNh dGlvbk1hbmFnZXJQcm94eTo6c2hvdyhXZWJQYWdlUHJveHkqIHBhZ2UsIGNvbnN0IFN0cmluZyYg dGl0bGUsIGNvbnN0IFN0cmluZyYgYm9keSwgY29uc3QgU3RyaW5nJiBpY29uVVJMLCBjb25zdCBT dHJpbmcmIG9yaWdpblN0cmluZywgdWludDY0X3Qgbm90aWZpY2F0aW9uSUQpCiB7CiAgICAgaWYg KCFpc05vdGlmaWNhdGlvbklEVmFsaWQobm90aWZpY2F0aW9uSUQpKQogICAgICAgICByZXR1cm47 CiAgICAgCi0gICAgUmVmUHRyPFdlYk5vdGlmaWNhdGlvbj4gbm90aWZpY2F0aW9uID0gV2ViTm90 aWZpY2F0aW9uOjpjcmVhdGUodGl0bGUsIGJvZHksIG9yaWdpblN0cmluZywgbm90aWZpY2F0aW9u SUQpOworICAgIFJlZlB0cjxXZWJOb3RpZmljYXRpb24+IG5vdGlmaWNhdGlvbiA9IFdlYk5vdGlm aWNhdGlvbjo6Y3JlYXRlKHRpdGxlLCBib2R5LCBpY29uVVJMLCBvcmlnaW5TdHJpbmcsIG5vdGlm aWNhdGlvbklEKTsKICAgICBtX25vdGlmaWNhdGlvbnMuc2V0KG5vdGlmaWNhdGlvbklELCBub3Rp ZmljYXRpb24pOwogICAgIG1fcHJvdmlkZXIuc2hvdyhwYWdlLCBub3RpZmljYXRpb24uZ2V0KCkp OwogfQpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL05vdGlmaWNhdGlvbnMvV2ViTm90 aWZpY2F0aW9uTWFuYWdlclByb3h5LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL05vdGlmaWNhdGlvbnMvV2ViTm90aWZpY2F0aW9uTWFuYWdlclByb3h5LmgJKHJldmlz aW9uIDEwNjkwMykKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Ob3RpZmljYXRpb25zL1dl Yk5vdGlmaWNhdGlvbk1hbmFnZXJQcm94eS5oCSh3b3JraW5nIGNvcHkpCkBAIC02MCw3ICs2MCw3 IEBAIHB1YmxpYzoKICAgICB2b2lkIGluaXRpYWxpemVQcm92aWRlcihjb25zdCBXS05vdGlmaWNh dGlvblByb3ZpZGVyKik7CiAgICAgdm9pZCBwb3B1bGF0ZUNvcHlPZk5vdGlmaWNhdGlvblBlcm1p c3Npb25zKEhhc2hNYXA8U3RyaW5nLCBib29sPiYpOwogCi0gICAgdm9pZCBzaG93KFdlYlBhZ2VQ cm94eSosIGNvbnN0IFN0cmluZyYgdGl0bGUsIGNvbnN0IFN0cmluZyYgYm9keSwgY29uc3QgU3Ry aW5nJiBvcmlnaW5TdHJpbmcsIHVpbnQ2NF90IG5vdGlmaWNhdGlvbklEKTsKKyAgICB2b2lkIHNo b3coV2ViUGFnZVByb3h5KiwgY29uc3QgU3RyaW5nJiB0aXRsZSwgY29uc3QgU3RyaW5nJiBib2R5 LCBjb25zdCBTdHJpbmcmIGljb25VUkwsIGNvbnN0IFN0cmluZyYgb3JpZ2luU3RyaW5nLCB1aW50 NjRfdCBub3RpZmljYXRpb25JRCk7CiAKICAgICB2b2lkIHByb3ZpZGVyRGlkU2hvd05vdGlmaWNh dGlvbih1aW50NjRfdCBub3RpZmljYXRpb25JRCk7CiAgICAgdm9pZCBwcm92aWRlckRpZENsaWNr Tm90aWZpY2F0aW9uKHVpbnQ2NF90IG5vdGlmaWNhdGlvbklEKTsKSW5kZXg6IFNvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvTm90aWZpY2F0aW9ucy9XZWJOb3RpZmljYXRpb25NYW5hZ2VyLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL05vdGlmaWNhdGlvbnMvV2Vi Tm90aWZpY2F0aW9uTWFuYWdlci5jcHAJKHJldmlzaW9uIDEwNjkwMykKKysrIFNvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvTm90aWZpY2F0aW9ucy9XZWJOb3RpZmljYXRpb25NYW5hZ2VyLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMTIxLDcgKzEyMSw3IEBAIGJvb2wgV2ViTm90aWZpY2F0aW9uTWFu YWdlcjo6c2hvdyhOb3RpZmkKICAgICB9CiAgICAgaXQtPnNlY29uZC5hcHBlbmQobm90aWZpY2F0 aW9uSUQpOwogICAgIAotICAgIG1fcHJvY2Vzcy0+Y29ubmVjdGlvbigpLT5zZW5kKE1lc3NhZ2Vz OjpXZWJQYWdlUHJveHk6OlNob3dOb3RpZmljYXRpb24obm90aWZpY2F0aW9uLT5jb250ZW50cygp LnRpdGxlLCBub3RpZmljYXRpb24tPmNvbnRlbnRzKCkuYm9keSwgbm90aWZpY2F0aW9uLT5zY3Jp cHRFeGVjdXRpb25Db250ZXh0KCktPnNlY3VyaXR5T3JpZ2luKCktPnRvU3RyaW5nKCksIG5vdGlm aWNhdGlvbklEKSwgcGFnZS0+cGFnZUlEKCkpOworICAgIG1fcHJvY2Vzcy0+Y29ubmVjdGlvbigp LT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OlNob3dOb3RpZmljYXRpb24obm90aWZpY2F0 aW9uLT5jb250ZW50cygpLnRpdGxlLCBub3RpZmljYXRpb24tPmNvbnRlbnRzKCkuYm9keSwgbm90 aWZpY2F0aW9uLT5pY29uVVJMKCkuc3RyaW5nKCksIG5vdGlmaWNhdGlvbi0+c2NyaXB0RXhlY3V0 aW9uQ29udGV4dCgpLT5zZWN1cml0eU9yaWdpbigpLT50b1N0cmluZygpLCBub3RpZmljYXRpb25J RCksIHBhZ2UtPnBhZ2VJRCgpKTsKICAgICByZXR1cm4gdHJ1ZTsKICNlbHNlCiAgICAgcmV0dXJu IGZhbHNlOwo= 125870 2012-02-07 10:13:48 -0800 2012-02-08 04:14:08 -0800 Patch. 77968.patch text/plain 11123 yael SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwNjkzMSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM0IEBACisyMDEyLTAyLTA3ICBZYWVsIEFo YXJvbiAgPHlhZWwuYWhhcm9uQG5va2lhLmNvbT4KKworICAgICAgICBbV0syXSBUZXh0IG5vdGlm aWNhdGlvbnMgc2hvdWxkIGhhdmUgYW4gaWNvblVSTAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Nzc5NjgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKyAgICAgICAgCisgICAgICAgIFBlciBodHRwOi8vd3d3LnczLm9yZy9UUi9u b3RpZmljYXRpb25zIHNpbXBsZSB0ZXh0IG5vdGlmaWNhdGlvbnMgc2hvdWxkIGhhdmUgYW4gaWNv blVSTC4KKyAgICAgICAgQWRkIGFuIGljb25VUkwgdG8gV2ViTm90aWZpY2F0aW9uIGFuZCBhZGQg YSBwdWJsaWMgQVBJIHRvIGFjY2VzcyBpdC4KKyAgICAgICAKKyAgICAgICAgKiBVSVByb2Nlc3Mv QVBJL0MvV0tOb3RpZmljYXRpb24uY3BwOgorICAgICAgICAoV0tOb3RpZmljYXRpb25Db3B5aWNv blVSTCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL1dLTm90aWZpY2F0aW9uLmg6CisgICAg ICAgICogVUlQcm9jZXNzL05vdGlmaWNhdGlvbnMvV2ViTm90aWZpY2F0aW9uLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViTm90aWZpY2F0aW9uOjpXZWJOb3RpZmljYXRpb24pOgorICAgICAgICAq IFVJUHJvY2Vzcy9Ob3RpZmljYXRpb25zL1dlYk5vdGlmaWNhdGlvbi5oOgorICAgICAgICAoV2Vi S2l0OjpXZWJOb3RpZmljYXRpb246OmNyZWF0ZSk6CisgICAgICAgIChXZWJLaXQ6OldlYk5vdGlm aWNhdGlvbjo6aWNvblVSTCk6CisgICAgICAgIChXZWJOb3RpZmljYXRpb24pOgorICAgICAgICAq IFVJUHJvY2Vzcy9Ob3RpZmljYXRpb25zL1dlYk5vdGlmaWNhdGlvbk1hbmFnZXJQcm94eS5jcHA6 CisgICAgICAgIChXZWJLaXQ6OldlYk5vdGlmaWNhdGlvbk1hbmFnZXJQcm94eTo6c2hvdyk6Cisg ICAgICAgICogVUlQcm9jZXNzL05vdGlmaWNhdGlvbnMvV2ViTm90aWZpY2F0aW9uTWFuYWdlclBy b3h5Lmg6CisgICAgICAgIChXZWJOb3RpZmljYXRpb25NYW5hZ2VyUHJveHkpOgorICAgICAgICAq IFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJv eHk6OnNob3dOb3RpZmljYXRpb24pOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHku aDoKKyAgICAgICAgKFdlYlBhZ2VQcm94eSk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQ cm94eS5tZXNzYWdlcy5pbjoKKyAgICAgICAgKiBXZWJQcm9jZXNzL05vdGlmaWNhdGlvbnMvV2Vi Tm90aWZpY2F0aW9uTWFuYWdlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYk5vdGlmaWNhdGlv bk1hbmFnZXI6OnNob3cpOgorCiAyMDEyLTAyLTAzICBBbmRyYXMgQmVjc2kgIDxhbmRyYXMuYmVj c2lAbm9raWEuY29tPgogCiAgICAgICAgIFtRdF1bV0syXSBBZGQgdGhlIGNvbXBvbmVudENvbXBs ZXRlIG1ldGhvZCB0byBXZWJWaWV3CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi UGFnZVByb3h5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi UGFnZVByb3h5LmNwcAkocmV2aXNpb24gMTA2OTAzKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMzNzcsOSArMzM3Nyw5IEBA IHZvaWQgV2ViUGFnZVByb3h5OjpyZXF1ZXN0Tm90aWZpY2F0aW9uUGUKICAgICAgICAgcmVxdWVz dC0+ZGVueSgpOwogfQogCi12b2lkIFdlYlBhZ2VQcm94eTo6c2hvd05vdGlmaWNhdGlvbihjb25z dCBTdHJpbmcmIHRpdGxlLCBjb25zdCBTdHJpbmcmIGJvZHksIGNvbnN0IFN0cmluZyYgb3JpZ2lu U3RyaW5nLCB1aW50NjRfdCBub3RpZmljYXRpb25JRCkKK3ZvaWQgV2ViUGFnZVByb3h5OjpzaG93 Tm90aWZpY2F0aW9uKGNvbnN0IFN0cmluZyYgdGl0bGUsIGNvbnN0IFN0cmluZyYgYm9keSwgY29u c3QgU3RyaW5nJiBpY29uVVJMLCBjb25zdCBTdHJpbmcmIG9yaWdpblN0cmluZywgdWludDY0X3Qg bm90aWZpY2F0aW9uSUQpCiB7Ci0gICAgbV9wcm9jZXNzLT5jb250ZXh0KCktPm5vdGlmaWNhdGlv bk1hbmFnZXJQcm94eSgpLT5zaG93KHRoaXMsIHRpdGxlLCBib2R5LCBvcmlnaW5TdHJpbmcsIG5v dGlmaWNhdGlvbklEKTsKKyAgICBtX3Byb2Nlc3MtPmNvbnRleHQoKS0+bm90aWZpY2F0aW9uTWFu YWdlclByb3h5KCktPnNob3codGhpcywgdGl0bGUsIGJvZHksIGljb25VUkwsIG9yaWdpblN0cmlu Zywgbm90aWZpY2F0aW9uSUQpOwogfQogCiBmbG9hdCBXZWJQYWdlUHJveHk6OmhlYWRlckhlaWdo dChXZWJGcmFtZVByb3h5KiBmcmFtZSkKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJQYWdlUHJveHkuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi UGFnZVByb3h5LmgJKHJldmlzaW9uIDEwNjkwMykKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJQYWdlUHJveHkuaAkod29ya2luZyBjb3B5KQpAQCAtNzI1LDcgKzcyNSw3IEBAIHByaXZh dGU6CiAgICAgdm9pZCByZWF0dGFjaFRvV2ViUHJvY2Vzc1dpdGhJdGVtKFdlYkJhY2tGb3J3YXJk TGlzdEl0ZW0qKTsKIAogICAgIHZvaWQgcmVxdWVzdE5vdGlmaWNhdGlvblBlcm1pc3Npb24odWlu dDY0X3Qgbm90aWZpY2F0aW9uSUQsIGNvbnN0IFN0cmluZyYgb3JpZ2luU3RyaW5nKTsKLSAgICB2 b2lkIHNob3dOb3RpZmljYXRpb24oY29uc3QgU3RyaW5nJiB0aXRsZSwgY29uc3QgU3RyaW5nJiBi b2R5LCBjb25zdCBTdHJpbmcmIG9yaWdpblN0cmluZywgdWludDY0X3Qgbm90aWZpY2F0aW9uSUQp OworICAgIHZvaWQgc2hvd05vdGlmaWNhdGlvbihjb25zdCBTdHJpbmcmIHRpdGxlLCBjb25zdCBT dHJpbmcmIGJvZHksIGNvbnN0IFN0cmluZyYgaWNvblVSTCwgY29uc3QgU3RyaW5nJiBvcmlnaW5T dHJpbmcsIHVpbnQ2NF90IG5vdGlmaWNhdGlvbklEKTsKICAgICAKICNpZiBVU0UoVElMRURfQkFD S0lOR19TVE9SRSkKICAgICB2b2lkIHBhZ2VEaWRSZXF1ZXN0U2Nyb2xsKGNvbnN0IFdlYkNvcmU6 OkludFBvaW50Jik7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5 Lm1lc3NhZ2VzLmluCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQ YWdlUHJveHkubWVzc2FnZXMuaW4JKHJldmlzaW9uIDEwNjkwMykKKysrIFNvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW4JKHdvcmtpbmcgY29weSkKQEAgLTIw Niw3ICsyMDYsNyBAQCBtZXNzYWdlcyAtPiBXZWJQYWdlUHJveHkgewogICAgIAogICAgICMgTm90 aWZpY2F0aW9uIG1lc3NhZ2VzCiAgICAgUmVxdWVzdE5vdGlmaWNhdGlvblBlcm1pc3Npb24odWlu dDY0X3QgcmVxdWVzdElELCBXVEY6OlN0cmluZyBvcmlnaW5JZGVudGlmaWVyKQotICAgIFNob3dO b3RpZmljYXRpb24oV1RGOjpTdHJpbmcgdGl0bGUsIFdURjo6U3RyaW5nIGJvZHksIFdURjo6U3Ry aW5nIG9yaWdpbklkZW50aWZpZXIsIHVpbnQ2NF90IG5vdGlmaWNhdGlvbklEKQorICAgIFNob3dO b3RpZmljYXRpb24oV1RGOjpTdHJpbmcgdGl0bGUsIFdURjo6U3RyaW5nIGJvZHksIFdURjo6U3Ry aW5nIGljb25VUkwsIFdURjo6U3RyaW5nIG9yaWdpbklkZW50aWZpZXIsIHVpbnQ2NF90IG5vdGlm aWNhdGlvbklEKQogCiAgICAgIyBTcGVsbGluZyBhbmQgZ3JhbW1hciBtZXNzYWdlcwogI2lmIFVT RShVTklGSUVEX1RFWFRfQ0hFQ0tJTkcpICAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvQy9XS05vdGlmaWNhdGlvbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9DL1dLTm90aWZpY2F0aW9uLmNwcAkocmV2aXNpb24gMTA2OTAzKQorKysg U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLTm90aWZpY2F0aW9uLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtNDcsNiArNDcsMTEgQEAgV0tTdHJpbmdSZWYgV0tOb3RpZmljYXRpb25Db3B5 Qm9keShXS05vdAogICAgIHJldHVybiB0b0NvcGllZEFQSSh0b0ltcGwobm90aWZpY2F0aW9uKS0+ Ym9keSgpKTsKIH0KIAorV0tTdHJpbmdSZWYgV0tOb3RpZmljYXRpb25Db3B5SWNvblVSTChXS05v dGlmaWNhdGlvblJlZiBub3RpZmljYXRpb24pCit7CisgICAgcmV0dXJuIHRvQ29waWVkQVBJKHRv SW1wbChub3RpZmljYXRpb24pLT5pY29uVVJMKCkpOworfQorCiBXS1NlY3VyaXR5T3JpZ2luUmVm IFdLTm90aWZpY2F0aW9uR2V0U2VjdXJpdHlPcmlnaW4oV0tOb3RpZmljYXRpb25SZWYgbm90aWZp Y2F0aW9uKQogewogICAgIHJldHVybiB0b0FQSSh0b0ltcGwobm90aWZpY2F0aW9uKS0+b3JpZ2lu KCkpOwpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLTm90aWZpY2F0aW9u LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLTm90aWZp Y2F0aW9uLmgJKHJldmlzaW9uIDEwNjkwMykKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvQy9XS05vdGlmaWNhdGlvbi5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNiw2ICszNiw3IEBAIFdL X0VYUE9SVCBXS1R5cGVJRCBXS05vdGlmaWNhdGlvbkdldFR5cGUKIAogV0tfRVhQT1JUIFdLU3Ry aW5nUmVmIFdLTm90aWZpY2F0aW9uQ29weVRpdGxlKFdLTm90aWZpY2F0aW9uUmVmIG5vdGlmaWNh dGlvbik7CiBXS19FWFBPUlQgV0tTdHJpbmdSZWYgV0tOb3RpZmljYXRpb25Db3B5Qm9keShXS05v dGlmaWNhdGlvblJlZiBub3RpZmljYXRpb24pOworV0tfRVhQT1JUIFdLU3RyaW5nUmVmIFdLTm90 aWZpY2F0aW9uQ29weUljb25VUkwoV0tOb3RpZmljYXRpb25SZWYgbm90aWZpY2F0aW9uKTsKIFdL X0VYUE9SVCBXS1NlY3VyaXR5T3JpZ2luUmVmIFdLTm90aWZpY2F0aW9uR2V0U2VjdXJpdHlPcmln aW4oV0tOb3RpZmljYXRpb25SZWYgbm90aWZpY2F0aW9uKTsKIFdLX0VYUE9SVCB1aW50NjRfdCBX S05vdGlmaWNhdGlvbkdldElEKFdLTm90aWZpY2F0aW9uUmVmIG5vdGlmaWNhdGlvbik7CiAKSW5k ZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Ob3RpZmljYXRpb25zL1dlYk5vdGlmaWNhdGlv bi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL05vdGlmaWNhdGlv bnMvV2ViTm90aWZpY2F0aW9uLmNwcAkocmV2aXNpb24gMTA2OTAzKQorKysgU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL05vdGlmaWNhdGlvbnMvV2ViTm90aWZpY2F0aW9uLmNwcAkod29ya2luZyBj b3B5KQpAQCAtMzMsOSArMzMsMTAgQEAKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLVdlYk5vdGlm aWNhdGlvbjo6V2ViTm90aWZpY2F0aW9uKGNvbnN0IFN0cmluZyYgdGl0bGUsIGNvbnN0IFN0cmlu ZyYgYm9keSwgY29uc3QgU3RyaW5nJiBvcmlnaW5TdHJpbmcsIHVpbnQ2NF90IG5vdGlmaWNhdGlv bklEKQorV2ViTm90aWZpY2F0aW9uOjpXZWJOb3RpZmljYXRpb24oY29uc3QgU3RyaW5nJiB0aXRs ZSwgY29uc3QgU3RyaW5nJiBib2R5LCBjb25zdCBTdHJpbmcmIGljb25VUkwsIGNvbnN0IFN0cmlu ZyYgb3JpZ2luU3RyaW5nLCB1aW50NjRfdCBub3RpZmljYXRpb25JRCkKICAgICA6IG1fdGl0bGUo dGl0bGUpCiAgICAgLCBtX2JvZHkoYm9keSkKKyAgICAsIG1faWNvblVSTChpY29uVVJMKQogICAg ICwgbV9vcmlnaW4oV2ViU2VjdXJpdHlPcmlnaW46OmNyZWF0ZUZyb21TdHJpbmcob3JpZ2luU3Ry aW5nKSkKICAgICAsIG1fbm90aWZpY2F0aW9uSUQobm90aWZpY2F0aW9uSUQpCiB7CkluZGV4OiBT b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTm90aWZpY2F0aW9ucy9XZWJOb3RpZmljYXRpb24uaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTm90aWZpY2F0aW9ucy9XZWJO b3RpZmljYXRpb24uaAkocmV2aXNpb24gMTA2OTAzKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL05vdGlmaWNhdGlvbnMvV2ViTm90aWZpY2F0aW9uLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ1 LDI0ICs0NSwyNiBAQCBjbGFzcyBXZWJOb3RpZmljYXRpb24gOiBwdWJsaWMgQVBJT2JqZWN0CiBw dWJsaWM6CiAgICAgc3RhdGljIGNvbnN0IFR5cGUgQVBJVHlwZSA9IFR5cGVOb3RpZmljYXRpb247 CiAgICAgCi0gICAgc3RhdGljIFBhc3NSZWZQdHI8V2ViTm90aWZpY2F0aW9uPiBjcmVhdGUoY29u c3QgU3RyaW5nJiB0aXRsZSwgY29uc3QgU3RyaW5nJiBib2R5LCBjb25zdCBTdHJpbmcmIG9yaWdp blN0cmluZywgdWludDY0X3Qgbm90aWZpY2F0aW9uSUQpCisgICAgc3RhdGljIFBhc3NSZWZQdHI8 V2ViTm90aWZpY2F0aW9uPiBjcmVhdGUoY29uc3QgU3RyaW5nJiB0aXRsZSwgY29uc3QgU3RyaW5n JiBib2R5LCBjb25zdCBTdHJpbmcmIGljb25VUkwsIGNvbnN0IFN0cmluZyYgb3JpZ2luU3RyaW5n LCB1aW50NjRfdCBub3RpZmljYXRpb25JRCkKICAgICB7Ci0gICAgICAgIHJldHVybiBhZG9wdFJl ZihuZXcgV2ViTm90aWZpY2F0aW9uKHRpdGxlLCBib2R5LCBvcmlnaW5TdHJpbmcsIG5vdGlmaWNh dGlvbklEKSk7CisgICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcgV2ViTm90aWZpY2F0aW9uKHRp dGxlLCBib2R5LCBpY29uVVJMLCBvcmlnaW5TdHJpbmcsIG5vdGlmaWNhdGlvbklEKSk7CiAgICAg fQogICAgIAogICAgIGNvbnN0IFN0cmluZyYgdGl0bGUoKSBjb25zdCB7IHJldHVybiBtX3RpdGxl OyB9CiAgICAgY29uc3QgU3RyaW5nJiBib2R5KCkgY29uc3QgeyByZXR1cm4gbV9ib2R5OyB9Cisg ICAgY29uc3QgU3RyaW5nJiBpY29uVVJMKCkgY29uc3QgeyByZXR1cm4gbV9pY29uVVJMOyB9CiAg ICAgV2ViU2VjdXJpdHlPcmlnaW4qIG9yaWdpbigpIGNvbnN0IHsgcmV0dXJuIG1fb3JpZ2luLmdl dCgpOyB9CiAgICAgCiAgICAgdWludDY0X3Qgbm90aWZpY2F0aW9uSUQoKSBjb25zdCB7IHJldHVy biBtX25vdGlmaWNhdGlvbklEOyB9CiAKIHByaXZhdGU6Ci0gICAgV2ViTm90aWZpY2F0aW9uKGNv bnN0IFN0cmluZyYgdGl0bGUsIGNvbnN0IFN0cmluZyYgYm9keSwgY29uc3QgU3RyaW5nJiBvcmln aW5TdHJpbmcsIHVpbnQ2NF90IG5vdGlmaWNhdGlvbklEKTsKKyAgICBXZWJOb3RpZmljYXRpb24o Y29uc3QgU3RyaW5nJiB0aXRsZSwgY29uc3QgU3RyaW5nJiBib2R5LCBjb25zdCBTdHJpbmcmIGlj b25VUkwsIGNvbnN0IFN0cmluZyYgb3JpZ2luU3RyaW5nLCB1aW50NjRfdCBub3RpZmljYXRpb25J RCk7CiAKICAgICB2aXJ0dWFsIFR5cGUgdHlwZSgpIGNvbnN0IHsgcmV0dXJuIEFQSVR5cGU7IH0K ICAgICAKICAgICBTdHJpbmcgbV90aXRsZTsKICAgICBTdHJpbmcgbV9ib2R5OworICAgIFN0cmlu ZyBtX2ljb25VUkw7CiAgICAgUmVmUHRyPFdlYlNlY3VyaXR5T3JpZ2luPiBtX29yaWdpbjsKICAg ICB1aW50NjRfdCBtX25vdGlmaWNhdGlvbklEOwogfTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9Ob3RpZmljYXRpb25zL1dlYk5vdGlmaWNhdGlvbk1hbmFnZXJQcm94eS5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL05vdGlmaWNhdGlvbnMvV2ViTm90 aWZpY2F0aW9uTWFuYWdlclByb3h5LmNwcAkocmV2aXNpb24gMTA2OTAzKQorKysgU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL05vdGlmaWNhdGlvbnMvV2ViTm90aWZpY2F0aW9uTWFuYWdlclByb3h5 LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzcsMTIgKzc3LDEyIEBAIHZvaWQgV2ViTm90aWZpY2F0 aW9uTWFuYWdlclByb3h5OjpkaWRSZWMKICAgICBkaWRSZWNlaXZlV2ViTm90aWZpY2F0aW9uTWFu YWdlclByb3h5TWVzc2FnZShjb25uZWN0aW9uLCBtZXNzYWdlSUQsIGFyZ3VtZW50cyk7CiB9CiAK LXZvaWQgV2ViTm90aWZpY2F0aW9uTWFuYWdlclByb3h5OjpzaG93KFdlYlBhZ2VQcm94eSogcGFn ZSwgY29uc3QgU3RyaW5nJiB0aXRsZSwgY29uc3QgU3RyaW5nJiBib2R5LCBjb25zdCBTdHJpbmcm IG9yaWdpblN0cmluZywgdWludDY0X3Qgbm90aWZpY2F0aW9uSUQpCit2b2lkIFdlYk5vdGlmaWNh dGlvbk1hbmFnZXJQcm94eTo6c2hvdyhXZWJQYWdlUHJveHkqIHBhZ2UsIGNvbnN0IFN0cmluZyYg dGl0bGUsIGNvbnN0IFN0cmluZyYgYm9keSwgY29uc3QgU3RyaW5nJiBpY29uVVJMLCBjb25zdCBT dHJpbmcmIG9yaWdpblN0cmluZywgdWludDY0X3Qgbm90aWZpY2F0aW9uSUQpCiB7CiAgICAgaWYg KCFpc05vdGlmaWNhdGlvbklEVmFsaWQobm90aWZpY2F0aW9uSUQpKQogICAgICAgICByZXR1cm47 CiAgICAgCi0gICAgUmVmUHRyPFdlYk5vdGlmaWNhdGlvbj4gbm90aWZpY2F0aW9uID0gV2ViTm90 aWZpY2F0aW9uOjpjcmVhdGUodGl0bGUsIGJvZHksIG9yaWdpblN0cmluZywgbm90aWZpY2F0aW9u SUQpOworICAgIFJlZlB0cjxXZWJOb3RpZmljYXRpb24+IG5vdGlmaWNhdGlvbiA9IFdlYk5vdGlm aWNhdGlvbjo6Y3JlYXRlKHRpdGxlLCBib2R5LCBpY29uVVJMLCBvcmlnaW5TdHJpbmcsIG5vdGlm aWNhdGlvbklEKTsKICAgICBtX25vdGlmaWNhdGlvbnMuc2V0KG5vdGlmaWNhdGlvbklELCBub3Rp ZmljYXRpb24pOwogICAgIG1fcHJvdmlkZXIuc2hvdyhwYWdlLCBub3RpZmljYXRpb24uZ2V0KCkp OwogfQpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL05vdGlmaWNhdGlvbnMvV2ViTm90 aWZpY2F0aW9uTWFuYWdlclByb3h5LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL05vdGlmaWNhdGlvbnMvV2ViTm90aWZpY2F0aW9uTWFuYWdlclByb3h5LmgJKHJldmlz aW9uIDEwNjkwMykKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Ob3RpZmljYXRpb25zL1dl Yk5vdGlmaWNhdGlvbk1hbmFnZXJQcm94eS5oCSh3b3JraW5nIGNvcHkpCkBAIC02MCw3ICs2MCw3 IEBAIHB1YmxpYzoKICAgICB2b2lkIGluaXRpYWxpemVQcm92aWRlcihjb25zdCBXS05vdGlmaWNh dGlvblByb3ZpZGVyKik7CiAgICAgdm9pZCBwb3B1bGF0ZUNvcHlPZk5vdGlmaWNhdGlvblBlcm1p c3Npb25zKEhhc2hNYXA8U3RyaW5nLCBib29sPiYpOwogCi0gICAgdm9pZCBzaG93KFdlYlBhZ2VQ cm94eSosIGNvbnN0IFN0cmluZyYgdGl0bGUsIGNvbnN0IFN0cmluZyYgYm9keSwgY29uc3QgU3Ry aW5nJiBvcmlnaW5TdHJpbmcsIHVpbnQ2NF90IG5vdGlmaWNhdGlvbklEKTsKKyAgICB2b2lkIHNo b3coV2ViUGFnZVByb3h5KiwgY29uc3QgU3RyaW5nJiB0aXRsZSwgY29uc3QgU3RyaW5nJiBib2R5 LCBjb25zdCBTdHJpbmcmIGljb25VUkwsIGNvbnN0IFN0cmluZyYgb3JpZ2luU3RyaW5nLCB1aW50 NjRfdCBub3RpZmljYXRpb25JRCk7CiAKICAgICB2b2lkIHByb3ZpZGVyRGlkU2hvd05vdGlmaWNh dGlvbih1aW50NjRfdCBub3RpZmljYXRpb25JRCk7CiAgICAgdm9pZCBwcm92aWRlckRpZENsaWNr Tm90aWZpY2F0aW9uKHVpbnQ2NF90IG5vdGlmaWNhdGlvbklEKTsKSW5kZXg6IFNvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvTm90aWZpY2F0aW9ucy9XZWJOb3RpZmljYXRpb25NYW5hZ2VyLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL05vdGlmaWNhdGlvbnMvV2Vi Tm90aWZpY2F0aW9uTWFuYWdlci5jcHAJKHJldmlzaW9uIDEwNjkwMykKKysrIFNvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvTm90aWZpY2F0aW9ucy9XZWJOb3RpZmljYXRpb25NYW5hZ2VyLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMTIxLDcgKzEyMSw3IEBAIGJvb2wgV2ViTm90aWZpY2F0aW9uTWFu YWdlcjo6c2hvdyhOb3RpZmkKICAgICB9CiAgICAgaXQtPnNlY29uZC5hcHBlbmQobm90aWZpY2F0 aW9uSUQpOwogICAgIAotICAgIG1fcHJvY2Vzcy0+Y29ubmVjdGlvbigpLT5zZW5kKE1lc3NhZ2Vz OjpXZWJQYWdlUHJveHk6OlNob3dOb3RpZmljYXRpb24obm90aWZpY2F0aW9uLT5jb250ZW50cygp LnRpdGxlLCBub3RpZmljYXRpb24tPmNvbnRlbnRzKCkuYm9keSwgbm90aWZpY2F0aW9uLT5zY3Jp cHRFeGVjdXRpb25Db250ZXh0KCktPnNlY3VyaXR5T3JpZ2luKCktPnRvU3RyaW5nKCksIG5vdGlm aWNhdGlvbklEKSwgcGFnZS0+cGFnZUlEKCkpOworICAgIG1fcHJvY2Vzcy0+Y29ubmVjdGlvbigp LT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OlNob3dOb3RpZmljYXRpb24obm90aWZpY2F0 aW9uLT5jb250ZW50cygpLnRpdGxlLCBub3RpZmljYXRpb24tPmNvbnRlbnRzKCkuYm9keSwgbm90 aWZpY2F0aW9uLT5pY29uVVJMKCkuc3RyaW5nKCksIG5vdGlmaWNhdGlvbi0+c2NyaXB0RXhlY3V0 aW9uQ29udGV4dCgpLT5zZWN1cml0eU9yaWdpbigpLT50b1N0cmluZygpLCBub3RpZmljYXRpb25J RCksIHBhZ2UtPnBhZ2VJRCgpKTsKICAgICByZXR1cm4gdHJ1ZTsKICNlbHNlCiAgICAgcmV0dXJu IGZhbHNlOwo=