186163 2018-05-31 14:42:01 -0700 Add OpenGL display mask to WebPage creation parameters. 2018-05-31 16:44:28 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 pvollan pvollan bfulgham commit-queue sam simon.fraser webkit-bug-importer oldest_to_newest 1429009 0 pvollan 2018-05-31 14:42:01 -0700 To make sure the OpenGL display mask is always available, include it in the WebPage creation parameters. 1429013 1 341695 pvollan 2018-05-31 14:59:59 -0700 Created attachment 341695 Patch 1429014 2 pvollan 2018-05-31 15:00:36 -0700 rdar://problem/40634504 1429020 3 341695 bfulgham 2018-05-31 15:17:20 -0700 Comment on attachment 341695 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=341695&action=review r=me > Source/WebKit/UIProcess/WebPageProxy.cpp:6151 > +#endif Is there a startup message that had previously been used to send the display mask that can now be removed? 1429022 4 341695 sam 2018-05-31 15:23:10 -0700 Comment on attachment 341695 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=341695&action=review > Source/WebKit/WebProcess/WebPage/WebPage.cpp:623 > +#if PLATFORM(IOS) > + GraphicsContext3D::setOpenGLDisplayMask(parameters.displayMask); > +#endif I don't this this will work with two WKWebViews in the same web process on different displays. This will just set the the global display mask two different values. 1429024 5 341698 pvollan 2018-05-31 15:35:26 -0700 Created attachment 341698 Patch 1429025 6 pvollan 2018-05-31 15:36:52 -0700 (In reply to Brent Fulgham from comment #3) > Comment on attachment 341695 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=341695&action=review > > r=me > > > Source/WebKit/UIProcess/WebPageProxy.cpp:6151 > > +#endif > > Is there a startup message that had previously been used to send the display > mask that can now be removed? The message is sent when the platform display ID is changing, which we still need to do. Thanks for reviewing! 1429026 7 pvollan 2018-05-31 15:38:26 -0700 (In reply to Sam Weinig from comment #4) > Comment on attachment 341695 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=341695&action=review > > > Source/WebKit/WebProcess/WebPage/WebPage.cpp:623 > > +#if PLATFORM(IOS) > > + GraphicsContext3D::setOpenGLDisplayMask(parameters.displayMask); > > +#endif > > I don't this this will work with two WKWebViews in the same web process on > different displays. This will just set the the global display mask two > different values. That makes sense. I think the OpenGL display mask could be moved to the Chrome class. Are you ok with that being done in a follow-up patch? Thanks for reviewing! 1429030 8 sam 2018-05-31 15:47:56 -0700 (In reply to Per Arne Vollan from comment #7) > (In reply to Sam Weinig from comment #4) > > Comment on attachment 341695 [details] > > Patch > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=341695&action=review > > > > > Source/WebKit/WebProcess/WebPage/WebPage.cpp:623 > > > +#if PLATFORM(IOS) > > > + GraphicsContext3D::setOpenGLDisplayMask(parameters.displayMask); > > > +#endif > > > > I don't this this will work with two WKWebViews in the same web process on > > different displays. This will just set the the global display mask two > > different values. > > That makes sense. I think the OpenGL display mask could be moved to the > Chrome class. Are you ok with that being done in a follow-up patch? > > Thanks for reviewing! Ok. But given that bug, it seems like you should find a way to test this. 1429031 9 341699 pvollan 2018-05-31 15:54:32 -0700 Created attachment 341699 Patch 1429032 10 341699 bfulgham 2018-05-31 16:02:07 -0700 Comment on attachment 341699 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=341699&action=review > Source/WebKit/WebProcess/WebPage/WebPage.cpp:623 > + GraphicsContext3D::setOpenGLDisplayMask(parameters.displayMask); For future: Might need this take the display mask as well as the displayID used by this page. 1429033 11 341699 commit-queue 2018-05-31 16:16:38 -0700 Comment on attachment 341699 Patch Rejecting attachment 341699 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-02', 'validate-changelog', '--check-oops', '--non-interactive', 341699, '--port=mac']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit ChangeLog entry in Source/WebCore/ChangeLog contains OOPS!. Full output: http://webkit-queues.webkit.org/results/7909090 1429036 12 simon.fraser 2018-05-31 16:25:09 -0700 When I move a window between screens are we doing to update the display mask? 1429037 13 bfulgham 2018-05-31 16:27:09 -0700 (In reply to Simon Fraser (smfr) from comment #12) > When I move a window between screens are we doing to update the display mask? yes. That part was already in place and working. This change is only about a startup problem we found during testing. 1429049 14 pvollan 2018-05-31 16:44:28 -0700 Committed r232375: <https://trac.webkit.org/changeset/232375/webkit> 341695 2018-05-31 14:59:59 -0700 2018-05-31 15:17:20 -0700 Patch bug-186163-20180531145958.patch text/plain 6740 pvollan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzMjMwMSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDE4LTA1LTMxICBQZXIgQXJu ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgT3BlbkdMIGRpc3Bs YXkgbWFzayB0byBXZWJQYWdlIGNyZWF0aW9uIHBhcmFtZXRlcnMuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODYxNjMKKyAgICAgICAgPHJkYXI6Ly9w cm9ibGVtLzQwNjM0NTA0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFRvIG1ha2Ugc3VyZSB0aGUgT3BlbkdMIGRpc3BsYXkgbWFzayBpcyBhbHdheXMg YXZhaWxhYmxlLCBpbmNsdWRlIGl0IGluIHRoZSBXZWJQYWdlIGNyZWF0aW9uIHBhcmFtZXRlcnMu CisgICAgICAgIFRoZSBPcGVuR0wgZGlzcGxheSBtYXNrIGlzIHNlbnQgdG8gdGhlIFdlYlByb2Nl c3Mgd2hlbiB0aGUgcGxhdGZvcm0gZGlzcGxheSBJRCBjaGFuZ2VzLCBidXQgdGhhdCBpcyBub3QK KyAgICAgICAgZWFybHkgZW5vdWdoIGluIGFsbCBjYXNlcy4gSWYgdGhlIE9wZW5HTCBkaXNwbGF5 IG1hc2sgaXMgbm90IHNldCwgb25seSBPcGVuR0wgc29mdHdhcmUgcmVuZGVyaW5nIGlzIG9mZmVy ZWQKKyAgICAgICAgb24gc29tZSBoYXJkd2FyZSBjb25maWd1cmF0aW9ucy4KKyAKKyAgICAgICAg Tm8gbmV3IHRlc3RzLCBzaW5jZSBpdCBpcyBub3QgdHJpdmlhbCB0byB0ZXN0IHdoZXRoZXIgT3Bl bkdMIHJlbmRlcmluZyBpcyBoYXJkd2FyZSBhY2NlbGVyYXRlZC4KKworICAgICAgICAqIHBsYXRm b3JtL1BsYXRmb3JtU2NyZWVuLmg6CisgICAgICAgICogcGxhdGZvcm0vbWFjL1BsYXRmb3JtU2Ny ZWVuTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6ZGlzcGxheUlEKToKKwogMjAxOC0wNS0zMCAg SmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KIAogICAgICAgICBNZWRpYSBlbGVtZW50 cyBvdXRzaWRlIGZ1bGxzY3JlZW4gc2hvdWxkIG5vdCBiZSBjb25zaWRlcmVkIG1haW4gY29udGVu dC4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1BsYXRmb3JtU2NyZWVuLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vUGxhdGZvcm1TY3JlZW4uaAkocmV2aXNp b24gMjMyMzAxKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vUGxhdGZvcm1TY3JlZW4uaAko d29ya2luZyBjb3B5KQpAQCAtODEsNyArODEsOSBAQCBXRUJDT1JFX0VYUE9SVCBDR0NvbG9yU3Bh Y2VSZWYgc2NyZWVuQ29sCiAjaWYgUExBVEZPUk0oTUFDKQogc3RydWN0IFNjcmVlblByb3BlcnRp ZXM7CiAKLU5TU2NyZWVuICpzY3JlZW4oTlNXaW5kb3cgKik7CitXRUJDT1JFX0VYUE9SVCBQbGF0 Zm9ybURpc3BsYXlJRCBkaXNwbGF5SUQoTlNTY3JlZW4gKik7CisKK1dFQkNPUkVfRVhQT1JUIE5T U2NyZWVuICpzY3JlZW4oTlNXaW5kb3cgKik7CiBOU1NjcmVlbiAqc2NyZWVuKFBsYXRmb3JtRGlz cGxheUlEKTsKIAogRmxvYXRSZWN0IHNjcmVlblJlY3RGb3JEaXNwbGF5KFBsYXRmb3JtRGlzcGxh eUlEKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9QbGF0Zm9ybVNjcmVlbk1h Yy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvUGxhdGZvcm1T Y3JlZW5NYWMubW0JKHJldmlzaW9uIDIzMjMwMSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L21hYy9QbGF0Zm9ybVNjcmVlbk1hYy5tbQkod29ya2luZyBjb3B5KQpAQCAtNDYsNyArNDYsNyBA QCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAvLyBUaGVzZSBmdW5jdGlvbnMgc2NhbGUgYmV0d2VlbiBz Y3JlZW4gYW5kIHBhZ2UgY29vcmRpbmF0ZXMgYmVjYXVzZSBKYXZhU2NyaXB0L0RPTSBvcGVyYXRp b25zCiAvLyBhc3N1bWUgdGhhdCB0aGUgc2NyZWVuIGFuZCB0aGUgcGFnZSBzaGFyZSB0aGUgc2Ft ZSBjb29yZGluYXRlIHN5c3RlbS4KIAotc3RhdGljIFBsYXRmb3JtRGlzcGxheUlEIGRpc3BsYXlJ RChOU1NjcmVlbiAqc2NyZWVuKQorUGxhdGZvcm1EaXNwbGF5SUQgZGlzcGxheUlEKE5TU2NyZWVu ICpzY3JlZW4pCiB7CiAgICAgQVNTRVJUKGhhc1Byb2Nlc3NQcml2aWxlZ2UoUHJvY2Vzc1ByaXZp bGVnZTo6Q2FuQ29tbXVuaWNhdGVXaXRoV2luZG93U2VydmVyKSk7CiAgICAgcmV0dXJuIFtbW3Nj cmVlbiBkZXZpY2VEZXNjcmlwdGlvbl0gb2JqZWN0Rm9yS2V5OkAiTlNTY3JlZW5OdW1iZXIiXSBp bnRWYWx1ZV07CkluZGV4OiBTb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViS2l0L0NoYW5nZUxvZwkocmV2aXNpb24gMjMyMzczKQorKysgU291cmNlL1dlYktp dC9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyNSBAQAorMjAxOC0wNS0zMSAg UGVyIEFybmUgVm9sbGFuICA8cHZvbGxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIE9wZW5H TCBkaXNwbGF5IG1hc2sgdG8gV2ViUGFnZSBjcmVhdGlvbiBwYXJhbWV0ZXJzLgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg2MTYzCisgICAgICAgIDxy ZGFyOi8vcHJvYmxlbS80MDYzNDUwND4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBUbyBtYWtlIHN1cmUgdGhlIE9wZW5HTCBkaXNwbGF5IG1hc2sgaXMg YWx3YXlzIGF2YWlsYWJsZSwgaW5jbHVkZSBpdCBpbiB0aGUgV2ViUGFnZSBjcmVhdGlvbiBwYXJh bWV0ZXJzLgorICAgICAgICBUaGUgT3BlbkdMIGRpc3BsYXkgbWFzayBpcyBzZW50IHRvIHRoZSBX ZWJQcm9jZXNzIHdoZW4gdGhlIHBsYXRmb3JtIGRpc3BsYXkgSUQgY2hhbmdlcywgYnV0IHRoYXQg aXMgbm90CisgICAgICAgIGVhcmx5IGVub3VnaCBpbiBhbGwgY2FzZXMuIElmIHRoZSBPcGVuR0wg ZGlzcGxheSBtYXNrIGlzIG5vdCBzZXQsIG9ubHkgT3BlbkdMIHNvZnR3YXJlIHJlbmRlcmluZyBp cyBvZmZlcmVkCisgICAgICAgIG9uIHNvbWUgaGFyZHdhcmUgY29uZmlndXJhdGlvbnMuCisKKyAg ICAgICAgKiBTaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5jcHA6CisgICAgICAgIChX ZWJLaXQ6OldlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnM6OmVuY29kZSBjb25zdCk6CisgICAgICAg IChXZWJLaXQ6OldlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnM6OmRlY29kZSk6CisgICAgICAgICog U2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuaDoKKyAgICAgICAgKiBVSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpjcmVhdGlv blBhcmFtZXRlcnMpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoK KyAgICAgICAgKFdlYktpdDo6bV9jcmVkZW50aWFsc01lc3Nlbmdlcik6CisKIDIwMTgtMDUtMzEg IEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CiAKICAgICAgICAgQWRkIGEgcnVs ZSB0byBhbGxvdyByZWFkaW5nIGZpbGVzIHdpdGggcHJlZml4IC9wcml2YXRlL3Zhci9kYi9DVk1T L2N2bXNDb2RlU2lnbk9iagpJbmRleDogU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFnZUNyZWF0 aW9uUGFyYW1ldGVycy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9TaGFyZWQvV2Vi UGFnZUNyZWF0aW9uUGFyYW1ldGVycy5jcHAJKHJldmlzaW9uIDIzMjMwMSkKKysrIFNvdXJjZS9X ZWJLaXQvU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0xMTksNiArMTE5LDkgQEAgdm9pZCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzOjplbmNv ZGUoSQogI2lmIEVOQUJMRShDT05URU5UX0VYVEVOU0lPTlMpCiAgICAgZW5jb2RlciA8PCBjb250 ZW50UnVsZUxpc3RzOwogI2VuZGlmCisjaWYgUExBVEZPUk0oTUFDKQorICAgIGVuY29kZXIgPDwg ZGlzcGxheU1hc2s7CisjZW5kaWYKIH0KIAogc3RkOjpvcHRpb25hbDxXZWJQYWdlQ3JlYXRpb25Q YXJhbWV0ZXJzPiBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzOjpkZWNvZGUoSVBDOjpEZWNvZGVy JiBkZWNvZGVyKQpAQCAtMzQzLDYgKzM0NiwxMSBAQCBzdGQ6Om9wdGlvbmFsPFdlYlBhZ2VDcmVh dGlvblBhcmFtZXRlcnM+CiAgICAgcGFyYW1ldGVycy5jb250ZW50UnVsZUxpc3RzID0gV1RGTW92 ZSgqY29udGVudFJ1bGVMaXN0cyk7CiAjZW5kaWYKIAorI2lmIFBMQVRGT1JNKE1BQykKKyAgICBp ZiAoIWRlY29kZXIuZGVjb2RlKHBhcmFtZXRlcnMuZGlzcGxheU1hc2spKQorICAgICAgICByZXR1 cm4gc3RkOjpudWxsb3B0OworI2VuZGlmCisKICAgICByZXR1cm4gV1RGTW92ZShwYXJhbWV0ZXJz KTsKIH0KIApJbmRleDogU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1l dGVycy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlBhZ2VDcmVhdGlv blBhcmFtZXRlcnMuaAkocmV2aXNpb24gMjMyMzAxKQorKysgU291cmNlL1dlYktpdC9TaGFyZWQv V2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5oCSh3b3JraW5nIGNvcHkpCkBAIC0xODUsNiArMTg1 LDEwIEBAIHN0cnVjdCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzIHsKICNpZiBFTkFCTEUoQ09O VEVOVF9FWFRFTlNJT05TKQogICAgIFZlY3RvcjxzdGQ6OnBhaXI8U3RyaW5nLCBXZWJDb21waWxl ZENvbnRlbnRSdWxlTGlzdERhdGE+PiBjb250ZW50UnVsZUxpc3RzOwogI2VuZGlmCisgICAgCisj aWYgUExBVEZPUk0oTUFDKQorICAgIENHT3BlbkdMRGlzcGxheU1hc2sgZGlzcGxheU1hc2sgeyAw IH07CisjZW5kaWYKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApJbmRleDogU291cmNlL1dl YktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCShyZXZpc2lvbiAyMzIzMDEpCisrKyBTb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02 MTQ0LDYgKzYxNDQsMTIgQEAgV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycyBXZWJQYWdlUHJveHk6 OgogICAgIHBhcmFtZXRlcnMuYXBwbGljYXRpb25NYW5pZmVzdCA9IG1fY29uZmlndXJhdGlvbi0+ YXBwbGljYXRpb25NYW5pZmVzdCgpID8gc3RkOjpvcHRpb25hbDxXZWJDb3JlOjpBcHBsaWNhdGlv bk1hbmlmZXN0PihtX2NvbmZpZ3VyYXRpb24tPmFwcGxpY2F0aW9uTWFuaWZlc3QoKS0+YXBwbGlj YXRpb25NYW5pZmVzdCgpKSA6IHN0ZDo6bnVsbG9wdDsKICNlbmRpZgogCisjaWYgUExBVEZPUk0o TUFDKQorICAgIGF1dG8gc2NyZWVuID0gV2ViQ29yZTo6c2NyZWVuKG1fcGFnZUNsaWVudC5wbGF0 Zm9ybVdpbmRvdygpKTsKKyAgICBhdXRvIGRpc3BsYXlJRCA9IFdlYkNvcmU6OmRpc3BsYXlJRChz Y3JlZW4pOworICAgIHBhcmFtZXRlcnMuZGlzcGxheU1hc2sgPSBDR0Rpc3BsYXlJRFRvT3BlbkdM RGlzcGxheU1hc2soZGlzcGxheUlEKTsKKyNlbmRpZgorCiAgICAgbV9wcm9jZXNzLT5hZGRXZWJV c2VyQ29udGVudENvbnRyb2xsZXJQcm94eShtX3VzZXJDb250ZW50Q29udHJvbGxlciwgcGFyYW1l dGVycyk7CiAKICAgICByZXR1cm4gcGFyYW1ldGVyczsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQv V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCShyZXZpc2lvbiAyMzIzMDEpCisrKyBTb3Vy Y2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAkod29ya2luZyBjb3B5KQpA QCAtNjE3LDYgKzYxNywxMCBAQCBXZWJQYWdlOjpXZWJQYWdlKHVpbnQ2NF90IHBhZ2VJRCwgV2Vi UGFnCiAgICAgc2V0Vmlld3BvcnRDb25maWd1cmF0aW9uVmlld0xheW91dFNpemUocGFyYW1ldGVy cy52aWV3cG9ydENvbmZpZ3VyYXRpb25WaWV3TGF5b3V0U2l6ZSk7CiAgICAgc2V0TWF4aW11bVVu b2JzY3VyZWRTaXplKHBhcmFtZXRlcnMubWF4aW11bVVub2JzY3VyZWRTaXplKTsKICNlbmRpZgor ICAgIAorI2lmIFBMQVRGT1JNKElPUykKKyAgICBHcmFwaGljc0NvbnRleHQzRDo6c2V0T3BlbkdM RGlzcGxheU1hc2socGFyYW1ldGVycy5kaXNwbGF5TWFzayk7CisjZW5kaWYKIH0KIAogI2lmIEVO QUJMRShXRUJfUlRDKQo= 341698 2018-05-31 15:35:26 -0700 2018-05-31 15:50:10 -0700 Patch bug-186163-20180531153525.patch text/plain 7031 pvollan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzMjMwMSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDE4LTA1LTMxICBQZXIgQXJu ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgT3BlbkdMIGRpc3Bs YXkgbWFzayB0byBXZWJQYWdlIGNyZWF0aW9uIHBhcmFtZXRlcnMuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODYxNjMKKyAgICAgICAgPHJkYXI6Ly9w cm9ibGVtLzQwNjM0NTA0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFRvIG1ha2Ugc3VyZSB0aGUgT3BlbkdMIGRpc3BsYXkgbWFzayBpcyBhbHdheXMg YXZhaWxhYmxlLCBpbmNsdWRlIGl0IGluIHRoZSBXZWJQYWdlIGNyZWF0aW9uIHBhcmFtZXRlcnMu CisgICAgICAgIFRoZSBPcGVuR0wgZGlzcGxheSBtYXNrIGlzIHNlbnQgdG8gdGhlIFdlYlByb2Nl c3Mgd2hlbiB0aGUgcGxhdGZvcm0gZGlzcGxheSBJRCBjaGFuZ2VzLCBidXQgdGhhdCBpcyBub3QK KyAgICAgICAgZWFybHkgZW5vdWdoIGluIGFsbCBjYXNlcy4gSWYgdGhlIE9wZW5HTCBkaXNwbGF5 IG1hc2sgaXMgbm90IHNldCwgb25seSBPcGVuR0wgc29mdHdhcmUgcmVuZGVyaW5nIGlzIG9mZmVy ZWQKKyAgICAgICAgb24gc29tZSBoYXJkd2FyZSBjb25maWd1cmF0aW9ucy4KKyAKKyAgICAgICAg Tm8gbmV3IHRlc3RzLCBzaW5jZSBpdCBpcyBub3QgdHJpdmlhbCB0byB0ZXN0IHdoZXRoZXIgT3Bl bkdMIHJlbmRlcmluZyBpcyBoYXJkd2FyZSBhY2NlbGVyYXRlZC4KKworICAgICAgICAqIHBsYXRm b3JtL1BsYXRmb3JtU2NyZWVuLmg6CisgICAgICAgICogcGxhdGZvcm0vbWFjL1BsYXRmb3JtU2Ny ZWVuTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6ZGlzcGxheUlEKToKKwogMjAxOC0wNS0zMCAg SmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KIAogICAgICAgICBNZWRpYSBlbGVtZW50 cyBvdXRzaWRlIGZ1bGxzY3JlZW4gc2hvdWxkIG5vdCBiZSBjb25zaWRlcmVkIG1haW4gY29udGVu dC4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1BsYXRmb3JtU2NyZWVuLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vUGxhdGZvcm1TY3JlZW4uaAkocmV2aXNp b24gMjMyMzAxKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vUGxhdGZvcm1TY3JlZW4uaAko d29ya2luZyBjb3B5KQpAQCAtODEsNyArODEsOSBAQCBXRUJDT1JFX0VYUE9SVCBDR0NvbG9yU3Bh Y2VSZWYgc2NyZWVuQ29sCiAjaWYgUExBVEZPUk0oTUFDKQogc3RydWN0IFNjcmVlblByb3BlcnRp ZXM7CiAKLU5TU2NyZWVuICpzY3JlZW4oTlNXaW5kb3cgKik7CitXRUJDT1JFX0VYUE9SVCBQbGF0 Zm9ybURpc3BsYXlJRCBkaXNwbGF5SUQoTlNTY3JlZW4gKik7CisKK1dFQkNPUkVfRVhQT1JUIE5T U2NyZWVuICpzY3JlZW4oTlNXaW5kb3cgKik7CiBOU1NjcmVlbiAqc2NyZWVuKFBsYXRmb3JtRGlz cGxheUlEKTsKIAogRmxvYXRSZWN0IHNjcmVlblJlY3RGb3JEaXNwbGF5KFBsYXRmb3JtRGlzcGxh eUlEKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9QbGF0Zm9ybVNjcmVlbk1h Yy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvUGxhdGZvcm1T Y3JlZW5NYWMubW0JKHJldmlzaW9uIDIzMjMwMSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L21hYy9QbGF0Zm9ybVNjcmVlbk1hYy5tbQkod29ya2luZyBjb3B5KQpAQCAtNDYsNyArNDYsNyBA QCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAvLyBUaGVzZSBmdW5jdGlvbnMgc2NhbGUgYmV0d2VlbiBz Y3JlZW4gYW5kIHBhZ2UgY29vcmRpbmF0ZXMgYmVjYXVzZSBKYXZhU2NyaXB0L0RPTSBvcGVyYXRp b25zCiAvLyBhc3N1bWUgdGhhdCB0aGUgc2NyZWVuIGFuZCB0aGUgcGFnZSBzaGFyZSB0aGUgc2Ft ZSBjb29yZGluYXRlIHN5c3RlbS4KIAotc3RhdGljIFBsYXRmb3JtRGlzcGxheUlEIGRpc3BsYXlJ RChOU1NjcmVlbiAqc2NyZWVuKQorUGxhdGZvcm1EaXNwbGF5SUQgZGlzcGxheUlEKE5TU2NyZWVu ICpzY3JlZW4pCiB7CiAgICAgQVNTRVJUKGhhc1Byb2Nlc3NQcml2aWxlZ2UoUHJvY2Vzc1ByaXZp bGVnZTo6Q2FuQ29tbXVuaWNhdGVXaXRoV2luZG93U2VydmVyKSk7CiAgICAgcmV0dXJuIFtbW3Nj cmVlbiBkZXZpY2VEZXNjcmlwdGlvbl0gb2JqZWN0Rm9yS2V5OkAiTlNTY3JlZW5OdW1iZXIiXSBp bnRWYWx1ZV07CkluZGV4OiBTb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViS2l0L0NoYW5nZUxvZwkocmV2aXNpb24gMjMyMzczKQorKysgU291cmNlL1dlYktp dC9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyNSBAQAorMjAxOC0wNS0zMSAg UGVyIEFybmUgVm9sbGFuICA8cHZvbGxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIE9wZW5H TCBkaXNwbGF5IG1hc2sgdG8gV2ViUGFnZSBjcmVhdGlvbiBwYXJhbWV0ZXJzLgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg2MTYzCisgICAgICAgIDxy ZGFyOi8vcHJvYmxlbS80MDYzNDUwND4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBUbyBtYWtlIHN1cmUgdGhlIE9wZW5HTCBkaXNwbGF5IG1hc2sgaXMg YWx3YXlzIGF2YWlsYWJsZSwgaW5jbHVkZSBpdCBpbiB0aGUgV2ViUGFnZSBjcmVhdGlvbiBwYXJh bWV0ZXJzLgorICAgICAgICBUaGUgT3BlbkdMIGRpc3BsYXkgbWFzayBpcyBzZW50IHRvIHRoZSBX ZWJQcm9jZXNzIHdoZW4gdGhlIHBsYXRmb3JtIGRpc3BsYXkgSUQgY2hhbmdlcywgYnV0IHRoYXQg aXMgbm90CisgICAgICAgIGVhcmx5IGVub3VnaCBpbiBhbGwgY2FzZXMuIElmIHRoZSBPcGVuR0wg ZGlzcGxheSBtYXNrIGlzIG5vdCBzZXQsIG9ubHkgT3BlbkdMIHNvZnR3YXJlIHJlbmRlcmluZyBp cyBvZmZlcmVkCisgICAgICAgIG9uIHNvbWUgaGFyZHdhcmUgY29uZmlndXJhdGlvbnMuCisKKyAg ICAgICAgKiBTaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5jcHA6CisgICAgICAgIChX ZWJLaXQ6OldlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnM6OmVuY29kZSBjb25zdCk6CisgICAgICAg IChXZWJLaXQ6OldlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnM6OmRlY29kZSk6CisgICAgICAgICog U2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuaDoKKyAgICAgICAgKiBVSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpjcmVhdGlv blBhcmFtZXRlcnMpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoK KyAgICAgICAgKFdlYktpdDo6bV9jcmVkZW50aWFsc01lc3Nlbmdlcik6CisKIDIwMTgtMDUtMzEg IEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CiAKICAgICAgICAgQWRkIGEgcnVs ZSB0byBhbGxvdyByZWFkaW5nIGZpbGVzIHdpdGggcHJlZml4IC9wcml2YXRlL3Zhci9kYi9DVk1T L2N2bXNDb2RlU2lnbk9iagpJbmRleDogU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFnZUNyZWF0 aW9uUGFyYW1ldGVycy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9TaGFyZWQvV2Vi UGFnZUNyZWF0aW9uUGFyYW1ldGVycy5jcHAJKHJldmlzaW9uIDIzMjMwMSkKKysrIFNvdXJjZS9X ZWJLaXQvU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0xMTksNiArMTE5LDkgQEAgdm9pZCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzOjplbmNv ZGUoSQogI2lmIEVOQUJMRShDT05URU5UX0VYVEVOU0lPTlMpCiAgICAgZW5jb2RlciA8PCBjb250 ZW50UnVsZUxpc3RzOwogI2VuZGlmCisjaWYgUExBVEZPUk0oTUFDKQorICAgIGVuY29kZXIgPDwg ZGlzcGxheU1hc2s7CisjZW5kaWYKIH0KIAogc3RkOjpvcHRpb25hbDxXZWJQYWdlQ3JlYXRpb25Q YXJhbWV0ZXJzPiBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzOjpkZWNvZGUoSVBDOjpEZWNvZGVy JiBkZWNvZGVyKQpAQCAtMzQzLDYgKzM0NiwxMSBAQCBzdGQ6Om9wdGlvbmFsPFdlYlBhZ2VDcmVh dGlvblBhcmFtZXRlcnM+CiAgICAgcGFyYW1ldGVycy5jb250ZW50UnVsZUxpc3RzID0gV1RGTW92 ZSgqY29udGVudFJ1bGVMaXN0cyk7CiAjZW5kaWYKIAorI2lmIFBMQVRGT1JNKE1BQykKKyAgICBp ZiAoIWRlY29kZXIuZGVjb2RlKHBhcmFtZXRlcnMuZGlzcGxheU1hc2spKQorICAgICAgICByZXR1 cm4gc3RkOjpudWxsb3B0OworI2VuZGlmCisKICAgICByZXR1cm4gV1RGTW92ZShwYXJhbWV0ZXJz KTsKIH0KIApJbmRleDogU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1l dGVycy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlBhZ2VDcmVhdGlv blBhcmFtZXRlcnMuaAkocmV2aXNpb24gMjMyMzAxKQorKysgU291cmNlL1dlYktpdC9TaGFyZWQv V2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5oCSh3b3JraW5nIGNvcHkpCkBAIC0xODUsNiArMTg1 LDEwIEBAIHN0cnVjdCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzIHsKICNpZiBFTkFCTEUoQ09O VEVOVF9FWFRFTlNJT05TKQogICAgIFZlY3RvcjxzdGQ6OnBhaXI8U3RyaW5nLCBXZWJDb21waWxl ZENvbnRlbnRSdWxlTGlzdERhdGE+PiBjb250ZW50UnVsZUxpc3RzOwogI2VuZGlmCisgICAgCisj aWYgUExBVEZPUk0oTUFDKQorICAgIENHT3BlbkdMRGlzcGxheU1hc2sgZGlzcGxheU1hc2sgeyAw IH07CisjZW5kaWYKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApJbmRleDogU291cmNlL1dl YktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCShyZXZpc2lvbiAyMzIzMDEpCisrKyBTb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02 MTQ0LDYgKzYxNDQsMTIgQEAgV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycyBXZWJQYWdlUHJveHk6 OgogICAgIHBhcmFtZXRlcnMuYXBwbGljYXRpb25NYW5pZmVzdCA9IG1fY29uZmlndXJhdGlvbi0+ YXBwbGljYXRpb25NYW5pZmVzdCgpID8gc3RkOjpvcHRpb25hbDxXZWJDb3JlOjpBcHBsaWNhdGlv bk1hbmlmZXN0PihtX2NvbmZpZ3VyYXRpb24tPmFwcGxpY2F0aW9uTWFuaWZlc3QoKS0+YXBwbGlj YXRpb25NYW5pZmVzdCgpKSA6IHN0ZDo6bnVsbG9wdDsKICNlbmRpZgogCisjaWYgUExBVEZPUk0o TUFDKQorICAgIGF1dG8gc2NyZWVuID0gV2ViQ29yZTo6c2NyZWVuKG1fcGFnZUNsaWVudC5wbGF0 Zm9ybVdpbmRvdygpKTsKKyAgICBhdXRvIGRpc3BsYXlJRCA9IFdlYkNvcmU6OmRpc3BsYXlJRChz Y3JlZW4pOworICAgIHBhcmFtZXRlcnMuZGlzcGxheU1hc2sgPSBDR0Rpc3BsYXlJRFRvT3BlbkdM RGlzcGxheU1hc2soZGlzcGxheUlEKTsKKyNlbmRpZgorCiAgICAgbV9wcm9jZXNzLT5hZGRXZWJV c2VyQ29udGVudENvbnRyb2xsZXJQcm94eShtX3VzZXJDb250ZW50Q29udHJvbGxlciwgcGFyYW1l dGVycyk7CiAKICAgICByZXR1cm4gcGFyYW1ldGVyczsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQv V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCShyZXZpc2lvbiAyMzIzMDEpCisrKyBTb3Vy Y2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAkod29ya2luZyBjb3B5KQpA QCAtMTU2LDYgKzE1Niw3IEBACiAjaW5jbHVkZSA8V2ViQ29yZS9GcmFtZUxvYWRSZXF1ZXN0Lmg+ CiAjaW5jbHVkZSA8V2ViQ29yZS9GcmFtZUxvYWRlclR5cGVzLmg+CiAjaW5jbHVkZSA8V2ViQ29y ZS9GcmFtZVZpZXcuaD4KKyNpbmNsdWRlIDxXZWJDb3JlL0dyYXBoaWNzQ29udGV4dDNELmg+CiAj aW5jbHVkZSA8V2ViQ29yZS9IVE1MQXR0YWNobWVudEVsZW1lbnQuaD4KICNpbmNsdWRlIDxXZWJD b3JlL0hUTUxGb3JtRWxlbWVudC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvSFRNTEltYWdlRWxlbWVu dC5oPgpAQCAtNjE3LDYgKzYxOCwxMCBAQCBXZWJQYWdlOjpXZWJQYWdlKHVpbnQ2NF90IHBhZ2VJ RCwgV2ViUGFnCiAgICAgc2V0Vmlld3BvcnRDb25maWd1cmF0aW9uVmlld0xheW91dFNpemUocGFy YW1ldGVycy52aWV3cG9ydENvbmZpZ3VyYXRpb25WaWV3TGF5b3V0U2l6ZSk7CiAgICAgc2V0TWF4 aW11bVVub2JzY3VyZWRTaXplKHBhcmFtZXRlcnMubWF4aW11bVVub2JzY3VyZWRTaXplKTsKICNl bmRpZgorICAgIAorI2lmIFBMQVRGT1JNKE1BQykKKyAgICBHcmFwaGljc0NvbnRleHQzRDo6c2V0 T3BlbkdMRGlzcGxheU1hc2socGFyYW1ldGVycy5kaXNwbGF5TWFzayk7CisjZW5kaWYKIH0KIAog I2lmIEVOQUJMRShXRUJfUlRDKQo= 341699 2018-05-31 15:54:32 -0700 2018-05-31 16:16:38 -0700 Patch bug-186163-20180531155431.patch text/plain 7251 pvollan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzMjMwMSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDE4LTA1LTMxICBQZXIgQXJu ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgT3BlbkdMIGRpc3Bs YXkgbWFzayB0byBXZWJQYWdlIGNyZWF0aW9uIHBhcmFtZXRlcnMuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODYxNjMKKyAgICAgICAgPHJkYXI6Ly9w cm9ibGVtLzQwNjM0NTA0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFRvIG1ha2Ugc3VyZSB0aGUgT3BlbkdMIGRpc3BsYXkgbWFzayBpcyBhbHdheXMg YXZhaWxhYmxlLCBpbmNsdWRlIGl0IGluIHRoZSBXZWJQYWdlIGNyZWF0aW9uIHBhcmFtZXRlcnMu CisgICAgICAgIFRoZSBPcGVuR0wgZGlzcGxheSBtYXNrIGlzIHNlbnQgdG8gdGhlIFdlYlByb2Nl c3Mgd2hlbiB0aGUgcGxhdGZvcm0gZGlzcGxheSBJRCBjaGFuZ2VzLCBidXQgdGhhdCBpcyBub3QK KyAgICAgICAgZWFybHkgZW5vdWdoIGluIGFsbCBjYXNlcy4gSWYgdGhlIE9wZW5HTCBkaXNwbGF5 IG1hc2sgaXMgbm90IHNldCwgb25seSBPcGVuR0wgc29mdHdhcmUgcmVuZGVyaW5nIGlzIG9mZmVy ZWQKKyAgICAgICAgb24gc29tZSBoYXJkd2FyZSBjb25maWd1cmF0aW9ucy4KKyAKKyAgICAgICAg Tm8gbmV3IHRlc3RzLCBzaW5jZSBpdCBpcyBub3QgdHJpdmlhbCB0byB0ZXN0IHdoZXRoZXIgT3Bl bkdMIHJlbmRlcmluZyBpcyBoYXJkd2FyZSBhY2NlbGVyYXRlZC4KKworICAgICAgICAqIHBsYXRm b3JtL1BsYXRmb3JtU2NyZWVuLmg6CisgICAgICAgICogcGxhdGZvcm0vbWFjL1BsYXRmb3JtU2Ny ZWVuTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6ZGlzcGxheUlEKToKKwogMjAxOC0wNS0zMCAg SmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KIAogICAgICAgICBNZWRpYSBlbGVtZW50 cyBvdXRzaWRlIGZ1bGxzY3JlZW4gc2hvdWxkIG5vdCBiZSBjb25zaWRlcmVkIG1haW4gY29udGVu dC4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1BsYXRmb3JtU2NyZWVuLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vUGxhdGZvcm1TY3JlZW4uaAkocmV2aXNp b24gMjMyMzAxKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vUGxhdGZvcm1TY3JlZW4uaAko d29ya2luZyBjb3B5KQpAQCAtODEsNyArODEsOSBAQCBXRUJDT1JFX0VYUE9SVCBDR0NvbG9yU3Bh Y2VSZWYgc2NyZWVuQ29sCiAjaWYgUExBVEZPUk0oTUFDKQogc3RydWN0IFNjcmVlblByb3BlcnRp ZXM7CiAKLU5TU2NyZWVuICpzY3JlZW4oTlNXaW5kb3cgKik7CitXRUJDT1JFX0VYUE9SVCBQbGF0 Zm9ybURpc3BsYXlJRCBkaXNwbGF5SUQoTlNTY3JlZW4gKik7CisKK1dFQkNPUkVfRVhQT1JUIE5T U2NyZWVuICpzY3JlZW4oTlNXaW5kb3cgKik7CiBOU1NjcmVlbiAqc2NyZWVuKFBsYXRmb3JtRGlz cGxheUlEKTsKIAogRmxvYXRSZWN0IHNjcmVlblJlY3RGb3JEaXNwbGF5KFBsYXRmb3JtRGlzcGxh eUlEKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9QbGF0Zm9ybVNjcmVlbk1h Yy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvUGxhdGZvcm1T Y3JlZW5NYWMubW0JKHJldmlzaW9uIDIzMjMwMSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L21hYy9QbGF0Zm9ybVNjcmVlbk1hYy5tbQkod29ya2luZyBjb3B5KQpAQCAtNDYsNyArNDYsNyBA QCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAvLyBUaGVzZSBmdW5jdGlvbnMgc2NhbGUgYmV0d2VlbiBz Y3JlZW4gYW5kIHBhZ2UgY29vcmRpbmF0ZXMgYmVjYXVzZSBKYXZhU2NyaXB0L0RPTSBvcGVyYXRp b25zCiAvLyBhc3N1bWUgdGhhdCB0aGUgc2NyZWVuIGFuZCB0aGUgcGFnZSBzaGFyZSB0aGUgc2Ft ZSBjb29yZGluYXRlIHN5c3RlbS4KIAotc3RhdGljIFBsYXRmb3JtRGlzcGxheUlEIGRpc3BsYXlJ RChOU1NjcmVlbiAqc2NyZWVuKQorUGxhdGZvcm1EaXNwbGF5SUQgZGlzcGxheUlEKE5TU2NyZWVu ICpzY3JlZW4pCiB7CiAgICAgQVNTRVJUKGhhc1Byb2Nlc3NQcml2aWxlZ2UoUHJvY2Vzc1ByaXZp bGVnZTo6Q2FuQ29tbXVuaWNhdGVXaXRoV2luZG93U2VydmVyKSk7CiAgICAgcmV0dXJuIFtbW3Nj cmVlbiBkZXZpY2VEZXNjcmlwdGlvbl0gb2JqZWN0Rm9yS2V5OkAiTlNTY3JlZW5OdW1iZXIiXSBp bnRWYWx1ZV07CkluZGV4OiBTb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViS2l0L0NoYW5nZUxvZwkocmV2aXNpb24gMjMyMzczKQorKysgU291cmNlL1dlYktp dC9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyNSBAQAorMjAxOC0wNS0zMSAg UGVyIEFybmUgVm9sbGFuICA8cHZvbGxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIE9wZW5H TCBkaXNwbGF5IG1hc2sgdG8gV2ViUGFnZSBjcmVhdGlvbiBwYXJhbWV0ZXJzLgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg2MTYzCisgICAgICAgIDxy ZGFyOi8vcHJvYmxlbS80MDYzNDUwND4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBUbyBtYWtlIHN1cmUgdGhlIE9wZW5HTCBkaXNwbGF5IG1hc2sgaXMg YWx3YXlzIGF2YWlsYWJsZSwgaW5jbHVkZSBpdCBpbiB0aGUgV2ViUGFnZSBjcmVhdGlvbiBwYXJh bWV0ZXJzLgorICAgICAgICBUaGUgT3BlbkdMIGRpc3BsYXkgbWFzayBpcyBzZW50IHRvIHRoZSBX ZWJQcm9jZXNzIHdoZW4gdGhlIHBsYXRmb3JtIGRpc3BsYXkgSUQgY2hhbmdlcywgYnV0IHRoYXQg aXMgbm90CisgICAgICAgIGVhcmx5IGVub3VnaCBpbiBhbGwgY2FzZXMuIElmIHRoZSBPcGVuR0wg ZGlzcGxheSBtYXNrIGlzIG5vdCBzZXQsIG9ubHkgT3BlbkdMIHNvZnR3YXJlIHJlbmRlcmluZyBp cyBvZmZlcmVkCisgICAgICAgIG9uIHNvbWUgaGFyZHdhcmUgY29uZmlndXJhdGlvbnMuCisKKyAg ICAgICAgKiBTaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5jcHA6CisgICAgICAgIChX ZWJLaXQ6OldlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnM6OmVuY29kZSBjb25zdCk6CisgICAgICAg IChXZWJLaXQ6OldlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnM6OmRlY29kZSk6CisgICAgICAgICog U2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuaDoKKyAgICAgICAgKiBVSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpjcmVhdGlv blBhcmFtZXRlcnMpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoK KyAgICAgICAgKFdlYktpdDo6bV9jcmVkZW50aWFsc01lc3Nlbmdlcik6CisKIDIwMTgtMDUtMzEg IEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CiAKICAgICAgICAgQWRkIGEgcnVs ZSB0byBhbGxvdyByZWFkaW5nIGZpbGVzIHdpdGggcHJlZml4IC9wcml2YXRlL3Zhci9kYi9DVk1T L2N2bXNDb2RlU2lnbk9iagpJbmRleDogU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFnZUNyZWF0 aW9uUGFyYW1ldGVycy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9TaGFyZWQvV2Vi UGFnZUNyZWF0aW9uUGFyYW1ldGVycy5jcHAJKHJldmlzaW9uIDIzMjMwMSkKKysrIFNvdXJjZS9X ZWJLaXQvU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0xMTksNiArMTE5LDkgQEAgdm9pZCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzOjplbmNv ZGUoSQogI2lmIEVOQUJMRShDT05URU5UX0VYVEVOU0lPTlMpCiAgICAgZW5jb2RlciA8PCBjb250 ZW50UnVsZUxpc3RzOwogI2VuZGlmCisjaWYgUExBVEZPUk0oTUFDKSAmJiBFTkFCTEUoV0VCUFJP Q0VTU19XSU5ET1dTRVJWRVJfQkxPQ0tJTkcpCisgICAgZW5jb2RlciA8PCBkaXNwbGF5TWFzazsK KyNlbmRpZgogfQogCiBzdGQ6Om9wdGlvbmFsPFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnM+IFdl YlBhZ2VDcmVhdGlvblBhcmFtZXRlcnM6OmRlY29kZShJUEM6OkRlY29kZXImIGRlY29kZXIpCkBA IC0zNDMsNiArMzQ2LDExIEBAIHN0ZDo6b3B0aW9uYWw8V2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVy cz4KICAgICBwYXJhbWV0ZXJzLmNvbnRlbnRSdWxlTGlzdHMgPSBXVEZNb3ZlKCpjb250ZW50UnVs ZUxpc3RzKTsKICNlbmRpZgogCisjaWYgUExBVEZPUk0oTUFDKSAmJiBFTkFCTEUoV0VCUFJPQ0VT U19XSU5ET1dTRVJWRVJfQkxPQ0tJTkcpCisgICAgaWYgKCFkZWNvZGVyLmRlY29kZShwYXJhbWV0 ZXJzLmRpc3BsYXlNYXNrKSkKKyAgICAgICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKKyNlbmRpZgor CiAgICAgcmV0dXJuIFdURk1vdmUocGFyYW1ldGVycyk7CiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJL aXQvU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmgJKHJldmlzaW9uIDIz MjMwMSkKKysrIFNvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMu aAkod29ya2luZyBjb3B5KQpAQCAtMTg1LDYgKzE4NSwxMCBAQCBzdHJ1Y3QgV2ViUGFnZUNyZWF0 aW9uUGFyYW1ldGVycyB7CiAjaWYgRU5BQkxFKENPTlRFTlRfRVhURU5TSU9OUykKICAgICBWZWN0 b3I8c3RkOjpwYWlyPFN0cmluZywgV2ViQ29tcGlsZWRDb250ZW50UnVsZUxpc3REYXRhPj4gY29u dGVudFJ1bGVMaXN0czsKICNlbmRpZgorICAgIAorI2lmIFBMQVRGT1JNKE1BQykgJiYgRU5BQkxF KFdFQlBST0NFU1NfV0lORE9XU0VSVkVSX0JMT0NLSU5HKQorICAgIENHT3BlbkdMRGlzcGxheU1h c2sgZGlzcGxheU1hc2sgeyAwIH07CisjZW5kaWYKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktp dApJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCShyZXZpc2lv biAyMzIzMDEpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC02MTQ0LDYgKzYxNDQsMTIgQEAgV2ViUGFnZUNyZWF0aW9uUGFyYW1l dGVycyBXZWJQYWdlUHJveHk6OgogICAgIHBhcmFtZXRlcnMuYXBwbGljYXRpb25NYW5pZmVzdCA9 IG1fY29uZmlndXJhdGlvbi0+YXBwbGljYXRpb25NYW5pZmVzdCgpID8gc3RkOjpvcHRpb25hbDxX ZWJDb3JlOjpBcHBsaWNhdGlvbk1hbmlmZXN0PihtX2NvbmZpZ3VyYXRpb24tPmFwcGxpY2F0aW9u TWFuaWZlc3QoKS0+YXBwbGljYXRpb25NYW5pZmVzdCgpKSA6IHN0ZDo6bnVsbG9wdDsKICNlbmRp ZgogCisjaWYgUExBVEZPUk0oTUFDKSAmJiBFTkFCTEUoV0VCUFJPQ0VTU19XSU5ET1dTRVJWRVJf QkxPQ0tJTkcpCisgICAgYXV0byBzY3JlZW4gPSBXZWJDb3JlOjpzY3JlZW4obV9wYWdlQ2xpZW50 LnBsYXRmb3JtV2luZG93KCkpOworICAgIGF1dG8gZGlzcGxheUlEID0gV2ViQ29yZTo6ZGlzcGxh eUlEKHNjcmVlbik7CisgICAgcGFyYW1ldGVycy5kaXNwbGF5TWFzayA9IENHRGlzcGxheUlEVG9P cGVuR0xEaXNwbGF5TWFzayhkaXNwbGF5SUQpOworI2VuZGlmCisKICAgICBtX3Byb2Nlc3MtPmFk ZFdlYlVzZXJDb250ZW50Q29udHJvbGxlclByb3h5KG1fdXNlckNvbnRlbnRDb250cm9sbGVyLCBw YXJhbWV0ZXJzKTsKIAogICAgIHJldHVybiBwYXJhbWV0ZXJzOwpJbmRleDogU291cmNlL1dlYktp dC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAJKHJldmlzaW9uIDIzMjMwMSkKKysr IFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0xNTYsNiArMTU2LDcgQEAKICNpbmNsdWRlIDxXZWJDb3JlL0ZyYW1lTG9hZFJlcXVl c3QuaD4KICNpbmNsdWRlIDxXZWJDb3JlL0ZyYW1lTG9hZGVyVHlwZXMuaD4KICNpbmNsdWRlIDxX ZWJDb3JlL0ZyYW1lVmlldy5oPgorI2luY2x1ZGUgPFdlYkNvcmUvR3JhcGhpY3NDb250ZXh0M0Qu aD4KICNpbmNsdWRlIDxXZWJDb3JlL0hUTUxBdHRhY2htZW50RWxlbWVudC5oPgogI2luY2x1ZGUg PFdlYkNvcmUvSFRNTEZvcm1FbGVtZW50Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9IVE1MSW1hZ2VF bGVtZW50Lmg+CkBAIC02MTcsNiArNjE4LDEwIEBAIFdlYlBhZ2U6OldlYlBhZ2UodWludDY0X3Qg cGFnZUlELCBXZWJQYWcKICAgICBzZXRWaWV3cG9ydENvbmZpZ3VyYXRpb25WaWV3TGF5b3V0U2l6 ZShwYXJhbWV0ZXJzLnZpZXdwb3J0Q29uZmlndXJhdGlvblZpZXdMYXlvdXRTaXplKTsKICAgICBz ZXRNYXhpbXVtVW5vYnNjdXJlZFNpemUocGFyYW1ldGVycy5tYXhpbXVtVW5vYnNjdXJlZFNpemUp OwogI2VuZGlmCisgICAgCisjaWYgUExBVEZPUk0oTUFDKSAmJiBFTkFCTEUoV0VCUFJPQ0VTU19X SU5ET1dTRVJWRVJfQkxPQ0tJTkcpCisgICAgR3JhcGhpY3NDb250ZXh0M0Q6OnNldE9wZW5HTERp c3BsYXlNYXNrKHBhcmFtZXRlcnMuZGlzcGxheU1hc2spOworI2VuZGlmCiB9CiAKICNpZiBFTkFC TEUoV0VCX1JUQykK