226756 2021-06-07 22:04:28 -0700 Require that callsites of `SnapshotOptions` specify a `PixelFormat` and `DestinationColorSpace` 2021-06-08 09:54:19 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 226730 1 hi hi ews-watchlist hi joepeck megan_gardner sam thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1767668 0 hi 2021-06-07 22:04:28 -0700 followup after r278565 1767671 1 430810 hi 2021-06-07 22:22:10 -0700 Created attachment 430810 Patch 1767794 2 430810 sam 2021-06-08 09:08:56 -0700 Comment on attachment 430810 Patch Thanks. 1767806 3 ews-feeder 2021-06-08 09:53:14 -0700 Committed r278614 (238601@main): <https://commits.webkit.org/238601@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 430810. 1767807 4 webkit-bug-importer 2021-06-08 09:54:19 -0700 <rdar://problem/79016850> 430810 2021-06-07 22:22:10 -0700 2021-06-08 09:53:15 -0700 Patch bug-226756-20210607232209.patch text/plain 14040 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3MjMwNjRiMzQ1YTZhMWI0YmM5YjkxMDQ5MmVkMzMwZjA1MzFhMzA1Li5i NzNhY2YwODgxODFjNjlhZTA2YWI0ODYzN2I1MjQwY2U0ZjMzNGM2IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMzcgQEAKKzIwMjEtMDYtMDcgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29t PgorCisgICAgICAgIFJlcXVpcmUgdGhhdCBjYWxsc2l0ZXMgb2YgYFNuYXBzaG90T3B0aW9uc2Ag c3BlY2lmeSBhIGBQaXhlbEZvcm1hdGAgYW5kIGBEZXN0aW5hdGlvbkNvbG9yU3BhY2VgCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjY3NTYKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBEb24ndCB3cmFwIGBQ aXhlbEZvcm1hdGAgb3IgYERlc3RpbmF0aW9uQ29sb3JTcGFjZWAgd2l0aCBgc3RkOjpvcHRpb25h bGAgYXMgd2Ugd2FudCBlYWNoCisgICAgICAgIGNhbGxzaXRlIHRvIGV4cGxpY2l0eSBjb25maWd1 cmUgdGhlbS4gVGhpcyBtYWtlcyBpdCBlYXNpZXIgdG8gZmluZCB3aGVyZSB2YWx1ZXMgZm9yIGVh Y2gKKyAgICAgICAgYXJlIHVzZWQgYXMgdGhlcmUncyBubyBpbXBsaWNpdCBiZWhhdmlvci4KKwor ICAgICAgICBObyBiZWhhdmlvciBjaGFuZ2UuIEZvbGxvd3VwIGFmdGVyIHIyNzg1NjUuCisKKyAg ICAgICAgKiBwYWdlL0ZyYW1lU25hcHNob3R0aW5nLmg6CisgICAgICAgICogcGFnZS9GcmFtZVNu YXBzaG90dGluZy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpzbmFwc2hvdEZyYW1lUmVjdCk6Cisg ICAgICAgIChXZWJDb3JlOjpzbmFwc2hvdEZyYW1lUmVjdFdpdGhDbGlwKToKKyAgICAgICAgKFdl YkNvcmU6OnNuYXBzaG90Tm9kZSk6CisgICAgICAgIChXZWJDb3JlOjpzbmFwc2hvdFNlbGVjdGlv bik6CisKKyAgICAgICAgKiBpbnNwZWN0b3IvYWdlbnRzL0luc3BlY3RvclBhZ2VBZ2VudC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JQYWdlQWdlbnQ6OnNuYXBzaG90Tm9kZSk6Cisg ICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JQYWdlQWdlbnQ6OnNuYXBzaG90UmVjdCk6CisgICAg ICAgICogcGFnZS9QYWdlQ29uc29sZUNsaWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQYWdl Q29uc29sZUNsaWVudDo6c2NyZWVuc2hvdCk6CisgICAgICAgICogcGFnZS9UZXh0SW5kaWNhdG9y LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnNuYXBzaG90T3B0aW9uc0ZvclRleHRJbmRpY2F0b3JP cHRpb25zKToKKyAgICAgICAgKFdlYkNvcmU6OnRha2VTbmFwc2hvdHMpOgorICAgICAgICAqIHBs YXRmb3JtL0RyYWdJbWFnZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjcmVhdGVEcmFnSW1hZ2VG b3JOb2RlKToKKyAgICAgICAgKFdlYkNvcmU6OmNyZWF0ZURyYWdJbWFnZUZvclNlbGVjdGlvbik6 CisgICAgICAgIChXZWJDb3JlOjpjcmVhdGVEcmFnSW1hZ2VGb3JSYW5nZSk6CisgICAgICAgIChX ZWJDb3JlOjpjcmVhdGVEcmFnSW1hZ2VGb3JJbWFnZSk6CisKIDIwMjEtMDYtMDcgIEFsZXggQ2hy aXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBBZG9wdCBTZWNU cnVzdEdldENlcnRpZmljYXRlQXRJbmRleCByZXBsYWNlbWVudCB3aGVyZSBhdmFpbGFibGUKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VM b2cKaW5kZXggM2UyMWYxZTBkYjFhODViYTVmNWRhNWYwMmU3Y2U3Y2Y4MzVmODg0MS4uNjk0ZTY3 ZGE2ZDcwOWViZjA1YzNiNTk5NGNkMDhhY2E3ZmVkYjRkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx OSBAQAorMjAyMS0wNi0wNyAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CisKKyAg ICAgICAgUmVxdWlyZSB0aGF0IGNhbGxzaXRlcyBvZiBgU25hcHNob3RPcHRpb25zYCBzcGVjaWZ5 IGEgYFBpeGVsRm9ybWF0YCBhbmQgYERlc3RpbmF0aW9uQ29sb3JTcGFjZWAKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNjc1NgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERvbid0IHdyYXAgYFBpeGVsRm9y bWF0YCBvciBgRGVzdGluYXRpb25Db2xvclNwYWNlYCB3aXRoIGBzdGQ6Om9wdGlvbmFsYCBhcyB3 ZSB3YW50IGVhY2gKKyAgICAgICAgY2FsbHNpdGUgdG8gZXhwbGljaXR5IGNvbmZpZ3VyZSB0aGVt LiBUaGlzIG1ha2VzIGl0IGVhc2llciB0byBmaW5kIHdoZXJlIHZhbHVlcyBmb3IgZWFjaAorICAg ICAgICBhcmUgdXNlZCBhcyB0aGVyZSdzIG5vIGltcGxpY2l0IGJlaGF2aW9yLgorCisgICAgICAg IE5vIGJlaGF2aW9yIGNoYW5nZS4gRm9sbG93dXAgYWZ0ZXIgcjI3ODU2NS4KKworICAgICAgICAq IFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJGcmFtZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkZy YW1lOjpjcmVhdGVTZWxlY3Rpb25TbmFwc2hvdCBjb25zdCk6CisKIDIwMjEtMDYtMDcgIEFsZXgg Q2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBBZG9wdCBT ZWNUcnVzdEdldENlcnRpZmljYXRlQXRJbmRleCByZXBsYWNlbWVudCB3aGVyZSBhdmFpbGFibGUK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yUGFn ZUFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yUGFn ZUFnZW50LmNwcAppbmRleCBmMDgwNmVkMzZkYzZiNzJmYjlhOTdjNGE0ZmIyMmJjOGEwOTU2ZTFh Li42NDExNzQyNWJhNWM1YjZhNzFkMTkwZGZjOGYxZWVmYjRmZmM2MzdjIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdlbnRzL0luc3BlY3RvclBhZ2VBZ2VudC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JQYWdlQWdlbnQuY3Bw CkBAIC0xMDcyLDcgKzEwNzIsNyBAQCBQcm90b2NvbDo6RXJyb3JTdHJpbmdPcjxTdHJpbmc+IElu c3BlY3RvclBhZ2VBZ2VudDo6c25hcHNob3ROb2RlKFByb3RvY29sOjpET006OgogICAgIGlmICgh bm9kZSkKICAgICAgICAgcmV0dXJuIG1ha2VVbmV4cGVjdGVkKGVycm9yU3RyaW5nKTsKIAotICAg IGF1dG8gc25hcHNob3QgPSBXZWJDb3JlOjpzbmFwc2hvdE5vZGUobV9pbnNwZWN0ZWRQYWdlLm1h aW5GcmFtZSgpLCAqbm9kZSk7CisgICAgYXV0byBzbmFwc2hvdCA9IFdlYkNvcmU6OnNuYXBzaG90 Tm9kZShtX2luc3BlY3RlZFBhZ2UubWFpbkZyYW1lKCksICpub2RlLCB7IHsgfSwgUGl4ZWxGb3Jt YXQ6OkJHUkE4LCBEZXN0aW5hdGlvbkNvbG9yU3BhY2U6OlNSR0IoKSB9KTsKICAgICBpZiAoIXNu YXBzaG90KQogICAgICAgICByZXR1cm4gbWFrZVVuZXhwZWN0ZWQoIkNvdWxkIG5vdCBjYXB0dXJl IHNuYXBzaG90Il9zKTsKIApAQCAtMTA4MSw3ICsxMDgxLDcgQEAgUHJvdG9jb2w6OkVycm9yU3Ry aW5nT3I8U3RyaW5nPiBJbnNwZWN0b3JQYWdlQWdlbnQ6OnNuYXBzaG90Tm9kZShQcm90b2NvbDo6 RE9NOjoKIAogUHJvdG9jb2w6OkVycm9yU3RyaW5nT3I8U3RyaW5nPiBJbnNwZWN0b3JQYWdlQWdl bnQ6OnNuYXBzaG90UmVjdChpbnQgeCwgaW50IHksIGludCB3aWR0aCwgaW50IGhlaWdodCwgUHJv dG9jb2w6OlBhZ2U6OkNvb3JkaW5hdGVTeXN0ZW0gY29vcmRpbmF0ZVN5c3RlbSkKIHsKLSAgICBT bmFwc2hvdE9wdGlvbnMgb3B0aW9uczsKKyAgICBTbmFwc2hvdE9wdGlvbnMgb3B0aW9ucyB7IHsg fSwgUGl4ZWxGb3JtYXQ6OkJHUkE4LCBEZXN0aW5hdGlvbkNvbG9yU3BhY2U6OlNSR0IoKSB9Owog ICAgIGlmIChjb29yZGluYXRlU3lzdGVtID09IFByb3RvY29sOjpQYWdlOjpDb29yZGluYXRlU3lz dGVtOjpWaWV3cG9ydCkKICAgICAgICAgb3B0aW9ucy5mbGFncy5hZGQoU25hcHNob3RGbGFnczo6 SW5WaWV3Q29vcmRpbmF0ZXMpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0Zy YW1lU25hcHNob3R0aW5nLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVTbmFwc2hvdHRp bmcuY3BwCmluZGV4IDFhOGViMjM2ZjMyNmE5ZjhmYjQ1YzdkOTg4Yjg3OTZiMmIyMzcyMjMuLjNi MzEyN2U0OGUwZjViNDdjODEzYTVkZTViYmQ5NDRhZjM0MWI0YzMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvRnJhbWVTbmFwc2hvdHRpbmcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvRnJhbWVTbmFwc2hvdHRpbmcuY3BwCkBAIC0zMSw3ICszMSw2IEBACiAjaW5jbHVkZSAi Y29uZmlnLmgiCiAjaW5jbHVkZSAiRnJhbWVTbmFwc2hvdHRpbmcuaCIKIAotI2luY2x1ZGUgIkRl c3RpbmF0aW9uQ29sb3JTcGFjZS5oIgogI2luY2x1ZGUgIkRvY3VtZW50LmgiCiAjaW5jbHVkZSAi RmxvYXRSZWN0LmgiCiAjaW5jbHVkZSAiRnJhbWUuaCIKQEAgLTQwLDcgKzM5LDYgQEAKICNpbmNs dWRlICJHcmFwaGljc0NvbnRleHQuaCIKICNpbmNsdWRlICJJbWFnZUJ1ZmZlci5oIgogI2luY2x1 ZGUgIlBhZ2UuaCIKLSNpbmNsdWRlICJQaXhlbEZvcm1hdC5oIgogI2luY2x1ZGUgIlJlbmRlck9i amVjdC5oIgogI2luY2x1ZGUgIlNldHRpbmdzLmgiCiAjaW5jbHVkZSA8d3RmL09wdGlvblNldC5o PgpAQCAtMTE0LDcgKzExMiw3IEBAIFJlZlB0cjxJbWFnZUJ1ZmZlcj4gc25hcHNob3RGcmFtZVJl Y3RXaXRoQ2xpcChGcmFtZSYgZnJhbWUsIGNvbnN0IEludFJlY3QmIGltYWdlCiAgICAgaWYgKG9w dGlvbnMuZmxhZ3MuY29udGFpbnMoU25hcHNob3RGbGFnczo6UGFpbnRXaXRoSW50ZWdyYWxTY2Fs ZUZhY3RvcikpCiAgICAgICAgIHNjYWxlRmFjdG9yID0gY2VpbGYoc2NhbGVGYWN0b3IpOwogCi0g ICAgYXV0byBidWZmZXIgPSBJbWFnZUJ1ZmZlcjo6Y3JlYXRlKGltYWdlUmVjdC5zaXplKCksIFJl bmRlcmluZ01vZGU6OlVuYWNjZWxlcmF0ZWQsIHNjYWxlRmFjdG9yLCBvcHRpb25zLmNvbG9yU3Bh Y2UudmFsdWVfb3IoRGVzdGluYXRpb25Db2xvclNwYWNlOjpTUkdCKCkpLCBvcHRpb25zLnBpeGVs Rm9ybWF0LnZhbHVlX29yKFBpeGVsRm9ybWF0OjpCR1JBOCkpOworICAgIGF1dG8gYnVmZmVyID0g SW1hZ2VCdWZmZXI6OmNyZWF0ZShpbWFnZVJlY3Quc2l6ZSgpLCBSZW5kZXJpbmdNb2RlOjpVbmFj Y2VsZXJhdGVkLCBzY2FsZUZhY3Rvciwgb3B0aW9ucy5jb2xvclNwYWNlLCBvcHRpb25zLnBpeGVs Rm9ybWF0KTsKICAgICBpZiAoIWJ1ZmZlcikKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAg YnVmZmVyLT5jb250ZXh0KCkudHJhbnNsYXRlKC1pbWFnZVJlY3QueCgpLCAtaW1hZ2VSZWN0Lnko KSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lU25hcHNob3R0aW5nLmgg Yi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lU25hcHNob3R0aW5nLmgKaW5kZXggMDg4NmE3MTQ4 Njc2OGM4NDMxNjY5MzY4ODdkOGEzOGFmZjZhODZjOS4uMGYxNzc3MTM2YjNiYmZjNTQ1NTU1Mzhl Yjg2NjllMzAwNmRhMTZlNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVNu YXBzaG90dGluZy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVTbmFwc2hvdHRpbmcu aApAQCAtMjksMTkgKzI5LDE4IEBACiAKICNwcmFnbWEgb25jZQogCisjaW5jbHVkZSAiRGVzdGlu YXRpb25Db2xvclNwYWNlLmgiCisjaW5jbHVkZSAiUGl4ZWxGb3JtYXQuaCIKICNpbmNsdWRlIDxt ZW1vcnk+Ci0jaW5jbHVkZSA8b3B0aW9uYWw+CiAjaW5jbHVkZSA8d3RmL0ZvcndhcmQuaD4KIAog bmFtZXNwYWNlIFdlYkNvcmUgewogCi1jbGFzcyBEZXN0aW5hdGlvbkNvbG9yU3BhY2U7CiBjbGFz cyBGbG9hdFJlY3Q7CiBjbGFzcyBGcmFtZTsKIGNsYXNzIEludFJlY3Q7CiBjbGFzcyBJbWFnZUJ1 ZmZlcjsKIGNsYXNzIE5vZGU7Ci1lbnVtIGNsYXNzIFBpeGVsRm9ybWF0IDogdWludDhfdDsKIAog ZW51bSBjbGFzcyBTbmFwc2hvdEZsYWdzIDogdWludDhfdCB7CiAgICAgRXhjbHVkZVNlbGVjdGlv bkhpZ2hsaWdodGluZyA9IDEgPDwgMCwKQEAgLTU0LDE0ICs1MywxNCBAQCBlbnVtIGNsYXNzIFNu YXBzaG90RmxhZ3MgOiB1aW50OF90IHsKIH07CiAKIHN0cnVjdCBTbmFwc2hvdE9wdGlvbnMgewot ICAgIE9wdGlvblNldDxTbmFwc2hvdEZsYWdzPiBmbGFncyB7IH07Ci0gICAgc3RkOjpvcHRpb25h bDxQaXhlbEZvcm1hdD4gcGl4ZWxGb3JtYXQgeyB9OwotICAgIHN0ZDo6b3B0aW9uYWw8RGVzdGlu YXRpb25Db2xvclNwYWNlPiBjb2xvclNwYWNlIHsgfTsKKyAgICBPcHRpb25TZXQ8U25hcHNob3RG bGFncz4gZmxhZ3M7CisgICAgUGl4ZWxGb3JtYXQgcGl4ZWxGb3JtYXQ7CisgICAgRGVzdGluYXRp b25Db2xvclNwYWNlIGNvbG9yU3BhY2U7CiB9OwogCi1XRUJDT1JFX0VYUE9SVCBSZWZQdHI8SW1h Z2VCdWZmZXI+IHNuYXBzaG90RnJhbWVSZWN0KEZyYW1lJiwgY29uc3QgSW50UmVjdCYsIFNuYXBz aG90T3B0aW9ucyYmID0geyB9KTsKLVJlZlB0cjxJbWFnZUJ1ZmZlcj4gc25hcHNob3RGcmFtZVJl Y3RXaXRoQ2xpcChGcmFtZSYsIGNvbnN0IEludFJlY3QmLCBjb25zdCBWZWN0b3I8RmxvYXRSZWN0 PiYgY2xpcFJlY3RzLCBTbmFwc2hvdE9wdGlvbnMmJiA9IHsgfSk7Ci1SZWZQdHI8SW1hZ2VCdWZm ZXI+IHNuYXBzaG90Tm9kZShGcmFtZSYsIE5vZGUmLCBTbmFwc2hvdE9wdGlvbnMmJiA9IHsgfSk7 Ci1XRUJDT1JFX0VYUE9SVCBSZWZQdHI8SW1hZ2VCdWZmZXI+IHNuYXBzaG90U2VsZWN0aW9uKEZy YW1lJiwgU25hcHNob3RPcHRpb25zJiYgPSB7IH0pOworV0VCQ09SRV9FWFBPUlQgUmVmUHRyPElt YWdlQnVmZmVyPiBzbmFwc2hvdEZyYW1lUmVjdChGcmFtZSYsIGNvbnN0IEludFJlY3QmLCBTbmFw c2hvdE9wdGlvbnMmJik7CitSZWZQdHI8SW1hZ2VCdWZmZXI+IHNuYXBzaG90RnJhbWVSZWN0V2l0 aENsaXAoRnJhbWUmLCBjb25zdCBJbnRSZWN0JiwgY29uc3QgVmVjdG9yPEZsb2F0UmVjdD4mIGNs aXBSZWN0cywgU25hcHNob3RPcHRpb25zJiYpOworUmVmUHRyPEltYWdlQnVmZmVyPiBzbmFwc2hv dE5vZGUoRnJhbWUmLCBOb2RlJiwgU25hcHNob3RPcHRpb25zJiYpOworV0VCQ09SRV9FWFBPUlQg UmVmUHRyPEltYWdlQnVmZmVyPiBzbmFwc2hvdFNlbGVjdGlvbihGcmFtZSYsIFNuYXBzaG90T3B0 aW9ucyYmKTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGFnZS9QYWdlQ29uc29sZUNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1Bh Z2VDb25zb2xlQ2xpZW50LmNwcAppbmRleCAyMjRlNWMzY2YyYzQzNTMwZGI0ZmI4NmVjZmNiNDIz MzBlMmY0N2NmLi5lNzE2NjBlMWYyMmVkZDljYWU4YjhkM2I3MjFkMGQ1NDc3Y2NkNjdjIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VDb25zb2xlQ2xpZW50LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VDb25zb2xlQ2xpZW50LmNwcApAQCAtMzU4LDcgKzM1OCw3 IEBAIHZvaWQgUGFnZUNvbnNvbGVDbGllbnQ6OnNjcmVlbnNob3QoSlNDOjpKU0dsb2JhbE9iamVj dCogbGV4aWNhbEdsb2JhbE9iamVjdCwgUmVmCiAKICAgICAgICAgICAgICAgICBpZiAoZGF0YVVS TC5pc0VtcHR5KCkpIHsKICAgICAgICAgICAgICAgICAgICAgaWYgKCFzbmFwc2hvdCkKLSAgICAg ICAgICAgICAgICAgICAgICAgIHNuYXBzaG90ID0gV2ViQ29yZTo6c25hcHNob3ROb2RlKG1fcGFn ZS5tYWluRnJhbWUoKSwgKm5vZGUpOworICAgICAgICAgICAgICAgICAgICAgICAgc25hcHNob3Qg PSBXZWJDb3JlOjpzbmFwc2hvdE5vZGUobV9wYWdlLm1haW5GcmFtZSgpLCAqbm9kZSwgeyB7IH0s IFBpeGVsRm9ybWF0OjpCR1JBOCwgRGVzdGluYXRpb25Db2xvclNwYWNlOjpTUkdCKCkgfSk7CiAK ICAgICAgICAgICAgICAgICAgICAgaWYgKHNuYXBzaG90KQogICAgICAgICAgICAgICAgICAgICAg ICAgZGF0YVVSTCA9IHNuYXBzaG90LT50b0RhdGFVUkwoImltYWdlL3BuZyJfcywgc3RkOjpudWxs b3B0LCBQcmVzZXJ2ZVJlc29sdXRpb246Olllcyk7CkBAIC00MDQsNyArNDA0LDcgQEAgdm9pZCBQ YWdlQ29uc29sZUNsaWVudDo6c2NyZWVuc2hvdChKU0M6OkpTR2xvYmFsT2JqZWN0KiBsZXhpY2Fs R2xvYmFsT2JqZWN0LCBSZWYKICAgICAgICAgaWYgKCF0YXJnZXQpIHsKICAgICAgICAgICAgIC8v IElmIG5vIHRhcmdldCBpcyBwcm92aWRlZCwgY2FwdHVyZSBhbiBpbWFnZSBvZiB0aGUgdmlld3Bv cnQuCiAgICAgICAgICAgICBJbnRSZWN0IGltYWdlUmVjdChJbnRQb2ludDo6emVybygpLCBtX3Bh Z2UubWFpbkZyYW1lKCkudmlldygpLT5zaXplRm9yVmlzaWJsZUNvbnRlbnQoKSk7Ci0gICAgICAg ICAgICBpZiAoYXV0byBzbmFwc2hvdCA9IFdlYkNvcmU6OnNuYXBzaG90RnJhbWVSZWN0KG1fcGFn ZS5tYWluRnJhbWUoKSwgaW1hZ2VSZWN0LCB7IHsgU25hcHNob3RGbGFnczo6SW5WaWV3Q29vcmRp bmF0ZXMgfSB9KSkKKyAgICAgICAgICAgIGlmIChhdXRvIHNuYXBzaG90ID0gV2ViQ29yZTo6c25h cHNob3RGcmFtZVJlY3QobV9wYWdlLm1haW5GcmFtZSgpLCBpbWFnZVJlY3QsIHsgeyBTbmFwc2hv dEZsYWdzOjpJblZpZXdDb29yZGluYXRlcyB9LCBQaXhlbEZvcm1hdDo6QkdSQTgsIERlc3RpbmF0 aW9uQ29sb3JTcGFjZTo6U1JHQigpIH0pKQogICAgICAgICAgICAgICAgIGRhdGFVUkwgPSBzbmFw c2hvdC0+dG9EYXRhVVJMKCJpbWFnZS9wbmciX3MsIHN0ZDo6bnVsbG9wdCwgUHJlc2VydmVSZXNv bHV0aW9uOjpZZXMpOwogICAgICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvVGV4dEluZGljYXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1RleHRJbmRpY2F0b3Iu Y3BwCmluZGV4IGE0OTcyYjRmMDU1MDU5NzkzMDIwMDMxYzc4YWQ0NTY4NGI5NGUwZGYuLjg2ZjEw ZDliNWVkMzRiYzBlMjBlYmI2OTMyZmY0YWQ5NGI3NjYzNGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvVGV4dEluZGljYXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9U ZXh0SW5kaWNhdG9yLmNwcApAQCAtMTI3LDggKzEyNyw3IEBAIHN0YXRpYyBib29sIGhhc05vbklu bGluZU9yUmVwbGFjZWRFbGVtZW50cyhjb25zdCBTaW1wbGVSYW5nZSYgcmFuZ2UpCiAKIHN0YXRp YyBTbmFwc2hvdE9wdGlvbnMgc25hcHNob3RPcHRpb25zRm9yVGV4dEluZGljYXRvck9wdGlvbnMo T3B0aW9uU2V0PFRleHRJbmRpY2F0b3JPcHRpb24+IG9wdGlvbnMpCiB7Ci0gICAgU25hcHNob3RP cHRpb25zIHNuYXBzaG90T3B0aW9uczsKLSAgICBzbmFwc2hvdE9wdGlvbnMuZmxhZ3MuYWRkKFNu YXBzaG90RmxhZ3M6OlBhaW50V2l0aEludGVncmFsU2NhbGVGYWN0b3IpOworICAgIFNuYXBzaG90 T3B0aW9ucyBzbmFwc2hvdE9wdGlvbnMgeyB7IFNuYXBzaG90RmxhZ3M6OlBhaW50V2l0aEludGVn cmFsU2NhbGVGYWN0b3IgfSwgUGl4ZWxGb3JtYXQ6OkJHUkE4LCBEZXN0aW5hdGlvbkNvbG9yU3Bh Y2U6OlNSR0IoKSB9OwogCiAgICAgaWYgKCFvcHRpb25zLmNvbnRhaW5zKFRleHRJbmRpY2F0b3JP cHRpb246OlBhaW50QWxsQ29udGVudCkpIHsKICAgICAgICAgaWYgKG9wdGlvbnMuY29udGFpbnMo VGV4dEluZGljYXRvck9wdGlvbjo6UGFpbnRCYWNrZ3JvdW5kcykpCkBAIC0xNjIsMTQgKzE2MSwx NCBAQCBzdGF0aWMgYm9vbCB0YWtlU25hcHNob3RzKFRleHRJbmRpY2F0b3JEYXRhJiBkYXRhLCBG cmFtZSYgZnJhbWUsIEludFJlY3Qgc25hcHNobwogCiAgICAgaWYgKGRhdGEub3B0aW9ucy5jb250 YWlucyhUZXh0SW5kaWNhdG9yT3B0aW9uOjpJbmNsdWRlU25hcHNob3RXaXRoU2VsZWN0aW9uSGln aGxpZ2h0KSkgewogICAgICAgICBmbG9hdCBzbmFwc2hvdFNjYWxlRmFjdG9yOwotICAgICAgICBk YXRhLmNvbnRlbnRJbWFnZVdpdGhIaWdobGlnaHQgPSB0YWtlU25hcHNob3QoZnJhbWUsIHNuYXBz aG90UmVjdCwgeyB9LCBzbmFwc2hvdFNjYWxlRmFjdG9yLCBjbGlwUmVjdHNJbkRvY3VtZW50Q29v cmRpbmF0ZXMpOworICAgICAgICBkYXRhLmNvbnRlbnRJbWFnZVdpdGhIaWdobGlnaHQgPSB0YWtl U25hcHNob3QoZnJhbWUsIHNuYXBzaG90UmVjdCwgeyB7IH0sIFBpeGVsRm9ybWF0OjpCR1JBOCwg RGVzdGluYXRpb25Db2xvclNwYWNlOjpTUkdCKCkgfSwgc25hcHNob3RTY2FsZUZhY3RvciwgY2xp cFJlY3RzSW5Eb2N1bWVudENvb3JkaW5hdGVzKTsKICAgICAgICAgQVNTRVJUKCFkYXRhLmNvbnRl bnRJbWFnZVdpdGhIaWdobGlnaHQgfHwgZGF0YS5jb250ZW50SW1hZ2VTY2FsZUZhY3RvciA+PSBz bmFwc2hvdFNjYWxlRmFjdG9yKTsKICAgICB9CiAKICAgICBpZiAoZGF0YS5vcHRpb25zLmNvbnRh aW5zKFRleHRJbmRpY2F0b3JPcHRpb246OkluY2x1ZGVTbmFwc2hvdE9mQWxsVmlzaWJsZUNvbnRl bnRXaXRob3V0U2VsZWN0aW9uKSkgewogICAgICAgICBmbG9hdCBzbmFwc2hvdFNjYWxlRmFjdG9y OwogICAgICAgICBhdXRvIHNuYXBzaG90UmVjdCA9IGZyYW1lLnZpZXcoKS0+dmlzaWJsZUNvbnRl bnRSZWN0KCk7Ci0gICAgICAgIGRhdGEuY29udGVudEltYWdlV2l0aG91dFNlbGVjdGlvbiA9IHRh a2VTbmFwc2hvdChmcmFtZSwgc25hcHNob3RSZWN0LCB7IHsgU25hcHNob3RGbGFnczo6UGFpbnRF dmVyeXRoaW5nRXhjbHVkaW5nU2VsZWN0aW9uIH0gfSwgc25hcHNob3RTY2FsZUZhY3RvciwgeyB9 KTsKKyAgICAgICAgZGF0YS5jb250ZW50SW1hZ2VXaXRob3V0U2VsZWN0aW9uID0gdGFrZVNuYXBz aG90KGZyYW1lLCBzbmFwc2hvdFJlY3QsIHsgeyBTbmFwc2hvdEZsYWdzOjpQYWludEV2ZXJ5dGhp bmdFeGNsdWRpbmdTZWxlY3Rpb24gfSwgUGl4ZWxGb3JtYXQ6OkJHUkE4LCBEZXN0aW5hdGlvbkNv bG9yU3BhY2U6OlNSR0IoKSB9LCBzbmFwc2hvdFNjYWxlRmFjdG9yLCB7IH0pOwogICAgICAgICBk YXRhLmNvbnRlbnRJbWFnZVdpdGhvdXRTZWxlY3Rpb25SZWN0SW5Sb290Vmlld0Nvb3JkaW5hdGVz ID0gZnJhbWUudmlldygpLT5jb250ZW50c1RvUm9vdFZpZXcoc25hcHNob3RSZWN0KTsKICAgICB9 CiAgICAgCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9EcmFnSW1hZ2UuY3Bw IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vRHJhZ0ltYWdlLmNwcAppbmRleCA3YmM1MzZjZjVk YjUwZTcxYTA0OTViMjhlYjkzNzNlYzExOTllNTgzLi42ZGZlMGRkM2VhNGRhM2ExZjVmMGY2Yzc5 ZDZkMWEzYmYwMGMzMTU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9EcmFn SW1hZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0RyYWdJbWFnZS5jcHAKQEAg LTExOSwxNCArMTE5LDE0IEBAIHN0YXRpYyBEcmFnSW1hZ2VSZWYgY3JlYXRlRHJhZ0ltYWdlRnJv bVNuYXBzaG90KFJlZlB0cjxJbWFnZUJ1ZmZlcj4gc25hcHNob3QsIE5vCiBEcmFnSW1hZ2VSZWYg Y3JlYXRlRHJhZ0ltYWdlRm9yTm9kZShGcmFtZSYgZnJhbWUsIE5vZGUmIG5vZGUpCiB7CiAgICAg U2NvcGVkTm9kZURyYWdFbmFibGVyIGVuYWJsZURyYWcoZnJhbWUsIG5vZGUpOwotICAgIHJldHVy biBjcmVhdGVEcmFnSW1hZ2VGcm9tU25hcHNob3Qoc25hcHNob3ROb2RlKGZyYW1lLCBub2RlKSwg Jm5vZGUpOworICAgIHJldHVybiBjcmVhdGVEcmFnSW1hZ2VGcm9tU25hcHNob3Qoc25hcHNob3RO b2RlKGZyYW1lLCBub2RlLCB7IHsgfSwgUGl4ZWxGb3JtYXQ6OkJHUkE4LCBEZXN0aW5hdGlvbkNv bG9yU3BhY2U6OlNSR0IoKSB9KSwgJm5vZGUpOwogfQogCiAjaWYgIVBMQVRGT1JNKElPU19GQU1J TFkpIHx8ICFFTkFCTEUoRFJBR19TVVBQT1JUKQogCiBEcmFnSW1hZ2VSZWYgY3JlYXRlRHJhZ0lt YWdlRm9yU2VsZWN0aW9uKEZyYW1lJiBmcmFtZSwgVGV4dEluZGljYXRvckRhdGEmLCBib29sIGZv cmNlQmxhY2tUZXh0KQogewotICAgIFNuYXBzaG90T3B0aW9ucyBvcHRpb25zOworICAgIFNuYXBz aG90T3B0aW9ucyBvcHRpb25zIHsgeyB9LCBQaXhlbEZvcm1hdDo6QkdSQTgsIERlc3RpbmF0aW9u Q29sb3JTcGFjZTo6U1JHQigpIH07CiAgICAgaWYgKGZvcmNlQmxhY2tUZXh0KQogICAgICAgICBv cHRpb25zLmZsYWdzLmFkZChTbmFwc2hvdEZsYWdzOjpGb3JjZUJsYWNrVGV4dCk7CiAgICAgcmV0 dXJuIGNyZWF0ZURyYWdJbWFnZUZyb21TbmFwc2hvdChzbmFwc2hvdFNlbGVjdGlvbihmcmFtZSwg V1RGTW92ZShvcHRpb25zKSksIG51bGxwdHIpOwpAQCAtMTg0LDggKzE4NCw3IEBAIERyYWdJbWFn ZVJlZiBjcmVhdGVEcmFnSW1hZ2VGb3JSYW5nZShGcmFtZSYgZnJhbWUsIGNvbnN0IFNpbXBsZVJh bmdlJiByYW5nZSwgYm9vCiAgICAgaWYgKCFzdGFydFJlbmRlcmVyIHx8ICFlbmRSZW5kZXJlcikK ICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAKLSAgICBTbmFwc2hvdE9wdGlvbnMgb3B0aW9uczsK LSAgICBvcHRpb25zLmZsYWdzLmFkZChTbmFwc2hvdEZsYWdzOjpQYWludFNlbGVjdGlvbk9ubHkp OworICAgIFNuYXBzaG90T3B0aW9ucyBvcHRpb25zIHsgeyBTbmFwc2hvdEZsYWdzOjpQYWludFNl bGVjdGlvbk9ubHkgfSwgUGl4ZWxGb3JtYXQ6OkJHUkE4LCBEZXN0aW5hdGlvbkNvbG9yU3BhY2U6 OlNSR0IoKSB9OwogICAgIGlmIChmb3JjZUJsYWNrVGV4dCkKICAgICAgICAgb3B0aW9ucy5mbGFn cy5hZGQoU25hcHNob3RGbGFnczo6Rm9yY2VCbGFja1RleHQpOwogCkBAIC0yMTgsNyArMjE3LDcg QEAgRHJhZ0ltYWdlUmVmIGNyZWF0ZURyYWdJbWFnZUZvckltYWdlKEZyYW1lJiBmcmFtZSwgTm9k ZSYgbm9kZSwgSW50UmVjdCYgaW1hZ2VSZWMKICAgICBlbGVtZW50UmVjdCA9IHNuYXBwZWRJbnRS ZWN0KHRvcExldmVsUmVjdCk7CiAgICAgaW1hZ2VSZWN0ID0gcGFpbnRpbmdSZWN0OwogCi0gICAg cmV0dXJuIGNyZWF0ZURyYWdJbWFnZUZyb21TbmFwc2hvdChzbmFwc2hvdE5vZGUoZnJhbWUsIG5v ZGUpLCAmbm9kZSk7CisgICAgcmV0dXJuIGNyZWF0ZURyYWdJbWFnZUZyb21TbmFwc2hvdChzbmFw c2hvdE5vZGUoZnJhbWUsIG5vZGUsIHsgeyB9LCBQaXhlbEZvcm1hdDo6QkdSQTgsIERlc3RpbmF0 aW9uQ29sb3JTcGFjZTo6U1JHQigpIH0pLCAmbm9kZSk7CiB9CiAKICNpZiAhUExBVEZPUk0oSU9T X0ZBTUlMWSkgfHwgIUVOQUJMRShEUkFHX1NVUFBPUlQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJGcmFtZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlBy b2Nlc3MvV2ViUGFnZS9XZWJGcmFtZS5jcHAKaW5kZXggODE1MzBkNWVlOWNmMjYwYjgxMTFkOGQw NjYyMzA3MWM3NzVkMjkyOC4uOGYzYWRmYzFmNTNhNzUxZDc1YjlkZTE2NTIwYWZjNGQyMzIxOTdj YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViRnJhbWUu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkZyYW1lLmNwcApA QCAtODQyLDcgKzg0Miw3IEBAIFJldGFpblB0cjxDRkRhdGFSZWY+IFdlYkZyYW1lOjp3ZWJBcmNo aXZlRGF0YShGcmFtZUZpbHRlckZ1bmN0aW9uIGNhbGxiYWNrLCB2b2lkCiAKIFJlZlB0cjxTaGFy ZWFibGVCaXRtYXA+IFdlYkZyYW1lOjpjcmVhdGVTZWxlY3Rpb25TbmFwc2hvdCgpIGNvbnN0CiB7 Ci0gICAgYXV0byBzbmFwc2hvdCA9IHNuYXBzaG90U2VsZWN0aW9uKCpjb3JlRnJhbWUoKSwgeyB7 IFdlYkNvcmU6OlNuYXBzaG90RmxhZ3M6OkZvcmNlQmxhY2tUZXh0IH0gfSk7CisgICAgYXV0byBz bmFwc2hvdCA9IHNuYXBzaG90U2VsZWN0aW9uKCpjb3JlRnJhbWUoKSwgeyB7IFdlYkNvcmU6OlNu YXBzaG90RmxhZ3M6OkZvcmNlQmxhY2tUZXh0IH0sIFBpeGVsRm9ybWF0OjpCR1JBOCwgRGVzdGlu YXRpb25Db2xvclNwYWNlOjpTUkdCKCkgfSk7CiAgICAgaWYgKCFzbmFwc2hvdCkKICAgICAgICAg cmV0dXJuIG51bGxwdHI7CiAK