222078 2021-02-17 15:09:19 -0800 Experiment with using the theme-color as the scroll area background if provided 2021-04-12 14:47:39 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 224455 1 hi hi bdakin cdumez changseok esprehn+autocc ews-watchlist fred.wang glenn hi kangil.han kondapallykalyan pdr simon.fraser thorton webkit-bug-importer oldest_to_newest 1730577 0 hi 2021-02-17 15:09:19 -0800 `<meta name="theme-color" content="...">` would be used (if provided) instead of the `pageExtendedBackgroundColor` 1730578 1 hi 2021-02-17 15:09:36 -0800 <rdar://problem/74158818> 1730579 2 420730 hi 2021-02-17 15:10:21 -0800 Created attachment 420730 Patch 1730583 3 420730 thorton 2021-02-17 15:20:10 -0800 Comment on attachment 420730 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=420730&action=review > Source/WTF/ChangeLog:3 > + experiment with using the theme-color as the scroll area background if provided Title could use some ... title casing. Or y'know at least a starting capital. > Source/WTF/Scripts/Preferences/WebPreferencesInternal.yaml:781 > + humanReadableName: "Use theme-color for scroll area background color" > + humanReadableDescription: "Use theme-color for scroll area background color" I hover the first string and see the second? Now I've wasted 3 seconds of my life. I would try shortening up the first one, it's pretty long for a menu item > Source/WebKit/UIProcess/ViewSnapshotStore.cpp:99 > + backgroundColor = webPageProxy.themeColor(); > + if (!backgroundColor.isValid()) Maybe a WebPageProxy getter to share this with WKWebViewIOS? 1730599 4 420730 hi 2021-02-17 15:48:02 -0800 Comment on attachment 420730 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=420730&action=review >> Source/WTF/Scripts/Preferences/WebPreferencesInternal.yaml:781 >> + humanReadableDescription: "Use theme-color for scroll area background color" > > I hover the first string and see the second? Now I've wasted 3 seconds of my life. > > I would try shortening up the first one, it's pretty long for a menu item talked offline about this and since it's an internal setting (and the existing title is already pretty succinct) i'll leave this as is >> Source/WebKit/UIProcess/ViewSnapshotStore.cpp:99 >> + if (!backgroundColor.isValid()) > > Maybe a WebPageProxy getter to share this with WKWebViewIOS? smart 1730601 5 420737 hi 2021-02-17 15:49:14 -0800 Created attachment 420737 Patch 1730606 6 420742 hi 2021-02-17 15:52:21 -0800 Created attachment 420742 Patch 1730610 7 420743 hi 2021-02-17 15:57:27 -0800 Created attachment 420743 Patch 1730621 8 420751 hi 2021-02-17 16:11:17 -0800 Created attachment 420751 Patch 1730622 9 420752 hi 2021-02-17 16:12:30 -0800 Created attachment 420752 Patch 1730623 10 420753 hi 2021-02-17 16:13:11 -0800 Created attachment 420753 Patch 1730630 11 420755 hi 2021-02-17 16:24:59 -0800 Created attachment 420755 Patch 1730670 12 420766 hi 2021-02-17 17:38:25 -0800 Created attachment 420766 Patch 1730684 13 420774 hi 2021-02-17 17:59:30 -0800 Created attachment 420774 Patch 1730916 14 ews-feeder 2021-02-18 10:38:19 -0800 Committed r273083: <https://commits.webkit.org/r273083> All reviewed patches have been landed. Closing bug and clearing flags on attachment 420774. 420730 2021-02-17 15:10:21 -0800 2021-02-17 15:49:14 -0800 Patch bug-222078-20210217161021.patch text/plain 8881 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nIGIvU291cmNlL1dURi9DaGFuZ2VMb2cK aW5kZXggM2M4NWZkODc5ZjlhNDhmMWMzM2NjMWIzYTM2ZTdlY2U3MjgwNDZmYi4uMzNmMjcyM2Zm MmMxYjU0NTIxOTA2ZWJhZDY1OTUzNjJlNzg5YjkxNyAxMDA2NDQKLS0tIGEvU291cmNlL1dURi9D aGFuZ2VMb2cKKysrIGIvU291cmNlL1dURi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAy MS0wMi0xNyAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CisKKyAgICAgICAgZXhw ZXJpbWVudCB3aXRoIHVzaW5nIHRoZSB0aGVtZS1jb2xvciBhcyB0aGUgc2Nyb2xsIGFyZWEgYmFj a2dyb3VuZCBpZiBwcm92aWRlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjIyMDc4CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS83NDE1ODgxOD4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMv UHJlZmVyZW5jZXMvV2ViUHJlZmVyZW5jZXNJbnRlcm5hbC55YW1sOgorCiAyMDIxLTAyLTE3ICBE ZWFuIEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KIAogICAgICAgICBVc2UgZWxlbWVudCBmdWxs c2NyZWVuIGZvciB2aWRlbyBvbiBzb21lIGNvbmZpZ3VyYXRpb25zCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTdj NTQ4MmI0ZjIzNjIwNWU4ODM3NTdhMWQyNjM2ZDI2YmIyY2RmNi4uZjNkNjU5NGFmM2UxZWI0OWIw ZTFhY2NiOTE1MzE1OTYyNTdmMTkwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIx LTAyLTE3ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBleHBl cmltZW50IHdpdGggdXNpbmcgdGhlIHRoZW1lLWNvbG9yIGFzIHRoZSBzY3JvbGwgYXJlYSBiYWNr Z3JvdW5kIGlmIHByb3ZpZGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMjIwNzgKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzc0MTU4ODE4PgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcmVuZGVyaW5n L1JlbmRlckxheWVyQ29tcG9zaXRvci5oOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXll ckNvbXBvc2l0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9y Ojp1cGRhdGVMYXllckZvck92ZXJoYW5nQXJlYXNCYWNrZ3JvdW5kQ29sb3IpOiBBZGRlZC4KKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6cm9vdEJhY2tncm91bmRDb2xv ck9yVHJhbnNwYXJlbmN5Q2hhbmdlZCk6CisKKyAgICAgICAgKiBkb20vRG9jdW1lbnQuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OnByb2Nlc3NUaGVtZUNvbG9yKToKKyAgICAgICAg Tm90aWZ5IHRoZSBgUmVuZGVyTGF5ZXJDb21wb3NpdG9yYCB3aGVuIGA8bWV0YSBuYW1lPSJ0aGVt ZS1jb2xvciIgY29udGVudD0iLi4uIj5gIGNoYW5nZXMuCisKIDIwMjEtMDItMTcgIERldmluIFJv dXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgogCiAgICAgICAgIFtpT1NdIHVwZGF0ZSBtZWRpYSBj b250cm9scyB0byB1c2UgbmV3IFNGIFN5bWJvbHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv Q2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggY2E3YzM1ODc5YWFhZWQy ZmY1ZmJmZjYxNzI2MzQzMDY2NjRiZjgxZS4uY2ZhZWRlZDU3YTczY2JhZTk2OWI0ZGY2MTA0OWJh ZTMxZjU3ZWY3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAyMS0wMi0xNyAgRGV2aW4g Um91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CisKKyAgICAgICAgZXhwZXJpbWVudCB3aXRoIHVz aW5nIHRoZSB0aGVtZS1jb2xvciBhcyB0aGUgc2Nyb2xsIGFyZWEgYmFja2dyb3VuZCBpZiBwcm92 aWRlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIy MDc4CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS83NDE1ODgxOD4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvaW9zL1dLV2Vi Vmlld0lPUy5tbToKKyAgICAgICAgKGJhc2VTY3JvbGxWaWV3QmFja2dyb3VuZENvbG9yKToKKyAg ICAgICAgKiBVSVByb2Nlc3MvVmlld1NuYXBzaG90U3RvcmUuY3BwOgorICAgICAgICAoV2ViS2l0 OjpWaWV3U25hcHNob3RTdG9yZTo6cmVjb3JkU25hcHNob3QpOgorCiAyMDIxLTAyLTE3ICBUcnVp dHQgU2F2ZWxsICA8dHNhdmVsbEBhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcmV2 ZXJ0aW5nIHIyNzI5MDUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL1NjcmlwdHMvUHJlZmVyZW5j ZXMvV2ViUHJlZmVyZW5jZXNJbnRlcm5hbC55YW1sIGIvU291cmNlL1dURi9TY3JpcHRzL1ByZWZl cmVuY2VzL1dlYlByZWZlcmVuY2VzSW50ZXJuYWwueWFtbAppbmRleCA4Yzg3MzRiZDAzMjNjYjI0 ZjBmNWJlM2ZhMmE2NDEwYjRlMjc5ZDg3Li5iMTM2ZGRlZWViM2M1MWQ2MDBhODU0ZWI5ZjQ4N2Rm NzhkZjViNzRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL1NjcmlwdHMvUHJlZmVyZW5jZXMvV2Vi UHJlZmVyZW5jZXNJbnRlcm5hbC55YW1sCisrKyBiL1NvdXJjZS9XVEYvU2NyaXB0cy9QcmVmZXJl bmNlcy9XZWJQcmVmZXJlbmNlc0ludGVybmFsLnlhbWwKQEAgLTc3NSw2ICs3NzUsMTcgQEAgVXNl R1BVUHJvY2Vzc0ZvcldlYkdMRW5hYmxlZDoKICAgICBXZWJLaXQ6CiAgICAgICBkZWZhdWx0OiBk ZWZhdWx0VXNlR1BVUHJvY2Vzc0ZvcldlYkdMRW5hYmxlZCgpCiAKK1VzZVRoZW1lQ29sb3JGb3JT Y3JvbGxBcmVhQmFja2dyb3VuZENvbG9yOgorICB0eXBlOiBib29sCisgIGh1bWFuUmVhZGFibGVO YW1lOiAiVXNlIHRoZW1lLWNvbG9yIGZvciBzY3JvbGwgYXJlYSBiYWNrZ3JvdW5kIGNvbG9yIgor ICBodW1hblJlYWRhYmxlRGVzY3JpcHRpb246ICJVc2UgdGhlbWUtY29sb3IgZm9yIHNjcm9sbCBh cmVhIGJhY2tncm91bmQgY29sb3IiCisgIHdlYmNvcmVCaW5kaW5nOiBub25lCisgIGRlZmF1bHRW YWx1ZToKKyAgICBXZWJLaXQ6CisgICAgICBkZWZhdWx0OiBmYWxzZQorICAgIFdlYkNvcmU6Cisg ICAgICBkZWZhdWx0OiBmYWxzZQorCiAjIEZJWE1FOiBSZW1vdmUgb25jZSA8cmRhcjovLzczODMw OTYxPiBoYXMgYmVlbiBmaXhlZAogVXNlaVR1bmVzQVZPdXRwdXRDb250ZXh0OgogICB0eXBlOiBi b29sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwIGIvU291cmNl L1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAppbmRleCAxYjlmNzI2NjM5MjEwODVjNThkMDhiNWIw Nzk5NjU2OWZlYTY2MmFhLi5hZjkwZWU2YWE5MjQyYmFiMDUyM2EwMDU1MDE4NTBhMmM3MWUzMTY4 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKQEAgLTM4MzIsNiArMzgzMiwxMyBAQCB2b2lkIERv Y3VtZW50Ojpwcm9jZXNzVGhlbWVDb2xvcihjb25zdCBTdHJpbmcmIHRoZW1lQ29sb3JTdHJpbmcp CiAKICAgICBpZiAoYXV0byogcGFnZSA9IHRoaXMtPnBhZ2UoKSkKICAgICAgICAgcGFnZS0+Y2hy b21lKCkuY2xpZW50KCkudGhlbWVDb2xvckNoYW5nZWQobV90aGVtZUNvbG9yKTsKKworI2lmIEVO QUJMRShSVUJCRVJfQkFORElORykKKyAgICBpZiAoYXV0byogdmlldyA9IHJlbmRlclZpZXcoKSkg eworICAgICAgICBpZiAodmlldy0+dXNlc0NvbXBvc2l0aW5nKCkpCisgICAgICAgICAgICB2aWV3 LT5jb21wb3NpdG9yKCkudXBkYXRlTGF5ZXJGb3JPdmVyaGFuZ0FyZWFzQmFja2dyb3VuZENvbG9y KCk7CisgICAgfQorI2VuZGlmIC8vIEVOQUJMRShSVUJCRVJfQkFORElORykKIH0KIAogI2lmIEVO QUJMRShEQVJLX01PREVfQ1NTKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAppbmRleCA5YzgwOTQ3ODg0OGNkMDk4YWM0OGFiMzA0YjI2 YzYyMDZkZGFhNTYxLi5lMDMwNTU0NjU2OGE4MTRiZTc4YjE4NTY3ODI5NDQ0MGZhYjY2MDVlIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9y LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9y LmNwcApAQCAtMzg1Nyw3ICszODU3LDI0IEBAIEdyYXBoaWNzTGF5ZXIqIFJlbmRlckxheWVyQ29t cG9zaXRvcjo6dXBkYXRlTGF5ZXJGb3JGb290ZXIoYm9vbCB3YW50c0xheWVyKQogICAgIHJldHVy biBtX2xheWVyRm9yRm9vdGVyLmdldCgpOwogfQogCi0jZW5kaWYKK3ZvaWQgUmVuZGVyTGF5ZXJD b21wb3NpdG9yOjp1cGRhdGVMYXllckZvck92ZXJoYW5nQXJlYXNCYWNrZ3JvdW5kQ29sb3IoKQor eworICAgIGlmICghbV9sYXllckZvck92ZXJoYW5nQXJlYXMpCisgICAgICAgIHJldHVybjsKKwor ICAgIENvbG9yIGJhY2tncm91bmRDb2xvcjsKKyAgICBpZiAocGFnZSgpLnNldHRpbmdzKCkudXNl VGhlbWVDb2xvckZvclNjcm9sbEFyZWFCYWNrZ3JvdW5kQ29sb3IoKSkKKyAgICAgICAgYmFja2dy b3VuZENvbG9yID0gcGFnZSgpLnRoZW1lQ29sb3IoKTsKKyAgICBpZiAoIWJhY2tncm91bmRDb2xv ci5pc1ZhbGlkKCkpCisgICAgICAgIGJhY2tncm91bmRDb2xvciA9IG1fcm9vdEV4dGVuZGVkQmFj a2dyb3VuZENvbG9yOworCisgICAgbV9sYXllckZvck92ZXJoYW5nQXJlYXMtPnNldEJhY2tncm91 bmRDb2xvcihiYWNrZ3JvdW5kQ29sb3IpOworCisgICAgaWYgKCFiYWNrZ3JvdW5kQ29sb3IuaXNW YWxpZCgpKQorICAgICAgICBtX2xheWVyRm9yT3ZlcmhhbmdBcmVhcy0+c2V0Q3VzdG9tQXBwZWFy YW5jZShHcmFwaGljc0xheWVyOjpDdXN0b21BcHBlYXJhbmNlOjpTY3JvbGxpbmdPdmVyaGFuZyk7 Cit9CisKKyNlbmRpZiAvLyBFTkFCTEUoUlVCQkVSX0JBTkRJTkcpCiAKIGJvb2wgUmVuZGVyTGF5 ZXJDb21wb3NpdG9yOjp2aWV3TmVlZHNUb0ludmFsaWRhdGVFdmVudFJlZ2lvbk9mRW5jbG9zaW5n Q29tcG9zaXRpbmdMYXllckZvclJlcGFpbnQoKSBjb25zdAogewpAQCAtMzkzMywxMiArMzk1MCw3 IEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpyb290QmFja2dyb3VuZENvbG9yT3JUcmFu c3BhcmVuY3lDaGFuZ2VkKCkKICAgICAgICAgcGFnZSgpLmNocm9tZSgpLmNsaWVudCgpLnBhZ2VF eHRlbmRlZEJhY2tncm91bmRDb2xvckRpZENoYW5nZShtX3Jvb3RFeHRlbmRlZEJhY2tncm91bmRD b2xvcik7CiAgICAgICAgIAogI2lmIEVOQUJMRShSVUJCRVJfQkFORElORykKLSAgICAgICAgaWYg KG1fbGF5ZXJGb3JPdmVyaGFuZ0FyZWFzKSB7Ci0gICAgICAgICAgICBtX2xheWVyRm9yT3Zlcmhh bmdBcmVhcy0+c2V0QmFja2dyb3VuZENvbG9yKG1fcm9vdEV4dGVuZGVkQmFja2dyb3VuZENvbG9y KTsKLQotICAgICAgICAgICAgaWYgKCFtX3Jvb3RFeHRlbmRlZEJhY2tncm91bmRDb2xvci5pc1Zh bGlkKCkpCi0gICAgICAgICAgICAgICAgbV9sYXllckZvck92ZXJoYW5nQXJlYXMtPnNldEN1c3Rv bUFwcGVhcmFuY2UoR3JhcGhpY3NMYXllcjo6Q3VzdG9tQXBwZWFyYW5jZTo6U2Nyb2xsaW5nT3Zl cmhhbmcpOwotICAgICAgICB9CisgICAgICAgIHVwZGF0ZUxheWVyRm9yT3ZlcmhhbmdBcmVhc0Jh Y2tncm91bmRDb2xvcigpOwogI2VuZGlmCiAgICAgfQogICAgIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5oIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5oCmluZGV4IGMxNTFlMjNkMGVmNjVm ZWI5OWYwNTdlNWQyMjhlYmJmZDVjMTg1MzIuLjQxMDM1YjkyMmM1NWFkZjRjYWE4ZGFkYWRmOTIy OGVhNzJjYTE4NWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJM YXllckNvbXBvc2l0b3IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5 ZXJDb21wb3NpdG9yLmgKQEAgLTM0Myw3ICszNDMsOSBAQCBwdWJsaWM6CiAgICAgR3JhcGhpY3NM YXllciogdXBkYXRlTGF5ZXJGb3JCb3R0b21PdmVyaGFuZ0FyZWEoYm9vbCB3YW50c0xheWVyKTsK ICAgICBHcmFwaGljc0xheWVyKiB1cGRhdGVMYXllckZvckhlYWRlcihib29sIHdhbnRzTGF5ZXIp OwogICAgIEdyYXBoaWNzTGF5ZXIqIHVwZGF0ZUxheWVyRm9yRm9vdGVyKGJvb2wgd2FudHNMYXll cik7Ci0jZW5kaWYKKworICAgIHZvaWQgdXBkYXRlTGF5ZXJGb3JPdmVyaGFuZ0FyZWFzQmFja2dy b3VuZENvbG9yKCk7CisjZW5kaWYgLy8gRU5BQkxFKFJVQkJFUl9CQU5ESU5HKQogCiAgICAgLy8g RklYTUU6IG1ha2UgdGhlIGNvb3JkaW5hdGVkL2FzeW5jIHRlcm1pbm9sb2d5IGNvbnNpc3RlbnQu CiAgICAgYm9vbCBpc1ZpZXdwb3J0Q29uc3RyYWluZWRGaXhlZE9yU3RpY2t5TGF5ZXIoY29uc3Qg UmVuZGVyTGF5ZXImKSBjb25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0FQSS9pb3MvV0tXZWJWaWV3SU9TLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2lv cy9XS1dlYlZpZXdJT1MubW0KaW5kZXggNTlkNDQ2MjZlYTQ1ZDhlODQ5Y2YxNTNiNTVmOGEyYjIz MzJjNzdjYS4uZjJhYzI1MDFkYThiNDE2Mjk5NTQ2OTY1ZTQ5YzA0MjJiNzFkMmRlOCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2lvcy9XS1dlYlZpZXdJT1MubW0KKysr IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2lvcy9XS1dlYlZpZXdJT1MubW0KQEAgLTQ5 Miw3ICs0OTIsMTYgQEAgc3RhdGljIFdlYkNvcmU6OkNvbG9yIGJhc2VTY3JvbGxWaWV3QmFja2dy b3VuZENvbG9yKFdLV2ViVmlldyAqd2ViVmlldykKICAgICBpZiAoIXdlYlZpZXctPl9wYWdlKQog ICAgICAgICByZXR1cm4geyB9OwogCi0gICAgcmV0dXJuIHdlYlZpZXctPl9wYWdlLT5wYWdlRXh0 ZW5kZWRCYWNrZ3JvdW5kQ29sb3IoKTsKKworICAgIGlmICh3ZWJWaWV3LT5fcGFnZS0+cHJlZmVy ZW5jZXMoKS51c2VUaGVtZUNvbG9yRm9yU2Nyb2xsQXJlYUJhY2tncm91bmRDb2xvcigpKSB7Cisg ICAgICAgIGlmIChhdXRvIHRoZW1lQ29sb3IgPSB3ZWJWaWV3LT5fcGFnZS0+dGhlbWVDb2xvcigp OyB0aGVtZUNvbG9yLmlzVmFsaWQoKSkKKyAgICAgICAgICAgIHJldHVybiB0aGVtZUNvbG9yOwor ICAgIH0KKworICAgIGlmIChhdXRvIHBhZ2VFeHRlbmRlZEJhY2tncm91bmRDb2xvciA9IHdlYlZp ZXctPl9wYWdlLT5wYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3IoKTsgcGFnZUV4dGVuZGVkQmFj a2dyb3VuZENvbG9yLmlzVmFsaWQoKSkKKyAgICAgICAgcmV0dXJuIHBhZ2VFeHRlbmRlZEJhY2tn cm91bmRDb2xvcjsKKworICAgIHJldHVybiB7IH07CiB9CiAKIHN0YXRpYyBXZWJDb3JlOjpDb2xv ciBzY3JvbGxWaWV3QmFja2dyb3VuZENvbG9yKFdLV2ViVmlldyAqd2ViVmlldykKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1ZpZXdTbmFwc2hvdFN0b3JlLmNwcCBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1ZpZXdTbmFwc2hvdFN0b3JlLmNwcAppbmRleCAyMzMxOTJhOGYx NDExZTk1NjljOTBhMTgwMDg0YjgxM2E3YjBkMTI3Li42NGUyNmJjYjM4MGNhMmI5OTQwNDU3YjRh NGY2ZTAxNWE5NWE4MjI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9WaWV3 U25hcHNob3RTdG9yZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvVmlld1NuYXBz aG90U3RvcmUuY3BwCkBAIC05Myw5ICs5MywxNSBAQCB2b2lkIFZpZXdTbmFwc2hvdFN0b3JlOjpy ZWNvcmRTbmFwc2hvdChXZWJQYWdlUHJveHkmIHdlYlBhZ2VQcm94eSwgV2ViQmFja0Zvcndhcgog ICAgIGlmICghc25hcHNob3QpCiAgICAgICAgIHJldHVybjsKIAorICAgIENvbG9yIGJhY2tncm91 bmRDb2xvcjsKKyAgICBpZiAod2ViUGFnZVByb3h5LnByZWZlcmVuY2VzKCkudXNlVGhlbWVDb2xv ckZvclNjcm9sbEFyZWFCYWNrZ3JvdW5kQ29sb3IoKSkKKyAgICAgICAgYmFja2dyb3VuZENvbG9y ID0gd2ViUGFnZVByb3h5LnRoZW1lQ29sb3IoKTsKKyAgICBpZiAoIWJhY2tncm91bmRDb2xvci5p c1ZhbGlkKCkpCisgICAgICAgIGJhY2tncm91bmRDb2xvciA9IHdlYlBhZ2VQcm94eS5wYWdlRXh0 ZW5kZWRCYWNrZ3JvdW5kQ29sb3IoKTsKKwogICAgIHNuYXBzaG90LT5zZXRSZW5kZXJUcmVlU2l6 ZSh3ZWJQYWdlUHJveHkucmVuZGVyVHJlZVNpemUoKSk7CiAgICAgc25hcHNob3QtPnNldERldmlj ZVNjYWxlRmFjdG9yKHdlYlBhZ2VQcm94eS5kZXZpY2VTY2FsZUZhY3RvcigpKTsKLSAgICBzbmFw c2hvdC0+c2V0QmFja2dyb3VuZENvbG9yKHdlYlBhZ2VQcm94eS5wYWdlRXh0ZW5kZWRCYWNrZ3Jv dW5kQ29sb3IoKSk7CisgICAgc25hcHNob3QtPnNldEJhY2tncm91bmRDb2xvcihXVEZNb3ZlKGJh Y2tncm91bmRDb2xvcikpOwogICAgIHNuYXBzaG90LT5zZXRWaWV3U2Nyb2xsUG9zaXRpb24oV2Vi Q29yZTo6cm91bmRlZEludFBvaW50KHdlYlBhZ2VQcm94eS52aWV3U2Nyb2xsUG9zaXRpb24oKSkp OwogCiAgICAgaXRlbS5zZXRTbmFwc2hvdChXVEZNb3ZlKHNuYXBzaG90KSk7Cg== 420737 2021-02-17 15:49:14 -0800 2021-02-17 15:57:03 -0800 Patch 222078.diff text/plain 9063 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nIGIvU291cmNlL1dURi9DaGFuZ2VMb2cK aW5kZXggM2M4NWZkODc5ZjlhLi5lMjg1M2FhZDBkNTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYv Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIw MjEtMDItMTcgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIEV4 cGVyaW1lbnQgd2l0aCB1c2luZyB0aGUgdGhlbWUtY29sb3IgYXMgdGhlIHNjcm9sbCBhcmVhIGJh Y2tncm91bmQgaWYgcHJvdmlkZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIyMjA3OAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzQxNTg4MTg+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgVGltIEhvcnRvbi4KKworICAgICAgICAqIFNjcmlwdHMvUHJl ZmVyZW5jZXMvV2ViUHJlZmVyZW5jZXNJbnRlcm5hbC55YW1sOgorCiAyMDIxLTAyLTE3ICBEZWFu IEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KIAogICAgICAgICBVc2UgZWxlbWVudCBmdWxsc2Ny ZWVuIGZvciB2aWRlbyBvbiBzb21lIGNvbmZpZ3VyYXRpb25zCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V1RGL1NjcmlwdHMvUHJlZmVyZW5jZXMvV2ViUHJlZmVyZW5jZXNJbnRlcm5hbC55YW1sIGIvU291 cmNlL1dURi9TY3JpcHRzL1ByZWZlcmVuY2VzL1dlYlByZWZlcmVuY2VzSW50ZXJuYWwueWFtbApp bmRleCA4Yzg3MzRiZDAzMjMuLmQwMTdkODkwMDM4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dURi9T Y3JpcHRzL1ByZWZlcmVuY2VzL1dlYlByZWZlcmVuY2VzSW50ZXJuYWwueWFtbAorKysgYi9Tb3Vy Y2UvV1RGL1NjcmlwdHMvUHJlZmVyZW5jZXMvV2ViUHJlZmVyZW5jZXNJbnRlcm5hbC55YW1sCkBA IC03NzUsNiArNzc1LDE3IEBAIFVzZUdQVVByb2Nlc3NGb3JXZWJHTEVuYWJsZWQ6CiAgICAgV2Vi S2l0OgogICAgICAgZGVmYXVsdDogZGVmYXVsdFVzZUdQVVByb2Nlc3NGb3JXZWJHTEVuYWJsZWQo KQogCitVc2VUaGVtZUNvbG9yRm9yU2Nyb2xsQXJlYUJhY2tncm91bmRDb2xvcjoKKyAgdHlwZTog Ym9vbAorICBodW1hblJlYWRhYmxlTmFtZTogIlVzZSB0aGVtZS1jb2xvciBmb3Igc2Nyb2xsIGFy ZWEgYmFja2dyb3VuZCBjb2xvciIKKyAgaHVtYW5SZWFkYWJsZURlc2NyaXB0aW9uOiAiVXNlIDxt ZXRhIG5hbWU9InRoZW1lLWNvbG9yIiBjb250ZW50PSIuLi4iPiBmb3IgdGhlIGJhY2tncm91bmQg Y29sb3Igb2YgdGhlIHNjcm9sbCBhcmVhIgorICB3ZWJjb3JlQmluZGluZzogbm9uZQorICBkZWZh dWx0VmFsdWU6CisgICAgV2ViS2l0OgorICAgICAgZGVmYXVsdDogZmFsc2UKKyAgICBXZWJDb3Jl OgorICAgICAgZGVmYXVsdDogZmFsc2UKKwogIyBGSVhNRTogUmVtb3ZlIG9uY2UgPHJkYXI6Ly83 MzgzMDk2MT4gaGFzIGJlZW4gZml4ZWQKIFVzZWlUdW5lc0FWT3V0cHV0Q29udGV4dDoKICAgdHlw ZTogYm9vbApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dl YkNvcmUvQ2hhbmdlTG9nCmluZGV4IDFhZjE0NzIwMGYwMC4uMWRlYmU3ZTUwOTZmIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMjEtMDItMTcgIERldmluIFJvdXNzbyAgPGRyb3Vzc29A YXBwbGUuY29tPgorCisgICAgICAgIEV4cGVyaW1lbnQgd2l0aCB1c2luZyB0aGUgdGhlbWUtY29s b3IgYXMgdGhlIHNjcm9sbCBhcmVhIGJhY2tncm91bmQgaWYgcHJvdmlkZWQKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMjA3OAorICAgICAgICA8cmRh cjovL3Byb2JsZW0vNzQxNTg4MTg+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgVGltIEhvcnRvbi4K KworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuaDoKKyAgICAgICAg KiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlTGF5ZXJGb3JPdmVyaGFuZ0FyZWFzQmFja2dy b3VuZENvbG9yKTogQWRkZWQuCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0 b3I6OnJvb3RCYWNrZ3JvdW5kQ29sb3JPclRyYW5zcGFyZW5jeUNoYW5nZWQpOgorCisgICAgICAg ICogZG9tL0RvY3VtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50Ojpwcm9jZXNz VGhlbWVDb2xvcik6CisgICAgICAgIE5vdGlmeSB0aGUgYFJlbmRlckxheWVyQ29tcG9zaXRvcmAg d2hlbiBgPG1ldGEgbmFtZT0idGhlbWUtY29sb3IiIGNvbnRlbnQ9Ii4uLiI+YCBjaGFuZ2VzLgor CiAyMDIxLTAyLTE3IERldmluIFJvdXNzbyA8ZHJvdXNzb0BhcHBsZS5jb20+CiAKICAgICAgICAg W2lPU10gdXBkYXRlIG1lZGlhIGNvbnRyb2xzIHRvIHVzZSBuZXcgU0YgU3ltYm9scwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Rv bS9Eb2N1bWVudC5jcHAKaW5kZXggMWI5ZjcyNjYzOTIxLi5hZjkwZWU2YWE5MjQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv ZG9tL0RvY3VtZW50LmNwcApAQCAtMzgzMiw2ICszODMyLDEzIEBAIHZvaWQgRG9jdW1lbnQ6OnBy b2Nlc3NUaGVtZUNvbG9yKGNvbnN0IFN0cmluZyYgdGhlbWVDb2xvclN0cmluZykKIAogICAgIGlm IChhdXRvKiBwYWdlID0gdGhpcy0+cGFnZSgpKQogICAgICAgICBwYWdlLT5jaHJvbWUoKS5jbGll bnQoKS50aGVtZUNvbG9yQ2hhbmdlZChtX3RoZW1lQ29sb3IpOworCisjaWYgRU5BQkxFKFJVQkJF Ul9CQU5ESU5HKQorICAgIGlmIChhdXRvKiB2aWV3ID0gcmVuZGVyVmlldygpKSB7CisgICAgICAg IGlmICh2aWV3LT51c2VzQ29tcG9zaXRpbmcoKSkKKyAgICAgICAgICAgIHZpZXctPmNvbXBvc2l0 b3IoKS51cGRhdGVMYXllckZvck92ZXJoYW5nQXJlYXNCYWNrZ3JvdW5kQ29sb3IoKTsKKyAgICB9 CisjZW5kaWYgLy8gRU5BQkxFKFJVQkJFUl9CQU5ESU5HKQogfQogCiAjaWYgRU5BQkxFKERBUktf TU9ERV9DU1MpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5 ZXJDb21wb3NpdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNv bXBvc2l0b3IuY3BwCmluZGV4IDljODA5NDc4ODQ4Yy4uZTAzMDU1NDY1NjhhIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcApAQCAt Mzg1Nyw3ICszODU3LDI0IEBAIEdyYXBoaWNzTGF5ZXIqIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6 dXBkYXRlTGF5ZXJGb3JGb290ZXIoYm9vbCB3YW50c0xheWVyKQogICAgIHJldHVybiBtX2xheWVy Rm9yRm9vdGVyLmdldCgpOwogfQogCi0jZW5kaWYKK3ZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9y Ojp1cGRhdGVMYXllckZvck92ZXJoYW5nQXJlYXNCYWNrZ3JvdW5kQ29sb3IoKQoreworICAgIGlm ICghbV9sYXllckZvck92ZXJoYW5nQXJlYXMpCisgICAgICAgIHJldHVybjsKKworICAgIENvbG9y IGJhY2tncm91bmRDb2xvcjsKKyAgICBpZiAocGFnZSgpLnNldHRpbmdzKCkudXNlVGhlbWVDb2xv ckZvclNjcm9sbEFyZWFCYWNrZ3JvdW5kQ29sb3IoKSkKKyAgICAgICAgYmFja2dyb3VuZENvbG9y ID0gcGFnZSgpLnRoZW1lQ29sb3IoKTsKKyAgICBpZiAoIWJhY2tncm91bmRDb2xvci5pc1ZhbGlk KCkpCisgICAgICAgIGJhY2tncm91bmRDb2xvciA9IG1fcm9vdEV4dGVuZGVkQmFja2dyb3VuZENv bG9yOworCisgICAgbV9sYXllckZvck92ZXJoYW5nQXJlYXMtPnNldEJhY2tncm91bmRDb2xvcihi YWNrZ3JvdW5kQ29sb3IpOworCisgICAgaWYgKCFiYWNrZ3JvdW5kQ29sb3IuaXNWYWxpZCgpKQor ICAgICAgICBtX2xheWVyRm9yT3ZlcmhhbmdBcmVhcy0+c2V0Q3VzdG9tQXBwZWFyYW5jZShHcmFw aGljc0xheWVyOjpDdXN0b21BcHBlYXJhbmNlOjpTY3JvbGxpbmdPdmVyaGFuZyk7Cit9CisKKyNl bmRpZiAvLyBFTkFCTEUoUlVCQkVSX0JBTkRJTkcpCiAKIGJvb2wgUmVuZGVyTGF5ZXJDb21wb3Np dG9yOjp2aWV3TmVlZHNUb0ludmFsaWRhdGVFdmVudFJlZ2lvbk9mRW5jbG9zaW5nQ29tcG9zaXRp bmdMYXllckZvclJlcGFpbnQoKSBjb25zdAogewpAQCAtMzkzMywxMiArMzk1MCw3IEBAIHZvaWQg UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpyb290QmFja2dyb3VuZENvbG9yT3JUcmFuc3BhcmVuY3lD aGFuZ2VkKCkKICAgICAgICAgcGFnZSgpLmNocm9tZSgpLmNsaWVudCgpLnBhZ2VFeHRlbmRlZEJh Y2tncm91bmRDb2xvckRpZENoYW5nZShtX3Jvb3RFeHRlbmRlZEJhY2tncm91bmRDb2xvcik7CiAg ICAgICAgIAogI2lmIEVOQUJMRShSVUJCRVJfQkFORElORykKLSAgICAgICAgaWYgKG1fbGF5ZXJG b3JPdmVyaGFuZ0FyZWFzKSB7Ci0gICAgICAgICAgICBtX2xheWVyRm9yT3ZlcmhhbmdBcmVhcy0+ c2V0QmFja2dyb3VuZENvbG9yKG1fcm9vdEV4dGVuZGVkQmFja2dyb3VuZENvbG9yKTsKLQotICAg ICAgICAgICAgaWYgKCFtX3Jvb3RFeHRlbmRlZEJhY2tncm91bmRDb2xvci5pc1ZhbGlkKCkpCi0g ICAgICAgICAgICAgICAgbV9sYXllckZvck92ZXJoYW5nQXJlYXMtPnNldEN1c3RvbUFwcGVhcmFu Y2UoR3JhcGhpY3NMYXllcjo6Q3VzdG9tQXBwZWFyYW5jZTo6U2Nyb2xsaW5nT3ZlcmhhbmcpOwot ICAgICAgICB9CisgICAgICAgIHVwZGF0ZUxheWVyRm9yT3ZlcmhhbmdBcmVhc0JhY2tncm91bmRD b2xvcigpOwogI2VuZGlmCiAgICAgfQogICAgIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5oCmluZGV4IGMxNTFlMjNkMGVmNi4uNDEwMzViOTIy YzU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21w b3NpdG9yLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9z aXRvci5oCkBAIC0zNDMsNyArMzQzLDkgQEAgcHVibGljOgogICAgIEdyYXBoaWNzTGF5ZXIqIHVw ZGF0ZUxheWVyRm9yQm90dG9tT3ZlcmhhbmdBcmVhKGJvb2wgd2FudHNMYXllcik7CiAgICAgR3Jh cGhpY3NMYXllciogdXBkYXRlTGF5ZXJGb3JIZWFkZXIoYm9vbCB3YW50c0xheWVyKTsKICAgICBH cmFwaGljc0xheWVyKiB1cGRhdGVMYXllckZvckZvb3Rlcihib29sIHdhbnRzTGF5ZXIpOwotI2Vu ZGlmCisKKyAgICB2b2lkIHVwZGF0ZUxheWVyRm9yT3ZlcmhhbmdBcmVhc0JhY2tncm91bmRDb2xv cigpOworI2VuZGlmIC8vIEVOQUJMRShSVUJCRVJfQkFORElORykKIAogICAgIC8vIEZJWE1FOiBt YWtlIHRoZSBjb29yZGluYXRlZC9hc3luYyB0ZXJtaW5vbG9neSBjb25zaXN0ZW50LgogICAgIGJv b2wgaXNWaWV3cG9ydENvbnN0cmFpbmVkRml4ZWRPclN0aWNreUxheWVyKGNvbnN0IFJlbmRlckxh eWVyJikgY29uc3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGVjN2E3MGQxY2Y1Ni4uYTE5OTAwZGU2MDljIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5n ZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTAyLTE3ICBEZXZpbiBSb3Vzc28gIDxkcm91c3Nv QGFwcGxlLmNvbT4KKworICAgICAgICBFeHBlcmltZW50IHdpdGggdXNpbmcgdGhlIHRoZW1lLWNv bG9yIGFzIHRoZSBzY3JvbGwgYXJlYSBiYWNrZ3JvdW5kIGlmIHByb3ZpZGVkCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjIwNzgKKyAgICAgICAgPHJk YXI6Ly9wcm9ibGVtLzc0MTU4ODE4PgorCisgICAgICAgIFJldmlld2VkIGJ5IFRpbSBIb3J0b24u CisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2lvcy9XS1dlYlZpZXdJT1MubW06CisgICAgICAg IChiYXNlU2Nyb2xsVmlld0JhY2tncm91bmRDb2xvcik6CisgICAgICAgICogVUlQcm9jZXNzL1Zp ZXdTbmFwc2hvdFN0b3JlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6Vmlld1NuYXBzaG90U3RvcmU6 OnJlY29yZFNuYXBzaG90KToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6Cisg ICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJQYWdlUHJv eHk6OnNjcm9sbEFyZWFCYWNrZ3JvdW5kQ29sb3IpOiBBZGRlZC4KKwogMjAyMS0wMi0xNyBUcnVp dHQgU2F2ZWxsIDx0c2F2ZWxsQGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByZXZl cnRpbmcgcjI3MjkwNS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9p b3MvV0tXZWJWaWV3SU9TLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2lvcy9XS1dl YlZpZXdJT1MubW0KaW5kZXggNTlkNDQ2MjZlYTQ1Li41MzI5ZDI0OGEzMGIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9pb3MvV0tXZWJWaWV3SU9TLm1tCisrKyBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9pb3MvV0tXZWJWaWV3SU9TLm1tCkBAIC00OTIsNyAr NDkyLDcgQEAgc3RhdGljIFdlYkNvcmU6OkNvbG9yIGJhc2VTY3JvbGxWaWV3QmFja2dyb3VuZENv bG9yKFdLV2ViVmlldyAqd2ViVmlldykKICAgICBpZiAoIXdlYlZpZXctPl9wYWdlKQogICAgICAg ICByZXR1cm4geyB9OwogCi0gICAgcmV0dXJuIHdlYlZpZXctPl9wYWdlLT5wYWdlRXh0ZW5kZWRC YWNrZ3JvdW5kQ29sb3IoKTsKKyAgICByZXR1cm4gd2ViVmlldy0+X3BhZ2UtPnNjcm9sbEFyZWFC YWNrZ3JvdW5kQ29sb3IoKTsKIH0KIAogc3RhdGljIFdlYkNvcmU6OkNvbG9yIHNjcm9sbFZpZXdC YWNrZ3JvdW5kQ29sb3IoV0tXZWJWaWV3ICp3ZWJWaWV3KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvVmlld1NuYXBzaG90U3RvcmUuY3BwIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvVmlld1NuYXBzaG90U3RvcmUuY3BwCmluZGV4IDIzMzE5MmE4ZjE0MS4uNDhkOTQ2MzI3 NTg0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9WaWV3U25hcHNob3RTdG9y ZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvVmlld1NuYXBzaG90U3RvcmUuY3Bw CkBAIC05NSw3ICs5NSw3IEBAIHZvaWQgVmlld1NuYXBzaG90U3RvcmU6OnJlY29yZFNuYXBzaG90 KFdlYlBhZ2VQcm94eSYgd2ViUGFnZVByb3h5LCBXZWJCYWNrRm9yd2FyCiAKICAgICBzbmFwc2hv dC0+c2V0UmVuZGVyVHJlZVNpemUod2ViUGFnZVByb3h5LnJlbmRlclRyZWVTaXplKCkpOwogICAg IHNuYXBzaG90LT5zZXREZXZpY2VTY2FsZUZhY3Rvcih3ZWJQYWdlUHJveHkuZGV2aWNlU2NhbGVG YWN0b3IoKSk7Ci0gICAgc25hcHNob3QtPnNldEJhY2tncm91bmRDb2xvcih3ZWJQYWdlUHJveHku cGFnZUV4dGVuZGVkQmFja2dyb3VuZENvbG9yKCkpOworICAgIHNuYXBzaG90LT5zZXRCYWNrZ3Jv dW5kQ29sb3Iod2ViUGFnZVByb3h5LnNjcm9sbEFyZWFCYWNrZ3JvdW5kQ29sb3IoKSk7CiAgICAg c25hcHNob3QtPnNldFZpZXdTY3JvbGxQb3NpdGlvbihXZWJDb3JlOjpyb3VuZGVkSW50UG9pbnQo d2ViUGFnZVByb3h5LnZpZXdTY3JvbGxQb3NpdGlvbigpKSk7CiAKICAgICBpdGVtLnNldFNuYXBz aG90KFdURk1vdmUoc25hcHNob3QpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuY3BwCmluZGV4IGY5NjNjODY5ZGE3ZS4uZThlZTkwM2Y1ZTc3IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKQEAgLTE5MDYsNiArMTkwNiwxNCBAQCB2b2lkIFdl YlBhZ2VQcm94eTo6c2V0VW5kZXJsYXlDb2xvcihjb25zdCBDb2xvciYgY29sb3IpCiAgICAgICAg IHNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlNldFVuZGVybGF5Q29sb3IoY29sb3IpKTsKIH0KIAor dm9pZCBXZWJQYWdlUHJveHk6OnNjcm9sbEFyZWFCYWNrZ3JvdW5kQ29sb3IoKSBjb25zdAorewor ICAgIGlmIChtX3ByZWZlcmVuY2VzLT4udXNlVGhlbWVDb2xvckZvclNjcm9sbEFyZWFCYWNrZ3Jv dW5kQ29sb3IoKSkKKyAgICAgICAgcmV0dXJuIG1fdGhlbWVDb2xvcjsKKworICAgIHJldHVybiBt X3BhZ2VFeHRlbmRlZEJhY2tncm91bmRDb2xvcjsKK30KKwogdm9pZCBXZWJQYWdlUHJveHk6OnZp ZXdXaWxsU3RhcnRMaXZlUmVzaXplKCkKIHsKICAgICBpZiAoIWhhc1J1bm5pbmdQcm9jZXNzKCkp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaCBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCmluZGV4IDI5MjQwNmM5YmY2Yy4u ZTJkOGRiMjNmZjIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdl UHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaApAQCAt NjM3LDYgKzYzNyw4IEBAIHB1YmxpYzoKICAgICAvLyB0aGUgbWVzc2FnZSBlbnRpcmVseS4KICAg ICBXZWJDb3JlOjpDb2xvciBwYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3IoKSBjb25zdCB7IHJl dHVybiBtX3BhZ2VFeHRlbmRlZEJhY2tncm91bmRDb2xvcjsgfQogCisgICAgV2ViQ29yZTo6Q29s b3Igc2Nyb2xsQXJlYUJhY2tncm91bmRDb2xvcigpIGNvbnN0OworCiAgICAgdm9pZCB2aWV3V2ls bFN0YXJ0TGl2ZVJlc2l6ZSgpOwogICAgIHZvaWQgdmlld1dpbGxFbmRMaXZlUmVzaXplKCk7CiAK 420742 2021-02-17 15:52:21 -0800 2021-02-17 15:58:43 -0800 Patch 222078.diff text/plain 9067 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nIGIvU291cmNlL1dURi9DaGFuZ2VMb2cK aW5kZXggM2M4NWZkODc5ZjlhLi5lMjg1M2FhZDBkNTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYv Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIw MjEtMDItMTcgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIEV4 cGVyaW1lbnQgd2l0aCB1c2luZyB0aGUgdGhlbWUtY29sb3IgYXMgdGhlIHNjcm9sbCBhcmVhIGJh Y2tncm91bmQgaWYgcHJvdmlkZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIyMjA3OAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzQxNTg4MTg+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgVGltIEhvcnRvbi4KKworICAgICAgICAqIFNjcmlwdHMvUHJl ZmVyZW5jZXMvV2ViUHJlZmVyZW5jZXNJbnRlcm5hbC55YW1sOgorCiAyMDIxLTAyLTE3ICBEZWFu IEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KIAogICAgICAgICBVc2UgZWxlbWVudCBmdWxsc2Ny ZWVuIGZvciB2aWRlbyBvbiBzb21lIGNvbmZpZ3VyYXRpb25zCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V1RGL1NjcmlwdHMvUHJlZmVyZW5jZXMvV2ViUHJlZmVyZW5jZXNJbnRlcm5hbC55YW1sIGIvU291 cmNlL1dURi9TY3JpcHRzL1ByZWZlcmVuY2VzL1dlYlByZWZlcmVuY2VzSW50ZXJuYWwueWFtbApp bmRleCA4Yzg3MzRiZDAzMjMuLmQwMTdkODkwMDM4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dURi9T Y3JpcHRzL1ByZWZlcmVuY2VzL1dlYlByZWZlcmVuY2VzSW50ZXJuYWwueWFtbAorKysgYi9Tb3Vy Y2UvV1RGL1NjcmlwdHMvUHJlZmVyZW5jZXMvV2ViUHJlZmVyZW5jZXNJbnRlcm5hbC55YW1sCkBA IC03NzUsNiArNzc1LDE3IEBAIFVzZUdQVVByb2Nlc3NGb3JXZWJHTEVuYWJsZWQ6CiAgICAgV2Vi S2l0OgogICAgICAgZGVmYXVsdDogZGVmYXVsdFVzZUdQVVByb2Nlc3NGb3JXZWJHTEVuYWJsZWQo KQogCitVc2VUaGVtZUNvbG9yRm9yU2Nyb2xsQXJlYUJhY2tncm91bmRDb2xvcjoKKyAgdHlwZTog Ym9vbAorICBodW1hblJlYWRhYmxlTmFtZTogIlVzZSB0aGVtZS1jb2xvciBmb3Igc2Nyb2xsIGFy ZWEgYmFja2dyb3VuZCBjb2xvciIKKyAgaHVtYW5SZWFkYWJsZURlc2NyaXB0aW9uOiAiVXNlIDxt ZXRhIG5hbWU9XCJ0aGVtZS1jb2xvclwiIGNvbnRlbnQ9XCIuLi5cIj4gZm9yIHRoZSBiYWNrZ3Jv dW5kIGNvbG9yIG9mIHRoZSBzY3JvbGwgYXJlYSIKKyAgd2ViY29yZUJpbmRpbmc6IG5vbmUKKyAg ZGVmYXVsdFZhbHVlOgorICAgIFdlYktpdDoKKyAgICAgIGRlZmF1bHQ6IGZhbHNlCisgICAgV2Vi Q29yZToKKyAgICAgIGRlZmF1bHQ6IGZhbHNlCisKICMgRklYTUU6IFJlbW92ZSBvbmNlIDxyZGFy Oi8vNzM4MzA5NjE+IGhhcyBiZWVuIGZpeGVkCiBVc2VpVHVuZXNBVk91dHB1dENvbnRleHQ6CiAg IHR5cGU6IGJvb2wKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAxYWYxNDcyMDBmMDAuLjFkZWJlN2U1MDk2ZiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTAyLTE3ICBEZXZpbiBSb3Vzc28gIDxkcm91 c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBFeHBlcmltZW50IHdpdGggdXNpbmcgdGhlIHRoZW1l LWNvbG9yIGFzIHRoZSBzY3JvbGwgYXJlYSBiYWNrZ3JvdW5kIGlmIHByb3ZpZGVkCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjIwNzgKKyAgICAgICAg PHJkYXI6Ly9wcm9ibGVtLzc0MTU4ODE4PgorCisgICAgICAgIFJldmlld2VkIGJ5IFRpbSBIb3J0 b24uCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmg6CisgICAg ICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6OnVwZGF0ZUxheWVyRm9yT3ZlcmhhbmdBcmVhc0Jh Y2tncm91bmRDb2xvcik6IEFkZGVkLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJDb21w b3NpdG9yOjpyb290QmFja2dyb3VuZENvbG9yT3JUcmFuc3BhcmVuY3lDaGFuZ2VkKToKKworICAg ICAgICAqIGRvbS9Eb2N1bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6cHJv Y2Vzc1RoZW1lQ29sb3IpOgorICAgICAgICBOb3RpZnkgdGhlIGBSZW5kZXJMYXllckNvbXBvc2l0 b3JgIHdoZW4gYDxtZXRhIG5hbWU9InRoZW1lLWNvbG9yIiBjb250ZW50PSIuLi4iPmAgY2hhbmdl cy4KKwogMjAyMS0wMi0xNyBEZXZpbiBSb3Vzc28gPGRyb3Vzc29AYXBwbGUuY29tPgogCiAgICAg ICAgIFtpT1NdIHVwZGF0ZSBtZWRpYSBjb250cm9scyB0byB1c2UgbmV3IFNGIFN5bWJvbHMKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9kb20vRG9jdW1lbnQuY3BwCmluZGV4IDFiOWY3MjY2MzkyMS4uYWY5MGVlNmFhOTI0IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2RvbS9Eb2N1bWVudC5jcHAKQEAgLTM4MzIsNiArMzgzMiwxMyBAQCB2b2lkIERvY3VtZW50 Ojpwcm9jZXNzVGhlbWVDb2xvcihjb25zdCBTdHJpbmcmIHRoZW1lQ29sb3JTdHJpbmcpCiAKICAg ICBpZiAoYXV0byogcGFnZSA9IHRoaXMtPnBhZ2UoKSkKICAgICAgICAgcGFnZS0+Y2hyb21lKCku Y2xpZW50KCkudGhlbWVDb2xvckNoYW5nZWQobV90aGVtZUNvbG9yKTsKKworI2lmIEVOQUJMRShS VUJCRVJfQkFORElORykKKyAgICBpZiAoYXV0byogdmlldyA9IHJlbmRlclZpZXcoKSkgeworICAg ICAgICBpZiAodmlldy0+dXNlc0NvbXBvc2l0aW5nKCkpCisgICAgICAgICAgICB2aWV3LT5jb21w b3NpdG9yKCkudXBkYXRlTGF5ZXJGb3JPdmVyaGFuZ0FyZWFzQmFja2dyb3VuZENvbG9yKCk7Cisg ICAgfQorI2VuZGlmIC8vIEVOQUJMRShSVUJCRVJfQkFORElORykKIH0KIAogI2lmIEVOQUJMRShE QVJLX01PREVfQ1NTKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckxheWVyQ29tcG9zaXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5 ZXJDb21wb3NpdG9yLmNwcAppbmRleCA5YzgwOTQ3ODg0OGMuLmUwMzA1NTQ2NTY4YSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAK QEAgLTM4NTcsNyArMzg1NywyNCBAQCBHcmFwaGljc0xheWVyKiBSZW5kZXJMYXllckNvbXBvc2l0 b3I6OnVwZGF0ZUxheWVyRm9yRm9vdGVyKGJvb2wgd2FudHNMYXllcikKICAgICByZXR1cm4gbV9s YXllckZvckZvb3Rlci5nZXQoKTsKIH0KIAotI2VuZGlmCit2b2lkIFJlbmRlckxheWVyQ29tcG9z aXRvcjo6dXBkYXRlTGF5ZXJGb3JPdmVyaGFuZ0FyZWFzQmFja2dyb3VuZENvbG9yKCkKK3sKKyAg ICBpZiAoIW1fbGF5ZXJGb3JPdmVyaGFuZ0FyZWFzKQorICAgICAgICByZXR1cm47CisKKyAgICBD b2xvciBiYWNrZ3JvdW5kQ29sb3I7CisgICAgaWYgKHBhZ2UoKS5zZXR0aW5ncygpLnVzZVRoZW1l Q29sb3JGb3JTY3JvbGxBcmVhQmFja2dyb3VuZENvbG9yKCkpCisgICAgICAgIGJhY2tncm91bmRD b2xvciA9IHBhZ2UoKS50aGVtZUNvbG9yKCk7CisgICAgaWYgKCFiYWNrZ3JvdW5kQ29sb3IuaXNW YWxpZCgpKQorICAgICAgICBiYWNrZ3JvdW5kQ29sb3IgPSBtX3Jvb3RFeHRlbmRlZEJhY2tncm91 bmRDb2xvcjsKKworICAgIG1fbGF5ZXJGb3JPdmVyaGFuZ0FyZWFzLT5zZXRCYWNrZ3JvdW5kQ29s b3IoYmFja2dyb3VuZENvbG9yKTsKKworICAgIGlmICghYmFja2dyb3VuZENvbG9yLmlzVmFsaWQo KSkKKyAgICAgICAgbV9sYXllckZvck92ZXJoYW5nQXJlYXMtPnNldEN1c3RvbUFwcGVhcmFuY2Uo R3JhcGhpY3NMYXllcjo6Q3VzdG9tQXBwZWFyYW5jZTo6U2Nyb2xsaW5nT3ZlcmhhbmcpOworfQor CisjZW5kaWYgLy8gRU5BQkxFKFJVQkJFUl9CQU5ESU5HKQogCiBib29sIFJlbmRlckxheWVyQ29t cG9zaXRvcjo6dmlld05lZWRzVG9JbnZhbGlkYXRlRXZlbnRSZWdpb25PZkVuY2xvc2luZ0NvbXBv c2l0aW5nTGF5ZXJGb3JSZXBhaW50KCkgY29uc3QKIHsKQEAgLTM5MzMsMTIgKzM5NTAsNyBAQCB2 b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6cm9vdEJhY2tncm91bmRDb2xvck9yVHJhbnNwYXJl bmN5Q2hhbmdlZCgpCiAgICAgICAgIHBhZ2UoKS5jaHJvbWUoKS5jbGllbnQoKS5wYWdlRXh0ZW5k ZWRCYWNrZ3JvdW5kQ29sb3JEaWRDaGFuZ2UobV9yb290RXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3Ip OwogICAgICAgICAKICNpZiBFTkFCTEUoUlVCQkVSX0JBTkRJTkcpCi0gICAgICAgIGlmIChtX2xh eWVyRm9yT3ZlcmhhbmdBcmVhcykgewotICAgICAgICAgICAgbV9sYXllckZvck92ZXJoYW5nQXJl YXMtPnNldEJhY2tncm91bmRDb2xvcihtX3Jvb3RFeHRlbmRlZEJhY2tncm91bmRDb2xvcik7Ci0K LSAgICAgICAgICAgIGlmICghbV9yb290RXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3IuaXNWYWxpZCgp KQotICAgICAgICAgICAgICAgIG1fbGF5ZXJGb3JPdmVyaGFuZ0FyZWFzLT5zZXRDdXN0b21BcHBl YXJhbmNlKEdyYXBoaWNzTGF5ZXI6OkN1c3RvbUFwcGVhcmFuY2U6OlNjcm9sbGluZ092ZXJoYW5n KTsKLSAgICAgICAgfQorICAgICAgICB1cGRhdGVMYXllckZvck92ZXJoYW5nQXJlYXNCYWNrZ3Jv dW5kQ29sb3IoKTsKICNlbmRpZgogICAgIH0KICAgICAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuaCBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuaAppbmRleCBjMTUxZTIzZDBlZjYuLjQxMDM1 YjkyMmM1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVy Q29tcG9zaXRvci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNv bXBvc2l0b3IuaApAQCAtMzQzLDcgKzM0Myw5IEBAIHB1YmxpYzoKICAgICBHcmFwaGljc0xheWVy KiB1cGRhdGVMYXllckZvckJvdHRvbU92ZXJoYW5nQXJlYShib29sIHdhbnRzTGF5ZXIpOwogICAg IEdyYXBoaWNzTGF5ZXIqIHVwZGF0ZUxheWVyRm9ySGVhZGVyKGJvb2wgd2FudHNMYXllcik7CiAg ICAgR3JhcGhpY3NMYXllciogdXBkYXRlTGF5ZXJGb3JGb290ZXIoYm9vbCB3YW50c0xheWVyKTsK LSNlbmRpZgorCisgICAgdm9pZCB1cGRhdGVMYXllckZvck92ZXJoYW5nQXJlYXNCYWNrZ3JvdW5k Q29sb3IoKTsKKyNlbmRpZiAvLyBFTkFCTEUoUlVCQkVSX0JBTkRJTkcpCiAKICAgICAvLyBGSVhN RTogbWFrZSB0aGUgY29vcmRpbmF0ZWQvYXN5bmMgdGVybWlub2xvZ3kgY29uc2lzdGVudC4KICAg ICBib29sIGlzVmlld3BvcnRDb25zdHJhaW5lZEZpeGVkT3JTdGlja3lMYXllcihjb25zdCBSZW5k ZXJMYXllciYpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9T b3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCBlYzdhNzBkMWNmNTYuLmExOTkwMGRlNjA5YyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9D aGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAyMS0wMi0xNyAgRGV2aW4gUm91c3NvICA8ZHJv dXNzb0BhcHBsZS5jb20+CisKKyAgICAgICAgRXhwZXJpbWVudCB3aXRoIHVzaW5nIHRoZSB0aGVt ZS1jb2xvciBhcyB0aGUgc2Nyb2xsIGFyZWEgYmFja2dyb3VuZCBpZiBwcm92aWRlZAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIyMDc4CisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS83NDE1ODgxOD4KKworICAgICAgICBSZXZpZXdlZCBieSBUaW0gSG9y dG9uLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9pb3MvV0tXZWJWaWV3SU9TLm1tOgorICAg ICAgICAoYmFzZVNjcm9sbFZpZXdCYWNrZ3JvdW5kQ29sb3IpOgorICAgICAgICAqIFVJUHJvY2Vz cy9WaWV3U25hcHNob3RTdG9yZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OlZpZXdTbmFwc2hvdFN0 b3JlOjpyZWNvcmRTbmFwc2hvdCk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5o OgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViUGFn ZVByb3h5OjpzY3JvbGxBcmVhQmFja2dyb3VuZENvbG9yKTogQWRkZWQuCisKIDIwMjEtMDItMTcg VHJ1aXR0IFNhdmVsbCA8dHNhdmVsbEBhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwg cmV2ZXJ0aW5nIHIyNzI5MDUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B UEkvaW9zL1dLV2ViVmlld0lPUy5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9pb3Mv V0tXZWJWaWV3SU9TLm1tCmluZGV4IDU5ZDQ0NjI2ZWE0NS4uNTMyOWQyNDhhMzBiIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvaW9zL1dLV2ViVmlld0lPUy5tbQorKysg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvaW9zL1dLV2ViVmlld0lPUy5tbQpAQCAtNDky LDcgKzQ5Miw3IEBAIHN0YXRpYyBXZWJDb3JlOjpDb2xvciBiYXNlU2Nyb2xsVmlld0JhY2tncm91 bmRDb2xvcihXS1dlYlZpZXcgKndlYlZpZXcpCiAgICAgaWYgKCF3ZWJWaWV3LT5fcGFnZSkKICAg ICAgICAgcmV0dXJuIHsgfTsKIAotICAgIHJldHVybiB3ZWJWaWV3LT5fcGFnZS0+cGFnZUV4dGVu ZGVkQmFja2dyb3VuZENvbG9yKCk7CisgICAgcmV0dXJuIHdlYlZpZXctPl9wYWdlLT5zY3JvbGxB cmVhQmFja2dyb3VuZENvbG9yKCk7CiB9CiAKIHN0YXRpYyBXZWJDb3JlOjpDb2xvciBzY3JvbGxW aWV3QmFja2dyb3VuZENvbG9yKFdLV2ViVmlldyAqd2ViVmlldykKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1ZpZXdTbmFwc2hvdFN0b3JlLmNwcCBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1ZpZXdTbmFwc2hvdFN0b3JlLmNwcAppbmRleCAyMzMxOTJhOGYxNDEuLjQ4ZDk0 NjMyNzU4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvVmlld1NuYXBzaG90 U3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1ZpZXdTbmFwc2hvdFN0b3Jl LmNwcApAQCAtOTUsNyArOTUsNyBAQCB2b2lkIFZpZXdTbmFwc2hvdFN0b3JlOjpyZWNvcmRTbmFw c2hvdChXZWJQYWdlUHJveHkmIHdlYlBhZ2VQcm94eSwgV2ViQmFja0ZvcndhcgogCiAgICAgc25h cHNob3QtPnNldFJlbmRlclRyZWVTaXplKHdlYlBhZ2VQcm94eS5yZW5kZXJUcmVlU2l6ZSgpKTsK ICAgICBzbmFwc2hvdC0+c2V0RGV2aWNlU2NhbGVGYWN0b3Iod2ViUGFnZVByb3h5LmRldmljZVNj YWxlRmFjdG9yKCkpOwotICAgIHNuYXBzaG90LT5zZXRCYWNrZ3JvdW5kQ29sb3Iod2ViUGFnZVBy b3h5LnBhZ2VFeHRlbmRlZEJhY2tncm91bmRDb2xvcigpKTsKKyAgICBzbmFwc2hvdC0+c2V0QmFj a2dyb3VuZENvbG9yKHdlYlBhZ2VQcm94eS5zY3JvbGxBcmVhQmFja2dyb3VuZENvbG9yKCkpOwog ICAgIHNuYXBzaG90LT5zZXRWaWV3U2Nyb2xsUG9zaXRpb24oV2ViQ29yZTo6cm91bmRlZEludFBv aW50KHdlYlBhZ2VQcm94eS52aWV3U2Nyb2xsUG9zaXRpb24oKSkpOwogCiAgICAgaXRlbS5zZXRT bmFwc2hvdChXVEZNb3ZlKHNuYXBzaG90KSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFn ZVByb3h5LmNwcAppbmRleCBmOTYzYzg2OWRhN2UuLmU4ZWU5MDNmNWU3NyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCkBAIC0xOTA2LDYgKzE5MDYsMTQgQEAgdm9p ZCBXZWJQYWdlUHJveHk6OnNldFVuZGVybGF5Q29sb3IoY29uc3QgQ29sb3ImIGNvbG9yKQogICAg ICAgICBzZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpTZXRVbmRlcmxheUNvbG9yKGNvbG9yKSk7CiB9 CiAKK3ZvaWQgV2ViUGFnZVByb3h5OjpzY3JvbGxBcmVhQmFja2dyb3VuZENvbG9yKCkgY29uc3QK K3sKKyAgICBpZiAobV9wcmVmZXJlbmNlcy0+LnVzZVRoZW1lQ29sb3JGb3JTY3JvbGxBcmVhQmFj a2dyb3VuZENvbG9yKCkpCisgICAgICAgIHJldHVybiBtX3RoZW1lQ29sb3I7CisKKyAgICByZXR1 cm4gbV9wYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3I7Cit9CisKIHZvaWQgV2ViUGFnZVByb3h5 Ojp2aWV3V2lsbFN0YXJ0TGl2ZVJlc2l6ZSgpCiB7CiAgICAgaWYgKCFoYXNSdW5uaW5nUHJvY2Vz cygpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmgg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAppbmRleCAyOTI0MDZjOWJm NmMuLmUyZDhkYjIzZmYyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vi UGFnZVByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgK QEAgLTYzNyw2ICs2MzcsOCBAQCBwdWJsaWM6CiAgICAgLy8gdGhlIG1lc3NhZ2UgZW50aXJlbHku CiAgICAgV2ViQ29yZTo6Q29sb3IgcGFnZUV4dGVuZGVkQmFja2dyb3VuZENvbG9yKCkgY29uc3Qg eyByZXR1cm4gbV9wYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3I7IH0KIAorICAgIFdlYkNvcmU6 OkNvbG9yIHNjcm9sbEFyZWFCYWNrZ3JvdW5kQ29sb3IoKSBjb25zdDsKKwogICAgIHZvaWQgdmll d1dpbGxTdGFydExpdmVSZXNpemUoKTsKICAgICB2b2lkIHZpZXdXaWxsRW5kTGl2ZVJlc2l6ZSgp OwogCg== 420743 2021-02-17 15:57:27 -0800 2021-02-17 16:11:17 -0800 Patch 222078.diff text/plain 9068 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nIGIvU291cmNlL1dURi9DaGFuZ2VMb2cK aW5kZXggM2M4NWZkODc5ZjlhLi5lMjg1M2FhZDBkNTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYv Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIw MjEtMDItMTcgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIEV4 cGVyaW1lbnQgd2l0aCB1c2luZyB0aGUgdGhlbWUtY29sb3IgYXMgdGhlIHNjcm9sbCBhcmVhIGJh Y2tncm91bmQgaWYgcHJvdmlkZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIyMjA3OAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzQxNTg4MTg+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgVGltIEhvcnRvbi4KKworICAgICAgICAqIFNjcmlwdHMvUHJl ZmVyZW5jZXMvV2ViUHJlZmVyZW5jZXNJbnRlcm5hbC55YW1sOgorCiAyMDIxLTAyLTE3ICBEZWFu IEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KIAogICAgICAgICBVc2UgZWxlbWVudCBmdWxsc2Ny ZWVuIGZvciB2aWRlbyBvbiBzb21lIGNvbmZpZ3VyYXRpb25zCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V1RGL1NjcmlwdHMvUHJlZmVyZW5jZXMvV2ViUHJlZmVyZW5jZXNJbnRlcm5hbC55YW1sIGIvU291 cmNlL1dURi9TY3JpcHRzL1ByZWZlcmVuY2VzL1dlYlByZWZlcmVuY2VzSW50ZXJuYWwueWFtbApp bmRleCA4Yzg3MzRiZDAzMjMuLmQwMTdkODkwMDM4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dURi9T Y3JpcHRzL1ByZWZlcmVuY2VzL1dlYlByZWZlcmVuY2VzSW50ZXJuYWwueWFtbAorKysgYi9Tb3Vy Y2UvV1RGL1NjcmlwdHMvUHJlZmVyZW5jZXMvV2ViUHJlZmVyZW5jZXNJbnRlcm5hbC55YW1sCkBA IC03NzUsNiArNzc1LDE3IEBAIFVzZUdQVVByb2Nlc3NGb3JXZWJHTEVuYWJsZWQ6CiAgICAgV2Vi S2l0OgogICAgICAgZGVmYXVsdDogZGVmYXVsdFVzZUdQVVByb2Nlc3NGb3JXZWJHTEVuYWJsZWQo KQogCitVc2VUaGVtZUNvbG9yRm9yU2Nyb2xsQXJlYUJhY2tncm91bmRDb2xvcjoKKyAgdHlwZTog Ym9vbAorICBodW1hblJlYWRhYmxlTmFtZTogIlVzZSB0aGVtZS1jb2xvciBmb3Igc2Nyb2xsIGFy ZWEgYmFja2dyb3VuZCBjb2xvciIKKyAgaHVtYW5SZWFkYWJsZURlc2NyaXB0aW9uOiAiVXNlIDxt ZXRhIG5hbWU9XCJ0aGVtZS1jb2xvclwiIGNvbnRlbnQ9XCIuLi5cIj4gZm9yIHRoZSBiYWNrZ3Jv dW5kIGNvbG9yIG9mIHRoZSBzY3JvbGwgYXJlYSIKKyAgd2ViY29yZUJpbmRpbmc6IG5vbmUKKyAg ZGVmYXVsdFZhbHVlOgorICAgIFdlYktpdDoKKyAgICAgIGRlZmF1bHQ6IGZhbHNlCisgICAgV2Vi Q29yZToKKyAgICAgIGRlZmF1bHQ6IGZhbHNlCisKICMgRklYTUU6IFJlbW92ZSBvbmNlIDxyZGFy Oi8vNzM4MzA5NjE+IGhhcyBiZWVuIGZpeGVkCiBVc2VpVHVuZXNBVk91dHB1dENvbnRleHQ6CiAg IHR5cGU6IGJvb2wKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAxYWYxNDcyMDBmMDAuLjFkZWJlN2U1MDk2ZiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTAyLTE3ICBEZXZpbiBSb3Vzc28gIDxkcm91 c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBFeHBlcmltZW50IHdpdGggdXNpbmcgdGhlIHRoZW1l LWNvbG9yIGFzIHRoZSBzY3JvbGwgYXJlYSBiYWNrZ3JvdW5kIGlmIHByb3ZpZGVkCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjIwNzgKKyAgICAgICAg PHJkYXI6Ly9wcm9ibGVtLzc0MTU4ODE4PgorCisgICAgICAgIFJldmlld2VkIGJ5IFRpbSBIb3J0 b24uCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmg6CisgICAg ICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6OnVwZGF0ZUxheWVyRm9yT3ZlcmhhbmdBcmVhc0Jh Y2tncm91bmRDb2xvcik6IEFkZGVkLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJDb21w b3NpdG9yOjpyb290QmFja2dyb3VuZENvbG9yT3JUcmFuc3BhcmVuY3lDaGFuZ2VkKToKKworICAg ICAgICAqIGRvbS9Eb2N1bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6cHJv Y2Vzc1RoZW1lQ29sb3IpOgorICAgICAgICBOb3RpZnkgdGhlIGBSZW5kZXJMYXllckNvbXBvc2l0 b3JgIHdoZW4gYDxtZXRhIG5hbWU9InRoZW1lLWNvbG9yIiBjb250ZW50PSIuLi4iPmAgY2hhbmdl cy4KKwogMjAyMS0wMi0xNyBEZXZpbiBSb3Vzc28gPGRyb3Vzc29AYXBwbGUuY29tPgogCiAgICAg ICAgIFtpT1NdIHVwZGF0ZSBtZWRpYSBjb250cm9scyB0byB1c2UgbmV3IFNGIFN5bWJvbHMKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9kb20vRG9jdW1lbnQuY3BwCmluZGV4IDFiOWY3MjY2MzkyMS4uYWY5MGVlNmFhOTI0IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2RvbS9Eb2N1bWVudC5jcHAKQEAgLTM4MzIsNiArMzgzMiwxMyBAQCB2b2lkIERvY3VtZW50 Ojpwcm9jZXNzVGhlbWVDb2xvcihjb25zdCBTdHJpbmcmIHRoZW1lQ29sb3JTdHJpbmcpCiAKICAg ICBpZiAoYXV0byogcGFnZSA9IHRoaXMtPnBhZ2UoKSkKICAgICAgICAgcGFnZS0+Y2hyb21lKCku Y2xpZW50KCkudGhlbWVDb2xvckNoYW5nZWQobV90aGVtZUNvbG9yKTsKKworI2lmIEVOQUJMRShS VUJCRVJfQkFORElORykKKyAgICBpZiAoYXV0byogdmlldyA9IHJlbmRlclZpZXcoKSkgeworICAg ICAgICBpZiAodmlldy0+dXNlc0NvbXBvc2l0aW5nKCkpCisgICAgICAgICAgICB2aWV3LT5jb21w b3NpdG9yKCkudXBkYXRlTGF5ZXJGb3JPdmVyaGFuZ0FyZWFzQmFja2dyb3VuZENvbG9yKCk7Cisg ICAgfQorI2VuZGlmIC8vIEVOQUJMRShSVUJCRVJfQkFORElORykKIH0KIAogI2lmIEVOQUJMRShE QVJLX01PREVfQ1NTKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckxheWVyQ29tcG9zaXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5 ZXJDb21wb3NpdG9yLmNwcAppbmRleCA5YzgwOTQ3ODg0OGMuLmUwMzA1NTQ2NTY4YSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAK QEAgLTM4NTcsNyArMzg1NywyNCBAQCBHcmFwaGljc0xheWVyKiBSZW5kZXJMYXllckNvbXBvc2l0 b3I6OnVwZGF0ZUxheWVyRm9yRm9vdGVyKGJvb2wgd2FudHNMYXllcikKICAgICByZXR1cm4gbV9s YXllckZvckZvb3Rlci5nZXQoKTsKIH0KIAotI2VuZGlmCit2b2lkIFJlbmRlckxheWVyQ29tcG9z aXRvcjo6dXBkYXRlTGF5ZXJGb3JPdmVyaGFuZ0FyZWFzQmFja2dyb3VuZENvbG9yKCkKK3sKKyAg ICBpZiAoIW1fbGF5ZXJGb3JPdmVyaGFuZ0FyZWFzKQorICAgICAgICByZXR1cm47CisKKyAgICBD b2xvciBiYWNrZ3JvdW5kQ29sb3I7CisgICAgaWYgKHBhZ2UoKS5zZXR0aW5ncygpLnVzZVRoZW1l Q29sb3JGb3JTY3JvbGxBcmVhQmFja2dyb3VuZENvbG9yKCkpCisgICAgICAgIGJhY2tncm91bmRD b2xvciA9IHBhZ2UoKS50aGVtZUNvbG9yKCk7CisgICAgaWYgKCFiYWNrZ3JvdW5kQ29sb3IuaXNW YWxpZCgpKQorICAgICAgICBiYWNrZ3JvdW5kQ29sb3IgPSBtX3Jvb3RFeHRlbmRlZEJhY2tncm91 bmRDb2xvcjsKKworICAgIG1fbGF5ZXJGb3JPdmVyaGFuZ0FyZWFzLT5zZXRCYWNrZ3JvdW5kQ29s b3IoYmFja2dyb3VuZENvbG9yKTsKKworICAgIGlmICghYmFja2dyb3VuZENvbG9yLmlzVmFsaWQo KSkKKyAgICAgICAgbV9sYXllckZvck92ZXJoYW5nQXJlYXMtPnNldEN1c3RvbUFwcGVhcmFuY2Uo R3JhcGhpY3NMYXllcjo6Q3VzdG9tQXBwZWFyYW5jZTo6U2Nyb2xsaW5nT3ZlcmhhbmcpOworfQor CisjZW5kaWYgLy8gRU5BQkxFKFJVQkJFUl9CQU5ESU5HKQogCiBib29sIFJlbmRlckxheWVyQ29t cG9zaXRvcjo6dmlld05lZWRzVG9JbnZhbGlkYXRlRXZlbnRSZWdpb25PZkVuY2xvc2luZ0NvbXBv c2l0aW5nTGF5ZXJGb3JSZXBhaW50KCkgY29uc3QKIHsKQEAgLTM5MzMsMTIgKzM5NTAsNyBAQCB2 b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6cm9vdEJhY2tncm91bmRDb2xvck9yVHJhbnNwYXJl bmN5Q2hhbmdlZCgpCiAgICAgICAgIHBhZ2UoKS5jaHJvbWUoKS5jbGllbnQoKS5wYWdlRXh0ZW5k ZWRCYWNrZ3JvdW5kQ29sb3JEaWRDaGFuZ2UobV9yb290RXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3Ip OwogICAgICAgICAKICNpZiBFTkFCTEUoUlVCQkVSX0JBTkRJTkcpCi0gICAgICAgIGlmIChtX2xh eWVyRm9yT3ZlcmhhbmdBcmVhcykgewotICAgICAgICAgICAgbV9sYXllckZvck92ZXJoYW5nQXJl YXMtPnNldEJhY2tncm91bmRDb2xvcihtX3Jvb3RFeHRlbmRlZEJhY2tncm91bmRDb2xvcik7Ci0K LSAgICAgICAgICAgIGlmICghbV9yb290RXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3IuaXNWYWxpZCgp KQotICAgICAgICAgICAgICAgIG1fbGF5ZXJGb3JPdmVyaGFuZ0FyZWFzLT5zZXRDdXN0b21BcHBl YXJhbmNlKEdyYXBoaWNzTGF5ZXI6OkN1c3RvbUFwcGVhcmFuY2U6OlNjcm9sbGluZ092ZXJoYW5n KTsKLSAgICAgICAgfQorICAgICAgICB1cGRhdGVMYXllckZvck92ZXJoYW5nQXJlYXNCYWNrZ3Jv dW5kQ29sb3IoKTsKICNlbmRpZgogICAgIH0KICAgICAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuaCBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuaAppbmRleCBjMTUxZTIzZDBlZjYuLjQxMDM1 YjkyMmM1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVy Q29tcG9zaXRvci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNv bXBvc2l0b3IuaApAQCAtMzQzLDcgKzM0Myw5IEBAIHB1YmxpYzoKICAgICBHcmFwaGljc0xheWVy KiB1cGRhdGVMYXllckZvckJvdHRvbU92ZXJoYW5nQXJlYShib29sIHdhbnRzTGF5ZXIpOwogICAg IEdyYXBoaWNzTGF5ZXIqIHVwZGF0ZUxheWVyRm9ySGVhZGVyKGJvb2wgd2FudHNMYXllcik7CiAg ICAgR3JhcGhpY3NMYXllciogdXBkYXRlTGF5ZXJGb3JGb290ZXIoYm9vbCB3YW50c0xheWVyKTsK LSNlbmRpZgorCisgICAgdm9pZCB1cGRhdGVMYXllckZvck92ZXJoYW5nQXJlYXNCYWNrZ3JvdW5k Q29sb3IoKTsKKyNlbmRpZiAvLyBFTkFCTEUoUlVCQkVSX0JBTkRJTkcpCiAKICAgICAvLyBGSVhN RTogbWFrZSB0aGUgY29vcmRpbmF0ZWQvYXN5bmMgdGVybWlub2xvZ3kgY29uc2lzdGVudC4KICAg ICBib29sIGlzVmlld3BvcnRDb25zdHJhaW5lZEZpeGVkT3JTdGlja3lMYXllcihjb25zdCBSZW5k ZXJMYXllciYpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9T b3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCBlYzdhNzBkMWNmNTYuLmExOTkwMGRlNjA5YyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9D aGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAyMS0wMi0xNyAgRGV2aW4gUm91c3NvICA8ZHJv dXNzb0BhcHBsZS5jb20+CisKKyAgICAgICAgRXhwZXJpbWVudCB3aXRoIHVzaW5nIHRoZSB0aGVt ZS1jb2xvciBhcyB0aGUgc2Nyb2xsIGFyZWEgYmFja2dyb3VuZCBpZiBwcm92aWRlZAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIyMDc4CisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS83NDE1ODgxOD4KKworICAgICAgICBSZXZpZXdlZCBieSBUaW0gSG9y dG9uLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9pb3MvV0tXZWJWaWV3SU9TLm1tOgorICAg ICAgICAoYmFzZVNjcm9sbFZpZXdCYWNrZ3JvdW5kQ29sb3IpOgorICAgICAgICAqIFVJUHJvY2Vz cy9WaWV3U25hcHNob3RTdG9yZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OlZpZXdTbmFwc2hvdFN0 b3JlOjpyZWNvcmRTbmFwc2hvdCk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5o OgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViUGFn ZVByb3h5OjpzY3JvbGxBcmVhQmFja2dyb3VuZENvbG9yKTogQWRkZWQuCisKIDIwMjEtMDItMTcg VHJ1aXR0IFNhdmVsbCA8dHNhdmVsbEBhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwg cmV2ZXJ0aW5nIHIyNzI5MDUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B UEkvaW9zL1dLV2ViVmlld0lPUy5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9pb3Mv V0tXZWJWaWV3SU9TLm1tCmluZGV4IDU5ZDQ0NjI2ZWE0NS4uNTMyOWQyNDhhMzBiIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvaW9zL1dLV2ViVmlld0lPUy5tbQorKysg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvaW9zL1dLV2ViVmlld0lPUy5tbQpAQCAtNDky LDcgKzQ5Miw3IEBAIHN0YXRpYyBXZWJDb3JlOjpDb2xvciBiYXNlU2Nyb2xsVmlld0JhY2tncm91 bmRDb2xvcihXS1dlYlZpZXcgKndlYlZpZXcpCiAgICAgaWYgKCF3ZWJWaWV3LT5fcGFnZSkKICAg ICAgICAgcmV0dXJuIHsgfTsKIAotICAgIHJldHVybiB3ZWJWaWV3LT5fcGFnZS0+cGFnZUV4dGVu ZGVkQmFja2dyb3VuZENvbG9yKCk7CisgICAgcmV0dXJuIHdlYlZpZXctPl9wYWdlLT5zY3JvbGxB cmVhQmFja2dyb3VuZENvbG9yKCk7CiB9CiAKIHN0YXRpYyBXZWJDb3JlOjpDb2xvciBzY3JvbGxW aWV3QmFja2dyb3VuZENvbG9yKFdLV2ViVmlldyAqd2ViVmlldykKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1ZpZXdTbmFwc2hvdFN0b3JlLmNwcCBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1ZpZXdTbmFwc2hvdFN0b3JlLmNwcAppbmRleCAyMzMxOTJhOGYxNDEuLjQ4ZDk0 NjMyNzU4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvVmlld1NuYXBzaG90 U3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1ZpZXdTbmFwc2hvdFN0b3Jl LmNwcApAQCAtOTUsNyArOTUsNyBAQCB2b2lkIFZpZXdTbmFwc2hvdFN0b3JlOjpyZWNvcmRTbmFw c2hvdChXZWJQYWdlUHJveHkmIHdlYlBhZ2VQcm94eSwgV2ViQmFja0ZvcndhcgogCiAgICAgc25h cHNob3QtPnNldFJlbmRlclRyZWVTaXplKHdlYlBhZ2VQcm94eS5yZW5kZXJUcmVlU2l6ZSgpKTsK ICAgICBzbmFwc2hvdC0+c2V0RGV2aWNlU2NhbGVGYWN0b3Iod2ViUGFnZVByb3h5LmRldmljZVNj YWxlRmFjdG9yKCkpOwotICAgIHNuYXBzaG90LT5zZXRCYWNrZ3JvdW5kQ29sb3Iod2ViUGFnZVBy b3h5LnBhZ2VFeHRlbmRlZEJhY2tncm91bmRDb2xvcigpKTsKKyAgICBzbmFwc2hvdC0+c2V0QmFj a2dyb3VuZENvbG9yKHdlYlBhZ2VQcm94eS5zY3JvbGxBcmVhQmFja2dyb3VuZENvbG9yKCkpOwog ICAgIHNuYXBzaG90LT5zZXRWaWV3U2Nyb2xsUG9zaXRpb24oV2ViQ29yZTo6cm91bmRlZEludFBv aW50KHdlYlBhZ2VQcm94eS52aWV3U2Nyb2xsUG9zaXRpb24oKSkpOwogCiAgICAgaXRlbS5zZXRT bmFwc2hvdChXVEZNb3ZlKHNuYXBzaG90KSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFn ZVByb3h5LmNwcAppbmRleCBmOTYzYzg2OWRhN2UuLmU4ZWU5MDNmNWU3NyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCkBAIC0xOTA2LDYgKzE5MDYsMTQgQEAgdm9p ZCBXZWJQYWdlUHJveHk6OnNldFVuZGVybGF5Q29sb3IoY29uc3QgQ29sb3ImIGNvbG9yKQogICAg ICAgICBzZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpTZXRVbmRlcmxheUNvbG9yKGNvbG9yKSk7CiB9 CiAKK0NvbG9yIFdlYlBhZ2VQcm94eTo6c2Nyb2xsQXJlYUJhY2tncm91bmRDb2xvcigpIGNvbnN0 Cit7CisgICAgaWYgKG1fcHJlZmVyZW5jZXMtPi51c2VUaGVtZUNvbG9yRm9yU2Nyb2xsQXJlYUJh Y2tncm91bmRDb2xvcigpKQorICAgICAgICByZXR1cm4gbV90aGVtZUNvbG9yOworCisgICAgcmV0 dXJuIG1fcGFnZUV4dGVuZGVkQmFja2dyb3VuZENvbG9yOworfQorCiB2b2lkIFdlYlBhZ2VQcm94 eTo6dmlld1dpbGxTdGFydExpdmVSZXNpemUoKQogewogICAgIGlmICghaGFzUnVubmluZ1Byb2Nl c3MoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5o IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKaW5kZXggMjkyNDA2Yzli ZjZjLi5lMmQ4ZGIyM2ZmMjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dl YlBhZ2VQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5o CkBAIC02MzcsNiArNjM3LDggQEAgcHVibGljOgogICAgIC8vIHRoZSBtZXNzYWdlIGVudGlyZWx5 LgogICAgIFdlYkNvcmU6OkNvbG9yIHBhZ2VFeHRlbmRlZEJhY2tncm91bmRDb2xvcigpIGNvbnN0 IHsgcmV0dXJuIG1fcGFnZUV4dGVuZGVkQmFja2dyb3VuZENvbG9yOyB9CiAKKyAgICBXZWJDb3Jl OjpDb2xvciBzY3JvbGxBcmVhQmFja2dyb3VuZENvbG9yKCkgY29uc3Q7CisKICAgICB2b2lkIHZp ZXdXaWxsU3RhcnRMaXZlUmVzaXplKCk7CiAgICAgdm9pZCB2aWV3V2lsbEVuZExpdmVSZXNpemUo KTsKIAo= 420751 2021-02-17 16:11:17 -0800 2021-02-17 16:12:30 -0800 Patch 222078.diff text/plain 9025 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nIGIvU291cmNlL1dURi9DaGFuZ2VMb2cK aW5kZXggM2M4NWZkODc5ZjlhLi5lMjg1M2FhZDBkNTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYv Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIw MjEtMDItMTcgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIEV4 cGVyaW1lbnQgd2l0aCB1c2luZyB0aGUgdGhlbWUtY29sb3IgYXMgdGhlIHNjcm9sbCBhcmVhIGJh Y2tncm91bmQgaWYgcHJvdmlkZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIyMjA3OAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzQxNTg4MTg+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgVGltIEhvcnRvbi4KKworICAgICAgICAqIFNjcmlwdHMvUHJl ZmVyZW5jZXMvV2ViUHJlZmVyZW5jZXNJbnRlcm5hbC55YW1sOgorCiAyMDIxLTAyLTE3ICBEZWFu IEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KIAogICAgICAgICBVc2UgZWxlbWVudCBmdWxsc2Ny ZWVuIGZvciB2aWRlbyBvbiBzb21lIGNvbmZpZ3VyYXRpb25zCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V1RGL1NjcmlwdHMvUHJlZmVyZW5jZXMvV2ViUHJlZmVyZW5jZXNJbnRlcm5hbC55YW1sIGIvU291 cmNlL1dURi9TY3JpcHRzL1ByZWZlcmVuY2VzL1dlYlByZWZlcmVuY2VzSW50ZXJuYWwueWFtbApp bmRleCA4Yzg3MzRiZDAzMjMuLmQwMTdkODkwMDM4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dURi9T Y3JpcHRzL1ByZWZlcmVuY2VzL1dlYlByZWZlcmVuY2VzSW50ZXJuYWwueWFtbAorKysgYi9Tb3Vy Y2UvV1RGL1NjcmlwdHMvUHJlZmVyZW5jZXMvV2ViUHJlZmVyZW5jZXNJbnRlcm5hbC55YW1sCkBA IC03NzUsNiArNzc1LDE3IEBAIFVzZUdQVVByb2Nlc3NGb3JXZWJHTEVuYWJsZWQ6CiAgICAgV2Vi S2l0OgogICAgICAgZGVmYXVsdDogZGVmYXVsdFVzZUdQVVByb2Nlc3NGb3JXZWJHTEVuYWJsZWQo KQogCitVc2VUaGVtZUNvbG9yRm9yU2Nyb2xsQXJlYUJhY2tncm91bmRDb2xvcjoKKyAgdHlwZTog Ym9vbAorICBodW1hblJlYWRhYmxlTmFtZTogIlVzZSB0aGVtZS1jb2xvciBmb3Igc2Nyb2xsIGFy ZWEgYmFja2dyb3VuZCBjb2xvciIKKyAgaHVtYW5SZWFkYWJsZURlc2NyaXB0aW9uOiAiVXNlIHRo ZW1lLWNvbG9yIGZvciBzY3JvbGwgYXJlYSBiYWNrZ3JvdW5kIGNvbG9yIgorICB3ZWJjb3JlQmlu ZGluZzogbm9uZQorICBkZWZhdWx0VmFsdWU6CisgICAgV2ViS2l0OgorICAgICAgZGVmYXVsdDog ZmFsc2UKKyAgICBXZWJDb3JlOgorICAgICAgZGVmYXVsdDogZmFsc2UKKwogIyBGSVhNRTogUmVt b3ZlIG9uY2UgPHJkYXI6Ly83MzgzMDk2MT4gaGFzIGJlZW4gZml4ZWQKIFVzZWlUdW5lc0FWT3V0 cHV0Q29udGV4dDoKICAgdHlwZTogYm9vbApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDFhZjE0NzIwMGYwMC4uMWRl YmU3ZTUwOTZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMjEtMDItMTcgIERldmlu IFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIEV4cGVyaW1lbnQgd2l0aCB1 c2luZyB0aGUgdGhlbWUtY29sb3IgYXMgdGhlIHNjcm9sbCBhcmVhIGJhY2tncm91bmQgaWYgcHJv dmlkZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIy MjA3OAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzQxNTg4MTg+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgVGltIEhvcnRvbi4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllckNvbXBv c2l0b3IuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlTGF5ZXJGb3JP dmVyaGFuZ0FyZWFzQmFja2dyb3VuZENvbG9yKTogQWRkZWQuCisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJMYXllckNvbXBvc2l0b3I6OnJvb3RCYWNrZ3JvdW5kQ29sb3JPclRyYW5zcGFyZW5jeUNo YW5nZWQpOgorCisgICAgICAgICogZG9tL0RvY3VtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkRvY3VtZW50Ojpwcm9jZXNzVGhlbWVDb2xvcik6CisgICAgICAgIE5vdGlmeSB0aGUgYFJlbmRl ckxheWVyQ29tcG9zaXRvcmAgd2hlbiBgPG1ldGEgbmFtZT0idGhlbWUtY29sb3IiIGNvbnRlbnQ9 Ii4uLiI+YCBjaGFuZ2VzLgorCiAyMDIxLTAyLTE3IERldmluIFJvdXNzbyA8ZHJvdXNzb0BhcHBs ZS5jb20+CiAKICAgICAgICAgW2lPU10gdXBkYXRlIG1lZGlhIGNvbnRyb2xzIHRvIHVzZSBuZXcg U0YgU3ltYm9scwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcCBi L1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKaW5kZXggMWI5ZjcyNjYzOTIxLi5hZjkw ZWU2YWE5MjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcApAQCAtMzgzMiw2ICszODMyLDEzIEBA IHZvaWQgRG9jdW1lbnQ6OnByb2Nlc3NUaGVtZUNvbG9yKGNvbnN0IFN0cmluZyYgdGhlbWVDb2xv clN0cmluZykKIAogICAgIGlmIChhdXRvKiBwYWdlID0gdGhpcy0+cGFnZSgpKQogICAgICAgICBw YWdlLT5jaHJvbWUoKS5jbGllbnQoKS50aGVtZUNvbG9yQ2hhbmdlZChtX3RoZW1lQ29sb3IpOwor CisjaWYgRU5BQkxFKFJVQkJFUl9CQU5ESU5HKQorICAgIGlmIChhdXRvKiB2aWV3ID0gcmVuZGVy VmlldygpKSB7CisgICAgICAgIGlmICh2aWV3LT51c2VzQ29tcG9zaXRpbmcoKSkKKyAgICAgICAg ICAgIHZpZXctPmNvbXBvc2l0b3IoKS51cGRhdGVMYXllckZvck92ZXJoYW5nQXJlYXNCYWNrZ3Jv dW5kQ29sb3IoKTsKKyAgICB9CisjZW5kaWYgLy8gRU5BQkxFKFJVQkJFUl9CQU5ESU5HKQogfQog CiAjaWYgRU5BQkxFKERBUktfTU9ERV9DU1MpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCmluZGV4IDljODA5NDc4ODQ4Yy4uZTAzMDU1 NDY1NjhhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJD b21wb3NpdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJD b21wb3NpdG9yLmNwcApAQCAtMzg1Nyw3ICszODU3LDI0IEBAIEdyYXBoaWNzTGF5ZXIqIFJlbmRl ckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlTGF5ZXJGb3JGb290ZXIoYm9vbCB3YW50c0xheWVyKQog ICAgIHJldHVybiBtX2xheWVyRm9yRm9vdGVyLmdldCgpOwogfQogCi0jZW5kaWYKK3ZvaWQgUmVu ZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRhdGVMYXllckZvck92ZXJoYW5nQXJlYXNCYWNrZ3JvdW5k Q29sb3IoKQoreworICAgIGlmICghbV9sYXllckZvck92ZXJoYW5nQXJlYXMpCisgICAgICAgIHJl dHVybjsKKworICAgIENvbG9yIGJhY2tncm91bmRDb2xvcjsKKyAgICBpZiAocGFnZSgpLnNldHRp bmdzKCkudXNlVGhlbWVDb2xvckZvclNjcm9sbEFyZWFCYWNrZ3JvdW5kQ29sb3IoKSkKKyAgICAg ICAgYmFja2dyb3VuZENvbG9yID0gcGFnZSgpLnRoZW1lQ29sb3IoKTsKKyAgICBpZiAoIWJhY2tn cm91bmRDb2xvci5pc1ZhbGlkKCkpCisgICAgICAgIGJhY2tncm91bmRDb2xvciA9IG1fcm9vdEV4 dGVuZGVkQmFja2dyb3VuZENvbG9yOworCisgICAgbV9sYXllckZvck92ZXJoYW5nQXJlYXMtPnNl dEJhY2tncm91bmRDb2xvcihiYWNrZ3JvdW5kQ29sb3IpOworCisgICAgaWYgKCFiYWNrZ3JvdW5k Q29sb3IuaXNWYWxpZCgpKQorICAgICAgICBtX2xheWVyRm9yT3ZlcmhhbmdBcmVhcy0+c2V0Q3Vz dG9tQXBwZWFyYW5jZShHcmFwaGljc0xheWVyOjpDdXN0b21BcHBlYXJhbmNlOjpTY3JvbGxpbmdP dmVyaGFuZyk7Cit9CisKKyNlbmRpZiAvLyBFTkFCTEUoUlVCQkVSX0JBTkRJTkcpCiAKIGJvb2wg UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp2aWV3TmVlZHNUb0ludmFsaWRhdGVFdmVudFJlZ2lvbk9m RW5jbG9zaW5nQ29tcG9zaXRpbmdMYXllckZvclJlcGFpbnQoKSBjb25zdAogewpAQCAtMzkzMywx MiArMzk1MCw3IEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpyb290QmFja2dyb3VuZENv bG9yT3JUcmFuc3BhcmVuY3lDaGFuZ2VkKCkKICAgICAgICAgcGFnZSgpLmNocm9tZSgpLmNsaWVu dCgpLnBhZ2VFeHRlbmRlZEJhY2tncm91bmRDb2xvckRpZENoYW5nZShtX3Jvb3RFeHRlbmRlZEJh Y2tncm91bmRDb2xvcik7CiAgICAgICAgIAogI2lmIEVOQUJMRShSVUJCRVJfQkFORElORykKLSAg ICAgICAgaWYgKG1fbGF5ZXJGb3JPdmVyaGFuZ0FyZWFzKSB7Ci0gICAgICAgICAgICBtX2xheWVy Rm9yT3ZlcmhhbmdBcmVhcy0+c2V0QmFja2dyb3VuZENvbG9yKG1fcm9vdEV4dGVuZGVkQmFja2dy b3VuZENvbG9yKTsKLQotICAgICAgICAgICAgaWYgKCFtX3Jvb3RFeHRlbmRlZEJhY2tncm91bmRD b2xvci5pc1ZhbGlkKCkpCi0gICAgICAgICAgICAgICAgbV9sYXllckZvck92ZXJoYW5nQXJlYXMt PnNldEN1c3RvbUFwcGVhcmFuY2UoR3JhcGhpY3NMYXllcjo6Q3VzdG9tQXBwZWFyYW5jZTo6U2Ny b2xsaW5nT3ZlcmhhbmcpOwotICAgICAgICB9CisgICAgICAgIHVwZGF0ZUxheWVyRm9yT3Zlcmhh bmdBcmVhc0JhY2tncm91bmRDb2xvcigpOwogI2VuZGlmCiAgICAgfQogICAgIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5oIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5oCmluZGV4IGMxNTFl MjNkMGVmNi4uNDEwMzViOTIyYzU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxheWVyQ29tcG9zaXRvci5oCkBAIC0zNDMsNyArMzQzLDkgQEAgcHVibGljOgogICAg IEdyYXBoaWNzTGF5ZXIqIHVwZGF0ZUxheWVyRm9yQm90dG9tT3ZlcmhhbmdBcmVhKGJvb2wgd2Fu dHNMYXllcik7CiAgICAgR3JhcGhpY3NMYXllciogdXBkYXRlTGF5ZXJGb3JIZWFkZXIoYm9vbCB3 YW50c0xheWVyKTsKICAgICBHcmFwaGljc0xheWVyKiB1cGRhdGVMYXllckZvckZvb3Rlcihib29s IHdhbnRzTGF5ZXIpOwotI2VuZGlmCisKKyAgICB2b2lkIHVwZGF0ZUxheWVyRm9yT3ZlcmhhbmdB cmVhc0JhY2tncm91bmRDb2xvcigpOworI2VuZGlmIC8vIEVOQUJMRShSVUJCRVJfQkFORElORykK IAogICAgIC8vIEZJWE1FOiBtYWtlIHRoZSBjb29yZGluYXRlZC9hc3luYyB0ZXJtaW5vbG9neSBj b25zaXN0ZW50LgogICAgIGJvb2wgaXNWaWV3cG9ydENvbnN0cmFpbmVkRml4ZWRPclN0aWNreUxh eWVyKGNvbnN0IFJlbmRlckxheWVyJikgY29uc3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGVjN2E3MGQxY2Y1Ni4u YTE5OTAwZGU2MDljIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9T b3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTAyLTE3ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBFeHBlcmltZW50IHdpdGgg dXNpbmcgdGhlIHRoZW1lLWNvbG9yIGFzIHRoZSBzY3JvbGwgYXJlYSBiYWNrZ3JvdW5kIGlmIHBy b3ZpZGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MjIwNzgKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzc0MTU4ODE4PgorCisgICAgICAgIFJldmll d2VkIGJ5IFRpbSBIb3J0b24uCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2lvcy9XS1dlYlZp ZXdJT1MubW06CisgICAgICAgIChiYXNlU2Nyb2xsVmlld0JhY2tncm91bmRDb2xvcik6CisgICAg ICAgICogVUlQcm9jZXNzL1ZpZXdTbmFwc2hvdFN0b3JlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 Vmlld1NuYXBzaG90U3RvcmU6OnJlY29yZFNuYXBzaG90KToKKyAgICAgICAgKiBVSVByb2Nlc3Mv V2ViUGFnZVByb3h5Lmg6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6Cisg ICAgICAgIChXZWJQYWdlUHJveHk6OnNjcm9sbEFyZWFCYWNrZ3JvdW5kQ29sb3IpOiBBZGRlZC4K KwogMjAyMS0wMi0xNyBUcnVpdHQgU2F2ZWxsIDx0c2F2ZWxsQGFwcGxlLmNvbT4KIAogICAgICAg ICBVbnJldmlld2VkLCByZXZlcnRpbmcgcjI3MjkwNS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL0FQSS9pb3MvV0tXZWJWaWV3SU9TLm1tIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQVBJL2lvcy9XS1dlYlZpZXdJT1MubW0KaW5kZXggNTlkNDQ2MjZlYTQ1Li41MzI5ZDI0 OGEzMGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9pb3MvV0tXZWJW aWV3SU9TLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9pb3MvV0tXZWJWaWV3 SU9TLm1tCkBAIC00OTIsNyArNDkyLDcgQEAgc3RhdGljIFdlYkNvcmU6OkNvbG9yIGJhc2VTY3Jv bGxWaWV3QmFja2dyb3VuZENvbG9yKFdLV2ViVmlldyAqd2ViVmlldykKICAgICBpZiAoIXdlYlZp ZXctPl9wYWdlKQogICAgICAgICByZXR1cm4geyB9OwogCi0gICAgcmV0dXJuIHdlYlZpZXctPl9w YWdlLT5wYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3IoKTsKKyAgICByZXR1cm4gd2ViVmlldy0+ X3BhZ2UtPnNjcm9sbEFyZWFCYWNrZ3JvdW5kQ29sb3IoKTsKIH0KIAogc3RhdGljIFdlYkNvcmU6 OkNvbG9yIHNjcm9sbFZpZXdCYWNrZ3JvdW5kQ29sb3IoV0tXZWJWaWV3ICp3ZWJWaWV3KQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvVmlld1NuYXBzaG90U3RvcmUuY3BwIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvVmlld1NuYXBzaG90U3RvcmUuY3BwCmluZGV4IDIzMzE5 MmE4ZjE0MS4uNDhkOTQ2MzI3NTg0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9WaWV3U25hcHNob3RTdG9yZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvVmll d1NuYXBzaG90U3RvcmUuY3BwCkBAIC05NSw3ICs5NSw3IEBAIHZvaWQgVmlld1NuYXBzaG90U3Rv cmU6OnJlY29yZFNuYXBzaG90KFdlYlBhZ2VQcm94eSYgd2ViUGFnZVByb3h5LCBXZWJCYWNrRm9y d2FyCiAKICAgICBzbmFwc2hvdC0+c2V0UmVuZGVyVHJlZVNpemUod2ViUGFnZVByb3h5LnJlbmRl clRyZWVTaXplKCkpOwogICAgIHNuYXBzaG90LT5zZXREZXZpY2VTY2FsZUZhY3Rvcih3ZWJQYWdl UHJveHkuZGV2aWNlU2NhbGVGYWN0b3IoKSk7Ci0gICAgc25hcHNob3QtPnNldEJhY2tncm91bmRD b2xvcih3ZWJQYWdlUHJveHkucGFnZUV4dGVuZGVkQmFja2dyb3VuZENvbG9yKCkpOworICAgIHNu YXBzaG90LT5zZXRCYWNrZ3JvdW5kQ29sb3Iod2ViUGFnZVByb3h5LnNjcm9sbEFyZWFCYWNrZ3Jv dW5kQ29sb3IoKSk7CiAgICAgc25hcHNob3QtPnNldFZpZXdTY3JvbGxQb3NpdGlvbihXZWJDb3Jl Ojpyb3VuZGVkSW50UG9pbnQod2ViUGFnZVByb3h5LnZpZXdTY3JvbGxQb3NpdGlvbigpKSk7CiAK ICAgICBpdGVtLnNldFNuYXBzaG90KFdURk1vdmUoc25hcHNob3QpKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCmluZGV4IGY5NjNjODY5ZGE3ZS4uZThlZTkwM2Y1ZTc3 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKQEAgLTE5MDYsNiAr MTkwNiwxNCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6c2V0VW5kZXJsYXlDb2xvcihjb25zdCBDb2xv ciYgY29sb3IpCiAgICAgICAgIHNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlNldFVuZGVybGF5Q29s b3IoY29sb3IpKTsKIH0KIAorQ29sb3IgV2ViUGFnZVByb3h5OjpzY3JvbGxBcmVhQmFja2dyb3Vu ZENvbG9yKCkgY29uc3QKK3sKKyAgICBpZiAobV9wcmVmZXJlbmNlcy0+LnVzZVRoZW1lQ29sb3JG b3JTY3JvbGxBcmVhQmFja2dyb3VuZENvbG9yKCkpCisgICAgICAgIHJldHVybiBtX3RoZW1lQ29s b3I7CisKKyAgICByZXR1cm4gbV9wYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3I7Cit9CisKIHZv aWQgV2ViUGFnZVByb3h5Ojp2aWV3V2lsbFN0YXJ0TGl2ZVJlc2l6ZSgpCiB7CiAgICAgaWYgKCFo YXNSdW5uaW5nUHJvY2VzcygpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaApp bmRleCAyOTI0MDZjOWJmNmMuLmUyZDhkYjIzZmYyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmgKQEAgLTYzNyw2ICs2MzcsOCBAQCBwdWJsaWM6CiAgICAgLy8gdGhlIG1l c3NhZ2UgZW50aXJlbHkuCiAgICAgV2ViQ29yZTo6Q29sb3IgcGFnZUV4dGVuZGVkQmFja2dyb3Vu ZENvbG9yKCkgY29uc3QgeyByZXR1cm4gbV9wYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3I7IH0K IAorICAgIFdlYkNvcmU6OkNvbG9yIHNjcm9sbEFyZWFCYWNrZ3JvdW5kQ29sb3IoKSBjb25zdDsK KwogICAgIHZvaWQgdmlld1dpbGxTdGFydExpdmVSZXNpemUoKTsKICAgICB2b2lkIHZpZXdXaWxs RW5kTGl2ZVJlc2l6ZSgpOwogCg== 420752 2021-02-17 16:12:30 -0800 2021-02-17 16:13:11 -0800 Patch 222078.diff text/plain 9027 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nIGIvU291cmNlL1dURi9DaGFuZ2VMb2cK aW5kZXggM2M4NWZkODc5ZjlhLi5lMjg1M2FhZDBkNTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYv Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIw MjEtMDItMTcgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIEV4 cGVyaW1lbnQgd2l0aCB1c2luZyB0aGUgdGhlbWUtY29sb3IgYXMgdGhlIHNjcm9sbCBhcmVhIGJh Y2tncm91bmQgaWYgcHJvdmlkZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIyMjA3OAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzQxNTg4MTg+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgVGltIEhvcnRvbi4KKworICAgICAgICAqIFNjcmlwdHMvUHJl ZmVyZW5jZXMvV2ViUHJlZmVyZW5jZXNJbnRlcm5hbC55YW1sOgorCiAyMDIxLTAyLTE3ICBEZWFu IEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KIAogICAgICAgICBVc2UgZWxlbWVudCBmdWxsc2Ny ZWVuIGZvciB2aWRlbyBvbiBzb21lIGNvbmZpZ3VyYXRpb25zCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V1RGL1NjcmlwdHMvUHJlZmVyZW5jZXMvV2ViUHJlZmVyZW5jZXNJbnRlcm5hbC55YW1sIGIvU291 cmNlL1dURi9TY3JpcHRzL1ByZWZlcmVuY2VzL1dlYlByZWZlcmVuY2VzSW50ZXJuYWwueWFtbApp bmRleCA4Yzg3MzRiZDAzMjMuLmQwMTdkODkwMDM4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dURi9T Y3JpcHRzL1ByZWZlcmVuY2VzL1dlYlByZWZlcmVuY2VzSW50ZXJuYWwueWFtbAorKysgYi9Tb3Vy Y2UvV1RGL1NjcmlwdHMvUHJlZmVyZW5jZXMvV2ViUHJlZmVyZW5jZXNJbnRlcm5hbC55YW1sCkBA IC03NzUsNiArNzc1LDE3IEBAIFVzZUdQVVByb2Nlc3NGb3JXZWJHTEVuYWJsZWQ6CiAgICAgV2Vi S2l0OgogICAgICAgZGVmYXVsdDogZGVmYXVsdFVzZUdQVVByb2Nlc3NGb3JXZWJHTEVuYWJsZWQo KQogCitVc2VUaGVtZUNvbG9yRm9yU2Nyb2xsQXJlYUJhY2tncm91bmRDb2xvcjoKKyAgdHlwZTog Ym9vbAorICBodW1hblJlYWRhYmxlTmFtZTogIlVzZSB0aGVtZS1jb2xvciBmb3Igc2Nyb2xsIGFy ZWEgYmFja2dyb3VuZCBjb2xvciIKKyAgaHVtYW5SZWFkYWJsZURlc2NyaXB0aW9uOiAiVXNlIHRo ZW1lLWNvbG9yIGZvciBzY3JvbGwgYXJlYSBiYWNrZ3JvdW5kIGNvbG9yIgorICB3ZWJjb3JlQmlu ZGluZzogbm9uZQorICBkZWZhdWx0VmFsdWU6CisgICAgV2ViS2l0OgorICAgICAgZGVmYXVsdDog ZmFsc2UKKyAgICBXZWJDb3JlOgorICAgICAgZGVmYXVsdDogZmFsc2UKKwogIyBGSVhNRTogUmVt b3ZlIG9uY2UgPHJkYXI6Ly83MzgzMDk2MT4gaGFzIGJlZW4gZml4ZWQKIFVzZWlUdW5lc0FWT3V0 cHV0Q29udGV4dDoKICAgdHlwZTogYm9vbApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDFhZjE0NzIwMGYwMC4uMWRl YmU3ZTUwOTZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMjEtMDItMTcgIERldmlu IFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIEV4cGVyaW1lbnQgd2l0aCB1 c2luZyB0aGUgdGhlbWUtY29sb3IgYXMgdGhlIHNjcm9sbCBhcmVhIGJhY2tncm91bmQgaWYgcHJv dmlkZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIy MjA3OAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzQxNTg4MTg+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgVGltIEhvcnRvbi4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllckNvbXBv c2l0b3IuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlTGF5ZXJGb3JP dmVyaGFuZ0FyZWFzQmFja2dyb3VuZENvbG9yKTogQWRkZWQuCisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJMYXllckNvbXBvc2l0b3I6OnJvb3RCYWNrZ3JvdW5kQ29sb3JPclRyYW5zcGFyZW5jeUNo YW5nZWQpOgorCisgICAgICAgICogZG9tL0RvY3VtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkRvY3VtZW50Ojpwcm9jZXNzVGhlbWVDb2xvcik6CisgICAgICAgIE5vdGlmeSB0aGUgYFJlbmRl ckxheWVyQ29tcG9zaXRvcmAgd2hlbiBgPG1ldGEgbmFtZT0idGhlbWUtY29sb3IiIGNvbnRlbnQ9 Ii4uLiI+YCBjaGFuZ2VzLgorCiAyMDIxLTAyLTE3ICBEZXZpbiBSb3Vzc28gPGRyb3Vzc29AYXBw bGUuY29tPgogCiAgICAgICAgIFtpT1NdIHVwZGF0ZSBtZWRpYSBjb250cm9scyB0byB1c2UgbmV3 IFNGIFN5bWJvbHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCmluZGV4IDFiOWY3MjY2MzkyMS4uYWY5 MGVlNmFhOTI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKQEAgLTM4MzIsNiArMzgzMiwxMyBA QCB2b2lkIERvY3VtZW50Ojpwcm9jZXNzVGhlbWVDb2xvcihjb25zdCBTdHJpbmcmIHRoZW1lQ29s b3JTdHJpbmcpCiAKICAgICBpZiAoYXV0byogcGFnZSA9IHRoaXMtPnBhZ2UoKSkKICAgICAgICAg cGFnZS0+Y2hyb21lKCkuY2xpZW50KCkudGhlbWVDb2xvckNoYW5nZWQobV90aGVtZUNvbG9yKTsK KworI2lmIEVOQUJMRShSVUJCRVJfQkFORElORykKKyAgICBpZiAoYXV0byogdmlldyA9IHJlbmRl clZpZXcoKSkgeworICAgICAgICBpZiAodmlldy0+dXNlc0NvbXBvc2l0aW5nKCkpCisgICAgICAg ICAgICB2aWV3LT5jb21wb3NpdG9yKCkudXBkYXRlTGF5ZXJGb3JPdmVyaGFuZ0FyZWFzQmFja2dy b3VuZENvbG9yKCk7CisgICAgfQorI2VuZGlmIC8vIEVOQUJMRShSVUJCRVJfQkFORElORykKIH0K IAogI2lmIEVOQUJMRShEQVJLX01PREVfQ1NTKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAppbmRleCA5YzgwOTQ3ODg0OGMuLmUwMzA1 NTQ2NTY4YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVy Q29tcG9zaXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVy Q29tcG9zaXRvci5jcHAKQEAgLTM4NTcsNyArMzg1NywyNCBAQCBHcmFwaGljc0xheWVyKiBSZW5k ZXJMYXllckNvbXBvc2l0b3I6OnVwZGF0ZUxheWVyRm9yRm9vdGVyKGJvb2wgd2FudHNMYXllcikK ICAgICByZXR1cm4gbV9sYXllckZvckZvb3Rlci5nZXQoKTsKIH0KIAotI2VuZGlmCit2b2lkIFJl bmRlckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlTGF5ZXJGb3JPdmVyaGFuZ0FyZWFzQmFja2dyb3Vu ZENvbG9yKCkKK3sKKyAgICBpZiAoIW1fbGF5ZXJGb3JPdmVyaGFuZ0FyZWFzKQorICAgICAgICBy ZXR1cm47CisKKyAgICBDb2xvciBiYWNrZ3JvdW5kQ29sb3I7CisgICAgaWYgKHBhZ2UoKS5zZXR0 aW5ncygpLnVzZVRoZW1lQ29sb3JGb3JTY3JvbGxBcmVhQmFja2dyb3VuZENvbG9yKCkpCisgICAg ICAgIGJhY2tncm91bmRDb2xvciA9IHBhZ2UoKS50aGVtZUNvbG9yKCk7CisgICAgaWYgKCFiYWNr Z3JvdW5kQ29sb3IuaXNWYWxpZCgpKQorICAgICAgICBiYWNrZ3JvdW5kQ29sb3IgPSBtX3Jvb3RF eHRlbmRlZEJhY2tncm91bmRDb2xvcjsKKworICAgIG1fbGF5ZXJGb3JPdmVyaGFuZ0FyZWFzLT5z ZXRCYWNrZ3JvdW5kQ29sb3IoYmFja2dyb3VuZENvbG9yKTsKKworICAgIGlmICghYmFja2dyb3Vu ZENvbG9yLmlzVmFsaWQoKSkKKyAgICAgICAgbV9sYXllckZvck92ZXJoYW5nQXJlYXMtPnNldEN1 c3RvbUFwcGVhcmFuY2UoR3JhcGhpY3NMYXllcjo6Q3VzdG9tQXBwZWFyYW5jZTo6U2Nyb2xsaW5n T3ZlcmhhbmcpOworfQorCisjZW5kaWYgLy8gRU5BQkxFKFJVQkJFUl9CQU5ESU5HKQogCiBib29s IFJlbmRlckxheWVyQ29tcG9zaXRvcjo6dmlld05lZWRzVG9JbnZhbGlkYXRlRXZlbnRSZWdpb25P ZkVuY2xvc2luZ0NvbXBvc2l0aW5nTGF5ZXJGb3JSZXBhaW50KCkgY29uc3QKIHsKQEAgLTM5MzMs MTIgKzM5NTAsNyBAQCB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6cm9vdEJhY2tncm91bmRD b2xvck9yVHJhbnNwYXJlbmN5Q2hhbmdlZCgpCiAgICAgICAgIHBhZ2UoKS5jaHJvbWUoKS5jbGll bnQoKS5wYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3JEaWRDaGFuZ2UobV9yb290RXh0ZW5kZWRC YWNrZ3JvdW5kQ29sb3IpOwogICAgICAgICAKICNpZiBFTkFCTEUoUlVCQkVSX0JBTkRJTkcpCi0g ICAgICAgIGlmIChtX2xheWVyRm9yT3ZlcmhhbmdBcmVhcykgewotICAgICAgICAgICAgbV9sYXll ckZvck92ZXJoYW5nQXJlYXMtPnNldEJhY2tncm91bmRDb2xvcihtX3Jvb3RFeHRlbmRlZEJhY2tn cm91bmRDb2xvcik7Ci0KLSAgICAgICAgICAgIGlmICghbV9yb290RXh0ZW5kZWRCYWNrZ3JvdW5k Q29sb3IuaXNWYWxpZCgpKQotICAgICAgICAgICAgICAgIG1fbGF5ZXJGb3JPdmVyaGFuZ0FyZWFz LT5zZXRDdXN0b21BcHBlYXJhbmNlKEdyYXBoaWNzTGF5ZXI6OkN1c3RvbUFwcGVhcmFuY2U6OlNj cm9sbGluZ092ZXJoYW5nKTsKLSAgICAgICAgfQorICAgICAgICB1cGRhdGVMYXllckZvck92ZXJo YW5nQXJlYXNCYWNrZ3JvdW5kQ29sb3IoKTsKICNlbmRpZgogICAgIH0KICAgICAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuaCBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuaAppbmRleCBjMTUx ZTIzZDBlZjYuLjQxMDM1YjkyMmM1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJMYXllckNvbXBvc2l0b3IuaApAQCAtMzQzLDcgKzM0Myw5IEBAIHB1YmxpYzoKICAg ICBHcmFwaGljc0xheWVyKiB1cGRhdGVMYXllckZvckJvdHRvbU92ZXJoYW5nQXJlYShib29sIHdh bnRzTGF5ZXIpOwogICAgIEdyYXBoaWNzTGF5ZXIqIHVwZGF0ZUxheWVyRm9ySGVhZGVyKGJvb2wg d2FudHNMYXllcik7CiAgICAgR3JhcGhpY3NMYXllciogdXBkYXRlTGF5ZXJGb3JGb290ZXIoYm9v bCB3YW50c0xheWVyKTsKLSNlbmRpZgorCisgICAgdm9pZCB1cGRhdGVMYXllckZvck92ZXJoYW5n QXJlYXNCYWNrZ3JvdW5kQ29sb3IoKTsKKyNlbmRpZiAvLyBFTkFCTEUoUlVCQkVSX0JBTkRJTkcp CiAKICAgICAvLyBGSVhNRTogbWFrZSB0aGUgY29vcmRpbmF0ZWQvYXN5bmMgdGVybWlub2xvZ3kg Y29uc2lzdGVudC4KICAgICBib29sIGlzVmlld3BvcnRDb25zdHJhaW5lZEZpeGVkT3JTdGlja3lM YXllcihjb25zdCBSZW5kZXJMYXllciYpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCBlYzdhNzBkMWNmNTYu LmExOTkwMGRlNjA5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIv U291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAyMS0wMi0xNyAgRGV2 aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CisKKyAgICAgICAgRXhwZXJpbWVudCB3aXRo IHVzaW5nIHRoZSB0aGVtZS1jb2xvciBhcyB0aGUgc2Nyb2xsIGFyZWEgYmFja2dyb3VuZCBpZiBw cm92aWRlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjIyMDc4CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS83NDE1ODgxOD4KKworICAgICAgICBSZXZp ZXdlZCBieSBUaW0gSG9ydG9uLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9pb3MvV0tXZWJW aWV3SU9TLm1tOgorICAgICAgICAoYmFzZVNjcm9sbFZpZXdCYWNrZ3JvdW5kQ29sb3IpOgorICAg ICAgICAqIFVJUHJvY2Vzcy9WaWV3U25hcHNob3RTdG9yZS5jcHA6CisgICAgICAgIChXZWJLaXQ6 OlZpZXdTbmFwc2hvdFN0b3JlOjpyZWNvcmRTbmFwc2hvdCk6CisgICAgICAgICogVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgor ICAgICAgICAoV2ViUGFnZVByb3h5OjpzY3JvbGxBcmVhQmFja2dyb3VuZENvbG9yKTogQWRkZWQu CisKIDIwMjEtMDItMTcgIFRydWl0dCBTYXZlbGwgPHRzYXZlbGxAYXBwbGUuY29tPgogCiAgICAg ICAgIFVucmV2aWV3ZWQsIHJldmVydGluZyByMjcyOTA1LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQVBJL2lvcy9XS1dlYlZpZXdJT1MubW0gYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvaW9zL1dLV2ViVmlld0lPUy5tbQppbmRleCA1OWQ0NDYyNmVhNDUuLjUzMjlk MjQ4YTMwYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2lvcy9XS1dl YlZpZXdJT1MubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2lvcy9XS1dlYlZp ZXdJT1MubW0KQEAgLTQ5Miw3ICs0OTIsNyBAQCBzdGF0aWMgV2ViQ29yZTo6Q29sb3IgYmFzZVNj cm9sbFZpZXdCYWNrZ3JvdW5kQ29sb3IoV0tXZWJWaWV3ICp3ZWJWaWV3KQogICAgIGlmICghd2Vi Vmlldy0+X3BhZ2UpCiAgICAgICAgIHJldHVybiB7IH07CiAKLSAgICByZXR1cm4gd2ViVmlldy0+ X3BhZ2UtPnBhZ2VFeHRlbmRlZEJhY2tncm91bmRDb2xvcigpOworICAgIHJldHVybiB3ZWJWaWV3 LT5fcGFnZS0+c2Nyb2xsQXJlYUJhY2tncm91bmRDb2xvcigpOwogfQogCiBzdGF0aWMgV2ViQ29y ZTo6Q29sb3Igc2Nyb2xsVmlld0JhY2tncm91bmRDb2xvcihXS1dlYlZpZXcgKndlYlZpZXcpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9WaWV3U25hcHNob3RTdG9yZS5jcHAg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9WaWV3U25hcHNob3RTdG9yZS5jcHAKaW5kZXggMjMz MTkyYThmMTQxLi40OGQ5NDYzMjc1ODQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1ZpZXdTbmFwc2hvdFN0b3JlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9W aWV3U25hcHNob3RTdG9yZS5jcHAKQEAgLTk1LDcgKzk1LDcgQEAgdm9pZCBWaWV3U25hcHNob3RT dG9yZTo6cmVjb3JkU25hcHNob3QoV2ViUGFnZVByb3h5JiB3ZWJQYWdlUHJveHksIFdlYkJhY2tG b3J3YXIKIAogICAgIHNuYXBzaG90LT5zZXRSZW5kZXJUcmVlU2l6ZSh3ZWJQYWdlUHJveHkucmVu ZGVyVHJlZVNpemUoKSk7CiAgICAgc25hcHNob3QtPnNldERldmljZVNjYWxlRmFjdG9yKHdlYlBh Z2VQcm94eS5kZXZpY2VTY2FsZUZhY3RvcigpKTsKLSAgICBzbmFwc2hvdC0+c2V0QmFja2dyb3Vu ZENvbG9yKHdlYlBhZ2VQcm94eS5wYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3IoKSk7CisgICAg c25hcHNob3QtPnNldEJhY2tncm91bmRDb2xvcih3ZWJQYWdlUHJveHkuc2Nyb2xsQXJlYUJhY2tn cm91bmRDb2xvcigpKTsKICAgICBzbmFwc2hvdC0+c2V0Vmlld1Njcm9sbFBvc2l0aW9uKFdlYkNv cmU6OnJvdW5kZWRJbnRQb2ludCh3ZWJQYWdlUHJveHkudmlld1Njcm9sbFBvc2l0aW9uKCkpKTsK IAogICAgIGl0ZW0uc2V0U25hcHNob3QoV1RGTW92ZShzbmFwc2hvdCkpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggZjk2M2M4NjlkYTdlLi5lOGVlOTAzZjVl NzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAK KysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcApAQCAtMTkwNiw2 ICsxOTA2LDE0IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpzZXRVbmRlcmxheUNvbG9yKGNvbnN0IENv bG9yJiBjb2xvcikKICAgICAgICAgc2VuZChNZXNzYWdlczo6V2ViUGFnZTo6U2V0VW5kZXJsYXlD b2xvcihjb2xvcikpOwogfQogCitDb2xvciBXZWJQYWdlUHJveHk6OnNjcm9sbEFyZWFCYWNrZ3Jv dW5kQ29sb3IoKSBjb25zdAoreworICAgIGlmIChtX3ByZWZlcmVuY2VzLT4udXNlVGhlbWVDb2xv ckZvclNjcm9sbEFyZWFCYWNrZ3JvdW5kQ29sb3IoKSkKKyAgICAgICAgcmV0dXJuIG1fdGhlbWVD b2xvcjsKKworICAgIHJldHVybiBtX3BhZ2VFeHRlbmRlZEJhY2tncm91bmRDb2xvcjsKK30KKwog dm9pZCBXZWJQYWdlUHJveHk6OnZpZXdXaWxsU3RhcnRMaXZlUmVzaXplKCkKIHsKICAgICBpZiAo IWhhc1J1bm5pbmdQcm9jZXNzKCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9XZWJQYWdlUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5o CmluZGV4IDI5MjQwNmM5YmY2Yy4uZTJkOGRiMjNmZjIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9XZWJQYWdlUHJveHkuaApAQCAtNjM3LDYgKzYzNyw4IEBAIHB1YmxpYzoKICAgICAvLyB0aGUg bWVzc2FnZSBlbnRpcmVseS4KICAgICBXZWJDb3JlOjpDb2xvciBwYWdlRXh0ZW5kZWRCYWNrZ3Jv dW5kQ29sb3IoKSBjb25zdCB7IHJldHVybiBtX3BhZ2VFeHRlbmRlZEJhY2tncm91bmRDb2xvcjsg fQogCisgICAgV2ViQ29yZTo6Q29sb3Igc2Nyb2xsQXJlYUJhY2tncm91bmRDb2xvcigpIGNvbnN0 OworCiAgICAgdm9pZCB2aWV3V2lsbFN0YXJ0TGl2ZVJlc2l6ZSgpOwogICAgIHZvaWQgdmlld1dp bGxFbmRMaXZlUmVzaXplKCk7CiAK 420753 2021-02-17 16:13:11 -0800 2021-02-17 16:24:59 -0800 Patch 222078.diff text/plain 9029 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nIGIvU291cmNlL1dURi9DaGFuZ2VMb2cK aW5kZXggM2M4NWZkODc5ZjlhLi5lMjg1M2FhZDBkNTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYv Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIw MjEtMDItMTcgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIEV4 cGVyaW1lbnQgd2l0aCB1c2luZyB0aGUgdGhlbWUtY29sb3IgYXMgdGhlIHNjcm9sbCBhcmVhIGJh Y2tncm91bmQgaWYgcHJvdmlkZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIyMjA3OAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzQxNTg4MTg+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgVGltIEhvcnRvbi4KKworICAgICAgICAqIFNjcmlwdHMvUHJl ZmVyZW5jZXMvV2ViUHJlZmVyZW5jZXNJbnRlcm5hbC55YW1sOgorCiAyMDIxLTAyLTE3ICBEZWFu IEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KIAogICAgICAgICBVc2UgZWxlbWVudCBmdWxsc2Ny ZWVuIGZvciB2aWRlbyBvbiBzb21lIGNvbmZpZ3VyYXRpb25zCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V1RGL1NjcmlwdHMvUHJlZmVyZW5jZXMvV2ViUHJlZmVyZW5jZXNJbnRlcm5hbC55YW1sIGIvU291 cmNlL1dURi9TY3JpcHRzL1ByZWZlcmVuY2VzL1dlYlByZWZlcmVuY2VzSW50ZXJuYWwueWFtbApp bmRleCA4Yzg3MzRiZDAzMjMuLmQwMTdkODkwMDM4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dURi9T Y3JpcHRzL1ByZWZlcmVuY2VzL1dlYlByZWZlcmVuY2VzSW50ZXJuYWwueWFtbAorKysgYi9Tb3Vy Y2UvV1RGL1NjcmlwdHMvUHJlZmVyZW5jZXMvV2ViUHJlZmVyZW5jZXNJbnRlcm5hbC55YW1sCkBA IC03NzUsNiArNzc1LDE3IEBAIFVzZUdQVVByb2Nlc3NGb3JXZWJHTEVuYWJsZWQ6CiAgICAgV2Vi S2l0OgogICAgICAgZGVmYXVsdDogZGVmYXVsdFVzZUdQVVByb2Nlc3NGb3JXZWJHTEVuYWJsZWQo KQogCitVc2VUaGVtZUNvbG9yRm9yU2Nyb2xsQXJlYUJhY2tncm91bmRDb2xvcjoKKyAgdHlwZTog Ym9vbAorICBodW1hblJlYWRhYmxlTmFtZTogIlVzZSB0aGVtZS1jb2xvciBmb3Igc2Nyb2xsIGFy ZWEgYmFja2dyb3VuZCBjb2xvciIKKyAgaHVtYW5SZWFkYWJsZURlc2NyaXB0aW9uOiAiVXNlIHRo ZW1lLWNvbG9yIGZvciBzY3JvbGwgYXJlYSBiYWNrZ3JvdW5kIGNvbG9yIgorICB3ZWJjb3JlQmlu ZGluZzogbm9uZQorICBkZWZhdWx0VmFsdWU6CisgICAgV2ViS2l0OgorICAgICAgZGVmYXVsdDog ZmFsc2UKKyAgICBXZWJDb3JlOgorICAgICAgZGVmYXVsdDogZmFsc2UKKwogIyBGSVhNRTogUmVt b3ZlIG9uY2UgPHJkYXI6Ly83MzgzMDk2MT4gaGFzIGJlZW4gZml4ZWQKIFVzZWlUdW5lc0FWT3V0 cHV0Q29udGV4dDoKICAgdHlwZTogYm9vbApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDFhZjE0NzIwMGYwMC4uMWRl YmU3ZTUwOTZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMjEtMDItMTcgIERldmlu IFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIEV4cGVyaW1lbnQgd2l0aCB1 c2luZyB0aGUgdGhlbWUtY29sb3IgYXMgdGhlIHNjcm9sbCBhcmVhIGJhY2tncm91bmQgaWYgcHJv dmlkZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIy MjA3OAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzQxNTg4MTg+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgVGltIEhvcnRvbi4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllckNvbXBv c2l0b3IuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlTGF5ZXJGb3JP dmVyaGFuZ0FyZWFzQmFja2dyb3VuZENvbG9yKTogQWRkZWQuCisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJMYXllckNvbXBvc2l0b3I6OnJvb3RCYWNrZ3JvdW5kQ29sb3JPclRyYW5zcGFyZW5jeUNo YW5nZWQpOgorCisgICAgICAgICogZG9tL0RvY3VtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkRvY3VtZW50Ojpwcm9jZXNzVGhlbWVDb2xvcik6CisgICAgICAgIE5vdGlmeSB0aGUgYFJlbmRl ckxheWVyQ29tcG9zaXRvcmAgd2hlbiBgPG1ldGEgbmFtZT0idGhlbWUtY29sb3IiIGNvbnRlbnQ9 Ii4uLiI+YCBjaGFuZ2VzLgorCiAyMDIxLTAyLTE3ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFw cGxlLmNvbT4KIAogICAgICAgICBbaU9TXSB1cGRhdGUgbWVkaWEgY29udHJvbHMgdG8gdXNlIG5l dyBTRiBTeW1ib2xzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3Bw IGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAppbmRleCAxYjlmNzI2NjM5MjEuLmFm OTBlZTZhYTkyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCkBAIC0zODMyLDYgKzM4MzIsMTMg QEAgdm9pZCBEb2N1bWVudDo6cHJvY2Vzc1RoZW1lQ29sb3IoY29uc3QgU3RyaW5nJiB0aGVtZUNv bG9yU3RyaW5nKQogCiAgICAgaWYgKGF1dG8qIHBhZ2UgPSB0aGlzLT5wYWdlKCkpCiAgICAgICAg IHBhZ2UtPmNocm9tZSgpLmNsaWVudCgpLnRoZW1lQ29sb3JDaGFuZ2VkKG1fdGhlbWVDb2xvcik7 CisKKyNpZiBFTkFCTEUoUlVCQkVSX0JBTkRJTkcpCisgICAgaWYgKGF1dG8qIHZpZXcgPSByZW5k ZXJWaWV3KCkpIHsKKyAgICAgICAgaWYgKHZpZXctPnVzZXNDb21wb3NpdGluZygpKQorICAgICAg ICAgICAgdmlldy0+Y29tcG9zaXRvcigpLnVwZGF0ZUxheWVyRm9yT3ZlcmhhbmdBcmVhc0JhY2tn cm91bmRDb2xvcigpOworICAgIH0KKyNlbmRpZiAvLyBFTkFCTEUoUlVCQkVSX0JBTkRJTkcpCiB9 CiAKICNpZiBFTkFCTEUoREFSS19NT0RFX0NTUykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKaW5kZXggOWM4MDk0Nzg4NDhjLi5lMDMw NTU0NjU2OGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXll ckNvbXBvc2l0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXll ckNvbXBvc2l0b3IuY3BwCkBAIC0zODU3LDcgKzM4NTcsMjQgQEAgR3JhcGhpY3NMYXllciogUmVu ZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRhdGVMYXllckZvckZvb3Rlcihib29sIHdhbnRzTGF5ZXIp CiAgICAgcmV0dXJuIG1fbGF5ZXJGb3JGb290ZXIuZ2V0KCk7CiB9CiAKLSNlbmRpZgordm9pZCBS ZW5kZXJMYXllckNvbXBvc2l0b3I6OnVwZGF0ZUxheWVyRm9yT3ZlcmhhbmdBcmVhc0JhY2tncm91 bmRDb2xvcigpCit7CisgICAgaWYgKCFtX2xheWVyRm9yT3ZlcmhhbmdBcmVhcykKKyAgICAgICAg cmV0dXJuOworCisgICAgQ29sb3IgYmFja2dyb3VuZENvbG9yOworICAgIGlmIChwYWdlKCkuc2V0 dGluZ3MoKS51c2VUaGVtZUNvbG9yRm9yU2Nyb2xsQXJlYUJhY2tncm91bmRDb2xvcigpKQorICAg ICAgICBiYWNrZ3JvdW5kQ29sb3IgPSBwYWdlKCkudGhlbWVDb2xvcigpOworICAgIGlmICghYmFj a2dyb3VuZENvbG9yLmlzVmFsaWQoKSkKKyAgICAgICAgYmFja2dyb3VuZENvbG9yID0gbV9yb290 RXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3I7CisKKyAgICBtX2xheWVyRm9yT3ZlcmhhbmdBcmVhcy0+ c2V0QmFja2dyb3VuZENvbG9yKGJhY2tncm91bmRDb2xvcik7CisKKyAgICBpZiAoIWJhY2tncm91 bmRDb2xvci5pc1ZhbGlkKCkpCisgICAgICAgIG1fbGF5ZXJGb3JPdmVyaGFuZ0FyZWFzLT5zZXRD dXN0b21BcHBlYXJhbmNlKEdyYXBoaWNzTGF5ZXI6OkN1c3RvbUFwcGVhcmFuY2U6OlNjcm9sbGlu Z092ZXJoYW5nKTsKK30KKworI2VuZGlmIC8vIEVOQUJMRShSVUJCRVJfQkFORElORykKIAogYm9v bCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnZpZXdOZWVkc1RvSW52YWxpZGF0ZUV2ZW50UmVnaW9u T2ZFbmNsb3NpbmdDb21wb3NpdGluZ0xheWVyRm9yUmVwYWludCgpIGNvbnN0CiB7CkBAIC0zOTMz LDEyICszOTUwLDcgQEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnJvb3RCYWNrZ3JvdW5k Q29sb3JPclRyYW5zcGFyZW5jeUNoYW5nZWQoKQogICAgICAgICBwYWdlKCkuY2hyb21lKCkuY2xp ZW50KCkucGFnZUV4dGVuZGVkQmFja2dyb3VuZENvbG9yRGlkQ2hhbmdlKG1fcm9vdEV4dGVuZGVk QmFja2dyb3VuZENvbG9yKTsKICAgICAgICAgCiAjaWYgRU5BQkxFKFJVQkJFUl9CQU5ESU5HKQot ICAgICAgICBpZiAobV9sYXllckZvck92ZXJoYW5nQXJlYXMpIHsKLSAgICAgICAgICAgIG1fbGF5 ZXJGb3JPdmVyaGFuZ0FyZWFzLT5zZXRCYWNrZ3JvdW5kQ29sb3IobV9yb290RXh0ZW5kZWRCYWNr Z3JvdW5kQ29sb3IpOwotCi0gICAgICAgICAgICBpZiAoIW1fcm9vdEV4dGVuZGVkQmFja2dyb3Vu ZENvbG9yLmlzVmFsaWQoKSkKLSAgICAgICAgICAgICAgICBtX2xheWVyRm9yT3ZlcmhhbmdBcmVh cy0+c2V0Q3VzdG9tQXBwZWFyYW5jZShHcmFwaGljc0xheWVyOjpDdXN0b21BcHBlYXJhbmNlOjpT Y3JvbGxpbmdPdmVyaGFuZyk7Ci0gICAgICAgIH0KKyAgICAgICAgdXBkYXRlTGF5ZXJGb3JPdmVy aGFuZ0FyZWFzQmFja2dyb3VuZENvbG9yKCk7CiAjZW5kaWYKICAgICB9CiAgICAgCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmggYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmgKaW5kZXggYzE1 MWUyM2QwZWY2Li40MTAzNWI5MjJjNTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmgKQEAgLTM0Myw3ICszNDMsOSBAQCBwdWJsaWM6CiAg ICAgR3JhcGhpY3NMYXllciogdXBkYXRlTGF5ZXJGb3JCb3R0b21PdmVyaGFuZ0FyZWEoYm9vbCB3 YW50c0xheWVyKTsKICAgICBHcmFwaGljc0xheWVyKiB1cGRhdGVMYXllckZvckhlYWRlcihib29s IHdhbnRzTGF5ZXIpOwogICAgIEdyYXBoaWNzTGF5ZXIqIHVwZGF0ZUxheWVyRm9yRm9vdGVyKGJv b2wgd2FudHNMYXllcik7Ci0jZW5kaWYKKworICAgIHZvaWQgdXBkYXRlTGF5ZXJGb3JPdmVyaGFu Z0FyZWFzQmFja2dyb3VuZENvbG9yKCk7CisjZW5kaWYgLy8gRU5BQkxFKFJVQkJFUl9CQU5ESU5H KQogCiAgICAgLy8gRklYTUU6IG1ha2UgdGhlIGNvb3JkaW5hdGVkL2FzeW5jIHRlcm1pbm9sb2d5 IGNvbnNpc3RlbnQuCiAgICAgYm9vbCBpc1ZpZXdwb3J0Q29uc3RyYWluZWRGaXhlZE9yU3RpY2t5 TGF5ZXIoY29uc3QgUmVuZGVyTGF5ZXImKSBjb25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggZWM3YTcwZDFjZjU2 Li5hMTk5MDBkZTYwOWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMjEtMDItMTcgIERl dmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIEV4cGVyaW1lbnQgd2l0 aCB1c2luZyB0aGUgdGhlbWUtY29sb3IgYXMgdGhlIHNjcm9sbCBhcmVhIGJhY2tncm91bmQgaWYg cHJvdmlkZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIyMjA3OAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzQxNTg4MTg+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgVGltIEhvcnRvbi4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvaW9zL1dLV2Vi Vmlld0lPUy5tbToKKyAgICAgICAgKGJhc2VTY3JvbGxWaWV3QmFja2dyb3VuZENvbG9yKToKKyAg ICAgICAgKiBVSVByb2Nlc3MvVmlld1NuYXBzaG90U3RvcmUuY3BwOgorICAgICAgICAoV2ViS2l0 OjpWaWV3U25hcHNob3RTdG9yZTo6cmVjb3JkU25hcHNob3QpOgorICAgICAgICAqIFVJUHJvY2Vz cy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoK KyAgICAgICAgKFdlYlBhZ2VQcm94eTo6c2Nyb2xsQXJlYUJhY2tncm91bmRDb2xvcik6IEFkZGVk LgorCiAyMDIxLTAyLTE3ICBUcnVpdHQgU2F2ZWxsICA8dHNhdmVsbEBhcHBsZS5jb20+CiAKICAg ICAgICAgVW5yZXZpZXdlZCwgcmV2ZXJ0aW5nIHIyNzI5MDUuCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9BUEkvaW9zL1dLV2ViVmlld0lPUy5tbSBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0FQSS9pb3MvV0tXZWJWaWV3SU9TLm1tCmluZGV4IDU5ZDQ0NjI2ZWE0NS4uNTMy OWQyNDhhMzBiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvaW9zL1dL V2ViVmlld0lPUy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvaW9zL1dLV2Vi Vmlld0lPUy5tbQpAQCAtNDkyLDcgKzQ5Miw3IEBAIHN0YXRpYyBXZWJDb3JlOjpDb2xvciBiYXNl U2Nyb2xsVmlld0JhY2tncm91bmRDb2xvcihXS1dlYlZpZXcgKndlYlZpZXcpCiAgICAgaWYgKCF3 ZWJWaWV3LT5fcGFnZSkKICAgICAgICAgcmV0dXJuIHsgfTsKIAotICAgIHJldHVybiB3ZWJWaWV3 LT5fcGFnZS0+cGFnZUV4dGVuZGVkQmFja2dyb3VuZENvbG9yKCk7CisgICAgcmV0dXJuIHdlYlZp ZXctPl9wYWdlLT5zY3JvbGxBcmVhQmFja2dyb3VuZENvbG9yKCk7CiB9CiAKIHN0YXRpYyBXZWJD b3JlOjpDb2xvciBzY3JvbGxWaWV3QmFja2dyb3VuZENvbG9yKFdLV2ViVmlldyAqd2ViVmlldykK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1ZpZXdTbmFwc2hvdFN0b3JlLmNw cCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1ZpZXdTbmFwc2hvdFN0b3JlLmNwcAppbmRleCAy MzMxOTJhOGYxNDEuLjQ4ZDk0NjMyNzU4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvVmlld1NuYXBzaG90U3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1ZpZXdTbmFwc2hvdFN0b3JlLmNwcApAQCAtOTUsNyArOTUsNyBAQCB2b2lkIFZpZXdTbmFwc2hv dFN0b3JlOjpyZWNvcmRTbmFwc2hvdChXZWJQYWdlUHJveHkmIHdlYlBhZ2VQcm94eSwgV2ViQmFj a0ZvcndhcgogCiAgICAgc25hcHNob3QtPnNldFJlbmRlclRyZWVTaXplKHdlYlBhZ2VQcm94eS5y ZW5kZXJUcmVlU2l6ZSgpKTsKICAgICBzbmFwc2hvdC0+c2V0RGV2aWNlU2NhbGVGYWN0b3Iod2Vi UGFnZVByb3h5LmRldmljZVNjYWxlRmFjdG9yKCkpOwotICAgIHNuYXBzaG90LT5zZXRCYWNrZ3Jv dW5kQ29sb3Iod2ViUGFnZVByb3h5LnBhZ2VFeHRlbmRlZEJhY2tncm91bmRDb2xvcigpKTsKKyAg ICBzbmFwc2hvdC0+c2V0QmFja2dyb3VuZENvbG9yKHdlYlBhZ2VQcm94eS5zY3JvbGxBcmVhQmFj a2dyb3VuZENvbG9yKCkpOwogICAgIHNuYXBzaG90LT5zZXRWaWV3U2Nyb2xsUG9zaXRpb24oV2Vi Q29yZTo6cm91bmRlZEludFBvaW50KHdlYlBhZ2VQcm94eS52aWV3U2Nyb2xsUG9zaXRpb24oKSkp OwogCiAgICAgaXRlbS5zZXRTbmFwc2hvdChXVEZNb3ZlKHNuYXBzaG90KSk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAppbmRleCBmOTYzYzg2OWRhN2UuLmU4ZWU5MDNm NWU3NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCkBAIC0xOTA2 LDYgKzE5MDYsMTQgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnNldFVuZGVybGF5Q29sb3IoY29uc3Qg Q29sb3ImIGNvbG9yKQogICAgICAgICBzZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpTZXRVbmRlcmxh eUNvbG9yKGNvbG9yKSk7CiB9CiAKK0NvbG9yIFdlYlBhZ2VQcm94eTo6c2Nyb2xsQXJlYUJhY2tn cm91bmRDb2xvcigpIGNvbnN0Cit7CisgICAgaWYgKG1fcHJlZmVyZW5jZXMtPi51c2VUaGVtZUNv bG9yRm9yU2Nyb2xsQXJlYUJhY2tncm91bmRDb2xvcigpKQorICAgICAgICByZXR1cm4gbV90aGVt ZUNvbG9yOworCisgICAgcmV0dXJuIG1fcGFnZUV4dGVuZGVkQmFja2dyb3VuZENvbG9yOworfQor CiB2b2lkIFdlYlBhZ2VQcm94eTo6dmlld1dpbGxTdGFydExpdmVSZXNpemUoKQogewogICAgIGlm ICghaGFzUnVubmluZ1Byb2Nlc3MoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1dlYlBhZ2VQcm94eS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5 LmgKaW5kZXggMjkyNDA2YzliZjZjLi5lMmQ4ZGIyM2ZmMjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1dlYlBhZ2VQcm94eS5oCkBAIC02MzcsNiArNjM3LDggQEAgcHVibGljOgogICAgIC8vIHRo ZSBtZXNzYWdlIGVudGlyZWx5LgogICAgIFdlYkNvcmU6OkNvbG9yIHBhZ2VFeHRlbmRlZEJhY2tn cm91bmRDb2xvcigpIGNvbnN0IHsgcmV0dXJuIG1fcGFnZUV4dGVuZGVkQmFja2dyb3VuZENvbG9y OyB9CiAKKyAgICBXZWJDb3JlOjpDb2xvciBzY3JvbGxBcmVhQmFja2dyb3VuZENvbG9yKCkgY29u c3Q7CisKICAgICB2b2lkIHZpZXdXaWxsU3RhcnRMaXZlUmVzaXplKCk7CiAgICAgdm9pZCB2aWV3 V2lsbEVuZExpdmVSZXNpemUoKTsKIAo= 420755 2021-02-17 16:24:59 -0800 2021-02-17 17:38:25 -0800 Patch 222078.diff text/plain 9028 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nIGIvU291cmNlL1dURi9DaGFuZ2VMb2cK aW5kZXggM2M4NWZkODc5ZjlhLi5lMjg1M2FhZDBkNTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYv Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIw MjEtMDItMTcgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIEV4 cGVyaW1lbnQgd2l0aCB1c2luZyB0aGUgdGhlbWUtY29sb3IgYXMgdGhlIHNjcm9sbCBhcmVhIGJh Y2tncm91bmQgaWYgcHJvdmlkZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIyMjA3OAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzQxNTg4MTg+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgVGltIEhvcnRvbi4KKworICAgICAgICAqIFNjcmlwdHMvUHJl ZmVyZW5jZXMvV2ViUHJlZmVyZW5jZXNJbnRlcm5hbC55YW1sOgorCiAyMDIxLTAyLTE3ICBEZWFu IEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KIAogICAgICAgICBVc2UgZWxlbWVudCBmdWxsc2Ny ZWVuIGZvciB2aWRlbyBvbiBzb21lIGNvbmZpZ3VyYXRpb25zCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V1RGL1NjcmlwdHMvUHJlZmVyZW5jZXMvV2ViUHJlZmVyZW5jZXNJbnRlcm5hbC55YW1sIGIvU291 cmNlL1dURi9TY3JpcHRzL1ByZWZlcmVuY2VzL1dlYlByZWZlcmVuY2VzSW50ZXJuYWwueWFtbApp bmRleCA4Yzg3MzRiZDAzMjMuLmQwMTdkODkwMDM4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dURi9T Y3JpcHRzL1ByZWZlcmVuY2VzL1dlYlByZWZlcmVuY2VzSW50ZXJuYWwueWFtbAorKysgYi9Tb3Vy Y2UvV1RGL1NjcmlwdHMvUHJlZmVyZW5jZXMvV2ViUHJlZmVyZW5jZXNJbnRlcm5hbC55YW1sCkBA IC03NzUsNiArNzc1LDE3IEBAIFVzZUdQVVByb2Nlc3NGb3JXZWJHTEVuYWJsZWQ6CiAgICAgV2Vi S2l0OgogICAgICAgZGVmYXVsdDogZGVmYXVsdFVzZUdQVVByb2Nlc3NGb3JXZWJHTEVuYWJsZWQo KQogCitVc2VUaGVtZUNvbG9yRm9yU2Nyb2xsQXJlYUJhY2tncm91bmRDb2xvcjoKKyAgdHlwZTog Ym9vbAorICBodW1hblJlYWRhYmxlTmFtZTogIlVzZSB0aGVtZS1jb2xvciBmb3Igc2Nyb2xsIGFy ZWEgYmFja2dyb3VuZCBjb2xvciIKKyAgaHVtYW5SZWFkYWJsZURlc2NyaXB0aW9uOiAiVXNlIHRo ZW1lLWNvbG9yIGZvciBzY3JvbGwgYXJlYSBiYWNrZ3JvdW5kIGNvbG9yIgorICB3ZWJjb3JlQmlu ZGluZzogbm9uZQorICBkZWZhdWx0VmFsdWU6CisgICAgV2ViS2l0OgorICAgICAgZGVmYXVsdDog ZmFsc2UKKyAgICBXZWJDb3JlOgorICAgICAgZGVmYXVsdDogZmFsc2UKKwogIyBGSVhNRTogUmVt b3ZlIG9uY2UgPHJkYXI6Ly83MzgzMDk2MT4gaGFzIGJlZW4gZml4ZWQKIFVzZWlUdW5lc0FWT3V0 cHV0Q29udGV4dDoKICAgdHlwZTogYm9vbApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDFhZjE0NzIwMGYwMC4uMWRl YmU3ZTUwOTZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMjEtMDItMTcgIERldmlu IFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIEV4cGVyaW1lbnQgd2l0aCB1 c2luZyB0aGUgdGhlbWUtY29sb3IgYXMgdGhlIHNjcm9sbCBhcmVhIGJhY2tncm91bmQgaWYgcHJv dmlkZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIy MjA3OAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzQxNTg4MTg+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgVGltIEhvcnRvbi4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllckNvbXBv c2l0b3IuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlTGF5ZXJGb3JP dmVyaGFuZ0FyZWFzQmFja2dyb3VuZENvbG9yKTogQWRkZWQuCisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJMYXllckNvbXBvc2l0b3I6OnJvb3RCYWNrZ3JvdW5kQ29sb3JPclRyYW5zcGFyZW5jeUNo YW5nZWQpOgorCisgICAgICAgICogZG9tL0RvY3VtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkRvY3VtZW50Ojpwcm9jZXNzVGhlbWVDb2xvcik6CisgICAgICAgIE5vdGlmeSB0aGUgYFJlbmRl ckxheWVyQ29tcG9zaXRvcmAgd2hlbiBgPG1ldGEgbmFtZT0idGhlbWUtY29sb3IiIGNvbnRlbnQ9 Ii4uLiI+YCBjaGFuZ2VzLgorCiAyMDIxLTAyLTE3ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFw cGxlLmNvbT4KIAogICAgICAgICBbaU9TXSB1cGRhdGUgbWVkaWEgY29udHJvbHMgdG8gdXNlIG5l dyBTRiBTeW1ib2xzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3Bw IGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAppbmRleCAxYjlmNzI2NjM5MjEuLmFm OTBlZTZhYTkyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCkBAIC0zODMyLDYgKzM4MzIsMTMg QEAgdm9pZCBEb2N1bWVudDo6cHJvY2Vzc1RoZW1lQ29sb3IoY29uc3QgU3RyaW5nJiB0aGVtZUNv bG9yU3RyaW5nKQogCiAgICAgaWYgKGF1dG8qIHBhZ2UgPSB0aGlzLT5wYWdlKCkpCiAgICAgICAg IHBhZ2UtPmNocm9tZSgpLmNsaWVudCgpLnRoZW1lQ29sb3JDaGFuZ2VkKG1fdGhlbWVDb2xvcik7 CisKKyNpZiBFTkFCTEUoUlVCQkVSX0JBTkRJTkcpCisgICAgaWYgKGF1dG8qIHZpZXcgPSByZW5k ZXJWaWV3KCkpIHsKKyAgICAgICAgaWYgKHZpZXctPnVzZXNDb21wb3NpdGluZygpKQorICAgICAg ICAgICAgdmlldy0+Y29tcG9zaXRvcigpLnVwZGF0ZUxheWVyRm9yT3ZlcmhhbmdBcmVhc0JhY2tn cm91bmRDb2xvcigpOworICAgIH0KKyNlbmRpZiAvLyBFTkFCTEUoUlVCQkVSX0JBTkRJTkcpCiB9 CiAKICNpZiBFTkFCTEUoREFSS19NT0RFX0NTUykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKaW5kZXggOWM4MDk0Nzg4NDhjLi5lMDMw NTU0NjU2OGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXll ckNvbXBvc2l0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXll ckNvbXBvc2l0b3IuY3BwCkBAIC0zODU3LDcgKzM4NTcsMjQgQEAgR3JhcGhpY3NMYXllciogUmVu ZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRhdGVMYXllckZvckZvb3Rlcihib29sIHdhbnRzTGF5ZXIp CiAgICAgcmV0dXJuIG1fbGF5ZXJGb3JGb290ZXIuZ2V0KCk7CiB9CiAKLSNlbmRpZgordm9pZCBS ZW5kZXJMYXllckNvbXBvc2l0b3I6OnVwZGF0ZUxheWVyRm9yT3ZlcmhhbmdBcmVhc0JhY2tncm91 bmRDb2xvcigpCit7CisgICAgaWYgKCFtX2xheWVyRm9yT3ZlcmhhbmdBcmVhcykKKyAgICAgICAg cmV0dXJuOworCisgICAgQ29sb3IgYmFja2dyb3VuZENvbG9yOworICAgIGlmIChwYWdlKCkuc2V0 dGluZ3MoKS51c2VUaGVtZUNvbG9yRm9yU2Nyb2xsQXJlYUJhY2tncm91bmRDb2xvcigpKQorICAg ICAgICBiYWNrZ3JvdW5kQ29sb3IgPSBwYWdlKCkudGhlbWVDb2xvcigpOworICAgIGlmICghYmFj a2dyb3VuZENvbG9yLmlzVmFsaWQoKSkKKyAgICAgICAgYmFja2dyb3VuZENvbG9yID0gbV9yb290 RXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3I7CisKKyAgICBtX2xheWVyRm9yT3ZlcmhhbmdBcmVhcy0+ c2V0QmFja2dyb3VuZENvbG9yKGJhY2tncm91bmRDb2xvcik7CisKKyAgICBpZiAoIWJhY2tncm91 bmRDb2xvci5pc1ZhbGlkKCkpCisgICAgICAgIG1fbGF5ZXJGb3JPdmVyaGFuZ0FyZWFzLT5zZXRD dXN0b21BcHBlYXJhbmNlKEdyYXBoaWNzTGF5ZXI6OkN1c3RvbUFwcGVhcmFuY2U6OlNjcm9sbGlu Z092ZXJoYW5nKTsKK30KKworI2VuZGlmIC8vIEVOQUJMRShSVUJCRVJfQkFORElORykKIAogYm9v bCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnZpZXdOZWVkc1RvSW52YWxpZGF0ZUV2ZW50UmVnaW9u T2ZFbmNsb3NpbmdDb21wb3NpdGluZ0xheWVyRm9yUmVwYWludCgpIGNvbnN0CiB7CkBAIC0zOTMz LDEyICszOTUwLDcgQEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnJvb3RCYWNrZ3JvdW5k Q29sb3JPclRyYW5zcGFyZW5jeUNoYW5nZWQoKQogICAgICAgICBwYWdlKCkuY2hyb21lKCkuY2xp ZW50KCkucGFnZUV4dGVuZGVkQmFja2dyb3VuZENvbG9yRGlkQ2hhbmdlKG1fcm9vdEV4dGVuZGVk QmFja2dyb3VuZENvbG9yKTsKICAgICAgICAgCiAjaWYgRU5BQkxFKFJVQkJFUl9CQU5ESU5HKQot ICAgICAgICBpZiAobV9sYXllckZvck92ZXJoYW5nQXJlYXMpIHsKLSAgICAgICAgICAgIG1fbGF5 ZXJGb3JPdmVyaGFuZ0FyZWFzLT5zZXRCYWNrZ3JvdW5kQ29sb3IobV9yb290RXh0ZW5kZWRCYWNr Z3JvdW5kQ29sb3IpOwotCi0gICAgICAgICAgICBpZiAoIW1fcm9vdEV4dGVuZGVkQmFja2dyb3Vu ZENvbG9yLmlzVmFsaWQoKSkKLSAgICAgICAgICAgICAgICBtX2xheWVyRm9yT3ZlcmhhbmdBcmVh cy0+c2V0Q3VzdG9tQXBwZWFyYW5jZShHcmFwaGljc0xheWVyOjpDdXN0b21BcHBlYXJhbmNlOjpT Y3JvbGxpbmdPdmVyaGFuZyk7Ci0gICAgICAgIH0KKyAgICAgICAgdXBkYXRlTGF5ZXJGb3JPdmVy aGFuZ0FyZWFzQmFja2dyb3VuZENvbG9yKCk7CiAjZW5kaWYKICAgICB9CiAgICAgCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmggYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmgKaW5kZXggYzE1 MWUyM2QwZWY2Li40MTAzNWI5MjJjNTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmgKQEAgLTM0Myw3ICszNDMsOSBAQCBwdWJsaWM6CiAg ICAgR3JhcGhpY3NMYXllciogdXBkYXRlTGF5ZXJGb3JCb3R0b21PdmVyaGFuZ0FyZWEoYm9vbCB3 YW50c0xheWVyKTsKICAgICBHcmFwaGljc0xheWVyKiB1cGRhdGVMYXllckZvckhlYWRlcihib29s IHdhbnRzTGF5ZXIpOwogICAgIEdyYXBoaWNzTGF5ZXIqIHVwZGF0ZUxheWVyRm9yRm9vdGVyKGJv b2wgd2FudHNMYXllcik7Ci0jZW5kaWYKKworICAgIHZvaWQgdXBkYXRlTGF5ZXJGb3JPdmVyaGFu Z0FyZWFzQmFja2dyb3VuZENvbG9yKCk7CisjZW5kaWYgLy8gRU5BQkxFKFJVQkJFUl9CQU5ESU5H KQogCiAgICAgLy8gRklYTUU6IG1ha2UgdGhlIGNvb3JkaW5hdGVkL2FzeW5jIHRlcm1pbm9sb2d5 IGNvbnNpc3RlbnQuCiAgICAgYm9vbCBpc1ZpZXdwb3J0Q29uc3RyYWluZWRGaXhlZE9yU3RpY2t5 TGF5ZXIoY29uc3QgUmVuZGVyTGF5ZXImKSBjb25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggZWM3YTcwZDFjZjU2 Li5hMTk5MDBkZTYwOWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMjEtMDItMTcgIERl dmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIEV4cGVyaW1lbnQgd2l0 aCB1c2luZyB0aGUgdGhlbWUtY29sb3IgYXMgdGhlIHNjcm9sbCBhcmVhIGJhY2tncm91bmQgaWYg cHJvdmlkZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIyMjA3OAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzQxNTg4MTg+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgVGltIEhvcnRvbi4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvaW9zL1dLV2Vi Vmlld0lPUy5tbToKKyAgICAgICAgKGJhc2VTY3JvbGxWaWV3QmFja2dyb3VuZENvbG9yKToKKyAg ICAgICAgKiBVSVByb2Nlc3MvVmlld1NuYXBzaG90U3RvcmUuY3BwOgorICAgICAgICAoV2ViS2l0 OjpWaWV3U25hcHNob3RTdG9yZTo6cmVjb3JkU25hcHNob3QpOgorICAgICAgICAqIFVJUHJvY2Vz cy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoK KyAgICAgICAgKFdlYlBhZ2VQcm94eTo6c2Nyb2xsQXJlYUJhY2tncm91bmRDb2xvcik6IEFkZGVk LgorCiAyMDIxLTAyLTE3ICBUcnVpdHQgU2F2ZWxsICA8dHNhdmVsbEBhcHBsZS5jb20+CiAKICAg ICAgICAgVW5yZXZpZXdlZCwgcmV2ZXJ0aW5nIHIyNzI5MDUuCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9BUEkvaW9zL1dLV2ViVmlld0lPUy5tbSBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0FQSS9pb3MvV0tXZWJWaWV3SU9TLm1tCmluZGV4IDU5ZDQ0NjI2ZWE0NS4uNTMy OWQyNDhhMzBiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvaW9zL1dL V2ViVmlld0lPUy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvaW9zL1dLV2Vi Vmlld0lPUy5tbQpAQCAtNDkyLDcgKzQ5Miw3IEBAIHN0YXRpYyBXZWJDb3JlOjpDb2xvciBiYXNl U2Nyb2xsVmlld0JhY2tncm91bmRDb2xvcihXS1dlYlZpZXcgKndlYlZpZXcpCiAgICAgaWYgKCF3 ZWJWaWV3LT5fcGFnZSkKICAgICAgICAgcmV0dXJuIHsgfTsKIAotICAgIHJldHVybiB3ZWJWaWV3 LT5fcGFnZS0+cGFnZUV4dGVuZGVkQmFja2dyb3VuZENvbG9yKCk7CisgICAgcmV0dXJuIHdlYlZp ZXctPl9wYWdlLT5zY3JvbGxBcmVhQmFja2dyb3VuZENvbG9yKCk7CiB9CiAKIHN0YXRpYyBXZWJD b3JlOjpDb2xvciBzY3JvbGxWaWV3QmFja2dyb3VuZENvbG9yKFdLV2ViVmlldyAqd2ViVmlldykK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1ZpZXdTbmFwc2hvdFN0b3JlLmNw cCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1ZpZXdTbmFwc2hvdFN0b3JlLmNwcAppbmRleCAy MzMxOTJhOGYxNDEuLjQ4ZDk0NjMyNzU4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvVmlld1NuYXBzaG90U3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1ZpZXdTbmFwc2hvdFN0b3JlLmNwcApAQCAtOTUsNyArOTUsNyBAQCB2b2lkIFZpZXdTbmFwc2hv dFN0b3JlOjpyZWNvcmRTbmFwc2hvdChXZWJQYWdlUHJveHkmIHdlYlBhZ2VQcm94eSwgV2ViQmFj a0ZvcndhcgogCiAgICAgc25hcHNob3QtPnNldFJlbmRlclRyZWVTaXplKHdlYlBhZ2VQcm94eS5y ZW5kZXJUcmVlU2l6ZSgpKTsKICAgICBzbmFwc2hvdC0+c2V0RGV2aWNlU2NhbGVGYWN0b3Iod2Vi UGFnZVByb3h5LmRldmljZVNjYWxlRmFjdG9yKCkpOwotICAgIHNuYXBzaG90LT5zZXRCYWNrZ3Jv dW5kQ29sb3Iod2ViUGFnZVByb3h5LnBhZ2VFeHRlbmRlZEJhY2tncm91bmRDb2xvcigpKTsKKyAg ICBzbmFwc2hvdC0+c2V0QmFja2dyb3VuZENvbG9yKHdlYlBhZ2VQcm94eS5zY3JvbGxBcmVhQmFj a2dyb3VuZENvbG9yKCkpOwogICAgIHNuYXBzaG90LT5zZXRWaWV3U2Nyb2xsUG9zaXRpb24oV2Vi Q29yZTo6cm91bmRlZEludFBvaW50KHdlYlBhZ2VQcm94eS52aWV3U2Nyb2xsUG9zaXRpb24oKSkp OwogCiAgICAgaXRlbS5zZXRTbmFwc2hvdChXVEZNb3ZlKHNuYXBzaG90KSk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAppbmRleCBmOTYzYzg2OWRhN2UuLmU4ZWU5MDNm NWU3NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCkBAIC0xOTA2 LDYgKzE5MDYsMTQgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnNldFVuZGVybGF5Q29sb3IoY29uc3Qg Q29sb3ImIGNvbG9yKQogICAgICAgICBzZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpTZXRVbmRlcmxh eUNvbG9yKGNvbG9yKSk7CiB9CiAKK0NvbG9yIFdlYlBhZ2VQcm94eTo6c2Nyb2xsQXJlYUJhY2tn cm91bmRDb2xvcigpIGNvbnN0Cit7CisgICAgaWYgKG1fcHJlZmVyZW5jZXMtPnVzZVRoZW1lQ29s b3JGb3JTY3JvbGxBcmVhQmFja2dyb3VuZENvbG9yKCkpCisgICAgICAgIHJldHVybiBtX3RoZW1l Q29sb3I7CisKKyAgICByZXR1cm4gbV9wYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3I7Cit9CisK IHZvaWQgV2ViUGFnZVByb3h5Ojp2aWV3V2lsbFN0YXJ0TGl2ZVJlc2l6ZSgpCiB7CiAgICAgaWYg KCFoYXNSdW5uaW5nUHJvY2VzcygpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvV2ViUGFnZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHku aAppbmRleCAyOTI0MDZjOWJmNmMuLmUyZDhkYjIzZmYyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvV2ViUGFnZVByb3h5LmgKQEAgLTYzNyw2ICs2MzcsOCBAQCBwdWJsaWM6CiAgICAgLy8gdGhl IG1lc3NhZ2UgZW50aXJlbHkuCiAgICAgV2ViQ29yZTo6Q29sb3IgcGFnZUV4dGVuZGVkQmFja2dy b3VuZENvbG9yKCkgY29uc3QgeyByZXR1cm4gbV9wYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3I7 IH0KIAorICAgIFdlYkNvcmU6OkNvbG9yIHNjcm9sbEFyZWFCYWNrZ3JvdW5kQ29sb3IoKSBjb25z dDsKKwogICAgIHZvaWQgdmlld1dpbGxTdGFydExpdmVSZXNpemUoKTsKICAgICB2b2lkIHZpZXdX aWxsRW5kTGl2ZVJlc2l6ZSgpOwogCg== 420766 2021-02-17 17:38:25 -0800 2021-02-17 17:59:30 -0800 Patch 222078.diff text/plain 9004 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nIGIvU291cmNlL1dURi9DaGFuZ2VMb2cK aW5kZXggM2M4NWZkODc5ZjlhLi5lMjg1M2FhZDBkNTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYv Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIw MjEtMDItMTcgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIEV4 cGVyaW1lbnQgd2l0aCB1c2luZyB0aGUgdGhlbWUtY29sb3IgYXMgdGhlIHNjcm9sbCBhcmVhIGJh Y2tncm91bmQgaWYgcHJvdmlkZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIyMjA3OAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzQxNTg4MTg+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgVGltIEhvcnRvbi4KKworICAgICAgICAqIFNjcmlwdHMvUHJl ZmVyZW5jZXMvV2ViUHJlZmVyZW5jZXNJbnRlcm5hbC55YW1sOgorCiAyMDIxLTAyLTE3ICBEZWFu IEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KIAogICAgICAgICBVc2UgZWxlbWVudCBmdWxsc2Ny ZWVuIGZvciB2aWRlbyBvbiBzb21lIGNvbmZpZ3VyYXRpb25zCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V1RGL1NjcmlwdHMvUHJlZmVyZW5jZXMvV2ViUHJlZmVyZW5jZXNJbnRlcm5hbC55YW1sIGIvU291 cmNlL1dURi9TY3JpcHRzL1ByZWZlcmVuY2VzL1dlYlByZWZlcmVuY2VzSW50ZXJuYWwueWFtbApp bmRleCA4Yzg3MzRiZDAzMjMuLmQwMTdkODkwMDM4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dURi9T Y3JpcHRzL1ByZWZlcmVuY2VzL1dlYlByZWZlcmVuY2VzSW50ZXJuYWwueWFtbAorKysgYi9Tb3Vy Y2UvV1RGL1NjcmlwdHMvUHJlZmVyZW5jZXMvV2ViUHJlZmVyZW5jZXNJbnRlcm5hbC55YW1sCkBA IC03NzUsNiArNzc1LDE2IEBAIFVzZUdQVVByb2Nlc3NGb3JXZWJHTEVuYWJsZWQ6CiAgICAgV2Vi S2l0OgogICAgICAgZGVmYXVsdDogZGVmYXVsdFVzZUdQVVByb2Nlc3NGb3JXZWJHTEVuYWJsZWQo KQogCitVc2VUaGVtZUNvbG9yRm9yU2Nyb2xsQXJlYUJhY2tncm91bmRDb2xvcjoKKyAgdHlwZTog Ym9vbAorICBodW1hblJlYWRhYmxlTmFtZTogIlVzZSB0aGVtZS1jb2xvciBmb3Igc2Nyb2xsIGFy ZWEgYmFja2dyb3VuZCBjb2xvciIKKyAgaHVtYW5SZWFkYWJsZURlc2NyaXB0aW9uOiAiVXNlIHRo ZW1lLWNvbG9yIGZvciBzY3JvbGwgYXJlYSBiYWNrZ3JvdW5kIGNvbG9yIgorICBkZWZhdWx0VmFs dWU6CisgICAgV2ViS2l0OgorICAgICAgZGVmYXVsdDogZmFsc2UKKyAgICBXZWJDb3JlOgorICAg ICAgZGVmYXVsdDogZmFsc2UKKwogIyBGSVhNRTogUmVtb3ZlIG9uY2UgPHJkYXI6Ly83MzgzMDk2 MT4gaGFzIGJlZW4gZml4ZWQKIFVzZWlUdW5lc0FWT3V0cHV0Q29udGV4dDoKICAgdHlwZTogYm9v bApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUv Q2hhbmdlTG9nCmluZGV4IDFhZjE0NzIwMGYwMC4uMWRlYmU3ZTUwOTZmIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjAgQEAKKzIwMjEtMDItMTcgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUu Y29tPgorCisgICAgICAgIEV4cGVyaW1lbnQgd2l0aCB1c2luZyB0aGUgdGhlbWUtY29sb3IgYXMg dGhlIHNjcm9sbCBhcmVhIGJhY2tncm91bmQgaWYgcHJvdmlkZWQKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMjA3OAorICAgICAgICA8cmRhcjovL3By b2JsZW0vNzQxNTg4MTg+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgVGltIEhvcnRvbi4KKworICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuaDoKKyAgICAgICAgKiByZW5k ZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlTGF5ZXJGb3JPdmVyaGFuZ0FyZWFzQmFja2dyb3VuZENv bG9yKTogQWRkZWQuCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6OnJv b3RCYWNrZ3JvdW5kQ29sb3JPclRyYW5zcGFyZW5jeUNoYW5nZWQpOgorCisgICAgICAgICogZG9t L0RvY3VtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50Ojpwcm9jZXNzVGhlbWVD b2xvcik6CisgICAgICAgIE5vdGlmeSB0aGUgYFJlbmRlckxheWVyQ29tcG9zaXRvcmAgd2hlbiBg PG1ldGEgbmFtZT0idGhlbWUtY29sb3IiIGNvbnRlbnQ9Ii4uLiI+YCBjaGFuZ2VzLgorCiAyMDIx LTAyLTE3ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9T XSB1cGRhdGUgbWVkaWEgY29udHJvbHMgdG8gdXNlIG5ldyBTRiBTeW1ib2xzCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0Rv Y3VtZW50LmNwcAppbmRleCAxYjlmNzI2NjM5MjEuLmFmOTBlZTZhYTkyNCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20v RG9jdW1lbnQuY3BwCkBAIC0zODMyLDYgKzM4MzIsMTMgQEAgdm9pZCBEb2N1bWVudDo6cHJvY2Vz c1RoZW1lQ29sb3IoY29uc3QgU3RyaW5nJiB0aGVtZUNvbG9yU3RyaW5nKQogCiAgICAgaWYgKGF1 dG8qIHBhZ2UgPSB0aGlzLT5wYWdlKCkpCiAgICAgICAgIHBhZ2UtPmNocm9tZSgpLmNsaWVudCgp LnRoZW1lQ29sb3JDaGFuZ2VkKG1fdGhlbWVDb2xvcik7CisKKyNpZiBFTkFCTEUoUlVCQkVSX0JB TkRJTkcpCisgICAgaWYgKGF1dG8qIHZpZXcgPSByZW5kZXJWaWV3KCkpIHsKKyAgICAgICAgaWYg KHZpZXctPnVzZXNDb21wb3NpdGluZygpKQorICAgICAgICAgICAgdmlldy0+Y29tcG9zaXRvcigp LnVwZGF0ZUxheWVyRm9yT3ZlcmhhbmdBcmVhc0JhY2tncm91bmRDb2xvcigpOworICAgIH0KKyNl bmRpZiAvLyBFTkFCTEUoUlVCQkVSX0JBTkRJTkcpCiB9CiAKICNpZiBFTkFCTEUoREFSS19NT0RF X0NTUykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNv bXBvc2l0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9z aXRvci5jcHAKaW5kZXggOWM4MDk0Nzg4NDhjLi5lMDMwNTU0NjU2OGEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCkBAIC0zODU3 LDcgKzM4NTcsMjQgQEAgR3JhcGhpY3NMYXllciogUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRh dGVMYXllckZvckZvb3Rlcihib29sIHdhbnRzTGF5ZXIpCiAgICAgcmV0dXJuIG1fbGF5ZXJGb3JG b290ZXIuZ2V0KCk7CiB9CiAKLSNlbmRpZgordm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnVw ZGF0ZUxheWVyRm9yT3ZlcmhhbmdBcmVhc0JhY2tncm91bmRDb2xvcigpCit7CisgICAgaWYgKCFt X2xheWVyRm9yT3ZlcmhhbmdBcmVhcykKKyAgICAgICAgcmV0dXJuOworCisgICAgQ29sb3IgYmFj a2dyb3VuZENvbG9yOworICAgIGlmIChwYWdlKCkuc2V0dGluZ3MoKS51c2VUaGVtZUNvbG9yRm9y U2Nyb2xsQXJlYUJhY2tncm91bmRDb2xvcigpKQorICAgICAgICBiYWNrZ3JvdW5kQ29sb3IgPSBw YWdlKCkudGhlbWVDb2xvcigpOworICAgIGlmICghYmFja2dyb3VuZENvbG9yLmlzVmFsaWQoKSkK KyAgICAgICAgYmFja2dyb3VuZENvbG9yID0gbV9yb290RXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3I7 CisKKyAgICBtX2xheWVyRm9yT3ZlcmhhbmdBcmVhcy0+c2V0QmFja2dyb3VuZENvbG9yKGJhY2tn cm91bmRDb2xvcik7CisKKyAgICBpZiAoIWJhY2tncm91bmRDb2xvci5pc1ZhbGlkKCkpCisgICAg ICAgIG1fbGF5ZXJGb3JPdmVyaGFuZ0FyZWFzLT5zZXRDdXN0b21BcHBlYXJhbmNlKEdyYXBoaWNz TGF5ZXI6OkN1c3RvbUFwcGVhcmFuY2U6OlNjcm9sbGluZ092ZXJoYW5nKTsKK30KKworI2VuZGlm IC8vIEVOQUJMRShSVUJCRVJfQkFORElORykKIAogYm9vbCBSZW5kZXJMYXllckNvbXBvc2l0b3I6 OnZpZXdOZWVkc1RvSW52YWxpZGF0ZUV2ZW50UmVnaW9uT2ZFbmNsb3NpbmdDb21wb3NpdGluZ0xh eWVyRm9yUmVwYWludCgpIGNvbnN0CiB7CkBAIC0zOTMzLDEyICszOTUwLDcgQEAgdm9pZCBSZW5k ZXJMYXllckNvbXBvc2l0b3I6OnJvb3RCYWNrZ3JvdW5kQ29sb3JPclRyYW5zcGFyZW5jeUNoYW5n ZWQoKQogICAgICAgICBwYWdlKCkuY2hyb21lKCkuY2xpZW50KCkucGFnZUV4dGVuZGVkQmFja2dy b3VuZENvbG9yRGlkQ2hhbmdlKG1fcm9vdEV4dGVuZGVkQmFja2dyb3VuZENvbG9yKTsKICAgICAg ICAgCiAjaWYgRU5BQkxFKFJVQkJFUl9CQU5ESU5HKQotICAgICAgICBpZiAobV9sYXllckZvck92 ZXJoYW5nQXJlYXMpIHsKLSAgICAgICAgICAgIG1fbGF5ZXJGb3JPdmVyaGFuZ0FyZWFzLT5zZXRC YWNrZ3JvdW5kQ29sb3IobV9yb290RXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3IpOwotCi0gICAgICAg ICAgICBpZiAoIW1fcm9vdEV4dGVuZGVkQmFja2dyb3VuZENvbG9yLmlzVmFsaWQoKSkKLSAgICAg ICAgICAgICAgICBtX2xheWVyRm9yT3ZlcmhhbmdBcmVhcy0+c2V0Q3VzdG9tQXBwZWFyYW5jZShH cmFwaGljc0xheWVyOjpDdXN0b21BcHBlYXJhbmNlOjpTY3JvbGxpbmdPdmVyaGFuZyk7Ci0gICAg ICAgIH0KKyAgICAgICAgdXBkYXRlTGF5ZXJGb3JPdmVyaGFuZ0FyZWFzQmFja2dyb3VuZENvbG9y KCk7CiAjZW5kaWYKICAgICB9CiAgICAgCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyTGF5ZXJDb21wb3NpdG9yLmgKaW5kZXggYzE1MWUyM2QwZWY2Li40MTAzNWI5MjJjNTUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0 b3IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9y LmgKQEAgLTM0Myw3ICszNDMsOSBAQCBwdWJsaWM6CiAgICAgR3JhcGhpY3NMYXllciogdXBkYXRl TGF5ZXJGb3JCb3R0b21PdmVyaGFuZ0FyZWEoYm9vbCB3YW50c0xheWVyKTsKICAgICBHcmFwaGlj c0xheWVyKiB1cGRhdGVMYXllckZvckhlYWRlcihib29sIHdhbnRzTGF5ZXIpOwogICAgIEdyYXBo aWNzTGF5ZXIqIHVwZGF0ZUxheWVyRm9yRm9vdGVyKGJvb2wgd2FudHNMYXllcik7Ci0jZW5kaWYK KworICAgIHZvaWQgdXBkYXRlTGF5ZXJGb3JPdmVyaGFuZ0FyZWFzQmFja2dyb3VuZENvbG9yKCk7 CisjZW5kaWYgLy8gRU5BQkxFKFJVQkJFUl9CQU5ESU5HKQogCiAgICAgLy8gRklYTUU6IG1ha2Ug dGhlIGNvb3JkaW5hdGVkL2FzeW5jIHRlcm1pbm9sb2d5IGNvbnNpc3RlbnQuCiAgICAgYm9vbCBp c1ZpZXdwb3J0Q29uc3RyYWluZWRGaXhlZE9yU3RpY2t5TGF5ZXIoY29uc3QgUmVuZGVyTGF5ZXIm KSBjb25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dl YktpdC9DaGFuZ2VMb2cKaW5kZXggZWM3YTcwZDFjZjU2Li5hMTk5MDBkZTYwOWMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMTkgQEAKKzIwMjEtMDItMTcgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBw bGUuY29tPgorCisgICAgICAgIEV4cGVyaW1lbnQgd2l0aCB1c2luZyB0aGUgdGhlbWUtY29sb3Ig YXMgdGhlIHNjcm9sbCBhcmVhIGJhY2tncm91bmQgaWYgcHJvdmlkZWQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMjA3OAorICAgICAgICA8cmRhcjov L3Byb2JsZW0vNzQxNTg4MTg+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgVGltIEhvcnRvbi4KKwor ICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvaW9zL1dLV2ViVmlld0lPUy5tbToKKyAgICAgICAgKGJh c2VTY3JvbGxWaWV3QmFja2dyb3VuZENvbG9yKToKKyAgICAgICAgKiBVSVByb2Nlc3MvVmlld1Nu YXBzaG90U3RvcmUuY3BwOgorICAgICAgICAoV2ViS2l0OjpWaWV3U25hcHNob3RTdG9yZTo6cmVj b3JkU25hcHNob3QpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKyAgICAg ICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYlBhZ2VQcm94eTo6 c2Nyb2xsQXJlYUJhY2tncm91bmRDb2xvcik6IEFkZGVkLgorCiAyMDIxLTAyLTE3ICBUcnVpdHQg U2F2ZWxsICA8dHNhdmVsbEBhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcmV2ZXJ0 aW5nIHIyNzI5MDUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvaW9z L1dLV2ViVmlld0lPUy5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9pb3MvV0tXZWJW aWV3SU9TLm1tCmluZGV4IDU5ZDQ0NjI2ZWE0NS4uNTMyOWQyNDhhMzBiIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvaW9zL1dLV2ViVmlld0lPUy5tbQorKysgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvaW9zL1dLV2ViVmlld0lPUy5tbQpAQCAtNDkyLDcgKzQ5 Miw3IEBAIHN0YXRpYyBXZWJDb3JlOjpDb2xvciBiYXNlU2Nyb2xsVmlld0JhY2tncm91bmRDb2xv cihXS1dlYlZpZXcgKndlYlZpZXcpCiAgICAgaWYgKCF3ZWJWaWV3LT5fcGFnZSkKICAgICAgICAg cmV0dXJuIHsgfTsKIAotICAgIHJldHVybiB3ZWJWaWV3LT5fcGFnZS0+cGFnZUV4dGVuZGVkQmFj a2dyb3VuZENvbG9yKCk7CisgICAgcmV0dXJuIHdlYlZpZXctPl9wYWdlLT5zY3JvbGxBcmVhQmFj a2dyb3VuZENvbG9yKCk7CiB9CiAKIHN0YXRpYyBXZWJDb3JlOjpDb2xvciBzY3JvbGxWaWV3QmFj a2dyb3VuZENvbG9yKFdLV2ViVmlldyAqd2ViVmlldykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1ZpZXdTbmFwc2hvdFN0b3JlLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1ZpZXdTbmFwc2hvdFN0b3JlLmNwcAppbmRleCAyMzMxOTJhOGYxNDEuLjQ4ZDk0NjMyNzU4 NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvVmlld1NuYXBzaG90U3RvcmUu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1ZpZXdTbmFwc2hvdFN0b3JlLmNwcApA QCAtOTUsNyArOTUsNyBAQCB2b2lkIFZpZXdTbmFwc2hvdFN0b3JlOjpyZWNvcmRTbmFwc2hvdChX ZWJQYWdlUHJveHkmIHdlYlBhZ2VQcm94eSwgV2ViQmFja0ZvcndhcgogCiAgICAgc25hcHNob3Qt PnNldFJlbmRlclRyZWVTaXplKHdlYlBhZ2VQcm94eS5yZW5kZXJUcmVlU2l6ZSgpKTsKICAgICBz bmFwc2hvdC0+c2V0RGV2aWNlU2NhbGVGYWN0b3Iod2ViUGFnZVByb3h5LmRldmljZVNjYWxlRmFj dG9yKCkpOwotICAgIHNuYXBzaG90LT5zZXRCYWNrZ3JvdW5kQ29sb3Iod2ViUGFnZVByb3h5LnBh Z2VFeHRlbmRlZEJhY2tncm91bmRDb2xvcigpKTsKKyAgICBzbmFwc2hvdC0+c2V0QmFja2dyb3Vu ZENvbG9yKHdlYlBhZ2VQcm94eS5zY3JvbGxBcmVhQmFja2dyb3VuZENvbG9yKCkpOwogICAgIHNu YXBzaG90LT5zZXRWaWV3U2Nyb2xsUG9zaXRpb24oV2ViQ29yZTo6cm91bmRlZEludFBvaW50KHdl YlBhZ2VQcm94eS52aWV3U2Nyb2xsUG9zaXRpb24oKSkpOwogCiAgICAgaXRlbS5zZXRTbmFwc2hv dChXVEZNb3ZlKHNuYXBzaG90KSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9XZWJQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5 LmNwcAppbmRleCBmOTYzYzg2OWRhN2UuLmU4ZWU5MDNmNWU3NyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCkBAIC0xOTA2LDYgKzE5MDYsMTQgQEAgdm9pZCBXZWJQ YWdlUHJveHk6OnNldFVuZGVybGF5Q29sb3IoY29uc3QgQ29sb3ImIGNvbG9yKQogICAgICAgICBz ZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpTZXRVbmRlcmxheUNvbG9yKGNvbG9yKSk7CiB9CiAKK0Nv bG9yIFdlYlBhZ2VQcm94eTo6c2Nyb2xsQXJlYUJhY2tncm91bmRDb2xvcigpIGNvbnN0Cit7Cisg ICAgaWYgKG1fcHJlZmVyZW5jZXMtPnVzZVRoZW1lQ29sb3JGb3JTY3JvbGxBcmVhQmFja2dyb3Vu ZENvbG9yKCkpCisgICAgICAgIHJldHVybiBtX3RoZW1lQ29sb3I7CisKKyAgICByZXR1cm4gbV9w YWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3I7Cit9CisKIHZvaWQgV2ViUGFnZVByb3h5Ojp2aWV3 V2lsbFN0YXJ0TGl2ZVJlc2l6ZSgpCiB7CiAgICAgaWYgKCFoYXNSdW5uaW5nUHJvY2VzcygpKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmggYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAppbmRleCAyOTI0MDZjOWJmNmMuLmUy ZDhkYjIzZmYyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVBy b3h5LmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKQEAgLTYz Nyw2ICs2MzcsOCBAQCBwdWJsaWM6CiAgICAgLy8gdGhlIG1lc3NhZ2UgZW50aXJlbHkuCiAgICAg V2ViQ29yZTo6Q29sb3IgcGFnZUV4dGVuZGVkQmFja2dyb3VuZENvbG9yKCkgY29uc3QgeyByZXR1 cm4gbV9wYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3I7IH0KIAorICAgIFdlYkNvcmU6OkNvbG9y IHNjcm9sbEFyZWFCYWNrZ3JvdW5kQ29sb3IoKSBjb25zdDsKKwogICAgIHZvaWQgdmlld1dpbGxT dGFydExpdmVSZXNpemUoKTsKICAgICB2b2lkIHZpZXdXaWxsRW5kTGl2ZVJlc2l6ZSgpOwogCg== 420774 2021-02-17 17:59:30 -0800 2021-02-18 10:38:21 -0800 Patch 222078.diff text/plain 9045 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nIGIvU291cmNlL1dURi9DaGFuZ2VMb2cK aW5kZXggM2M4NWZkODc5ZjlhLi5lMjg1M2FhZDBkNTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYv Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIw MjEtMDItMTcgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIEV4 cGVyaW1lbnQgd2l0aCB1c2luZyB0aGUgdGhlbWUtY29sb3IgYXMgdGhlIHNjcm9sbCBhcmVhIGJh Y2tncm91bmQgaWYgcHJvdmlkZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIyMjA3OAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzQxNTg4MTg+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgVGltIEhvcnRvbi4KKworICAgICAgICAqIFNjcmlwdHMvUHJl ZmVyZW5jZXMvV2ViUHJlZmVyZW5jZXNJbnRlcm5hbC55YW1sOgorCiAyMDIxLTAyLTE3ICBEZWFu IEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KIAogICAgICAgICBVc2UgZWxlbWVudCBmdWxsc2Ny ZWVuIGZvciB2aWRlbyBvbiBzb21lIGNvbmZpZ3VyYXRpb25zCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V1RGL1NjcmlwdHMvUHJlZmVyZW5jZXMvV2ViUHJlZmVyZW5jZXNJbnRlcm5hbC55YW1sIGIvU291 cmNlL1dURi9TY3JpcHRzL1ByZWZlcmVuY2VzL1dlYlByZWZlcmVuY2VzSW50ZXJuYWwueWFtbApp bmRleCA4Yzg3MzRiZDAzMjMuLmQwMTdkODkwMDM4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dURi9T Y3JpcHRzL1ByZWZlcmVuY2VzL1dlYlByZWZlcmVuY2VzSW50ZXJuYWwueWFtbAorKysgYi9Tb3Vy Y2UvV1RGL1NjcmlwdHMvUHJlZmVyZW5jZXMvV2ViUHJlZmVyZW5jZXNJbnRlcm5hbC55YW1sCkBA IC03NzUsNiArNzc1LDE4IEBAIFVzZUdQVVByb2Nlc3NGb3JXZWJHTEVuYWJsZWQ6CiAgICAgV2Vi S2l0OgogICAgICAgZGVmYXVsdDogZGVmYXVsdFVzZUdQVVByb2Nlc3NGb3JXZWJHTEVuYWJsZWQo KQogCitVc2VUaGVtZUNvbG9yRm9yU2Nyb2xsQXJlYUJhY2tncm91bmRDb2xvcjoKKyAgdHlwZTog Ym9vbAorICBodW1hblJlYWRhYmxlTmFtZTogIlVzZSB0aGVtZS1jb2xvciBmb3Igc2Nyb2xsIGFy ZWEgYmFja2dyb3VuZCBjb2xvciIKKyAgaHVtYW5SZWFkYWJsZURlc2NyaXB0aW9uOiAiVXNlIHRo ZW1lLWNvbG9yIGZvciBzY3JvbGwgYXJlYSBiYWNrZ3JvdW5kIGNvbG9yIgorICBkZWZhdWx0VmFs dWU6CisgICAgV2ViS2l0TGVnYWN5OgorICAgICAgZGVmYXVsdDogZmFsc2UKKyAgICBXZWJLaXQ6 CisgICAgICBkZWZhdWx0OiBmYWxzZQorICAgIFdlYkNvcmU6CisgICAgICBkZWZhdWx0OiBmYWxz ZQorCiAjIEZJWE1FOiBSZW1vdmUgb25jZSA8cmRhcjovLzczODMwOTYxPiBoYXMgYmVlbiBmaXhl ZAogVXNlaVR1bmVzQVZPdXRwdXRDb250ZXh0OgogICB0eXBlOiBib29sCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MWFmMTQ3MjAwZjAwLi4xZGViZTdlNTA5NmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAor MjAyMS0wMi0xNyAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CisKKyAgICAgICAg RXhwZXJpbWVudCB3aXRoIHVzaW5nIHRoZSB0aGVtZS1jb2xvciBhcyB0aGUgc2Nyb2xsIGFyZWEg YmFja2dyb3VuZCBpZiBwcm92aWRlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjIyMDc4CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS83NDE1ODgxOD4K KworICAgICAgICBSZXZpZXdlZCBieSBUaW0gSG9ydG9uLgorCisgICAgICAgICogcmVuZGVyaW5n L1JlbmRlckxheWVyQ29tcG9zaXRvci5oOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXll ckNvbXBvc2l0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9y Ojp1cGRhdGVMYXllckZvck92ZXJoYW5nQXJlYXNCYWNrZ3JvdW5kQ29sb3IpOiBBZGRlZC4KKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6cm9vdEJhY2tncm91bmRDb2xv ck9yVHJhbnNwYXJlbmN5Q2hhbmdlZCk6CisKKyAgICAgICAgKiBkb20vRG9jdW1lbnQuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OnByb2Nlc3NUaGVtZUNvbG9yKToKKyAgICAgICAg Tm90aWZ5IHRoZSBgUmVuZGVyTGF5ZXJDb21wb3NpdG9yYCB3aGVuIGA8bWV0YSBuYW1lPSJ0aGVt ZS1jb2xvciIgY29udGVudD0iLi4uIj5gIGNoYW5nZXMuCisKIDIwMjEtMDItMTcgIERldmluIFJv dXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgogCiAgICAgICAgIFtpT1NdIHVwZGF0ZSBtZWRpYSBj b250cm9scyB0byB1c2UgbmV3IFNGIFN5bWJvbHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2RvbS9Eb2N1bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCmluZGV4 IDFiOWY3MjY2MzkyMS4uYWY5MGVlNmFhOTI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9k b20vRG9jdW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKQEAg LTM4MzIsNiArMzgzMiwxMyBAQCB2b2lkIERvY3VtZW50Ojpwcm9jZXNzVGhlbWVDb2xvcihjb25z dCBTdHJpbmcmIHRoZW1lQ29sb3JTdHJpbmcpCiAKICAgICBpZiAoYXV0byogcGFnZSA9IHRoaXMt PnBhZ2UoKSkKICAgICAgICAgcGFnZS0+Y2hyb21lKCkuY2xpZW50KCkudGhlbWVDb2xvckNoYW5n ZWQobV90aGVtZUNvbG9yKTsKKworI2lmIEVOQUJMRShSVUJCRVJfQkFORElORykKKyAgICBpZiAo YXV0byogdmlldyA9IHJlbmRlclZpZXcoKSkgeworICAgICAgICBpZiAodmlldy0+dXNlc0NvbXBv c2l0aW5nKCkpCisgICAgICAgICAgICB2aWV3LT5jb21wb3NpdG9yKCkudXBkYXRlTGF5ZXJGb3JP dmVyaGFuZ0FyZWFzQmFja2dyb3VuZENvbG9yKCk7CisgICAgfQorI2VuZGlmIC8vIEVOQUJMRShS VUJCRVJfQkFORElORykKIH0KIAogI2lmIEVOQUJMRShEQVJLX01PREVfQ1NTKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAppbmRleCA5 YzgwOTQ3ODg0OGMuLmUwMzA1NTQ2NTY4YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKQEAgLTM4NTcsNyArMzg1NywyNCBAQCBH cmFwaGljc0xheWVyKiBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnVwZGF0ZUxheWVyRm9yRm9vdGVy KGJvb2wgd2FudHNMYXllcikKICAgICByZXR1cm4gbV9sYXllckZvckZvb3Rlci5nZXQoKTsKIH0K IAotI2VuZGlmCit2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlTGF5ZXJGb3JPdmVy aGFuZ0FyZWFzQmFja2dyb3VuZENvbG9yKCkKK3sKKyAgICBpZiAoIW1fbGF5ZXJGb3JPdmVyaGFu Z0FyZWFzKQorICAgICAgICByZXR1cm47CisKKyAgICBDb2xvciBiYWNrZ3JvdW5kQ29sb3I7Cisg ICAgaWYgKHBhZ2UoKS5zZXR0aW5ncygpLnVzZVRoZW1lQ29sb3JGb3JTY3JvbGxBcmVhQmFja2dy b3VuZENvbG9yKCkpCisgICAgICAgIGJhY2tncm91bmRDb2xvciA9IHBhZ2UoKS50aGVtZUNvbG9y KCk7CisgICAgaWYgKCFiYWNrZ3JvdW5kQ29sb3IuaXNWYWxpZCgpKQorICAgICAgICBiYWNrZ3Jv dW5kQ29sb3IgPSBtX3Jvb3RFeHRlbmRlZEJhY2tncm91bmRDb2xvcjsKKworICAgIG1fbGF5ZXJG b3JPdmVyaGFuZ0FyZWFzLT5zZXRCYWNrZ3JvdW5kQ29sb3IoYmFja2dyb3VuZENvbG9yKTsKKwor ICAgIGlmICghYmFja2dyb3VuZENvbG9yLmlzVmFsaWQoKSkKKyAgICAgICAgbV9sYXllckZvck92 ZXJoYW5nQXJlYXMtPnNldEN1c3RvbUFwcGVhcmFuY2UoR3JhcGhpY3NMYXllcjo6Q3VzdG9tQXBw ZWFyYW5jZTo6U2Nyb2xsaW5nT3ZlcmhhbmcpOworfQorCisjZW5kaWYgLy8gRU5BQkxFKFJVQkJF Ul9CQU5ESU5HKQogCiBib29sIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6dmlld05lZWRzVG9JbnZh bGlkYXRlRXZlbnRSZWdpb25PZkVuY2xvc2luZ0NvbXBvc2l0aW5nTGF5ZXJGb3JSZXBhaW50KCkg Y29uc3QKIHsKQEAgLTM5MzMsMTIgKzM5NTAsNyBAQCB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRv cjo6cm9vdEJhY2tncm91bmRDb2xvck9yVHJhbnNwYXJlbmN5Q2hhbmdlZCgpCiAgICAgICAgIHBh Z2UoKS5jaHJvbWUoKS5jbGllbnQoKS5wYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3JEaWRDaGFu Z2UobV9yb290RXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3IpOwogICAgICAgICAKICNpZiBFTkFCTEUo UlVCQkVSX0JBTkRJTkcpCi0gICAgICAgIGlmIChtX2xheWVyRm9yT3ZlcmhhbmdBcmVhcykgewot ICAgICAgICAgICAgbV9sYXllckZvck92ZXJoYW5nQXJlYXMtPnNldEJhY2tncm91bmRDb2xvciht X3Jvb3RFeHRlbmRlZEJhY2tncm91bmRDb2xvcik7Ci0KLSAgICAgICAgICAgIGlmICghbV9yb290 RXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3IuaXNWYWxpZCgpKQotICAgICAgICAgICAgICAgIG1fbGF5 ZXJGb3JPdmVyaGFuZ0FyZWFzLT5zZXRDdXN0b21BcHBlYXJhbmNlKEdyYXBoaWNzTGF5ZXI6OkN1 c3RvbUFwcGVhcmFuY2U6OlNjcm9sbGluZ092ZXJoYW5nKTsKLSAgICAgICAgfQorICAgICAgICB1 cGRhdGVMYXllckZvck92ZXJoYW5nQXJlYXNCYWNrZ3JvdW5kQ29sb3IoKTsKICNlbmRpZgogICAg IH0KICAgICAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXll ckNvbXBvc2l0b3IuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBv c2l0b3IuaAppbmRleCBjMTUxZTIzZDBlZjYuLjQxMDM1YjkyMmM1NSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuaApAQCAtMzQzLDcgKzM0 Myw5IEBAIHB1YmxpYzoKICAgICBHcmFwaGljc0xheWVyKiB1cGRhdGVMYXllckZvckJvdHRvbU92 ZXJoYW5nQXJlYShib29sIHdhbnRzTGF5ZXIpOwogICAgIEdyYXBoaWNzTGF5ZXIqIHVwZGF0ZUxh eWVyRm9ySGVhZGVyKGJvb2wgd2FudHNMYXllcik7CiAgICAgR3JhcGhpY3NMYXllciogdXBkYXRl TGF5ZXJGb3JGb290ZXIoYm9vbCB3YW50c0xheWVyKTsKLSNlbmRpZgorCisgICAgdm9pZCB1cGRh dGVMYXllckZvck92ZXJoYW5nQXJlYXNCYWNrZ3JvdW5kQ29sb3IoKTsKKyNlbmRpZiAvLyBFTkFC TEUoUlVCQkVSX0JBTkRJTkcpCiAKICAgICAvLyBGSVhNRTogbWFrZSB0aGUgY29vcmRpbmF0ZWQv YXN5bmMgdGVybWlub2xvZ3kgY29uc2lzdGVudC4KICAgICBib29sIGlzVmlld3BvcnRDb25zdHJh aW5lZEZpeGVkT3JTdGlja3lMYXllcihjb25zdCBSZW5kZXJMYXllciYpIGNvbnN0OwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpp bmRleCBlYzdhNzBkMWNmNTYuLmExOTkwMGRlNjA5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBA QAorMjAyMS0wMi0xNyAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CisKKyAgICAg ICAgRXhwZXJpbWVudCB3aXRoIHVzaW5nIHRoZSB0aGVtZS1jb2xvciBhcyB0aGUgc2Nyb2xsIGFy ZWEgYmFja2dyb3VuZCBpZiBwcm92aWRlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjIyMDc4CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS83NDE1ODgx OD4KKworICAgICAgICBSZXZpZXdlZCBieSBUaW0gSG9ydG9uLgorCisgICAgICAgICogVUlQcm9j ZXNzL0FQSS9pb3MvV0tXZWJWaWV3SU9TLm1tOgorICAgICAgICAoYmFzZVNjcm9sbFZpZXdCYWNr Z3JvdW5kQ29sb3IpOgorICAgICAgICAqIFVJUHJvY2Vzcy9WaWV3U25hcHNob3RTdG9yZS5jcHA6 CisgICAgICAgIChXZWJLaXQ6OlZpZXdTbmFwc2hvdFN0b3JlOjpyZWNvcmRTbmFwc2hvdCk6Cisg ICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9X ZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViUGFnZVByb3h5OjpzY3JvbGxBcmVhQmFja2dy b3VuZENvbG9yKTogQWRkZWQuCisKIDIwMjEtMDItMTcgIFRydWl0dCBTYXZlbGwgIDx0c2F2ZWxs QGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByZXZlcnRpbmcgcjI3MjkwNS4KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9pb3MvV0tXZWJWaWV3SU9TLm1t IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2lvcy9XS1dlYlZpZXdJT1MubW0KaW5kZXgg NTlkNDQ2MjZlYTQ1Li41MzI5ZDI0OGEzMGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9pb3MvV0tXZWJWaWV3SU9TLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0FQSS9pb3MvV0tXZWJWaWV3SU9TLm1tCkBAIC00OTIsNyArNDkyLDcgQEAgc3RhdGljIFdl YkNvcmU6OkNvbG9yIGJhc2VTY3JvbGxWaWV3QmFja2dyb3VuZENvbG9yKFdLV2ViVmlldyAqd2Vi VmlldykKICAgICBpZiAoIXdlYlZpZXctPl9wYWdlKQogICAgICAgICByZXR1cm4geyB9OwogCi0g ICAgcmV0dXJuIHdlYlZpZXctPl9wYWdlLT5wYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3IoKTsK KyAgICByZXR1cm4gd2ViVmlldy0+X3BhZ2UtPnNjcm9sbEFyZWFCYWNrZ3JvdW5kQ29sb3IoKTsK IH0KIAogc3RhdGljIFdlYkNvcmU6OkNvbG9yIHNjcm9sbFZpZXdCYWNrZ3JvdW5kQ29sb3IoV0tX ZWJWaWV3ICp3ZWJWaWV3KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvVmll d1NuYXBzaG90U3RvcmUuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvVmlld1NuYXBzaG90 U3RvcmUuY3BwCmluZGV4IDIzMzE5MmE4ZjE0MS4uNDhkOTQ2MzI3NTg0IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9WaWV3U25hcHNob3RTdG9yZS5jcHAKKysrIGIvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvVmlld1NuYXBzaG90U3RvcmUuY3BwCkBAIC05NSw3ICs5NSw3IEBA IHZvaWQgVmlld1NuYXBzaG90U3RvcmU6OnJlY29yZFNuYXBzaG90KFdlYlBhZ2VQcm94eSYgd2Vi UGFnZVByb3h5LCBXZWJCYWNrRm9yd2FyCiAKICAgICBzbmFwc2hvdC0+c2V0UmVuZGVyVHJlZVNp emUod2ViUGFnZVByb3h5LnJlbmRlclRyZWVTaXplKCkpOwogICAgIHNuYXBzaG90LT5zZXREZXZp Y2VTY2FsZUZhY3Rvcih3ZWJQYWdlUHJveHkuZGV2aWNlU2NhbGVGYWN0b3IoKSk7Ci0gICAgc25h cHNob3QtPnNldEJhY2tncm91bmRDb2xvcih3ZWJQYWdlUHJveHkucGFnZUV4dGVuZGVkQmFja2dy b3VuZENvbG9yKCkpOworICAgIHNuYXBzaG90LT5zZXRCYWNrZ3JvdW5kQ29sb3Iod2ViUGFnZVBy b3h5LnNjcm9sbEFyZWFCYWNrZ3JvdW5kQ29sb3IoKSk7CiAgICAgc25hcHNob3QtPnNldFZpZXdT Y3JvbGxQb3NpdGlvbihXZWJDb3JlOjpyb3VuZGVkSW50UG9pbnQod2ViUGFnZVByb3h5LnZpZXdT Y3JvbGxQb3NpdGlvbigpKSk7CiAKICAgICBpdGVtLnNldFNuYXBzaG90KFdURk1vdmUoc25hcHNo b3QpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5j cHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCmluZGV4IGY5NjNj ODY5ZGE3ZS4uZThlZTkwM2Y1ZTc3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9XZWJQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQ cm94eS5jcHAKQEAgLTE5MDYsNiArMTkwNiwxNCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6c2V0VW5k ZXJsYXlDb2xvcihjb25zdCBDb2xvciYgY29sb3IpCiAgICAgICAgIHNlbmQoTWVzc2FnZXM6Oldl YlBhZ2U6OlNldFVuZGVybGF5Q29sb3IoY29sb3IpKTsKIH0KIAorQ29sb3IgV2ViUGFnZVByb3h5 OjpzY3JvbGxBcmVhQmFja2dyb3VuZENvbG9yKCkgY29uc3QKK3sKKyAgICBpZiAobV9wcmVmZXJl bmNlcy0+dXNlVGhlbWVDb2xvckZvclNjcm9sbEFyZWFCYWNrZ3JvdW5kQ29sb3IoKSkKKyAgICAg ICAgcmV0dXJuIG1fdGhlbWVDb2xvcjsKKworICAgIHJldHVybiBtX3BhZ2VFeHRlbmRlZEJhY2tn cm91bmRDb2xvcjsKK30KKwogdm9pZCBXZWJQYWdlUHJveHk6OnZpZXdXaWxsU3RhcnRMaXZlUmVz aXplKCkKIHsKICAgICBpZiAoIWhhc1J1bm5pbmdQcm9jZXNzKCkpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1dlYlBhZ2VQcm94eS5oCmluZGV4IDI5MjQwNmM5YmY2Yy4uZTJkOGRiMjNmZjIzIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAorKysgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaApAQCAtNjM3LDYgKzYzNyw4IEBAIHB1 YmxpYzoKICAgICAvLyB0aGUgbWVzc2FnZSBlbnRpcmVseS4KICAgICBXZWJDb3JlOjpDb2xvciBw YWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3IoKSBjb25zdCB7IHJldHVybiBtX3BhZ2VFeHRlbmRl ZEJhY2tncm91bmRDb2xvcjsgfQogCisgICAgV2ViQ29yZTo6Q29sb3Igc2Nyb2xsQXJlYUJhY2tn cm91bmRDb2xvcigpIGNvbnN0OworCiAgICAgdm9pZCB2aWV3V2lsbFN0YXJ0TGl2ZVJlc2l6ZSgp OwogICAgIHZvaWQgdmlld1dpbGxFbmRMaXZlUmVzaXplKCk7CiAK