71590 2011-11-04 15:11:44 -0700 [chromium] Use the security origin instead of the URL when checking notification permissions 2011-11-06 18:51:57 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dcheng dcheng dglazkov fishd tkent webkit.review.bot yutak oldest_to_newest 496494 0 dcheng 2011-11-04 15:11:44 -0700 [chromium] Use the security origin instead of the URL when checking notification permissions 496495 1 113718 dcheng 2011-11-04 15:12:06 -0700 Created attachment 113718 Patch 496496 2 webkit.review.bot 2011-11-04 15:14:21 -0700 Please wait for approval from fishd@chromium.org before submitting because this patch contains changes to the Chromium public API. 496499 3 113718 webkit.review.bot 2011-11-04 15:17:51 -0700 Comment on attachment 113718 Patch Attachment 113718 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/10332103 496502 4 113718 abarth 2011-11-04 15:23:48 -0700 Comment on attachment 113718 Patch Technically fishd should review this patch. If you've updated Chromium already, you might need to update the chromium_rev in Source/WebKit/chromium/DEPS 496505 5 dcheng 2011-11-04 15:25:29 -0700 Yep, I'm waiting for fishd and verifying that rolling the chromium DEPS in this patch will fix it. 496520 6 113723 dcheng 2011-11-04 15:53:14 -0700 Created attachment 113723 Patch 496524 7 dcheng 2011-11-04 15:55:55 -0700 One weird thing I noticed--it looks like WebString has a conversion operator to WTF::String (http://codesearch.google.com/codesearch#OAMlx_jo-ck/src/third_party/WebKit/Source/WebKit/chromium/public/WebString.h&exact_package=chromium&q=WebString&type=cs&l=104). However... it doesn't seem to work and I need to manually construct a WTF::String. Am I doing something wrong? 496525 8 113723 abarth 2011-11-04 15:56:29 -0700 Comment on attachment 113723 Patch LGTM, but please wait for a thumbs up from fishd before landing. 496543 9 113723 webkit.review.bot 2011-11-04 16:32:47 -0700 Comment on attachment 113723 Patch Attachment 113723 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/10332122 New failing tests: fast/notifications/notifications-display-close-events.html fast/notifications/notifications-click-event.html fast/notifications/notifications-check-permission.html fast/notifications/notifications-rtl.html fast/notifications/notifications-no-icon.html fast/notifications/notifications-replace.html fast/notifications/notifications-with-permission.html fast/notifications/notifications-double-show.html 496548 10 113723 dcheng 2011-11-04 16:35:14 -0700 Comment on attachment 113723 Patch R- until I figure out how to fix the tests. Oddly enough the corresponding Chrome extension tests still seem to work. 496710 11 113723 fishd 2011-11-05 14:57:51 -0700 Comment on attachment 113723 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=113723&action=review > Source/WebKit/chromium/public/WebNotificationPresenter.h:63 > + virtual Permission checkPermission(const WebSecurityOrigin&) = 0; WebKit API changes LGTM 496776 12 dcheng 2011-11-05 21:15:09 -0700 Committed r99368: <http://trac.webkit.org/changeset/99368> 496792 13 yutak 2011-11-06 02:03:44 -0800 This change caused compile errors on Chromium canary builders: http://build.chromium.org/p/chromium.webkit/builders/Webkit%20Win%20Builder/builds/15854 Could you fix them or roll out your change at your earliest convenience? (I'm on limited network connection right now and can't fix this for you.) 496806 14 dcheng 2011-11-06 09:16:38 -0800 (In reply to comment #13) > This change caused compile errors on Chromium canary builders: > http://build.chromium.org/p/chromium.webkit/builders/Webkit%20Win%20Builder/builds/15854 > > Could you fix them or roll out your change at your earliest convenience? (I'm on limited network connection right now and can't fix this for you.) Sorry for not catching this locally. I have a Chromium-side fix ready to go, I'm waiting for the Chromium tree to re-open. 496821 15 dcheng 2011-11-06 10:49:26 -0800 Chromium r108814 should fix this. I'll clobber the Windows builder to be sure. 496945 16 yutak 2011-11-06 18:51:57 -0800 I confirmed the fix. Thanks! 113718 2011-11-04 15:12:06 -0700 2011-11-04 15:53:10 -0700 Patch bug-71590-20111104151205.patch text/plain 2677 dcheng U3VidmVyc2lvbiBSZXZpc2lvbjogOTkyNzEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXgg MWQ4OTc3MzQ3NDNjMGIyZDQ0ZTAyMGUxYmJlNTFmYWU1ODA3ZGEzYS4uOTA0Y2ZlYTJiZTMwZGY2 NzMyZGRiNmM4YWVlNmVhMDkxOWUzMGQ2NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxNCBAQAorMjAxMS0xMS0wNCAgRGFuaWVsIENoZW5nICA8ZGNoZW5nQGNocm9taXVt Lm9yZz4KKworICAgICAgICBbY2hyb21pdW1dIFVzZSB0aGUgc2VjdXJpdHkgb3JpZ2luIGluc3Rl YWQgb2YgdGhlIFVSTCB3aGVuIGNoZWNraW5nIG5vdGlmaWNhdGlvbiBwZXJtaXNzaW9ucworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzE1OTAKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHB1YmxpYy9XZWJO b3RpZmljYXRpb25QcmVzZW50ZXIuaDoKKyAgICAgICAgKiBzcmMvTm90aWZpY2F0aW9uUHJlc2Vu dGVySW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5vdGlmaWNhdGlvblByZXNlbnRlckltcGw6 OmNoZWNrUGVybWlzc2lvbik6CisKIDIwMTEtMTEtMDIgIFhpYW9tZWkgSmkgIDx4amlAY2hyb21p dW0ub3JnPgogCiAgICAgICAgIEVuYWJsZSBjdHJsLWFycm93IG1vdmUgY3Vyc29yIGJ5IHdvcmQg aW4gdmlzdWFsIG9yZGVyIGluIGNyLXdpbiBieSBjb21tYW5kIGxpbmUgZmxhZy4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYk5vdGlmaWNhdGlvblByZXNlbnRl ci5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViTm90aWZpY2F0aW9uUHJlc2Vu dGVyLmgKaW5kZXggOWZiN2U2ZTg4YTI5YTIzODZlYzk4ZjQzM2Y3MjU1Nzg1OGMzYzhiYy4uY2Qx NTNiN2UzM2M5MWZkMGY0MjY3NTlhYTkzZDc0MTkzMjQ1OThiMiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViTm90aWZpY2F0aW9uUHJlc2VudGVyLmgKKysrIGIv U291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViTm90aWZpY2F0aW9uUHJlc2VudGVyLmgK QEAgLTM5LDcgKzM5LDYgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiAKIGNsYXNzIFdlYkRvY3VtZW50 OwogY2xhc3MgV2ViTm90aWZpY2F0aW9uOwotY2xhc3MgV2ViVVJMOwogCiAvLyBQcm92aWRlcyB0 aGUgc2VydmljZXMgdG8gc2hvdyBkZXNrdG9wIG5vdGlmaWNhdGlvbnMgdG8gdGhlIHVzZXIuCiBj bGFzcyBXZWJOb3RpZmljYXRpb25QcmVzZW50ZXIgewpAQCAtNjEsNyArNjAsNyBAQCBwdWJsaWM6 CiAgICAgdmlydHVhbCB2b2lkIG9iamVjdERlc3Ryb3llZChjb25zdCBXZWJOb3RpZmljYXRpb24m KSA9IDA7CiAKICAgICAvLyBDaGVja3MgdGhlIHBlcm1pc3Npb24gbGV2ZWwgZm9yIHRoZSBnaXZl biBvcmlnaW4uCi0gICAgdmlydHVhbCBQZXJtaXNzaW9uIGNoZWNrUGVybWlzc2lvbihjb25zdCBX ZWJVUkwmKSA9IDA7CisgICAgdmlydHVhbCBQZXJtaXNzaW9uIGNoZWNrUGVybWlzc2lvbihjb25z dCBXZWJTZWN1cml0eU9yaWdpbiYpID0gMDsKIAogICAgIC8vIFJlcXVlc3RzIHBlcm1pc3Npb24g Zm9yIGEgZ2l2ZW4gb3JpZ2luLiAgVGhpcyBvcGVyYXRpb24gaXMgYXN5bmNocm9ub3VzIGFuZCB0 aGUgY2FsbGJhY2sgcHJvdmlkZWQKICAgICAvLyB3aWxsIGJlIGludm9rZWQgd2hlbiB0aGUgcGVy bWlzc2lvbiBkZWNpc2lvbiBpcyBtYWRlLiAgQ2FsbGJhY2sgcG9pbnRlciBtdXN0IHJlbWFpbgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvTm90aWZpY2F0aW9uUHJlc2Vu dGVySW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9Ob3RpZmljYXRpb25QcmVz ZW50ZXJJbXBsLmNwcAppbmRleCA5MWI2YmExNjgyNGFiNDNiMWIwMDA4YWE2YjhmMjY2NTQ4MzA5 ZDNhLi45YTFlZWE4MWY5NWYxZmEwZGYwYWE2MWMxODllYjBjNTk2YzQwNDhmIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9Ob3RpZmljYXRpb25QcmVzZW50ZXJJbXBsLmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9Ob3RpZmljYXRpb25QcmVzZW50ZXJJ bXBsLmNwcApAQCAtOTYsNyArOTYsNyBAQCB2b2lkIE5vdGlmaWNhdGlvblByZXNlbnRlckltcGw6 Om5vdGlmaWNhdGlvbk9iamVjdERlc3Ryb3llZChOb3RpZmljYXRpb24qIG5vdGlmaQogCiBOb3Rp ZmljYXRpb25QcmVzZW50ZXI6OlBlcm1pc3Npb24gTm90aWZpY2F0aW9uUHJlc2VudGVySW1wbDo6 Y2hlY2tQZXJtaXNzaW9uKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIGNvbnRleHQpCiB7Ci0gICAg aW50IHJlc3VsdCA9IG1fcHJlc2VudGVyLT5jaGVja1Blcm1pc3Npb24oY29udGV4dC0+dXJsKCkp OworICAgIGludCByZXN1bHQgPSBtX3ByZXNlbnRlci0+Y2hlY2tQZXJtaXNzaW9uKFdlYlNlY3Vy aXR5T3JpZ2luKGNvbnRleHQtPnNlY3VyaXR5T3JpZ2luKCkpKTsKICAgICByZXR1cm4gc3RhdGlj X2Nhc3Q8Tm90aWZpY2F0aW9uUHJlc2VudGVyOjpQZXJtaXNzaW9uPihyZXN1bHQpOwogfQogCg== 113723 2011-11-04 15:53:14 -0700 2011-11-05 14:57:51 -0700 Patch bug-71590-20111104155313.patch text/plain 5454 dcheng U3VidmVyc2lvbiBSZXZpc2lvbjogOTkzMDcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXgg ZGM3YTdjYWQ1MTI5YmM0ZjhjYTc5MTE4NTU1YWI2MWY3MWQ4ZTkwMy4uMzc2N2YwNTViMWQzYjhi NmU5ODcwZjdiOTFmMGU4MDgwZjFjOWFjMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxNCBAQAorMjAxMS0xMS0wNCAgRGFuaWVsIENoZW5nICA8ZGNoZW5nQGNocm9taXVt Lm9yZz4KKworICAgICAgICBbY2hyb21pdW1dIFVzZSB0aGUgc2VjdXJpdHkgb3JpZ2luIGluc3Rl YWQgb2YgdGhlIFVSTCB3aGVuIGNoZWNraW5nIG5vdGlmaWNhdGlvbiBwZXJtaXNzaW9ucworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzE1OTAKKworICAg ICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgorCisgICAgICAgICogcHVibGljL1dlYk5vdGlm aWNhdGlvblByZXNlbnRlci5oOgorICAgICAgICAqIHNyYy9Ob3RpZmljYXRpb25QcmVzZW50ZXJJ bXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6Tm90aWZpY2F0aW9uUHJlc2VudGVySW1wbDo6Y2hl Y2tQZXJtaXNzaW9uKToKKwogMjAxMS0xMS0wMyAgQWRyaWVubmUgV2Fsa2VyICA8ZW5uZUBnb29n bGUuY29tPgogCiAgICAgICAgIFtjaHJvbWl1bV0gSW1wbGVtZW50IGNoZWNrZXJib2FyZGluZyBm b3IgbWlzc2luZyBsYXllciB0aWxlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9wdWJsaWMvV2ViTm90aWZpY2F0aW9uUHJlc2VudGVyLmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3B1YmxpYy9XZWJOb3RpZmljYXRpb25QcmVzZW50ZXIuaAppbmRleCA5ZmI3ZTZlODhhMjlh MjM4NmVjOThmNDMzZjcyNTU3ODU4YzNjOGJjLi5jZDE1M2I3ZTMzYzkxZmQwZjQyNjc1OWFhOTNk NzQxOTMyNDU5OGIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9X ZWJOb3RpZmljYXRpb25QcmVzZW50ZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1 YmxpYy9XZWJOb3RpZmljYXRpb25QcmVzZW50ZXIuaApAQCAtMzksNyArMzksNiBAQCBuYW1lc3Bh Y2UgV2ViS2l0IHsKIAogY2xhc3MgV2ViRG9jdW1lbnQ7CiBjbGFzcyBXZWJOb3RpZmljYXRpb247 Ci1jbGFzcyBXZWJVUkw7CiAKIC8vIFByb3ZpZGVzIHRoZSBzZXJ2aWNlcyB0byBzaG93IGRlc2t0 b3Agbm90aWZpY2F0aW9ucyB0byB0aGUgdXNlci4KIGNsYXNzIFdlYk5vdGlmaWNhdGlvblByZXNl bnRlciB7CkBAIC02MSw3ICs2MCw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgb2JqZWN0 RGVzdHJveWVkKGNvbnN0IFdlYk5vdGlmaWNhdGlvbiYpID0gMDsKIAogICAgIC8vIENoZWNrcyB0 aGUgcGVybWlzc2lvbiBsZXZlbCBmb3IgdGhlIGdpdmVuIG9yaWdpbi4KLSAgICB2aXJ0dWFsIFBl cm1pc3Npb24gY2hlY2tQZXJtaXNzaW9uKGNvbnN0IFdlYlVSTCYpID0gMDsKKyAgICB2aXJ0dWFs IFBlcm1pc3Npb24gY2hlY2tQZXJtaXNzaW9uKGNvbnN0IFdlYlNlY3VyaXR5T3JpZ2luJikgPSAw OwogCiAgICAgLy8gUmVxdWVzdHMgcGVybWlzc2lvbiBmb3IgYSBnaXZlbiBvcmlnaW4uICBUaGlz IG9wZXJhdGlvbiBpcyBhc3luY2hyb25vdXMgYW5kIHRoZSBjYWxsYmFjayBwcm92aWRlZAogICAg IC8vIHdpbGwgYmUgaW52b2tlZCB3aGVuIHRoZSBwZXJtaXNzaW9uIGRlY2lzaW9uIGlzIG1hZGUu ICBDYWxsYmFjayBwb2ludGVyIG11c3QgcmVtYWluCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3NyYy9Ob3RpZmljYXRpb25QcmVzZW50ZXJJbXBsLmNwcCBiL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vc3JjL05vdGlmaWNhdGlvblByZXNlbnRlckltcGwuY3BwCmluZGV4IDkxYjZi YTE2ODI0YWI0M2IxYjAwMDhhYTZiOGYyNjY1NDgzMDlkM2EuLjlhMWVlYTgxZjk1ZjFmYTBkZjBh YTYxYzE4OWViMGM1OTZjNDA0OGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v c3JjL05vdGlmaWNhdGlvblByZXNlbnRlckltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vc3JjL05vdGlmaWNhdGlvblByZXNlbnRlckltcGwuY3BwCkBAIC05Niw3ICs5Niw3IEBA IHZvaWQgTm90aWZpY2F0aW9uUHJlc2VudGVySW1wbDo6bm90aWZpY2F0aW9uT2JqZWN0RGVzdHJv eWVkKE5vdGlmaWNhdGlvbiogbm90aWZpCiAKIE5vdGlmaWNhdGlvblByZXNlbnRlcjo6UGVybWlz c2lvbiBOb3RpZmljYXRpb25QcmVzZW50ZXJJbXBsOjpjaGVja1Blcm1pc3Npb24oU2NyaXB0RXhl Y3V0aW9uQ29udGV4dCogY29udGV4dCkKIHsKLSAgICBpbnQgcmVzdWx0ID0gbV9wcmVzZW50ZXIt PmNoZWNrUGVybWlzc2lvbihjb250ZXh0LT51cmwoKSk7CisgICAgaW50IHJlc3VsdCA9IG1fcHJl c2VudGVyLT5jaGVja1Blcm1pc3Npb24oV2ViU2VjdXJpdHlPcmlnaW4oY29udGV4dC0+c2VjdXJp dHlPcmlnaW4oKSkpOwogICAgIHJldHVybiBzdGF0aWNfY2FzdDxOb3RpZmljYXRpb25QcmVzZW50 ZXI6OlBlcm1pc3Npb24+KHJlc3VsdCk7CiB9CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxv ZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBiNTE1NzkyOTcyZjRiYmIyZjJhM2NjOGM1YjE5ZTRh OGIzOGYzYjZkLi4zOWU5NjAwNGFkZDMxMzdiOTY2NWEyYTc5OWZhMjIxZjY5MmZhYWI5IDEwMDY0 NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MTQgQEAKKzIwMTEtMTEtMDQgIERhbmllbCBDaGVuZyAgPGRjaGVuZ0BjaHJvbWl1bS5vcmc+CisK KyAgICAgICAgW2Nocm9taXVtXSBVc2UgdGhlIHNlY3VyaXR5IG9yaWdpbiBpbnN0ZWFkIG9mIHRo ZSBVUkwgd2hlbiBjaGVja2luZyBub3RpZmljYXRpb24gcGVybWlzc2lvbnMKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcxNTkwCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL2Nocm9taXVt L05vdGlmaWNhdGlvblByZXNlbnRlci5jcHA6CisgICAgICAgIChOb3RpZmljYXRpb25QcmVzZW50 ZXI6OmNoZWNrUGVybWlzc2lvbik6CisgICAgICAgICogRHVtcFJlbmRlclRyZWUvY2hyb21pdW0v Tm90aWZpY2F0aW9uUHJlc2VudGVyLmg6CisKIDIwMTEtMTEtMDQgIEFuZGVycyBDYXJsc3NvbiAg PGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBGaXggV0tUUiBjcmFzaCB3aGVuIHJ1bm5p bmcgTlBOX0NvbnZlcnRQb2ludCB0ZXN0LgpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRy ZWUvY2hyb21pdW0vTm90aWZpY2F0aW9uUHJlc2VudGVyLmNwcCBiL1Rvb2xzL0R1bXBSZW5kZXJU cmVlL2Nocm9taXVtL05vdGlmaWNhdGlvblByZXNlbnRlci5jcHAKaW5kZXggMzU0OTMxOGQxM2I2 Y2M1MTY1MjUxNDFiNzMzYzQ1NTk5YWZiZjk3MC4uMTBkOTNhY2JhNTRkYzhmMjA2ZDc3NmQxYjY2 NDBiZmY3ZjY2ZjNhZSAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0v Tm90aWZpY2F0aW9uUHJlc2VudGVyLmNwcAorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJv bWl1bS9Ob3RpZmljYXRpb25QcmVzZW50ZXIuY3BwCkBAIC0xMzUsMTEgKzEzNSwxMSBAQCB2b2lk IE5vdGlmaWNhdGlvblByZXNlbnRlcjo6b2JqZWN0RGVzdHJveWVkKGNvbnN0IFdlYktpdDo6V2Vi Tm90aWZpY2F0aW9uJiBub3RpZgogICAgIG1fYWN0aXZlTm90aWZpY2F0aW9ucy5yZW1vdmUoaWQp OwogfQogCi1XZWJOb3RpZmljYXRpb25QcmVzZW50ZXI6OlBlcm1pc3Npb24gTm90aWZpY2F0aW9u UHJlc2VudGVyOjpjaGVja1Blcm1pc3Npb24oY29uc3QgV2ViVVJMJiB1cmwpCitXZWJOb3RpZmlj YXRpb25QcmVzZW50ZXI6OlBlcm1pc3Npb24gTm90aWZpY2F0aW9uUHJlc2VudGVyOjpjaGVja1Bl cm1pc3Npb24oY29uc3QgV2ViU2VjdXJpdHlPcmlnaW4mIG9yaWdpbikKIHsKICAgICAvLyBDaGVj ayB3aXRoIHRoZSBsYXlvdXQgdGVzdCBjb250cm9sbGVyCi0gICAgV1RGOjpTdHJpbmcgb3JpZ2lu ID0gV1RGOjpTdHJpbmcoc3RhdGljX2Nhc3Q8R1VSTD4odXJsKS5HZXRPcmlnaW4oKS5zcGVjKCku Y19zdHIoKSk7Ci0gICAgYm9vbCBhbGxvd2VkID0gbV9hbGxvd2VkT3JpZ2lucy5maW5kKG9yaWdp bikgIT0gbV9hbGxvd2VkT3JpZ2lucy5lbmQoKTsKKyAgICBXZWJTdHJpbmcgb3JpZ2luU3RyaW5n ID0gb3JpZ2luLnRvU3RyaW5nKCk7CisgICAgYm9vbCBhbGxvd2VkID0gbV9hbGxvd2VkT3JpZ2lu cy5maW5kKFdURjo6U3RyaW5nKG9yaWdpblN0cmluZy5kYXRhKCksIG9yaWdpblN0cmluZy5sZW5n dGgoKSkpICE9IG1fYWxsb3dlZE9yaWdpbnMuZW5kKCk7CiAgICAgcmV0dXJuIGFsbG93ZWQgPyBX ZWJOb3RpZmljYXRpb25QcmVzZW50ZXI6OlBlcm1pc3Npb25BbGxvd2VkCiAgICAgICAgIDogV2Vi Tm90aWZpY2F0aW9uUHJlc2VudGVyOjpQZXJtaXNzaW9uRGVuaWVkOwogfQpkaWZmIC0tZ2l0IGEv VG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vTm90aWZpY2F0aW9uUHJlc2VudGVyLmggYi9U b29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9Ob3RpZmljYXRpb25QcmVzZW50ZXIuaAppbmRl eCBmMTc0NzM1OTJjMGUxMDBmMDk0NWNmOTI0Y2NiZDU4ZWNhMTViNWI1Li5iMzNkZjkxMzgyMGFm ZWZmMWIyZDBiY2EyODY2OWRlNTE4MTQ3MTAzIDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVy VHJlZS9jaHJvbWl1bS9Ob3RpZmljYXRpb25QcmVzZW50ZXIuaAorKysgYi9Ub29scy9EdW1wUmVu ZGVyVHJlZS9jaHJvbWl1bS9Ob3RpZmljYXRpb25QcmVzZW50ZXIuaApAQCAtNTYsNyArNTYsNyBA QCBwdWJsaWM6CiAgICAgdmlydHVhbCBib29sIHNob3coY29uc3QgV2ViS2l0OjpXZWJOb3RpZmlj YXRpb24mKTsKICAgICB2aXJ0dWFsIHZvaWQgY2FuY2VsKGNvbnN0IFdlYktpdDo6V2ViTm90aWZp Y2F0aW9uJik7CiAgICAgdmlydHVhbCB2b2lkIG9iamVjdERlc3Ryb3llZChjb25zdCBXZWJLaXQ6 OldlYk5vdGlmaWNhdGlvbiYpOwotICAgIHZpcnR1YWwgUGVybWlzc2lvbiBjaGVja1Blcm1pc3Np b24oY29uc3QgV2ViS2l0OjpXZWJVUkwmKTsKKyAgICB2aXJ0dWFsIFBlcm1pc3Npb24gY2hlY2tQ ZXJtaXNzaW9uKGNvbnN0IFdlYktpdDo6V2ViU2VjdXJpdHlPcmlnaW4mKTsKICAgICB2aXJ0dWFs IHZvaWQgcmVxdWVzdFBlcm1pc3Npb24oY29uc3QgV2ViS2l0OjpXZWJTZWN1cml0eU9yaWdpbiYs IFdlYktpdDo6V2ViTm90aWZpY2F0aW9uUGVybWlzc2lvbkNhbGxiYWNrKik7CiAKICAgICB2b2lk IHJlc2V0KCkgeyBtX2FsbG93ZWRPcmlnaW5zLmNsZWFyKCk7IH0K