200374 2019-08-01 19:00:44 -0700 Add to InteractionInformationAtPosition information about whether the element is in a subscrollable region 2019-08-08 16:02:00 -0700 1 1 1 Unclassified WebKit Scrolling WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser commit-queue dino simon.fraser thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1557832 0 simon.fraser 2019-08-01 19:00:44 -0700 Add to InteractionInformationAtPosition information about whether the element is in a subscrollable or fixed region 1557833 1 375378 simon.fraser 2019-08-01 19:03:13 -0700 Created attachment 375378 Patch 1559657 2 webkit-bug-importer 2019-08-08 14:08:38 -0700 <rdar://problem/54095519> 1559663 3 375839 simon.fraser 2019-08-08 14:38:49 -0700 Created attachment 375839 Patch 1559697 4 simon.fraser 2019-08-08 16:02:00 -0700 https://trac.webkit.org/r248447 375378 2019-08-01 19:03:13 -0700 2019-08-08 14:38:49 -0700 Patch bug-200374-20190801190312.patch text/plain 9838 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ4MDc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzRkYWYwNGRkN2JkN2Uy NjcyOTg1OWYxNjg0OTQyMDc4YTc5ZGQyMC4uYjFkMDQ0ZDVkNTZiMzZjMWE1NjJiOWVlZjFiODAw MjRiZGIwMTljNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE5LTA4LTAxICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIEFkZCB0byBJbnRl cmFjdGlvbkluZm9ybWF0aW9uQXRQb3NpdGlvbiBpbmZvcm1hdGlvbiBhYm91dCB3aGV0aGVyIHRo ZSBlbGVtZW50IGlzIGluIGEgc3Vic2Nyb2xsYWJsZSBvciBmaXhlZCByZWdpb24KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMDM3NAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZvciBlbGVtZW50IHByZXZp ZXcgaW50ZXJhY3Rpb25zLCB3ZSB3aWxsIG5lZWQgaW5mb3JtYXRpb24gYWJvdXQgd2hldGhlciB0 aGUgZWxlbWVudCBiZWluZyBpbnRlcmFjdGVkIHdpdGggaXMKKyAgICAgICAgaW5zaWRlIGFzeW5j IG92ZXJmbG93OnNjcm9sbCwgaW4gYSBzdWJmcmFtZSwgb3IgaW5zaWRlIGZpeGVkIHBvc2l0aW9u LCBzbyBwbHVtYiB0aGlzIHRocm91Z2ggaW4gSW50ZXJhY3Rpb25JbmZvcm1hdGlvbkF0UG9zaXRp b24uCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyTGF5ZXI6OmNvbnRhaW5lZEluQXN5bmNTY3JvbGxhYmxlQW5jZXN0b3IgY29u c3QpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllci5oOgorICAgICAgICAqIHJlbmRl cmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy TGF5ZXJDb21wb3NpdG9yOjpjb250YWluZWRJbkFzeW5jU2Nyb2xsYWJsZUFuY2VzdG9yKToKKyAg ICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmg6CisKIDIwMTktMDctMzEg IFNhYW0gQmFyYXRpICA8c2JhcmF0aUBhcHBsZS5jb20+CiAKICAgICAgICAgW1dITFNMIFJlbW92 ZSBjaGFyL3Nob3J0L2hhbGYgdHlwZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdl TG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggNzViMzgxNDgxMThmMTYzMTZkNjk4 MGM3Yjc0ZTc1ZGM3ZDAzNDBkYy4uZDdiOGNlOTI3ZWIxNzE0ZDU4NmVlZDFlMDQ1NWFlODVkZmQy MDA5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl YktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxOS0wOC0wMSAgU2ltb24gRnJhc2Vy ICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgdG8gSW50ZXJhY3Rpb25J bmZvcm1hdGlvbkF0UG9zaXRpb24gaW5mb3JtYXRpb24gYWJvdXQgd2hldGhlciB0aGUgZWxlbWVu dCBpcyBpbiBhIHN1YnNjcm9sbGFibGUgb3IgZml4ZWQgcmVnaW9uCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDAzNzQKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAgICAgICAgCisgICAgICAgIEZvciBlbGVtZW50IHByZXZp ZXcgaW50ZXJhY3Rpb25zLCB3ZSB3aWxsIG5lZWQgaW5mb3JtYXRpb24gYWJvdXQgd2hldGhlciB0 aGUgZWxlbWVudCBiZWluZyBpbnRlcmFjdGVkIHdpdGggaXMKKyAgICAgICAgaW5zaWRlIGFzeW5j IG92ZXJmbG93OnNjcm9sbCwgaW4gYSBzdWJmcmFtZSwgb3IgaW5zaWRlIGZpeGVkIHBvc2l0aW9u LCBzbyBwbHVtYiB0aGlzIHRocm91Z2ggaW4gSW50ZXJhY3Rpb25JbmZvcm1hdGlvbkF0UG9zaXRp b24uCisKKyAgICAgICAgKiBTaGFyZWQvaW9zL0ludGVyYWN0aW9uSW5mb3JtYXRpb25BdFBvc2l0 aW9uLmg6CisgICAgICAgICogU2hhcmVkL2lvcy9JbnRlcmFjdGlvbkluZm9ybWF0aW9uQXRQb3Np dGlvbi5tbToKKyAgICAgICAgKFdlYktpdDo6SW50ZXJhY3Rpb25JbmZvcm1hdGlvbkF0UG9zaXRp b246OmVuY29kZSBjb25zdCk6CisgICAgICAgIChXZWJLaXQ6OkludGVyYWN0aW9uSW5mb3JtYXRp b25BdFBvc2l0aW9uOjpkZWNvZGUpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9pb3Mv V2ViUGFnZUlPUy5tbToKKyAgICAgICAgKFdlYktpdDo6ZWxlbWVudFBvc2l0aW9uSW5mb3JtYXRp b24pOgorCiAyMDE5LTA3LTMxICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAg ICAgICAgUkVHUkVTU0lPTiAocjI0NzQ4Nj8pOiBGbGFreSBBUEkgVGVzdCBUZXN0V2ViS2l0QVBJ LldLV2ViVmlldy5Mb2NhbFN0b3JhZ2VQcm9jZXNzU3VzcGVuZHMKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCmluZGV4IDI3NmNlODI3MmJjZGIzMzY0NTQxZGU0NjExMmYy YTNmOTc0MTAxNzEuLmE4Zjg3YTJjMWUyYTgyNjE0NDdiOWE3ZDVmZTRhN2E4MjZlZmYyNDAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcApAQCAtMjMzNCw2ICsyMzM0 LDExIEBAIGJvb2wgUmVuZGVyTGF5ZXI6OnVzZXNBc3luY1Njcm9sbGluZygpIGNvbnN0CiAgICAg cmV0dXJuIGNvbXBvc2l0b3IoKS51c2VDb29yZGluYXRlZFNjcm9sbGluZ0ZvckxheWVyKCp0aGlz KTsKIH0KIAorYm9vbCBSZW5kZXJMYXllcjo6Y29udGFpbmVkSW5Bc3luY1Njcm9sbGFibGVBbmNl c3RvcigpIGNvbnN0Cit7CisgICAgcmV0dXJuIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6Y29udGFp bmVkSW5Bc3luY1Njcm9sbGFibGVBbmNlc3RvcigqdGhpcyk7Cit9CisKIHN0YXRpYyBpbmxpbmUg aW50IGFkanVzdGVkU2Nyb2xsRGVsdGEoaW50IGJlZ2lubmluZ0RlbHRhKQogewogICAgIC8vIFRo aXMgaW1wbGVtZW50aW9uIG1hdGNoZXMgRmlyZWZveCdzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyTGF5ZXIuaAppbmRleCBlMzFhYmI4NzYzMGZmNmVmZjdkNDYwZmExZTNiMmUxMjJiOTBi NjU5Li5iNGQ1OWU2YzQwZWRmMDE4ZjE3Yzc2MmE3NjM5ZWFmY2Q5MmFiYTY2IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaApAQCAtNDkzLDcgKzQ5Myw3IEBAIHB1YmxpYzoK ICAgICAvLyBSZXR1cm5zIHRydWUgd2hlbiB0aGUgbGF5ZXIgY291bGQgZG8gdG91Y2ggc2Nyb2xs aW5nLCBidXQgZG9lc24ndCBsb29rIGF0IHdoZXRoZXIgdGhlcmUgaXMgYWN0dWFsbHkgc2Nyb2xs YWJsZSBvdmVyZmxvdy4KICAgICBib29sIGNhblVzZUNvbXBvc2l0ZWRTY3JvbGxpbmcoKSBjb25z dDsKICAgICAvLyBSZXR1cm5zIHRydWUgd2hlbiB0aGVyZSBpcyBhY3R1YWxseSBzY3JvbGxhYmxl IG92ZXJmbG93IChyZXF1aXJlcyBsYXlvdXQgdG8gYmUgdXAtdG8tZGF0ZSkuCi0gICAgYm9vbCBo YXNDb21wb3NpdGVkU2Nyb2xsYWJsZU92ZXJmbG93KCkgY29uc3Q7CisgICAgV0VCQ09SRV9FWFBP UlQgYm9vbCBoYXNDb21wb3NpdGVkU2Nyb2xsYWJsZU92ZXJmbG93KCkgY29uc3Q7CiAKICAgICBp bnQgdmVydGljYWxTY3JvbGxiYXJXaWR0aChPdmVybGF5U2Nyb2xsYmFyU2l6ZVJlbGV2YW5jeSA9 IElnbm9yZU92ZXJsYXlTY3JvbGxiYXJTaXplKSBjb25zdDsKICAgICBpbnQgaG9yaXpvbnRhbFNj cm9sbGJhckhlaWdodChPdmVybGF5U2Nyb2xsYmFyU2l6ZVJlbGV2YW5jeSA9IElnbm9yZU92ZXJs YXlTY3JvbGxiYXJTaXplKSBjb25zdDsKQEAgLTg0OCw2ICs4NDgsOCBAQCBwdWJsaWM6CiAKICAg ICBib29sIHVzZXNDb21wb3NpdGVkU2Nyb2xsaW5nKCkgY29uc3Qgb3ZlcnJpZGU7CiAgICAgYm9v bCB1c2VzQXN5bmNTY3JvbGxpbmcoKSBjb25zdCBvdmVycmlkZTsKKyAgICAKKyAgICBXRUJDT1JF X0VYUE9SVCBib29sIGNvbnRhaW5lZEluQXN5bmNTY3JvbGxhYmxlQW5jZXN0b3IoKSBjb25zdDsK IAogICAgIGJvb2wgaGFzQ29tcG9zaXRlZFNjcm9sbGluZ0FuY2VzdG9yKCkgY29uc3QgeyByZXR1 cm4gbV9oYXNDb21wb3NpdGVkU2Nyb2xsaW5nQW5jZXN0b3I7IH0KICAgICB2b2lkIHNldEhhc0Nv bXBvc2l0ZWRTY3JvbGxpbmdBbmNlc3Rvcihib29sIGhhc0NvbXBvc2l0ZWRTY3JvbGxpbmdBbmNl c3RvcikgeyBtX2hhc0NvbXBvc2l0ZWRTY3JvbGxpbmdBbmNlc3RvciA9IGhhc0NvbXBvc2l0ZWRT Y3JvbGxpbmdBbmNlc3RvcjsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAppbmRleCA4ZmY5ZjBmZmFiMjJmYzA4NzNmM2NlNGQ0YmUy M2ViNzA2NmE0M2E4Li40ZGU1ZGIwY2ZlMmViZjEyZjA0MTMwYzYwMmJmMGM5ZDcyYjg5NWQ2IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9y LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9y LmNwcApAQCAtMjcwNyw2ICsyNzA3LDIxIEBAIFZlY3RvcjxDb21wb3NpdGVkQ2xpcERhdGE+IFJl bmRlckxheWVyQ29tcG9zaXRvcjo6Y29tcHV0ZUFuY2VzdG9yQ2xpcHBpbmdTdGFjayhjCiAgICAg cmV0dXJuIG5ld1N0YWNrOwogfQogCitib29sIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6Y29udGFp bmVkSW5Bc3luY1Njcm9sbGFibGVBbmNlc3Rvcihjb25zdCBSZW5kZXJMYXllciYgbGF5ZXIpCit7 CisgICAgYm9vbCBoYXNBbmNlc3RvclNjcm9sbGVyID0gZmFsc2U7CisgICAgdHJhdmVyc2VBbmNl c3RvckxheWVycyhsYXllciwgWyZdKGNvbnN0IFJlbmRlckxheWVyJiBhbmNlc3RvckxheWVyLCBi b29sIGlzQ29udGFpbmluZ0Jsb2NrQ2hhaW4sIGJvb2wgLyppc1BhaW50T3JkZXJBbmNlc3Rvciov KSB7CisgICAgICAgIGlmIChpc0NvbnRhaW5pbmdCbG9ja0NoYWluICYmIGFuY2VzdG9yTGF5ZXIu aGFzQ29tcG9zaXRlZFNjcm9sbGFibGVPdmVyZmxvdygpKSB7CisgICAgICAgICAgICBoYXNBbmNl c3RvclNjcm9sbGVyID0gdHJ1ZTsKKyAgICAgICAgICAgIHJldHVybiBBbmNlc3RvclRyYXZlcnNh bDo6U3RvcDsKKyAgICAgICAgfQorCisgICAgICAgIHJldHVybiBBbmNlc3RvclRyYXZlcnNhbDo6 Q29udGludWU7CisgICAgfSk7CisKKyAgICByZXR1cm4gaGFzQW5jZXN0b3JTY3JvbGxlcjsKK30K KwogLy8gUmV0dXJuIHRydWUgaWYgdGhlIGdpdmVuIGxheWVyIGlzIGEgc3RhY2tpbmcgY29udGV4 dCBhbmQgaGFzIGNvbXBvc2l0aW5nIGNoaWxkCiAvLyBsYXllcnMgdGhhdCBpdCBuZWVkcyB0byBj bGlwLiBJbiB0aGlzIGNhc2Ugd2UgaW5zZXJ0IGEgY2xpcHBpbmcgR3JhcGhpY3NMYXllcgogLy8g aW50byB0aGUgaGllcmFyY2h5IGJldHdlZW4gdGhpcyBsYXllciBhbmQgaXRzIGNoaWxkcmVuIGlu IHRoZSB6LW9yZGVyIGhpZXJhcmNoeS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJMYXllckNvbXBvc2l0b3IuaAppbmRleCAwNjllZTk3YzcxNTdmMmZlYzgyMTE2YzU0YWFh YzI4MWQyYzJjM2UzLi40ODc4MDk2ZTdhNTU3NjQxNDdhNjNjYzFjNmY0MTUxYWNiODYwNWI1IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9y LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5o CkBAIC0yMTQsNiArMjE0LDkgQEAgcHVibGljOgogCiAgICAgYm9vbCB1cGRhdGVBbmNlc3RvckNs aXBwaW5nU3RhY2soY29uc3QgUmVuZGVyTGF5ZXImLCBjb25zdCBSZW5kZXJMYXllciogY29tcG9z aXRpbmdBbmNlc3RvcikgY29uc3Q7CiAKKyAgICAvLyBXaGV0aGVyIHRoZSBnaXZlbiBsYXllciBj YW4gYmUgbW92ZWQgYnkgYW4gYXN5bmMgc2Nyb2xsYWJsZSBhbmNlc3Rvci4KKyAgICBzdGF0aWMg Ym9vbCBjb250YWluZWRJbkFzeW5jU2Nyb2xsYWJsZUFuY2VzdG9yKGNvbnN0IFJlbmRlckxheWVy Jik7CisKICAgICAvLyBXaGV0aGVyIGxheWVyJ3MgYmFja2luZyBuZWVkcyBhIGdyYXBoaWNzIGxh eWVyIHRvIGNsaXAgei1vcmRlciBjaGlsZHJlbiBvZiB0aGUgZ2l2ZW4gbGF5ZXIuCiAgICAgc3Rh dGljIGJvb2wgY2xpcHNDb21wb3NpdGluZ0Rlc2NlbmRhbnRzKGNvbnN0IFJlbmRlckxheWVyJik7 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL2lvcy9JbnRlcmFjdGlvbkluZm9y bWF0aW9uQXRQb3NpdGlvbi5oIGIvU291cmNlL1dlYktpdC9TaGFyZWQvaW9zL0ludGVyYWN0aW9u SW5mb3JtYXRpb25BdFBvc2l0aW9uLmgKaW5kZXggZGNjYzBlOTZmNmY0ZWE0MDAyMTMzYWY4MTky ODY0MGRlODI0YjAzNS4uNzllMWI2MjJmMzQ4ZDdmNDk5MWRiZDg0NWRiNTkwMjE5YzhlMDQwNiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvaW9zL0ludGVyYWN0aW9uSW5mb3JtYXRp b25BdFBvc2l0aW9uLmgKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvaW9zL0ludGVyYWN0aW9u SW5mb3JtYXRpb25BdFBvc2l0aW9uLmgKQEAgLTYxLDYgKzYxLDggQEAgc3RydWN0IEludGVyYWN0 aW9uSW5mb3JtYXRpb25BdFBvc2l0aW9uIHsKICAgICBib29sIGlzQXR0YWNobWVudCB7IGZhbHNl IH07CiAgICAgYm9vbCBpc0FuaW1hdGVkSW1hZ2UgeyBmYWxzZSB9OwogICAgIGJvb2wgaXNFbGVt ZW50IHsgZmFsc2UgfTsKKyAgICBib29sIGlzSW5TdWJzY3JvbGxhYmxlUmVnaW9uIHsgZmFsc2Ug fTsKKyAgICBib29sIGluc2lkZUZpeGVkUG9zaXRpb24geyBmYWxzZSB9OwogI2lmIEVOQUJMRShE QVRBX0RFVEVDVElPTikKICAgICBib29sIGlzRGF0YURldGVjdG9yTGluayB7IGZhbHNlIH07CiAj ZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL2lvcy9JbnRlcmFjdGlvbklu Zm9ybWF0aW9uQXRQb3NpdGlvbi5tbSBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL2lvcy9JbnRlcmFj dGlvbkluZm9ybWF0aW9uQXRQb3NpdGlvbi5tbQppbmRleCBkYWYzOWZmZGUxNGU1MTJjMmY5MWUw ZjYxNTRhNWIyODkzOTY2YjI1Li5iNzA5MTAxY2M1NDI0NDJmNzhhNmY2ZTMzNTc5NWJmZmE0Mjc3 ZTFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9pb3MvSW50ZXJhY3Rpb25JbmZv cm1hdGlvbkF0UG9zaXRpb24ubW0KKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvaW9zL0ludGVy YWN0aW9uSW5mb3JtYXRpb25BdFBvc2l0aW9uLm1tCkBAIC01Niw2ICs1Niw4IEBAIHZvaWQgSW50 ZXJhY3Rpb25JbmZvcm1hdGlvbkF0UG9zaXRpb246OmVuY29kZShJUEM6OkVuY29kZXImIGVuY29k ZXIpIGNvbnN0CiAgICAgZW5jb2RlciA8PCBpc0F0dGFjaG1lbnQ7CiAgICAgZW5jb2RlciA8PCBp c0FuaW1hdGVkSW1hZ2U7CiAgICAgZW5jb2RlciA8PCBpc0VsZW1lbnQ7CisgICAgZW5jb2RlciA8 PCBpc0luU3Vic2Nyb2xsYWJsZVJlZ2lvbjsKKyAgICBlbmNvZGVyIDw8IGluc2lkZUZpeGVkUG9z aXRpb247CiAgICAgZW5jb2RlciA8PCBhZGp1c3RlZFBvaW50Rm9yTm9kZVJlc3BvbmRpbmdUb0Ns aWNrRXZlbnRzOwogICAgIGVuY29kZXIgPDwgdXJsOwogICAgIGVuY29kZXIgPDwgaW1hZ2VVUkw7 CkBAIC0xMjUsNiArMTI3LDEyIEBAIGJvb2wgSW50ZXJhY3Rpb25JbmZvcm1hdGlvbkF0UG9zaXRp b246OmRlY29kZShJUEM6OkRlY29kZXImIGRlY29kZXIsIEludGVyYWN0aW9uCiAgICAgaWYgKCFk ZWNvZGVyLmRlY29kZShyZXN1bHQuaXNFbGVtZW50KSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwog CisgICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQuaXNJblN1YnNjcm9sbGFibGVSZWdpb24p KQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJlc3Vs dC5pbnNpZGVGaXhlZFBvc2l0aW9uKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCiAgICAgaWYg KCFkZWNvZGVyLmRlY29kZShyZXN1bHQuYWRqdXN0ZWRQb2ludEZvck5vZGVSZXNwb25kaW5nVG9D bGlja0V2ZW50cykpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0gYi9Tb3VyY2UvV2Vi S2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQppbmRleCBmMzY3MmNhMGIz MjFjMzI1OTFhZGM1ZmM5ZTlkNDAxOWQ1Nzg1NGY5Li41NTdlNzZiNzRjMDY3NWZkZTQyZTliZDJk OTA0ZTJkMDM5ZDcyOThjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2Vi UGFnZS9pb3MvV2ViUGFnZUlPUy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2Vi UGFnZS9pb3MvV2ViUGFnZUlPUy5tbQpAQCAtMjY4MCw2ICsyNjgwLDI1IEBAIHN0YXRpYyB2b2lk IGVsZW1lbnRQb3NpdGlvbkluZm9ybWF0aW9uKFdlYlBhZ2UmIHBhZ2UsIEVsZW1lbnQmIGVsZW1l bnQsIGNvbnN0IEluCiAgICAgfQogCiAgICAgaWYgKGF1dG8qIHJlbmRlcmVyID0gZWxlbWVudC5y ZW5kZXJlcigpKSB7CisgICAgICAgIGF1dG8gaW5TdWJzY3JvbGxhYmxlUmVnaW9uID0gW10gKGNv bnN0IFJlbmRlck9iamVjdCYgcmVuZGVyZXIpIHsKKyAgICAgICAgICAgIGlmICghcmVuZGVyZXIu ZG9jdW1lbnQoKS5mcmFtZSgpLT5pc01haW5GcmFtZSgpKQorICAgICAgICAgICAgICAgIHJldHVy biB0cnVlOworCisgICAgICAgICAgICBpZiAocmVuZGVyZXIuaGFzTGF5ZXIoKSkKKyAgICAgICAg ICAgICAgICByZXR1cm4gZG93bmNhc3Q8UmVuZGVyTGF5ZXJNb2RlbE9iamVjdD4ocmVuZGVyZXIp LmxheWVyKCktPmNvbnRhaW5lZEluQXN5bmNTY3JvbGxhYmxlQW5jZXN0b3IoKTsKKworICAgICAg ICAgICAgaWYgKGF1dG8qIGxheWVyID0gcmVuZGVyZXIuZW5jbG9zaW5nTGF5ZXIoKSkKKyAgICAg ICAgICAgICAgICByZXR1cm4gbGF5ZXItPmhhc0NvbXBvc2l0ZWRTY3JvbGxhYmxlT3ZlcmZsb3co KSB8fCBsYXllci0+Y29udGFpbmVkSW5Bc3luY1Njcm9sbGFibGVBbmNlc3RvcigpOworCisgICAg ICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIH07CisKKyAgICAgICAgaW5mby5pc0luU3Vi c2Nyb2xsYWJsZVJlZ2lvbiA9IGluU3Vic2Nyb2xsYWJsZVJlZ2lvbigqcmVuZGVyZXIpOworCisg ICAgICAgIGJvb2wgaW5GaXhlZCA9IGZhbHNlOworICAgICAgICByZW5kZXJlci0+bG9jYWxUb0Nv bnRhaW5lclBvaW50KHsgfSwgbnVsbHB0ciwgVXNlVHJhbnNmb3JtcywgJmluRml4ZWQpOworICAg ICAgICBpbmZvLmluc2lkZUZpeGVkUG9zaXRpb24gPSBpbkZpeGVkOworCiAgICAgICAgIGlmIChy ZW5kZXJlci0+aXNSZW5kZXJJbWFnZSgpKQogICAgICAgICAgICAgaW1hZ2VQb3NpdGlvbkluZm9y bWF0aW9uKHBhZ2UsIGVsZW1lbnQsIHJlcXVlc3QsIGluZm8pOwogICAgICAgICBib3VuZHNQb3Np dGlvbkluZm9ybWF0aW9uKCpyZW5kZXJlciwgaW5mbyk7Cg== 375839 2019-08-08 14:38:49 -0700 2019-08-08 16:00:12 -0700 Patch bug-200374-20190808143849.patch text/plain 19531 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ4Mzc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmU2MzFhOTIxN2NiNjMw MmYxYTE0NTA4ZTM3ZTAwMzJmOGVhYjE4Yy4uMzA5MGYyNzU3NTg1YWRkNmExYjc2ZWVhMWNjMWZk ZmQwMjI3YjUxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDE5LTA4LTA4ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIEFkZCB0byBJbnRl cmFjdGlvbkluZm9ybWF0aW9uQXRQb3NpdGlvbiBpbmZvcm1hdGlvbiBhYm91dCB3aGV0aGVyIHRo ZSBlbGVtZW50IGlzIGluIGEgc3Vic2Nyb2xsYWJsZSByZWdpb24KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMDM3NAorICAgICAgICByZGFyOi8vcHJv YmxlbS81NDA5NTUxOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIEFkZCB0byBJbnRlcmFjdGlvbkluZm9ybWF0aW9uQXRQb3NpdGlvbiBhIFNjcm9sbGlu Z05vZGVJRCB3aGljaCByZXByZXNlbnRzIHRoZSBlbmNsb3Npbmcgc2Nyb2xsaW5nCisgICAgICAg IG5vZGUgdGhhdCBhZmZlY3RzIHRoZSB0YXJnZXRlZCBlbGVtZW50J3MgcG9zaXRpb24uIFdlIHVz ZSB0aGlzIHRvIGZpbmQgYSBVSVNjcm9sbFZpZXcgaW4gdGhlIFVJIHByb2Nlc3MuCisgICAgICAg IAorICAgICAgICBUaGUgZW50cnlwb2ludCB0byBmaW5kaW5nIHRoZSBlbmNsb3Npbmcgc2Nyb2xs aW5nIG5vZGUgaXMgU2Nyb2xsaW5nQ29vcmRpbmF0b3I6OnNjcm9sbGFibGVDb250YWluZXJOb2Rl SUQoKSwKKyAgICAgICAgd2hpY2ggY2FsbHMgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjphc3luY1Nj cm9sbGFibGVDb250YWluZXJOb2RlSUQoKSB0byBsb29rIGZvciBhIHNjcm9sbGluZyBhbmNlc3Rv ciBpbgorICAgICAgICB0aGUgY3VycmVudCBmcmFtZSwgYW5kIHRoZW4gbG9va3MgZm9yIGFuIGVu Y2xvc2luZyBzY3JvbGxhYmxlIGZyYW1lLCBvciBhIHNjcm9sbGluZyBhbmNlc3RvciBpbgorICAg ICAgICB0aGUgZW5jbG9zaW5nIGZyYW1lLgorICAgICAgICAKKyAgICAgICAgVGhlcmUncyBhIGJp dCBvZiBzdWJ0bGV0eSBpbiBSZW5kZXJMYXllckNvbXBvc2l0b3I6OmFzeW5jU2Nyb2xsYWJsZUNv bnRhaW5lck5vZGVJRCgpIGJlY2F1c2UgaWYgeW91J3JlIGFza2luZworICAgICAgICBmb3IgdGhl IG5vZGUgdGhhdCBzY3JvbGxzIHRoZSByZW5kZXJlciwgaWYgdGhlIHJlbmRlcmVyIGl0c2VsZiBo YXMgYSBsYXllciBhbmQgaXMgc2Nyb2xsYWJsZSwgeW91IHdhbnQKKyAgICAgICAgaXRzIGVuY2xv c2luZyBzY3JvbGxlci4KKworICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL0FzeW5jU2Nyb2xsaW5n Q29vcmRpbmF0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QXN5bmNTY3JvbGxpbmdDb29yZGlu YXRvcjo6c2Nyb2xsYWJsZUNvbnRhaW5lck5vZGVJRCBjb25zdCk6CisgICAgICAgICogcGFnZS9z Y3JvbGxpbmcvQXN5bmNTY3JvbGxpbmdDb29yZGluYXRvci5oOgorICAgICAgICAqIHBhZ2Uvc2Ny b2xsaW5nL1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnNjcm9s bGFibGVDb250YWluZXJOb2RlSUQgY29uc3QpOgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL1Nj cm9sbGluZ0Nvb3JkaW5hdG9yLmg6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyLmg6 CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHA6CisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6OmFzeW5jU2Nyb2xsYWJsZUNvbnRhaW5l ck5vZGVJRCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5oOgor CiAyMDE5LTA4LTA3ICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgogCiAgICAgICAg IFtXSExTTF0gY2FjaGUgcmVzdWx0cyBvZiBhcmd1bWVudFR5cGVGb3JBbmRPdmVybG9hZCBpbnNp ZGUgQ2hlY2tlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZwppbmRleCBkOGFhY2VlYzhlMTNiMWU1NGRlYmZhOGY5ZTcyODJhN2Y3 ZGVkZjZiLi4xYWZiYWE5YTI4OWQ3YzVmNDc0MWI4YjU5ZmYyYjQ4OWI0NTYxNmYyIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxv ZwpAQCAtMSwzICsxLDMxIEBACisyMDE5LTA4LTA4ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFz ZXJAYXBwbGUuY29tPgorCisgICAgICAgIEFkZCB0byBJbnRlcmFjdGlvbkluZm9ybWF0aW9uQXRQ b3NpdGlvbiBpbmZvcm1hdGlvbiBhYm91dCB3aGV0aGVyIHRoZSBlbGVtZW50IGlzIGluIGEgc3Vi c2Nyb2xsYWJsZSByZWdpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIwMDM3NAorICAgICAgICByZGFyOi8vcHJvYmxlbS81NDA5NTUxOQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAgQWRkIElu dGVyYWN0aW9uSW5mb3JtYXRpb25BdFBvc2l0aW9uLmNvbnRhaW5lclNjcm9sbGluZ05vZGVJRCBh bmQgaW5pdGlhbGl6ZSBpdCBpbiBlbGVtZW50UG9zaXRpb25JbmZvcm1hdGlvbigpCisgICAgICAg IGJ5IGFza2luZyB0aGUgc2Nyb2xsaW5nIGNvb3JkaW5hdG9yLgorICAgICAgICAKKyAgICAgICAg QWxzbyBhZGQgYSB3YXkgdG8gZ2V0IGZyb20gYSBTY3JvbGxpbmdOb2RlSUQgdG8gYSBVSVNjcm9s bFZpZXcgdG8gUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3JQcm94eSwKKyAgICAgICAgd2hpY2gg Z2V0cyB0aGUgc2Nyb2xsaW5nIG5vZGUgYW5kIGFza3MgdGhlIGRlbGVnYXRlIGZvciB0aGUgVUlW aWV3LgorCisgICAgICAgICogU2hhcmVkL2lvcy9JbnRlcmFjdGlvbkluZm9ybWF0aW9uQXRQb3Np dGlvbi5oOgorICAgICAgICAqIFNoYXJlZC9pb3MvSW50ZXJhY3Rpb25JbmZvcm1hdGlvbkF0UG9z aXRpb24ubW06CisgICAgICAgIChXZWJLaXQ6OkludGVyYWN0aW9uSW5mb3JtYXRpb25BdFBvc2l0 aW9uOjplbmNvZGUgY29uc3QpOgorICAgICAgICAoV2ViS2l0OjpJbnRlcmFjdGlvbkluZm9ybWF0 aW9uQXRQb3NpdGlvbjo6ZGVjb2RlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvUmVtb3RlTGF5ZXJU cmVlL1JlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHkuaDoKKyAgICAgICAgKiBVSVByb2Nl c3MvUmVtb3RlTGF5ZXJUcmVlL2lvcy9SZW1vdGVTY3JvbGxpbmdDb29yZGluYXRvclByb3h5SU9T Lm1tOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVTY3JvbGxpbmdDb29yZGluYXRvclByb3h5Ojpz Y3JvbGxWaWV3Rm9yU2Nyb2xsaW5nTm9kZUlEIGNvbnN0KToKKyAgICAgICAgKiBVSVByb2Nlc3Mv UmVtb3RlTGF5ZXJUcmVlL2lvcy9TY3JvbGxpbmdUcmVlT3ZlcmZsb3dTY3JvbGxpbmdOb2RlSU9T Lmg6CisgICAgICAgICogVUlQcm9jZXNzL1JlbW90ZUxheWVyVHJlZS9pb3MvU2Nyb2xsaW5nVHJl ZU92ZXJmbG93U2Nyb2xsaW5nTm9kZUlPUy5tbToKKyAgICAgICAgKFdlYktpdDo6U2Nyb2xsaW5n VHJlZU92ZXJmbG93U2Nyb2xsaW5nTm9kZUlPUzo6c2Nyb2xsVmlldyBjb25zdCk6CisgICAgICAg ICogVUlQcm9jZXNzL1JlbW90ZUxheWVyVHJlZS9pb3MvU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05v ZGVEZWxlZ2F0ZUlPUy5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFn ZUlPUy5tbToKKyAgICAgICAgKFdlYktpdDo6ZWxlbWVudFBvc2l0aW9uSW5mb3JtYXRpb24pOgor CiAyMDE5LTA4LTA3ICBQcml5YW5rYSBBZ2Fyd2FsICA8cGFnYXJ3YWw5OTlAYXBwbGUuY29tPgog CiAgICAgICAgIEFsbG93IGNsaWVudHMgdG8gdG9nZ2xlIGEgdGV4dCBpbnB1dCBmaWVsZCBiZXR3 ZWVuIGJlaW5nIHZpZXdhYmxlIGFuZCBoYXZpbmcgY2hhcmFjdGVycyBoaWRkZW4gd2hpbGUgbWFp bnRhaW5pbmcgCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9Bc3lu Y1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5n L0FzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3IuY3BwCmluZGV4IGFlOGE5ZmJiNDliOGU1NzE3M2E3 NTEzNWQwNzAwMzljZTBkYjVmMjcuLjMwNmNmZWQxOWNlNmQwMGI2MmE4NTI0OTcwMDI4YjgwNDVm YWQ4MjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL0FzeW5jU2Ny b2xsaW5nQ29vcmRpbmF0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5n L0FzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3IuY3BwCkBAIC0zNyw2ICszNyw4IEBACiAjaW5jbHVk ZSAiTG9nZ2luZy5oIgogI2luY2x1ZGUgIlBhZ2UuaCIKICNpbmNsdWRlICJQZXJmb3JtYW5jZUxv Z2dpbmdDbGllbnQuaCIKKyNpbmNsdWRlICJSZW5kZXJMYXllckNvbXBvc2l0b3IuaCIKKyNpbmNs dWRlICJSZW5kZXJWaWV3LmgiCiAjaW5jbHVkZSAiU2Nyb2xsQW5pbWF0b3IuaCIKICNpbmNsdWRl ICJTY3JvbGxpbmdDb25zdHJhaW50cy5oIgogI2luY2x1ZGUgIlNjcm9sbGluZ1N0YXRlRml4ZWRO b2RlLmgiCkBAIC03ODksNiArNzkxLDI4IEBAIGJvb2wgQXN5bmNTY3JvbGxpbmdDb29yZGluYXRv cjo6YXN5bmNGcmFtZU9yT3ZlcmZsb3dTY3JvbGxpbmdFbmFibGVkKCkgY29uc3QKICAgICByZXR1 cm4gc2V0dGluZ3MuYXN5bmNGcmFtZVNjcm9sbGluZ0VuYWJsZWQoKSB8fCBzZXR0aW5ncy5hc3lu Y092ZXJmbG93U2Nyb2xsaW5nRW5hYmxlZCgpOwogfQogCitTY3JvbGxpbmdOb2RlSUQgQXN5bmNT Y3JvbGxpbmdDb29yZGluYXRvcjo6c2Nyb2xsYWJsZUNvbnRhaW5lck5vZGVJRChjb25zdCBSZW5k ZXJPYmplY3QmIHJlbmRlcmVyKSBjb25zdAoreworICAgIGlmIChhdXRvIG92ZXJmbG93U2Nyb2xs aW5nTm9kZUlEID0gcmVuZGVyZXIudmlldygpLmNvbXBvc2l0b3IoKS5hc3luY1Njcm9sbGFibGVD b250YWluZXJOb2RlSUQocmVuZGVyZXIpKQorICAgICAgICByZXR1cm4gb3ZlcmZsb3dTY3JvbGxp bmdOb2RlSUQ7CisKKyAgICAvLyBJZiB3ZSdyZSBpbiBhIHNjcm9sbGFibGUgZnJhbWUsIHJldHVy biB0aGF0LgorICAgIGF1dG8qIGZyYW1lVmlldyA9IHJlbmRlcmVyLmZyYW1lKCkudmlldygpOwor ICAgIGlmICghZnJhbWVWaWV3KQorICAgICAgICByZXR1cm4gMDsKKworICAgIGlmIChhdXRvIHNj cm9sbGluZ05vZGVJRCA9IGZyYW1lVmlldy0+c2Nyb2xsaW5nTm9kZUlEKCkpCisgICAgICAgIHJl dHVybiBzY3JvbGxpbmdOb2RlSUQ7CisKKyAgICAvLyBPdGhlcndpc2UsIGxvb2sgZm9yIGEgc2Ny b2xsYWJsZSBlbGVtZW50IGluIHRoZSBjb250YWluaW5nIGZyYW1lLgorICAgIGlmIChhdXRvKiBv d25lckVsZW1lbnQgPSByZW5kZXJlci5kb2N1bWVudCgpLm93bmVyRWxlbWVudCgpKSB7CisgICAg ICAgIGlmIChhdXRvKiBmcmFtZVJlbmRlcmVyID0gb3duZXJFbGVtZW50LT5yZW5kZXJlcigpKQor ICAgICAgICAgICAgcmV0dXJuIHNjcm9sbGFibGVDb250YWluZXJOb2RlSUQoKmZyYW1lUmVuZGVy ZXIpOworICAgIH0KKworICAgIHJldHVybiAwOworfQorCiBTdHJpbmcgQXN5bmNTY3JvbGxpbmdD b29yZGluYXRvcjo6c2Nyb2xsaW5nU3RhdGVUcmVlQXNUZXh0KFNjcm9sbGluZ1N0YXRlVHJlZUFz VGV4dEJlaGF2aW9yIGJlaGF2aW9yKSBjb25zdAogewogICAgIGlmIChtX3Njcm9sbGluZ1N0YXRl VHJlZS0+cm9vdFN0YXRlTm9kZSgpKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdl L3Njcm9sbGluZy9Bc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmggYi9Tb3VyY2UvV2ViQ29yZS9w YWdlL3Njcm9sbGluZy9Bc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmgKaW5kZXggMDVlZWM4NmVj NzViMDIxZDVmZjMwODgyMmNkMzRiZWY1ZGQxYTZiNC4uMjg3NzEyM2MyMWUwZTg1ZDIxOTEwYTc1 OTNjMDNjMTNlMjg4N2Q4OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxp bmcvQXN5bmNTY3JvbGxpbmdDb29yZGluYXRvci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv c2Nyb2xsaW5nL0FzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3IuaApAQCAtOTEsNiArOTEsOCBAQCBw cml2YXRlOgogICAgIAogICAgIGJvb2wgYXN5bmNGcmFtZU9yT3ZlcmZsb3dTY3JvbGxpbmdFbmFi bGVkKCkgY29uc3Q7CiAKKyAgICBXRUJDT1JFX0VYUE9SVCBTY3JvbGxpbmdOb2RlSUQgc2Nyb2xs YWJsZUNvbnRhaW5lck5vZGVJRChjb25zdCBSZW5kZXJPYmplY3QmKSBjb25zdCBvdmVycmlkZTsK KwogICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgZnJhbWVWaWV3TGF5b3V0VXBkYXRlZChGcmFtZVZp ZXcmKSBvdmVycmlkZTsKICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIGZyYW1lVmlld1Jvb3RMYXll ckRpZENoYW5nZShGcmFtZVZpZXcmKSBvdmVycmlkZTsKICAgICBXRUJDT1JFX0VYUE9SVCB2b2lk IGZyYW1lVmlld1Zpc3VhbFZpZXdwb3J0Q2hhbmdlZChGcmFtZVZpZXcmKSBvdmVycmlkZTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ0Nvb3JkaW5h dG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ0Nvb3JkaW5h dG9yLmNwcAppbmRleCA3ODk4NDY2YzRkZmNlZDExN2JlYzk0NjliM2I1Njk4NjY2MmE2MDBmLi41 YjZlMDI1OGY1Nzg3NDNiOGNhOWM3ODg0YWYyODZmMDUxMTBkNDNmIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdDb29yZGluYXRvci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3IuY3BwCkBA IC05Niw2ICs5NiwxMSBAQCBib29sIFNjcm9sbGluZ0Nvb3JkaW5hdG9yOjpjb29yZGluYXRlc1Nj cm9sbGluZ0Zvck92ZXJmbG93TGF5ZXIoY29uc3QgUmVuZGVyTGF5ZQogICAgIHJldHVybiBsYXll ci5oYXNDb21wb3NpdGVkU2Nyb2xsYWJsZU92ZXJmbG93KCk7CiB9CiAKK1Njcm9sbGluZ05vZGVJ RCBTY3JvbGxpbmdDb29yZGluYXRvcjo6c2Nyb2xsYWJsZUNvbnRhaW5lck5vZGVJRChjb25zdCBS ZW5kZXJPYmplY3QmKSBjb25zdAoreworICAgIHJldHVybiAwOworfQorCiBFdmVudFRyYWNraW5n UmVnaW9ucyBTY3JvbGxpbmdDb29yZGluYXRvcjo6YWJzb2x1dGVFdmVudFRyYWNraW5nUmVnaW9u c0ZvckZyYW1lKGNvbnN0IEZyYW1lJiBmcmFtZSkgY29uc3QKIHsKICAgICBhdXRvKiByZW5kZXJW aWV3ID0gZnJhbWUuY29udGVudFJlbmRlcmVyKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdDb29yZGluYXRvci5oIGIvU291cmNlL1dlYkNvcmUv cGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3IuaAppbmRleCA4NGE3ZjRjNzk3Yzdh OTA3ZTkwNmVjNWE3MWM5MWUyM2E0ZDczY2QxLi40YThjZjhjOGQyYmM1NzAxOTE5N2Y4YTFlYjM1 MmY2NjhkNjliYjExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9T Y3JvbGxpbmdDb29yZGluYXRvci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5n L1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmgKQEAgLTU5LDYgKzU5LDcgQEAgY2xhc3MgRnJhbWVWaWV3 OwogY2xhc3MgR3JhcGhpY3NMYXllcjsKIGNsYXNzIFBhZ2U7CiBjbGFzcyBSZWdpb247CitjbGFz cyBSZW5kZXJPYmplY3Q7CiBjbGFzcyBSZW5kZXJMYXllcjsKIGNsYXNzIFNjcm9sbGFibGVBcmVh OwogY2xhc3MgVmlld3BvcnRDb25zdHJhaW50czsKQEAgLTgzLDYgKzg0LDkgQEAgcHVibGljOgog ICAgIC8vIFJldHVybiB3aGV0aGVyIHRoaXMgc2Nyb2xsaW5nIGNvb3JkaW5hdG9yIGhhbmRsZXMg c2Nyb2xsaW5nIGZvciB0aGUgZ2l2ZW4gb3ZlcmZsb3cgc2Nyb2xsIGxheWVyLgogICAgIFdFQkNP UkVfRVhQT1JUIHZpcnR1YWwgYm9vbCBjb29yZGluYXRlc1Njcm9sbGluZ0Zvck92ZXJmbG93TGF5 ZXIoY29uc3QgUmVuZGVyTGF5ZXImKSBjb25zdDsKIAorICAgIC8vIFJldHVybnMgdGhlIFNjcm9s bGluZ05vZGVJRCBvZiB0aGUgaW5uZXJtb3N0IHNjcm9sbGluZyBub2RlIHRoYXQgc2Nyb2xscyB0 aGUgcmVuZGVyZXIuCisgICAgV0VCQ09SRV9FWFBPUlQgdmlydHVhbCBTY3JvbGxpbmdOb2RlSUQg c2Nyb2xsYWJsZUNvbnRhaW5lck5vZGVJRChjb25zdCBSZW5kZXJPYmplY3QmKSBjb25zdDsKKwog ICAgIC8vIFNob3VsZCBiZSBjYWxsZWQgd2hlbmV2ZXIgdGhlIGdpdmVuIGZyYW1lIHZpZXcgaGFz IGJlZW4gbGFpZCBvdXQuCiAgICAgdmlydHVhbCB2b2lkIGZyYW1lVmlld0xheW91dFVwZGF0ZWQo RnJhbWVWaWV3JikgeyB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckxheWVyQ29tcG9zaXRvci5jcHAKaW5kZXggOGZmOWYwZmZhYjIyZmMwODczZjNjZTRkNGJlMjNl YjcwNjZhNDNhOC4uNGQyMjQ2ZGNjOTA4NTc2YmQwYjEyOTA2YmJkZTY4M2FhMzQzMzE3NiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5j cHAKQEAgLTI3MDcsNiArMjcwNywzNyBAQCBWZWN0b3I8Q29tcG9zaXRlZENsaXBEYXRhPiBSZW5k ZXJMYXllckNvbXBvc2l0b3I6OmNvbXB1dGVBbmNlc3RvckNsaXBwaW5nU3RhY2soYwogICAgIHJl dHVybiBuZXdTdGFjazsKIH0KIAorLy8gTm90ZSB0aGF0IHRoaXMgcmV0dXJucyB0aGUgU2Nyb2xs aW5nTm9kZUlEIG9mIHRoZSBzY3JvbGxlciB0aGlzIGxheWVyIGlzIGVtYmVkZGVkIGluLCBub3Qg dGhlIGxheWVyJ3Mgb3duIFNjcm9sbGluZ05vZGVJRCBpZiBpdCBoYXMgb25lLgorU2Nyb2xsaW5n Tm9kZUlEIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6YXN5bmNTY3JvbGxhYmxlQ29udGFpbmVyTm9k ZUlEKGNvbnN0IFJlbmRlck9iamVjdCYgcmVuZGVyZXIpCit7CisgICAgYXV0byogZW5jbG9zaW5n TGF5ZXIgPSByZW5kZXJlci5lbmNsb3NpbmdMYXllcigpOworICAgIGlmICghZW5jbG9zaW5nTGF5 ZXIpCisgICAgICAgIHJldHVybiAwOworICAgIAorICAgIGF1dG8gbGF5ZXJTY3JvbGxpbmdOb2Rl SUQgPSBbXShjb25zdCBSZW5kZXJMYXllciYgbGF5ZXIpIC0+IFNjcm9sbGluZ05vZGVJRCB7Cisg ICAgICAgIGlmIChsYXllci5pc0NvbXBvc2l0ZWQoKSkKKyAgICAgICAgICAgIHJldHVybiBsYXll ci5iYWNraW5nKCktPnNjcm9sbGluZ05vZGVJREZvclJvbGUoU2Nyb2xsQ29vcmRpbmF0aW9uUm9s ZTo6U2Nyb2xsaW5nKTsKKyAgICAgICAgcmV0dXJuIDA7CisgICAgfTsKKworICAgIC8vIElmIHRo ZSByZW5kZXJlciBpcyBpbnNpZGUgdGhlIGxheWVyLCB3ZSBjYXJlIGFib3V0IHRoZSBsYXllcidz IHNjcm9sbGFiaWxpdHkuIE90aGVyd2lzZSwgd2UgbGV0IHRyYXZlcnNlQW5jZXN0b3JMYXllcnMg bG9vayBhdCBhbmNlc3RvcnMuCisgICAgaWYgKCFyZW5kZXJlci5oYXNMYXllcigpKSB7CisgICAg ICAgIGlmIChhdXRvIHNjcm9sbGluZ05vZGVJRCA9IGxheWVyU2Nyb2xsaW5nTm9kZUlEKCplbmNs b3NpbmdMYXllcikpCisgICAgICAgICAgICByZXR1cm4gc2Nyb2xsaW5nTm9kZUlEOworICAgIH0K KworICAgIFNjcm9sbGluZ05vZGVJRCBjb250YWluZXJTY3JvbGxpbmdOb2RlSUQgPSAwOworICAg IHRyYXZlcnNlQW5jZXN0b3JMYXllcnMoKmVuY2xvc2luZ0xheWVyLCBbJl0oY29uc3QgUmVuZGVy TGF5ZXImIGFuY2VzdG9yTGF5ZXIsIGJvb2wgaXNDb250YWluaW5nQmxvY2tDaGFpbiwgYm9vbCAv KmlzUGFpbnRPcmRlckFuY2VzdG9yKi8pIHsKKyAgICAgICAgaWYgKGlzQ29udGFpbmluZ0Jsb2Nr Q2hhaW4gJiYgYW5jZXN0b3JMYXllci5oYXNDb21wb3NpdGVkU2Nyb2xsYWJsZU92ZXJmbG93KCkp IHsKKyAgICAgICAgICAgIGNvbnRhaW5lclNjcm9sbGluZ05vZGVJRCA9IGxheWVyU2Nyb2xsaW5n Tm9kZUlEKGFuY2VzdG9yTGF5ZXIpOworICAgICAgICAgICAgcmV0dXJuIEFuY2VzdG9yVHJhdmVy c2FsOjpTdG9wOworICAgICAgICB9CisgICAgICAgIHJldHVybiBBbmNlc3RvclRyYXZlcnNhbDo6 Q29udGludWU7CisgICAgfSk7CisKKyAgICByZXR1cm4gY29udGFpbmVyU2Nyb2xsaW5nTm9kZUlE OworfQorCiAvLyBSZXR1cm4gdHJ1ZSBpZiB0aGUgZ2l2ZW4gbGF5ZXIgaXMgYSBzdGFja2luZyBj b250ZXh0IGFuZCBoYXMgY29tcG9zaXRpbmcgY2hpbGQKIC8vIGxheWVycyB0aGF0IGl0IG5lZWRz IHRvIGNsaXAuIEluIHRoaXMgY2FzZSB3ZSBpbnNlcnQgYSBjbGlwcGluZyBHcmFwaGljc0xheWVy CiAvLyBpbnRvIHRoZSBoaWVyYXJjaHkgYmV0d2VlbiB0aGlzIGxheWVyIGFuZCBpdHMgY2hpbGRy ZW4gaW4gdGhlIHotb3JkZXIgaGllcmFyY2h5LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5oCmluZGV4IDA2OWVlOTdjNzE1N2YyZmVjODIxMTZj NTRhYWFjMjgxZDJjMmMzZTMuLmJmNjQ1Y2Q0MWI4OTEyMTJkN2Y1YTMwMzg2ZWY5Y2E1NGJmYTQ2 MDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBv c2l0b3IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3Np dG9yLmgKQEAgLTIxNCw2ICsyMTQsMTAgQEAgcHVibGljOgogCiAgICAgYm9vbCB1cGRhdGVBbmNl c3RvckNsaXBwaW5nU3RhY2soY29uc3QgUmVuZGVyTGF5ZXImLCBjb25zdCBSZW5kZXJMYXllciog Y29tcG9zaXRpbmdBbmNlc3RvcikgY29uc3Q7CiAKKyAgICAvLyBSZXR1cm5zIHRoZSBTY3JvbGxp bmdOb2RlSUQgZm9yIHRoZSBjb250YWluaW5nIGFzeW5jLXNjcm9sbGFibGUgbGF5ZXIgdGhhdCBz Y3JvbGxzIHRoaXMgcmVuZGVyZXIncyBib3JkZXIgYm94LgorICAgIC8vIE1heSByZXR1cm4gMCBm b3IgcG9zaXRpb24tZml4ZWQgY29udGVudC4KKyAgICBzdGF0aWMgU2Nyb2xsaW5nTm9kZUlEIGFz eW5jU2Nyb2xsYWJsZUNvbnRhaW5lck5vZGVJRChjb25zdCBSZW5kZXJPYmplY3QmKTsKKwogICAg IC8vIFdoZXRoZXIgbGF5ZXIncyBiYWNraW5nIG5lZWRzIGEgZ3JhcGhpY3MgbGF5ZXIgdG8gY2xp cCB6LW9yZGVyIGNoaWxkcmVuIG9mIHRoZSBnaXZlbiBsYXllci4KICAgICBzdGF0aWMgYm9vbCBj bGlwc0NvbXBvc2l0aW5nRGVzY2VuZGFudHMoY29uc3QgUmVuZGVyTGF5ZXImKTsKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvaW9zL0ludGVyYWN0aW9uSW5mb3JtYXRpb25BdFBv c2l0aW9uLmggYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9pb3MvSW50ZXJhY3Rpb25JbmZvcm1hdGlv bkF0UG9zaXRpb24uaAppbmRleCBkY2NjMGU5NmY2ZjRlYTQwMDIxMzNhZjgxOTI4NjQwZGU4MjRi MDM1Li42YTQ3YmQ3MzY1ZTliYzkxZjI4YjNiMjJmZDlkZTU1OTNiMDQ4OGM3IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9pb3MvSW50ZXJhY3Rpb25JbmZvcm1hdGlvbkF0UG9zaXRp b24uaAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9pb3MvSW50ZXJhY3Rpb25JbmZvcm1hdGlv bkF0UG9zaXRpb24uaApAQCAtMzEsNiArMzEsNyBAQAogI2luY2x1ZGUgIkludGVyYWN0aW9uSW5m b3JtYXRpb25SZXF1ZXN0LmgiCiAjaW5jbHVkZSAiU2hhcmVhYmxlQml0bWFwLmgiCiAjaW5jbHVk ZSA8V2ViQ29yZS9JbnRQb2ludC5oPgorI2luY2x1ZGUgPFdlYkNvcmUvU2Nyb2xsVHlwZXMuaD4K ICNpbmNsdWRlIDxXZWJDb3JlL1NlbGVjdGlvblJlY3QuaD4KICNpbmNsdWRlIDxXZWJDb3JlL1Rl eHRJbmRpY2F0b3IuaD4KICNpbmNsdWRlIDx3dGYvVVJMLmg+CkBAIC02MSw2ICs2Miw3IEBAIHN0 cnVjdCBJbnRlcmFjdGlvbkluZm9ybWF0aW9uQXRQb3NpdGlvbiB7CiAgICAgYm9vbCBpc0F0dGFj aG1lbnQgeyBmYWxzZSB9OwogICAgIGJvb2wgaXNBbmltYXRlZEltYWdlIHsgZmFsc2UgfTsKICAg ICBib29sIGlzRWxlbWVudCB7IGZhbHNlIH07CisgICAgV2ViQ29yZTo6U2Nyb2xsaW5nTm9kZUlE IGNvbnRhaW5lclNjcm9sbGluZ05vZGVJRCB7IDAgfTsKICNpZiBFTkFCTEUoREFUQV9ERVRFQ1RJ T04pCiAgICAgYm9vbCBpc0RhdGFEZXRlY3RvckxpbmsgeyBmYWxzZSB9OwogI2VuZGlmCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9pb3MvSW50ZXJhY3Rpb25JbmZvcm1hdGlvbkF0 UG9zaXRpb24ubW0gYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9pb3MvSW50ZXJhY3Rpb25JbmZvcm1h dGlvbkF0UG9zaXRpb24ubW0KaW5kZXggZGFmMzlmZmRlMTRlNTEyYzJmOTFlMGY2MTU0YTViMjg5 Mzk2NmIyNS4uMmZmM2ZkODI4YTM0YmE5ZTk3ZGM4MTYwMTExZGJkMDE4ZTAxZmU3MSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvaW9zL0ludGVyYWN0aW9uSW5mb3JtYXRpb25BdFBv c2l0aW9uLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL2lvcy9JbnRlcmFjdGlvbkluZm9y bWF0aW9uQXRQb3NpdGlvbi5tbQpAQCAtNTYsNiArNTYsNyBAQCB2b2lkIEludGVyYWN0aW9uSW5m b3JtYXRpb25BdFBvc2l0aW9uOjplbmNvZGUoSVBDOjpFbmNvZGVyJiBlbmNvZGVyKSBjb25zdAog ICAgIGVuY29kZXIgPDwgaXNBdHRhY2htZW50OwogICAgIGVuY29kZXIgPDwgaXNBbmltYXRlZElt YWdlOwogICAgIGVuY29kZXIgPDwgaXNFbGVtZW50OworICAgIGVuY29kZXIgPDwgY29udGFpbmVy U2Nyb2xsaW5nTm9kZUlEOwogICAgIGVuY29kZXIgPDwgYWRqdXN0ZWRQb2ludEZvck5vZGVSZXNw b25kaW5nVG9DbGlja0V2ZW50czsKICAgICBlbmNvZGVyIDw8IHVybDsKICAgICBlbmNvZGVyIDw8 IGltYWdlVVJMOwpAQCAtMTI1LDYgKzEyNiw5IEBAIGJvb2wgSW50ZXJhY3Rpb25JbmZvcm1hdGlv bkF0UG9zaXRpb246OmRlY29kZShJUEM6OkRlY29kZXImIGRlY29kZXIsIEludGVyYWN0aW9uCiAg ICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQuaXNFbGVtZW50KSkKICAgICAgICAgcmV0dXJu IGZhbHNlOwogCisgICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQuY29udGFpbmVyU2Nyb2xs aW5nTm9kZUlEKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCiAgICAgaWYgKCFkZWNvZGVyLmRl Y29kZShyZXN1bHQuYWRqdXN0ZWRQb2ludEZvck5vZGVSZXNwb25kaW5nVG9DbGlja0V2ZW50cykp CiAgICAgICAgIHJldHVybiBmYWxzZTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHkuaCBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1JlbW90ZUxheWVyVHJlZS9SZW1vdGVTY3JvbGxpbmdD b29yZGluYXRvclByb3h5LmgKaW5kZXggNzJhOGVhYzJmN2Y2NjFkMjMxN2MwYzUxMDVmMzlkNDIz YTA0ZTNkZi4uODZkMGRlZmM2OTY1ZTRmYTZiYTExNjQ3NjFiYzlhYzcxOThjNzJlNiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZVNjcm9s bGluZ0Nvb3JkaW5hdG9yUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9SZW1v dGVMYXllclRyZWUvUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3JQcm94eS5oCkBAIC0zNCw2ICsz NCw4IEBACiAjaW5jbHVkZSA8d3RmL05vbmNvcHlhYmxlLmg+CiAjaW5jbHVkZSA8d3RmL1JlZlB0 ci5oPgogCitPQkpDX0NMQVNTIFVJU2Nyb2xsVmlldzsKKwogbmFtZXNwYWNlIFdlYkNvcmUgewog Y2xhc3MgRmxvYXRQb2ludDsKIGNsYXNzIFBsYXRmb3JtV2hlZWxFdmVudDsKQEAgLTg3LDYgKzg5 LDggQEAgcHVibGljOgogICAgIGJvb2wgaGFzU2Nyb2xsYWJsZU1haW5GcmFtZSgpIGNvbnN0Owog CiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKKyAgICBVSVNjcm9sbFZpZXcgKnNjcm9sbFZpZXdG b3JTY3JvbGxpbmdOb2RlSUQoV2ViQ29yZTo6U2Nyb2xsaW5nTm9kZUlEKSBjb25zdDsKKwogICAg IFdlYkNvcmU6OkZsb2F0UmVjdCBjdXJyZW50TGF5b3V0Vmlld3BvcnQoKSBjb25zdDsKICAgICB2 b2lkIHNjcm9sbGluZ1RyZWVOb2RlV2lsbFN0YXJ0UGFuR2VzdHVyZSgpOwogICAgIHZvaWQgc2Ny b2xsaW5nVHJlZU5vZGVXaWxsU3RhcnRTY3JvbGwoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1JlbW90ZUxheWVyVHJlZS9pb3MvUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0 b3JQcm94eUlPUy5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1JlbW90ZUxheWVyVHJlZS9p b3MvUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3JQcm94eUlPUy5tbQppbmRleCAxNzczOTBmNWE4 ZWIwZGEyMGZiNTcwZjA0YmYxMzlmY2E1YmE3MzcwLi41NDUyZWJhMjU4MjZjNWI3MDNmNDNjMzYz ZjFmYjhhNGQ0NDQ1ZmI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9SZW1v dGVMYXllclRyZWUvaW9zL1JlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHlJT1MubW0KKysr IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVlL2lvcy9SZW1vdGVTY3Jv bGxpbmdDb29yZGluYXRvclByb3h5SU9TLm1tCkBAIC0zMSw2ICszMSw3IEBACiAKICNpbXBvcnQg IlJlbW90ZUxheWVyVHJlZUhvc3QuaCIKICNpbXBvcnQgIlJlbW90ZUxheWVyVHJlZU5vZGUuaCIK KyNpbXBvcnQgIlNjcm9sbGluZ1RyZWVPdmVyZmxvd1Njcm9sbGluZ05vZGVJT1MuaCIKICNpbXBv cnQgIldlYlBhZ2VQcm94eS5oIgogI2ltcG9ydCA8VUlLaXQvVUlWaWV3Lmg+CiAjaW1wb3J0IDxX ZWJDb3JlL1Njcm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxpbmdOb2RlLmg+CkBAIC01Miw2ICs1Mywx NyBAQAogbmFtZXNwYWNlIFdlYktpdCB7CiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAorVUlT Y3JvbGxWaWV3ICpSZW1vdGVTY3JvbGxpbmdDb29yZGluYXRvclByb3h5OjpzY3JvbGxWaWV3Rm9y U2Nyb2xsaW5nTm9kZUlEKFdlYkNvcmU6OlNjcm9sbGluZ05vZGVJRCBub2RlSUQpIGNvbnN0Cit7 CisgICAgYXV0byogdHJlZU5vZGUgPSBtX3Njcm9sbGluZ1RyZWUtPm5vZGVGb3JJRChub2RlSUQp OworICAgIGlmICghaXM8U2Nyb2xsaW5nVHJlZU92ZXJmbG93U2Nyb2xsaW5nTm9kZT4odHJlZU5v ZGUpKQorICAgICAgICByZXR1cm4gbmlsOworCisgICAgYXV0byogc2Nyb2xsaW5nTm9kZSA9IGRv d25jYXN0PFNjcm9sbGluZ1RyZWVPdmVyZmxvd1Njcm9sbGluZ05vZGU+KHRyZWVOb2RlKTsKKyAg ICAvLyBBbGwgU2Nyb2xsaW5nVHJlZU92ZXJmbG93U2Nyb2xsaW5nTm9kZXMgYXJlIFNjcm9sbGlu Z1RyZWVPdmVyZmxvd1Njcm9sbGluZ05vZGVJT1Mgb24gaU9TLgorICAgIHJldHVybiBzdGF0aWNf Y2FzdDxTY3JvbGxpbmdUcmVlT3ZlcmZsb3dTY3JvbGxpbmdOb2RlSU9TKj4oc2Nyb2xsaW5nTm9k ZSktPnNjcm9sbFZpZXcoKTsKK30KKwogdm9pZCBSZW1vdGVTY3JvbGxpbmdDb29yZGluYXRvclBy b3h5Ojpjb25uZWN0U3RhdGVOb2RlTGF5ZXJzKFNjcm9sbGluZ1N0YXRlVHJlZSYgc3RhdGVUcmVl LCBjb25zdCBSZW1vdGVMYXllclRyZWVIb3N0JiBsYXllclRyZWVIb3N0KQogewogICAgIGZvciAo YXV0byYgY3Vyck5vZGUgOiBzdGF0ZVRyZWUubm9kZU1hcCgpLnZhbHVlcygpKSB7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9SZW1vdGVMYXllclRyZWUvaW9zL1Njcm9sbGlu Z1RyZWVPdmVyZmxvd1Njcm9sbGluZ05vZGVJT1MuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1JlbW90ZUxheWVyVHJlZS9pb3MvU2Nyb2xsaW5nVHJlZU92ZXJmbG93U2Nyb2xsaW5nTm9kZUlP Uy5oCmluZGV4IDViOTg2ZDJiNTk2MmRlMzBlOTRkZmVlY2MzZWI1ZGFjMzljYTZiYzYuLjhiNmU5 MWUyZjcxOGM3OGEyNjc1MTk3NzlkOWVmZmNjM2Q1NjQ4OWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1JlbW90ZUxheWVyVHJlZS9pb3MvU2Nyb2xsaW5nVHJlZU92ZXJmbG93 U2Nyb2xsaW5nTm9kZUlPUy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1JlbW90ZUxh eWVyVHJlZS9pb3MvU2Nyb2xsaW5nVHJlZU92ZXJmbG93U2Nyb2xsaW5nTm9kZUlPUy5oCkBAIC0y OSw2ICsyOSw4IEBACiAKICNpbmNsdWRlIDxXZWJDb3JlL1Njcm9sbGluZ1RyZWVPdmVyZmxvd1Nj cm9sbGluZ05vZGUuaD4KIAorT0JKQ19DTEFTUyBVSVNjcm9sbFZpZXc7CisKIG5hbWVzcGFjZSBX ZWJLaXQgewogCiBjbGFzcyBTY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZURlbGVnYXRlSU9TOwpA QCAtMzgsNiArNDAsOCBAQCBwdWJsaWM6CiAgICAgc3RhdGljIFJlZjxTY3JvbGxpbmdUcmVlT3Zl cmZsb3dTY3JvbGxpbmdOb2RlSU9TPiBjcmVhdGUoV2ViQ29yZTo6U2Nyb2xsaW5nVHJlZSYsIFdl YkNvcmU6OlNjcm9sbGluZ05vZGVJRCk7CiAgICAgdmlydHVhbCB+U2Nyb2xsaW5nVHJlZU92ZXJm bG93U2Nyb2xsaW5nTm9kZUlPUygpOwogCisgICAgVUlTY3JvbGxWaWV3KiBzY3JvbGxWaWV3KCkg Y29uc3Q7CisKIHByaXZhdGU6CiAgICAgU2Nyb2xsaW5nVHJlZU92ZXJmbG93U2Nyb2xsaW5nTm9k ZUlPUyhXZWJDb3JlOjpTY3JvbGxpbmdUcmVlJiwgV2ViQ29yZTo6U2Nyb2xsaW5nTm9kZUlEKTsK IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVlL2lv cy9TY3JvbGxpbmdUcmVlT3ZlcmZsb3dTY3JvbGxpbmdOb2RlSU9TLm1tIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVlL2lvcy9TY3JvbGxpbmdUcmVlT3ZlcmZsb3dTY3Jv bGxpbmdOb2RlSU9TLm1tCmluZGV4IDE4ZmUwODg1YmZjOTY3MDE1MTFlZmIyNTMyYmE1NjgzZjQ3 OGJlOGEuLmI1NmUyZWE2NGRhNTIwMzFkZmFmMTI4ZWMyNDhjZDE1YzcxMDA5MjYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1JlbW90ZUxheWVyVHJlZS9pb3MvU2Nyb2xsaW5n VHJlZU92ZXJmbG93U2Nyb2xsaW5nTm9kZUlPUy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9SZW1vdGVMYXllclRyZWUvaW9zL1Njcm9sbGluZ1RyZWVPdmVyZmxvd1Njcm9sbGluZ05v ZGVJT1MubW0KQEAgLTUxLDYgKzUxLDExIEBAIFNjcm9sbGluZ1RyZWVPdmVyZmxvd1Njcm9sbGlu Z05vZGVJT1M6On5TY3JvbGxpbmdUcmVlT3ZlcmZsb3dTY3JvbGxpbmdOb2RlSU9TKCkKIHsKIH0K IAorVUlTY3JvbGxWaWV3KiBTY3JvbGxpbmdUcmVlT3ZlcmZsb3dTY3JvbGxpbmdOb2RlSU9TOjpz Y3JvbGxWaWV3KCkgY29uc3QKK3sKKyAgICByZXR1cm4gbV9zY3JvbGxpbmdOb2RlRGVsZWdhdGUt PnNjcm9sbFZpZXcoKTsKK30KKwogdm9pZCBTY3JvbGxpbmdUcmVlT3ZlcmZsb3dTY3JvbGxpbmdO b2RlSU9TOjpjb21taXRTdGF0ZUJlZm9yZUNoaWxkcmVuKGNvbnN0IFdlYkNvcmU6OlNjcm9sbGlu Z1N0YXRlTm9kZSYgc3RhdGVOb2RlKQogewogICAgIGlmIChzdGF0ZU5vZGUuaGFzQ2hhbmdlZFBy b3BlcnR5KFNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZTo6U2Nyb2xsQ29udGFpbmVyTGF5ZXIp KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVlL2lv cy9TY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZURlbGVnYXRlSU9TLmggYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9SZW1vdGVMYXllclRyZWUvaW9zL1Njcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2Rl RGVsZWdhdGVJT1MuaAppbmRleCA3ODhkMWM5YzEwZjQ5MjYwZTJhNmQyYjQzNzM3Y2YxYzBjNjkx NTU3Li42NDg5YThlNzQ0MmQ3YjE3MDUyOTViNjJlZWI1YzAyNWM3YTliMzNhIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9SZW1vdGVMYXllclRyZWUvaW9zL1Njcm9sbGluZ1Ry ZWVTY3JvbGxpbmdOb2RlRGVsZWdhdGVJT1MuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9SZW1vdGVMYXllclRyZWUvaW9zL1Njcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlRGVsZWdhdGVJ T1MuaApAQCAtNzQsMTAgKzc0LDkgQEAgcHVibGljOgogI2VuZGlmCiAKICAgICBVSVNjcm9sbFZp ZXcgKmZpbmRBY3RpbmdTY3JvbGxQYXJlbnQoVUlTY3JvbGxWaWV3ICopOwotCi1wcml2YXRlOgog ICAgIFVJU2Nyb2xsVmlldyAqc2Nyb2xsVmlldygpIGNvbnN0OwogCitwcml2YXRlOgogICAgIFJl dGFpblB0cjxDQUxheWVyPiBtX3Njcm9sbExheWVyOwogICAgIFJldGFpblB0cjxDQUxheWVyPiBt X3Njcm9sbGVkQ29udGVudHNMYXllcjsKICAgICBSZXRhaW5QdHI8V0tTY3JvbGxpbmdOb2RlU2Ny b2xsVmlld0RlbGVnYXRlPiBtX3Njcm9sbFZpZXdEZWxlZ2F0ZTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tIGIvU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0KaW5kZXggZjM2NzJjYTBi MzIxYzMyNTkxYWRjNWZjOWU5ZDQwMTlkNTc4NTRmOS4uMjQ1ZGI5YmNkYTJiNDEyN2M3ZGRiM2U2 MzM0YmYzMDVjNzM5N2JlMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl YlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0KKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl YlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0KQEAgLTI2NzksNiArMjY3OSwxNCBAQCBzdGF0aWMgdm9p ZCBlbGVtZW50UG9zaXRpb25JbmZvcm1hdGlvbihXZWJQYWdlJiBwYWdlLCBFbGVtZW50JiBlbGVt ZW50LCBjb25zdCBJbgogI2VuZGlmCiAgICAgfQogCisgICAgYXV0byogZWxlbWVudEZvclNjcm9s bFRlc3RpbmcgPSBsaW5rRWxlbWVudCA/IGxpbmtFbGVtZW50IDogJmVsZW1lbnQ7CisgICAgaWYg KGF1dG8qIHJlbmRlcmVyID0gZWxlbWVudEZvclNjcm9sbFRlc3RpbmctPnJlbmRlcmVyKCkpIHsK KyNpZiBFTkFCTEUoQVNZTkNfU0NST0xMSU5HKQorICAgICAgICBpZiAoYXV0byogc2Nyb2xsaW5n Q29vcmRpbmF0b3IgPSBwYWdlLnNjcm9sbGluZ0Nvb3JkaW5hdG9yKCkpCisgICAgICAgICAgICBp bmZvLmNvbnRhaW5lclNjcm9sbGluZ05vZGVJRCA9IHNjcm9sbGluZ0Nvb3JkaW5hdG9yLT5zY3Jv bGxhYmxlQ29udGFpbmVyTm9kZUlEKCpyZW5kZXJlcik7CisjZW5kaWYKKyAgICB9CisKICAgICBp ZiAoYXV0byogcmVuZGVyZXIgPSBlbGVtZW50LnJlbmRlcmVyKCkpIHsKICAgICAgICAgaWYgKHJl bmRlcmVyLT5pc1JlbmRlckltYWdlKCkpCiAgICAgICAgICAgICBpbWFnZVBvc2l0aW9uSW5mb3Jt YXRpb24ocGFnZSwgZWxlbWVudCwgcmVxdWVzdCwgaW5mbyk7Cg==