175009 2017-07-31 20:59:51 -0700 REGRESSION (r217197): New Yorker website hangs for a long time on load, lots of blank tiles 2018-02-15 21:31:37 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue jmarcell mcatanzaro simon.fraser zalan oldest_to_newest 1333653 0 zalan 2017-07-31 20:59:51 -0700 rdar://problem/33505791 1333655 1 316831 zalan 2017-07-31 21:08:49 -0700 Created attachment 316831 Patch 1333913 2 316831 simon.fraser 2017-08-01 12:59:01 -0700 Comment on attachment 316831 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=316831&action=review > Source/WebCore/ChangeLog:9 > + This patch ensures that we report the desktop, non-frame-flattened frame size for media queries. "for media queries in subframes" > Source/WebCore/ChangeLog:11 > + Some websites don't expect the iframes to be expanded and their media query callbacks code > + result in never ending layouts. I think you should say a little more here about what the site was doing (MQ listener changing content, triggering resize across the MQ boundary). > Source/WebCore/page/FrameView.cpp:-1387 > - i want this one > Source/WebCore/page/FrameView.cpp:5415 > + if (isFrameFlatteningValidForThisFrame() && !m_frameFlatteningViewSizeForMediaQuery) > + m_frameFlatteningViewSizeForMediaQuery = ScrollView::layoutSize(); Maybe do this somewhere you know you are already in a flattened frame layout. > LayoutTests/ChangeLog:11 > + * fast/frames/flattening/media-query-growing-content-expected.txt: Added. > + * fast/frames/flattening/media-query-growing-content.html: Added. > + * fast/frames/flattening/resources/media-query-min-height-with-flattening.html: Added. Please also test aspect-ratio and orientation media queries. 1333929 3 316888 zalan 2017-08-01 13:35:44 -0700 Created attachment 316888 Patch 1333957 4 316888 commit-queue 2017-08-01 14:42:32 -0700 Comment on attachment 316888 Patch Clearing flags on attachment: 316888 Committed r220112: <http://trac.webkit.org/changeset/220112> 1333958 5 commit-queue 2017-08-01 14:42:34 -0700 All reviewed patches have been landed. Closing bug. 1399708 6 mcatanzaro 2018-02-15 17:46:19 -0800 Hi Jason, why has r220112 been reverted on the safari-604 and safari-605 branches, but not on trunk? Is there some regression that's somehow specific to those branches...? 1399745 7 jmarcell 2018-02-15 19:23:58 -0800 Michael, I have asked Alan to comment. 1399774 8 zalan 2018-02-15 21:31:37 -0800 (In reply to Michael Catanzaro from comment #6) > Hi Jason, why has r220112 been reverted on the safari-604 and safari-605 > branches, but not on trunk? Is there some regression that's somehow specific > to those branches...? See bug 182859, we are trying to fix it properly on trunk now. 316831 2017-07-31 21:08:49 -0700 2017-08-01 13:35:43 -0700 Patch bug-175009-20170731210849.patch text/plain 10442 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjIwMDQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTQ1NTQxMzZjNWE2MGZi NjFmNDdlYWMyNDliOWIxMWU5MmU3OTQzNS4uM2I3NjFhMzg4NWEzOTUyYTk2MzllYTliOGNkZDlk ZDZiNjNhZjQ2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE3LTA3LTMxICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTiAocjIxNzE5 Nyk6IE5ldyBZb3JrZXIgd2Vic2l0ZSBoYW5ncyBmb3IgYSBsb25nIHRpbWUgb24gbG9hZCwgbG90 cyBvZiBibGFuayB0aWxlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTc1MDA5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zMzUwNTc5MT4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHBhdGNoIGVu c3VyZXMgdGhhdCB3ZSByZXBvcnQgdGhlIGRlc2t0b3AsIG5vbi1mcmFtZS1mbGF0dGVuZWQgZnJh bWUgc2l6ZSBmb3IgbWVkaWEgcXVlcmllcy4KKyAgICAgICAgU29tZSB3ZWJzaXRlcyBkb24ndCBl eHBlY3QgdGhlIGlmcmFtZXMgdG8gYmUgZXhwYW5kZWQgYW5kIHRoZWlyIG1lZGlhIHF1ZXJ5IGNh bGxiYWNrcyBjb2RlCisgICAgICAgIHJlc3VsdCBpbiBuZXZlciBlbmRpbmcgbGF5b3V0cy4gCisK KyAgICAgICAgVGVzdDogZmFzdC9mcmFtZXMvZmxhdHRlbmluZy9tZWRpYS1xdWVyeS1ncm93aW5n LWNvbnRlbnQuaHRtbAorCisgICAgICAgICogY3NzL01lZGlhUXVlcnlFdmFsdWF0b3IuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6b3JpZW50YXRpb25FdmFsdWF0ZSk6CisgICAgICAgIChXZWJDb3Jl Ojphc3BlY3RSYXRpb0V2YWx1YXRlKToKKyAgICAgICAgKFdlYkNvcmU6OmhlaWdodEV2YWx1YXRl KToKKyAgICAgICAgKFdlYkNvcmU6OndpZHRoRXZhbHVhdGUpOgorICAgICAgICAqIHBhZ2UvRnJh bWVWaWV3LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6bGF5b3V0KToKKyAgICAg ICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6bGF5b3V0U2l6ZUZvck1lZGlhUXVlcnkgY29uc3QpOgor ICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3OjpldmFsdWF0ZU1lZGlhUXVlcnlMaXN0KToKKyAg ICAgICAgKiBwYWdlL0ZyYW1lVmlldy5oOgorCiAyMDE3LTA3LTI4ICBTYW0gV2VpbmlnICA8c2Ft QHdlYmtpdC5vcmc+CiAKICAgICAgICAgW1dlYklETF0gUmVtb3ZlIEpTIGJ1aWx0aW4gYmluZGlu Z3MgZm9yIEZldGNoSGVhZGVycwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL01lZGlh UXVlcnlFdmFsdWF0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL01lZGlhUXVlcnlFdmFsdWF0 b3IuY3BwCmluZGV4IDg3M2RiOWQ3YjM1NTZlZDBhNzZlZDIzN2M4ZTIwMGQ5OTFmNDA2NTIuLjBh OTRmNTU1YTAzZGUyMjAyMDllNjI0NzYzNDNiYjQyNTYwNmM0MTggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2Nzcy9NZWRpYVF1ZXJ5RXZhbHVhdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9jc3MvTWVkaWFRdWVyeUV2YWx1YXRvci5jcHAKQEAgLTMwNCwxNiArMzA0LDE0IEBAIHN0YXRp YyBib29sIG9yaWVudGF0aW9uRXZhbHVhdGUoQ1NTVmFsdWUqIHZhbHVlLCBjb25zdCBDU1NUb0xl bmd0aENvbnZlcnNpb25EYXRhCiAgICAgaWYgKCF2aWV3KQogICAgICAgICByZXR1cm4gZmFsc2U7 CiAKLSAgICBhdXRvIHdpZHRoID0gdmlldy0+bGF5b3V0V2lkdGgoKTsKLSAgICBhdXRvIGhlaWdo dCA9IHZpZXctPmxheW91dEhlaWdodCgpOwotCisgICAgYXV0byB2aWV3U2l6ZSA9IHZpZXctPmxh eW91dFNpemVGb3JNZWRpYVF1ZXJ5KCk7CiAgICAgaWYgKCFpczxDU1NQcmltaXRpdmVWYWx1ZT4o dmFsdWUpKSB7CiAgICAgICAgIC8vIEV4cHJlc3Npb24gKG9yaWVudGF0aW9uKSBldmFsdWF0ZXMg dG8gdHJ1ZSBpZiB3aWR0aCBhbmQgaGVpZ2h0ID49IDAuCi0gICAgICAgIHJldHVybiBoZWlnaHQg Pj0gMCAmJiB3aWR0aCA+PSAwOworICAgICAgICByZXR1cm4gdmlld1NpemUuaGVpZ2h0KCkgPj0g MCAmJiB2aWV3U2l6ZS53aWR0aCgpID49IDA7CiAgICAgfQogCiAgICAgYXV0byBrZXl3b3JkID0g ZG93bmNhc3Q8Q1NTUHJpbWl0aXZlVmFsdWU+KCp2YWx1ZSkudmFsdWVJRCgpOwotICAgIGlmICh3 aWR0aCA+IGhlaWdodCkgLy8gU3F1YXJlIHZpZXdwb3J0IGlzIHBvcnRyYWl0LgorICAgIGlmICh2 aWV3U2l6ZS53aWR0aCgpID4gdmlld1NpemUuaGVpZ2h0KCkpIC8vIFNxdWFyZSB2aWV3cG9ydCBp cyBwb3J0cmFpdC4KICAgICAgICAgcmV0dXJuIGtleXdvcmQgPT0gQ1NTVmFsdWVMYW5kc2NhcGU7 CiAgICAgcmV0dXJuIGtleXdvcmQgPT0gQ1NTVmFsdWVQb3J0cmFpdDsKIH0KQEAgLTMyNCwxMiAr MzIyLDExIEBAIHN0YXRpYyBib29sIGFzcGVjdFJhdGlvRXZhbHVhdGUoQ1NTVmFsdWUqIHZhbHVl LCBjb25zdCBDU1NUb0xlbmd0aENvbnZlcnNpb25EYXRhCiAgICAgLy8gYXNzdW1lIGlmIHdlIGhh dmUgYSBkZXZpY2UsIGl0cyBhc3BlY3QgcmF0aW8gaXMgbm9uLXplcm8KICAgICBpZiAoIXZhbHVl KQogICAgICAgICByZXR1cm4gdHJ1ZTsKLQogICAgIEZyYW1lVmlldyogdmlldyA9IGZyYW1lLnZp ZXcoKTsKICAgICBpZiAoIXZpZXcpCiAgICAgICAgIHJldHVybiB0cnVlOwotCi0gICAgcmV0dXJu IGNvbXBhcmVBc3BlY3RSYXRpb1ZhbHVlKHZhbHVlLCB2aWV3LT5sYXlvdXRXaWR0aCgpLCB2aWV3 LT5sYXlvdXRIZWlnaHQoKSwgb3ApOworICAgIGF1dG8gdmlld1NpemUgPSB2aWV3LT5sYXlvdXRT aXplRm9yTWVkaWFRdWVyeSgpOworICAgIHJldHVybiBjb21wYXJlQXNwZWN0UmF0aW9WYWx1ZSh2 YWx1ZSwgdmlld1NpemUud2lkdGgoKSwgdmlld1NpemUuaGVpZ2h0KCksIG9wKTsKIH0KIAogc3Rh dGljIGJvb2wgZGV2aWNlQXNwZWN0UmF0aW9FdmFsdWF0ZShDU1NWYWx1ZSogdmFsdWUsIGNvbnN0 IENTU1RvTGVuZ3RoQ29udmVyc2lvbkRhdGEmLCBGcmFtZSYgZnJhbWUsIE1lZGlhRmVhdHVyZVBy ZWZpeCBvcCkKQEAgLTQ0NSw3ICs0NDIsNyBAQCBzdGF0aWMgYm9vbCBoZWlnaHRFdmFsdWF0ZShD U1NWYWx1ZSogdmFsdWUsIGNvbnN0IENTU1RvTGVuZ3RoQ29udmVyc2lvbkRhdGEmIGNvbgogICAg IEZyYW1lVmlldyogdmlldyA9IGZyYW1lLnZpZXcoKTsKICAgICBpZiAoIXZpZXcpCiAgICAgICAg IHJldHVybiBmYWxzZTsKLSAgICBpbnQgaGVpZ2h0ID0gdmlldy0+bGF5b3V0SGVpZ2h0KCk7Cisg ICAgaW50IGhlaWdodCA9IHZpZXctPmxheW91dFNpemVGb3JNZWRpYVF1ZXJ5KCkuaGVpZ2h0KCk7 CiAgICAgaWYgKCF2YWx1ZSkKICAgICAgICAgcmV0dXJuIGhlaWdodDsKICAgICBpZiAoYXV0byog cmVuZGVyVmlldyA9IGZyYW1lLmRvY3VtZW50KCktPnJlbmRlclZpZXcoKSkKQEAgLTQ1OSw3ICs0 NTYsNyBAQCBzdGF0aWMgYm9vbCB3aWR0aEV2YWx1YXRlKENTU1ZhbHVlKiB2YWx1ZSwgY29uc3Qg Q1NTVG9MZW5ndGhDb252ZXJzaW9uRGF0YSYgY29udgogICAgIEZyYW1lVmlldyogdmlldyA9IGZy YW1lLnZpZXcoKTsKICAgICBpZiAoIXZpZXcpCiAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICBp bnQgd2lkdGggPSB2aWV3LT5sYXlvdXRXaWR0aCgpOworICAgIGludCB3aWR0aCA9IHZpZXctPmxh eW91dFNpemVGb3JNZWRpYVF1ZXJ5KCkud2lkdGgoKTsKICAgICBpZiAoIXZhbHVlKQogICAgICAg ICByZXR1cm4gd2lkdGg7CiAgICAgaWYgKGF1dG8qIHJlbmRlclZpZXcgPSBmcmFtZS5kb2N1bWVu dCgpLT5yZW5kZXJWaWV3KCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1l Vmlldy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKaW5kZXggN2I1ZGM2 Y2RlNDQwZDgzNTc1ODYzYTE1NTQ3ZjA0ZjAzMGNlZTE2Ni4uZGE2MWUzZjU0YmJkY2VmOGNhOTU1 MzIwZDQzMThhNjcwYWUwODk2ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFt ZVZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcApAQCAtMTM3 MCwxMyArMTM3MCwxMCBAQCB2b2lkIEZyYW1lVmlldzo6bGF5b3V0KGJvb2wgYWxsb3dTdWJ0cmVl KQogICAgICAgICAgICAgLy8gRklYTUU6IFRoaXMgaW5zdHJ1bWVudGF0aW9uIGV2ZW50IGlzIG5v dCBzdHJpY3RseSBhY2N1cmF0ZSBzaW5jZSBjYWNoZWQgbWVkaWEgcXVlcnkgcmVzdWx0cyBkbyBu b3QgcGVyc2lzdCBhY3Jvc3MgU3R5bGVSZXNvbHZlciByZWJ1aWxkcy4KICAgICAgICAgICAgIElu c3BlY3Rvckluc3RydW1lbnRhdGlvbjo6bWVkaWFRdWVyeVJlc3VsdENoYW5nZWQoZG9jdW1lbnQp OwogICAgICAgICB9Ci0gICAgICAgIAotICAgICAgICBkb2N1bWVudC5ldmFsdWF0ZU1lZGlhUXVl cnlMaXN0KCk7Ci0KKyAgICAgICAgZXZhbHVhdGVNZWRpYVF1ZXJ5TGlzdCgpOwogICAgICAgICAv LyBJZiB0aGVyZSBpcyBhbnkgcGFnaW5hdGlvbiB0byBhcHBseSwgaXQgd2lsbCBhZmZlY3QgdGhl IFJlbmRlclZpZXcncyBzdHlsZSwgc28gd2Ugc2hvdWxkCiAgICAgICAgIC8vIHRha2UgY2FyZSBv ZiB0aGF0IG5vdy4KICAgICAgICAgYXBwbHlQYWdpbmF0aW9uVG9WaWV3cG9ydCgpOwotCiAgICAg ICAgIC8vIEFsd2F5cyBlbnN1cmUgb3VyIHN0eWxlIGluZm8gaXMgdXAtdG8tZGF0ZS4gVGhpcyBj YW4gaGFwcGVuIGluIHNpdHVhdGlvbnMgd2hlcmUKICAgICAgICAgLy8gdGhlIGxheW91dCBiZWF0 cyBhbnkgc29ydCBvZiBzdHlsZSByZWNhbGMgdXBkYXRlIHRoYXQgbmVlZHMgdG8gb2NjdXIuCiAg ICAgICAgIGRvY3VtZW50LnVwZGF0ZVN0eWxlSWZOZWVkZWQoKTsKQEAgLTEzODQsNyArMTM4MSw2 IEBAIHZvaWQgRnJhbWVWaWV3OjpsYXlvdXQoYm9vbCBhbGxvd1N1YnRyZWUpCiAgICAgICAgIC8v IHNvIHRoZXJlJ3Mgbm8gcG9pbnQgdG8gY29udGludWluZyB0byBsYXlvdXQKICAgICAgICAgaWYg KGhhc09uZVJlZigpKQogICAgICAgICAgICAgcmV0dXJuOwotCiAgICAgICAgIC8vIENsb3NlIGJs b2NrIGhlcmUgc28gd2UgY2FuIHNldCB1cCB0aGUgZm9udCBjYWNoZSBwdXJnZSBwcmV2ZW50ZXIs IHdoaWNoIHdlIHdpbGwgc3RpbGwKICAgICAgICAgLy8gd2FudCBpbiBzY29wZSBldmVuIGFmdGVy IHdlIHdhbnQgbV9sYXlvdXRTY2hlZHVsaW5nRW5hYmxlZCB0byBiZSByZXN0b3JlZCBhZ2Fpbi4K ICAgICAgICAgLy8gVGhlIG5leHQgYmxvY2sgc2V0cyBtX2xheW91dFNjaGVkdWxpbmdFbmFibGVk IGJhY2sgdG8gZmFsc2Ugb25jZSBhZ2Fpbi4KQEAgLTU0MDcsNSArNTQwMywxOCBAQCBib29sIEZy YW1lVmlldzo6c2hvdWxkUGxhY2VCbG9ja0RpcmVjdGlvblNjcm9sbGJhck9uTGVmdCgpIGNvbnN0 CiB7CiAgICAgcmV0dXJuIHJlbmRlclZpZXcoKSAmJiByZW5kZXJWaWV3KCktPnNob3VsZFBsYWNl QmxvY2tEaXJlY3Rpb25TY3JvbGxiYXJPbkxlZnQoKTsKIH0KLSAgICAKKworSW50U2l6ZSBGcmFt ZVZpZXc6OmxheW91dFNpemVGb3JNZWRpYVF1ZXJ5KCkgY29uc3QKK3sKKyAgICByZXR1cm4gbV9m cmFtZUZsYXR0ZW5pbmdWaWV3U2l6ZUZvck1lZGlhUXVlcnkudmFsdWVfb3IoU2Nyb2xsVmlldzo6 bGF5b3V0U2l6ZSgpKTsKK30KKwordm9pZCBGcmFtZVZpZXc6OmV2YWx1YXRlTWVkaWFRdWVyeUxp c3QoKQoreworICAgIGlmIChpc0ZyYW1lRmxhdHRlbmluZ1ZhbGlkRm9yVGhpc0ZyYW1lKCkgJiYg IW1fZnJhbWVGbGF0dGVuaW5nVmlld1NpemVGb3JNZWRpYVF1ZXJ5KQorICAgICAgICBtX2ZyYW1l RmxhdHRlbmluZ1ZpZXdTaXplRm9yTWVkaWFRdWVyeSA9IFNjcm9sbFZpZXc6OmxheW91dFNpemUo KTsKKyAgICBBU1NFUlQoZnJhbWUoKS5kb2N1bWVudCgpKTsKKyAgICBmcmFtZSgpLmRvY3VtZW50 KCktPmV2YWx1YXRlTWVkaWFRdWVyeUxpc3QoKTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29y ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaCBiL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgKaW5kZXggMTlmMDJmNmQ2YWNmODU2MGUyMTU0M2U1OTky MWJmMzNjZDRlYWI0OS4uZjBiMDBiMDdmZDczMmYyOTg4Y2Y3YWJjYWQ3ZmExNWI3YzIyMWQ4MyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oCkBAIC0yMTYsNyArMjE2LDggQEAgcHVibGljOgogICAg IGJvb2wgc2hvdWxkVXBkYXRlKCkgY29uc3Q7CiAKICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIGFk anVzdFZpZXdTaXplKCk7Ci0gICAgCisgICAgSW50U2l6ZSBsYXlvdXRTaXplRm9yTWVkaWFRdWVy eSgpIGNvbnN0OworCiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBzZXRWaWV3cG9ydFNpemVGb3JD U1NWaWV3cG9ydFVuaXRzKEludFNpemUpOwogICAgIEludFNpemUgdmlld3BvcnRTaXplRm9yQ1NT Vmlld3BvcnRVbml0cygpIGNvbnN0OwogICAgIApAQCAtNzc3LDYgKzc3OCw4IEBAIHByaXZhdGU6 CiAKICAgICBSZW5kZXJFbGVtZW50KiB2aWV3cG9ydFJlbmRlcmVyKCkgY29uc3Q7CiAKKyAgICB2 b2lkIGV2YWx1YXRlTWVkaWFRdWVyeUxpc3QoKTsKKwogICAgIEhhc2hTZXQ8V2lkZ2V0Kj4gbV93 aWRnZXRzSW5SZW5kZXJUcmVlOwogCiAgICAgc3RhdGljIGRvdWJsZSBzQ3VycmVudFBhaW50VGlt ZVN0YW1wOyAvLyB1c2VkIGZvciBkZXRlY3RpbmcgZGVjb2RlZCByZXNvdXJjZSB0aHJhc2ggaW4g dGhlIGNhY2hlCkBAIC04OTAsNiArODkzLDggQEAgcHJpdmF0ZToKICAgICBpbnQgbV9hdXRvU2l6 ZUZpeGVkTWluaW11bUhlaWdodDsKICAgICAvLyBUaGUgaW50cmluc2ljIGNvbnRlbnQgc2l6ZSBk ZWNpZGVkIGJ5IGF1dG9zaXppbmcuCiAgICAgSW50U2l6ZSBtX2F1dG9TaXplQ29udGVudFNpemU7 CisgICAgLy8gUmVwb3J0IHRoZSBmaXJzdCBjb21wdXRlZCBmcmFtZSB2aWV3IHNpemUgdG8gbWVk aWEgcXVlcmllcy4KKyAgICBzdGQ6Om9wdGlvbmFsPEludFNpemU+IG1fZnJhbWVGbGF0dGVuaW5n Vmlld1NpemVGb3JNZWRpYVF1ZXJ5OwogCiAgICAgc3RkOjp1bmlxdWVfcHRyPFNjcm9sbGFibGVB cmVhU2V0PiBtX3Njcm9sbGFibGVBcmVhczsKICAgICBzdGQ6OnVuaXF1ZV9wdHI8Vmlld3BvcnRD b25zdHJhaW5lZE9iamVjdFNldD4gbV92aWV3cG9ydENvbnN0cmFpbmVkT2JqZWN0czsKZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRl eCA3ZTYxZTk1YWVhZTIzZDFlZjA1YmJjYzM2OWFhMTIzNDQ3MzNjZWM4Li5lMTk1MTZkZjIzYjky ZGZhYzkyMDJhNTVhNjE3MGVhZGYwMGI0NjQwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTct MDctMzEgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNT SU9OIChyMjE3MTk3KTogTmV3IFlvcmtlciB3ZWJzaXRlIGhhbmdzIGZvciBhIGxvbmcgdGltZSBv biBsb2FkLCBsb3RzIG9mIGJsYW5rIHRpbGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNzUwMDkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzMzNTA1 NzkxPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog ZmFzdC9mcmFtZXMvZmxhdHRlbmluZy9tZWRpYS1xdWVyeS1ncm93aW5nLWNvbnRlbnQtZXhwZWN0 ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2ZyYW1lcy9mbGF0dGVuaW5nL21lZGlhLXF1 ZXJ5LWdyb3dpbmctY29udGVudC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2ZyYW1lcy9m bGF0dGVuaW5nL3Jlc291cmNlcy9tZWRpYS1xdWVyeS1taW4taGVpZ2h0LXdpdGgtZmxhdHRlbmlu Zy5odG1sOiBBZGRlZC4KKwogMjAxNy0wNy0yOCAgU2FtIFdlaW5pZyAgPHNhbUB3ZWJraXQub3Jn PgogCiAgICAgICAgIFtXZWJJRExdIFJlbW92ZSBKUyBidWlsdGluIGJpbmRpbmdzIGZvciBGZXRj aEhlYWRlcnMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvZnJhbWVzL2ZsYXR0ZW5pbmcv bWVkaWEtcXVlcnktZ3Jvd2luZy1jb250ZW50LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zh c3QvZnJhbWVzL2ZsYXR0ZW5pbmcvbWVkaWEtcXVlcnktZ3Jvd2luZy1jb250ZW50LWV4cGVjdGVk LnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwLi4xMzk1OTdmOWNiMDdjNWQ0OGJlZDE4OTg0ZWM0NzQ3ZjRiNGYzNDM4 Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9mcmFtZXMvZmxhdHRlbmluZy9t ZWRpYS1xdWVyeS1ncm93aW5nLWNvbnRlbnQtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMiBAQAor CisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvZnJhbWVzL2ZsYXR0ZW5pbmcvbWVkaWEt cXVlcnktZ3Jvd2luZy1jb250ZW50Lmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2ZyYW1lcy9mbGF0 dGVuaW5nL21lZGlhLXF1ZXJ5LWdyb3dpbmctY29udGVudC5odG1sCm5ldyBmaWxlIG1vZGUgMTAw NjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjI2YjRl NGZmNDNiNjExZWZjOWM1N2NiYmZmNmEwZWM2OGVjZTRlNWQKLS0tIC9kZXYvbnVsbAorKysgYi9M YXlvdXRUZXN0cy9mYXN0L2ZyYW1lcy9mbGF0dGVuaW5nL21lZGlhLXF1ZXJ5LWdyb3dpbmctY29u dGVudC5odG1sCkBAIC0wLDAgKzEsMjUgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVh ZD4KKzx0aXRsZT5UaGlzIHRlc3RzIHRoYXQgbWVkaWEgcXVlcnkgY2FuJ3QgZ2V0IGludG8gYW4g ZXZlci1ncm93aW5nIGN5Y2xlLjwvdGl0bGU+Cis8c2NyaXB0PgoraWYgKHdpbmRvdy50ZXN0UnVu bmVyKQorICAgIHRlc3RSdW5uZXIuZHVtcEFzVGV4dCgpOworaWYgKHdpbmRvdy5pbnRlcm5hbHMp CisgICAgaW50ZXJuYWxzLnNldHRpbmdzLnNldEZyYW1lRmxhdHRlbmluZygiRnVsbHlFbmFibGVk Iik7CisKK2Z1bmN0aW9uIHJ1blRlc3QoKSB7CisgICAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKSB7 CisgICAgICAgIHRlc3RSdW5uZXIud2FpdFVudGlsRG9uZSgpOworICAgICAgICBzZXRUaW1lb3V0 KGZ1bmN0aW9uKCkgeworICAgICAgICAgICAgdGVzdFJ1bm5lci5ub3RpZnlEb25lKCk7CisgICAg ICAgIH0sIDUwKTsKKyAgICB9Cit9Cis8L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5PgorPGlmcmFt ZSBvbmxvYWQ9InJ1blRlc3QoKSIgc3JjPSIuL3Jlc291cmNlcy9tZWRpYS1xdWVyeS1taW4taGVp Z2h0LXdpdGgtZmxhdHRlbmluZy5odG1sIj48L2lmcmFtZT4KKzxkaXYgaWQ9dGVzdFJlc3VsdD48 L2Rpdj4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvZnJh bWVzL2ZsYXR0ZW5pbmcvcmVzb3VyY2VzL21lZGlhLXF1ZXJ5LW1pbi1oZWlnaHQtd2l0aC1mbGF0 dGVuaW5nLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2ZyYW1lcy9mbGF0dGVuaW5nL3Jlc291cmNl cy9tZWRpYS1xdWVyeS1taW4taGVpZ2h0LXdpdGgtZmxhdHRlbmluZy5odG1sCm5ldyBmaWxlIG1v ZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAu LjQ0NzU1Y2M1ODA0ZGYyMDg3NjgzZDA2NjEyN2U3Mjg0MzZlNjI4MDMKLS0tIC9kZXYvbnVsbAor KysgYi9MYXlvdXRUZXN0cy9mYXN0L2ZyYW1lcy9mbGF0dGVuaW5nL3Jlc291cmNlcy9tZWRpYS1x dWVyeS1taW4taGVpZ2h0LXdpdGgtZmxhdHRlbmluZy5odG1sCkBAIC0wLDAgKzEsMTcgQEAKKzxz dHlsZT4KKyAgICBkaXYgeworICAgICAgICB3aWR0aDogMjAwcHg7CisgICAgICAgIGhlaWdodDog NjAwcHg7CisgICAgfQorPC9zdHlsZT4KKzxkaXYgaWQ9Z3Jvd2luZ0Rpdj48L2Rpdj4KKzxzY3Jp cHQ+Cit2YXIgY291bnRlciA9IDA7Cit3aW5kb3cubWF0Y2hNZWRpYSgnKG1pbi1oZWlnaHQ6IDIw MHB4KScpLmFkZExpc3RlbmVyKGZ1bmN0aW9uKGNoYW5nZWQpIHsKKyAgICArK2NvdW50ZXI7Cisg ICAgc2V0VGltZW91dChmdW5jdGlvbigpIHsKKyAgICAgICAgZ3Jvd2luZ0Rpdi5pbm5lclRleHQg PSBncm93aW5nRGl2LmlubmVyVGV4dCArICcgbWVkaWEgcXVlcnkgY2FsbGJhY2sgJzsKKyAgICAg ICAgcGFyZW50LmRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJ0ZXN0UmVzdWx0IikuaW5uZXJUZXh0 ID0gY291bnRlcjsKKyAgICB9LCAwKTsKK30pOworPC9zY3JpcHQ+ClwgTm8gbmV3bGluZSBhdCBl bmQgb2YgZmlsZQo= 316888 2017-08-01 13:35:44 -0700 2017-08-01 14:42:32 -0700 Patch bug-175009-20170801133543.patch text/plain 10626 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjIwMDQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTQ1NTQxMzZjNWE2MGZi NjFmNDdlYWMyNDliOWIxMWU5MmU3OTQzNS4uODAzNjAyMzliMTk5OGQ1MTc0MjE5MDI0YmU3YzQx MmJkZGQ1ZmZjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE3LTA3LTMxICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTiAocjIxNzE5 Nyk6IE5ldyBZb3JrZXIgd2Vic2l0ZSBoYW5ncyBmb3IgYSBsb25nIHRpbWUgb24gbG9hZCwgbG90 cyBvZiBibGFuayB0aWxlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTc1MDA5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zMzUwNTc5MT4KKworICAg ICAgICBSZXZpZXdlZCBieSBTaW1vbiBGcmFzZXIuCisKKyAgICAgICAgVGhpcyBwYXRjaCBlbnN1 cmVzIHRoYXQgd2UgcmVwb3J0IHRoZSBkZXNrdG9wLCBub24tZnJhbWUtZmxhdHRlbmVkIGZyYW1l IHNpemUgZm9yIG1lZGlhIHF1ZXJpZXMgaW4gc3ViZnJhbWVzLgorICAgICAgICBTb21lIHdlYnNp dGVzIGRvbid0IGV4cGVjdCB0aGUgaWZyYW1lcyB0byBiZSBleHBhbmRlZCB0byB0aGUgc2l6ZSBv ZiB0aGUgY29udGVudCBhbmQgd2hlbiB0aGUgbWVkaWEgcXVlcnkKKyAgICAgICAgY2FsbGJhY2sg bXV0YXRlcyB0aGUgY29udGVudCAodHJpZ2dlcmluZyBmcmFtZSByZXNpemUpLCB0aGV5IG1pZ2h0 IGVuZCB1cCBnZXR0aW5nIGludG8gYSBuZXZlciBlbmRpbmcgbGF5b3V0LgorCisgICAgICAgIFRl c3Q6IGZhc3QvZnJhbWVzL2ZsYXR0ZW5pbmcvbWVkaWEtcXVlcnktZ3Jvd2luZy1jb250ZW50Lmh0 bWwKKworICAgICAgICAqIGNzcy9NZWRpYVF1ZXJ5RXZhbHVhdG9yLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6Om9yaWVudGF0aW9uRXZhbHVhdGUpOgorICAgICAgICAoV2ViQ29yZTo6YXNwZWN0UmF0 aW9FdmFsdWF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpoZWlnaHRFdmFsdWF0ZSk6CisgICAgICAg IChXZWJDb3JlOjp3aWR0aEV2YWx1YXRlKToKKyAgICAgICAgKiBwYWdlL0ZyYW1lVmlldy5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OmxheW91dCk6CisgICAgICAgIChXZWJDb3Jl OjpGcmFtZVZpZXc6OmxheW91dFNpemVGb3JNZWRpYVF1ZXJ5IGNvbnN0KToKKyAgICAgICAgKFdl YkNvcmU6OkZyYW1lVmlldzo6ZXZhbHVhdGVNZWRpYVF1ZXJ5TGlzdCk6CisgICAgICAgICogcGFn ZS9GcmFtZVZpZXcuaDoKKwogMjAxNy0wNy0yOCAgU2FtIFdlaW5pZyAgPHNhbUB3ZWJraXQub3Jn PgogCiAgICAgICAgIFtXZWJJRExdIFJlbW92ZSBKUyBidWlsdGluIGJpbmRpbmdzIGZvciBGZXRj aEhlYWRlcnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9NZWRpYVF1ZXJ5RXZhbHVh dG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9NZWRpYVF1ZXJ5RXZhbHVhdG9yLmNwcAppbmRl eCA4NzNkYjlkN2IzNTU2ZWQwYTc2ZWQyMzdjOGUyMDBkOTkxZjQwNjUyLi4wYTk0ZjU1NWEwM2Rl MjIwMjA5ZTYyNDc2MzQzYmI0MjU2MDZjNDE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9j c3MvTWVkaWFRdWVyeUV2YWx1YXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL01lZGlh UXVlcnlFdmFsdWF0b3IuY3BwCkBAIC0zMDQsMTYgKzMwNCwxNCBAQCBzdGF0aWMgYm9vbCBvcmll bnRhdGlvbkV2YWx1YXRlKENTU1ZhbHVlKiB2YWx1ZSwgY29uc3QgQ1NTVG9MZW5ndGhDb252ZXJz aW9uRGF0YQogICAgIGlmICghdmlldykKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgYXV0 byB3aWR0aCA9IHZpZXctPmxheW91dFdpZHRoKCk7Ci0gICAgYXV0byBoZWlnaHQgPSB2aWV3LT5s YXlvdXRIZWlnaHQoKTsKLQorICAgIGF1dG8gdmlld1NpemUgPSB2aWV3LT5sYXlvdXRTaXplRm9y TWVkaWFRdWVyeSgpOwogICAgIGlmICghaXM8Q1NTUHJpbWl0aXZlVmFsdWU+KHZhbHVlKSkgewog ICAgICAgICAvLyBFeHByZXNzaW9uIChvcmllbnRhdGlvbikgZXZhbHVhdGVzIHRvIHRydWUgaWYg d2lkdGggYW5kIGhlaWdodCA+PSAwLgotICAgICAgICByZXR1cm4gaGVpZ2h0ID49IDAgJiYgd2lk dGggPj0gMDsKKyAgICAgICAgcmV0dXJuIHZpZXdTaXplLmhlaWdodCgpID49IDAgJiYgdmlld1Np emUud2lkdGgoKSA+PSAwOwogICAgIH0KIAogICAgIGF1dG8ga2V5d29yZCA9IGRvd25jYXN0PENT U1ByaW1pdGl2ZVZhbHVlPigqdmFsdWUpLnZhbHVlSUQoKTsKLSAgICBpZiAod2lkdGggPiBoZWln aHQpIC8vIFNxdWFyZSB2aWV3cG9ydCBpcyBwb3J0cmFpdC4KKyAgICBpZiAodmlld1NpemUud2lk dGgoKSA+IHZpZXdTaXplLmhlaWdodCgpKSAvLyBTcXVhcmUgdmlld3BvcnQgaXMgcG9ydHJhaXQu CiAgICAgICAgIHJldHVybiBrZXl3b3JkID09IENTU1ZhbHVlTGFuZHNjYXBlOwogICAgIHJldHVy biBrZXl3b3JkID09IENTU1ZhbHVlUG9ydHJhaXQ7CiB9CkBAIC0zMjQsMTIgKzMyMiwxMSBAQCBz dGF0aWMgYm9vbCBhc3BlY3RSYXRpb0V2YWx1YXRlKENTU1ZhbHVlKiB2YWx1ZSwgY29uc3QgQ1NT VG9MZW5ndGhDb252ZXJzaW9uRGF0YQogICAgIC8vIGFzc3VtZSBpZiB3ZSBoYXZlIGEgZGV2aWNl LCBpdHMgYXNwZWN0IHJhdGlvIGlzIG5vbi16ZXJvCiAgICAgaWYgKCF2YWx1ZSkKICAgICAgICAg cmV0dXJuIHRydWU7Ci0KICAgICBGcmFtZVZpZXcqIHZpZXcgPSBmcmFtZS52aWV3KCk7CiAgICAg aWYgKCF2aWV3KQogICAgICAgICByZXR1cm4gdHJ1ZTsKLQotICAgIHJldHVybiBjb21wYXJlQXNw ZWN0UmF0aW9WYWx1ZSh2YWx1ZSwgdmlldy0+bGF5b3V0V2lkdGgoKSwgdmlldy0+bGF5b3V0SGVp Z2h0KCksIG9wKTsKKyAgICBhdXRvIHZpZXdTaXplID0gdmlldy0+bGF5b3V0U2l6ZUZvck1lZGlh UXVlcnkoKTsKKyAgICByZXR1cm4gY29tcGFyZUFzcGVjdFJhdGlvVmFsdWUodmFsdWUsIHZpZXdT aXplLndpZHRoKCksIHZpZXdTaXplLmhlaWdodCgpLCBvcCk7CiB9CiAKIHN0YXRpYyBib29sIGRl dmljZUFzcGVjdFJhdGlvRXZhbHVhdGUoQ1NTVmFsdWUqIHZhbHVlLCBjb25zdCBDU1NUb0xlbmd0 aENvbnZlcnNpb25EYXRhJiwgRnJhbWUmIGZyYW1lLCBNZWRpYUZlYXR1cmVQcmVmaXggb3ApCkBA IC00NDUsNyArNDQyLDcgQEAgc3RhdGljIGJvb2wgaGVpZ2h0RXZhbHVhdGUoQ1NTVmFsdWUqIHZh bHVlLCBjb25zdCBDU1NUb0xlbmd0aENvbnZlcnNpb25EYXRhJiBjb24KICAgICBGcmFtZVZpZXcq IHZpZXcgPSBmcmFtZS52aWV3KCk7CiAgICAgaWYgKCF2aWV3KQogICAgICAgICByZXR1cm4gZmFs c2U7Ci0gICAgaW50IGhlaWdodCA9IHZpZXctPmxheW91dEhlaWdodCgpOworICAgIGludCBoZWln aHQgPSB2aWV3LT5sYXlvdXRTaXplRm9yTWVkaWFRdWVyeSgpLmhlaWdodCgpOwogICAgIGlmICgh dmFsdWUpCiAgICAgICAgIHJldHVybiBoZWlnaHQ7CiAgICAgaWYgKGF1dG8qIHJlbmRlclZpZXcg PSBmcmFtZS5kb2N1bWVudCgpLT5yZW5kZXJWaWV3KCkpCkBAIC00NTksNyArNDU2LDcgQEAgc3Rh dGljIGJvb2wgd2lkdGhFdmFsdWF0ZShDU1NWYWx1ZSogdmFsdWUsIGNvbnN0IENTU1RvTGVuZ3Ro Q29udmVyc2lvbkRhdGEmIGNvbnYKICAgICBGcmFtZVZpZXcqIHZpZXcgPSBmcmFtZS52aWV3KCk7 CiAgICAgaWYgKCF2aWV3KQogICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgaW50IHdpZHRoID0g dmlldy0+bGF5b3V0V2lkdGgoKTsKKyAgICBpbnQgd2lkdGggPSB2aWV3LT5sYXlvdXRTaXplRm9y TWVkaWFRdWVyeSgpLndpZHRoKCk7CiAgICAgaWYgKCF2YWx1ZSkKICAgICAgICAgcmV0dXJuIHdp ZHRoOwogICAgIGlmIChhdXRvKiByZW5kZXJWaWV3ID0gZnJhbWUuZG9jdW1lbnQoKS0+cmVuZGVy VmlldygpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwIGIv U291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCmluZGV4IDdiNWRjNmNkZTQ0MGQ4MzU3 NTg2M2ExNTU0N2YwNGYwMzBjZWUxNjYuLmY2N2I4M2E3YjFmYmFmMmU1YTExYmUzMTA4NTI3NjBl ZGYxNTllN2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKQEAgLTEzMTYsNiArMTMxNiw4 IEBAIHZvaWQgRnJhbWVWaWV3OjpsYXlvdXQoYm9vbCBhbGxvd1N1YnRyZWUpCiAgICAgYm9vbCBp bkNoaWxkRnJhbWVMYXlvdXRXaXRoRnJhbWVGbGF0dGVuaW5nID0gaXNJbkNoaWxkRnJhbWVXaXRo RnJhbWVGbGF0dGVuaW5nKCk7CiAKICAgICBpZiAoaW5DaGlsZEZyYW1lTGF5b3V0V2l0aEZyYW1l RmxhdHRlbmluZykgeworICAgICAgICBpZiAoIW1fZnJhbWVGbGF0dGVuaW5nVmlld1NpemVGb3JN ZWRpYVF1ZXJ5KQorICAgICAgICAgICAgbV9mcmFtZUZsYXR0ZW5pbmdWaWV3U2l6ZUZvck1lZGlh UXVlcnkgPSBTY3JvbGxWaWV3OjpsYXlvdXRTaXplKCk7CiAgICAgICAgIHN0YXJ0TGF5b3V0QXRN YWluRnJhbWVWaWV3SWZOZWVkZWQoYWxsb3dTdWJ0cmVlKTsKICAgICAgICAgUmVuZGVyRWxlbWVu dCogcm9vdCA9IG1fbGF5b3V0Um9vdCA/IG1fbGF5b3V0Um9vdCA6IGZyYW1lKCkuZG9jdW1lbnQo KS0+cmVuZGVyVmlldygpOwogICAgICAgICBpZiAoIXJvb3QgfHwgIXJvb3QtPm5lZWRzTGF5b3V0 KCkpCkBAIC0xMzcwLDEzICsxMzcyLDEwIEBAIHZvaWQgRnJhbWVWaWV3OjpsYXlvdXQoYm9vbCBh bGxvd1N1YnRyZWUpCiAgICAgICAgICAgICAvLyBGSVhNRTogVGhpcyBpbnN0cnVtZW50YXRpb24g ZXZlbnQgaXMgbm90IHN0cmljdGx5IGFjY3VyYXRlIHNpbmNlIGNhY2hlZCBtZWRpYSBxdWVyeSBy ZXN1bHRzIGRvIG5vdCBwZXJzaXN0IGFjcm9zcyBTdHlsZVJlc29sdmVyIHJlYnVpbGRzLgogICAg ICAgICAgICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjptZWRpYVF1ZXJ5UmVzdWx0Q2hhbmdl ZChkb2N1bWVudCk7CiAgICAgICAgIH0KLSAgICAgICAgCiAgICAgICAgIGRvY3VtZW50LmV2YWx1 YXRlTWVkaWFRdWVyeUxpc3QoKTsKLQogICAgICAgICAvLyBJZiB0aGVyZSBpcyBhbnkgcGFnaW5h dGlvbiB0byBhcHBseSwgaXQgd2lsbCBhZmZlY3QgdGhlIFJlbmRlclZpZXcncyBzdHlsZSwgc28g d2Ugc2hvdWxkCiAgICAgICAgIC8vIHRha2UgY2FyZSBvZiB0aGF0IG5vdy4KICAgICAgICAgYXBw bHlQYWdpbmF0aW9uVG9WaWV3cG9ydCgpOwotCiAgICAgICAgIC8vIEFsd2F5cyBlbnN1cmUgb3Vy IHN0eWxlIGluZm8gaXMgdXAtdG8tZGF0ZS4gVGhpcyBjYW4gaGFwcGVuIGluIHNpdHVhdGlvbnMg d2hlcmUKICAgICAgICAgLy8gdGhlIGxheW91dCBiZWF0cyBhbnkgc29ydCBvZiBzdHlsZSByZWNh bGMgdXBkYXRlIHRoYXQgbmVlZHMgdG8gb2NjdXIuCiAgICAgICAgIGRvY3VtZW50LnVwZGF0ZVN0 eWxlSWZOZWVkZWQoKTsKQEAgLTU0MDcsNSArNTQwNiwxMCBAQCBib29sIEZyYW1lVmlldzo6c2hv dWxkUGxhY2VCbG9ja0RpcmVjdGlvblNjcm9sbGJhck9uTGVmdCgpIGNvbnN0CiB7CiAgICAgcmV0 dXJuIHJlbmRlclZpZXcoKSAmJiByZW5kZXJWaWV3KCktPnNob3VsZFBsYWNlQmxvY2tEaXJlY3Rp b25TY3JvbGxiYXJPbkxlZnQoKTsKIH0KLSAgICAKKworSW50U2l6ZSBGcmFtZVZpZXc6OmxheW91 dFNpemVGb3JNZWRpYVF1ZXJ5KCkgY29uc3QKK3sKKyAgICByZXR1cm4gbV9mcmFtZUZsYXR0ZW5p bmdWaWV3U2l6ZUZvck1lZGlhUXVlcnkudmFsdWVfb3IoU2Nyb2xsVmlldzo6bGF5b3V0U2l6ZSgp KTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGFnZS9GcmFtZVZpZXcuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgKaW5k ZXggMTlmMDJmNmQ2YWNmODU2MGUyMTU0M2U1OTkyMWJmMzNjZDRlYWI0OS4uZGJjMDg1ZWQ0ZDJh ZGJkYjAwOGZkNGQ0YzRjZDY4MGYyNDIwYjAyOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGFnZS9GcmFtZVZpZXcuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oCkBA IC0yMTYsNyArMjE2LDggQEAgcHVibGljOgogICAgIGJvb2wgc2hvdWxkVXBkYXRlKCkgY29uc3Q7 CiAKICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIGFkanVzdFZpZXdTaXplKCk7Ci0gICAgCisgICAg SW50U2l6ZSBsYXlvdXRTaXplRm9yTWVkaWFRdWVyeSgpIGNvbnN0OworCiAgICAgV0VCQ09SRV9F WFBPUlQgdm9pZCBzZXRWaWV3cG9ydFNpemVGb3JDU1NWaWV3cG9ydFVuaXRzKEludFNpemUpOwog ICAgIEludFNpemUgdmlld3BvcnRTaXplRm9yQ1NTVmlld3BvcnRVbml0cygpIGNvbnN0OwogICAg IApAQCAtODkwLDYgKzg5MSw4IEBAIHByaXZhdGU6CiAgICAgaW50IG1fYXV0b1NpemVGaXhlZE1p bmltdW1IZWlnaHQ7CiAgICAgLy8gVGhlIGludHJpbnNpYyBjb250ZW50IHNpemUgZGVjaWRlZCBi eSBhdXRvc2l6aW5nLgogICAgIEludFNpemUgbV9hdXRvU2l6ZUNvbnRlbnRTaXplOworICAgIC8v IFJlcG9ydCB0aGUgZmlyc3QgY29tcHV0ZWQgZnJhbWUgdmlldyBzaXplIHRvIG1lZGlhIHF1ZXJp ZXMuCisgICAgc3RkOjpvcHRpb25hbDxJbnRTaXplPiBtX2ZyYW1lRmxhdHRlbmluZ1ZpZXdTaXpl Rm9yTWVkaWFRdWVyeTsKIAogICAgIHN0ZDo6dW5pcXVlX3B0cjxTY3JvbGxhYmxlQXJlYVNldD4g bV9zY3JvbGxhYmxlQXJlYXM7CiAgICAgc3RkOjp1bmlxdWVfcHRyPFZpZXdwb3J0Q29uc3RyYWlu ZWRPYmplY3RTZXQ+IG1fdmlld3BvcnRDb25zdHJhaW5lZE9iamVjdHM7CmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggN2U2MWU5 NWFlYWUyM2QxZWYwNWJiY2MzNjlhYTEyMzQ0NzMzY2VjOC4uZGVhYmY1NTBmNTZjNGE3NTE4ZDNj MjVkMjAwYjYyMDg1ZTM1OGFmNiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisr KyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE3LTA3LTMxICBa YWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTiAocjIx NzE5Nyk6IE5ldyBZb3JrZXIgd2Vic2l0ZSBoYW5ncyBmb3IgYSBsb25nIHRpbWUgb24gbG9hZCwg bG90cyBvZiBibGFuayB0aWxlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTc1MDA5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zMzUwNTc5MT4KKwor ICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBGcmFzZXIuCisKKyAgICAgICAgKiBmYXN0L2ZyYW1l cy9mbGF0dGVuaW5nL21lZGlhLXF1ZXJ5LWdyb3dpbmctY29udGVudC1leHBlY3RlZC50eHQ6IEFk ZGVkLgorICAgICAgICAqIGZhc3QvZnJhbWVzL2ZsYXR0ZW5pbmcvbWVkaWEtcXVlcnktZ3Jvd2lu Zy1jb250ZW50Lmh0bWw6IEFkZGVkLgorICAgICAgICAqIGZhc3QvZnJhbWVzL2ZsYXR0ZW5pbmcv cmVzb3VyY2VzL21lZGlhLXF1ZXJ5LW1pbi1oZWlnaHQtd2l0aC1mbGF0dGVuaW5nLmh0bWw6IEFk ZGVkLgorCiAyMDE3LTA3LTI4ICBTYW0gV2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+CiAKICAgICAg ICAgW1dlYklETF0gUmVtb3ZlIEpTIGJ1aWx0aW4gYmluZGluZ3MgZm9yIEZldGNoSGVhZGVycwpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9mcmFtZXMvZmxhdHRlbmluZy9tZWRpYS1xdWVy eS1ncm93aW5nLWNvbnRlbnQtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9mcmFtZXMv ZmxhdHRlbmluZy9tZWRpYS1xdWVyeS1ncm93aW5nLWNvbnRlbnQtZXhwZWN0ZWQudHh0Cm5ldyBm aWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAuLjEzOTU5N2Y5Y2IwN2M1ZDQ4YmVkMTg5ODRlYzQ3NDdmNGI0ZjM0MzgKLS0tIC9kZXYv bnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2ZyYW1lcy9mbGF0dGVuaW5nL21lZGlhLXF1ZXJ5 LWdyb3dpbmctY29udGVudC1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwyIEBACisKKwpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9mcmFtZXMvZmxhdHRlbmluZy9tZWRpYS1xdWVyeS1ncm93 aW5nLWNvbnRlbnQuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvZnJhbWVzL2ZsYXR0ZW5pbmcvbWVk aWEtcXVlcnktZ3Jvd2luZy1jb250ZW50Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMjZiNGU0ZmY0M2I2MTFl ZmM5YzU3Y2JiZmY2YTBlYzY4ZWNlNGU1ZAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3Rz L2Zhc3QvZnJhbWVzL2ZsYXR0ZW5pbmcvbWVkaWEtcXVlcnktZ3Jvd2luZy1jb250ZW50Lmh0bWwK QEAgLTAsMCArMSwyNSBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorPHRpdGxl PlRoaXMgdGVzdHMgdGhhdCBtZWRpYSBxdWVyeSBjYW4ndCBnZXQgaW50byBhbiBldmVyLWdyb3dp bmcgY3ljbGUuPC90aXRsZT4KKzxzY3JpcHQ+CitpZiAod2luZG93LnRlc3RSdW5uZXIpCisgICAg dGVzdFJ1bm5lci5kdW1wQXNUZXh0KCk7CitpZiAod2luZG93LmludGVybmFscykKKyAgICBpbnRl cm5hbHMuc2V0dGluZ3Muc2V0RnJhbWVGbGF0dGVuaW5nKCJGdWxseUVuYWJsZWQiKTsKKworZnVu Y3Rpb24gcnVuVGVzdCgpIHsKKyAgICBpZiAod2luZG93LnRlc3RSdW5uZXIpIHsKKyAgICAgICAg dGVzdFJ1bm5lci53YWl0VW50aWxEb25lKCk7CisgICAgICAgIHNldFRpbWVvdXQoZnVuY3Rpb24o KSB7CisgICAgICAgICAgICB0ZXN0UnVubmVyLm5vdGlmeURvbmUoKTsKKyAgICAgICAgfSwgNTAp OworICAgIH0KK30KKzwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+Cis8aWZyYW1lIG9ubG9hZD0i cnVuVGVzdCgpIiBzcmM9Ii4vcmVzb3VyY2VzL21lZGlhLXF1ZXJ5LW1pbi1oZWlnaHQtd2l0aC1m bGF0dGVuaW5nLmh0bWwiPjwvaWZyYW1lPgorPGRpdiBpZD10ZXN0UmVzdWx0PjwvZGl2PgorPC9i b2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9mcmFtZXMvZmxhdHRl bmluZy9yZXNvdXJjZXMvbWVkaWEtcXVlcnktbWluLWhlaWdodC13aXRoLWZsYXR0ZW5pbmcuaHRt bCBiL0xheW91dFRlc3RzL2Zhc3QvZnJhbWVzL2ZsYXR0ZW5pbmcvcmVzb3VyY2VzL21lZGlhLXF1 ZXJ5LW1pbi1oZWlnaHQtd2l0aC1mbGF0dGVuaW5nLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQK aW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uOTRhOGRhMDg2 MmE2YWY1M2QyZDJhMWQxMzM0ODc5NDNiNWJjNWM0ZQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91 dFRlc3RzL2Zhc3QvZnJhbWVzL2ZsYXR0ZW5pbmcvcmVzb3VyY2VzL21lZGlhLXF1ZXJ5LW1pbi1o ZWlnaHQtd2l0aC1mbGF0dGVuaW5nLmh0bWwKQEAgLTAsMCArMSwzNCBAQAorPHN0eWxlPgorICAg IGRpdiB7CisgICAgICAgIHdpZHRoOiAyMDBweDsKKyAgICAgICAgaGVpZ2h0OiA2MDBweDsKKyAg ICB9Cis8L3N0eWxlPgorPGRpdiBpZD1ncm93aW5nRGl2PjwvZGl2PgorPHNjcmlwdD4KK3ZhciBj b3VudGVyID0gMDsKK3dpbmRvdy5tYXRjaE1lZGlhKCcobWluLWhlaWdodDogMjAwcHgpJykuYWRk TGlzdGVuZXIoZnVuY3Rpb24oY2hhbmdlZCkgeworICAgICsrY291bnRlcjsKKyAgICBzZXRUaW1l b3V0KGZ1bmN0aW9uKCkgeworICAgICAgICBncm93aW5nRGl2LmlubmVyVGV4dCA9IGdyb3dpbmdE aXYuaW5uZXJUZXh0ICsgJyBtZWRpYSBxdWVyeSBjYWxsYmFjayAnOworICAgICAgICBwYXJlbnQu ZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInRlc3RSZXN1bHQiKS5pbm5lclRleHQgPSBjb3VudGVy OworICAgIH0sIDApOworfSk7CisKK3dpbmRvdy5tYXRjaE1lZGlhKCcobWluLXdpZHRoOiA2MDBw eCknKS5hZGRMaXN0ZW5lcihmdW5jdGlvbihjaGFuZ2VkKSB7CisgICAgKytjb3VudGVyOworICAg IHNldFRpbWVvdXQoZnVuY3Rpb24oKSB7CisgICAgICAgIGdyb3dpbmdEaXYuaW5uZXJUZXh0ID0g Z3Jvd2luZ0Rpdi5pbm5lclRleHQgKyAnIG1lZGlhIHF1ZXJ5IGNhbGxiYWNrICc7CisgICAgICAg IHBhcmVudC5kb2N1bWVudC5nZXRFbGVtZW50QnlJZCgidGVzdFJlc3VsdCIpLmlubmVyVGV4dCA9 IGNvdW50ZXI7CisgICAgfSwgMCk7Cit9KTsKKword2luZG93Lm1hdGNoTWVkaWEoJyhtaW4tYXNw ZWN0LXJhdGlvOiAxLzEpJykuYWRkTGlzdGVuZXIoZnVuY3Rpb24oY2hhbmdlZCkgeworICAgICsr Y291bnRlcjsKKyAgICBzZXRUaW1lb3V0KGZ1bmN0aW9uKCkgeworICAgICAgICBncm93aW5nRGl2 LmlubmVyVGV4dCA9IGdyb3dpbmdEaXYuaW5uZXJUZXh0ICsgJyBtZWRpYSBxdWVyeSBjYWxsYmFj ayAnOworICAgICAgICBwYXJlbnQuZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInRlc3RSZXN1bHQi KS5pbm5lclRleHQgPSBjb3VudGVyOworICAgIH0sIDApOworfSk7CisKKzwvc2NyaXB0PgpcIE5v IG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUK