34238 2010-01-27 19:42:16 -0800 Send application ID and full URL to Chromium when requesting notification permissions 2010-01-28 12:12:03 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 aa aa dglazkov eric johnnyg webkit.review.bot oldest_to_newest 185316 0 aa 2010-01-27 19:42:16 -0800 Send application ID and full URL to Chromium when requesting notification permissions 185320 1 aa 2010-01-27 20:10:37 -0800 We are experimenting with the concept of an "application id" in Chromium to group permission requests together so that they can be made all at once. The application ID should be settable by authors using either an HTTP header or a meta tag using http-equiv. 185323 2 47588 aa 2010-01-27 20:27:14 -0800 Created attachment 47588 Patch 185324 3 webkit.review.bot 2010-01-27 20:29:49 -0800 Attachment 47588 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 WebCore/notifications/NotificationPresenter.h:41: Code inside a namespace should not be indented. [whitespace/indent] [4] Total errors found: 1 If any of these errors are false positives, please file a bug against check-webkit-style. 185326 4 aa 2010-01-27 20:34:09 -0800 (In reply to comment #3) > Attachment 47588 [details] did not pass style-queue: > > Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 > WebCore/notifications/NotificationPresenter.h:41: Code inside a namespace > should not be indented. [whitespace/indent] [4] > Total errors found: 1 > > > If any of these errors are false positives, please file a bug against > check-webkit-style. Note: the file was already indented incorrectly, so just followed along. 185329 5 47588 darin 2010-01-27 20:44:03 -0800 Comment on attachment 47588 Patch > - if (m_presenter->checkPermission(context->securityOrigin()) != NotificationPresenter::PermissionAllowed) { > + if (m_presenter->checkPermission(context->url(), > + context->isDocument() ? static_cast<Document*>(context) : 0) > + != NotificationPresenter::PermissionAllowed) { I'm surprised to discover that the style guide doesn't specifically recommends against lining up with parentheses in this fashion. Renaming will make lines like this no longer line up, so we have been avoiding this kind of formatting, but I can't find that in writing anywhere. Maybe a local variable for the document will keep things a bit more compact. > virtual void cancel(Notification* object) = 0; > virtual void notificationObjectDestroyed(Notification* object) = 0; > virtual void requestPermission(SecurityOrigin* origin, PassRefPtr<VoidCallback> callback) = 0; > + virtual Permission checkPermission(const KURL& url, Document* document) = 0; In every single one of these cases the argument names should be omitted, because all they do is repeat the type name. I didn't review style much in the Chromium-specific part of the patch, but the code seems OK. r=me 185558 6 aa 2010-01-28 11:24:31 -0800 Committed r54008: <http://trac.webkit.org/changeset/54008> 185566 7 eric 2010-01-28 12:12:03 -0800 Broke Chromium builders: CXX(target) out/Release/obj.target/webcore/../../WebCore/bindings/v8/WorkerContextExecutionProxy.o CXX(target) out/Release/obj.target/webcore/../../WebCore/notifications/Notification.o ../../WebCore/notifications/Notification.cpp: In constructor ‘WebCore::Notification::Notification(const WebCore::String&, WebCore::ScriptExecutionContext*, WebCore::ExceptionCode&, WebCore::NotificationPresenter*)’: ../../WebCore/notifications/Notification.cpp:53: error: expected primary-expression before ‘!=’ token ../../WebCore/notifications/Notification.cpp:53: error: expected `;' before ‘)’ token ../../WebCore/notifications/Notification.cpp: In constructor ‘WebCore::Notification::Notification(const WebCore::NotificationContents&, WebCore::ScriptExecutionContext*, WebCore::ExceptionCode&, WebCore::NotificationPresenter*)’: ../../WebCore/notifications/Notification.cpp:74: error: expected primary-expression before ‘!=’ token ../../WebCore/notifications/Notification.cpp:74: error: expected `;' before ‘)’ token make[1]: *** [out/Release/obj.target/webcore/../../WebCore/notifications/Notification.o] Error 1 make[1]: *** Waiting for unfinished jobs.... make[1]: Leaving directory `/WebKit-BuildSlave/chromium-linux-release/build/WebKit/chromium' program finished with exit code 2 elapsedTime=57.465181 47588 2010-01-27 20:27:14 -0800 2010-01-27 20:44:03 -0800 Patch bug-34238-20100127202713.patch text/plain 15670 aa ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZDZlMjJmNy4uNjNiYzQ1YyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNyBAQAorMjAxMC0wMS0yNyAgQWFyb24gQm9vZG1h biAgPGFhQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBFeHBhbmQgdGhlIE5vdGlmaWNhdGlvblByZXNlbnRlcjo6Y2hlY2tQZXJt aXNzaW9uKCkgaW50ZXJmYWNlIHRvIHNlbmQgdGhlIGZ1bGwKKyAgICAgICAgVVJMIG9mIHRoZSBy ZXF1ZXN0aW5nIGNvbnRleHQsIGFzIHdlbGwgYXMgYSBwb2ludGVyIHRvIHRoZSBkb2N1bWVudCBp ZiB0aGF0CisgICAgICAgIGNvbnRleHQgd2FzIGEgZG9jdW1lbnQuCisKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM0MjM4CisKKyAgICAgICAgTm8gbmV3 IHRlc3RzLiAoT09QUyEpCisKKyAgICAgICAgKiBub3RpZmljYXRpb25zL05vdGlmaWNhdGlvbi5j cHA6CisgICAgICAgIChXZWJDb3JlOjpOb3RpZmljYXRpb246Ok5vdGlmaWNhdGlvbik6CisgICAg ICAgICogbm90aWZpY2F0aW9ucy9Ob3RpZmljYXRpb25DZW50ZXIuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6Tm90aWZpY2F0aW9uQ2VudGVyOjpOb3RpZmljYXRpb25DZW50ZXIpOgorICAgICAgICAo V2ViQ29yZTo6Tm90aWZpY2F0aW9uQ2VudGVyOjpjaGVja1Blcm1pc3Npb24pOgorICAgICAgICBQ YXNzIHRoZSBmdWxsIFVSTCBhbmQgZG9jdW1lbnQgZnJvbSB0aGUgcmVxdWVzdGluZyBjb250ZXh0 IHdoZW4gY2FsbGluZworICAgICAgICBOb3RpZmljYXRpb25QcmVzZW50ZXI6OmNoZWNrUGVybWlz c2lvbigpLgorICAgICAgICAKKyAgICAgICAgKiBub3RpZmljYXRpb25zL05vdGlmaWNhdGlvblBy ZXNlbnRlci5oOgorICAgICAgICAoV2ViQ29yZTo6Tm90aWZpY2F0aW9uUHJlc2VudGVyOjopOgor ICAgICAgICBFeHBhbmQgaW50ZXJmYWNlLgorCiAyMDEwLTAxLTI3ICBKb2huIEFiZC1FbC1NYWxl ayAgPGphbUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGltaXRyaSBHbGF6 a292LgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9ub3RpZmljYXRpb25zL05vdGlmaWNhdGlvbi5jcHAg Yi9XZWJDb3JlL25vdGlmaWNhdGlvbnMvTm90aWZpY2F0aW9uLmNwcAppbmRleCBlY2I1Nzk5Li41 ODEwNDFjIDEwMDY0NAotLS0gYS9XZWJDb3JlL25vdGlmaWNhdGlvbnMvTm90aWZpY2F0aW9uLmNw cAorKysgYi9XZWJDb3JlL25vdGlmaWNhdGlvbnMvTm90aWZpY2F0aW9uLmNwcApAQCAtMzgsNyAr MzgsNyBAQAogCiAjaW5jbHVkZSAiRG9jdW1lbnQuaCIKICNpbmNsdWRlICJFdmVudE5hbWVzLmgi Ci0jaW5jbHVkZSAiV29ya2VyQ29udGV4dC5oIiAKKyNpbmNsdWRlICJXb3JrZXJDb250ZXh0Lmgi CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIApAQCAtNDksNyArNDksOSBAQCBOb3RpZmljYXRpb246 Ok5vdGlmaWNhdGlvbihjb25zdCBTdHJpbmcmIHVybCwgU2NyaXB0RXhlY3V0aW9uQ29udGV4dCog Y29udGV4dCwgRQogICAgICwgbV9wcmVzZW50ZXIocHJvdmlkZXIpCiB7CiAgICAgQVNTRVJUKG1f cHJlc2VudGVyKTsKLSAgICBpZiAobV9wcmVzZW50ZXItPmNoZWNrUGVybWlzc2lvbihjb250ZXh0 LT5zZWN1cml0eU9yaWdpbigpKSAhPSBOb3RpZmljYXRpb25QcmVzZW50ZXI6OlBlcm1pc3Npb25B bGxvd2VkKSB7CisgICAgaWYgKG1fcHJlc2VudGVyLT5jaGVja1Blcm1pc3Npb24oY29udGV4dC0+ dXJsKCksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29udGV4dC0+aXNE b2N1bWVudCgpID8gc3RhdGljX2Nhc3Q8RG9jdW1lbnQqPihjb250ZXh0KSA6IDApCisgICAgICAg ICAgICAhPSBOb3RpZmljYXRpb25QcmVzZW50ZXI6OlBlcm1pc3Npb25BbGxvd2VkKSB7CiAgICAg ICAgIGVjID0gU0VDVVJJVFlfRVJSOwogICAgICAgICByZXR1cm47CiAgICAgfQpAQCAtNjksNyAr NzEsOSBAQCBOb3RpZmljYXRpb246Ok5vdGlmaWNhdGlvbihjb25zdCBOb3RpZmljYXRpb25Db250 ZW50cyYgY29udGVudHMsIFNjcmlwdEV4ZWN1dGlvbgogICAgICwgbV9wcmVzZW50ZXIocHJvdmlk ZXIpCiB7CiAgICAgQVNTRVJUKG1fcHJlc2VudGVyKTsKLSAgICBpZiAobV9wcmVzZW50ZXItPmNo ZWNrUGVybWlzc2lvbihjb250ZXh0LT5zZWN1cml0eU9yaWdpbigpKSAhPSBOb3RpZmljYXRpb25Q cmVzZW50ZXI6OlBlcm1pc3Npb25BbGxvd2VkKSB7CisgICAgaWYgKG1fcHJlc2VudGVyLT5jaGVj a1Blcm1pc3Npb24oY29udGV4dC0+dXJsKCksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgY29udGV4dC0+aXNEb2N1bWVudCgpID8gc3RhdGljX2Nhc3Q8RG9jdW1lbnQqPihj b250ZXh0KSA6IDApCisgICAgICAgICAgICAhPSBOb3RpZmljYXRpb25QcmVzZW50ZXI6OlBlcm1p c3Npb25BbGxvd2VkKSB7CiAgICAgICAgIGVjID0gU0VDVVJJVFlfRVJSOwogICAgICAgICByZXR1 cm47CiAgICAgfQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9ub3RpZmljYXRpb25zL05vdGlmaWNhdGlv bkNlbnRlci5jcHAgYi9XZWJDb3JlL25vdGlmaWNhdGlvbnMvTm90aWZpY2F0aW9uQ2VudGVyLmNw cAppbmRleCA0NWQyOWNmLi5hZDlmYmVjIDEwMDY0NAotLS0gYS9XZWJDb3JlL25vdGlmaWNhdGlv bnMvTm90aWZpY2F0aW9uQ2VudGVyLmNwcAorKysgYi9XZWJDb3JlL25vdGlmaWNhdGlvbnMvTm90 aWZpY2F0aW9uQ2VudGVyLmNwcApAQCAtNDAsMTYgKzQwLDE4IEBACiAKIG5hbWVzcGFjZSBXZWJD b3JlIHsKIAotTm90aWZpY2F0aW9uQ2VudGVyOjpOb3RpZmljYXRpb25DZW50ZXIoU2NyaXB0RXhl Y3V0aW9uQ29udGV4dCogY29udGV4dCwgTm90aWZpY2F0aW9uUHJlc2VudGVyKiBwcmVzZW50ZXIp IAorTm90aWZpY2F0aW9uQ2VudGVyOjpOb3RpZmljYXRpb25DZW50ZXIoU2NyaXB0RXhlY3V0aW9u Q29udGV4dCogY29udGV4dCwgTm90aWZpY2F0aW9uUHJlc2VudGVyKiBwcmVzZW50ZXIpCiAgICAg OiBBY3RpdmVET01PYmplY3QoY29udGV4dCwgdGhpcykKICAgICAsIG1fc2NyaXB0RXhlY3V0aW9u Q29udGV4dChjb250ZXh0KQogICAgICwgbV9ub3RpZmljYXRpb25QcmVzZW50ZXIocHJlc2VudGVy KSB7fQogCi1pbnQgTm90aWZpY2F0aW9uQ2VudGVyOjpjaGVja1Blcm1pc3Npb24oKSAKK2ludCBO b3RpZmljYXRpb25DZW50ZXI6OmNoZWNrUGVybWlzc2lvbigpCiB7CiAgICAgaWYgKCFwcmVzZW50 ZXIoKSkKICAgICAgICAgcmV0dXJuIE5vdGlmaWNhdGlvblByZXNlbnRlcjo6UGVybWlzc2lvbkRl bmllZDsKLSAgICByZXR1cm4gbV9ub3RpZmljYXRpb25QcmVzZW50ZXItPmNoZWNrUGVybWlzc2lv bihtX3NjcmlwdEV4ZWN1dGlvbkNvbnRleHQtPnNlY3VyaXR5T3JpZ2luKCkpOworICAgIHJldHVy biBtX25vdGlmaWNhdGlvblByZXNlbnRlci0+Y2hlY2tQZXJtaXNzaW9uKAorICAgICAgICBtX3Nj cmlwdEV4ZWN1dGlvbkNvbnRleHQtPnVybCgpLAorICAgICAgICBtX3NjcmlwdEV4ZWN1dGlvbkNv bnRleHQtPmlzRG9jdW1lbnQoKSA/IHN0YXRpY19jYXN0PERvY3VtZW50Kj4obV9zY3JpcHRFeGVj dXRpb25Db250ZXh0KSA6IDApOwogfQogCiB2b2lkIE5vdGlmaWNhdGlvbkNlbnRlcjo6cmVxdWVz dFBlcm1pc3Npb24oUGFzc1JlZlB0cjxWb2lkQ2FsbGJhY2s+IGNhbGxiYWNrKQpkaWZmIC0tZ2l0 IGEvV2ViQ29yZS9ub3RpZmljYXRpb25zL05vdGlmaWNhdGlvblByZXNlbnRlci5oIGIvV2ViQ29y ZS9ub3RpZmljYXRpb25zL05vdGlmaWNhdGlvblByZXNlbnRlci5oCmluZGV4IGZlODBkYTguLjVh NTllZGUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvbm90aWZpY2F0aW9ucy9Ob3RpZmljYXRpb25QcmVz ZW50ZXIuaAorKysgYi9XZWJDb3JlL25vdGlmaWNhdGlvbnMvTm90aWZpY2F0aW9uUHJlc2VudGVy LmgKQEAgLTM4LDE0ICszOCwxNiBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKKyAgICBjbGFz cyBEb2N1bWVudDsKICAgICBjbGFzcyBOb3RpZmljYXRpb247CisgICAgY2xhc3MgS1VSTDsKICAg ICBjbGFzcyBTZWN1cml0eU9yaWdpbjsKICAgICBjbGFzcyBTdHJpbmc7Ci0gICAgCisKICAgICBj bGFzcyBOb3RpZmljYXRpb25QcmVzZW50ZXIgewogCiAgICAgcHVibGljOgotICAgICAgICBlbnVt IFBlcm1pc3Npb24geyAKKyAgICAgICAgZW51bSBQZXJtaXNzaW9uIHsKICAgICAgICAgICAgIFBl cm1pc3Npb25BbGxvd2VkLCAvLyBVc2VyIGhhcyBhbGxvd2VkIG5vdGlmaWNhdGlvbnMKICAgICAg ICAgICAgIFBlcm1pc3Npb25Ob3RBbGxvd2VkLCAvLyBVc2VyIGhhcyBub3QgeWV0IGFsbG93ZWQK ICAgICAgICAgICAgIFBlcm1pc3Npb25EZW5pZWQgLy8gVXNlciBoYXMgZXhwbGljaXRseSBkZW5p ZWQgcGVybWlzc2lvbgpAQCAtNTksMTggKzYxLDIwIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAg ICAgICAgLy8gUmVxdWVzdHMgdGhhdCBhIG5vdGlmaWNhdGlvbiB0aGF0IGhhcyBhbHJlYWR5IGJl ZW4gc2hvd24gYmUgY2FuY2VsZWQuCiAgICAgICAgIHZpcnR1YWwgdm9pZCBjYW5jZWwoTm90aWZp Y2F0aW9uKiBvYmplY3QpID0gMDsKIAotICAgICAgICAvLyBJbmZvcm1zIHRoZSBwcmVzZW50ZXIg dGhhdCBhIE5vdGlmaWNhdGlvbiBvYmplY3QgaGFzIGJlZW4gZGVzdHJveWVkIAorICAgICAgICAv LyBJbmZvcm1zIHRoZSBwcmVzZW50ZXIgdGhhdCBhIE5vdGlmaWNhdGlvbiBvYmplY3QgaGFzIGJl ZW4gZGVzdHJveWVkCiAgICAgICAgIC8vIChzdWNoIGFzIGJ5IGEgcGFnZSB0cmFuc2l0aW9uKS4g IFRoZSBwcmVzZW50ZXIgbWF5IGNvbnRpbnVlIHNob3dpbmcKICAgICAgICAgLy8gdGhlIG5vdGlm aWNhdGlvbiwgYnV0IG11c3Qgbm90IGF0dGVtcHQgdG8gY2FsbCB0aGUgZXZlbnQgaGFuZGxlcnMu CiAgICAgICAgIHZpcnR1YWwgdm9pZCBub3RpZmljYXRpb25PYmplY3REZXN0cm95ZWQoTm90aWZp Y2F0aW9uKiBvYmplY3QpID0gMDsKIAogICAgICAgICAvLyBSZXF1ZXN0cyB1c2VyIHBlcm1pc3Np b24gdG8gc2hvdyBkZXNrdG9wIG5vdGlmaWNhdGlvbnMgZnJvbSBhIHBhcnRpY3VsYXIKLSAgICAg ICAgLy8gb3JpZ2luLiAgVGhlIGNhbGxiYWNrIHBhcmFtZXRlciBzaG91bGQgYmUgcnVuIHdoZW4g dGhlIHVzZXIgaGFzCisgICAgICAgIC8vIG9yaWdpbi4gVGhlIGNhbGxiYWNrIHBhcmFtZXRlciBz aG91bGQgYmUgcnVuIHdoZW4gdGhlIHVzZXIgaGFzCiAgICAgICAgIC8vIG1hZGUgYSBkZWNpc2lv bi4KICAgICAgICAgdmlydHVhbCB2b2lkIHJlcXVlc3RQZXJtaXNzaW9uKFNlY3VyaXR5T3JpZ2lu KiBvcmlnaW4sIFBhc3NSZWZQdHI8Vm9pZENhbGxiYWNrPiBjYWxsYmFjaykgPSAwOwogCi0gICAg ICAgIC8vIENoZWNrcyB0aGUgY3VycmVudCBsZXZlbCBvZiBwZXJtaXNzaW9uLgotICAgICAgICB2 aXJ0dWFsIFBlcm1pc3Npb24gY2hlY2tQZXJtaXNzaW9uKFNlY3VyaXR5T3JpZ2luKiBvcmlnaW4p ID0gMDsKKyAgICAgICAgLy8gQ2hlY2tzIHRoZSBjdXJyZW50IGxldmVsIG9mIHBlcm1pc3Npb24g Zm9yIHRoZSBzcGVjaWZpZWQgVVJMLiBJZiB0aGUKKyAgICAgICAgLy8gVVJMIGlzIGEgZG9jdW1l bnQgKGFzIG9wcG9zZWQgdG8gYSB3b3JrZXIgb3Igb3RoZXIgU2NyaXB0RXhlY3V0aW9uQ29udGV4 dCksCisgICAgICAgIC8vIHxkb2N1bWVudHwgd2lsbCBhbHNvIGJlIHByb3ZpZGVkLgorICAgICAg ICB2aXJ0dWFsIFBlcm1pc3Npb24gY2hlY2tQZXJtaXNzaW9uKGNvbnN0IEtVUkwmIHVybCwgRG9j dW1lbnQqIGRvY3VtZW50KSA9IDA7CiAgICAgfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpk aWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1dlYktpdC9jaHJvbWl1bS9D aGFuZ2VMb2cKaW5kZXggYTA0M2M2Yi4uMjg5Mjg2MiAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9t aXVtL0NoYW5nZUxvZworKysgYi9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MjMgQEAKKzIwMTAtMDEtMjcgIEFhcm9uIEJvb2RtYW4gIDxhYUBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU2VuZCBmdWxsIFVS TCBhbmQgYXBwbGljYXRpb24gaWQgb2YgcmVxdWVzdGluZyBjb250ZXh0IHRvIENocm9taXVtCisg ICAgICAgIHdoZW4gY2hlY2tpbmcgbm90aWZpY2F0aW9uIHBlcm1pc3Npb25zLgorCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNDIzOAorCisgICAgICAg ICogcHVibGljL1dlYkRvY3VtZW50Lmg6CisgICAgICAgICogc3JjL1dlYkRvY3VtZW50LmNwcDoK KyAgICAgICAgKFdlYktpdDo6V2ViRG9jdW1lbnQ6OmFwcGxpY2F0aW9uSUQpOgorICAgICAgICBJ bXBsZW1lbnQgYXBwbGljYXRpb25JRCgpIG1ldGhvZC4KKworICAgICAgICAqIHB1YmxpYy9XZWJO b3RpZmljYXRpb25QcmVzZW50ZXIuaDoKKyAgICAgICAgKiBzcmMvTm90aWZpY2F0aW9uUHJlc2Vu dGVySW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5vdGlmaWNhdGlvblByZXNlbnRlckltcGw6 OmNoZWNrUGVybWlzc2lvbik6CisgICAgICAgICogc3JjL05vdGlmaWNhdGlvblByZXNlbnRlcklt cGwuaDoKKyAgICAgICAgU2VuZCBhcHBsaWNhdGlvbklEIGFuZCBmdWxsIFVSTCB0aHJvdWdoIHRv IENocm9taXVtLgorCiAyMDEwLTAxLTI2ICBEYXJpbiBGaXNoZXIgIDxkYXJpbkBjaHJvbWl1bS5v cmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGF2aWQgTGV2aW4uCmRpZmYgLS1naXQgYS9XZWJL aXQvY2hyb21pdW0vcHVibGljL1dlYkRvY3VtZW50LmggYi9XZWJLaXQvY2hyb21pdW0vcHVibGlj L1dlYkRvY3VtZW50LmgKaW5kZXggMDM5NzkxMC4uZTE1OGM0MSAxMDA2NDQKLS0tIGEvV2ViS2l0 L2Nocm9taXVtL3B1YmxpYy9XZWJEb2N1bWVudC5oCisrKyBiL1dlYktpdC9jaHJvbWl1bS9wdWJs aWMvV2ViRG9jdW1lbnQuaApAQCAtNjgsNiArNjgsNyBAQCBwdWJsaWM6CiAgICAgV0VCS0lUX0FQ SSBXZWJOb2RlQ29sbGVjdGlvbiBhbGwoKTsKICAgICBXRUJLSVRfQVBJIFdlYlVSTCBjb21wbGV0 ZVVSTChjb25zdCBXZWJTdHJpbmcmKSBjb25zdDsKICAgICBXRUJLSVRfQVBJIFdlYkVsZW1lbnQg Z2V0RWxlbWVudEJ5SWQoY29uc3QgV2ViU3RyaW5nJiBpZCkgY29uc3Q7CisgICAgV0VCS0lUX0FQ SSBXZWJTdHJpbmcgYXBwbGljYXRpb25JRCgpIGNvbnN0OwogCiAjaWYgV0VCS0lUX0lNUExFTUVO VEFUSU9OCiAgICAgV2ViRG9jdW1lbnQoY29uc3QgV1RGOjpQYXNzUmVmUHRyPFdlYkNvcmU6OkRv Y3VtZW50PiYpOwpkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJOb3RpZmlj YXRpb25QcmVzZW50ZXIuaCBiL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViTm90aWZpY2F0aW9u UHJlc2VudGVyLmgKaW5kZXggNjUzYjE0Mi4uYTM3NjRhYSAxMDA2NDQKLS0tIGEvV2ViS2l0L2No cm9taXVtL3B1YmxpYy9XZWJOb3RpZmljYXRpb25QcmVzZW50ZXIuaAorKysgYi9XZWJLaXQvY2hy b21pdW0vcHVibGljL1dlYk5vdGlmaWNhdGlvblByZXNlbnRlci5oCkBAIC0zNSw4ICszNSwxMCBA QAogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAorY2xhc3MgV2ViRG9jdW1lbnQ7CiBjbGFzcyBXZWJO b3RpZmljYXRpb247CiBjbGFzcyBXZWJOb3RpZmljYXRpb25QZXJtaXNzaW9uQ2FsbGJhY2s7Citj bGFzcyBXZWJVUkw7CiAKIC8vIFByb3ZpZGVzIHRoZSBzZXJ2aWNlcyB0byBzaG93IGRlc2t0b3Ag bm90aWZpY2F0aW9ucyB0byB0aGUgdXNlci4KIGNsYXNzIFdlYk5vdGlmaWNhdGlvblByZXNlbnRl ciB7CkBAIC01Nyw4ICs1OSw5IEBAIHB1YmxpYzoKICAgICAvLyBiZWluZyBkZXN0cm95ZWQuICBE b2VzIF9ub3RfIHJlbW92ZSB0aGUgbm90aWZpY2F0aW9uIGlmIGJlaW5nIHNob3duLCBidXQgZGV0 YWNoZXMgaXQgZnJvbSByZWNlaXZpbmcgZXZlbnRzLgogICAgIHZpcnR1YWwgdm9pZCBvYmplY3RE ZXN0cm95ZWQoY29uc3QgV2ViTm90aWZpY2F0aW9uJikgPSAwOwogCi0gICAgLy8gQ2hlY2tzIHRo ZSBwZXJtaXNzaW9uIGxldmVsIG9mIGEgZ2l2ZW4gb3JpZ2luLgotICAgIHZpcnR1YWwgUGVybWlz c2lvbiBjaGVja1Blcm1pc3Npb24oY29uc3QgV2ViU3RyaW5nJiBvcmlnaW4pID0gMDsKKyAgICAv LyBDaGVja3MgdGhlIHBlcm1pc3Npb24gbGV2ZWwgZm9yIHRoZSBnaXZlbiBVUkwuIElmIHRoZSBV UkwgaXMgYmVpbmcgZGlzcGxheWVkIGluIGEgZG9jdW1lbnQKKyAgICAvLyAoYXMgb3Bwb3NlZCB0 byBhIHdvcmtlciBvciBvdGhlciBTY3JpcHRFeGVjdXRpb25Db250ZXh0KSwgfGRvY3VtZW50fCB3 aWxsIGFsc28gYmUgcHJvdmlkZWQuCisgICAgdmlydHVhbCBQZXJtaXNzaW9uIGNoZWNrUGVybWlz c2lvbihjb25zdCBXZWJVUkwmIHVybCwgV2ViRG9jdW1lbnQqIGRvY3VtZW50KSA9IDA7CiAKICAg ICAvLyBSZXF1ZXN0cyBwZXJtaXNzaW9uIGZvciBhIGdpdmVuIG9yaWdpbi4gIFRoaXMgb3BlcmF0 aW9uIGlzIGFzeW5jaHJvbm91cyBhbmQgdGhlIGNhbGxiYWNrIHByb3ZpZGVkCiAgICAgLy8gd2ls bCBiZSBpbnZva2VkIHdoZW4gdGhlIHBlcm1pc3Npb24gZGVjaXNpb24gaXMgbWFkZS4gIENhbGxi YWNrIHBvaW50ZXIgbXVzdCByZW1haW4KZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9zcmMv Tm90aWZpY2F0aW9uUHJlc2VudGVySW1wbC5jcHAgYi9XZWJLaXQvY2hyb21pdW0vc3JjL05vdGlm aWNhdGlvblByZXNlbnRlckltcGwuY3BwCmluZGV4IDZiMjIzMTkuLmEzOGI4YjUgMTAwNjQ0Ci0t LSBhL1dlYktpdC9jaHJvbWl1bS9zcmMvTm90aWZpY2F0aW9uUHJlc2VudGVySW1wbC5jcHAKKysr IGIvV2ViS2l0L2Nocm9taXVtL3NyYy9Ob3RpZmljYXRpb25QcmVzZW50ZXJJbXBsLmNwcApAQCAt MzMsMTIgKzMzLDE1IEBACiAKICNpZiBFTkFCTEUoTk9USUZJQ0FUSU9OUykKIAorI2luY2x1ZGUg IkRvY3VtZW50LmgiCiAjaW5jbHVkZSAiTm90aWZpY2F0aW9uLmgiCiAjaW5jbHVkZSAiU2VjdXJp dHlPcmlnaW4uaCIKIAorI2luY2x1ZGUgIldlYkRvY3VtZW50LmgiCiAjaW5jbHVkZSAiV2ViTm90 aWZpY2F0aW9uLmgiCiAjaW5jbHVkZSAiV2ViTm90aWZpY2F0aW9uUGVybWlzc2lvbkNhbGxiYWNr LmgiCiAjaW5jbHVkZSAiV2ViTm90aWZpY2F0aW9uUHJlc2VudGVyLmgiCisjaW5jbHVkZSAiV2Vi VVJMLmgiCiAKICNpbmNsdWRlIDx3dGYvUGFzc1JlZlB0ci5oPgogCkBAIC04OSw5ICs5MiwxMyBA QCB2b2lkIE5vdGlmaWNhdGlvblByZXNlbnRlckltcGw6Om5vdGlmaWNhdGlvbk9iamVjdERlc3Ry b3llZChOb3RpZmljYXRpb24qIG5vdGlmaQogICAgIG1fcHJlc2VudGVyLT5vYmplY3REZXN0cm95 ZWQoUGFzc1JlZlB0cjxOb3RpZmljYXRpb24+KG5vdGlmaWNhdGlvbikpOwogfQogCi1Ob3RpZmlj YXRpb25QcmVzZW50ZXI6OlBlcm1pc3Npb24gTm90aWZpY2F0aW9uUHJlc2VudGVySW1wbDo6Y2hl Y2tQZXJtaXNzaW9uKFNlY3VyaXR5T3JpZ2luKiBvcmlnaW4pCitOb3RpZmljYXRpb25QcmVzZW50 ZXI6OlBlcm1pc3Npb24gTm90aWZpY2F0aW9uUHJlc2VudGVySW1wbDo6Y2hlY2tQZXJtaXNzaW9u KGNvbnN0IEtVUkwmIHVybCwgRG9jdW1lbnQqIGRvY3VtZW50KQogewotICAgIGludCByZXN1bHQg PSBtX3ByZXNlbnRlci0+Y2hlY2tQZXJtaXNzaW9uKG9yaWdpbi0+dG9TdHJpbmcoKSk7CisgICAg V2ViRG9jdW1lbnQgd2ViRG9jdW1lbnQ7CisgICAgaWYgKGRvY3VtZW50KQorICAgICAgICB3ZWJE b2N1bWVudCA9IGRvY3VtZW50OworCisgICAgaW50IHJlc3VsdCA9IG1fcHJlc2VudGVyLT5jaGVj a1Blcm1pc3Npb24odXJsLCBkb2N1bWVudCA/ICZ3ZWJEb2N1bWVudCA6IDApOwogICAgIHJldHVy biBzdGF0aWNfY2FzdDxOb3RpZmljYXRpb25QcmVzZW50ZXI6OlBlcm1pc3Npb24+KHJlc3VsdCk7 CiB9CiAKZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9zcmMvTm90aWZpY2F0aW9uUHJlc2Vu dGVySW1wbC5oIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9Ob3RpZmljYXRpb25QcmVzZW50ZXJJbXBs LmgKaW5kZXggNGFmZTlkYy4uOGUzNzk5YyAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL3Ny Yy9Ob3RpZmljYXRpb25QcmVzZW50ZXJJbXBsLmgKKysrIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9O b3RpZmljYXRpb25QcmVzZW50ZXJJbXBsLmgKQEAgLTU0LDcgKzU0LDcgQEAgcHVibGljOgogICAg IHZpcnR1YWwgYm9vbCBzaG93KFdlYkNvcmU6Ok5vdGlmaWNhdGlvbiogb2JqZWN0KTsKICAgICB2 aXJ0dWFsIHZvaWQgY2FuY2VsKFdlYkNvcmU6Ok5vdGlmaWNhdGlvbiogb2JqZWN0KTsKICAgICB2 aXJ0dWFsIHZvaWQgbm90aWZpY2F0aW9uT2JqZWN0RGVzdHJveWVkKFdlYkNvcmU6Ok5vdGlmaWNh dGlvbiogb2JqZWN0KTsKLSAgICB2aXJ0dWFsIFdlYkNvcmU6Ok5vdGlmaWNhdGlvblByZXNlbnRl cjo6UGVybWlzc2lvbiBjaGVja1Blcm1pc3Npb24oV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW4qIG9y aWdpbik7CisgICAgdmlydHVhbCBXZWJDb3JlOjpOb3RpZmljYXRpb25QcmVzZW50ZXI6OlBlcm1p c3Npb24gY2hlY2tQZXJtaXNzaW9uKGNvbnN0IFdlYkNvcmU6OktVUkwmIHVybCwgV2ViQ29yZTo6 RG9jdW1lbnQqIGRvY3VtZW50KTsKICAgICB2aXJ0dWFsIHZvaWQgcmVxdWVzdFBlcm1pc3Npb24o V2ViQ29yZTo6U2VjdXJpdHlPcmlnaW4qIG9yaWdpbiwgV1RGOjpQYXNzUmVmUHRyPFdlYkNvcmU6 OlZvaWRDYWxsYmFjaz4gY2FsbGJhY2spOwogCiBwcml2YXRlOgpkaWZmIC0tZ2l0IGEvV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJEb2N1bWVudC5jcHAgYi9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkRv Y3VtZW50LmNwcAppbmRleCBiNzkzOGNmLi44NGYzMDA0IDEwMDY0NAotLS0gYS9XZWJLaXQvY2hy b21pdW0vc3JjL1dlYkRvY3VtZW50LmNwcAorKysgYi9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkRv Y3VtZW50LmNwcApAQCAtMzIsMTIgKzMyLDE0IEBACiAjaW5jbHVkZSAiV2ViRG9jdW1lbnQuaCIK IAogI2luY2x1ZGUgIkRvY3VtZW50LmgiCisjaW5jbHVkZSAiRG9jdW1lbnRMb2FkZXIuaCIKICNp bmNsdWRlICJFbGVtZW50LmgiCiAjaW5jbHVkZSAiSFRNTEFsbENvbGxlY3Rpb24uaCIKICNpbmNs dWRlICJIVE1MQm9keUVsZW1lbnQuaCIKICNpbmNsdWRlICJIVE1MQ29sbGVjdGlvbi5oIgogI2lu Y2x1ZGUgIkhUTUxFbGVtZW50LmgiCiAjaW5jbHVkZSAiSFRNTEhlYWRFbGVtZW50LmgiCisjaW5j bHVkZSAiTm9kZUxpc3QuaCIKIAogI2luY2x1ZGUgIldlYkVsZW1lbnQuaCIKICNpbmNsdWRlICJX ZWJGcmFtZUltcGwuaCIKQEAgLTExMSw0ICsxMTMsMzggQEAgV2ViRWxlbWVudCBXZWJEb2N1bWVu dDo6Z2V0RWxlbWVudEJ5SWQoY29uc3QgV2ViU3RyaW5nJiBpZCkgY29uc3QKICAgICByZXR1cm4g V2ViRWxlbWVudChjb25zdFVud3JhcDxEb2N1bWVudD4oKS0+Z2V0RWxlbWVudEJ5SWQoaWQpKTsK IH0KIAorV2ViU3RyaW5nIFdlYkRvY3VtZW50OjphcHBsaWNhdGlvbklEKCkgY29uc3QKK3sKKyAg ICBjb25zdCBjaGFyKiBrQ2hyb21lQXBwbGljYXRpb25IZWFkZXIgPSAieC1jaHJvbWUtYXBwbGlj YXRpb24iOworCisgICAgLy8gRmlyc3QgY2hlY2sgaWYgdGhlIGRvY3VtZW50J3MgcmVzcG9uc2Ug aW5jbHVkZWQgYSBoZWFkZXIgaW5kaWNhdGluZyB0aGUKKyAgICAvLyBhcHBsaWNhdGlvbiBpdCBz aG91bGQgZ28gd2l0aC4KKyAgICBjb25zdCBEb2N1bWVudCogZG9jdW1lbnQgPSBjb25zdFVud3Jh cDxEb2N1bWVudD4oKTsKKyAgICBGcmFtZSogZnJhbWUgPSBkb2N1bWVudC0+ZnJhbWUoKTsKKyAg ICBpZiAoIWZyYW1lKQorICAgICAgICByZXR1cm4gV2ViU3RyaW5nKCk7CisKKyAgICBEb2N1bWVu dExvYWRlciogbG9hZGVyID0gZnJhbWUtPmxvYWRlcigpLT5kb2N1bWVudExvYWRlcigpOworICAg IGlmICghbG9hZGVyKQorICAgICAgICByZXR1cm4gV2ViU3RyaW5nKCk7CisKKyAgICBXZWJTdHJp bmcgaGVhZGVyVmFsdWUgPQorICAgICAgICBsb2FkZXItPnJlc3BvbnNlKCkuaHR0cEhlYWRlckZp ZWxkKGtDaHJvbWVBcHBsaWNhdGlvbkhlYWRlcik7CisgICAgaWYgKCFoZWFkZXJWYWx1ZS5pc0Vt cHR5KCkpCisgICAgICAgIHJldHVybiBoZWFkZXJWYWx1ZTsKKworICAgIC8vIE90aGVyd2lzZSwg ZmFsbCBiYWNrIHRvIGxvb2tpbmcgZm9yIHRoZSBtZXRhIHRhZy4KKyAgICBSZWZQdHI8Tm9kZUxp c3Q+IG1ldGFUYWdzID0KKyAgICAgICAgY29uc3RfY2FzdDxEb2N1bWVudCo+KGRvY3VtZW50KS0+ Z2V0RWxlbWVudHNCeVRhZ05hbWUoIm1ldGEiKTsKKyAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBp IDwgbWV0YVRhZ3MtPmxlbmd0aCgpOyArK2kpIHsKKyAgICAgICAgRWxlbWVudCogZWxlbWVudCA9 IHN0YXRpY19jYXN0PEVsZW1lbnQqPihtZXRhVGFncy0+aXRlbShpKSk7CisgICAgICAgIGlmIChl bGVtZW50LT5nZXRBdHRyaWJ1dGUoImh0dHAtZXF1aXYiKS5sb3dlcigpID09CisgICAgICAgICAg ICAgICAga0Nocm9tZUFwcGxpY2F0aW9uSGVhZGVyKSB7CisgICAgICAgICAgICByZXR1cm4gZWxl bWVudC0+Z2V0QXR0cmlidXRlKCJ2YWx1ZSIpOworICAgICAgICB9CisgICAgfQorCisgICAgcmV0 dXJuIFdlYlN0cmluZygpOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBh L1dlYktpdC93aW4vQ2hhbmdlTG9nIGIvV2ViS2l0L3dpbi9DaGFuZ2VMb2cKaW5kZXggMTY1Mjlj OC4uZTE4OTViZSAxMDA2NDQKLS0tIGEvV2ViS2l0L3dpbi9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0 L3dpbi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxMC0wMS0yNyAgQWFyb24gQm9vZG1h biAgPGFhQGNocm9taXVtLm9yZz4KKworICAgICAgICBFeHBhbmQgTm90aWZpY2F0aW9uQ2VudGVy OjpjaGVja1Blcm1pc3Npb24oKSBpbnRlcmZhY2UuCisgICAgICAgIEl0IG5vdyBwYXNzZXMgdGhl IGZ1bGwgVVJMIGluc3RlYWQgb2YganVzdCB0aGUgb3JpZ2luLgorCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNDIzOAorCisgICAgICAgICogV2ViQ29y ZVN1cHBvcnQvV2ViRGVza3RvcE5vdGlmaWNhdGlvbnNEZWxlZ2F0ZS5jcHA6CisgICAgICAgIChX ZWJEZXNrdG9wTm90aWZpY2F0aW9uc0RlbGVnYXRlOjpjaGVja1Blcm1pc3Npb24pOgorICAgICAg ICAqIFdlYkNvcmVTdXBwb3J0L1dlYkRlc2t0b3BOb3RpZmljYXRpb25zRGVsZWdhdGUuaDoKKwog MjAxMC0wMS0yNyAgQWRhbSBSb2JlbiAgPGFyb2JlbkBhcHBsZS5jb20+CiAKICAgICAgICAgTWFr ZSBpdCBwb3NzaWJsZSB0byBpbnN0YW50aWF0ZSBXZWJTZXJpYWxpemVkSlNWYWx1ZSB1c2luZwpk aWZmIC0tZ2l0IGEvV2ViS2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJEZXNrdG9wTm90aWZpY2F0 aW9uc0RlbGVnYXRlLmNwcCBiL1dlYktpdC93aW4vV2ViQ29yZVN1cHBvcnQvV2ViRGVza3RvcE5v dGlmaWNhdGlvbnNEZWxlZ2F0ZS5jcHAKaW5kZXggZjgyMmJmZS4uM2Y2ZWIwNyAxMDA2NDQKLS0t IGEvV2ViS2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJEZXNrdG9wTm90aWZpY2F0aW9uc0RlbGVn YXRlLmNwcAorKysgYi9XZWJLaXQvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkRlc2t0b3BOb3RpZmlj YXRpb25zRGVsZWdhdGUuY3BwCkBAIC0zMyw2ICszMyw4IEBACiAjaW5jbHVkZSAiV2ViU2VjdXJp dHlPcmlnaW4uaCIKICNpbmNsdWRlICJXZWJWaWV3LmgiCiAjaW5jbHVkZSA8V2ViQ29yZS9CU3Ry aW5nLmg+CisjaW5jbHVkZSA8V2ViQ29yZS9Eb2N1bWVudC5oPgorI2luY2x1ZGUgPFdlYkNvcmUv S1VSTC5oPgogCiAjaWYgRU5BQkxFKE5PVElGSUNBVElPTlMpCiAKQEAgLTE3MCwxMCArMTcyLDEw IEBAIHZvaWQgV2ViRGVza3RvcE5vdGlmaWNhdGlvbnNEZWxlZ2F0ZTo6cmVxdWVzdFBlcm1pc3Np b24oU2VjdXJpdHlPcmlnaW4qIG9yaWdpbiwKICAgICAgICAgbm90aWZpY2F0aW9uRGVsZWdhdGUo KS0+cmVxdWVzdE5vdGlmaWNhdGlvblBlcm1pc3Npb24ob3JnKTsKIH0KIAotTm90aWZpY2F0aW9u UHJlc2VudGVyOjpQZXJtaXNzaW9uIFdlYkRlc2t0b3BOb3RpZmljYXRpb25zRGVsZWdhdGU6OmNo ZWNrUGVybWlzc2lvbihTZWN1cml0eU9yaWdpbiogb3JpZ2luKQorTm90aWZpY2F0aW9uUHJlc2Vu dGVyOjpQZXJtaXNzaW9uIFdlYkRlc2t0b3BOb3RpZmljYXRpb25zRGVsZWdhdGU6OmNoZWNrUGVy bWlzc2lvbihjb25zdCBLVVJMJiB1cmwsIERvY3VtZW50KikKIHsKICAgICBpbnQgb3V0ID0gMDsK LSAgICBCU3RyaW5nIG9yZyhvcmlnaW4tPnRvU3RyaW5nKCkpOworICAgIEJTdHJpbmcgb3JnKFNl Y3VyaXR5T3JpZ2luOjpjcmVhdGUodXJsKS0+dG9TdHJpbmcoKSk7CiAgICAgaWYgKGhhc05vdGlm aWNhdGlvbkRlbGVnYXRlKCkpCiAgICAgICAgIG5vdGlmaWNhdGlvbkRlbGVnYXRlKCktPmNoZWNr Tm90aWZpY2F0aW9uUGVybWlzc2lvbihvcmcsICZvdXQpOwogICAgIHJldHVybiAoTm90aWZpY2F0 aW9uUHJlc2VudGVyOjpQZXJtaXNzaW9uKSBvdXQ7CmRpZmYgLS1naXQgYS9XZWJLaXQvd2luL1dl YkNvcmVTdXBwb3J0L1dlYkRlc2t0b3BOb3RpZmljYXRpb25zRGVsZWdhdGUuaCBiL1dlYktpdC93 aW4vV2ViQ29yZVN1cHBvcnQvV2ViRGVza3RvcE5vdGlmaWNhdGlvbnNEZWxlZ2F0ZS5oCmluZGV4 IDAwYzAwZDUuLmQzMGIxZTcgMTAwNjQ0Ci0tLSBhL1dlYktpdC93aW4vV2ViQ29yZVN1cHBvcnQv V2ViRGVza3RvcE5vdGlmaWNhdGlvbnNEZWxlZ2F0ZS5oCisrKyBiL1dlYktpdC93aW4vV2ViQ29y ZVN1cHBvcnQvV2ViRGVza3RvcE5vdGlmaWNhdGlvbnNEZWxlZ2F0ZS5oCkBAIC0zNiw2ICszNiwx MSBAQAogCiBpbnRlcmZhY2UgSVdlYkRlc2t0b3BOb3RpZmljYXRpb25QcmVzZW50ZXI7CiAKK25h bWVzcGFjZSBXZWJDb3JlIHsKK2NsYXNzIERvY3VtZW50OworY2xhc3MgS1VSTDsKK30KKwogY2xh c3MgV2ViRGVza3RvcE5vdGlmaWNhdGlvbnNEZWxlZ2F0ZSA6IHB1YmxpYyBXZWJDb3JlOjpOb3Rp ZmljYXRpb25QcmVzZW50ZXIgewogcHVibGljOgogICAgIFdlYkRlc2t0b3BOb3RpZmljYXRpb25z RGVsZWdhdGUoV2ViVmlldyogdmlldyk7CkBAIC00NSw3ICs1MCw3IEBAIHB1YmxpYzoKICAgICB2 aXJ0dWFsIHZvaWQgY2FuY2VsKFdlYkNvcmU6Ok5vdGlmaWNhdGlvbiogb2JqZWN0KTsKICAgICB2 aXJ0dWFsIHZvaWQgbm90aWZpY2F0aW9uT2JqZWN0RGVzdHJveWVkKFdlYkNvcmU6Ok5vdGlmaWNh dGlvbiogb2JqZWN0KTsKICAgICB2aXJ0dWFsIHZvaWQgcmVxdWVzdFBlcm1pc3Npb24oV2ViQ29y ZTo6U2VjdXJpdHlPcmlnaW4qIG9yaWdpbiwgUGFzc1JlZlB0cjxXZWJDb3JlOjpWb2lkQ2FsbGJh Y2s+IGNhbGxiYWNrKTsKLSAgICB2aXJ0dWFsIFdlYkNvcmU6Ok5vdGlmaWNhdGlvblByZXNlbnRl cjo6UGVybWlzc2lvbiBjaGVja1Blcm1pc3Npb24oV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW4qIG9y aWdpbik7CisgICAgdmlydHVhbCBXZWJDb3JlOjpOb3RpZmljYXRpb25QcmVzZW50ZXI6OlBlcm1p c3Npb24gY2hlY2tQZXJtaXNzaW9uKGNvbnN0IEtVUkwmIHVybCwgRG9jdW1lbnQqIGRvY3VtZW50 KTsKIAogcHJpdmF0ZToKICAgICBib29sIGhhc05vdGlmaWNhdGlvbkRlbGVnYXRlKCk7Cg==