219808 2020-12-11 16:02:56 -0800 Introduce RenderLayerScrollableArea 2020-12-30 15:02:23 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zimmermann zimmermann alex annulen bfulgham changseok esprehn+autocc ews-watchlist fred.wang glenn gyuyoung.kim kondapallykalyan mjs pdr ryuan.choi sergio simon.fraser thorton webkit-bug-importer zalan oldest_to_newest 1714139 0 zimmermann 2020-12-11 16:02:56 -0800 All overflow/scroll related functionality should be moved out of RenderLayer, to cleanup and simplify the layer code. This allows to optimize for the case where a layer is not scrollable: we no longer have to keep track of many scrolling related conditions/variables and save a good amount of memory per layer. Plan: 1) Introduce RenderLayerScrollableArea inheriting from ScrollableArea, with a back-reference to RenderLayer -- that mimics the design of RenderLayerFilters. 2) RenderLayer no longer needs to inherit from ScrollableArea, instead it stores a RenderLayerScrollableArea object. 3) Move all overflow/scroll/marquee/resize/... handling from RenderLayer to RenderLayerScrollableArea 4) Only create RenderLayerScrollableArea objects if necessary! This requires heavy testing of the regular and composited code paths, which I had to perform in the past weeks. -- This ticket adds a RenderLayerScrollableArea stub implementation and adds it to all build systems. 1714145 1 416061 zimmermann 2020-12-11 16:08:19 -0800 Created attachment 416061 Patch 1714160 2 416067 zimmermann 2020-12-11 16:28:45 -0800 Created attachment 416067 Patch 1714167 3 416067 thorton 2020-12-11 16:41:28 -0800 Comment on attachment 416067 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=416067&action=review > Source/WebCore/rendering/RenderLayerScrollableArea.cpp:19 > + * of either the Mozilla Public License Version 1.1, found at This is a pretty odd license for WebKit, is it intentional? We tend to prefer BSD-2; https://webkit.org/licensing-webkit/ mentions the LGPL, and there is some LGPL code, but not sure about this MPL bit. I would check with someone to make sure this is right! 1714174 4 zimmermann 2020-12-11 16:52:51 -0800 (In reply to Tim Horton from comment #3) > Comment on attachment 416067 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=416067&action=review > > > Source/WebCore/rendering/RenderLayerScrollableArea.cpp:19 > > + * of either the Mozilla Public License Version 1.1, found at > > This is a pretty odd license for WebKit, is it intentional? We tend to > prefer BSD-2; https://webkit.org/licensing-webkit/ mentions the LGPL, and > there is some LGPL code, but not sure about this MPL bit. I would check with > someone to make sure this is right! I copy & pasted the license from RenderLayer, since RenderLayerScrollableArea will contain moved code from RenderLayer mostly, with slight adaptions (s/this/m_layer/). I assumed that I would need to preserve the original license, no? I'm not an expert on this topic, please enlighten me if that's incorrect. 1714175 5 thorton 2020-12-11 16:55:56 -0800 (In reply to Nikolas Zimmermann from comment #4) > (In reply to Tim Horton from comment #3) > > Comment on attachment 416067 [details] > > Patch > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=416067&action=review > > > > > Source/WebCore/rendering/RenderLayerScrollableArea.cpp:19 > > > + * of either the Mozilla Public License Version 1.1, found at > > > > This is a pretty odd license for WebKit, is it intentional? We tend to > > prefer BSD-2; https://webkit.org/licensing-webkit/ mentions the LGPL, and > > there is some LGPL code, but not sure about this MPL bit. I would check with > > someone to make sure this is right! > > I copy & pasted the license from RenderLayer, since > RenderLayerScrollableArea will contain moved code from RenderLayer mostly, > with slight adaptions (s/this/m_layer/). > > I assumed that I would need to preserve the original license, no? > I'm not an expert on this topic, please enlighten me if that's incorrect. Ah! In that case I think you probably want to pull the full copyright header along too. 1714182 6 zimmermann 2020-12-11 17:00:01 -0800 (In reply to Tim Horton from comment #5) > Ah! In that case I think you probably want to pull the full copyright header > along too. Fair enough, will include that in the next variant -- this doesn't build with clang atm anyhow :-) 1714280 7 416108 zimmermann 2020-12-12 14:01:30 -0800 Created attachment 416108 Patch 1715837 8 webkit-bug-importer 2020-12-18 16:04:47 -0800 <rdar://problem/72484180> 1716869 9 416108 zimmermann 2020-12-30 15:02:15 -0800 Comment on attachment 416108 Patch Clearing flags on attachment: 416108 Committed r271111: <https://trac.webkit.org/changeset/271111> 1716870 10 zimmermann 2020-12-30 15:02:23 -0800 All reviewed patches have been landed. Closing bug. 416061 2020-12-11 16:08:19 -0800 2020-12-11 16:28:45 -0800 Patch patch-stub-v1.diff text/plain 9174 zimmermann ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA5ZTJjNzRkZjQ0YjQuLjhlNjE1NjhmZmYzYyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDI5IEBACisyMDIwLTEyLTEyICBOaWtvbGFzIFppbW1lcm1hbm4gIDxuemltbWVybWFu bkBpZ2FsaWEuY29tPgorCisgICAgICAgIEludHJvZHVjZSBSZW5kZXJMYXllclNjcm9sbGFibGVB cmVhCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTk4 MDgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBPdmVy aGF1bCBSZW5kZXJMYXllcjoKKyAgICAgICAgVGhlIGdvYWwgaXMgdG8gbW92ZSBhbGwgb3ZlcmZs b3cvc2Nyb2xsLy4uLiBoYW5kbGluZworICAgICAgICBvdXQgb2YgUmVuZGVyTGF5ZXIsIHRvIHN0 cmVhbWxpbmUgaXRzIGludGVyZmFjZSBhbmQKKyAgICAgICAgbWFrZSBpdCByZS11c2FibGUgZm9y IGxheWVyIHR5cGVzIHRoYXQgZG8gbm90IG5lZWQKKyAgICAgICAgbm9yIHN1cHBvcnQgc2Nyb2xs aW5nL292ZXJmbG93LgorCisgICAgICAgIFRoaXMgcGF0Y2ggaW50cm9kdWNlcyBSZW5kZXJMYXll clNjcm9sbGFibGVBcmVhIGluaGVyaXRpbmcKKyAgICAgICAgZnJvbSBTY3JvbGxhYmxlQXJlYSwg d2l0aCBhIGJhY2stcmVmZXJlbmNlIHRvIFJlbmRlckxheWVyIC0tCisgICAgICAgIHRoYXQgbWlt aWNzIHRoZSBkZXNpZ24gb2YgUmVuZGVyTGF5ZXJGaWx0ZXJzLgorCisgICAgICAgIEZvbGxvdy11 cCBwYXRjaGVzIHdpbGwgbGFuZCB0aGUgYWN0dWFsIGltcGxlbWVudGF0aW9uLCB0aGlzCisgICAg ICAgIG9ubHkgYWRkcyBhIHN0dWIgYW5kIGFkZHMgaXQgdG8gdGhlIGJ1aWxkIHN5c3RlbXMuCisK KyAgICAgICAgTm8gZnVuY3Rpb25hbCBjaGFuZ2UgLSBubyBuZXcgdGVzdHMgbmVlZGVkLgorCisg ICAgICAgICogSGVhZGVycy5jbWFrZTogQWRkIFJlbmRlckxheWVyU2Nyb2xsYWJsZUFyZWEuKiB0 byBidWlsZC4KKyAgICAgICAgKiBTb3VyY2VzLnR4dDogRGl0dG8uCisgICAgICAgICogV2ViQ29y ZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOiBEaXR0by4KKwogMjAyMC0xMi0xMSAgWmFsYW4g QnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gVXNlIElubGlu ZVRleHRJdGVtOjpzaG91bGRQcmVzZXJ2ZVNwYWNlc0FuZFRhYnMgdGhyb3VnaG91dCB0aGUgaW5s aW5lIGxpbmUgbGF5b3V0IGNvZGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0hlYWRlcnMu Y21ha2UgYi9Tb3VyY2UvV2ViQ29yZS9IZWFkZXJzLmNtYWtlCmluZGV4IDAwOTBmNjQ1YjlkNS4u NWM0MThjN2RjOTYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9IZWFkZXJzLmNtYWtlCisr KyBiL1NvdXJjZS9XZWJDb3JlL0hlYWRlcnMuY21ha2UKQEAgLTE0ODYsNiArMTQ4Niw3IEBAIHNl dChXZWJDb3JlX1BSSVZBVEVfRlJBTUVXT1JLX0hFQURFUlMKICAgICByZW5kZXJpbmcvUmVuZGVy TGF5ZXJCYWNraW5nLmgKICAgICByZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmgKICAg ICByZW5kZXJpbmcvUmVuZGVyTGF5ZXJNb2RlbE9iamVjdC5oCisgICAgcmVuZGVyaW5nL1JlbmRl ckxheWVyU2Nyb2xsYWJsZUFyZWEuaAogICAgIHJlbmRlcmluZy9SZW5kZXJMaW5lQm94TGlzdC5o CiAgICAgcmVuZGVyaW5nL1JlbmRlck1lZGlhLmgKICAgICByZW5kZXJpbmcvUmVuZGVyT2JqZWN0 LmgKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1NvdXJjZXMudHh0IGIvU291cmNlL1dlYkNv cmUvU291cmNlcy50eHQKaW5kZXggYTQ5ZjM2ODJhMmYyLi5lZmViMjU0YzBmYjQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL1NvdXJjZXMudHh0CisrKyBiL1NvdXJjZS9XZWJDb3JlL1NvdXJj ZXMudHh0CkBAIC0yMjI3LDYgKzIyMjcsNyBAQCByZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5n LmNwcAogcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKIHJlbmRlcmluZy9SZW5k ZXJMYXllckZpbHRlcnMuY3BwCiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJNb2RlbE9iamVjdC5jcHAK K3JlbmRlcmluZy9SZW5kZXJMYXllclNjcm9sbGFibGVBcmVhLmNwcAogcmVuZGVyaW5nL1JlbmRl ckxheW91dFN0YXRlLmNwcAogcmVuZGVyaW5nL1JlbmRlckxpbmVCb3hMaXN0LmNwcAogcmVuZGVy aW5nL1JlbmRlckxpbmVCcmVhay5jcHAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNv cmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvaiBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNv ZGVwcm9qL3Byb2plY3QucGJ4cHJvagppbmRleCA1MjJhYzIzMDNkZGIuLjg3MjRjMjNmYjc0NCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhw cm9qCisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJv agpAQCAtNjA0Myw2ICs2MDQzLDggQEAKIAkJMEY0Q0RFQUEyM0Q5MUE4QTAwMjUxQjAyIC8qIFNj cm9sbFR5cGVzLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0S25vd25GaWxl VHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFNjcm9sbFR5cGVzLmNwcDsgc291cmNl VHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMEY1M0ZCODEyMTNCMUJCODAwQzQwRDM0IC8qIENTU0Zp bHRlci5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsg bGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBDU1NGaWx0ZXIu Y3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkwRjUzRkI4MzIxM0IxQkI4MDBDNDBE MzQgLyogQ1NTRmlsdGVyLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29k aW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IENTU0Zp bHRlci5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OworCQkwRjUzRkI4NDIxM0I3ODY0MDBD NDBEMzQgLyogUmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYS5oICovID0ge2lzYSA9IFBCWEZpbGVS ZWZlcmVuY2U7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBSZW5k ZXJMYXllclNjcm9sbGFibGVBcmVhLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCTBG NTNGQjgzMjEzQjc4NjQwMEM0MEQzNCAvKiBSZW5kZXJMYXllclNjcm9sbGFibGVBcmVhLmNwcCAq LyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNv ZGUuY3BwLmNwcDsgcGF0aCA9IFJlbmRlckxheWVyU2Nyb2xsYWJsZUFyZWEuY3BwOyBzb3VyY2VU cmVlID0gIjxncm91cD4iOyB9OwogCQkwRjUzRkI4OTIxM0I3Njg0MDBDNDBEMzQgLyogUmVuZGVy TGF5ZXJGaWx0ZXJzLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgbGFzdEtub3duRmls ZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFJlbmRlckxheWVyRmlsdGVycy5oOyBzb3Vy Y2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkwRjUzRkI4QjIxM0I3Njg0MDBDNDBEMzQgLyogUmVu ZGVyTGF5ZXJGaWx0ZXJzLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0S25v d25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFJlbmRlckxheWVyRmlsdGVy cy5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTBGNTREQ0UzMTg4MTA1MUQwMDNF RURCQiAvKiBUZXh0QXV0b1NpemluZy5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsg ZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7 IHBhdGggPSBUZXh0QXV0b1NpemluZy5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CkBA IC0yOTY3Myw2ICsyOTY3NSw4IEBACiAJCQkJMEY1M0ZCODkyMTNCNzY4NDAwQzQwRDM0IC8qIFJl bmRlckxheWVyRmlsdGVycy5oICovLAogCQkJCTNDMjQ0RkU1QTM3NUFDNjMzRjg4QkU2RiAvKiBS ZW5kZXJMYXllck1vZGVsT2JqZWN0LmNwcCAqLywKIAkJCQkzQzI0NEZFNEEzNzVBQzYzM0Y4OEJF NkYgLyogUmVuZGVyTGF5ZXJNb2RlbE9iamVjdC5oICovLAorCQkJCTBGNTNGQjgzMjEzQjc4NjQw MEM0MEQzNCAvKiBSZW5kZXJMYXllclNjcm9sbGFibGVBcmVhLmNwcCAqLywKKwkJCQkwRjUzRkI4 NDIxM0I3ODY0MDBDNDBEMzQgLyogUmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYS5oICovLAogCQkJ CTJEOTA2NjA0MEJFMTQxRDQwMDk1Njk5OCAvKiBSZW5kZXJMYXlvdXRTdGF0ZS5jcHAgKi8sCiAJ CQkJMkQ5MDY2MDUwQkUxNDFENDAwOTU2OTk4IC8qIFJlbmRlckxheW91dFN0YXRlLmggKi8sCiAJ CQkJQkMzM0ZCMUEwRjMwRUU4NTAwMkNERDdDIC8qIFJlbmRlckxpbmVCb3hMaXN0LmNwcCAqLywK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllclNjcm9sbGFi bGVBcmVhLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllclNjcm9sbGFi bGVBcmVhLmNwcApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAuLjI1NjBj ZjI5NDkyZgotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJMYXllclNjcm9sbGFibGVBcmVhLmNwcApAQCAtMCwwICsxLDQ3IEBACisvKgorICogQ29weXJp Z2h0IChDKSAyMDIwIElnYWxpYSBTLkwuCisgKgorICogVGhpcyBsaWJyYXJ5IGlzIGZyZWUgc29m dHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vcgorICogbW9kaWZ5IGl0IHVuZGVy IHRoZSB0ZXJtcyBvZiB0aGUgR05VIExlc3NlciBHZW5lcmFsIFB1YmxpYworICogTGljZW5zZSBh cyBwdWJsaXNoZWQgYnkgdGhlIEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbjsgZWl0aGVyCisgKiB2 ZXJzaW9uIDIuMSBvZiB0aGUgTGljZW5zZSwgb3IgKGF0IHlvdXIgb3B0aW9uKSBhbnkgbGF0ZXIg dmVyc2lvbi4KKyAqCisgKiBUaGlzIGxpYnJhcnkgaXMgZGlzdHJpYnV0ZWQgaW4gdGhlIGhvcGUg dGhhdCBpdCB3aWxsIGJlIHVzZWZ1bCwKKyAqIGJ1dCBXSVRIT1VUIEFOWSBXQVJSQU5UWTsgd2l0 aG91dCBldmVuIHRoZSBpbXBsaWVkIHdhcnJhbnR5IG9mCisgKiBNRVJDSEFOVEFCSUxJVFkgb3Ig RklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBVUlBPU0UuICBTZWUgdGhlIEdOVQorICogTGVzc2Vy IEdlbmVyYWwgUHVibGljIExpY2Vuc2UgZm9yIG1vcmUgZGV0YWlscy4KKyAqCisgKiBZb3Ugc2hv dWxkIGhhdmUgcmVjZWl2ZWQgYSBjb3B5IG9mIHRoZSBHTlUgTGVzc2VyIEdlbmVyYWwgUHVibGlj CisgKiBMaWNlbnNlIGFsb25nIHdpdGggdGhpcyBsaWJyYXJ5OyBpZiBub3QsIHdyaXRlIHRvIHRo ZSBGcmVlIFNvZnR3YXJlCisgKiBGb3VuZGF0aW9uLCBJbmMuLCA1MSBGcmFua2xpbiBTdHJlZXQs IEZpZnRoIEZsb29yLCBCb3N0b24sIE1BICAwMjExMC0xMzAxICBVU0EKKyAqCisgKiBBbHRlcm5h dGl2ZWx5LCB0aGUgY29udGVudHMgb2YgdGhpcyBmaWxlIG1heSBiZSB1c2VkIHVuZGVyIHRoZSB0 ZXJtcworICogb2YgZWl0aGVyIHRoZSBNb3ppbGxhIFB1YmxpYyBMaWNlbnNlIFZlcnNpb24gMS4x LCBmb3VuZCBhdAorICogaHR0cDovL3d3dy5tb3ppbGxhLm9yZy9NUEwvICh0aGUgIk1QTCIpIG9y IHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMKKyAqIExpY2Vuc2UgVmVyc2lvbiAyLjAsIGZvdW5kIGF0 IGh0dHA6Ly93d3cuZnNmLm9yZy9jb3B5bGVmdC9ncGwuaHRtbAorICogKHRoZSAiR1BMIiksIGlu IHdoaWNoIGNhc2UgdGhlIHByb3Zpc2lvbnMgb2YgdGhlIE1QTCBvciB0aGUgR1BMIGFyZQorICog YXBwbGljYWJsZSBpbnN0ZWFkIG9mIHRob3NlIGFib3ZlLiAgSWYgeW91IHdpc2ggdG8gYWxsb3cg dXNlIG9mIHlvdXIKKyAqIHZlcnNpb24gb2YgdGhpcyBmaWxlIG9ubHkgdW5kZXIgdGhlIHRlcm1z IG9mIG9uZSBvZiB0aG9zZSB0d28KKyAqIGxpY2Vuc2VzICh0aGUgTVBMIG9yIHRoZSBHUEwpIGFu ZCBub3QgdG8gYWxsb3cgb3RoZXJzIHRvIHVzZSB5b3VyCisgKiB2ZXJzaW9uIG9mIHRoaXMgZmls ZSB1bmRlciB0aGUgTEdQTCwgaW5kaWNhdGUgeW91ciBkZWNpc2lvbiBieQorICogZGVsZXRpbmd0 aGUgcHJvdmlzaW9ucyBhYm92ZSBhbmQgcmVwbGFjZSB0aGVtIHdpdGggdGhlIG5vdGljZSBhbmQK KyAqIG90aGVyIHByb3Zpc2lvbnMgcmVxdWlyZWQgYnkgdGhlIE1QTCBvciB0aGUgR1BMLCBhcyB0 aGUgY2FzZSBtYXkgYmUuCisgKiBJZiB5b3UgZG8gbm90IGRlbGV0ZSB0aGUgcHJvdmlzaW9ucyBh Ym92ZSwgYSByZWNpcGllbnQgbWF5IHVzZSB5b3VyCisgKiB2ZXJzaW9uIG9mIHRoaXMgZmlsZSB1 bmRlciBhbnkgb2YgdGhlIExHUEwsIHRoZSBNUEwgb3IgdGhlIEdQTC4KKyAqLworCisjaW5jbHVk ZSAiY29uZmlnLmgiCisjaW5jbHVkZSAiUmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYS5oIgorCitu YW1lc3BhY2UgV2ViQ29yZSB7CisKK1JlbmRlckxheWVyU2Nyb2xsYWJsZUFyZWE6OlJlbmRlckxh eWVyU2Nyb2xsYWJsZUFyZWEoUmVuZGVyTGF5ZXImIGxheWVyKQorICAgIDogbV9sYXllcihsYXll cikKK3sKK30KKworUmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYTo6flJlbmRlckxheWVyU2Nyb2xs YWJsZUFyZWEoKQoreworfQorCit9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYS5oIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyU2Nyb2xsYWJsZUFyZWEuaApuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAuLjA4ZjdlZDQ3Mjc3ZgotLS0gL2Rldi9u dWxsCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllclNjcm9sbGFibGVB cmVhLmgKQEAgLTAsMCArMSw1MCBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAyMCBJZ2FsaWEg Uy5MLgorICoKKyAqIFRoaXMgbGlicmFyeSBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlz dHJpYnV0ZSBpdCBhbmQvb3IKKyAqIG1vZGlmeSBpdCB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEdO VSBMZXNzZXIgR2VuZXJhbCBQdWJsaWMKKyAqIExpY2Vuc2UgYXMgcHVibGlzaGVkIGJ5IHRoZSBG cmVlIFNvZnR3YXJlIEZvdW5kYXRpb247IGVpdGhlcgorICogdmVyc2lvbiAyLjEgb2YgdGhlIExp Y2Vuc2UsIG9yIChhdCB5b3VyIG9wdGlvbikgYW55IGxhdGVyIHZlcnNpb24uCisgKgorICogVGhp cyBsaWJyYXJ5IGlzIGRpc3RyaWJ1dGVkIGluIHRoZSBob3BlIHRoYXQgaXQgd2lsbCBiZSB1c2Vm dWwsCisgKiBidXQgV0lUSE9VVCBBTlkgV0FSUkFOVFk7IHdpdGhvdXQgZXZlbiB0aGUgaW1wbGll ZCB3YXJyYW50eSBvZgorICogTUVSQ0hBTlRBQklMSVRZIG9yIEZJVE5FU1MgRk9SIEEgUEFSVElD VUxBUiBQVVJQT1NFLiAgU2VlIHRoZSBHTlUKKyAqIExlc3NlciBHZW5lcmFsIFB1YmxpYyBMaWNl bnNlIGZvciBtb3JlIGRldGFpbHMuCisgKgorICogWW91IHNob3VsZCBoYXZlIHJlY2VpdmVkIGEg Y29weSBvZiB0aGUgR05VIExlc3NlciBHZW5lcmFsIFB1YmxpYworICogTGljZW5zZSBhbG9uZyB3 aXRoIHRoaXMgbGlicmFyeTsgaWYgbm90LCB3cml0ZSB0byB0aGUgRnJlZSBTb2Z0d2FyZQorICog Rm91bmRhdGlvbiwgSW5jLiwgNTEgRnJhbmtsaW4gU3RyZWV0LCBGaWZ0aCBGbG9vciwgQm9zdG9u LCBNQSAgMDIxMTAtMTMwMSAgVVNBCisgKgorICogQWx0ZXJuYXRpdmVseSwgdGhlIGNvbnRlbnRz IG9mIHRoaXMgZmlsZSBtYXkgYmUgdXNlZCB1bmRlciB0aGUgdGVybXMKKyAqIG9mIGVpdGhlciB0 aGUgTW96aWxsYSBQdWJsaWMgTGljZW5zZSBWZXJzaW9uIDEuMSwgZm91bmQgYXQKKyAqIGh0dHA6 Ly93d3cubW96aWxsYS5vcmcvTVBMLyAodGhlICJNUEwiKSBvciB0aGUgR05VIEdlbmVyYWwgUHVi bGljCisgKiBMaWNlbnNlIFZlcnNpb24gMi4wLCBmb3VuZCBhdCBodHRwOi8vd3d3LmZzZi5vcmcv Y29weWxlZnQvZ3BsLmh0bWwKKyAqICh0aGUgIkdQTCIpLCBpbiB3aGljaCBjYXNlIHRoZSBwcm92 aXNpb25zIG9mIHRoZSBNUEwgb3IgdGhlIEdQTCBhcmUKKyAqIGFwcGxpY2FibGUgaW5zdGVhZCBv ZiB0aG9zZSBhYm92ZS4gIElmIHlvdSB3aXNoIHRvIGFsbG93IHVzZSBvZiB5b3VyCisgKiB2ZXJz aW9uIG9mIHRoaXMgZmlsZSBvbmx5IHVuZGVyIHRoZSB0ZXJtcyBvZiBvbmUgb2YgdGhvc2UgdHdv CisgKiBsaWNlbnNlcyAodGhlIE1QTCBvciB0aGUgR1BMKSBhbmQgbm90IHRvIGFsbG93IG90aGVy cyB0byB1c2UgeW91cgorICogdmVyc2lvbiBvZiB0aGlzIGZpbGUgdW5kZXIgdGhlIExHUEwsIGlu ZGljYXRlIHlvdXIgZGVjaXNpb24gYnkKKyAqIGRlbGV0aW5ndGhlIHByb3Zpc2lvbnMgYWJvdmUg YW5kIHJlcGxhY2UgdGhlbSB3aXRoIHRoZSBub3RpY2UgYW5kCisgKiBvdGhlciBwcm92aXNpb25z IHJlcXVpcmVkIGJ5IHRoZSBNUEwgb3IgdGhlIEdQTCwgYXMgdGhlIGNhc2UgbWF5IGJlLgorICog SWYgeW91IGRvIG5vdCBkZWxldGUgdGhlIHByb3Zpc2lvbnMgYWJvdmUsIGEgcmVjaXBpZW50IG1h eSB1c2UgeW91cgorICogdmVyc2lvbiBvZiB0aGlzIGZpbGUgdW5kZXIgYW55IG9mIHRoZSBMR1BM LCB0aGUgTVBMIG9yIHRoZSBHUEwuCisgKi8KKworI3ByYWdtYSBvbmNlCisKKyNpbmNsdWRlICJS ZW5kZXJMYXllci5oIgorI2luY2x1ZGUgIlNjcm9sbGFibGVBcmVhLmgiCisKK25hbWVzcGFjZSBX ZWJDb3JlIHsKKworY2xhc3MgUmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYSBmaW5hbCA6IHB1Ymxp YyBTY3JvbGxhYmxlQXJlYSB7CisgICAgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CitwdWJsaWM6 CisgICAgZXhwbGljaXQgUmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYShSZW5kZXJMYXllciYpOwor ICAgIHZpcnR1YWwgflJlbmRlckxheWVyU2Nyb2xsYWJsZUFyZWEoKTsKKworcHJpdmF0ZToKKyAg ICBSZW5kZXJMYXllciYgbV9sYXllcjsKK307CisKK30gLy8gbmFtZXNwYWNlIFdlYkNvcmUK 416067 2020-12-11 16:28:45 -0800 2020-12-12 14:01:30 -0800 Patch patch-stub-v2.diff text/plain 9585 zimmermann ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA5ZTJjNzRkZjQ0YjQuLjA2MTlmNTNmYzU4YSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDM0IEBACisyMDIwLTEyLTEyICBOaWtvbGFzIFppbW1lcm1hbm4gIDxuemltbWVybWFu bkBpZ2FsaWEuY29tPgorCisgICAgICAgIEludHJvZHVjZSBSZW5kZXJMYXllclNjcm9sbGFibGVB cmVhCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTk4 MDgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBPdmVy aGF1bCBSZW5kZXJMYXllcjoKKyAgICAgICAgVGhlIGdvYWwgaXMgdG8gbW92ZSBhbGwgb3ZlcmZs b3cvc2Nyb2xsLy4uLiBoYW5kbGluZworICAgICAgICBvdXQgb2YgUmVuZGVyTGF5ZXIsIHRvIHN0 cmVhbWxpbmUgaXRzIGludGVyZmFjZSBhbmQKKyAgICAgICAgbWFrZSBpdCByZS11c2FibGUgZm9y IGxheWVyIHR5cGVzIHRoYXQgZG8gbm90IG5lZWQKKyAgICAgICAgbm9yIHN1cHBvcnQgc2Nyb2xs aW5nL292ZXJmbG93LgorCisgICAgICAgIFRoaXMgcGF0Y2ggaW50cm9kdWNlcyBSZW5kZXJMYXll clNjcm9sbGFibGVBcmVhIGluaGVyaXRpbmcKKyAgICAgICAgZnJvbSBTY3JvbGxhYmxlQXJlYSwg d2l0aCBhIGJhY2stcmVmZXJlbmNlIHRvIFJlbmRlckxheWVyIC0tCisgICAgICAgIHRoYXQgbWlt aWNzIHRoZSBkZXNpZ24gb2YgUmVuZGVyTGF5ZXJGaWx0ZXJzLgorCisgICAgICAgIEZvbGxvdy11 cCBwYXRjaGVzIHdpbGwgbGFuZCB0aGUgYWN0dWFsIGltcGxlbWVudGF0aW9uLCB0aGlzCisgICAg ICAgIG9ubHkgYWRkcyBhIHN0dWIgYW5kIGFkZHMgaXQgdG8gdGhlIGJ1aWxkIHN5c3RlbXMuCisK KyAgICAgICAgTm8gZnVuY3Rpb25hbCBjaGFuZ2UgLSBubyBuZXcgdGVzdHMgbmVlZGVkLgorCisg ICAgICAgICogSGVhZGVycy5jbWFrZTogQWRkIFJlbmRlckxheWVyU2Nyb2xsYWJsZUFyZWEuKiB0 byBidWlsZC4KKyAgICAgICAgKiBTb3VyY2VzLnR4dDogRGl0dG8uCisgICAgICAgICogV2ViQ29y ZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOiBEaXR0by4KKyAgICAgICAgKiByZW5kZXJpbmcv UmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYS5jcHA6IEFkZGVkLgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYTo6UmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYSk6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllclNjcm9sbGFibGVBcmVhOjp+UmVuZGVyTGF5ZXJT Y3JvbGxhYmxlQXJlYSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllclNjcm9sbGFibGVB cmVhOjpzdHViKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJl YS5oOiBBZGRlZC4KKwogMjAyMC0xMi0xMSAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29t PgogCiAgICAgICAgIFtMRkNdW0lGQ10gVXNlIElubGluZVRleHRJdGVtOjpzaG91bGRQcmVzZXJ2 ZVNwYWNlc0FuZFRhYnMgdGhyb3VnaG91dCB0aGUgaW5saW5lIGxpbmUgbGF5b3V0IGNvZGUKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0hlYWRlcnMuY21ha2UgYi9Tb3VyY2UvV2ViQ29yZS9I ZWFkZXJzLmNtYWtlCmluZGV4IDAwOTBmNjQ1YjlkNS4uNWM0MThjN2RjOTYyIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9IZWFkZXJzLmNtYWtlCisrKyBiL1NvdXJjZS9XZWJDb3JlL0hlYWRl cnMuY21ha2UKQEAgLTE0ODYsNiArMTQ4Niw3IEBAIHNldChXZWJDb3JlX1BSSVZBVEVfRlJBTUVX T1JLX0hFQURFUlMKICAgICByZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmgKICAgICByZW5k ZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmgKICAgICByZW5kZXJpbmcvUmVuZGVyTGF5ZXJN b2RlbE9iamVjdC5oCisgICAgcmVuZGVyaW5nL1JlbmRlckxheWVyU2Nyb2xsYWJsZUFyZWEuaAog ICAgIHJlbmRlcmluZy9SZW5kZXJMaW5lQm94TGlzdC5oCiAgICAgcmVuZGVyaW5nL1JlbmRlck1l ZGlhLmgKICAgICByZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmgKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL1NvdXJjZXMudHh0IGIvU291cmNlL1dlYkNvcmUvU291cmNlcy50eHQKaW5kZXggYTQ5 ZjM2ODJhMmYyLi5lZmViMjU0YzBmYjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1NvdXJj ZXMudHh0CisrKyBiL1NvdXJjZS9XZWJDb3JlL1NvdXJjZXMudHh0CkBAIC0yMjI3LDYgKzIyMjcs NyBAQCByZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcAogcmVuZGVyaW5nL1JlbmRlckxh eWVyQ29tcG9zaXRvci5jcHAKIHJlbmRlcmluZy9SZW5kZXJMYXllckZpbHRlcnMuY3BwCiByZW5k ZXJpbmcvUmVuZGVyTGF5ZXJNb2RlbE9iamVjdC5jcHAKK3JlbmRlcmluZy9SZW5kZXJMYXllclNj cm9sbGFibGVBcmVhLmNwcAogcmVuZGVyaW5nL1JlbmRlckxheW91dFN0YXRlLmNwcAogcmVuZGVy aW5nL1JlbmRlckxpbmVCb3hMaXN0LmNwcAogcmVuZGVyaW5nL1JlbmRlckxpbmVCcmVhay5jcHAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4 cHJvaiBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpp bmRleCA1MjJhYzIzMDNkZGIuLjg3MjRjMjNmYjc0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCisrKyBiL1NvdXJjZS9XZWJDb3Jl L1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpAQCAtNjA0Myw2ICs2MDQzLDggQEAK IAkJMEY0Q0RFQUEyM0Q5MUE4QTAwMjUxQjAyIC8qIFNjcm9sbFR5cGVzLmNwcCAqLyA9IHtpc2Eg PSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNw cDsgcGF0aCA9IFNjcm9sbFR5cGVzLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJ MEY1M0ZCODEyMTNCMUJCODAwQzQwRDM0IC8qIENTU0ZpbHRlci5jcHAgKi8gPSB7aXNhID0gUEJY RmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3Vy Y2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBDU1NGaWx0ZXIuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91 cD4iOyB9OwogCQkwRjUzRkI4MzIxM0IxQkI4MDBDNDBEMzQgLyogQ1NTRmlsdGVyLmggKi8gPSB7 aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5 cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IENTU0ZpbHRlci5oOyBzb3VyY2VUcmVlID0gIjxn cm91cD4iOyB9OworCQkwRjUzRkI4NDIxM0I3ODY0MDBDNDBEMzQgLyogUmVuZGVyTGF5ZXJTY3Jv bGxhYmxlQXJlYS5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGxhc3RLbm93bkZpbGVU eXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBSZW5kZXJMYXllclNjcm9sbGFibGVBcmVhLmg7 IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCTBGNTNGQjgzMjEzQjc4NjQwMEM0MEQzNCAv KiBSZW5kZXJMYXllclNjcm9sbGFibGVBcmVhLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl bmNlOyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFJlbmRl ckxheWVyU2Nyb2xsYWJsZUFyZWEuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkw RjUzRkI4OTIxM0I3Njg0MDBDNDBEMzQgLyogUmVuZGVyTGF5ZXJGaWx0ZXJzLmggKi8gPSB7aXNh ID0gUEJYRmlsZVJlZmVyZW5jZTsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsg cGF0aCA9IFJlbmRlckxheWVyRmlsdGVycy5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9Owog CQkwRjUzRkI4QjIxM0I3Njg0MDBDNDBEMzQgLyogUmVuZGVyTGF5ZXJGaWx0ZXJzLmNwcCAqLyA9 IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUu Y3BwLmNwcDsgcGF0aCA9IFJlbmRlckxheWVyRmlsdGVycy5jcHA7IHNvdXJjZVRyZWUgPSAiPGdy b3VwPiI7IH07CiAJCTBGNTREQ0UzMTg4MTA1MUQwMDNFRURCQiAvKiBUZXh0QXV0b1NpemluZy5j cHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtu b3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBUZXh0QXV0b1NpemluZy5j cHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CkBAIC0yOTY3Myw2ICsyOTY3NSw4IEBACiAJ CQkJMEY1M0ZCODkyMTNCNzY4NDAwQzQwRDM0IC8qIFJlbmRlckxheWVyRmlsdGVycy5oICovLAog CQkJCTNDMjQ0RkU1QTM3NUFDNjMzRjg4QkU2RiAvKiBSZW5kZXJMYXllck1vZGVsT2JqZWN0LmNw cCAqLywKIAkJCQkzQzI0NEZFNEEzNzVBQzYzM0Y4OEJFNkYgLyogUmVuZGVyTGF5ZXJNb2RlbE9i amVjdC5oICovLAorCQkJCTBGNTNGQjgzMjEzQjc4NjQwMEM0MEQzNCAvKiBSZW5kZXJMYXllclNj cm9sbGFibGVBcmVhLmNwcCAqLywKKwkJCQkwRjUzRkI4NDIxM0I3ODY0MDBDNDBEMzQgLyogUmVu ZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYS5oICovLAogCQkJCTJEOTA2NjA0MEJFMTQxRDQwMDk1Njk5 OCAvKiBSZW5kZXJMYXlvdXRTdGF0ZS5jcHAgKi8sCiAJCQkJMkQ5MDY2MDUwQkUxNDFENDAwOTU2 OTk4IC8qIFJlbmRlckxheW91dFN0YXRlLmggKi8sCiAJCQkJQkMzM0ZCMUEwRjMwRUU4NTAwMkNE RDdDIC8qIFJlbmRlckxpbmVCb3hMaXN0LmNwcCAqLywKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllclNjcm9sbGFibGVBcmVhLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllclNjcm9sbGFibGVBcmVhLmNwcApuZXcgZmlsZSBtb2Rl IDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAuLmY2ZjZkNzJhMTg4MAotLS0gL2Rldi9udWxsCisr KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllclNjcm9sbGFibGVBcmVhLmNw cApAQCAtMCwwICsxLDUyIEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDIwIElnYWxpYSBTLkwu CisgKgorICogVGhpcyBsaWJyYXJ5IGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmli dXRlIGl0IGFuZC9vcgorICogbW9kaWZ5IGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIExl c3NlciBHZW5lcmFsIFB1YmxpYworICogTGljZW5zZSBhcyBwdWJsaXNoZWQgYnkgdGhlIEZyZWUg U29mdHdhcmUgRm91bmRhdGlvbjsgZWl0aGVyCisgKiB2ZXJzaW9uIDIuMSBvZiB0aGUgTGljZW5z ZSwgb3IgKGF0IHlvdXIgb3B0aW9uKSBhbnkgbGF0ZXIgdmVyc2lvbi4KKyAqCisgKiBUaGlzIGxp YnJhcnkgaXMgZGlzdHJpYnV0ZWQgaW4gdGhlIGhvcGUgdGhhdCBpdCB3aWxsIGJlIHVzZWZ1bCwK KyAqIGJ1dCBXSVRIT1VUIEFOWSBXQVJSQU5UWTsgd2l0aG91dCBldmVuIHRoZSBpbXBsaWVkIHdh cnJhbnR5IG9mCisgKiBNRVJDSEFOVEFCSUxJVFkgb3IgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFS IFBVUlBPU0UuICBTZWUgdGhlIEdOVQorICogTGVzc2VyIEdlbmVyYWwgUHVibGljIExpY2Vuc2Ug Zm9yIG1vcmUgZGV0YWlscy4KKyAqCisgKiBZb3Ugc2hvdWxkIGhhdmUgcmVjZWl2ZWQgYSBjb3B5 IG9mIHRoZSBHTlUgTGVzc2VyIEdlbmVyYWwgUHVibGljCisgKiBMaWNlbnNlIGFsb25nIHdpdGgg dGhpcyBsaWJyYXJ5OyBpZiBub3QsIHdyaXRlIHRvIHRoZSBGcmVlIFNvZnR3YXJlCisgKiBGb3Vu ZGF0aW9uLCBJbmMuLCA1MSBGcmFua2xpbiBTdHJlZXQsIEZpZnRoIEZsb29yLCBCb3N0b24sIE1B ICAwMjExMC0xMzAxICBVU0EKKyAqCisgKiBBbHRlcm5hdGl2ZWx5LCB0aGUgY29udGVudHMgb2Yg dGhpcyBmaWxlIG1heSBiZSB1c2VkIHVuZGVyIHRoZSB0ZXJtcworICogb2YgZWl0aGVyIHRoZSBN b3ppbGxhIFB1YmxpYyBMaWNlbnNlIFZlcnNpb24gMS4xLCBmb3VuZCBhdAorICogaHR0cDovL3d3 dy5tb3ppbGxhLm9yZy9NUEwvICh0aGUgIk1QTCIpIG9yIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMK KyAqIExpY2Vuc2UgVmVyc2lvbiAyLjAsIGZvdW5kIGF0IGh0dHA6Ly93d3cuZnNmLm9yZy9jb3B5 bGVmdC9ncGwuaHRtbAorICogKHRoZSAiR1BMIiksIGluIHdoaWNoIGNhc2UgdGhlIHByb3Zpc2lv bnMgb2YgdGhlIE1QTCBvciB0aGUgR1BMIGFyZQorICogYXBwbGljYWJsZSBpbnN0ZWFkIG9mIHRo b3NlIGFib3ZlLiAgSWYgeW91IHdpc2ggdG8gYWxsb3cgdXNlIG9mIHlvdXIKKyAqIHZlcnNpb24g b2YgdGhpcyBmaWxlIG9ubHkgdW5kZXIgdGhlIHRlcm1zIG9mIG9uZSBvZiB0aG9zZSB0d28KKyAq IGxpY2Vuc2VzICh0aGUgTVBMIG9yIHRoZSBHUEwpIGFuZCBub3QgdG8gYWxsb3cgb3RoZXJzIHRv IHVzZSB5b3VyCisgKiB2ZXJzaW9uIG9mIHRoaXMgZmlsZSB1bmRlciB0aGUgTEdQTCwgaW5kaWNh dGUgeW91ciBkZWNpc2lvbiBieQorICogZGVsZXRpbmd0aGUgcHJvdmlzaW9ucyBhYm92ZSBhbmQg cmVwbGFjZSB0aGVtIHdpdGggdGhlIG5vdGljZSBhbmQKKyAqIG90aGVyIHByb3Zpc2lvbnMgcmVx dWlyZWQgYnkgdGhlIE1QTCBvciB0aGUgR1BMLCBhcyB0aGUgY2FzZSBtYXkgYmUuCisgKiBJZiB5 b3UgZG8gbm90IGRlbGV0ZSB0aGUgcHJvdmlzaW9ucyBhYm92ZSwgYSByZWNpcGllbnQgbWF5IHVz ZSB5b3VyCisgKiB2ZXJzaW9uIG9mIHRoaXMgZmlsZSB1bmRlciBhbnkgb2YgdGhlIExHUEwsIHRo ZSBNUEwgb3IgdGhlIEdQTC4KKyAqLworCisjaW5jbHVkZSAiY29uZmlnLmgiCisjaW5jbHVkZSAi UmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYS5oIgorCituYW1lc3BhY2UgV2ViQ29yZSB7CisKK1Jl bmRlckxheWVyU2Nyb2xsYWJsZUFyZWE6OlJlbmRlckxheWVyU2Nyb2xsYWJsZUFyZWEoUmVuZGVy TGF5ZXImIGxheWVyKQorICAgIDogbV9sYXllcihsYXllcikKK3sKK30KKworUmVuZGVyTGF5ZXJT Y3JvbGxhYmxlQXJlYTo6flJlbmRlckxheWVyU2Nyb2xsYWJsZUFyZWEoKQoreworfQorCit2b2lk IFJlbmRlckxheWVyU2Nyb2xsYWJsZUFyZWE6OnN0dWIoKQoreworICAgIG1fbGF5ZXIucmVuZGVy ZXIoKTsKK30KKworfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyU2Nyb2xsYWJsZUFyZWEuaCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllclNjcm9sbGFibGVBcmVhLmgKbmV3IGZpbGUgbW9kZSAx MDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwLi5lY2E1MjVhMjAwMGYKLS0tIC9kZXYvbnVsbAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYS5oCkBA IC0wLDAgKzEsNTIgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMjAgSWdhbGlhIFMuTC4KKyAq CisgKiBUaGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUg aXQgYW5kL29yCisgKiBtb2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgTGVzc2Vy IEdlbmVyYWwgUHVibGljCisgKiBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBieSB0aGUgRnJlZSBTb2Z0 d2FyZSBGb3VuZGF0aW9uOyBlaXRoZXIKKyAqIHZlcnNpb24gMi4xIG9mIHRoZSBMaWNlbnNlLCBv ciAoYXQgeW91ciBvcHRpb24pIGFueSBsYXRlciB2ZXJzaW9uLgorICoKKyAqIFRoaXMgbGlicmFy eSBpcyBkaXN0cmlidXRlZCBpbiB0aGUgaG9wZSB0aGF0IGl0IHdpbGwgYmUgdXNlZnVsLAorICog YnV0IFdJVEhPVVQgQU5ZIFdBUlJBTlRZOyB3aXRob3V0IGV2ZW4gdGhlIGltcGxpZWQgd2FycmFu dHkgb2YKKyAqIE1FUkNIQU5UQUJJTElUWSBvciBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVS UE9TRS4gIFNlZSB0aGUgR05VCisgKiBMZXNzZXIgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBmb3Ig bW9yZSBkZXRhaWxzLgorICoKKyAqIFlvdSBzaG91bGQgaGF2ZSByZWNlaXZlZCBhIGNvcHkgb2Yg dGhlIEdOVSBMZXNzZXIgR2VuZXJhbCBQdWJsaWMKKyAqIExpY2Vuc2UgYWxvbmcgd2l0aCB0aGlz IGxpYnJhcnk7IGlmIG5vdCwgd3JpdGUgdG8gdGhlIEZyZWUgU29mdHdhcmUKKyAqIEZvdW5kYXRp b24sIEluYy4sIDUxIEZyYW5rbGluIFN0cmVldCwgRmlmdGggRmxvb3IsIEJvc3RvbiwgTUEgIDAy MTEwLTEzMDEgIFVTQQorICoKKyAqIEFsdGVybmF0aXZlbHksIHRoZSBjb250ZW50cyBvZiB0aGlz IGZpbGUgbWF5IGJlIHVzZWQgdW5kZXIgdGhlIHRlcm1zCisgKiBvZiBlaXRoZXIgdGhlIE1vemls bGEgUHVibGljIExpY2Vuc2UgVmVyc2lvbiAxLjEsIGZvdW5kIGF0CisgKiBodHRwOi8vd3d3Lm1v emlsbGEub3JnL01QTC8gKHRoZSAiTVBMIikgb3IgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYworICog TGljZW5zZSBWZXJzaW9uIDIuMCwgZm91bmQgYXQgaHR0cDovL3d3dy5mc2Yub3JnL2NvcHlsZWZ0 L2dwbC5odG1sCisgKiAodGhlICJHUEwiKSwgaW4gd2hpY2ggY2FzZSB0aGUgcHJvdmlzaW9ucyBv ZiB0aGUgTVBMIG9yIHRoZSBHUEwgYXJlCisgKiBhcHBsaWNhYmxlIGluc3RlYWQgb2YgdGhvc2Ug YWJvdmUuICBJZiB5b3Ugd2lzaCB0byBhbGxvdyB1c2Ugb2YgeW91cgorICogdmVyc2lvbiBvZiB0 aGlzIGZpbGUgb25seSB1bmRlciB0aGUgdGVybXMgb2Ygb25lIG9mIHRob3NlIHR3bworICogbGlj ZW5zZXMgKHRoZSBNUEwgb3IgdGhlIEdQTCkgYW5kIG5vdCB0byBhbGxvdyBvdGhlcnMgdG8gdXNl IHlvdXIKKyAqIHZlcnNpb24gb2YgdGhpcyBmaWxlIHVuZGVyIHRoZSBMR1BMLCBpbmRpY2F0ZSB5 b3VyIGRlY2lzaW9uIGJ5CisgKiBkZWxldGluZ3RoZSBwcm92aXNpb25zIGFib3ZlIGFuZCByZXBs YWNlIHRoZW0gd2l0aCB0aGUgbm90aWNlIGFuZAorICogb3RoZXIgcHJvdmlzaW9ucyByZXF1aXJl ZCBieSB0aGUgTVBMIG9yIHRoZSBHUEwsIGFzIHRoZSBjYXNlIG1heSBiZS4KKyAqIElmIHlvdSBk byBub3QgZGVsZXRlIHRoZSBwcm92aXNpb25zIGFib3ZlLCBhIHJlY2lwaWVudCBtYXkgdXNlIHlv dXIKKyAqIHZlcnNpb24gb2YgdGhpcyBmaWxlIHVuZGVyIGFueSBvZiB0aGUgTEdQTCwgdGhlIE1Q TCBvciB0aGUgR1BMLgorICovCisKKyNwcmFnbWEgb25jZQorCisjaW5jbHVkZSAiUmVuZGVyTGF5 ZXIuaCIKKyNpbmNsdWRlICJTY3JvbGxhYmxlQXJlYS5oIgorCituYW1lc3BhY2UgV2ViQ29yZSB7 CisKK2NsYXNzIFJlbmRlckxheWVyU2Nyb2xsYWJsZUFyZWEgZmluYWwgOiBwdWJsaWMgU2Nyb2xs YWJsZUFyZWEgeworICAgIFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOworcHVibGljOgorICAgIGV4 cGxpY2l0IFJlbmRlckxheWVyU2Nyb2xsYWJsZUFyZWEoUmVuZGVyTGF5ZXImKTsKKyAgICB2aXJ0 dWFsIH5SZW5kZXJMYXllclNjcm9sbGFibGVBcmVhKCk7CisKKyAgICB2b2lkIHN0dWIoKTsKKwor cHJpdmF0ZToKKyAgICBSZW5kZXJMYXllciYgbV9sYXllcjsKK307CisKK30gLy8gbmFtZXNwYWNl IFdlYkNvcmUK 416108 2020-12-12 14:01:30 -0800 2020-12-30 15:02:15 -0800 Patch patch-stub-v3.diff text/plain 10838 zimmermann ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA5ZTJjNzRkZjQ0YjQuLjg0ODM2OWZhOGIxNSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDM0IEBACisyMDIwLTEyLTEyICBOaWtvbGFzIFppbW1lcm1hbm4gIDxuemltbWVybWFu bkBpZ2FsaWEuY29tPgorCisgICAgICAgIEludHJvZHVjZSBSZW5kZXJMYXllclNjcm9sbGFibGVB cmVhCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTk4 MDgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBPdmVy aGF1bCBSZW5kZXJMYXllcjoKKyAgICAgICAgVGhlIGdvYWwgaXMgdG8gbW92ZSBhbGwgb3ZlcmZs b3cvc2Nyb2xsLy4uLiBoYW5kbGluZworICAgICAgICBvdXQgb2YgUmVuZGVyTGF5ZXIsIHRvIHN0 cmVhbWxpbmUgaXRzIGludGVyZmFjZSBhbmQKKyAgICAgICAgbWFrZSBpdCByZS11c2FibGUgZm9y IGxheWVyIHR5cGVzIHRoYXQgZG8gbm90IG5lZWQKKyAgICAgICAgbm9yIHN1cHBvcnQgc2Nyb2xs aW5nL292ZXJmbG93LgorCisgICAgICAgIFRoaXMgcGF0Y2ggaW50cm9kdWNlcyBSZW5kZXJMYXll clNjcm9sbGFibGVBcmVhIGluaGVyaXRpbmcKKyAgICAgICAgZnJvbSBTY3JvbGxhYmxlQXJlYSwg d2l0aCBhIGJhY2stcmVmZXJlbmNlIHRvIFJlbmRlckxheWVyIC0tCisgICAgICAgIHRoYXQgbWlt aWNzIHRoZSBkZXNpZ24gb2YgUmVuZGVyTGF5ZXJGaWx0ZXJzLgorCisgICAgICAgIEZvbGxvdy11 cCBwYXRjaGVzIHdpbGwgbGFuZCB0aGUgYWN0dWFsIGltcGxlbWVudGF0aW9uLCB0aGlzCisgICAg ICAgIG9ubHkgYWRkcyBhIHN0dWIgYW5kIGFkZHMgaXQgdG8gdGhlIGJ1aWxkIHN5c3RlbXMuCisK KyAgICAgICAgTm8gZnVuY3Rpb25hbCBjaGFuZ2UgLSBubyBuZXcgdGVzdHMgbmVlZGVkLgorCisg ICAgICAgICogSGVhZGVycy5jbWFrZTogQWRkIFJlbmRlckxheWVyU2Nyb2xsYWJsZUFyZWEuKiB0 byBidWlsZC4KKyAgICAgICAgKiBTb3VyY2VzLnR4dDogRGl0dG8uCisgICAgICAgICogV2ViQ29y ZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOiBEaXR0by4KKyAgICAgICAgKiByZW5kZXJpbmcv UmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYS5jcHA6IEFkZGVkLgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYTo6UmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYSk6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllclNjcm9sbGFibGVBcmVhOjp+UmVuZGVyTGF5ZXJT Y3JvbGxhYmxlQXJlYSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllclNjcm9sbGFibGVB cmVhOjpzaG91bGRQbGFjZUJsb2NrRGlyZWN0aW9uU2Nyb2xsYmFyT25MZWZ0IGNvbnN0KToKKyAg ICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYS5oOiBBZGRlZC4KKwog MjAyMC0xMi0xMSAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtM RkNdW0lGQ10gVXNlIElubGluZVRleHRJdGVtOjpzaG91bGRQcmVzZXJ2ZVNwYWNlc0FuZFRhYnMg dGhyb3VnaG91dCB0aGUgaW5saW5lIGxpbmUgbGF5b3V0IGNvZGUKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL0hlYWRlcnMuY21ha2UgYi9Tb3VyY2UvV2ViQ29yZS9IZWFkZXJzLmNtYWtlCmlu ZGV4IDAwOTBmNjQ1YjlkNS4uNWM0MThjN2RjOTYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9IZWFkZXJzLmNtYWtlCisrKyBiL1NvdXJjZS9XZWJDb3JlL0hlYWRlcnMuY21ha2UKQEAgLTE0 ODYsNiArMTQ4Niw3IEBAIHNldChXZWJDb3JlX1BSSVZBVEVfRlJBTUVXT1JLX0hFQURFUlMKICAg ICByZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmgKICAgICByZW5kZXJpbmcvUmVuZGVyTGF5 ZXJDb21wb3NpdG9yLmgKICAgICByZW5kZXJpbmcvUmVuZGVyTGF5ZXJNb2RlbE9iamVjdC5oCisg ICAgcmVuZGVyaW5nL1JlbmRlckxheWVyU2Nyb2xsYWJsZUFyZWEuaAogICAgIHJlbmRlcmluZy9S ZW5kZXJMaW5lQm94TGlzdC5oCiAgICAgcmVuZGVyaW5nL1JlbmRlck1lZGlhLmgKICAgICByZW5k ZXJpbmcvUmVuZGVyT2JqZWN0LmgKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1NvdXJjZXMu dHh0IGIvU291cmNlL1dlYkNvcmUvU291cmNlcy50eHQKaW5kZXggYTQ5ZjM2ODJhMmYyLi5lZmVi MjU0YzBmYjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1NvdXJjZXMudHh0CisrKyBiL1Nv dXJjZS9XZWJDb3JlL1NvdXJjZXMudHh0CkBAIC0yMjI3LDYgKzIyMjcsNyBAQCByZW5kZXJpbmcv UmVuZGVyTGF5ZXJCYWNraW5nLmNwcAogcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5j cHAKIHJlbmRlcmluZy9SZW5kZXJMYXllckZpbHRlcnMuY3BwCiByZW5kZXJpbmcvUmVuZGVyTGF5 ZXJNb2RlbE9iamVjdC5jcHAKK3JlbmRlcmluZy9SZW5kZXJMYXllclNjcm9sbGFibGVBcmVhLmNw cAogcmVuZGVyaW5nL1JlbmRlckxheW91dFN0YXRlLmNwcAogcmVuZGVyaW5nL1JlbmRlckxpbmVC b3hMaXN0LmNwcAogcmVuZGVyaW5nL1JlbmRlckxpbmVCcmVhay5jcHAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvaiBiL1NvdXJjZS9X ZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagppbmRleCA1MjJhYzIzMDNk ZGIuLjg3MjRjMjNmYjc0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29k ZXByb2ovcHJvamVjdC5wYnhwcm9qCisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVw cm9qL3Byb2plY3QucGJ4cHJvagpAQCAtNjA0Myw2ICs2MDQzLDggQEAKIAkJMEY0Q0RFQUEyM0Q5 MUE4QTAwMjUxQjAyIC8qIFNjcm9sbFR5cGVzLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl bmNlOyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFNjcm9s bFR5cGVzLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMEY1M0ZCODEyMTNCMUJC ODAwQzQwRDM0IC8qIENTU0ZpbHRlci5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsg ZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7 IHBhdGggPSBDU1NGaWx0ZXIuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkwRjUz RkI4MzIxM0IxQkI4MDBDNDBEMzQgLyogQ1NTRmlsdGVyLmggKi8gPSB7aXNhID0gUEJYRmlsZVJl ZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2Rl LmMuaDsgcGF0aCA9IENTU0ZpbHRlci5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OworCQkw RjUzRkI4NDIxM0I3ODY0MDBDNDBEMzQgLyogUmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYS5oICov ID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29k ZS5jLmg7IHBhdGggPSBSZW5kZXJMYXllclNjcm9sbGFibGVBcmVhLmg7IHNvdXJjZVRyZWUgPSAi PGdyb3VwPiI7IH07CisJCTBGNTNGQjgzMjEzQjc4NjQwMEM0MEQzNCAvKiBSZW5kZXJMYXllclNj cm9sbGFibGVBcmVhLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0S25vd25G aWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFJlbmRlckxheWVyU2Nyb2xsYWJs ZUFyZWEuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkwRjUzRkI4OTIxM0I3Njg0 MDBDNDBEMzQgLyogUmVuZGVyTGF5ZXJGaWx0ZXJzLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVy ZW5jZTsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFJlbmRlckxh eWVyRmlsdGVycy5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkwRjUzRkI4QjIxM0I3 Njg0MDBDNDBEMzQgLyogUmVuZGVyTGF5ZXJGaWx0ZXJzLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxl UmVmZXJlbmNlOyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9 IFJlbmRlckxheWVyRmlsdGVycy5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTBG NTREQ0UzMTg4MTA1MUQwMDNFRURCQiAvKiBUZXh0QXV0b1NpemluZy5jcHAgKi8gPSB7aXNhID0g UEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBz b3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBUZXh0QXV0b1NpemluZy5jcHA7IHNvdXJjZVRyZWUg PSAiPGdyb3VwPiI7IH07CkBAIC0yOTY3Myw2ICsyOTY3NSw4IEBACiAJCQkJMEY1M0ZCODkyMTNC NzY4NDAwQzQwRDM0IC8qIFJlbmRlckxheWVyRmlsdGVycy5oICovLAogCQkJCTNDMjQ0RkU1QTM3 NUFDNjMzRjg4QkU2RiAvKiBSZW5kZXJMYXllck1vZGVsT2JqZWN0LmNwcCAqLywKIAkJCQkzQzI0 NEZFNEEzNzVBQzYzM0Y4OEJFNkYgLyogUmVuZGVyTGF5ZXJNb2RlbE9iamVjdC5oICovLAorCQkJ CTBGNTNGQjgzMjEzQjc4NjQwMEM0MEQzNCAvKiBSZW5kZXJMYXllclNjcm9sbGFibGVBcmVhLmNw cCAqLywKKwkJCQkwRjUzRkI4NDIxM0I3ODY0MDBDNDBEMzQgLyogUmVuZGVyTGF5ZXJTY3JvbGxh YmxlQXJlYS5oICovLAogCQkJCTJEOTA2NjA0MEJFMTQxRDQwMDk1Njk5OCAvKiBSZW5kZXJMYXlv dXRTdGF0ZS5jcHAgKi8sCiAJCQkJMkQ5MDY2MDUwQkUxNDFENDAwOTU2OTk4IC8qIFJlbmRlckxh eW91dFN0YXRlLmggKi8sCiAJCQkJQkMzM0ZCMUEwRjMwRUU4NTAwMkNERDdDIC8qIFJlbmRlckxp bmVCb3hMaXN0LmNwcCAqLywKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJMYXllclNjcm9sbGFibGVBcmVhLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJMYXllclNjcm9sbGFibGVBcmVhLmNwcApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAw MDAwMDAwMDAwMDAuLjg5OTllMDAzN2ExNQotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllclNjcm9sbGFibGVBcmVhLmNwcApAQCAtMCwwICsxLDY1 IEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDA2LTIwMjAgQXBwbGUgSW5jLiBBbGwgcmlnaHRz IHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDE5IEFkb2JlLiBBbGwgcmlnaHRzIHJlc2Vy dmVkLgorICogQ29weXJpZ2h0IChDKSAyMDIwIElnYWxpYSBTLkwuCisgKgorICogUG9ydGlvbnMg YXJlIENvcHlyaWdodCAoQykgMTk5OCBOZXRzY2FwZSBDb21tdW5pY2F0aW9ucyBDb3Jwb3JhdGlv bi4KKyAqCisgKiBPdGhlciBjb250cmlidXRvcnM6CisgKiAgIFJvYmVydCBPJ0NhbGxhaGFuIDxy b2MrQGNzLmNtdS5lZHU+CisgKiAgIERhdmlkIEJhcm9uIDxkYmFyb25AZmFzLmhhcnZhcmQuZWR1 PgorICogICBDaHJpc3RpYW4gQmllc2luZ2VyIDxjYmllc2luZ2VyQHdlYi5kZT4KKyAqICAgUmFu ZGFsbCBKZXN1cCA8cmplc3VwQHdnYXRlLmNvbT4KKyAqICAgUm9sYW5kIE1haW56IDxyb2xhbmQu bWFpbnpAaW5mb3JtYXRpay5tZWQudW5pLWdpZXNzZW4uZGU+CisgKiAgIEpvc2ggU29yZWYgPHRp bWVsZXNzQG1hYy5jb20+CisgKiAgIEJvcmlzIFpiYXJza3kgPGJ6YmFyc2t5QG1pdC5lZHU+Cisg KgorICogVGhpcyBsaWJyYXJ5IGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRl IGl0IGFuZC9vcgorICogbW9kaWZ5IGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIExlc3Nl ciBHZW5lcmFsIFB1YmxpYworICogTGljZW5zZSBhcyBwdWJsaXNoZWQgYnkgdGhlIEZyZWUgU29m dHdhcmUgRm91bmRhdGlvbjsgZWl0aGVyCisgKiB2ZXJzaW9uIDIuMSBvZiB0aGUgTGljZW5zZSwg b3IgKGF0IHlvdXIgb3B0aW9uKSBhbnkgbGF0ZXIgdmVyc2lvbi4KKyAqCisgKiBUaGlzIGxpYnJh cnkgaXMgZGlzdHJpYnV0ZWQgaW4gdGhlIGhvcGUgdGhhdCBpdCB3aWxsIGJlIHVzZWZ1bCwKKyAq IGJ1dCBXSVRIT1VUIEFOWSBXQVJSQU5UWTsgd2l0aG91dCBldmVuIHRoZSBpbXBsaWVkIHdhcnJh bnR5IG9mCisgKiBNRVJDSEFOVEFCSUxJVFkgb3IgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBV UlBPU0UuICBTZWUgdGhlIEdOVQorICogTGVzc2VyIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgZm9y IG1vcmUgZGV0YWlscy4KKyAqCisgKiBZb3Ugc2hvdWxkIGhhdmUgcmVjZWl2ZWQgYSBjb3B5IG9m IHRoZSBHTlUgTGVzc2VyIEdlbmVyYWwgUHVibGljCisgKiBMaWNlbnNlIGFsb25nIHdpdGggdGhp cyBsaWJyYXJ5OyBpZiBub3QsIHdyaXRlIHRvIHRoZSBGcmVlIFNvZnR3YXJlCisgKiBGb3VuZGF0 aW9uLCBJbmMuLCA1MSBGcmFua2xpbiBTdHJlZXQsIEZpZnRoIEZsb29yLCBCb3N0b24sIE1BICAw MjExMC0xMzAxICBVU0EKKyAqCisgKiBBbHRlcm5hdGl2ZWx5LCB0aGUgY29udGVudHMgb2YgdGhp cyBmaWxlIG1heSBiZSB1c2VkIHVuZGVyIHRoZSB0ZXJtcworICogb2YgZWl0aGVyIHRoZSBNb3pp bGxhIFB1YmxpYyBMaWNlbnNlIFZlcnNpb24gMS4xLCBmb3VuZCBhdAorICogaHR0cDovL3d3dy5t b3ppbGxhLm9yZy9NUEwvICh0aGUgIk1QTCIpIG9yIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMKKyAq IExpY2Vuc2UgVmVyc2lvbiAyLjAsIGZvdW5kIGF0IGh0dHA6Ly93d3cuZnNmLm9yZy9jb3B5bGVm dC9ncGwuaHRtbAorICogKHRoZSAiR1BMIiksIGluIHdoaWNoIGNhc2UgdGhlIHByb3Zpc2lvbnMg b2YgdGhlIE1QTCBvciB0aGUgR1BMIGFyZQorICogYXBwbGljYWJsZSBpbnN0ZWFkIG9mIHRob3Nl IGFib3ZlLiAgSWYgeW91IHdpc2ggdG8gYWxsb3cgdXNlIG9mIHlvdXIKKyAqIHZlcnNpb24gb2Yg dGhpcyBmaWxlIG9ubHkgdW5kZXIgdGhlIHRlcm1zIG9mIG9uZSBvZiB0aG9zZSB0d28KKyAqIGxp Y2Vuc2VzICh0aGUgTVBMIG9yIHRoZSBHUEwpIGFuZCBub3QgdG8gYWxsb3cgb3RoZXJzIHRvIHVz ZSB5b3VyCisgKiB2ZXJzaW9uIG9mIHRoaXMgZmlsZSB1bmRlciB0aGUgTEdQTCwgaW5kaWNhdGUg eW91ciBkZWNpc2lvbiBieQorICogZGVsZXRpbmd0aGUgcHJvdmlzaW9ucyBhYm92ZSBhbmQgcmVw bGFjZSB0aGVtIHdpdGggdGhlIG5vdGljZSBhbmQKKyAqIG90aGVyIHByb3Zpc2lvbnMgcmVxdWly ZWQgYnkgdGhlIE1QTCBvciB0aGUgR1BMLCBhcyB0aGUgY2FzZSBtYXkgYmUuCisgKiBJZiB5b3Ug ZG8gbm90IGRlbGV0ZSB0aGUgcHJvdmlzaW9ucyBhYm92ZSwgYSByZWNpcGllbnQgbWF5IHVzZSB5 b3VyCisgKiB2ZXJzaW9uIG9mIHRoaXMgZmlsZSB1bmRlciBhbnkgb2YgdGhlIExHUEwsIHRoZSBN UEwgb3IgdGhlIEdQTC4KKyAqLworCisjaW5jbHVkZSAiY29uZmlnLmgiCisjaW5jbHVkZSAiUmVu ZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYS5oIgorCituYW1lc3BhY2UgV2ViQ29yZSB7CisKK1JlbmRl ckxheWVyU2Nyb2xsYWJsZUFyZWE6OlJlbmRlckxheWVyU2Nyb2xsYWJsZUFyZWEoUmVuZGVyTGF5 ZXImIGxheWVyKQorICAgIDogbV9sYXllcihsYXllcikKK3sKK30KKworUmVuZGVyTGF5ZXJTY3Jv bGxhYmxlQXJlYTo6flJlbmRlckxheWVyU2Nyb2xsYWJsZUFyZWEoKQoreworfQorCitib29sIFJl bmRlckxheWVyU2Nyb2xsYWJsZUFyZWE6OnNob3VsZFBsYWNlQmxvY2tEaXJlY3Rpb25TY3JvbGxi YXJPbkxlZnQoKSBjb25zdAoreworICAgIHJldHVybiBtX2xheWVyLnJlbmRlcmVyKCkuc2hvdWxk UGxhY2VCbG9ja0RpcmVjdGlvblNjcm9sbGJhck9uTGVmdCgpOworfQorCit9IC8vIG5hbWVzcGFj ZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5 ZXJTY3JvbGxhYmxlQXJlYS5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVy U2Nyb2xsYWJsZUFyZWEuaApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAu LjZkOWNkZWMyMjU1NwotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJMYXllclNjcm9sbGFibGVBcmVhLmgKQEAgLTAsMCArMSw2NSBAQAorLyoKKyAqIENv cHlyaWdodCAoQykgMjAwMywgMjAwOSwgMjAxMiwgMjAxNSBBcHBsZSBJbmMuIEFsbCByaWdodHMg cmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMjAgSWdhbGlhIFMuTC4KKyAqCisgKiBQb3J0 aW9ucyBhcmUgQ29weXJpZ2h0IChDKSAxOTk4IE5ldHNjYXBlIENvbW11bmljYXRpb25zIENvcnBv cmF0aW9uLgorICoKKyAqIE90aGVyIGNvbnRyaWJ1dG9yczoKKyAqICAgUm9iZXJ0IE8nQ2FsbGFo YW4gPHJvYytAY3MuY211LmVkdT4KKyAqICAgRGF2aWQgQmFyb24gPGRiYXJvbkBmYXMuaGFydmFy ZC5lZHU+CisgKiAgIENocmlzdGlhbiBCaWVzaW5nZXIgPGNiaWVzaW5nZXJAd2ViLmRlPgorICog ICBSYW5kYWxsIEplc3VwIDxyamVzdXBAd2dhdGUuY29tPgorICogICBSb2xhbmQgTWFpbnogPHJv bGFuZC5tYWluekBpbmZvcm1hdGlrLm1lZC51bmktZ2llc3Nlbi5kZT4KKyAqICAgSm9zaCBTb3Jl ZiA8dGltZWxlc3NAbWFjLmNvbT4KKyAqICAgQm9yaXMgWmJhcnNreSA8YnpiYXJza3lAbWl0LmVk dT4KKyAqCisgKiBUaGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3Ry aWJ1dGUgaXQgYW5kL29yCisgKiBtb2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUg TGVzc2VyIEdlbmVyYWwgUHVibGljCisgKiBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBieSB0aGUgRnJl ZSBTb2Z0d2FyZSBGb3VuZGF0aW9uOyBlaXRoZXIKKyAqIHZlcnNpb24gMi4xIG9mIHRoZSBMaWNl bnNlLCBvciAoYXQgeW91ciBvcHRpb24pIGFueSBsYXRlciB2ZXJzaW9uLgorICoKKyAqIFRoaXMg bGlicmFyeSBpcyBkaXN0cmlidXRlZCBpbiB0aGUgaG9wZSB0aGF0IGl0IHdpbGwgYmUgdXNlZnVs LAorICogYnV0IFdJVEhPVVQgQU5ZIFdBUlJBTlRZOyB3aXRob3V0IGV2ZW4gdGhlIGltcGxpZWQg d2FycmFudHkgb2YKKyAqIE1FUkNIQU5UQUJJTElUWSBvciBGSVRORVNTIEZPUiBBIFBBUlRJQ1VM QVIgUFVSUE9TRS4gIFNlZSB0aGUgR05VCisgKiBMZXNzZXIgR2VuZXJhbCBQdWJsaWMgTGljZW5z ZSBmb3IgbW9yZSBkZXRhaWxzLgorICoKKyAqIFlvdSBzaG91bGQgaGF2ZSByZWNlaXZlZCBhIGNv cHkgb2YgdGhlIEdOVSBMZXNzZXIgR2VuZXJhbCBQdWJsaWMKKyAqIExpY2Vuc2UgYWxvbmcgd2l0 aCB0aGlzIGxpYnJhcnk7IGlmIG5vdCwgd3JpdGUgdG8gdGhlIEZyZWUgU29mdHdhcmUKKyAqIEZv dW5kYXRpb24sIEluYy4sIDUxIEZyYW5rbGluIFN0cmVldCwgRmlmdGggRmxvb3IsIEJvc3Rvbiwg TUEgIDAyMTEwLTEzMDEgIFVTQQorICoKKyAqIEFsdGVybmF0aXZlbHksIHRoZSBjb250ZW50cyBv ZiB0aGlzIGZpbGUgbWF5IGJlIHVzZWQgdW5kZXIgdGhlIHRlcm1zCisgKiBvZiBlaXRoZXIgdGhl IE1vemlsbGEgUHVibGljIExpY2Vuc2UgVmVyc2lvbiAxLjEsIGZvdW5kIGF0CisgKiBodHRwOi8v d3d3Lm1vemlsbGEub3JnL01QTC8gKHRoZSAiTVBMIikgb3IgdGhlIEdOVSBHZW5lcmFsIFB1Ymxp YworICogTGljZW5zZSBWZXJzaW9uIDIuMCwgZm91bmQgYXQgaHR0cDovL3d3dy5mc2Yub3JnL2Nv cHlsZWZ0L2dwbC5odG1sCisgKiAodGhlICJHUEwiKSwgaW4gd2hpY2ggY2FzZSB0aGUgcHJvdmlz aW9ucyBvZiB0aGUgTVBMIG9yIHRoZSBHUEwgYXJlCisgKiBhcHBsaWNhYmxlIGluc3RlYWQgb2Yg dGhvc2UgYWJvdmUuICBJZiB5b3Ugd2lzaCB0byBhbGxvdyB1c2Ugb2YgeW91cgorICogdmVyc2lv biBvZiB0aGlzIGZpbGUgb25seSB1bmRlciB0aGUgdGVybXMgb2Ygb25lIG9mIHRob3NlIHR3bwor ICogbGljZW5zZXMgKHRoZSBNUEwgb3IgdGhlIEdQTCkgYW5kIG5vdCB0byBhbGxvdyBvdGhlcnMg dG8gdXNlIHlvdXIKKyAqIHZlcnNpb24gb2YgdGhpcyBmaWxlIHVuZGVyIHRoZSBMR1BMLCBpbmRp Y2F0ZSB5b3VyIGRlY2lzaW9uIGJ5CisgKiBkZWxldGluZ3RoZSBwcm92aXNpb25zIGFib3ZlIGFu ZCByZXBsYWNlIHRoZW0gd2l0aCB0aGUgbm90aWNlIGFuZAorICogb3RoZXIgcHJvdmlzaW9ucyBy ZXF1aXJlZCBieSB0aGUgTVBMIG9yIHRoZSBHUEwsIGFzIHRoZSBjYXNlIG1heSBiZS4KKyAqIElm IHlvdSBkbyBub3QgZGVsZXRlIHRoZSBwcm92aXNpb25zIGFib3ZlLCBhIHJlY2lwaWVudCBtYXkg dXNlIHlvdXIKKyAqIHZlcnNpb24gb2YgdGhpcyBmaWxlIHVuZGVyIGFueSBvZiB0aGUgTEdQTCwg dGhlIE1QTCBvciB0aGUgR1BMLgorICovCisKKyNwcmFnbWEgb25jZQorCisjaW5jbHVkZSAiUmVu ZGVyTGF5ZXIuaCIKKyNpbmNsdWRlICJTY3JvbGxhYmxlQXJlYS5oIgorCituYW1lc3BhY2UgV2Vi Q29yZSB7CisKKy8vIEZJWE1FOiBNYXJrIGFzICdmaW5hbCcgb25jZSB0aGUgYWN0dWFsIGltcGxl bWVudGF0aW9uIGxhbmRzLgorY2xhc3MgUmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYSA6IHB1Ymxp YyBTY3JvbGxhYmxlQXJlYSB7CisgICAgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CitwdWJsaWM6 CisgICAgZXhwbGljaXQgUmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYShSZW5kZXJMYXllciYpOwor ICAgIHZpcnR1YWwgflJlbmRlckxheWVyU2Nyb2xsYWJsZUFyZWEoKTsKKworICAgIGJvb2wgc2hv dWxkUGxhY2VCbG9ja0RpcmVjdGlvblNjcm9sbGJhck9uTGVmdCgpIGNvbnN0IGZpbmFsOworCitw cml2YXRlOgorICAgIFJlbmRlckxheWVyJiBtX2xheWVyOworfTsKKworfSAvLyBuYW1lc3BhY2Ug V2ViQ29yZQo=