192303 2018-12-03 00:34:58 -0800 [iOS] Handle hit testing for subframes 2019-05-09 07:54:29 -0700 1 1 1 Unclassified WebKit UI Events WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=184297 https://bugs.webkit.org/show_bug.cgi?id=176451 InRadar P2 Normal --- 173833 196394 149264 182868 194900 1 fred.wang fred.wang commit-queue dbates koivisto simon.fraser victorsignup webkit-bug-importer oldest_to_newest 1484288 0 fred.wang 2018-12-03 00:34:58 -0800 Extracting the windowToContents/contentToWindow changes from bug 173833. These are necessary to properly handle hit testing. 1484294 1 356365 fred.wang 2018-12-03 00:54:48 -0800 Created attachment 356365 Patch (applies on top of bug 173833) This has been extracted from attachment 356214 1484497 2 356365 simon.fraser 2018-12-03 14:01:19 -0800 Comment on attachment 356365 Patch (applies on top of bug 173833) View in context: https://bugs.webkit.org/attachment.cgi?id=356365&action=review > Source/WebCore/page/FrameView.h:682 > + bool coordinateChangeShouldIgnoreScrollPosition() const final; Please rename this to windowToContentsShouldIgnoreScrollPosition() 1484539 3 356365 fred.wang 2018-12-03 14:52:39 -0800 Comment on attachment 356365 Patch (applies on top of bug 173833) View in context: https://bugs.webkit.org/attachment.cgi?id=356365&action=review >> Source/WebCore/page/FrameView.h:682 >> + bool coordinateChangeShouldIgnoreScrollPosition() const final; > > Please rename this to windowToContentsShouldIgnoreScrollPosition() smfr: I can but note that as I said elsewhere the function might be needed in other siutations: https://bugs.webkit.org/attachment.cgi?id=353085&action=review https://bugs.webkit.org/attachment.cgi?id=348915&action=review Anyway, this is blocked by bug 173833. 1496216 4 356365 koivisto 2019-01-19 01:59:44 -0800 Comment on attachment 356365 Patch (applies on top of bug 173833) View in context: https://bugs.webkit.org/attachment.cgi?id=356365&action=review Want to land this? > Source/WebCore/platform/ScrollView.cpp:933 > - if (delegatesScrolling()) > + if (coordinateChangeShouldIgnoreScrollPosition()) This change is needed in a bunch of other places too (IntRect, rootView versions versions of these function). 1496224 5 356365 fred.wang 2019-01-19 04:22:59 -0800 Comment on attachment 356365 Patch (applies on top of bug 173833) View in context: https://bugs.webkit.org/attachment.cgi?id=356365&action=review @Antti: Feel free to land the code changes if you want to. >> Source/WebCore/platform/ScrollView.cpp:933 >> + if (coordinateChangeShouldIgnoreScrollPosition()) > > This change is needed in a bunch of other places too (IntRect, rootView versions versions of these function). Yes, but I tried to keep this minimal and focused as Simon had concerned about changing all these functions. See also comment 3 for similar bugs (involving other functions). 1496546 6 koivisto 2019-01-21 01:29:45 -0800 Actually I think this is wrong. The delegatesScrolling bit shouldn't be set for subframes in the first place. It is meant for application controlled top level scrolling only. 1496582 7 359686 koivisto 2019-01-21 06:06:05 -0800 Created attachment 359686 patch 1496709 8 359686 commit-queue 2019-01-21 22:50:54 -0800 Comment on attachment 359686 patch Clearing flags on attachment: 359686 Committed r240249: <https://trac.webkit.org/changeset/240249> 1496710 9 commit-queue 2019-01-21 22:50:56 -0800 All reviewed patches have been landed. Closing bug. 1496711 10 webkit-bug-importer 2019-01-21 22:51:29 -0800 <rdar://problem/47438192> 1496723 11 fred.wang 2019-01-22 00:53:48 -0800 > 15:29:48 - anttik: fredw: note that the test is missing the programmatic scroll subtest, that needs an additional fix > 15:30:46 - fredw: anttik: ok. Yes I guess we need the stuff from bug 182868 for programmatic scrolling Will move the remaining test into bug 182868. 1534735 12 koivisto 2019-05-09 07:54:29 -0700 *** Bug 197613 has been marked as a duplicate of this bug. *** 356365 2018-12-03 00:54:48 -0800 2019-01-21 06:06:05 -0800 Patch (applies on top of bug 173833) 0002-Bug-192303-iOS-Handle-hit-testing-for-subframes.patch text/plain 7646 fred.wang RnJvbSA1NzVmNDgyM2ExMDJmMjQ2MzQxMzAyNGMzMmZiMWU4ZjBmNWIzNDEwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBGcmVkZXJpYyBXYW5nIDxmd2FuZ0BpZ2FsaWEuY29tPgpEYXRl OiBNb24sIDMgRGVjIDIwMTggMDk6MzE6MjAgKzAxMDAKU3ViamVjdDogW1BBVENIIHhzZXJ2ZXIg Mi8zXSBCdWcgMTkyMzAzIC0gW2lPU10gSGFuZGxlIGhpdCB0ZXN0aW5nIGZvcgogc3ViZnJhbWVz CgotLS0KIExheW91dFRlc3RzL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICB8IDEw ICsrKysrKysKIC4uLi9zY3JvbGxpbmcvaW9zL2hpdC10ZXN0aW5nLWlmcmFtZS5odG1sICAgICB8 IDE2ICsrKysrKysrKysrLQogU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nICAgICAgICAgICAgICAg ICAgICAgIHwgMjYgKysrKysrKysrKysrKysrKysrKwogU291cmNlL1dlYkNvcmUvcGFnZS9GcmFt ZVZpZXcuY3BwICAgICAgICAgICAgIHwgIDUgKysrKwogU291cmNlL1dlYkNvcmUvcGFnZS9GcmFt ZVZpZXcuaCAgICAgICAgICAgICAgIHwgIDIgKysKIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Nj cm9sbFZpZXcuY3BwICAgICAgICB8ICA0ICstLQogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Ny b2xsVmlldy5oICAgICAgICAgIHwgIDIgKysKIDcgZmlsZXMgY2hhbmdlZCwgNjIgaW5zZXJ0aW9u cygrKSwgMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cg Yi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMmFjNTliMmJkNzguLjU4YzNiNGYxMjZiIDEw MDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTgtMTItMDMgIEZyZWRlcmljIFdhbmcgIDxmd2FuZ0Bp Z2FsaWEuY29tPgorCisgICAgICAgIFtpT1NdIEhhbmRsZSBoaXQgdGVzdGluZyBmb3Igc3ViZnJh bWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTIz MDMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGZh c3Qvc2Nyb2xsaW5nL2lvcy9oaXQtdGVzdGluZy1pZnJhbWUuaHRtbDogQWRkIGEgdGVzdCB0byB2 ZXJpZnkgdGhhdCBhIGNsaWNrIGV2ZW50IGlzCisgICAgICAgIGNvbnN1bWVkIGJ5IGFuIGVsZW1l bnQgaW5zaWRlIGEgc3ViZnJhbWUsIGFmdGVyIGEgdXNlciBzY3JvbGwuCisKIDIwMTgtMTEtMjAg IEZyZWRlcmljIFdhbmcgIDxmd2FuZ0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFtpT1NdIEFkanVz dCBsYXllciBoaWVyYXJjaHkgdG8gaGFuZGxlIGZyYW1lIHNjcm9sbGluZwpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvZmFzdC9zY3JvbGxpbmcvaW9zL2hpdC10ZXN0aW5nLWlmcmFtZS5odG1sIGIv TGF5b3V0VGVzdHMvZmFzdC9zY3JvbGxpbmcvaW9zL2hpdC10ZXN0aW5nLWlmcmFtZS5odG1sCmlu ZGV4IGEyODI1ZWZlMjUxLi5hYTQ1NzAyMGQwNCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFz dC9zY3JvbGxpbmcvaW9zL2hpdC10ZXN0aW5nLWlmcmFtZS5odG1sCisrKyBiL0xheW91dFRlc3Rz L2Zhc3Qvc2Nyb2xsaW5nL2lvcy9oaXQtdGVzdGluZy1pZnJhbWUuaHRtbApAQCAtNDMsMTAgKzQz LDE3IEBACiAgICAgICAgICBwID0gZnJhbWVCb3goImNsaWNrRWxlbWVudEluc2lkZUZyYW1lQWZ0 ZXJQcm9ncmFtbWF0aWNTY3JvbGwiKTsKICAgICAgICAgIGF3YWl0IHRhcEF0UG9pbnQocC5sZWZ0 ICsgNyArIDEwLCBwLnRvcCArIDcgKyAxMCk7CiAKKyAgICAgICAgIC8vIFRoaXMgdmVyaWZpZXMg dGhhdCBhIGNsaWNrIGV2ZW50IGlzIGNvbnN1bWVkIGJ5IGFuIGVsZW1lbnQgaW5zaWRlIHRoZSBm cmFtZSwgYWZ0ZXIgYSB1c2VyIHNjcm9sbC4KKyAgICAgICAgIHAgPSBmcmFtZUJveCgiY2xpY2tF bGVtZW50SW5zaWRlRnJhbWVBZnRlclVzZXJTY3JvbGwiKTsKKyAgICAgICAgIGF3YWl0IHRvdWNo QW5kRHJhZ0Zyb21Qb2ludFRvUG9pbnQocC5sZWZ0ICsgNywgcC50b3AgKyA3LCBwLmxlZnQgKyA3 LCBwLnRvcCAtIDE1MCk7CisgICAgICAgICBhd2FpdCBsaWZ0VXBBdFBvaW50KHAubGVmdCArIDcs IHAudG9wIC0gMTUwKTsKKyAgICAgICAgIGF3YWl0IHdhaXRQcm9taXNlKDE1MDApOyAvLyBXYWl0 IGZvciBzY3JvbGxpbmcgdG8gc3RhYmlsaXplIGFuZCBmb3Igc2Nyb2xsYmFycyB0byBkaXNhcHBl YXIuCisgICAgICAgICBhd2FpdCB0YXBBdFBvaW50KHAubGVmdCArIDcgKyAxMCwgcC5ib3R0b20g LSA3KTsKKwogICAgICAgICAgdGVzdFJ1bm5lci5ub3RpZnlEb25lKCk7CiAgICAgICAgfQogCi0g ICAgICAgdmFyIGZyYW1lVG9Mb2FkQ291bnQgPSA1OworICAgICAgIHZhciBmcmFtZVRvTG9hZENv dW50ID0gNjsKICAgICAgICBmdW5jdGlvbiBuZXdGcmFtZUxvYWRlZCgpIHsKICAgICAgICAgICAg ZnJhbWVUb0xvYWRDb3VudC0tOwogICAgICAgICAgICBpZiAoZnJhbWVUb0xvYWRDb3VudCA9PSAw KQpAQCAtMTAwLDYgKzEwNywxMyBAQAogICAgICAgICAgICAgICAgICAgIG9uY2xpY2s9J3RoaXMu c3R5bGUuYmFja2dyb3VuZD0mcXVvdDtncmVlbiZxdW90Oyc+PC9kaXY+CiAgICAgICAgICAgPC9i b2R5PiIgb25sb2FkPSJuZXdGcmFtZUxvYWRlZCgpIj4KICAgICAgIDwvaWZyYW1lPgorICAgICAg PGlmcmFtZSBpZD0iY2xpY2tFbGVtZW50SW5zaWRlRnJhbWVBZnRlclVzZXJTY3JvbGwiIHN0eWxl PSJsZWZ0OiAyMDBweDsgdG9wOiAxMDBweDsiIHNjcm9sbGluZz0ieWVzIiBvbmNsaWNrPSJ0aGlz LnN0eWxlLmJhY2tncm91bmQ9J3JlZCciIHNyY2RvYz0iCisgICAgICAgICAgPGJvZHkgc3R5bGU9 J21hcmdpbjogMDsgd2lkdGg6IDIwMHB4OyBoZWlnaHQ6IDIwMHB4OyBiYWNrZ3JvdW5kOiBncmVl bjsnPgorICAgICAgICAgICAgIDxkaXYgc3R5bGU9J3Bvc2l0aW9uOiBhYnNvbHV0ZTsgd2lkdGg6 IDc1cHg7IGhlaWdodDogNzVweDsgYmFja2dyb3VuZDogcmVkOyc+PC9kaXY+CisgICAgICAgICAg ICAgIDxkaXYgc3R5bGU9J3Bvc2l0aW9uOiBhYnNvbHV0ZTsgbGVmdDogMHB4OyB0b3A6IDE1MHB4 OyB3aWR0aDogNTBweDsgaGVpZ2h0OiA1MHB4OyBiYWNrZ3JvdW5kOiByZWQ7JworICAgICAgICAg ICAgICAgICAgIG9uY2xpY2s9J3RoaXMuc3R5bGUuYmFja2dyb3VuZD0mcXVvdDtncmVlbiZxdW90 Oyc+PC9kaXY+CisgICAgICAgICAgPC9ib2R5PiIgb25sb2FkPSJuZXdGcmFtZUxvYWRlZCgpIj4K KyAgICAgIDwvaWZyYW1lPgogICAgIDwvZGl2PgogPC9ib2R5PgogPC9odG1sPgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmlu ZGV4IGMwYThkYmY0ZTIwLi5lMmMyYzhlMTUzZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBA CisyMDE4LTEyLTAzICBGcmVkZXJpYyBXYW5nICA8ZndhbmdAaWdhbGlhLmNvbT4KKworICAgICAg ICBbaU9TXSBIYW5kbGUgaGl0IHRlc3RpbmcgZm9yIHN1YmZyYW1lcworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkyMzAzCisKKyAgICAgICAgSGl0IHRl c3RpbmcgZm9yIHN1YmZyYW1lcyBvbiBpT1MgaXMgZXNzZW50aWFsbHkgaW1wbGVtZW50ZWQgaW4g YnVnIDE3MzgzMy4gVGhpcyBjb21taXQgZml4ZXMKKyAgICAgICAgYSBoaXQgdGVzdGluZyBidWcg d2hlbiB0aGUgc3ViZnJhbWUgaGFzIGJlZW4gc2Nyb2xsZWQgYnkgdXNlciBpbnRlcmFjdGlvbi4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0OiBm YXN0L3Njcm9sbGluZy9pb3MvaGl0LXRlc3RpbmctaWZyYW1lLmh0bWwKKworICAgICAgICAqIHBs YXRmb3JtL1Njcm9sbFZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsVmlldzo6d2lu ZG93VG9Db250ZW50cyBjb25zdCk6IFVzZSBjb29yZGluYXRlQ2hhbmdlU2hvdWxkSWdub3JlU2Ny b2xsUG9zaXRpb24oKQorICAgICAgICBpbnN0ZWFkIG9mIGRlbGVnYXRlc1Njcm9sbGluZygpIHNv IHRoYXQgV2ViQ29yZTo6ZG9jdW1lbnRQb2ludEZvcldpbmRvd1BvaW50IHRha2VzIGludG8gYWNj b3VudCB0aGUKKyAgICAgICAgc2Nyb2xsIHBvc2l0aW9uIG9mIHN1YmZyYW1lcyBkdXJpbmcgaGl0 IHRlc3RpbmcuCisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxWaWV3Ojpjb250ZW50c1RvV2luZG93 IGNvbnN0KTogU2FtZSBjaGFuZ2UgZm9yIGNvbnNpc3RlbmN5LgorICAgICAgICAqIHBsYXRmb3Jt L1Njcm9sbFZpZXcuaDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbFZpZXc6OmNvb3JkaW5hdGVD aGFuZ2VTaG91bGRJZ25vcmVTY3JvbGxQb3NpdGlvbiBjb25zdCk6IEZvciBTY3JvbGxWaWV3IG1h a2UKKyAgICAgICAgd2luZG93VG9Db250ZW50cyBiZWhhdmUgdGhlIHNhbWUgYXMgdGhlIG9sZCB2 ZXJzaW9uLgorICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkZyYW1lVmlldzo6Y29vcmRpbmF0ZUNoYW5nZVNob3VsZElnbm9yZVNjcm9sbFBvc2l0aW9uIGNv bnN0KTogTm93IGFsc28gdGFrZSBpbnRvCisgICAgICAgIGFjY291bnQgc2Nyb2xsIHBvc2l0aW9u IG9mIHN1YmZyYW1lcyBpbiBXZWJLaXQyLgorICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3Lmg6IE92 ZXJyaWRlIGNvb3JkaW5hdGVDaGFuZ2VTaG91bGRJZ25vcmVTY3JvbGxQb3NpdGlvbiB0byBtYWtl IGl0IG1vcmUKKyAgICAgICAgcmVzdHJpY3RpdmUuCisKIDIwMTgtMDItMTYgIEZyZWRlcmljIFdh bmcgIDxmd2FuZ0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFtpT1NdIEFkanVzdCBsYXllciBoaWVy YXJjaHkgdG8gaGFuZGxlIGZyYW1lIHNjcm9sbGluZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGFnZS9GcmFtZVZpZXcuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3Bw CmluZGV4IDc3OGI0YzU2ZWViLi5kM2E0MzJmZmY5MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGFnZS9GcmFtZVZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3 LmNwcApAQCAtMTM5Niw2ICsxMzk2LDExIEBAIHZvaWQgRnJhbWVWaWV3OjphZGp1c3RNZWRpYVR5 cGVGb3JQcmludGluZyhib29sIHByaW50aW5nKQogICAgIH0KIH0KIAorYm9vbCBGcmFtZVZpZXc6 OmNvb3JkaW5hdGVDaGFuZ2VTaG91bGRJZ25vcmVTY3JvbGxQb3NpdGlvbigpIGNvbnN0Cit7Cisg ICAgcmV0dXJuIGRlbGVnYXRlc1Njcm9sbGluZygpICYmIChwbGF0Zm9ybVdpZGdldCgpIHx8IGZy YW1lKCkuaXNNYWluRnJhbWUoKSk7Cit9CisKIGJvb2wgRnJhbWVWaWV3Ojp1c2VTbG93UmVwYWlu dHMoYm9vbCBjb25zaWRlck92ZXJsYXApIGNvbnN0CiB7CiAgICAgYm9vbCBtdXN0QmVTbG93ID0g aGFzU2xvd1JlcGFpbnRPYmplY3RzKCkgfHwgKHBsYXRmb3JtV2lkZ2V0KCkgJiYgaGFzVmlld3Bv cnRDb25zdHJhaW5lZE9iamVjdHMoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdl L0ZyYW1lVmlldy5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaAppbmRleCBlNDQ5 Nzc2NzBlNi4uN2E4MWU4MDczNmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJh bWVWaWV3LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaApAQCAtNjc5LDYg KzY3OSw4IEBAIHByaXZhdGU6CiAKICAgICBib29sIGlzRnJhbWVWaWV3KCkgY29uc3QgZmluYWwg eyByZXR1cm4gdHJ1ZTsgfQogCisgICAgYm9vbCBjb29yZGluYXRlQ2hhbmdlU2hvdWxkSWdub3Jl U2Nyb2xsUG9zaXRpb24oKSBjb25zdCBmaW5hbDsKKwogICAgIGZyaWVuZCBjbGFzcyBSZW5kZXJX aWRnZXQ7CiAgICAgYm9vbCB1c2VTbG93UmVwYWludHMoYm9vbCBjb25zaWRlck92ZXJsYXAgPSB0 cnVlKSBjb25zdDsKICAgICBib29sIHVzZVNsb3dSZXBhaW50c0lmTm90T3ZlcmxhcHBlZCgpIGNv bnN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmNwcAppbmRleCA5OGQ0ZWNhZTg4 Ny4uMzQxODY1YTE1MWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9s bFZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuY3BwCkBA IC05MjIsNyArOTIyLDcgQEAgSW50UmVjdCBTY3JvbGxWaWV3Ojpjb250ZW50c1RvUm9vdFZpZXco Y29uc3QgSW50UmVjdCYgY29udGVudHNSZWN0KSBjb25zdAogCiBJbnRQb2ludCBTY3JvbGxWaWV3 Ojp3aW5kb3dUb0NvbnRlbnRzKGNvbnN0IEludFBvaW50JiB3aW5kb3dQb2ludCkgY29uc3QKIHsK LSAgICBpZiAoZGVsZWdhdGVzU2Nyb2xsaW5nKCkpCisgICAgaWYgKGNvb3JkaW5hdGVDaGFuZ2VT aG91bGRJZ25vcmVTY3JvbGxQb3NpdGlvbigpKQogICAgICAgICByZXR1cm4gY29udmVydEZyb21D b250YWluaW5nV2luZG93KHdpbmRvd1BvaW50KTsKIAogICAgIHJldHVybiB2aWV3VG9Db250ZW50 cyhjb252ZXJ0RnJvbUNvbnRhaW5pbmdXaW5kb3cod2luZG93UG9pbnQpKTsKQEAgLTkzMCw3ICs5 MzAsNyBAQCBJbnRQb2ludCBTY3JvbGxWaWV3Ojp3aW5kb3dUb0NvbnRlbnRzKGNvbnN0IEludFBv aW50JiB3aW5kb3dQb2ludCkgY29uc3QKIAogSW50UG9pbnQgU2Nyb2xsVmlldzo6Y29udGVudHNU b1dpbmRvdyhjb25zdCBJbnRQb2ludCYgY29udGVudHNQb2ludCkgY29uc3QKIHsKLSAgICBpZiAo ZGVsZWdhdGVzU2Nyb2xsaW5nKCkpCisgICAgaWYgKGNvb3JkaW5hdGVDaGFuZ2VTaG91bGRJZ25v cmVTY3JvbGxQb3NpdGlvbigpKQogICAgICAgICByZXR1cm4gY29udmVydFRvQ29udGFpbmluZ1dp bmRvdyhjb250ZW50c1BvaW50KTsKIAogICAgIHJldHVybiBjb252ZXJ0VG9Db250YWluaW5nV2lu ZG93KGNvbnRlbnRzVG9WaWV3KGNvbnRlbnRzUG9pbnQpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Nj cm9sbFZpZXcuaAppbmRleCBhODQ1NDYyMTk3Mi4uMGQ0N2E5NTAzMTMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9TY3JvbGxWaWV3LmgKQEAgLTM4MSw2ICszODEsOCBAQCBwdWJsaWM6CiBwcm90ZWN0 ZWQ6CiAgICAgU2Nyb2xsVmlldygpOwogCisgICAgdmlydHVhbCBib29sIGNvb3JkaW5hdGVDaGFu Z2VTaG91bGRJZ25vcmVTY3JvbGxQb3NpdGlvbigpIGNvbnN0IHsgcmV0dXJuIGRlbGVnYXRlc1Nj cm9sbGluZygpOyB9CisKICAgICB2aXJ0dWFsIHZvaWQgcmVwYWludENvbnRlbnRSZWN0YW5nbGUo Y29uc3QgSW50UmVjdCYpOwogICAgIHZpcnR1YWwgdm9pZCBwYWludENvbnRlbnRzKEdyYXBoaWNz Q29udGV4dCYsIGNvbnN0IEludFJlY3QmIGRhbWFnZVJlY3QsIFNlY3VyaXR5T3JpZ2luUGFpbnRQ b2xpY3kgPSBTZWN1cml0eU9yaWdpblBhaW50UG9saWN5OjpBbnlPcmlnaW4pID0gMDsKIAotLSAK Mi4xOS4xCgo= 359686 2019-01-21 06:06:05 -0800 2019-01-21 22:50:54 -0800 patch no-subframe-delegate-3.patch text/plain 11930 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI0MDIzNCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4IEBACisyMDE5LTAxLTIxICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBIYW5kbGUgaGl0IHRl c3RpbmcgZm9yIHN1YmZyYW1lcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTkyMzAzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgRG9uJ3Qgc2V0IGRlbGVnYXRlc1Njcm9sbGluZyBiaXQgZm9yIHN1YmZyYW1l cyBvbiBpT1MuIEl0IGlzIG1lYW50IGZvciB0b3AgbGV2ZWwgYXBwbGljYXRpb24KKyAgICAgICAg Y29udHJvbGxlZCBzY3JvbGxpbmcuIFRoaXMgZml4ZXMgY29vcmRpbmF0ZSBjb252ZXJzaW9ucyBm b3Igc3ViZnJhbWVzIGFuZCBtYWtlcyBldmVudHMgd29yay4KKworICAgICAgICBUZXN0IGJ5IEZy ZWRlcmljIFdhbmcuCisKKyAgICAgICAgVGVzdDogZmFzdC9zY3JvbGxpbmcvaW9zL2hpdC10ZXN0 aW5nLWlmcmFtZS5odG1sCisKKyAgICAgICAgKiBwbGF0Zm9ybS9TY3JvbGxWaWV3LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlNjcm9sbFZpZXc6Om1hbmFnZXNTY3JvbGxiYXJzIGNvbnN0KToKKwor ICAgICAgICBBZGQgYSBmdW5jdGlvbiB0aGF0IHRlbGxzIGlmIHRoZSBzY3JvbGx2aWV3IHNob3Vs ZCBkZWFsIHdpdGggc2Nyb2xsYmFycyBhdCBhbGwKKyAgICAgICAgVGhpcyBpcyBhbHdheXMgZmFs c2Ugb24gaU9TIGFuZCBub3QgY29ubmVjdGVkIHRvIGRlbGVnYXRlc1Njcm9sbGluZyBiaXQuCisK KyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbFZpZXc6OnVwZGF0ZVNjcm9sbGJhcnMpOgorICAgICAg ICAqIHBsYXRmb3JtL1Njcm9sbFZpZXcuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5 ZXJDb21wb3NpdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRv cjo6c2hvdWxkQ29tcG9zaXRlT3ZlcmZsb3dDb250cm9scyBjb25zdCk6CisKIDIwMTktMDEtMjEg IEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgogCiAgICAgICAgIE1vdmUgZGVsZWdh dGVzU2Nyb2xsaW5nKCkgdGVzdHMgdG8gbG93ZXIgbGV2ZWwgY29udmVyc2lvbiBmdW5jdGlvbiBp biBTY3JvbGxWaWV3CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmNwcAko cmV2aXNpb24gMjQwMjMyKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTU0Miw2ICs1NDIsMTkgQEAgSW50U2l6ZSBTY3JvbGxWaWV3 OjpvdmVyaGFuZ0Ftb3VudCgpIGNvbgogICAgIHJldHVybiBzdHJldGNoOwogfQogCitib29sIFNj cm9sbFZpZXc6Om1hbmFnZXNTY3JvbGxiYXJzKCkgY29uc3QKK3sKKyNpZiBQTEFURk9STShJT1Nf RkFNSUxZKQorICAgIHJldHVybiBmYWxzZTsKKyNlbHNlCisgICAgaWYgKHBsYXRmb3JtV2lkZ2V0 KCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBpZiAoZGVsZWdhdGVzU2Nyb2xsaW5nKCkp CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICByZXR1cm4gdHJ1ZTsKKyNlbmRpZgorfQorCiB2 b2lkIFNjcm9sbFZpZXc6OnVwZGF0ZVNjcm9sbGJhcnMoY29uc3QgU2Nyb2xsUG9zaXRpb24mIGRl c2lyZWRQb3NpdGlvbikKIHsKICAgICBMT0dfV0lUSF9TVFJFQU0oU2Nyb2xsaW5nLCBzdHJlYW0g PDwgIlNjcm9sbFZpZXc6OnVwZGF0ZVNjcm9sbGJhcnMgIiA8PCBkZXNpcmVkUG9zaXRpb24pOwpA QCAtNTQ5LDcgKzU2Miw3IEBAIHZvaWQgU2Nyb2xsVmlldzo6dXBkYXRlU2Nyb2xsYmFycyhjb25z dCAKICAgICBpZiAobV9pblVwZGF0ZVNjcm9sbGJhcnMgfHwgcHJvaGliaXRzU2Nyb2xsaW5nKCkg fHwgcGxhdGZvcm1XaWRnZXQoKSkKICAgICAgICAgcmV0dXJuOwogICAgIAotICAgIGlmIChkZWxl Z2F0ZXNTY3JvbGxpbmcoKSkgeworICAgIGlmICghbWFuYWdlc1Njcm9sbGJhcnMoKSkgewogICAg ICAgICBpZiAoc2Nyb2xsT3JpZ2luQ2hhbmdlZCgpKSB7CiAgICAgICAgICAgICBTY3JvbGxhYmxl QXJlYTo6c2Nyb2xsVG9PZmZzZXRXaXRob3V0QW5pbWF0aW9uKHNjcm9sbE9mZnNldEZyb21Qb3Np dGlvbihkZXNpcmVkUG9zaXRpb24pKTsKICAgICAgICAgICAgIHJlc2V0U2Nyb2xsT3JpZ2luQ2hh bmdlZCgpOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuaAkocmV2aXNpb24g MjQwMjMyKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5oCSh3b3JraW5n IGNvcHkpCkBAIC0zNzgsNiArMzc4LDggQEAgcHVibGljOgogICAgIHZvaWQgc2V0QWxsb3dzVW5j bGFtcGVkU2Nyb2xsUG9zaXRpb25Gb3JUZXN0aW5nKGJvb2wgYWxsb3dzVW5jbGFtcGVkU2Nyb2xs UG9zaXRpb24pIHsgbV9hbGxvd3NVbmNsYW1wZWRTY3JvbGxQb3NpdGlvbiA9IGFsbG93c1VuY2xh bXBlZFNjcm9sbFBvc2l0aW9uOyB9CiAgICAgYm9vbCBhbGxvd3NVbmNsYW1wZWRTY3JvbGxQb3Np dGlvbigpIGNvbnN0IHsgcmV0dXJuIG1fYWxsb3dzVW5jbGFtcGVkU2Nyb2xsUG9zaXRpb247IH0K IAorICAgIGJvb2wgbWFuYWdlc1Njcm9sbGJhcnMoKSBjb25zdDsKKwogcHJvdGVjdGVkOgogICAg IFNjcm9sbFZpZXcoKTsKIApJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxh eWVyQ29tcG9zaXRvci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAJKHJldmlzaW9uIDI0MDIzMikKKysrIFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0zMDA3LDEwICszMDA3LDcgQEAgYm9vbCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnNob3Vs ZENvbXBvcwogewogICAgIGF1dG8mIGZyYW1lVmlldyA9IG1fcmVuZGVyVmlldy5mcmFtZVZpZXco KTsKIAotICAgIGlmIChmcmFtZVZpZXcucGxhdGZvcm1XaWRnZXQoKSkKLSAgICAgICAgcmV0dXJu IGZhbHNlOwotCi0gICAgaWYgKGZyYW1lVmlldy5kZWxlZ2F0ZXNTY3JvbGxpbmcoKSkKKyAgICBp ZiAoIWZyYW1lVmlldy5tYW5hZ2VzU2Nyb2xsYmFycygpKQogICAgICAgICByZXR1cm4gZmFsc2U7 CiAKICAgICBpZiAoZG9jdW1lbnRVc2VzVGlsZWRCYWNraW5nKCkpCkluZGV4OiBTb3VyY2UvV2Vi S2l0L0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwkocmV2 aXNpb24gMjQwMjM0KQorKysgU291cmNlL1dlYktpdC9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkK QEAgLTEsMyArMSwxNSBAQAorMjAxOS0wMS0yMSAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBs ZS5jb20+CisKKyAgICAgICAgW2lPU10gSGFuZGxlIGhpdCB0ZXN0aW5nIGZvciBzdWJmcmFtZXMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MjMwMwor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViUHJv Y2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHA6CisgICAgICAgIChX ZWJLaXQ6OldlYkZyYW1lTG9hZGVyQ2xpZW50Ojp0cmFuc2l0aW9uVG9Db21taXR0ZWRGb3JOZXdQ YWdlKToKKworICAgICAgICBPbmx5IHNldCBkZWxlZ2F0ZXNTY3JvbGxpbmcgZm9yIHRoZSBtYWlu IGZyYW1lLgorCiAyMDE5LTAxLTIwICBNaWNoYWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AaWdh bGlhLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCBmaXggLVdyZXR1cm4tdHlwZSB3YXJuaW5n CkluZGV4OiBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVM b2FkZXJDbGllbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9X ZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAJKHJldmlzaW9uIDI0MDIzMikK KysrIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRl ckNsaWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE0MzksNyArMTQzOSw4IEBAIHZvaWQgV2Vi RnJhbWVMb2FkZXJDbGllbnQ6OnRyYW5zaXRpb25Ub0MKICAgICBtX2ZyYW1lLT5jb3JlRnJhbWUo KS0+dmlldygpLT5zZXRWaWV3RXhwb3NlZFJlY3Qod2ViUGFnZS0+ZHJhd2luZ0FyZWEoKS0+dmll d0V4cG9zZWRSZWN0KCkpOwogI2VuZGlmCiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKLSAgICBt X2ZyYW1lLT5jb3JlRnJhbWUoKS0+dmlldygpLT5zZXREZWxlZ2F0ZXNTY3JvbGxpbmcodHJ1ZSk7 CisgICAgaWYgKGlzTWFpbkZyYW1lKQorICAgICAgICBtX2ZyYW1lLT5jb3JlRnJhbWUoKS0+dmll dygpLT5zZXREZWxlZ2F0ZXNTY3JvbGxpbmcodHJ1ZSk7CiAjZW5kaWYKIAogICAgIGlmICh3ZWJQ YWdlLT5zY3JvbGxQaW5uaW5nQmVoYXZpb3IoKSAhPSBEb05vdFBpbikKSW5kZXg6IExheW91dFRl c3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlz aW9uIDI0MDIzNCkKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAt MSwzICsxLDE1IEBACisyMDE5LTAxLTIxICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNv bT4KKworICAgICAgICBbaU9TXSBIYW5kbGUgaGl0IHRlc3RpbmcgZm9yIHN1YmZyYW1lcworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkyMzAzCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGVzdCBieSBGcmVk ZXJpYyBXYW5nLgorCisgICAgICAgICogZmFzdC9zY3JvbGxpbmcvaW9zL2hpdC10ZXN0aW5nLWlm cmFtZS1leHBlY3RlZC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L3Njcm9sbGluZy9pb3Mv aGl0LXRlc3RpbmctaWZyYW1lLmh0bWw6IEFkZGVkLgorCiAyMDE5LTAxLTIxICBGcmVkZXJpYyBX YW5nICA8ZndhbmdAaWdhbGlhLmNvbT4KIAogICAgICAgICBBZGQgYSBiYXNpYyB0ZXN0IGZvciBz Y3JvbGxhYmxlIGlmcmFtZSBvbiBpT1MKSW5kZXg6IExheW91dFRlc3RzL2Zhc3Qvc2Nyb2xsaW5n L2lvcy9oaXQtdGVzdGluZy1pZnJhbWUtZXhwZWN0ZWQuaHRtbAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlv dXRUZXN0cy9mYXN0L3Njcm9sbGluZy9pb3MvaGl0LXRlc3RpbmctaWZyYW1lLWV4cGVjdGVkLmh0 bWwJKG5vbmV4aXN0ZW50KQorKysgTGF5b3V0VGVzdHMvZmFzdC9zY3JvbGxpbmcvaW9zL2hpdC10 ZXN0aW5nLWlmcmFtZS1leHBlY3RlZC5odG1sCSh3b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEsMTEg QEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWwKKyAgPGhlYWQ+CisgICAgPHRpdGxlPkhpdCB0ZXN0 aW5nIG9mIGlmcmFtZTwvdGl0bGU+CisgIDwvaGVhZD4KKyAgPGJvZHk+CisgICAgPHA+VGhpcyB0 ZXN0IHBhc3NlcyBpZiB5b3Ugc2VlIGEgZ3JlZW4gcmVjdGFuZ2xlLjwvcD4KKyAgICA8ZGl2IHN0 eWxlPSJwb3NpdGlvbjogYWJzb2x1dGU7IHRvcDogM2VtOyB3aWR0aDogMzAwcHg7IGhlaWdodDog MjAwcHg7IGJhY2tncm91bmQ6IGdyZWVuOyI+CisgICAgPC9kaXY+Cis8L2JvZHk+Cis8L2h0bWw+ CkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L3Njcm9sbGluZy9pb3MvaGl0LXRlc3RpbmctaWZyYW1l Lmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9zY3JvbGxpbmcvaW9zL2hpdC10 ZXN0aW5nLWlmcmFtZS5odG1sCShub25leGlzdGVudCkKKysrIExheW91dFRlc3RzL2Zhc3Qvc2Ny b2xsaW5nL2lvcy9oaXQtdGVzdGluZy1pZnJhbWUuaHRtbAkod29ya2luZyBjb3B5KQpAQCAtMCww ICsxLDEwOCBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKyAgPGhlYWQ+CisgICAgPHRpdGxl PkhpdCB0ZXN0aW5nIG9mIGlmcmFtZTwvdGl0bGU+CisgICAgPG1ldGEgbmFtZT0idmlld3BvcnQi IGNvbnRlbnQ9IndpZHRoPWRldmljZS13aWR0aCwgaW5pdGlhbC1zY2FsZT0xIj4KKyAgICA8c2Ny aXB0IHNyYz0iLi4vLi4vLi4vcmVzb3VyY2VzL2Jhc2ljLWdlc3R1cmVzLmpzIj48L3NjcmlwdD4K KyAgICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCI+CisgICAgICAgIGlmICh3aW5kb3cu dGVzdFJ1bm5lcikKKyAgICAgICAgICAgIHRlc3RSdW5uZXIud2FpdFVudGlsRG9uZSgpOworICAg ICAgICBpZiAod2luZG93LmludGVybmFscykKKyAgICAgICAgICAgIGludGVybmFscy5zZXR0aW5n cy5zZXRBc3luY0ZyYW1lU2Nyb2xsaW5nRW5hYmxlZCh0cnVlKTsKKworICAgICAgZnVuY3Rpb24g ZnJhbWVCb3goaWQpCisgICAgICB7CisgICAgICAgICAgcmV0dXJuIGRvY3VtZW50LmdldEVsZW1l bnRCeUlkKGlkKS5nZXRCb3VuZGluZ0NsaWVudFJlY3QoKTsKKyAgICAgIH0KKworICAgICAgZnVu Y3Rpb24gd2FpdFByb21pc2UoZGVsYXkpCisgICAgICB7CisgICAgICAgICAgcmV0dXJuIG5ldyBQ cm9taXNlKChyZXNvbHZlKSA9PiB7IHNldFRpbWVvdXQocmVzb2x2ZSwgZGVsYXkpOyB9KTsKKyAg ICAgIH0KKworICAgICAgYXN5bmMgZnVuY3Rpb24gcnVuVGVzdCgpIHsKKyAgICAgICAgIGlmICgh d2luZG93LnRlc3RSdW5uZXIgfHwgIXRlc3RSdW5uZXIucnVuVUlTY3JpcHQpCisgICAgICAgICAg ICAgcmV0dXJuOworCisgICAgICAgICAvLyBUaGlzIHZlcmlmaWVzIHdoZXRoZXIgdGhlIGlmcmFt ZSBoYW5kbGVzIGNsaWNrcyBpbnNpZGUgb3Igb3VzaWRlIGl0cyBjb250ZW50IGJveC4KKyAgICAg ICAgIHZhciBwID0gZnJhbWVCb3goImNsaWNrSW5Db250ZW50Qm94Iik7CisgICAgICAgICBhd2Fp dCB0YXBBdFBvaW50KHAubGVmdCArIDcsIHAudG9wICsgNyk7CisgICAgICAgICBwID0gZnJhbWVC b3goImNsaWNrSW5QYWRkaW5nQm94T3V0T2ZDb250ZW50Qm94Iik7CisgICAgICAgICBhd2FpdCB0 YXBBdFBvaW50KHAubGVmdCArIDMsIHAudG9wICsgMyk7CisKKyAgICAgICAgIC8vIFRoaXMgdmVy aWZpZXMgdGhhdCBhIGNsaWNrIGV2ZW50IGlzIGNvbnN1bWVkIGJ5IHRoZSBlbGVtZW50IG9uIHRv cCB0aGUgZnJhbWUuCisgICAgICAgICBwID0gZnJhbWVCb3goImNsaWNrRWxlbWVudEFib3ZlRnJh bWUiKTsKKyAgICAgICAgIGF3YWl0IHRhcEF0UG9pbnQocC5sZWZ0ICsgNTAsIHAudG9wICsgNTAp OworCisgICAgICAgICAvLyBUaGlzIHZlcmlmaWVzIHRoYXQgYSBjbGljayBldmVudCBpcyBjb25z dW1lZCBieSBhbiBlbGVtZW50IGluc2lkZSB0aGUgZnJhbWUuCisgICAgICAgICBwID0gZnJhbWVC b3goImNsaWNrRWxlbWVudEluc2lkZUZyYW1lIik7CisgICAgICAgICBhd2FpdCB0YXBBdFBvaW50 KHAubGVmdCArIDcgKyAxMCwgcC50b3AgKyA3ICsgMTApOworCisgICAgICAgICAvLyBUaGlzIHZl cmlmaWVzIHRoYXQgYSBjbGljayBldmVudCBpcyBjb25zdW1lZCBieSBhbiBlbGVtZW50IGluc2lk ZSB0aGUgZnJhbWUsIGFmdGVyIGEgdXNlciBzY3JvbGwuCisgICAgICAgICBwID0gZnJhbWVCb3go ImNsaWNrRWxlbWVudEluc2lkZUZyYW1lQWZ0ZXJVc2VyU2Nyb2xsIik7CisgICAgICAgICBhd2Fp dCB0b3VjaEFuZERyYWdGcm9tUG9pbnRUb1BvaW50KHAubGVmdCArIDcsIHAudG9wICsgNywgcC5s ZWZ0ICsgNywgcC50b3AgLSAxNTApOworICAgICAgICAgYXdhaXQgbGlmdFVwQXRQb2ludChwLmxl ZnQgKyA3LCBwLnRvcCAtIDE1MCk7CisgICAgICAgICBhd2FpdCB3YWl0UHJvbWlzZSgxNTAwKTsg Ly8gV2FpdCBmb3Igc2Nyb2xsaW5nIHRvIHN0YWJpbGl6ZSBhbmQgZm9yIHNjcm9sbGJhcnMgdG8g ZGlzYXBwZWFyLgorICAgICAgICAgYXdhaXQgdGFwQXRQb2ludChwLmxlZnQgKyA3ICsgMTAsIHAu Ym90dG9tIC0gNyk7CisgICAgICAgICBhd2FpdCB3YWl0UHJvbWlzZSgxMDApOworCisgICAgICAg ICB0ZXN0UnVubmVyLm5vdGlmeURvbmUoKTsKKyAgICAgICB9CisKKyAgICAgICB2YXIgZnJhbWVU b0xvYWRDb3VudCA9IDU7CisgICAgICAgZnVuY3Rpb24gbmV3RnJhbWVMb2FkZWQoKSB7CisgICAg ICAgICAgIGZyYW1lVG9Mb2FkQ291bnQtLTsKKyAgICAgICAgICAgaWYgKGZyYW1lVG9Mb2FkQ291 bnQgPT0gMCkKKyAgICAgICAgICAgICAgIHJ1blRlc3QoKTsKKyAgICAgICB9CisgICAgPC9zY3Jp cHQ+CisgICAgPHN0eWxlPgorICAgICAgICBpZnJhbWUgeworICAgICAgICAgICAgcG9zaXRpb246 IGFic29sdXRlOworICAgICAgICAgICAgaGVpZ2h0OiA5MHB4OworICAgICAgICAgICAgd2lkdGg6 IDkwcHg7CisgICAgICAgICAgICBvdmVyZmxvdzogbm9uZTsKKyAgICAgICAgICAgIG1hcmdpbjog MDsKKyAgICAgICAgICAgIGJvcmRlcjogMDsKKyAgICAgICAgICAgIHBhZGRpbmc6IDVweDsKKyAg ICAgICAgfQorICAgIDwvc3R5bGU+CisgIDwvaGVhZD4KKyAgPGJvZHk+CisgICAgPHA+VGhpcyB0 ZXN0IHBhc3NlcyBpZiB5b3Ugc2VlIGEgZ3JlZW4gcmVjdGFuZ2xlLjwvcD4KKyAgICA8ZGl2IHN0 eWxlPSJwb3NpdGlvbjogYWJzb2x1dGU7IHRvcDogM2VtOyB3aWR0aDogMzAwcHg7IGhlaWdodDog MjAwcHg7IGJhY2tncm91bmQ6IGdyZWVuOyI+CisgICAgICA8aWZyYW1lIGlkPSJjbGlja0luQ29u dGVudEJveCIgc3R5bGU9ImxlZnQ6IDBweDsgdG9wOiAwcHg7IiBzY3JvbGxpbmc9InllcyIgb25j bGljaz0idGhpcy5zdHlsZS5iYWNrZ3JvdW5kPSdyZWQnIiBzcmNkb2M9IgorICAgICAgICAgIDxi b2R5IHN0eWxlPSdtYXJnaW46IDA7IHdpZHRoOiAyMDBweDsgaGVpZ2h0OiAyMDBweCc+CisgICAg ICAgICAgICAgIDxkaXYgc3R5bGU9J3Bvc2l0aW9uOiBhYnNvbHV0ZTsgd2lkdGg6IDEwMHB4OyBo ZWlnaHQ6IDEwMHB4OyBiYWNrZ3JvdW5kOiByZWQ7JworICAgICAgICAgICAgICAgICAgIG9uY2xp Y2s9J3RoaXMuc3R5bGUuYmFja2dyb3VuZD0mcXVvdDtncmVlbiZxdW90Oyc+PC9kaXY+CisgICAg ICAgICAgPC9ib2R5PiIgb25sb2FkPSJuZXdGcmFtZUxvYWRlZCgpIj4KKyAgICAgIDwvaWZyYW1l PgorICAgICAgPGlmcmFtZSBpZD0iY2xpY2tJblBhZGRpbmdCb3hPdXRPZkNvbnRlbnRCb3giIHN0 eWxlPSJsZWZ0OiAxMDBweDsgdG9wOiAwcHg7IGJhY2tncm91bmQ6IHJlZDsiIG9uY2xpY2s9InRo aXMuc3R5bGUuYmFja2dyb3VuZD0nZ3JlZW4nIiBzY3JvbGxpbmc9InllcyIgc3JjZG9jPSIKKyAg ICAgICAgICA8Ym9keSBzdHlsZT0nbWFyZ2luOiAwOyB3aWR0aDogMjAwcHg7IGhlaWdodDogMjAw cHgnPgorICAgICAgICAgICAgICA8ZGl2IHN0eWxlPSdwb3NpdGlvbjogYWJzb2x1dGU7IHdpZHRo OiAxMDBweDsgaGVpZ2h0OiAxMDBweDsgYmFja2dyb3VuZDogZ3JlZW47JworICAgICAgICAgICAg ICAgICAgIG9uY2xpY2s9J3RoaXMuc3R5bGUuYmFja2dyb3VuZD0mcXVvdDtyZWQmcXVvdDsnPjwv ZGl2PgorICAgICAgICAgIDwvYm9keT4iIG9ubG9hZD0ibmV3RnJhbWVMb2FkZWQoKSI+CisgICAg ICA8L2lmcmFtZT4KKyAgICAgIDxpZnJhbWUgaWQ9ImNsaWNrRWxlbWVudEFib3ZlRnJhbWUiIHN0 eWxlPSJsZWZ0OiAyMDBweDsgdG9wOiAwcHg7IiBzY3JvbGxpbmc9InllcyIgb25jbGljaz0idGhp cy5zdHlsZS5iYWNrZ3JvdW5kPSdyZWQnIiBzcmNkb2M9IgorICAgICAgICAgIDxib2R5IHN0eWxl PSdtYXJnaW46IDA7IHdpZHRoOiAyMDBweDsgaGVpZ2h0OiAyMDBweDsgYmFja2dyb3VuZDogZ3Jl ZW47Jz4KKyAgICAgICAgICAgICAgPGRpdiBzdHlsZT0ncG9zaXRpb246IGFic29sdXRlOyB3aWR0 aDogMTAwcHg7IGhlaWdodDogMTAwcHg7IGJhY2tncm91bmQ6IGdyZWVuOycKKyAgICAgICAgICAg ICAgICAgICBvbmNsaWNrPSd0aGlzLnN0eWxlLmJhY2tncm91bmQ9JnF1b3Q7cmVkJnF1b3Q7Jz48 L2Rpdj4KKyAgICAgICAgICA8L2JvZHk+IiBvbmxvYWQ9Im5ld0ZyYW1lTG9hZGVkKCkiPgorICAg ICAgPC9pZnJhbWU+CisgICAgICA8ZGl2IHN0eWxlPSJwb3NpdGlvbjogYWJzb2x1dGU7IHdpZHRo OiA1MHB4OyBoZWlnaHQ6IDUwcHg7IGxlZnQ6IDIyNXB4OyB0b3A6IDI1cHg7IGJhY2tncm91bmQ6 IHJlZCIgb25jbGljaz0idGhpcy5zdHlsZS5iYWNrZ3JvdW5kPSdncmVlbic7Ij48L2Rpdj4KKyAg ICAgIDxpZnJhbWUgaWQ9ImNsaWNrRWxlbWVudEluc2lkZUZyYW1lIiBzdHlsZT0ibGVmdDogMHB4 OyB0b3A6IDEwMHB4OyIgc2Nyb2xsaW5nPSJ5ZXMiIG9uY2xpY2s9InRoaXMuc3R5bGUuYmFja2dy b3VuZD0ncmVkJyIgc3JjZG9jPSIKKyAgICAgICAgICA8Ym9keSBzdHlsZT0nbWFyZ2luOiAwOyB3 aWR0aDogMjAwcHg7IGhlaWdodDogMjAwcHg7IGJhY2tncm91bmQ6IGdyZWVuOyc+CisgICAgICAg ICAgICAgIDxkaXYgc3R5bGU9J3Bvc2l0aW9uOiBhYnNvbHV0ZTsgbGVmdDogMTBweDsgdG9wOiAx MHB4OyB3aWR0aDogNTBweDsgaGVpZ2h0OiA1MHB4OyBiYWNrZ3JvdW5kOiByZWQ7JworICAgICAg ICAgICAgICAgICAgIG9uY2xpY2s9J3RoaXMuc3R5bGUuYmFja2dyb3VuZD0mcXVvdDtncmVlbiZx dW90Oyc+PC9kaXY+CisgICAgICAgICAgPC9ib2R5PiIgb25sb2FkPSJuZXdGcmFtZUxvYWRlZCgp Ij4KKyAgICAgIDwvaWZyYW1lPgorICAgICAgPGlmcmFtZSBpZD0iY2xpY2tFbGVtZW50SW5zaWRl RnJhbWVBZnRlclVzZXJTY3JvbGwiIHN0eWxlPSJsZWZ0OiAxMDBweDsgdG9wOiAxMDBweDsiIHNj cm9sbGluZz0ieWVzIiBvbmNsaWNrPSJ0aGlzLnN0eWxlLmJhY2tncm91bmQ9J3JlZCciIHNyY2Rv Yz0iCisgICAgICAgICAgPGJvZHkgc3R5bGU9J21hcmdpbjogMDsgd2lkdGg6IDIwMHB4OyBoZWln aHQ6IDIwMHB4OyBiYWNrZ3JvdW5kOiBncmVlbjsnPgorICAgICAgICAgICAgIDxkaXYgc3R5bGU9 J3Bvc2l0aW9uOiBhYnNvbHV0ZTsgd2lkdGg6IDc1cHg7IGhlaWdodDogNzVweDsgYmFja2dyb3Vu ZDogcmVkOyc+PC9kaXY+CisgICAgICAgICAgICAgIDxkaXYgc3R5bGU9J3Bvc2l0aW9uOiBhYnNv bHV0ZTsgbGVmdDogMHB4OyB0b3A6IDE1MHB4OyB3aWR0aDogNTBweDsgaGVpZ2h0OiA1MHB4OyBi YWNrZ3JvdW5kOiByZWQ7JworICAgICAgICAgICAgICAgICAgIG9uY2xpY2s9J3RoaXMuc3R5bGUu YmFja2dyb3VuZD0mcXVvdDtncmVlbiZxdW90Oyc+PC9kaXY+CisgICAgICAgICAgPC9ib2R5PiIg b25sb2FkPSJuZXdGcmFtZUxvYWRlZCgpIj4KKyAgICAgIDwvaWZyYW1lPgorICAgIDwvZGl2Pgor PC9ib2R5PgorPC9odG1sPgo=