193741 2019-01-23 15:21:13 -0800 DidFirstVisuallyNonEmptyLayout milestone should always fire at some point. 2019-01-24 14:58:16 -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 ggaren koivisto simon.fraser zalan oldest_to_newest 1497594 0 zalan 2019-01-23 15:21:13 -0800 It's important that this milestone gets fired. 1497595 1 zalan 2019-01-23 15:21:29 -0800 <rdar://problem/47135030> 1497618 2 359960 zalan 2019-01-23 15:40:59 -0800 Created attachment 359960 Patch 1497628 3 359960 simon.fraser 2019-01-23 15:58:43 -0800 Comment on attachment 359960 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=359960&action=review > Source/WebCore/page/FrameView.cpp:4550 > +void FrameView::firstVisuallyNonEmptyLayoutMilestoneWatchdogFired() Firing your watchdog means that you weren't happy with how it was doing its job, so you let it go. This is a watchdog timer getting fired. > Source/WebCore/page/FrameView.cpp:4559 > +void FrameView::fireFirstVisuallyNonEmptyLayoutMilestoneIfRequested() This function seems to do more than fire the milestone; it clears some state, and triggers the DidFirstMeaningfulPaint milestone. > Source/WebCore/page/FrameView.h:836 > + Timer m_firstVisuallyNonEmptyMilestoneWatchdog; m_firstVisuallyNonEmptyMilestoneWatchdogTimer 1497688 4 359983 zalan 2019-01-23 18:44:05 -0800 Created attachment 359983 Patch 1497691 5 359983 simon.fraser 2019-01-23 18:46:37 -0800 Comment on attachment 359983 Patch Can we layout-test this? 1497692 6 simon.fraser 2019-01-23 18:46:46 -0800 Or API test 1497698 7 zalan 2019-01-23 18:56:23 -0800 (In reply to Simon Fraser (smfr) from comment #6) > Or API test We've got some API tests in this area. Need to think about how to simulate this case though. 1497820 8 360014 zalan 2019-01-24 08:47:02 -0800 Created attachment 360014 Patch 1497864 9 360020 zalan 2019-01-24 10:17:10 -0800 Created attachment 360020 Patch 1497877 10 360020 koivisto 2019-01-24 10:34:22 -0800 Comment on attachment 360020 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=360020&action=review As someone mentioned, a test would be cool. > Source/WebCore/page/FrameView.cpp:4557 > +void FrameView::handleFirstVisuallyNonEmptyLayoutMilestone() > +{ > + ASSERT(!m_isVisuallyNonEmpty); > + ASSERT(m_firstVisuallyNonEmptyLayoutCallbackPending); > + m_isVisuallyNonEmpty = true; > + m_firstVisuallyNonEmptyLayoutCallbackPending = false; > + addPaintPendingMilestones(DidFirstMeaningfulPaint); > + > + if (!frame().isMainFrame()) > + return; > + if (!frame().page() || !frame().page()->requestedLayoutMilestones().contains(DidFirstVisuallyNonEmptyLayout)) > + return; > + frame().loader().didReachLayoutMilestone(DidFirstVisuallyNonEmptyLayout); > +} Can't we just call fireLayoutRelatedMilestonesIfNeeded() instead of this? I'm not sure why another function doing the firing is needed. I'm not sure this does everything that needs to be done. 1497884 11 zalan 2019-01-24 10:47:58 -0800 (In reply to Antti Koivisto from comment #10) > Comment on attachment 360020 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=360020&action=review > > As someone mentioned, a test would be cool. > > > Source/WebCore/page/FrameView.cpp:4557 > > +void FrameView::handleFirstVisuallyNonEmptyLayoutMilestone() > > +{ > > + ASSERT(!m_isVisuallyNonEmpty); > > + ASSERT(m_firstVisuallyNonEmptyLayoutCallbackPending); > > + m_isVisuallyNonEmpty = true; > > + m_firstVisuallyNonEmptyLayoutCallbackPending = false; > > + addPaintPendingMilestones(DidFirstMeaningfulPaint); > > + > > + if (!frame().isMainFrame()) > > + return; > > + if (!frame().page() || !frame().page()->requestedLayoutMilestones().contains(DidFirstVisuallyNonEmptyLayout)) > > + return; > > + frame().loader().didReachLayoutMilestone(DidFirstVisuallyNonEmptyLayout); > > +} > > Can't we just call fireLayoutRelatedMilestonesIfNeeded() instead of this? > I'm not sure why another function doing the firing is needed. I'm not sure > this does everything that needs to be done. Since this is not an actual layout, I thought it would be incorrect to call fireLayoutRelatedMilestonesIfNeeded() -but obviously it fixes the bug as well. Let's go back to that. 1497887 12 zalan 2019-01-24 10:51:47 -0800 >I'm not sure this does everything that needs to be done. It does. 1497889 13 360022 zalan 2019-01-24 10:55:56 -0800 Created attachment 360022 Patch 1497892 14 360022 simon.fraser 2019-01-24 11:08:37 -0800 Comment on attachment 360022 Patch Please rename m_firstVisuallyNonEmptyLayoutCallbackPending. It's not a callback. 1497894 15 360022 koivisto 2019-01-24 11:11:32 -0800 Comment on attachment 360022 Patch r=me 1497939 16 360034 zalan 2019-01-24 13:57:29 -0800 Created attachment 360034 Patch 1497961 17 360039 zalan 2019-01-24 14:31:00 -0800 Created attachment 360039 Patch 1497977 18 360039 commit-queue 2019-01-24 14:58:15 -0800 Comment on attachment 360039 Patch Clearing flags on attachment: 360039 Committed r240450: <https://trac.webkit.org/changeset/240450> 1497978 19 commit-queue 2019-01-24 14:58:16 -0800 All reviewed patches have been landed. Closing bug. 359960 2019-01-23 15:40:59 -0800 2019-01-23 18:44:04 -0800 Patch bug-193741-20190123154056.patch text/plain 6577 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5OTI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjg3MGU2YjgwOTVmMDVh MTFhZGFlMWVmYjA2OGY3MWEyZjdkZWE5NS4uNmY1NjNkYmZlNjQ1N2FlZTdlMzYxMTI0OTI3NTRl MzZhYmUyMjkyYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE5LTAxLTIzICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgRGlkRmlyc3RWaXN1YWxseU5v bkVtcHR5TGF5b3V0IG1pbGVzdG9uZSBzaG91bGQgYWx3YXlzIGZpcmUgYXQgc29tZSBwb2ludC4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5Mzc0MQor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDcxMzUwMzA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBlbnN1cmVzIHRoYXQgd2UgYWx3 YXlzIGZpcmUgdGhlIERpZEZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dCAoaWYgcmVxdWVzdGVk KS4KKyAgICAgICAgRWl0aGVyIHdoZW4KKyAgICAgICAgICAgIDEuIG1haW5mcmFtZSBmaW5pc2hl ZCBsb2FkaW5nIGNvbXBsZXRlbHkKKyAgICAgICAgICAgIDIuIG9yIG9uIGEgNHMgd2F0Y2hkb2cg dGltZXIKKworICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkZyYW1lVmlldzo6RnJhbWVWaWV3KToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6cmVz ZXRMYXlvdXRNaWxlc3RvbmVzKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6bG9hZFBy b2dyZXNzaW5nU3RhdHVzQ2hhbmdlZCk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OnF1 YWxpZmllc0FzVmlzdWFsbHlOb25FbXB0eSk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6 OnVwZGF0ZUlzVmlzdWFsbHlOb25FbXB0eSk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6 OmZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dE1pbGVzdG9uZVdhdGNoZG9nRmlyZWQpOgorICAg ICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3OjpmaXJlRmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0 TWlsZXN0b25lSWZSZXF1ZXN0ZWQpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3OjpxdWFs aWZpZXNBc1Zpc3VhbGx5Tm9uRW1wdHkgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAqIHBhZ2Uv RnJhbWVWaWV3Lmg6CisKIDIwMTktMDEtMTQgIFphbiBEb2JlcnNlayAgPHpkb2JlcnNla0BpZ2Fs aWEuY29tPgogCiAgICAgICAgIERPTUNhY2hlU3RvcmFnZTogdXNlLWFmdGVyLW1vdmUgaW4gZG9T ZXF1ZW50aWFsTWF0Y2goKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZp ZXcuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCmluZGV4IGQyNWE3ZTYx YTdhZTM0Y2IyNTdlMTRmMGU1MjVjNzM5ODIyODJkZTkuLjNiYzQxNmUyNGZiNjE5YTMzY2M0NGNh MzBlZTRiMjliMTU3ODFlZWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVW aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKQEAgLTE4Nyw2 ICsxODcsNyBAQCBGcmFtZVZpZXc6OkZyYW1lVmlldyhGcmFtZSYgZnJhbWUpCiAgICAgLCBtX2Nh bkhhdmVTY3JvbGxiYXJzKHRydWUpCiAgICAgLCBtX3VwZGF0ZUVtYmVkZGVkT2JqZWN0c1RpbWVy KCp0aGlzLCAmRnJhbWVWaWV3Ojp1cGRhdGVFbWJlZGRlZE9iamVjdHNUaW1lckZpcmVkKQogICAg ICwgbV91cGRhdGVXaWRnZXRQb3NpdGlvbnNUaW1lcigqdGhpcywgJkZyYW1lVmlldzo6dXBkYXRl V2lkZ2V0UG9zaXRpb25zVGltZXJGaXJlZCkKKyAgICAsIG1fZmlyc3RWaXN1YWxseU5vbkVtcHR5 TWlsZXN0b25lV2F0Y2hkb2coKnRoaXMsICZGcmFtZVZpZXc6OmZpcnN0VmlzdWFsbHlOb25FbXB0 eUxheW91dE1pbGVzdG9uZVdhdGNoZG9nRmlyZWQpCiAgICAgLCBtX2lzVHJhbnNwYXJlbnQoZmFs c2UpCiAgICAgLCBtX2Jhc2VCYWNrZ3JvdW5kQ29sb3IoQ29sb3I6OndoaXRlKQogICAgICwgbV9t ZWRpYVR5cGUoInNjcmVlbiIpCkBAIC0yOTIsNiArMjkzLDcgQEAgdm9pZCBGcmFtZVZpZXc6OnJl c2V0KCkKIAogdm9pZCBGcmFtZVZpZXc6OnJlc2V0TGF5b3V0TWlsZXN0b25lcygpCiB7CisgICAg bV9maXJzdFZpc3VhbGx5Tm9uRW1wdHlNaWxlc3RvbmVXYXRjaGRvZy5zdG9wKCk7CiAgICAgbV9m aXJzdExheW91dENhbGxiYWNrUGVuZGluZyA9IGZhbHNlOwogICAgIG1faXNWaXN1YWxseU5vbkVt cHR5ID0gZmFsc2U7CiAgICAgbV9maXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXRDYWxsYmFja1Bl bmRpbmcgPSB0cnVlOwpAQCAtMjg0MSw2ICsyODQzLDkgQEAgdm9pZCBGcmFtZVZpZXc6OmRpc2Fi bGVMYXllckZsdXNoVGhyb3R0bGluZ1RlbXBvcmFyaWx5Rm9ySW50ZXJhY3Rpb24oKQogCiB2b2lk IEZyYW1lVmlldzo6bG9hZFByb2dyZXNzaW5nU3RhdHVzQ2hhbmdlZCgpCiB7CisgICAgYXV0byBo YXNQZW5kaW5nVmlzdWFsbHlOb25FbXB0eUNhbGxiYWNrID0gbV9maXJzdFZpc3VhbGx5Tm9uRW1w dHlMYXlvdXRDYWxsYmFja1BlbmRpbmcgJiYgIW1faXNWaXN1YWxseU5vbkVtcHR5OyAKKyAgICBp ZiAoaGFzUGVuZGluZ1Zpc3VhbGx5Tm9uRW1wdHlDYWxsYmFjayAmJiBmcmFtZSgpLmxvYWRlcigp LmlzQ29tcGxldGUoKSkKKyAgICAgICAgZmlyZUZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dE1p bGVzdG9uZUlmUmVxdWVzdGVkKCk7CiAgICAgdXBkYXRlTGF5ZXJGbHVzaFRocm90dGxpbmcoKTsK ICAgICBhZGp1c3RUaWxlZEJhY2tpbmdDb3ZlcmFnZSgpOwogfQpAQCAtNDQzMSw3ICs0NDM2LDcg QEAgc3RhdGljIGJvb2wgZWxlbWVudE92ZXJmbG93UmVjdElzTGFyZ2VyVGhhblRocmVzaG9sZChj b25zdCBFbGVtZW50JiBlbGVtZW50KQogICAgIHJldHVybiBmYWxzZTsKIH0KIAotYm9vbCBGcmFt ZVZpZXc6OnF1YWxpZmllc0FzVmlzdWFsbHlOb25FbXB0eSgpIGNvbnN0Citib29sIEZyYW1lVmll dzo6cXVhbGlmaWVzQXNWaXN1YWxseU5vbkVtcHR5KCkKIHsKICAgICAvLyBObyBjb250ZW50IHll dC4KICAgICBFbGVtZW50KiBkb2N1bWVudEVsZW1lbnQgPSBmcmFtZSgpLmRvY3VtZW50KCktPmRv Y3VtZW50RWxlbWVudCgpOwpAQCAtNDQ0Myw5ICs0NDQ4LDEyIEBAIGJvb2wgRnJhbWVWaWV3Ojpx dWFsaWZpZXNBc1Zpc3VhbGx5Tm9uRW1wdHkoKSBjb25zdAogICAgICAgICByZXR1cm4gZmFsc2U7 CiAKICAgICBhdXRvIGZpbmlzaGVkUGFyc2luZ01haW5Eb2N1bWVudCA9IGZyYW1lKCkubG9hZGVy KCkuc3RhdGVNYWNoaW5lKCkuY29tbWl0dGVkRmlyc3RSZWFsRG9jdW1lbnRMb2FkKCkgJiYgIWZy YW1lKCkuZG9jdW1lbnQoKS0+cGFyc2luZygpOwotICAgIC8vIEVuc3VyZSB0aGF0IHdlIGFsd2F5 cyBmaXJlIHZpc3VhbGx5IG5vbi1lbXB0eSBtaWxlc3RvbmUgZXZlbnR1YWxseS4KLSAgICBpZiAo ZmluaXNoZWRQYXJzaW5nTWFpbkRvY3VtZW50ICYmIGZyYW1lKCkubG9hZGVyKCkuaXNDb21wbGV0 ZSgpKQotICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICBpZiAoZmluaXNoZWRQYXJzaW5nTWFpbkRv Y3VtZW50KSB7CisgICAgICAgIGlmIChmcmFtZSgpLmxvYWRlcigpLmlzQ29tcGxldGUoKSkKKyAg ICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICAvLyBFbnN1cmUgdGhhdCB3ZSBhbHdheXMg ZmlyZSB2aXN1YWxseSBub24tZW1wdHkgbWlsZXN0b25lIGV2ZW50dWFsbHkuCisgICAgICAgIG1f Zmlyc3RWaXN1YWxseU5vbkVtcHR5TWlsZXN0b25lV2F0Y2hkb2cuc3RhcnRPbmVTaG90KDRfcyk7 CisgICAgfQogCiAgICAgYXV0byBpc1Zpc2libGUgPSBbXShjb25zdCBFbGVtZW50KiBlbGVtZW50 KSB7CiAgICAgICAgIGlmICghZWxlbWVudCB8fCAhZWxlbWVudC0+cmVuZGVyZXIoKSkKQEAgLTQ1 MzUsOSArNDU0MywzNiBAQCB2b2lkIEZyYW1lVmlldzo6dXBkYXRlSXNWaXN1YWxseU5vbkVtcHR5 KCkKICAgICBpZiAoIXF1YWxpZmllc0FzVmlzdWFsbHlOb25FbXB0eSgpKQogICAgICAgICByZXR1 cm47CiAgICAgbV9pc1Zpc3VhbGx5Tm9uRW1wdHkgPSB0cnVlOworICAgIG1fZmlyc3RWaXN1YWxs eU5vbkVtcHR5TWlsZXN0b25lV2F0Y2hkb2cuc3RvcCgpOwogICAgIGFkanVzdFRpbGVkQmFja2lu Z0NvdmVyYWdlKCk7CiB9CiAKK3ZvaWQgRnJhbWVWaWV3OjpmaXJzdFZpc3VhbGx5Tm9uRW1wdHlM YXlvdXRNaWxlc3RvbmVXYXRjaGRvZ0ZpcmVkKCkKK3sKKyAgICBpZiAoIW1fZmlyc3RWaXN1YWxs eU5vbkVtcHR5TGF5b3V0Q2FsbGJhY2tQZW5kaW5nICYmIG1faXNWaXN1YWxseU5vbkVtcHR5KQor ICAgICAgICByZXR1cm47CisgICAgCisgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgiRnJhbWVW aWV3OjpmaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXRNaWxlc3RvbmVXYXRjaGRvZ0ZpcmVkKCkg LSBkZWxheWVkIGZpcnN0IHBhaW50IChpcyBtYWluIGZyYW1lICVkKSIsIGZyYW1lKCkuaXNNYWlu RnJhbWUoKSk7CisgICAgZmlyZUZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dE1pbGVzdG9uZUlm UmVxdWVzdGVkKCk7Cit9CisKK3ZvaWQgRnJhbWVWaWV3OjpmaXJlRmlyc3RWaXN1YWxseU5vbkVt cHR5TGF5b3V0TWlsZXN0b25lSWZSZXF1ZXN0ZWQoKQoreworICAgIEFTU0VSVCghbV9pc1Zpc3Vh bGx5Tm9uRW1wdHkpOworICAgIEFTU0VSVChtX2ZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dENh bGxiYWNrUGVuZGluZyk7CisgICAgbV9pc1Zpc3VhbGx5Tm9uRW1wdHkgPSB0cnVlOworICAgIG1f Zmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0Q2FsbGJhY2tQZW5kaW5nID0gZmFsc2U7CisgICAg bV9maXJzdFZpc3VhbGx5Tm9uRW1wdHlNaWxlc3RvbmVXYXRjaGRvZy5zdG9wKCk7CisgICAgYWRk UGFpbnRQZW5kaW5nTWlsZXN0b25lcyhEaWRGaXJzdE1lYW5pbmdmdWxQYWludCk7CisKKyAgICBh dXRvKiBwYWdlID0gZnJhbWUoKS5wYWdlKCk7CisgICAgaWYgKCFwYWdlIHx8ICFwYWdlLT5yZXF1 ZXN0ZWRMYXlvdXRNaWxlc3RvbmVzKCkuY29udGFpbnMoRGlkRmlyc3RWaXN1YWxseU5vbkVtcHR5 TGF5b3V0KSkKKyAgICAgICAgcmV0dXJuOworICAgIGlmICghZnJhbWUoKS5pc01haW5GcmFtZSgp KQorICAgICAgICByZXR1cm47CisgICAgZnJhbWUoKS5sb2FkZXIoKS5kaWRSZWFjaExheW91dE1p bGVzdG9uZShEaWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXQpOworfQorCiBib29sIEZyYW1l Vmlldzo6aXNWaWV3Rm9yRG9jdW1lbnRJbkZyYW1lKCkgY29uc3QKIHsKICAgICBSZW5kZXJWaWV3 KiByZW5kZXJWaWV3ID0gdGhpcy0+cmVuZGVyVmlldygpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGFnZS9GcmFtZVZpZXcuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgK aW5kZXggMjk3NmI1NjdkYmYwYTE5Nzg5Yjc2ZTYwOWExMTdlNjJiNTExODI1Yi4uNjYwOTg5ZTI3 NWNlYzllZGIxOWM4YmE1MGI0ZWM2NmVlMWFmZjU1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGFnZS9GcmFtZVZpZXcuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5o CkBAIC03ODgsNyArNzg4LDcgQEAgcHJpdmF0ZToKIAogICAgIHZvaWQgbWFya1Jvb3RPckJvZHlS ZW5kZXJlckRpcnR5KCkgY29uc3Q7CiAKLSAgICBib29sIHF1YWxpZmllc0FzVmlzdWFsbHlOb25F bXB0eSgpIGNvbnN0OworICAgIGJvb2wgcXVhbGlmaWVzQXNWaXN1YWxseU5vbkVtcHR5KCk7CiAg ICAgYm9vbCBpc1ZpZXdGb3JEb2N1bWVudEluRnJhbWUoKSBjb25zdDsKIAogICAgIEFYT2JqZWN0 Q2FjaGUqIGF4T2JqZWN0Q2FjaGUoKSBjb25zdDsKQEAgLTgwOSw2ICs4MDksOSBAQCBwcml2YXRl OgogICAgIH07CiAgICAgdm9pZCBvdmVycmlkZVZpZXdwb3J0U2l6ZUZvckNTU1ZpZXdwb3J0VW5p dHMoT3ZlcnJpZGVWaWV3cG9ydFNpemUpOwogCisgICAgdm9pZCBmaXJlRmlyc3RWaXN1YWxseU5v bkVtcHR5TGF5b3V0TWlsZXN0b25lSWZSZXF1ZXN0ZWQoKTsKKyAgICB2b2lkIGZpcnN0VmlzdWFs bHlOb25FbXB0eUxheW91dE1pbGVzdG9uZVdhdGNoZG9nRmlyZWQoKTsKKwogICAgIEhhc2hTZXQ8 V2lkZ2V0Kj4gbV93aWRnZXRzSW5SZW5kZXJUcmVlOwogCiAgICAgc3RhdGljIE1vbm90b25pY1Rp bWUgc0N1cnJlbnRQYWludFRpbWVTdGFtcDsgLy8gdXNlZCBmb3IgZGV0ZWN0aW5nIGRlY29kZWQg cmVzb3VyY2UgdGhyYXNoIGluIHRoZSBjYWNoZQpAQCAtODMwLDYgKzgzMyw3IEBAIHByaXZhdGU6 CiAgICAgVGltZXIgbV91cGRhdGVXaWRnZXRQb3NpdGlvbnNUaW1lcjsKIAogICAgIGJvb2wgbV9m aXJzdExheW91dENhbGxiYWNrUGVuZGluZzsKKyAgICBUaW1lciBtX2ZpcnN0VmlzdWFsbHlOb25F bXB0eU1pbGVzdG9uZVdhdGNoZG9nOwogCiAgICAgYm9vbCBtX2lzVHJhbnNwYXJlbnQ7CiAjaWYg RU5BQkxFKERBUktfTU9ERV9DU1MpCg== 359983 2019-01-23 18:44:05 -0800 2019-01-24 08:47:00 -0800 Patch bug-193741-20190123184402.patch text/plain 6941 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5OTI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjg3MGU2YjgwOTVmMDVh MTFhZGFlMWVmYjA2OGY3MWEyZjdkZWE5NS4uYThjMzJlOGRlMzE3MjgyMWJjMmVjZjc4YTRkNTU0 OTg5YzU3MTcyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDE5LTAxLTIzICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgRGlkRmlyc3RWaXN1YWxseU5v bkVtcHR5TGF5b3V0IG1pbGVzdG9uZSBzaG91bGQgYWx3YXlzIGZpcmUgYXQgc29tZSBwb2ludC4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5Mzc0MQor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDcxMzUwMzA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgZmlyZUxheW91dFJlbGF0ZWRNaWxlc3RvbmVzSWZO ZWVkZWQoKSBpcyBwYXJ0IG9mIHRoZSBwb3N0LWxheW91dCB0YXNrcy4gSW4gY2VydGFpbiBjYXNl cyB3aGVuCisgICAgICAgICAgICAxLiB0aGUgcmVjZWl2ZWQgZGF0YSBpcyBub3QgImNvbnRlbnRm dWwiIHlldAorICAgICAgICAgICAgMi4gYW5kIHdlIGFyZSBleHBlY3Rpbmcgc29tZSBtb3JlIChs b2FkaW5nIGlzIG5vdCBjb21wbGV0ZSB5ZXQpCisgICAgICAgICAgICAzLiBidXQgbm8gbGF5b3V0 IGlzIGluaXRpYXRlZCBhbnltb3JlCisgICAgICAgIG5vdGhpbmcgdHJpZ2dlcnMgdGhlIG1pbGVz dG9uZSBmaXJpbmcuCisKKyAgICAgICAgVGhpcyBwYXRjaCBlbnN1cmVzIHRoYXQgd2UgYWx3YXlz IGZpcmUgdGhlIERpZEZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dCBldmVudHVhbGx5IChpZiBy ZXF1ZXN0ZWQpLgorICAgICAgICBFaXRoZXIgd2hlbgorICAgICAgICAgICAgMS4gbWFpbmZyYW1l IGZpbmlzaGVkIGxvYWRpbmcgY29tcGxldGVseQorICAgICAgICAgICAgMi4gb3Igb24gYSA0cyB3 YXRjaGRvZyB0aW1lcgorCisgICAgICAgICogcGFnZS9GcmFtZVZpZXcuY3BwOgorICAgICAgICAo V2ViQ29yZTo6RnJhbWVWaWV3OjpGcmFtZVZpZXcpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVW aWV3OjpyZXNldExheW91dE1pbGVzdG9uZXMpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3 Ojpsb2FkUHJvZ3Jlc3NpbmdTdGF0dXNDaGFuZ2VkKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1l Vmlldzo6cXVhbGlmaWVzQXNWaXN1YWxseU5vbkVtcHR5KToKKyAgICAgICAgKFdlYkNvcmU6OkZy YW1lVmlldzo6dXBkYXRlSXNWaXN1YWxseU5vbkVtcHR5KToKKyAgICAgICAgKFdlYkNvcmU6OkZy YW1lVmlldzo6Zmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0TWlsZXN0b25lV2F0Y2hkb2dGaXJl ZCk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OmZpcmVGaXJzdFZpc3VhbGx5Tm9uRW1w dHlMYXlvdXRNaWxlc3RvbmVJZlJlcXVlc3RlZCk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZp ZXc6OnF1YWxpZmllc0FzVmlzdWFsbHlOb25FbXB0eSBjb25zdCk6IERlbGV0ZWQuCisgICAgICAg ICogcGFnZS9GcmFtZVZpZXcuaDoKKwogMjAxOS0wMS0xNCAgWmFuIERvYmVyc2VrICA8emRvYmVy c2VrQGlnYWxpYS5jb20+CiAKICAgICAgICAgRE9NQ2FjaGVTdG9yYWdlOiB1c2UtYWZ0ZXItbW92 ZSBpbiBkb1NlcXVlbnRpYWxNYXRjaCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdl L0ZyYW1lVmlldy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKaW5kZXgg ZDI1YTdlNjFhN2FlMzRjYjI1N2UxNGYwZTUyNWM3Mzk4MjI4MmRlOS4uNWVmNzAzN2Y1ZGVlYzFl YjZkM2M0MTk3ODM2NDZhZjU1OWY2NDE4NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFn ZS9GcmFtZVZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcApA QCAtMTg3LDYgKzE4Nyw3IEBAIEZyYW1lVmlldzo6RnJhbWVWaWV3KEZyYW1lJiBmcmFtZSkKICAg ICAsIG1fY2FuSGF2ZVNjcm9sbGJhcnModHJ1ZSkKICAgICAsIG1fdXBkYXRlRW1iZWRkZWRPYmpl Y3RzVGltZXIoKnRoaXMsICZGcmFtZVZpZXc6OnVwZGF0ZUVtYmVkZGVkT2JqZWN0c1RpbWVyRmly ZWQpCiAgICAgLCBtX3VwZGF0ZVdpZGdldFBvc2l0aW9uc1RpbWVyKCp0aGlzLCAmRnJhbWVWaWV3 Ojp1cGRhdGVXaWRnZXRQb3NpdGlvbnNUaW1lckZpcmVkKQorICAgICwgbV9maXJzdFZpc3VhbGx5 Tm9uRW1wdHlNaWxlc3RvbmVXYXRjaGRvZ1RpbWVyKCp0aGlzLCAmRnJhbWVWaWV3OjpmaXJzdFZp c3VhbGx5Tm9uRW1wdHlMYXlvdXRNaWxlc3RvbmVXYXRjaGRvZ1RpbWVyRmlyZWQpCiAgICAgLCBt X2lzVHJhbnNwYXJlbnQoZmFsc2UpCiAgICAgLCBtX2Jhc2VCYWNrZ3JvdW5kQ29sb3IoQ29sb3I6 OndoaXRlKQogICAgICwgbV9tZWRpYVR5cGUoInNjcmVlbiIpCkBAIC0yOTIsNiArMjkzLDcgQEAg dm9pZCBGcmFtZVZpZXc6OnJlc2V0KCkKIAogdm9pZCBGcmFtZVZpZXc6OnJlc2V0TGF5b3V0TWls ZXN0b25lcygpCiB7CisgICAgbV9maXJzdFZpc3VhbGx5Tm9uRW1wdHlNaWxlc3RvbmVXYXRjaGRv Z1RpbWVyLnN0b3AoKTsKICAgICBtX2ZpcnN0TGF5b3V0Q2FsbGJhY2tQZW5kaW5nID0gZmFsc2U7 CiAgICAgbV9pc1Zpc3VhbGx5Tm9uRW1wdHkgPSBmYWxzZTsKICAgICBtX2ZpcnN0VmlzdWFsbHlO b25FbXB0eUxheW91dENhbGxiYWNrUGVuZGluZyA9IHRydWU7CkBAIC0yODQxLDYgKzI4NDMsOSBA QCB2b2lkIEZyYW1lVmlldzo6ZGlzYWJsZUxheWVyRmx1c2hUaHJvdHRsaW5nVGVtcG9yYXJpbHlG b3JJbnRlcmFjdGlvbigpCiAKIHZvaWQgRnJhbWVWaWV3Ojpsb2FkUHJvZ3Jlc3NpbmdTdGF0dXND aGFuZ2VkKCkKIHsKKyAgICBhdXRvIGhhc1BlbmRpbmdWaXN1YWxseU5vbkVtcHR5Q2FsbGJhY2sg PSBtX2ZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dENhbGxiYWNrUGVuZGluZyAmJiAhbV9pc1Zp c3VhbGx5Tm9uRW1wdHk7IAorICAgIGlmIChoYXNQZW5kaW5nVmlzdWFsbHlOb25FbXB0eUNhbGxi YWNrICYmIGZyYW1lKCkubG9hZGVyKCkuaXNDb21wbGV0ZSgpKQorICAgICAgICBoYW5kbGVGaXJz dFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXRNaWxlc3RvbmUoKTsKICAgICB1cGRhdGVMYXllckZsdXNo VGhyb3R0bGluZygpOwogICAgIGFkanVzdFRpbGVkQmFja2luZ0NvdmVyYWdlKCk7CiB9CkBAIC00 NDMxLDcgKzQ0MzYsNyBAQCBzdGF0aWMgYm9vbCBlbGVtZW50T3ZlcmZsb3dSZWN0SXNMYXJnZXJU aGFuVGhyZXNob2xkKGNvbnN0IEVsZW1lbnQmIGVsZW1lbnQpCiAgICAgcmV0dXJuIGZhbHNlOwog fQogCi1ib29sIEZyYW1lVmlldzo6cXVhbGlmaWVzQXNWaXN1YWxseU5vbkVtcHR5KCkgY29uc3QK K2Jvb2wgRnJhbWVWaWV3OjpxdWFsaWZpZXNBc1Zpc3VhbGx5Tm9uRW1wdHkoKQogewogICAgIC8v IE5vIGNvbnRlbnQgeWV0LgogICAgIEVsZW1lbnQqIGRvY3VtZW50RWxlbWVudCA9IGZyYW1lKCku ZG9jdW1lbnQoKS0+ZG9jdW1lbnRFbGVtZW50KCk7CkBAIC00NDQzLDkgKzQ0NDgsMTIgQEAgYm9v bCBGcmFtZVZpZXc6OnF1YWxpZmllc0FzVmlzdWFsbHlOb25FbXB0eSgpIGNvbnN0CiAgICAgICAg IHJldHVybiBmYWxzZTsKIAogICAgIGF1dG8gZmluaXNoZWRQYXJzaW5nTWFpbkRvY3VtZW50ID0g ZnJhbWUoKS5sb2FkZXIoKS5zdGF0ZU1hY2hpbmUoKS5jb21taXR0ZWRGaXJzdFJlYWxEb2N1bWVu dExvYWQoKSAmJiAhZnJhbWUoKS5kb2N1bWVudCgpLT5wYXJzaW5nKCk7Ci0gICAgLy8gRW5zdXJl IHRoYXQgd2UgYWx3YXlzIGZpcmUgdmlzdWFsbHkgbm9uLWVtcHR5IG1pbGVzdG9uZSBldmVudHVh bGx5LgotICAgIGlmIChmaW5pc2hlZFBhcnNpbmdNYWluRG9jdW1lbnQgJiYgZnJhbWUoKS5sb2Fk ZXIoKS5pc0NvbXBsZXRlKCkpCi0gICAgICAgIHJldHVybiB0cnVlOworICAgIGlmIChmaW5pc2hl ZFBhcnNpbmdNYWluRG9jdW1lbnQpIHsKKyAgICAgICAgaWYgKGZyYW1lKCkubG9hZGVyKCkuaXND b21wbGV0ZSgpKQorICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIC8vIEVuc3VyZSB0 aGF0IHdlIGFsd2F5cyBmaXJlIHZpc3VhbGx5IG5vbi1lbXB0eSBtaWxlc3RvbmUgZXZlbnR1YWxs eS4KKyAgICAgICAgbV9maXJzdFZpc3VhbGx5Tm9uRW1wdHlNaWxlc3RvbmVXYXRjaGRvZ1RpbWVy LnN0YXJ0T25lU2hvdCg0X3MpOworICAgIH0KIAogICAgIGF1dG8gaXNWaXNpYmxlID0gW10oY29u c3QgRWxlbWVudCogZWxlbWVudCkgewogICAgICAgICBpZiAoIWVsZW1lbnQgfHwgIWVsZW1lbnQt PnJlbmRlcmVyKCkpCkBAIC00NTM1LDkgKzQ1NDMsMzYgQEAgdm9pZCBGcmFtZVZpZXc6OnVwZGF0 ZUlzVmlzdWFsbHlOb25FbXB0eSgpCiAgICAgaWYgKCFxdWFsaWZpZXNBc1Zpc3VhbGx5Tm9uRW1w dHkoKSkKICAgICAgICAgcmV0dXJuOwogICAgIG1faXNWaXN1YWxseU5vbkVtcHR5ID0gdHJ1ZTsK KyAgICBtX2ZpcnN0VmlzdWFsbHlOb25FbXB0eU1pbGVzdG9uZVdhdGNoZG9nVGltZXIuc3RvcCgp OwogICAgIGFkanVzdFRpbGVkQmFja2luZ0NvdmVyYWdlKCk7CiB9CiAKK3ZvaWQgRnJhbWVWaWV3 OjpmaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXRNaWxlc3RvbmVXYXRjaGRvZ1RpbWVyRmlyZWQo KQoreworICAgIGlmICghbV9maXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXRDYWxsYmFja1BlbmRp bmcgJiYgbV9pc1Zpc3VhbGx5Tm9uRW1wdHkpCisgICAgICAgIHJldHVybjsKKyAgICAKKyAgICBS RUxFQVNFX0xPR19JRl9BTExPV0VEKCJGcmFtZVZpZXc6OmZpcnN0VmlzdWFsbHlOb25FbXB0eUxh eW91dE1pbGVzdG9uZVdhdGNoZG9nVGltZXJGaXJlZCgpIC0gZGVsYXllZCBmaXJzdCBwYWludCAo aXMgbWFpbiBmcmFtZSAlZCkiLCBmcmFtZSgpLmlzTWFpbkZyYW1lKCkpOworICAgIGhhbmRsZUZp cnN0VmlzdWFsbHlOb25FbXB0eUxheW91dE1pbGVzdG9uZSgpOworfQorCit2b2lkIEZyYW1lVmll dzo6aGFuZGxlRmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0TWlsZXN0b25lKCkKK3sKKyAgICBB U1NFUlQoIW1faXNWaXN1YWxseU5vbkVtcHR5KTsKKyAgICBBU1NFUlQobV9maXJzdFZpc3VhbGx5 Tm9uRW1wdHlMYXlvdXRDYWxsYmFja1BlbmRpbmcpOworICAgIG1faXNWaXN1YWxseU5vbkVtcHR5 ID0gdHJ1ZTsKKyAgICBtX2ZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dENhbGxiYWNrUGVuZGlu ZyA9IGZhbHNlOworICAgIG1fZmlyc3RWaXN1YWxseU5vbkVtcHR5TWlsZXN0b25lV2F0Y2hkb2dU aW1lci5zdG9wKCk7CisgICAgYWRkUGFpbnRQZW5kaW5nTWlsZXN0b25lcyhEaWRGaXJzdE1lYW5p bmdmdWxQYWludCk7CisKKyAgICBhdXRvKiBwYWdlID0gZnJhbWUoKS5wYWdlKCk7CisgICAgaWYg KCFwYWdlIHx8ICFwYWdlLT5yZXF1ZXN0ZWRMYXlvdXRNaWxlc3RvbmVzKCkuY29udGFpbnMoRGlk Rmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0KSkKKyAgICAgICAgcmV0dXJuOworICAgIGlmICgh ZnJhbWUoKS5pc01haW5GcmFtZSgpKQorICAgICAgICByZXR1cm47CisgICAgZnJhbWUoKS5sb2Fk ZXIoKS5kaWRSZWFjaExheW91dE1pbGVzdG9uZShEaWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlv dXQpOworfQorCiBib29sIEZyYW1lVmlldzo6aXNWaWV3Rm9yRG9jdW1lbnRJbkZyYW1lKCkgY29u c3QKIHsKICAgICBSZW5kZXJWaWV3KiByZW5kZXJWaWV3ID0gdGhpcy0+cmVuZGVyVmlldygpOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaCBiL1NvdXJjZS9XZWJD b3JlL3BhZ2UvRnJhbWVWaWV3LmgKaW5kZXggMjk3NmI1NjdkYmYwYTE5Nzg5Yjc2ZTYwOWExMTdl NjJiNTExODI1Yi4uOTNlZjFlMTIyNDFkNDUxMzRjY2YxZTQwZjNkODM0MTllNTFkZGMxZCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wYWdlL0ZyYW1lVmlldy5oCkBAIC03ODgsNyArNzg4LDcgQEAgcHJpdmF0ZToKIAogICAg IHZvaWQgbWFya1Jvb3RPckJvZHlSZW5kZXJlckRpcnR5KCkgY29uc3Q7CiAKLSAgICBib29sIHF1 YWxpZmllc0FzVmlzdWFsbHlOb25FbXB0eSgpIGNvbnN0OworICAgIGJvb2wgcXVhbGlmaWVzQXNW aXN1YWxseU5vbkVtcHR5KCk7CiAgICAgYm9vbCBpc1ZpZXdGb3JEb2N1bWVudEluRnJhbWUoKSBj b25zdDsKIAogICAgIEFYT2JqZWN0Q2FjaGUqIGF4T2JqZWN0Q2FjaGUoKSBjb25zdDsKQEAgLTgw OSw2ICs4MDksOSBAQCBwcml2YXRlOgogICAgIH07CiAgICAgdm9pZCBvdmVycmlkZVZpZXdwb3J0 U2l6ZUZvckNTU1ZpZXdwb3J0VW5pdHMoT3ZlcnJpZGVWaWV3cG9ydFNpemUpOwogCisgICAgdm9p ZCBoYW5kbGVGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXRNaWxlc3RvbmUoKTsKKyAgICB2b2lk IGZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dE1pbGVzdG9uZVdhdGNoZG9nVGltZXJGaXJlZCgp OworCiAgICAgSGFzaFNldDxXaWRnZXQqPiBtX3dpZGdldHNJblJlbmRlclRyZWU7CiAKICAgICBz dGF0aWMgTW9ub3RvbmljVGltZSBzQ3VycmVudFBhaW50VGltZVN0YW1wOyAvLyB1c2VkIGZvciBk ZXRlY3RpbmcgZGVjb2RlZCByZXNvdXJjZSB0aHJhc2ggaW4gdGhlIGNhY2hlCkBAIC04MzAsNiAr ODMzLDcgQEAgcHJpdmF0ZToKICAgICBUaW1lciBtX3VwZGF0ZVdpZGdldFBvc2l0aW9uc1RpbWVy OwogCiAgICAgYm9vbCBtX2ZpcnN0TGF5b3V0Q2FsbGJhY2tQZW5kaW5nOworICAgIFRpbWVyIG1f Zmlyc3RWaXN1YWxseU5vbkVtcHR5TWlsZXN0b25lV2F0Y2hkb2dUaW1lcjsKIAogICAgIGJvb2wg bV9pc1RyYW5zcGFyZW50OwogI2lmIEVOQUJMRShEQVJLX01PREVfQ1NTKQo= 360014 2019-01-24 08:47:02 -0800 2019-01-24 10:17:09 -0800 Patch bug-193741-20190124084657.patch text/plain 6927 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5OTI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjg3MGU2YjgwOTVmMDVh MTFhZGFlMWVmYjA2OGY3MWEyZjdkZWE5NS4uYThjMzJlOGRlMzE3MjgyMWJjMmVjZjc4YTRkNTU0 OTg5YzU3MTcyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDE5LTAxLTIzICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgRGlkRmlyc3RWaXN1YWxseU5v bkVtcHR5TGF5b3V0IG1pbGVzdG9uZSBzaG91bGQgYWx3YXlzIGZpcmUgYXQgc29tZSBwb2ludC4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5Mzc0MQor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDcxMzUwMzA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgZmlyZUxheW91dFJlbGF0ZWRNaWxlc3RvbmVzSWZO ZWVkZWQoKSBpcyBwYXJ0IG9mIHRoZSBwb3N0LWxheW91dCB0YXNrcy4gSW4gY2VydGFpbiBjYXNl cyB3aGVuCisgICAgICAgICAgICAxLiB0aGUgcmVjZWl2ZWQgZGF0YSBpcyBub3QgImNvbnRlbnRm dWwiIHlldAorICAgICAgICAgICAgMi4gYW5kIHdlIGFyZSBleHBlY3Rpbmcgc29tZSBtb3JlIChs b2FkaW5nIGlzIG5vdCBjb21wbGV0ZSB5ZXQpCisgICAgICAgICAgICAzLiBidXQgbm8gbGF5b3V0 IGlzIGluaXRpYXRlZCBhbnltb3JlCisgICAgICAgIG5vdGhpbmcgdHJpZ2dlcnMgdGhlIG1pbGVz dG9uZSBmaXJpbmcuCisKKyAgICAgICAgVGhpcyBwYXRjaCBlbnN1cmVzIHRoYXQgd2UgYWx3YXlz IGZpcmUgdGhlIERpZEZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dCBldmVudHVhbGx5IChpZiBy ZXF1ZXN0ZWQpLgorICAgICAgICBFaXRoZXIgd2hlbgorICAgICAgICAgICAgMS4gbWFpbmZyYW1l IGZpbmlzaGVkIGxvYWRpbmcgY29tcGxldGVseQorICAgICAgICAgICAgMi4gb3Igb24gYSA0cyB3 YXRjaGRvZyB0aW1lcgorCisgICAgICAgICogcGFnZS9GcmFtZVZpZXcuY3BwOgorICAgICAgICAo V2ViQ29yZTo6RnJhbWVWaWV3OjpGcmFtZVZpZXcpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVW aWV3OjpyZXNldExheW91dE1pbGVzdG9uZXMpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3 Ojpsb2FkUHJvZ3Jlc3NpbmdTdGF0dXNDaGFuZ2VkKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1l Vmlldzo6cXVhbGlmaWVzQXNWaXN1YWxseU5vbkVtcHR5KToKKyAgICAgICAgKFdlYkNvcmU6OkZy YW1lVmlldzo6dXBkYXRlSXNWaXN1YWxseU5vbkVtcHR5KToKKyAgICAgICAgKFdlYkNvcmU6OkZy YW1lVmlldzo6Zmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0TWlsZXN0b25lV2F0Y2hkb2dGaXJl ZCk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OmZpcmVGaXJzdFZpc3VhbGx5Tm9uRW1w dHlMYXlvdXRNaWxlc3RvbmVJZlJlcXVlc3RlZCk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZp ZXc6OnF1YWxpZmllc0FzVmlzdWFsbHlOb25FbXB0eSBjb25zdCk6IERlbGV0ZWQuCisgICAgICAg ICogcGFnZS9GcmFtZVZpZXcuaDoKKwogMjAxOS0wMS0xNCAgWmFuIERvYmVyc2VrICA8emRvYmVy c2VrQGlnYWxpYS5jb20+CiAKICAgICAgICAgRE9NQ2FjaGVTdG9yYWdlOiB1c2UtYWZ0ZXItbW92 ZSBpbiBkb1NlcXVlbnRpYWxNYXRjaCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdl L0ZyYW1lVmlldy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKaW5kZXgg ZDI1YTdlNjFhN2FlMzRjYjI1N2UxNGYwZTUyNWM3Mzk4MjI4MmRlOS4uYTNhMmIwZDRhODcxOGYw ZDY5NWQwY2NkZGM5MDVjNGNkNGYwMTAyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFn ZS9GcmFtZVZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcApA QCAtMTg3LDYgKzE4Nyw3IEBAIEZyYW1lVmlldzo6RnJhbWVWaWV3KEZyYW1lJiBmcmFtZSkKICAg ICAsIG1fY2FuSGF2ZVNjcm9sbGJhcnModHJ1ZSkKICAgICAsIG1fdXBkYXRlRW1iZWRkZWRPYmpl Y3RzVGltZXIoKnRoaXMsICZGcmFtZVZpZXc6OnVwZGF0ZUVtYmVkZGVkT2JqZWN0c1RpbWVyRmly ZWQpCiAgICAgLCBtX3VwZGF0ZVdpZGdldFBvc2l0aW9uc1RpbWVyKCp0aGlzLCAmRnJhbWVWaWV3 Ojp1cGRhdGVXaWRnZXRQb3NpdGlvbnNUaW1lckZpcmVkKQorICAgICwgbV9maXJzdFZpc3VhbGx5 Tm9uRW1wdHlNaWxlc3RvbmVXYXRjaGRvZ1RpbWVyKCp0aGlzLCAmRnJhbWVWaWV3OjpmaXJzdFZp c3VhbGx5Tm9uRW1wdHlMYXlvdXRNaWxlc3RvbmVXYXRjaGRvZ1RpbWVyRmlyZWQpCiAgICAgLCBt X2lzVHJhbnNwYXJlbnQoZmFsc2UpCiAgICAgLCBtX2Jhc2VCYWNrZ3JvdW5kQ29sb3IoQ29sb3I6 OndoaXRlKQogICAgICwgbV9tZWRpYVR5cGUoInNjcmVlbiIpCkBAIC0yOTIsNiArMjkzLDcgQEAg dm9pZCBGcmFtZVZpZXc6OnJlc2V0KCkKIAogdm9pZCBGcmFtZVZpZXc6OnJlc2V0TGF5b3V0TWls ZXN0b25lcygpCiB7CisgICAgbV9maXJzdFZpc3VhbGx5Tm9uRW1wdHlNaWxlc3RvbmVXYXRjaGRv Z1RpbWVyLnN0b3AoKTsKICAgICBtX2ZpcnN0TGF5b3V0Q2FsbGJhY2tQZW5kaW5nID0gZmFsc2U7 CiAgICAgbV9pc1Zpc3VhbGx5Tm9uRW1wdHkgPSBmYWxzZTsKICAgICBtX2ZpcnN0VmlzdWFsbHlO b25FbXB0eUxheW91dENhbGxiYWNrUGVuZGluZyA9IHRydWU7CkBAIC0yODQxLDYgKzI4NDMsOSBA QCB2b2lkIEZyYW1lVmlldzo6ZGlzYWJsZUxheWVyRmx1c2hUaHJvdHRsaW5nVGVtcG9yYXJpbHlG b3JJbnRlcmFjdGlvbigpCiAKIHZvaWQgRnJhbWVWaWV3Ojpsb2FkUHJvZ3Jlc3NpbmdTdGF0dXND aGFuZ2VkKCkKIHsKKyAgICBhdXRvIGhhc1BlbmRpbmdWaXN1YWxseU5vbkVtcHR5Q2FsbGJhY2sg PSBtX2ZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dENhbGxiYWNrUGVuZGluZyAmJiAhbV9pc1Zp c3VhbGx5Tm9uRW1wdHk7IAorICAgIGlmIChoYXNQZW5kaW5nVmlzdWFsbHlOb25FbXB0eUNhbGxi YWNrICYmIGZyYW1lKCkubG9hZGVyKCkuaXNDb21wbGV0ZSgpKQorICAgICAgICBoYW5kbGVGaXJz dFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXRNaWxlc3RvbmUoKTsKICAgICB1cGRhdGVMYXllckZsdXNo VGhyb3R0bGluZygpOwogICAgIGFkanVzdFRpbGVkQmFja2luZ0NvdmVyYWdlKCk7CiB9CkBAIC00 NDMxLDcgKzQ0MzYsNyBAQCBzdGF0aWMgYm9vbCBlbGVtZW50T3ZlcmZsb3dSZWN0SXNMYXJnZXJU aGFuVGhyZXNob2xkKGNvbnN0IEVsZW1lbnQmIGVsZW1lbnQpCiAgICAgcmV0dXJuIGZhbHNlOwog fQogCi1ib29sIEZyYW1lVmlldzo6cXVhbGlmaWVzQXNWaXN1YWxseU5vbkVtcHR5KCkgY29uc3QK K2Jvb2wgRnJhbWVWaWV3OjpxdWFsaWZpZXNBc1Zpc3VhbGx5Tm9uRW1wdHkoKQogewogICAgIC8v IE5vIGNvbnRlbnQgeWV0LgogICAgIEVsZW1lbnQqIGRvY3VtZW50RWxlbWVudCA9IGZyYW1lKCku ZG9jdW1lbnQoKS0+ZG9jdW1lbnRFbGVtZW50KCk7CkBAIC00NDQzLDkgKzQ0NDgsMTIgQEAgYm9v bCBGcmFtZVZpZXc6OnF1YWxpZmllc0FzVmlzdWFsbHlOb25FbXB0eSgpIGNvbnN0CiAgICAgICAg IHJldHVybiBmYWxzZTsKIAogICAgIGF1dG8gZmluaXNoZWRQYXJzaW5nTWFpbkRvY3VtZW50ID0g ZnJhbWUoKS5sb2FkZXIoKS5zdGF0ZU1hY2hpbmUoKS5jb21taXR0ZWRGaXJzdFJlYWxEb2N1bWVu dExvYWQoKSAmJiAhZnJhbWUoKS5kb2N1bWVudCgpLT5wYXJzaW5nKCk7Ci0gICAgLy8gRW5zdXJl IHRoYXQgd2UgYWx3YXlzIGZpcmUgdmlzdWFsbHkgbm9uLWVtcHR5IG1pbGVzdG9uZSBldmVudHVh bGx5LgotICAgIGlmIChmaW5pc2hlZFBhcnNpbmdNYWluRG9jdW1lbnQgJiYgZnJhbWUoKS5sb2Fk ZXIoKS5pc0NvbXBsZXRlKCkpCi0gICAgICAgIHJldHVybiB0cnVlOworICAgIGlmIChmaW5pc2hl ZFBhcnNpbmdNYWluRG9jdW1lbnQpIHsKKyAgICAgICAgaWYgKGZyYW1lKCkubG9hZGVyKCkuaXND b21wbGV0ZSgpKQorICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIC8vIEVuc3VyZSB0 aGF0IHdlIGFsd2F5cyBmaXJlIHZpc3VhbGx5IG5vbi1lbXB0eSBtaWxlc3RvbmUgZXZlbnR1YWxs eS4KKyAgICAgICAgbV9maXJzdFZpc3VhbGx5Tm9uRW1wdHlNaWxlc3RvbmVXYXRjaGRvZ1RpbWVy LnN0YXJ0T25lU2hvdCg0X3MpOworICAgIH0KIAogICAgIGF1dG8gaXNWaXNpYmxlID0gW10oY29u c3QgRWxlbWVudCogZWxlbWVudCkgewogICAgICAgICBpZiAoIWVsZW1lbnQgfHwgIWVsZW1lbnQt PnJlbmRlcmVyKCkpCkBAIC00NTM1LDkgKzQ1NDMsMzUgQEAgdm9pZCBGcmFtZVZpZXc6OnVwZGF0 ZUlzVmlzdWFsbHlOb25FbXB0eSgpCiAgICAgaWYgKCFxdWFsaWZpZXNBc1Zpc3VhbGx5Tm9uRW1w dHkoKSkKICAgICAgICAgcmV0dXJuOwogICAgIG1faXNWaXN1YWxseU5vbkVtcHR5ID0gdHJ1ZTsK KyAgICBtX2ZpcnN0VmlzdWFsbHlOb25FbXB0eU1pbGVzdG9uZVdhdGNoZG9nVGltZXIuc3RvcCgp OwogICAgIGFkanVzdFRpbGVkQmFja2luZ0NvdmVyYWdlKCk7CiB9CiAKK3ZvaWQgRnJhbWVWaWV3 OjpmaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXRNaWxlc3RvbmVXYXRjaGRvZ1RpbWVyRmlyZWQo KQoreworICAgIGlmICghbV9maXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXRDYWxsYmFja1BlbmRp bmcgJiYgbV9pc1Zpc3VhbGx5Tm9uRW1wdHkpCisgICAgICAgIHJldHVybjsKKyAgICAKKyAgICBS RUxFQVNFX0xPR19JRl9BTExPV0VEKCJGcmFtZVZpZXc6OmZpcnN0VmlzdWFsbHlOb25FbXB0eUxh eW91dE1pbGVzdG9uZVdhdGNoZG9nVGltZXJGaXJlZCgpIC0gZGVsYXllZCBmaXJzdCBwYWludCAo aXMgbWFpbiBmcmFtZSAlZCkiLCBmcmFtZSgpLmlzTWFpbkZyYW1lKCkpOworICAgIGhhbmRsZUZp cnN0VmlzdWFsbHlOb25FbXB0eUxheW91dE1pbGVzdG9uZSgpOworfQorCit2b2lkIEZyYW1lVmll dzo6aGFuZGxlRmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0TWlsZXN0b25lKCkKK3sKKyAgICBB U1NFUlQoIW1faXNWaXN1YWxseU5vbkVtcHR5KTsKKyAgICBBU1NFUlQobV9maXJzdFZpc3VhbGx5 Tm9uRW1wdHlMYXlvdXRDYWxsYmFja1BlbmRpbmcpOworICAgIG1faXNWaXN1YWxseU5vbkVtcHR5 ID0gdHJ1ZTsKKyAgICBtX2ZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dENhbGxiYWNrUGVuZGlu ZyA9IGZhbHNlOworICAgIG1fZmlyc3RWaXN1YWxseU5vbkVtcHR5TWlsZXN0b25lV2F0Y2hkb2dU aW1lci5zdG9wKCk7CisgICAgYWRkUGFpbnRQZW5kaW5nTWlsZXN0b25lcyhEaWRGaXJzdE1lYW5p bmdmdWxQYWludCk7CisKKyAgICBpZiAoIWZyYW1lKCkuaXNNYWluRnJhbWUoKSkKKyAgICAgICAg cmV0dXJuOworICAgIGlmICghZnJhbWUoKS5wYWdlKCkgfHwgIWZyYW1lKCkucGFnZSgpLT5yZXF1 ZXN0ZWRMYXlvdXRNaWxlc3RvbmVzKCkuY29udGFpbnMoRGlkRmlyc3RWaXN1YWxseU5vbkVtcHR5 TGF5b3V0KSkKKyAgICAgICAgcmV0dXJuOworICAgIGZyYW1lKCkubG9hZGVyKCkuZGlkUmVhY2hM YXlvdXRNaWxlc3RvbmUoRGlkRmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0KTsKK30KKwogYm9v bCBGcmFtZVZpZXc6OmlzVmlld0ZvckRvY3VtZW50SW5GcmFtZSgpIGNvbnN0CiB7CiAgICAgUmVu ZGVyVmlldyogcmVuZGVyVmlldyA9IHRoaXMtPnJlbmRlclZpZXcoKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1l Vmlldy5oCmluZGV4IDI5NzZiNTY3ZGJmMGExOTc4OWI3NmU2MDlhMTE3ZTYyYjUxMTgyNWIuLjkz ZWYxZTEyMjQxZDQ1MTM0Y2NmMWU0MGYzZDgzNDE5ZTUxZGRjMWQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFt ZVZpZXcuaApAQCAtNzg4LDcgKzc4OCw3IEBAIHByaXZhdGU6CiAKICAgICB2b2lkIG1hcmtSb290 T3JCb2R5UmVuZGVyZXJEaXJ0eSgpIGNvbnN0OwogCi0gICAgYm9vbCBxdWFsaWZpZXNBc1Zpc3Vh bGx5Tm9uRW1wdHkoKSBjb25zdDsKKyAgICBib29sIHF1YWxpZmllc0FzVmlzdWFsbHlOb25FbXB0 eSgpOwogICAgIGJvb2wgaXNWaWV3Rm9yRG9jdW1lbnRJbkZyYW1lKCkgY29uc3Q7CiAKICAgICBB WE9iamVjdENhY2hlKiBheE9iamVjdENhY2hlKCkgY29uc3Q7CkBAIC04MDksNiArODA5LDkgQEAg cHJpdmF0ZToKICAgICB9OwogICAgIHZvaWQgb3ZlcnJpZGVWaWV3cG9ydFNpemVGb3JDU1NWaWV3 cG9ydFVuaXRzKE92ZXJyaWRlVmlld3BvcnRTaXplKTsKIAorICAgIHZvaWQgaGFuZGxlRmlyc3RW aXN1YWxseU5vbkVtcHR5TGF5b3V0TWlsZXN0b25lKCk7CisgICAgdm9pZCBmaXJzdFZpc3VhbGx5 Tm9uRW1wdHlMYXlvdXRNaWxlc3RvbmVXYXRjaGRvZ1RpbWVyRmlyZWQoKTsKKwogICAgIEhhc2hT ZXQ8V2lkZ2V0Kj4gbV93aWRnZXRzSW5SZW5kZXJUcmVlOwogCiAgICAgc3RhdGljIE1vbm90b25p Y1RpbWUgc0N1cnJlbnRQYWludFRpbWVTdGFtcDsgLy8gdXNlZCBmb3IgZGV0ZWN0aW5nIGRlY29k ZWQgcmVzb3VyY2UgdGhyYXNoIGluIHRoZSBjYWNoZQpAQCAtODMwLDYgKzgzMyw3IEBAIHByaXZh dGU6CiAgICAgVGltZXIgbV91cGRhdGVXaWRnZXRQb3NpdGlvbnNUaW1lcjsKIAogICAgIGJvb2wg bV9maXJzdExheW91dENhbGxiYWNrUGVuZGluZzsKKyAgICBUaW1lciBtX2ZpcnN0VmlzdWFsbHlO b25FbXB0eU1pbGVzdG9uZVdhdGNoZG9nVGltZXI7CiAKICAgICBib29sIG1faXNUcmFuc3BhcmVu dDsKICNpZiBFTkFCTEUoREFSS19NT0RFX0NTUykK 360020 2019-01-24 10:17:10 -0800 2019-01-24 10:52:00 -0800 Patch bug-193741-20190124101706.patch text/plain 3790 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5OTI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjg3MGU2YjgwOTVmMDVh MTFhZGFlMWVmYjA2OGY3MWEyZjdkZWE5NS4uMTVjMGUyOTg2ZDc4OWJjN2EwNjI0NmE2MmJjYjcy OTQwZGEzMzYyMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE5LTAxLTIzICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgRGlkRmlyc3RWaXN1YWxseU5v bkVtcHR5TGF5b3V0IG1pbGVzdG9uZSBzaG91bGQgYWx3YXlzIGZpcmUgYXQgc29tZSBwb2ludC4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5Mzc0MQor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDcxMzUwMzA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgZmlyZUxheW91dFJlbGF0ZWRNaWxlc3RvbmVzSWZO ZWVkZWQoKSBpcyBwYXJ0IG9mIHRoZSBwb3N0LWxheW91dCB0YXNrcy4gSW4gY2VydGFpbiBjYXNl cyB3aGVuCisgICAgICAgICAgICAxLiB0aGUgcmVjZWl2ZWQgZGF0YSBpcyBub3QgImNvbnRlbnRm dWwiIHlldAorICAgICAgICAgICAgMi4gYW5kIHdlIGFyZSBleHBlY3Rpbmcgc29tZSBtb3JlIChs b2FkaW5nIGlzIG5vdCBjb21wbGV0ZSB5ZXQpCisgICAgICAgICAgICAzLiBidXQgbm8gbGF5b3V0 IGlzIGluaXRpYXRlZCBhbnltb3JlCisgICAgICAgIG5vdGhpbmcgdHJpZ2dlcnMgdGhlIG1pbGVz dG9uZSBmaXJpbmcuCisKKyAgICAgICAgVGhpcyBwYXRjaCBlbnN1cmVzIHRoYXQgd2UgZmlyZSB0 aGUgRGlkRmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0IHdoZW4gdGhlIGZyYW1lIGxvYWQgaXMg Y29tcGxldGUgdW5sZXNzIHdlIGFscmVhZHkgZGlkLgorCisgICAgICAgICogcGFnZS9GcmFtZVZp ZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3OjpGcmFtZVZpZXcpOgorICAgICAg ICAoV2ViQ29yZTo6RnJhbWVWaWV3OjpyZXNldExheW91dE1pbGVzdG9uZXMpOgorICAgICAgICAo V2ViQ29yZTo6RnJhbWVWaWV3Ojpsb2FkUHJvZ3Jlc3NpbmdTdGF0dXNDaGFuZ2VkKToKKyAgICAg ICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6cXVhbGlmaWVzQXNWaXN1YWxseU5vbkVtcHR5KToKKyAg ICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6dXBkYXRlSXNWaXN1YWxseU5vbkVtcHR5KToKKyAg ICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6Zmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0TWls ZXN0b25lV2F0Y2hkb2dGaXJlZCk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OmZpcmVG aXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXRNaWxlc3RvbmVJZlJlcXVlc3RlZCk6CisgICAgICAg IChXZWJDb3JlOjpGcmFtZVZpZXc6OnF1YWxpZmllc0FzVmlzdWFsbHlOb25FbXB0eSBjb25zdCk6 IERlbGV0ZWQuCisgICAgICAgICogcGFnZS9GcmFtZVZpZXcuaDoKKwogMjAxOS0wMS0xNCAgWmFu IERvYmVyc2VrICA8emRvYmVyc2VrQGlnYWxpYS5jb20+CiAKICAgICAgICAgRE9NQ2FjaGVTdG9y YWdlOiB1c2UtYWZ0ZXItbW92ZSBpbiBkb1NlcXVlbnRpYWxNYXRjaCgpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0Zy YW1lVmlldy5jcHAKaW5kZXggZDI1YTdlNjFhN2FlMzRjYjI1N2UxNGYwZTUyNWM3Mzk4MjI4MmRl OS4uYzVhNjAzYjJjM2FmMjEzNDBkMDNiNmUxNWM5ZDQxZjhmMGFlODZhYiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvRnJhbWVWaWV3LmNwcApAQCAtMjg0MSw2ICsyODQxLDkgQEAgdm9pZCBGcmFtZVZpZXc6OmRp c2FibGVMYXllckZsdXNoVGhyb3R0bGluZ1RlbXBvcmFyaWx5Rm9ySW50ZXJhY3Rpb24oKQogCiB2 b2lkIEZyYW1lVmlldzo6bG9hZFByb2dyZXNzaW5nU3RhdHVzQ2hhbmdlZCgpCiB7CisgICAgYXV0 byBoYXNQZW5kaW5nVmlzdWFsbHlOb25FbXB0eUNhbGxiYWNrID0gbV9maXJzdFZpc3VhbGx5Tm9u RW1wdHlMYXlvdXRDYWxsYmFja1BlbmRpbmcgJiYgIW1faXNWaXN1YWxseU5vbkVtcHR5OyAKKyAg ICBpZiAoaGFzUGVuZGluZ1Zpc3VhbGx5Tm9uRW1wdHlDYWxsYmFjayAmJiBmcmFtZSgpLmxvYWRl cigpLmlzQ29tcGxldGUoKSkKKyAgICAgICAgaGFuZGxlRmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5 b3V0TWlsZXN0b25lKCk7CiAgICAgdXBkYXRlTGF5ZXJGbHVzaFRocm90dGxpbmcoKTsKICAgICBh ZGp1c3RUaWxlZEJhY2tpbmdDb3ZlcmFnZSgpOwogfQpAQCAtNDUzOCw2ICs0NTQxLDIxIEBAIHZv aWQgRnJhbWVWaWV3Ojp1cGRhdGVJc1Zpc3VhbGx5Tm9uRW1wdHkoKQogICAgIGFkanVzdFRpbGVk QmFja2luZ0NvdmVyYWdlKCk7CiB9CiAKK3ZvaWQgRnJhbWVWaWV3OjpoYW5kbGVGaXJzdFZpc3Vh bGx5Tm9uRW1wdHlMYXlvdXRNaWxlc3RvbmUoKQoreworICAgIEFTU0VSVCghbV9pc1Zpc3VhbGx5 Tm9uRW1wdHkpOworICAgIEFTU0VSVChtX2ZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dENhbGxi YWNrUGVuZGluZyk7CisgICAgbV9pc1Zpc3VhbGx5Tm9uRW1wdHkgPSB0cnVlOworICAgIG1fZmly c3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0Q2FsbGJhY2tQZW5kaW5nID0gZmFsc2U7CisgICAgYWRk UGFpbnRQZW5kaW5nTWlsZXN0b25lcyhEaWRGaXJzdE1lYW5pbmdmdWxQYWludCk7CisKKyAgICBp ZiAoIWZyYW1lKCkuaXNNYWluRnJhbWUoKSkKKyAgICAgICAgcmV0dXJuOworICAgIGlmICghZnJh bWUoKS5wYWdlKCkgfHwgIWZyYW1lKCkucGFnZSgpLT5yZXF1ZXN0ZWRMYXlvdXRNaWxlc3RvbmVz KCkuY29udGFpbnMoRGlkRmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0KSkKKyAgICAgICAgcmV0 dXJuOworICAgIGZyYW1lKCkubG9hZGVyKCkuZGlkUmVhY2hMYXlvdXRNaWxlc3RvbmUoRGlkRmly c3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0KTsKK30KKwogYm9vbCBGcmFtZVZpZXc6OmlzVmlld0Zv ckRvY3VtZW50SW5GcmFtZSgpIGNvbnN0CiB7CiAgICAgUmVuZGVyVmlldyogcmVuZGVyVmlldyA9 IHRoaXMtPnJlbmRlclZpZXcoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJh bWVWaWV3LmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oCmluZGV4IDI5NzZiNTY3 ZGJmMGExOTc4OWI3NmU2MDlhMTE3ZTYyYjUxMTgyNWIuLjM0MzRhNGExNDllNmQ3M2FjZWI0MDI4 YmNiYTI3YWU2YmRmZDlhMmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVW aWV3LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaApAQCAtODA5LDYgKzgw OSw4IEBAIHByaXZhdGU6CiAgICAgfTsKICAgICB2b2lkIG92ZXJyaWRlVmlld3BvcnRTaXplRm9y Q1NTVmlld3BvcnRVbml0cyhPdmVycmlkZVZpZXdwb3J0U2l6ZSk7CiAKKyAgICB2b2lkIGhhbmRs ZUZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dE1pbGVzdG9uZSgpOworCiAgICAgSGFzaFNldDxX aWRnZXQqPiBtX3dpZGdldHNJblJlbmRlclRyZWU7CiAKICAgICBzdGF0aWMgTW9ub3RvbmljVGlt ZSBzQ3VycmVudFBhaW50VGltZVN0YW1wOyAvLyB1c2VkIGZvciBkZXRlY3RpbmcgZGVjb2RlZCBy ZXNvdXJjZSB0aHJhc2ggaW4gdGhlIGNhY2hlCg== 360022 2019-01-24 10:55:56 -0800 2019-01-24 13:57:27 -0800 Patch bug-193741-20190124105552.patch text/plain 1977 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5OTI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjg3MGU2YjgwOTVmMDVh MTFhZGFlMWVmYjA2OGY3MWEyZjdkZWE5NS4uMjBjNGY5YjRhY2JlNTA0MzhlNzc2ZTA4ZDAxZWI0 Y2Y5YzNjYjY0ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE5LTAxLTIzICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgRGlkRmlyc3RWaXN1YWxseU5v bkVtcHR5TGF5b3V0IG1pbGVzdG9uZSBzaG91bGQgYWx3YXlzIGZpcmUgYXQgc29tZSBwb2ludC4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5Mzc0MQor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDcxMzUwMzA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgZmlyZUxheW91dFJlbGF0ZWRNaWxlc3RvbmVzSWZO ZWVkZWQoKSBpcyBwYXJ0IG9mIHRoZSBwb3N0LWxheW91dCB0YXNrcy4gSW4gY2VydGFpbiBjYXNl cyB3aGVuCisgICAgICAgICAgICAxLiB0aGUgcmVjZWl2ZWQgZGF0YSBpcyBub3QgImNvbnRlbnRm dWwiIHlldAorICAgICAgICAgICAgMi4gYW5kIHdlIGFyZSBleHBlY3Rpbmcgc29tZSBtb3JlIChs b2FkaW5nIGlzIG5vdCBjb21wbGV0ZSB5ZXQpCisgICAgICAgICAgICAzLiBidXQgbm8gbGF5b3V0 IGlzIGluaXRpYXRlZCBhbnltb3JlCisgICAgICAgIG5vdGhpbmcgdHJpZ2dlcnMgdGhlIG1pbGVz dG9uZSBmaXJpbmcuCisKKyAgICAgICAgVGhpcyBwYXRjaCBlbnN1cmVzIHRoYXQgd2UgZmlyZSB0 aGUgRGlkRmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0IHdoZW4gdGhlIGZyYW1lIGxvYWQgaXMg Y29tcGxldGUgdW5sZXNzIHdlIGFscmVhZHkgZGlkLgorCisgICAgICAgICogcGFnZS9GcmFtZVZp ZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3OjpGcmFtZVZpZXcpOgorICAgICAg ICAoV2ViQ29yZTo6RnJhbWVWaWV3Ojpsb2FkUHJvZ3Jlc3NpbmdTdGF0dXNDaGFuZ2VkKToKKwog MjAxOS0wMS0xNCAgWmFuIERvYmVyc2VrICA8emRvYmVyc2VrQGlnYWxpYS5jb20+CiAKICAgICAg ICAgRE9NQ2FjaGVTdG9yYWdlOiB1c2UtYWZ0ZXItbW92ZSBpbiBkb1NlcXVlbnRpYWxNYXRjaCgp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKaW5kZXggZDI1YTdlNjFhN2FlMzRjYjI1N2UxNGYw ZTUyNWM3Mzk4MjI4MmRlOS4uN2U1MTIyMWI4NTQzZjM1YjZjYmY4YWE0NzI5ZDk0NGE5YTk3MmU0 NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcApAQCAtMjg0MSw2ICsyODQxLDkgQEAgdm9p ZCBGcmFtZVZpZXc6OmRpc2FibGVMYXllckZsdXNoVGhyb3R0bGluZ1RlbXBvcmFyaWx5Rm9ySW50 ZXJhY3Rpb24oKQogCiB2b2lkIEZyYW1lVmlldzo6bG9hZFByb2dyZXNzaW5nU3RhdHVzQ2hhbmdl ZCgpCiB7CisgICAgYXV0byBoYXNQZW5kaW5nVmlzdWFsbHlOb25FbXB0eUNhbGxiYWNrID0gbV9m aXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXRDYWxsYmFja1BlbmRpbmcgJiYgIW1faXNWaXN1YWxs eU5vbkVtcHR5OworICAgIGlmIChoYXNQZW5kaW5nVmlzdWFsbHlOb25FbXB0eUNhbGxiYWNrICYm IGZyYW1lKCkubG9hZGVyKCkuaXNDb21wbGV0ZSgpKQorICAgICAgICBmaXJlTGF5b3V0UmVsYXRl ZE1pbGVzdG9uZXNJZk5lZWRlZCgpOwogICAgIHVwZGF0ZUxheWVyRmx1c2hUaHJvdHRsaW5nKCk7 CiAgICAgYWRqdXN0VGlsZWRCYWNraW5nQ292ZXJhZ2UoKTsKIH0K 360034 2019-01-24 13:57:29 -0800 2019-01-24 14:30:58 -0800 Patch bug-193741-20190124135724.patch text/plain 9634 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5OTI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjg3MGU2YjgwOTVmMDVh MTFhZGFlMWVmYjA2OGY3MWEyZjdkZWE5NS4uNjE0ODEzNjU5ODViNGJkNWEzODkzMzM5OTRjMWYx NjBkNTZhNjc3ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE5LTAxLTIzICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgRGlkRmlyc3RWaXN1YWxseU5v bkVtcHR5TGF5b3V0IG1pbGVzdG9uZSBzaG91bGQgYWx3YXlzIGZpcmUgYXQgc29tZSBwb2ludC4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5Mzc0MQor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDcxMzUwMzA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg QW50dGkgS29pdmlzdG8gYW5kIFNpbW9uIEZyYXNlci4KKworICAgICAgICBmaXJlTGF5b3V0UmVs YXRlZE1pbGVzdG9uZXNJZk5lZWRlZCgpIGlzIHBhcnQgb2YgdGhlIHBvc3QtbGF5b3V0IHRhc2tz LiBJbiBjZXJ0YWluIGNhc2VzIHdoZW4KKyAgICAgICAgICAgIDEuIHRoZSByZWNlaXZlZCBkYXRh IGlzIG5vdCAiY29udGVudGZ1bCIgeWV0CisgICAgICAgICAgICAyLiBhbmQgd2UgYXJlIGV4cGVj dGluZyBzb21lIG1vcmUgKGxvYWRpbmcgaXMgbm90IGNvbXBsZXRlIHlldCkKKyAgICAgICAgICAg IDMuIGJ1dCBubyBsYXlvdXQgaXMgaW5pdGlhdGVkIGFueW1vcmUKKyAgICAgICAgbm90aGluZyB0 cmlnZ2VycyB0aGUgbWlsZXN0b25lIGZpcmluZy4KKworICAgICAgICBUaGlzIHBhdGNoIGVuc3Vy ZXMgdGhhdCB3ZSBmaXJlIHRoZSBEaWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXQgd2hlbiB0 aGUgZnJhbWUgbG9hZCBpcyBjb21wbGV0ZSB1bmxlc3Mgd2UgYWxyZWFkeSBkaWQuCisKKyAgICAg ICAgKiBwYWdlL0ZyYW1lVmlldy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OkZy YW1lVmlldyk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OmxvYWRQcm9ncmVzc2luZ1N0 YXR1c0NoYW5nZWQpOgorCiAyMDE5LTAxLTE0ICBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdh bGlhLmNvbT4KIAogICAgICAgICBET01DYWNoZVN0b3JhZ2U6IHVzZS1hZnRlci1tb3ZlIGluIGRv U2VxdWVudGlhbE1hdGNoKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVW aWV3LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAppbmRleCBkMjVhN2U2 MWE3YWUzNGNiMjU3ZTE0ZjBlNTI1YzczOTgyMjgyZGU5Li4xM2M4OWYzYWNhMDViZjE5NzJmMjE0 YzQ4ZDBjNzRmNTQyNmU3MDE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1l Vmlldy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCkBAIC0yODQx LDYgKzI4NDEsOSBAQCB2b2lkIEZyYW1lVmlldzo6ZGlzYWJsZUxheWVyRmx1c2hUaHJvdHRsaW5n VGVtcG9yYXJpbHlGb3JJbnRlcmFjdGlvbigpCiAKIHZvaWQgRnJhbWVWaWV3Ojpsb2FkUHJvZ3Jl c3NpbmdTdGF0dXNDaGFuZ2VkKCkKIHsKKyAgICBhdXRvIGhhc1BlbmRpbmdWaXN1YWxseU5vbkVt cHR5Q2FsbGJhY2sgPSBtX2ZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dENhbGxiYWNrUGVuZGlu ZyAmJiAhbV9pc1Zpc3VhbGx5Tm9uRW1wdHk7CisgICAgaWYgKGhhc1BlbmRpbmdWaXN1YWxseU5v bkVtcHR5Q2FsbGJhY2sgJiYgZnJhbWUoKS5sb2FkZXIoKS5pc0NvbXBsZXRlKCkpCisgICAgICAg IGZpcmVMYXlvdXRSZWxhdGVkTWlsZXN0b25lc0lmTmVlZGVkKCk7CiAgICAgdXBkYXRlTGF5ZXJG bHVzaFRocm90dGxpbmcoKTsKICAgICBhZGp1c3RUaWxlZEJhY2tpbmdDb3ZlcmFnZSgpOwogfQpA QCAtNTE4NSw4ICs1MTg4LDExIEBAIHZvaWQgRnJhbWVWaWV3OjpmaXJlTGF5b3V0UmVsYXRlZE1p bGVzdG9uZXNJZk5lZWRlZCgpCiAgICAgICAgICAgICBtaWxlc3RvbmVzQWNoaWV2ZWQuYWRkKERp ZFJlbmRlclNpZ25pZmljYW50QW1vdW50T2ZUZXh0KTsKICAgICB9CiAKLSAgICBpZiAobWlsZXN0 b25lc0FjaGlldmVkICYmIGZyYW1lKCkuaXNNYWluRnJhbWUoKSkKKyAgICBpZiAobWlsZXN0b25l c0FjaGlldmVkICYmIGZyYW1lKCkuaXNNYWluRnJhbWUoKSkgeworICAgICAgICBpZiAobWlsZXN0 b25lc0FjaGlldmVkLmNvbnRhaW5zKERpZEZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dCkpCisg ICAgICAgICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCJGcmFtZVZpZXc6OmZpcmVMYXlvdXRS ZWxhdGVkTWlsZXN0b25lc0lmTmVlZGVkKCkgLSBmaXJpbmcgZmlyc3QgdmlzdWFsbHkgbm9uLWVt cHR5IGxheW91dCBtaWxlc3RvbmUgb24gdGhlIG1haW4gZnJhbWUiKTsKICAgICAgICAgZnJhbWUo KS5sb2FkZXIoKS5kaWRSZWFjaExheW91dE1pbGVzdG9uZShtaWxlc3RvbmVzQWNoaWV2ZWQpOwor ICAgIH0KIH0KIAogdm9pZCBGcmFtZVZpZXc6OmZpcmVQYWludFJlbGF0ZWRNaWxlc3RvbmVzSWZO ZWVkZWQoKQpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmlu ZGV4IDc5ZTU4ZWZiZDQ3YmNiYzljNmVjZGNjZmJiOWI2ZTUzZmI5OGFhNmUuLjM4OGE1OTQ5Zjk5 NTY4YzlhMGU2ZWMwZWZjYmQ0NDkwOWIxYzFkOGIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxv ZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxOS0wMS0yMyAgWmFs YW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgorCisgICAgICAgIERpZEZpcnN0VmlzdWFsbHlO b25FbXB0eUxheW91dCBtaWxlc3RvbmUgc2hvdWxkIGFsd2F5cyBmaXJlIGF0IHNvbWUgcG9pbnQu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTM3NDEK KyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ3MTM1MDMwPgorCisgICAgICAgIFJldmlld2VkIGJ5 IEFudHRpIEtvaXZpc3RvIGFuZCBTaW1vbiBGcmFzZXIuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0 QVBJL1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKyAgICAgICAgKiBU ZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdC9MYXlvdXRNaWxlc3RvbmVzV2l0aEFsbENvbnRlbnRJ bkZyYW1lLmNwcDoKKyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OlRFU1QpOgorCiAyMDE5LTAxLTE0 ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bQkZDXSBB ZGQgYmFzaWMgYm94LXNpemluZyBzdXBwb3J0LgpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktp dEFQSS9UZXN0V2ViS2l0QVBJLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2ogYi9Ub29scy9UZXN0 V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagppbmRleCBm ZTI3ZTQ5OTM3MjU3ODI2MjFmZWY4MDRmYWQwNzZkOGMwYzU1ZTk3Li44YTk2ZWM0ZDYzNzkwNGYy MTliZWIwYjI4MDMyYWZjNGMzZDdlNDk1IDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJ L1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagorKysgYi9Ub29scy9UZXN0 V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpAQCAtNTEs NiArNTEsNyBAQAogCQkxMTVFQjM0MzFFRTBCQTAzMDAzQzJDMEEgLyogVmlld3BvcnRTaXplRm9y Vmlld3BvcnRVbml0cy5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmls ZVJlZiA9IDExNUVCMzQyMUVFMEI3MjAwMDNDMkMwQSAvKiBWaWV3cG9ydFNpemVGb3JWaWV3cG9y dFVuaXRzLm1tICovOyB9OwogCQkxMTcxQjI0RjIxOUY0OUNEMDBDQjg5N0QgLyogRmlyc3RNZWFu aW5nZnVsUGFpbnRNaWxlc3RvbmVfQnVuZGxlLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBC WEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDExQjdGRDIxMjE5RjQ2REQwMDY5QjI3RiAvKiBGaXJzdE1l YW5pbmdmdWxQYWludE1pbGVzdG9uZV9CdW5kbGUuY3BwICovOyB9OwogCQkxMUI3RkQyODIxOUY0 NzExMDA2OUIyN0YgLyogRmlyc3RNZWFuaW5nZnVsUGFpbnRNaWxlc3RvbmUuY3BwIGluIFNvdXJj ZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMTFCN0ZEMjIyMTlGNDZERDAw NjlCMjdGIC8qIEZpcnN0TWVhbmluZ2Z1bFBhaW50TWlsZXN0b25lLmNwcCAqLzsgfTsKKwkJMTFD MjU5OEQyMUZBNjMyNDAwNEM5RTIzIC8qIGFzeW5jLXNjcmlwdC1sb2FkLmh0bWwgaW4gQ29weSBS ZXNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMTFDMjU5OEMyMUZB NjE4RDAwNEM5RTIzIC8qIGFzeW5jLXNjcmlwdC1sb2FkLmh0bWwgKi87IH07CiAJCTE0M0RERTk4 MjBDOTAxOEIwMDdGNzZGQSAvKiBTZWN1cml0eS5mcmFtZXdvcmsgaW4gRnJhbWV3b3JrcyAqLyA9 IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA1NzRGNTVEMDIwNEQ0NzFDMDAyOTQ4QzYg LyogU2VjdXJpdHkuZnJhbWV3b3JrICovOyB9OwogCQkxQTAyQzg3MDEyNUQ0Q0ZEMDBFM0Y0QkQg LyogZmluZC5odG1sIGluIENvcHkgUmVzb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsg ZmlsZVJlZiA9IDFBMDJDODRCMTI1RDRBNUUwMEUzRjRCRCAvKiBmaW5kLmh0bWwgKi87IH07CiAJ CTFBMzUyNEFFMUQ2M0E0RkIwMDMxNzI5QiAvKiBTY29wZS5jcHAgaW4gU291cmNlcyAqLyA9IHtp c2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQTM1MjRBQzFENjNBNEZCMDAzMTcyOUIgLyog U2NvcGUuY3BwICovOyB9OwpAQCAtMTAwMCw2ICsxMDAxLDcgQEAKIAkJCQk1QzlFNTk0MjFEM0VC NUFDMDBFM0M2MkUgLyogQXBwbGljYXRpb25DYWNoZS5kYi1zaG0gaW4gQ29weSBSZXNvdXJjZXMg Ki8sCiAJCQkJNUM5RTU5NDMxRDNFQjVBQzAwRTNDNjJFIC8qIEFwcGxpY2F0aW9uQ2FjaGUuZGIt d2FsIGluIENvcHkgUmVzb3VyY2VzICovLAogCQkJCUY2QjdCRTk3MTc0NjlCOTYwMDhBMzQ0NSAv KiBhc3NvY2lhdGUtZm9ybS1jb250cm9scy5odG1sIGluIENvcHkgUmVzb3VyY2VzICovLAorCQkJ CTExQzI1OThEMjFGQTYzMjQwMDRDOUUyMyAvKiBhc3luYy1zY3JpcHQtbG9hZC5odG1sIGluIENv cHkgUmVzb3VyY2VzICovLAogCQkJCUY0ODU2Q0EzMUU2NDlFQTgwMDlEN0VFNyAvKiBhdHRhY2ht ZW50LWVsZW1lbnQuaHRtbCBpbiBDb3B5IFJlc291cmNlcyAqLywKIAkJCQlCNTVGMTFCNzE1MTdE MDMzMDA5MTU5MTYgLyogYXR0cmlidXRlZFN0cmluZ0N1c3RvbUZvbnQuaHRtbCBpbiBDb3B5IFJl c291cmNlcyAqLywKIAkJCQk3QzlFRDk4QjE3QTE5RjRCMDBFNERDMzMgLyogYXR0cmlidXRlZFN0 cmluZ1N0cmlrZXRocm91Z2guaHRtbCBpbiBDb3B5IFJlc291cmNlcyAqLywKQEAgLTEzMjQsNiAr MTMyNiw3IEBACiAJCTExNUVCMzQyMUVFMEI3MjAwMDNDMkMwQSAvKiBWaWV3cG9ydFNpemVGb3JW aWV3cG9ydFVuaXRzLm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGlu ZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBwYXRoID0g Vmlld3BvcnRTaXplRm9yVmlld3BvcnRVbml0cy5tbTsgc291cmNlVHJlZSA9ICI8Z3JvdXA+Ijsg fTsKIAkJMTFCN0ZEMjEyMTlGNDZERDAwNjlCMjdGIC8qIEZpcnN0TWVhbmluZ2Z1bFBhaW50TWls ZXN0b25lX0J1bmRsZS5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29k aW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBG aXJzdE1lYW5pbmdmdWxQYWludE1pbGVzdG9uZV9CdW5kbGUuY3BwOyBzb3VyY2VUcmVlID0gIjxn cm91cD4iOyB9OwogCQkxMUI3RkQyMjIxOUY0NkREMDA2OUIyN0YgLyogRmlyc3RNZWFuaW5nZnVs UGFpbnRNaWxlc3RvbmUuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNv ZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0g Rmlyc3RNZWFuaW5nZnVsUGFpbnRNaWxlc3RvbmUuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4i OyB9OworCQkxMUMyNTk4QzIxRkE2MThEMDA0QzlFMjMgLyogYXN5bmMtc2NyaXB0LWxvYWQuaHRt bCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25v d25GaWxlVHlwZSA9IHRleHQuaHRtbDsgcGF0aCA9ICJhc3luYy1zY3JpcHQtbG9hZC5odG1sIjsg c291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMTQ0NjQwMTIxNjdBODMwNTAwMEJEMjE4IC8q IExheW91dFVuaXQuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGlu ZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gTGF5 b3V0VW5pdC5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTE0RjNCMTEyMTVFNDVF QUIwMDIxMDA2OSAvKiBTYXR1cmF0ZWRBcml0aG1ldGljT3BlcmF0aW9ucy5jcHAgKi8gPSB7aXNh ID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUg PSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBTYXR1cmF0ZWRBcml0aG1ldGljT3BlcmF0aW9u cy5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTFBMDJDODRCMTI1RDRBNUUwMEUz RjRCRCAvKiBmaW5kLmh0bWwgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29k aW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSB0ZXh0Lmh0bWw7IHBhdGggPSBmaW5kLmh0bWw7 IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CkBAIC0zMjYzLDYgKzMyNjYsNyBAQAogCQkJCTFD MkI4MTg1MUM4OTI1MjMwMEE1NTI5RiAvKiBBaGVtLnR0ZiAqLywKIAkJCQk5M0QzRDE5QjE3QjFB N0IwMDBDN0M0MTUgLyogYWxsLWNvbnRlbnQtaW4tb25lLWlmcmFtZS5odG1sICovLAogCQkJCUY2 QjdCRTk2MTc0NjlCN0UwMDhBMzQ0NSAvKiBhc3NvY2lhdGUtZm9ybS1jb250cm9scy5odG1sICov LAorCQkJCTExQzI1OThDMjFGQTYxOEQwMDRDOUUyMyAvKiBhc3luYy1zY3JpcHQtbG9hZC5odG1s ICovLAogCQkJCUM5QzlBOTFBMjFERUQyNEQwMEZERTk2RSAvKiBhdWRpby13aXRoLXBsYXktYnV0 dG9uLmh0bWwgKi8sCiAJCQkJNzZFMTgyREUxNTQ3NUE4MzAwRjFGQUREIC8qIGF1dG8tc3VibWl0 dGluZy1mb3JtLmh0bWwgKi8sCiAJCQkJQzlDNjBFNjMxRTUzQTlCQTAwNkRBMTgxIC8qIGF1dG9w bGF5LWNoZWNrLWZyYW1lLmh0bWwgKi8sCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJ L1Rlc3RzL1dlYktpdC9MYXlvdXRNaWxlc3RvbmVzV2l0aEFsbENvbnRlbnRJbkZyYW1lLmNwcCBi L1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0L0xheW91dE1pbGVzdG9uZXNXaXRoQWxs Q29udGVudEluRnJhbWUuY3BwCmluZGV4IDQ3Y2RkNGJhYjA5N2NkOGI2ODZmYmJkMDliMGFiOTc3 MjhiNDdmNDEuLjVjZjgyNjA5NmI2NWU2Y2Y3Yjk2NTY1MzEzYzZiMDhiMWQ5MzdiY2UgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0L0xheW91dE1pbGVzdG9uZXNX aXRoQWxsQ29udGVudEluRnJhbWUuY3BwCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMv V2ViS2l0L0xheW91dE1pbGVzdG9uZXNXaXRoQWxsQ29udGVudEluRnJhbWUuY3BwCkBAIC0xMTcs NiArMTE3LDI4IEBAIFRFU1QoV2ViS2l0LCBGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXRBZnRl clBhZ2VDYWNoZVJlc3RvcmUpCiAgICAgZGlkTmF2aWdhdGUgPSBmYWxzZTsKIH0KIAorVEVTVChX ZWJLaXQsIEZpcnN0VmlzdWFsbHlOb25FbXB0eU1pbGVzdG9uZVdpdGhMb2FkQ29tcGxldGUpCit7 CisgICAgV0tSZXRhaW5QdHI8V0tDb250ZXh0UmVmPiBjb250ZXh0KEFkb3B0V0ssIFdLQ29udGV4 dENyZWF0ZVdpdGhDb25maWd1cmF0aW9uKG51bGxwdHIpKTsKKyAgICBQbGF0Zm9ybVdlYlZpZXcg d2ViVmlldyhjb250ZXh0LmdldCgpKTsKKworICAgIFdLUGFnZU5hdmlnYXRpb25DbGllbnRWMyBs b2FkZXJDbGllbnQ7CisgICAgbWVtc2V0KCZsb2FkZXJDbGllbnQsIDAsIHNpemVvZihsb2FkZXJD bGllbnQpKTsKKworICAgIGxvYWRlckNsaWVudC5iYXNlLnZlcnNpb24gPSAzOworICAgIGxvYWRl ckNsaWVudC5iYXNlLmNsaWVudEluZm8gPSAmd2ViVmlldzsKKyAgICBsb2FkZXJDbGllbnQucmVu ZGVyaW5nUHJvZ3Jlc3NEaWRDaGFuZ2UgPSByZW5kZXJpbmdQcm9ncmVzc0RpZENoYW5nZTsKKwor ICAgIFdLUGFnZVNldFBhZ2VOYXZpZ2F0aW9uQ2xpZW50KHdlYlZpZXcucGFnZSgpLCAmbG9hZGVy Q2xpZW50LmJhc2UpOworICAgIGRpZEZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dCA9IGZhbHNl OworCisgICAgV0tQYWdlTGlzdGVuRm9yTGF5b3V0TWlsZXN0b25lcyh3ZWJWaWV3LnBhZ2UoKSwg V0tQYWdlUmVuZGVyaW5nUHJvZ3Jlc3NFdmVudEZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dCk7 CisgICAgV0tQYWdlTG9hZFVSTCh3ZWJWaWV3LnBhZ2UoKSwgYWRvcHRXSyhVdGlsOjpjcmVhdGVV UkxGb3JSZXNvdXJjZSgiYXN5bmMtc2NyaXB0LWxvYWQiLCAiaHRtbCIpKS5nZXQoKSk7CisKKyAg ICBVdGlsOjpydW4oJmRpZEZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dCk7CisgICAgRVhQRUNU X1RSVUUoZGlkRmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0KTsKK30KKwogfSAvLyBuYW1lc3Bh Y2UgVGVzdFdlYktpdEFQSQogCiAjZW5kaWYKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRB UEkvVGVzdHMvV2ViS2l0L2FzeW5jLXNjcmlwdC1sb2FkLmh0bWwgYi9Ub29scy9UZXN0V2ViS2l0 QVBJL1Rlc3RzL1dlYktpdC9hc3luYy1zY3JpcHQtbG9hZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAw NjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmEzOGY4 NTg2NjE2OTQ5NTE1ODhjNmY3MWVlMGEwMzM0ZDdlY2NiYWQKLS0tIC9kZXYvbnVsbAorKysgYi9U b29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdC9hc3luYy1zY3JpcHQtbG9hZC5odG1sCkBA IC0wLDAgKzEsMTYgQEAKKzxoZWFkPgorPHN0eWxlPgorQGZvbnQtZmFjZSB7CisgICAgZm9udC1m YW1pbHk6ICdGb250QXdlc29tZSc7CisgICAgc3JjOiB1cmwoImZvbnQxLndvZmYyIikgZm9ybWF0 KCJ3b2ZmMiIpOworICAgIGZvbnQtd2VpZ2h0OiBub3JtYWw7CisgICAgZm9udC1zdHlsZTogbm9y bWFsCit9CisKKy5mb29iYXIgeworICAgIGZvbnQ6IG5vcm1hbCBub3JtYWwgbm9ybWFsIDE0cHgg LyAxIEZvbnRBd2Vzb21lOworfQorPC9zdHlsZT4KKzwvaGVhZD4KKzxib2R5PmZvb2JhcjxzY3Jp cHQ+ZG9jdW1lbnQuYm9keS5vZmZzZXRIZWlnaHQ8L3NjcmlwdD4KKzxzY3JpcHQgYXN5bmM9InRy dWUiIHNyYz0iZm9vYmFyLmpzIj48L3NjcmlwdD4KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxl Cg== 360039 2019-01-24 14:31:00 -0800 2019-01-24 14:58:15 -0800 Patch bug-193741-20190124143055.patch text/plain 9623 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5OTI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjg3MGU2YjgwOTVmMDVh MTFhZGFlMWVmYjA2OGY3MWEyZjdkZWE5NS4uNjE0ODEzNjU5ODViNGJkNWEzODkzMzM5OTRjMWYx NjBkNTZhNjc3ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE5LTAxLTIzICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgRGlkRmlyc3RWaXN1YWxseU5v bkVtcHR5TGF5b3V0IG1pbGVzdG9uZSBzaG91bGQgYWx3YXlzIGZpcmUgYXQgc29tZSBwb2ludC4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5Mzc0MQor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDcxMzUwMzA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg QW50dGkgS29pdmlzdG8gYW5kIFNpbW9uIEZyYXNlci4KKworICAgICAgICBmaXJlTGF5b3V0UmVs YXRlZE1pbGVzdG9uZXNJZk5lZWRlZCgpIGlzIHBhcnQgb2YgdGhlIHBvc3QtbGF5b3V0IHRhc2tz LiBJbiBjZXJ0YWluIGNhc2VzIHdoZW4KKyAgICAgICAgICAgIDEuIHRoZSByZWNlaXZlZCBkYXRh IGlzIG5vdCAiY29udGVudGZ1bCIgeWV0CisgICAgICAgICAgICAyLiBhbmQgd2UgYXJlIGV4cGVj dGluZyBzb21lIG1vcmUgKGxvYWRpbmcgaXMgbm90IGNvbXBsZXRlIHlldCkKKyAgICAgICAgICAg IDMuIGJ1dCBubyBsYXlvdXQgaXMgaW5pdGlhdGVkIGFueW1vcmUKKyAgICAgICAgbm90aGluZyB0 cmlnZ2VycyB0aGUgbWlsZXN0b25lIGZpcmluZy4KKworICAgICAgICBUaGlzIHBhdGNoIGVuc3Vy ZXMgdGhhdCB3ZSBmaXJlIHRoZSBEaWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXQgd2hlbiB0 aGUgZnJhbWUgbG9hZCBpcyBjb21wbGV0ZSB1bmxlc3Mgd2UgYWxyZWFkeSBkaWQuCisKKyAgICAg ICAgKiBwYWdlL0ZyYW1lVmlldy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OkZy YW1lVmlldyk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OmxvYWRQcm9ncmVzc2luZ1N0 YXR1c0NoYW5nZWQpOgorCiAyMDE5LTAxLTE0ICBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdh bGlhLmNvbT4KIAogICAgICAgICBET01DYWNoZVN0b3JhZ2U6IHVzZS1hZnRlci1tb3ZlIGluIGRv U2VxdWVudGlhbE1hdGNoKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVW aWV3LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAppbmRleCBkMjVhN2U2 MWE3YWUzNGNiMjU3ZTE0ZjBlNTI1YzczOTgyMjgyZGU5Li5mM2YzZDk3MzNhODEwYmEzZTc2Mzcy YjFhN2Y2NjNmNzA3N2Q1ZjAzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1l Vmlldy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCkBAIC0yODQx LDYgKzI4NDEsOSBAQCB2b2lkIEZyYW1lVmlldzo6ZGlzYWJsZUxheWVyRmx1c2hUaHJvdHRsaW5n VGVtcG9yYXJpbHlGb3JJbnRlcmFjdGlvbigpCiAKIHZvaWQgRnJhbWVWaWV3Ojpsb2FkUHJvZ3Jl c3NpbmdTdGF0dXNDaGFuZ2VkKCkKIHsKKyAgICBhdXRvIGhhc1BlbmRpbmdWaXN1YWxseU5vbkVt cHR5Q2FsbGJhY2sgPSBtX2ZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dENhbGxiYWNrUGVuZGlu ZyAmJiAhbV9pc1Zpc3VhbGx5Tm9uRW1wdHk7CisgICAgaWYgKGhhc1BlbmRpbmdWaXN1YWxseU5v bkVtcHR5Q2FsbGJhY2sgJiYgZnJhbWUoKS5sb2FkZXIoKS5pc0NvbXBsZXRlKCkpCisgICAgICAg IGZpcmVMYXlvdXRSZWxhdGVkTWlsZXN0b25lc0lmTmVlZGVkKCk7CiAgICAgdXBkYXRlTGF5ZXJG bHVzaFRocm90dGxpbmcoKTsKICAgICBhZGp1c3RUaWxlZEJhY2tpbmdDb3ZlcmFnZSgpOwogfQpA QCAtNTE4NSw4ICs1MTg4LDExIEBAIHZvaWQgRnJhbWVWaWV3OjpmaXJlTGF5b3V0UmVsYXRlZE1p bGVzdG9uZXNJZk5lZWRlZCgpCiAgICAgICAgICAgICBtaWxlc3RvbmVzQWNoaWV2ZWQuYWRkKERp ZFJlbmRlclNpZ25pZmljYW50QW1vdW50T2ZUZXh0KTsKICAgICB9CiAKLSAgICBpZiAobWlsZXN0 b25lc0FjaGlldmVkICYmIGZyYW1lKCkuaXNNYWluRnJhbWUoKSkKKyAgICBpZiAobWlsZXN0b25l c0FjaGlldmVkICYmIGZyYW1lKCkuaXNNYWluRnJhbWUoKSkgeworICAgICAgICBpZiAobWlsZXN0 b25lc0FjaGlldmVkLmNvbnRhaW5zKERpZEZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dCkpCisg ICAgICAgICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCJmaXJlTGF5b3V0UmVsYXRlZE1pbGVz dG9uZXNJZk5lZWRlZCgpIC0gZmlyaW5nIGZpcnN0IHZpc3VhbGx5IG5vbi1lbXB0eSBsYXlvdXQg bWlsZXN0b25lIG9uIHRoZSBtYWluIGZyYW1lIik7CiAgICAgICAgIGZyYW1lKCkubG9hZGVyKCku ZGlkUmVhY2hMYXlvdXRNaWxlc3RvbmUobWlsZXN0b25lc0FjaGlldmVkKTsKKyAgICB9CiB9CiAK IHZvaWQgRnJhbWVWaWV3OjpmaXJlUGFpbnRSZWxhdGVkTWlsZXN0b25lc0lmTmVlZGVkKCkKZGlm ZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA3OWU1OGVm YmQ0N2JjYmM5YzZlY2RjY2ZiYjliNmU1M2ZiOThhYTZlLi4zODhhNTk0OWY5OTU2OGM5YTBlNmVj MGVmY2JkNDQ5MDliMWMxZDhiIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9v bHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTktMDEtMjMgIFphbGFuIEJ1anRhcyAg PHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBEaWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlv dXQgbWlsZXN0b25lIHNob3VsZCBhbHdheXMgZmlyZSBhdCBzb21lIHBvaW50LgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkzNzQxCisgICAgICAgIDxy ZGFyOi8vcHJvYmxlbS80NzEzNTAzMD4KKworICAgICAgICBSZXZpZXdlZCBieSBBbnR0aSBLb2l2 aXN0byBhbmQgU2ltb24gRnJhc2VyLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0V2Vi S2l0QVBJLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisgICAgICAgICogVGVzdFdlYktpdEFQ SS9UZXN0cy9XZWJLaXQvTGF5b3V0TWlsZXN0b25lc1dpdGhBbGxDb250ZW50SW5GcmFtZS5jcHA6 CisgICAgICAgIChUZXN0V2ViS2l0QVBJOjpURVNUKToKKwogMjAxOS0wMS0xNCAgWmFsYW4gQnVq dGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0JGQ10gQWRkIGJhc2ljIGJv eC1zaXppbmcgc3VwcG9ydC4KZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdFdl YktpdEFQSS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9U ZXN0V2ViS2l0QVBJLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKaW5kZXggZmUyN2U0OTkzNzI1 NzgyNjIxZmVmODA0ZmFkMDc2ZDhjMGM1NWU5Ny4uOGE5NmVjNGQ2Mzc5MDRmMjE5YmViMGIyODAz MmFmYzRjM2Q3ZTQ5NSAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0V2ViS2l0 QVBJLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9U ZXN0V2ViS2l0QVBJLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKQEAgLTUxLDYgKzUxLDcgQEAK IAkJMTE1RUIzNDMxRUUwQkEwMzAwM0MyQzBBIC8qIFZpZXdwb3J0U2l6ZUZvclZpZXdwb3J0VW5p dHMubW0gaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxMTVF QjM0MjFFRTBCNzIwMDAzQzJDMEEgLyogVmlld3BvcnRTaXplRm9yVmlld3BvcnRVbml0cy5tbSAq LzsgfTsKIAkJMTE3MUIyNEYyMTlGNDlDRDAwQ0I4OTdEIC8qIEZpcnN0TWVhbmluZ2Z1bFBhaW50 TWlsZXN0b25lX0J1bmRsZS5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7 IGZpbGVSZWYgPSAxMUI3RkQyMTIxOUY0NkREMDA2OUIyN0YgLyogRmlyc3RNZWFuaW5nZnVsUGFp bnRNaWxlc3RvbmVfQnVuZGxlLmNwcCAqLzsgfTsKIAkJMTFCN0ZEMjgyMTlGNDcxMTAwNjlCMjdG IC8qIEZpcnN0TWVhbmluZ2Z1bFBhaW50TWlsZXN0b25lLmNwcCBpbiBTb3VyY2VzICovID0ge2lz YSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDExQjdGRDIyMjE5RjQ2REQwMDY5QjI3RiAvKiBG aXJzdE1lYW5pbmdmdWxQYWludE1pbGVzdG9uZS5jcHAgKi87IH07CisJCTExQzI1OThEMjFGQTYz MjQwMDRDOUUyMyAvKiBhc3luYy1zY3JpcHQtbG9hZC5odG1sIGluIENvcHkgUmVzb3VyY2VzICov ID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDExQzI1OThDMjFGQTYxOEQwMDRDOUUy MyAvKiBhc3luYy1zY3JpcHQtbG9hZC5odG1sICovOyB9OwogCQkxNDNEREU5ODIwQzkwMThCMDA3 Rjc2RkEgLyogU2VjdXJpdHkuZnJhbWV3b3JrIGluIEZyYW1ld29ya3MgKi8gPSB7aXNhID0gUEJY QnVpbGRGaWxlOyBmaWxlUmVmID0gNTc0RjU1RDAyMDRENDcxQzAwMjk0OEM2IC8qIFNlY3VyaXR5 LmZyYW1ld29yayAqLzsgfTsKIAkJMUEwMkM4NzAxMjVENENGRDAwRTNGNEJEIC8qIGZpbmQuaHRt bCBpbiBDb3B5IFJlc291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAx QTAyQzg0QjEyNUQ0QTVFMDBFM0Y0QkQgLyogZmluZC5odG1sICovOyB9OwogCQkxQTM1MjRBRTFE NjNBNEZCMDAzMTcyOUIgLyogU2NvcGUuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVp bGRGaWxlOyBmaWxlUmVmID0gMUEzNTI0QUMxRDYzQTRGQjAwMzE3MjlCIC8qIFNjb3BlLmNwcCAq LzsgfTsKQEAgLTEwMDAsNiArMTAwMSw3IEBACiAJCQkJNUM5RTU5NDIxRDNFQjVBQzAwRTNDNjJF IC8qIEFwcGxpY2F0aW9uQ2FjaGUuZGItc2htIGluIENvcHkgUmVzb3VyY2VzICovLAogCQkJCTVD OUU1OTQzMUQzRUI1QUMwMEUzQzYyRSAvKiBBcHBsaWNhdGlvbkNhY2hlLmRiLXdhbCBpbiBDb3B5 IFJlc291cmNlcyAqLywKIAkJCQlGNkI3QkU5NzE3NDY5Qjk2MDA4QTM0NDUgLyogYXNzb2NpYXRl LWZvcm0tY29udHJvbHMuaHRtbCBpbiBDb3B5IFJlc291cmNlcyAqLywKKwkJCQkxMUMyNTk4RDIx RkE2MzI0MDA0QzlFMjMgLyogYXN5bmMtc2NyaXB0LWxvYWQuaHRtbCBpbiBDb3B5IFJlc291cmNl cyAqLywKIAkJCQlGNDg1NkNBMzFFNjQ5RUE4MDA5RDdFRTcgLyogYXR0YWNobWVudC1lbGVtZW50 Lmh0bWwgaW4gQ29weSBSZXNvdXJjZXMgKi8sCiAJCQkJQjU1RjExQjcxNTE3RDAzMzAwOTE1OTE2 IC8qIGF0dHJpYnV0ZWRTdHJpbmdDdXN0b21Gb250Lmh0bWwgaW4gQ29weSBSZXNvdXJjZXMgKi8s CiAJCQkJN0M5RUQ5OEIxN0ExOUY0QjAwRTREQzMzIC8qIGF0dHJpYnV0ZWRTdHJpbmdTdHJpa2V0 aHJvdWdoLmh0bWwgaW4gQ29weSBSZXNvdXJjZXMgKi8sCkBAIC0xMzI0LDYgKzEzMjYsNyBAQAog CQkxMTVFQjM0MjFFRTBCNzIwMDAzQzJDMEEgLyogVmlld3BvcnRTaXplRm9yVmlld3BvcnRVbml0 cy5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0 S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsgcGF0aCA9IFZpZXdwb3J0U2l6 ZUZvclZpZXdwb3J0VW5pdHMubW07IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTExQjdG RDIxMjE5RjQ2REQwMDY5QjI3RiAvKiBGaXJzdE1lYW5pbmdmdWxQYWludE1pbGVzdG9uZV9CdW5k bGUuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxh c3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gRmlyc3RNZWFuaW5n ZnVsUGFpbnRNaWxlc3RvbmVfQnVuZGxlLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsK IAkJMTFCN0ZEMjIyMTlGNDZERDAwNjlCMjdGIC8qIEZpcnN0TWVhbmluZ2Z1bFBhaW50TWlsZXN0 b25lLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBs YXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IEZpcnN0TWVhbmlu Z2Z1bFBhaW50TWlsZXN0b25lLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJMTFD MjU5OEMyMUZBNjE4RDAwNEM5RTIzIC8qIGFzeW5jLXNjcmlwdC1sb2FkLmh0bWwgKi8gPSB7aXNh ID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUg PSB0ZXh0Lmh0bWw7IHBhdGggPSAiYXN5bmMtc2NyaXB0LWxvYWQuaHRtbCI7IHNvdXJjZVRyZWUg PSAiPGdyb3VwPiI7IH07CiAJCTE0NDY0MDEyMTY3QTgzMDUwMDBCRDIxOCAvKiBMYXlvdXRVbml0 LmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0 S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IExheW91dFVuaXQuY3Bw OyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkxNEYzQjExMjE1RTQ1RUFCMDAyMTAwNjkg LyogU2F0dXJhdGVkQXJpdGhtZXRpY09wZXJhdGlvbnMuY3BwICovID0ge2lzYSA9IFBCWEZpbGVS ZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29k ZS5jcHAuY3BwOyBwYXRoID0gU2F0dXJhdGVkQXJpdGhtZXRpY09wZXJhdGlvbnMuY3BwOyBzb3Vy Y2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkxQTAyQzg0QjEyNUQ0QTVFMDBFM0Y0QkQgLyogZmlu ZC5odG1sICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxh c3RLbm93bkZpbGVUeXBlID0gdGV4dC5odG1sOyBwYXRoID0gZmluZC5odG1sOyBzb3VyY2VUcmVl ID0gIjxncm91cD4iOyB9OwpAQCAtMzI2Myw2ICszMjY2LDcgQEAKIAkJCQkxQzJCODE4NTFDODky NTIzMDBBNTUyOUYgLyogQWhlbS50dGYgKi8sCiAJCQkJOTNEM0QxOUIxN0IxQTdCMDAwQzdDNDE1 IC8qIGFsbC1jb250ZW50LWluLW9uZS1pZnJhbWUuaHRtbCAqLywKIAkJCQlGNkI3QkU5NjE3NDY5 QjdFMDA4QTM0NDUgLyogYXNzb2NpYXRlLWZvcm0tY29udHJvbHMuaHRtbCAqLywKKwkJCQkxMUMy NTk4QzIxRkE2MThEMDA0QzlFMjMgLyogYXN5bmMtc2NyaXB0LWxvYWQuaHRtbCAqLywKIAkJCQlD OUM5QTkxQTIxREVEMjREMDBGREU5NkUgLyogYXVkaW8td2l0aC1wbGF5LWJ1dHRvbi5odG1sICov LAogCQkJCTc2RTE4MkRFMTU0NzVBODMwMEYxRkFERCAvKiBhdXRvLXN1Ym1pdHRpbmctZm9ybS5o dG1sICovLAogCQkJCUM5QzYwRTYzMUU1M0E5QkEwMDZEQTE4MSAvKiBhdXRvcGxheS1jaGVjay1m cmFtZS5odG1sICovLApkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJL aXQvTGF5b3V0TWlsZXN0b25lc1dpdGhBbGxDb250ZW50SW5GcmFtZS5jcHAgYi9Ub29scy9UZXN0 V2ViS2l0QVBJL1Rlc3RzL1dlYktpdC9MYXlvdXRNaWxlc3RvbmVzV2l0aEFsbENvbnRlbnRJbkZy YW1lLmNwcAppbmRleCA0N2NkZDRiYWIwOTdjZDhiNjg2ZmJiZDA5YjBhYjk3NzI4YjQ3ZjQxLi41 Y2Y4MjYwOTZiNjVlNmNmN2I5NjU2NTMxM2M2YjA4YjFkOTM3YmNlIDEwMDY0NAotLS0gYS9Ub29s cy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdC9MYXlvdXRNaWxlc3RvbmVzV2l0aEFsbENvbnRl bnRJbkZyYW1lLmNwcAorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdC9MYXlv dXRNaWxlc3RvbmVzV2l0aEFsbENvbnRlbnRJbkZyYW1lLmNwcApAQCAtMTE3LDYgKzExNywyOCBA QCBURVNUKFdlYktpdCwgRmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0QWZ0ZXJQYWdlQ2FjaGVS ZXN0b3JlKQogICAgIGRpZE5hdmlnYXRlID0gZmFsc2U7CiB9CiAKK1RFU1QoV2ViS2l0LCBGaXJz dFZpc3VhbGx5Tm9uRW1wdHlNaWxlc3RvbmVXaXRoTG9hZENvbXBsZXRlKQoreworICAgIFdLUmV0 YWluUHRyPFdLQ29udGV4dFJlZj4gY29udGV4dChBZG9wdFdLLCBXS0NvbnRleHRDcmVhdGVXaXRo Q29uZmlndXJhdGlvbihudWxscHRyKSk7CisgICAgUGxhdGZvcm1XZWJWaWV3IHdlYlZpZXcoY29u dGV4dC5nZXQoKSk7CisKKyAgICBXS1BhZ2VOYXZpZ2F0aW9uQ2xpZW50VjMgbG9hZGVyQ2xpZW50 OworICAgIG1lbXNldCgmbG9hZGVyQ2xpZW50LCAwLCBzaXplb2YobG9hZGVyQ2xpZW50KSk7CisK KyAgICBsb2FkZXJDbGllbnQuYmFzZS52ZXJzaW9uID0gMzsKKyAgICBsb2FkZXJDbGllbnQuYmFz ZS5jbGllbnRJbmZvID0gJndlYlZpZXc7CisgICAgbG9hZGVyQ2xpZW50LnJlbmRlcmluZ1Byb2dy ZXNzRGlkQ2hhbmdlID0gcmVuZGVyaW5nUHJvZ3Jlc3NEaWRDaGFuZ2U7CisKKyAgICBXS1BhZ2VT ZXRQYWdlTmF2aWdhdGlvbkNsaWVudCh3ZWJWaWV3LnBhZ2UoKSwgJmxvYWRlckNsaWVudC5iYXNl KTsKKyAgICBkaWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXQgPSBmYWxzZTsKKworICAgIFdL UGFnZUxpc3RlbkZvckxheW91dE1pbGVzdG9uZXMod2ViVmlldy5wYWdlKCksIFdLUGFnZVJlbmRl cmluZ1Byb2dyZXNzRXZlbnRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXQpOworICAgIFdLUGFn ZUxvYWRVUkwod2ViVmlldy5wYWdlKCksIGFkb3B0V0soVXRpbDo6Y3JlYXRlVVJMRm9yUmVzb3Vy Y2UoImFzeW5jLXNjcmlwdC1sb2FkIiwgImh0bWwiKSkuZ2V0KCkpOworCisgICAgVXRpbDo6cnVu KCZkaWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXQpOworICAgIEVYUEVDVF9UUlVFKGRpZEZp cnN0VmlzdWFsbHlOb25FbXB0eUxheW91dCk7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFRlc3RXZWJL aXRBUEkKIAogI2VuZGlmCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dl YktpdC9hc3luYy1zY3JpcHQtbG9hZC5odG1sIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9X ZWJLaXQvYXN5bmMtc2NyaXB0LWxvYWQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5hMzhmODU4NjYxNjk0OTUx NTg4YzZmNzFlZTBhMDMzNGQ3ZWNjYmFkCi0tLSAvZGV2L251bGwKKysrIGIvVG9vbHMvVGVzdFdl YktpdEFQSS9UZXN0cy9XZWJLaXQvYXN5bmMtc2NyaXB0LWxvYWQuaHRtbApAQCAtMCwwICsxLDE2 IEBACis8aGVhZD4KKzxzdHlsZT4KK0Bmb250LWZhY2UgeworICAgIGZvbnQtZmFtaWx5OiAnRm9u dEF3ZXNvbWUnOworICAgIHNyYzogdXJsKCJmb250MS53b2ZmMiIpIGZvcm1hdCgid29mZjIiKTsK KyAgICBmb250LXdlaWdodDogbm9ybWFsOworICAgIGZvbnQtc3R5bGU6IG5vcm1hbAorfQorCisu Zm9vYmFyIHsKKyAgICBmb250OiBub3JtYWwgbm9ybWFsIG5vcm1hbCAxNHB4IC8gMSBGb250QXdl c29tZTsKK30KKzwvc3R5bGU+Cis8L2hlYWQ+Cis8Ym9keT5mb29iYXI8c2NyaXB0PmRvY3VtZW50 LmJvZHkub2Zmc2V0SGVpZ2h0PC9zY3JpcHQ+Cis8c2NyaXB0IGFzeW5jPSJ0cnVlIiBzcmM9ImZv b2Jhci5qcyI+PC9zY3JpcHQ+ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQo=