134773 2014-07-09 12:17:50 -0700 Use IOSurface ViewSnapshots everywhere on Mac, remove JPEG encoding path 2014-07-09 12:32:05 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thorton thorton andersca mitz simon.fraser oldest_to_newest 1021418 0 thorton 2014-07-09 12:17:50 -0700 It's effectively unreachable code, and makes the next big patch more annoying. 1021420 1 234651 thorton 2014-07-09 12:21:53 -0700 Created attachment 234651 patch 1021421 2 234651 andersca 2014-07-09 12:22:51 -0700 Comment on attachment 234651 patch View in context: https://bugs.webkit.org/attachment.cgi?id=234651&action=review > Source/WebCore/platform/graphics/cocoa/IOSurface.mm:79 > + RetainPtr<CGContextRef> surfaceContext = surface->ensurePlatformContext(); auto. 1021426 3 thorton 2014-07-09 12:32:05 -0700 http://trac.webkit.org/changeset/170925 234651 2014-07-09 12:21:53 -0700 2014-07-09 12:22:51 -0700 patch jpeg-remove.diff text/plain 12857 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4M2YxMmU0Li5mYWY0MjIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYg QEAKKzIwMTQtMDctMDkgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgUmVtb3ZlIHVudXNlZCBKUEVHLWVuY29kaW5nIFZpZXdTbmFwc2hvdCBjb2RlCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzQ3NzMKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYkNvcmUu ZXhwLmluOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0lPU3VyZmFjZS5oOgor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0lPU3VyZmFjZS5tbToKKyAgICAgICAg KElPU3VyZmFjZTo6Y3JlYXRlRnJvbUltYWdlKToKKyAgICAgICAgTW92ZSBtYWtlLWFuLUlPU3Vy ZmFjZS1mcm9tLWEtQ0dJbWFnZVJlZiBpbnRvIFdlYkNvcmU6OklPU3VyZmFjZS4KKwogMjAxNC0w Ny0wOSAgQnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBbV2lu XSBSZW1vdmUgdXNlIG9mICdncmVwJyBpbiBidWlsZCBzdGVwcwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvV2ViQ29yZS5leHAuaW4gYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgpp bmRleCA2MWMzNzc4Li45YjNiMDAxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3Jl LmV4cC5pbgorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgpAQCAtMTQ3OSw2ICsx NDc5LDcgQEAgX19aTjdXZWJDb3JlOUhUTUxOYW1lczlzZWxlY3RUYWdFCiBfX1pON1dlYkNvcmU5 SFRNTE5hbWVzOXN0eWxlQXR0ckUKIF9fWk43V2ViQ29yZTlIVE1MTmFtZXM5dGl0bGVBdHRyRQog X19aTjdXZWJDb3JlOUhUTUxOYW1lczl2YWx1ZUF0dHJFCitfX1pON1dlYkNvcmU5SU9TdXJmYWNl MTVjcmVhdGVGcm9tSW1hZ2VFUDdDR0ltYWdlCiBfX1pON1dlYkNvcmU5SW5saW5lQm94MTRhZGp1 c3RQb3NpdGlvbkVmZgogX19aTjdXZWJDb3JlOUlubGluZUJveDE0ZGlydHlMaW5lQm94ZXNFdgog X19aTjdXZWJDb3JlOUlubGluZUJveDE0c2VsZWN0aW9uU3RhdGVFdgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvSU9TdXJmYWNlLmggYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9JT1N1cmZhY2UuaAppbmRleCA1NDBhODdk Li43ZjgwOGNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j b2NvYS9JT1N1cmZhY2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j b2NvYS9JT1N1cmZhY2UuaApAQCAtNDAsNiArNDAsNyBAQCBwdWJsaWM6CiAgICAgc3RhdGljIFBh c3NSZWZQdHI8SU9TdXJmYWNlPiBjcmVhdGUoSW50U2l6ZSwgQ29sb3JTcGFjZSk7CiAgICAgc3Rh dGljIFBhc3NSZWZQdHI8SU9TdXJmYWNlPiBjcmVhdGVGcm9tTWFjaFBvcnQobWFjaF9wb3J0X3Qs IENvbG9yU3BhY2UpOwogICAgIHN0YXRpYyBQYXNzUmVmUHRyPElPU3VyZmFjZT4gY3JlYXRlRnJv bVN1cmZhY2UoSU9TdXJmYWNlUmVmLCBDb2xvclNwYWNlKTsKKyAgICBzdGF0aWMgUGFzc1JlZlB0 cjxJT1N1cmZhY2U+IGNyZWF0ZUZyb21JbWFnZShDR0ltYWdlUmVmKTsKIAogICAgIHN0YXRpYyBJ bnRTaXplIG1heGltdW1TaXplKCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2NvY29hL0lPU3VyZmFjZS5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2NvY29hL0lPU3VyZmFjZS5tbQppbmRleCBmNjYwMWUzLi5hMzQ4ZDFiIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9JT1N1cmZhY2Uu bW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvSU9TdXJmYWNl Lm1tCkBAIC03MCw2ICs3MCwxOSBAQCBQYXNzUmVmUHRyPElPU3VyZmFjZT4gSU9TdXJmYWNlOjpj cmVhdGVGcm9tU3VyZmFjZShJT1N1cmZhY2VSZWYgc3VyZmFjZSwgQ29sb3JTcAogICAgIHJldHVy biBhZG9wdFJlZihuZXcgSU9TdXJmYWNlKHN1cmZhY2UsIGNvbG9yU3BhY2UpKTsKIH0KIAorUGFz c1JlZlB0cjxJT1N1cmZhY2U+IElPU3VyZmFjZTo6Y3JlYXRlRnJvbUltYWdlKENHSW1hZ2VSZWYg aW1hZ2UpCit7CisgICAgc2l6ZV90IHdpZHRoID0gQ0dJbWFnZUdldFdpZHRoKGltYWdlKTsKKyAg ICBzaXplX3QgaGVpZ2h0ID0gQ0dJbWFnZUdldEhlaWdodChpbWFnZSk7CisKKyAgICBSZWZQdHI8 SU9TdXJmYWNlPiBzdXJmYWNlID0gSU9TdXJmYWNlOjpjcmVhdGUoSW50U2l6ZSh3aWR0aCwgaGVp Z2h0KSwgQ29sb3JTcGFjZURldmljZVJHQik7CisgICAgUmV0YWluUHRyPENHQ29udGV4dFJlZj4g c3VyZmFjZUNvbnRleHQgPSBzdXJmYWNlLT5lbnN1cmVQbGF0Zm9ybUNvbnRleHQoKTsKKyAgICBD R0NvbnRleHREcmF3SW1hZ2Uoc3VyZmFjZUNvbnRleHQuZ2V0KCksIENHUmVjdE1ha2UoMCwgMCwg d2lkdGgsIGhlaWdodCksIGltYWdlKTsKKyAgICBDR0NvbnRleHRGbHVzaChzdXJmYWNlQ29udGV4 dC5nZXQoKSk7CisKKyAgICByZXR1cm4gc3VyZmFjZS5yZWxlYXNlKCk7Cit9CisKIElPU3VyZmFj ZTo6SU9TdXJmYWNlKEludFNpemUgc2l6ZSwgQ29sb3JTcGFjZSBjb2xvclNwYWNlKQogICAgIDog bV9jb2xvclNwYWNlKGNvbG9yU3BhY2UpCiAgICAgLCBtX3NpemUoc2l6ZSkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRl eCA3MjI4YmExLi42NDNjYjY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMTQtMDct MDkgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmVt b3ZlIHVudXNlZCBKUEVHLWVuY29kaW5nIFZpZXdTbmFwc2hvdCBjb2RlCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzQ3NzMKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvbWFjL1dL Vmlldy5tbToKKyAgICAgICAgKC1bV0tWaWV3IF90YWtlVmlld1NuYXBzaG90XSk6CisgICAgICAg ICogVUlQcm9jZXNzL21hYy9WaWV3U25hcHNob3RTdG9yZS5oOgorICAgICAgICAqIFVJUHJvY2Vz cy9tYWMvVmlld1NuYXBzaG90U3RvcmUubW06CisgICAgICAgIChXZWJLaXQ6OlZpZXdTbmFwc2hv dFN0b3JlOjpWaWV3U25hcHNob3RTdG9yZSk6CisgICAgICAgIChXZWJLaXQ6OlZpZXdTbmFwc2hv dFN0b3JlOjp+Vmlld1NuYXBzaG90U3RvcmUpOgorICAgICAgICAoV2ViS2l0OjpWaWV3U25hcHNo b3RTdG9yZTo6cmVjb3JkU25hcHNob3QpOgorICAgICAgICAoV2ViS2l0OjpWaWV3U25hcHNob3Q6 OmNsZWFySW1hZ2UpOgorICAgICAgICAoV2ViS2l0OjpWaWV3U25hcHNob3Q6OmFzTGF5ZXJDb250 ZW50cyk6CisgICAgICAgIChXZWJLaXQ6OmNyZWF0ZUlPU3VyZmFjZUZyb21JbWFnZSk6IERlbGV0 ZWQuCisgICAgICAgIChXZWJLaXQ6OmNvbXByZXNzSW1hZ2VBc0pQRUcpOiBEZWxldGVkLgorICAg ICAgICAoV2ViS2l0OjpWaWV3U25hcHNob3RTdG9yZTo6cmVkdWNlU25hcHNob3RNZW1vcnlDb3N0 KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYktpdDo6Vmlld1NuYXBzaG90U3RvcmU6OmRpZENvbXBy ZXNzU25hcHNob3QpOiBEZWxldGVkLgorICAgICAgICBSZW1vdmUgYWxsIFZpZXdTbmFwc2hvdChT dG9yZSkgY29kZSByZWxhdGVkIHRvIEpQRUctZW5jb2RlZCBzbmFwc2hvdHMuCisgICAgICAgIFJl bW92ZSB0aGUgImltYWdlIiBtZW1iZXIgb24gVmlld1NuYXBzaG90OyBNYWMgd2lsbCBhbHdheXMg c3RhcnQgb3V0IHdpdGggYW4gSU9TdXJmYWNlIGluc3RlYWQuCisgICAgICAgIEFkb3B0IFdlYkNv cmU6OklPU3VyZmFjZTo6Y3JlYXRlRnJvbUltYWdlIHRvIG1ha2UgdGhhdCBoYXBwZW4uCisgICAg ICAgIEFkZCBhIGNvbW1lbnQgbm90aW5nIHRoYXQgaWYgYSBzbmFwc2hvdCBjb21lcyBiYWNrIGVt cHR5LCB3ZSBzaG91bGQgdGhyb3cgaXQgYXdheSBjb21wbGV0ZWx5LgorCiAyMDE0LTA3LTA5ICBL d2FuZ0h5dWsgS2ltICA8aHl1a2kua2ltQHNhbXN1bmcuY29tPgogCiAgICAgICAgIFtFRkxdIEZp eCBjcmFzaCBjYXVzZWQgYnkgaW52YWxpZCBjdXJzb3IgaW1hZ2UuCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0KaW5kZXggN2IzZmFlNC4uZTU3OGEwNyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQpAQCAtMzE0MSw3ICszMTQx LDggQEAgLSAoVmlld1NuYXBzaG90KV90YWtlVmlld1NuYXBzaG90CiAKICAgICBhdXRvIGNyb3Bw ZWRTbmFwc2hvdEltYWdlID0gYWRvcHRDRihDR0ltYWdlQ3JlYXRlV2l0aEltYWdlSW5SZWN0KHdp bmRvd1NuYXBzaG90SW1hZ2UuZ2V0KCksIE5TUmVjdFRvQ0dSZWN0KFt3aW5kb3cgY29udmVydFJl Y3RUb0JhY2tpbmc6Y3JvcHBlZEltYWdlUmVjdF0pKSk7CiAKLSAgICBzbmFwc2hvdC5pbWFnZSA9 IGNyb3BwZWRTbmFwc2hvdEltYWdlLmdldCgpOworICAgIHNuYXBzaG90LnN1cmZhY2UgPSBJT1N1 cmZhY2U6OmNyZWF0ZUZyb21JbWFnZShjcm9wcGVkU25hcHNob3RJbWFnZS5nZXQoKSk7CisgICAg c25hcHNob3Quc3VyZmFjZS0+c2V0SXNWb2xhdGlsZSh0cnVlKTsKIAogICAgIEludFNpemUgaW1h Z2VTaXplKENHSW1hZ2VHZXRXaWR0aChjcm9wcGVkU25hcHNob3RJbWFnZS5nZXQoKSksIENHSW1h Z2VHZXRIZWlnaHQoY3JvcHBlZFNuYXBzaG90SW1hZ2UuZ2V0KCkpKTsKICAgICBzbmFwc2hvdC5z aXplID0gaW1hZ2VTaXplOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21h Yy9WaWV3U25hcHNob3RTdG9yZS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9WaWV3 U25hcHNob3RTdG9yZS5oCmluZGV4IDNmYmFhNGUuLjJiYzc3ZGYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvVmlld1NuYXBzaG90U3RvcmUuaAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1ZpZXdTbmFwc2hvdFN0b3JlLmgKQEAgLTM3LDE3ICszNywx MCBAQAogCiBPQkpDX0NMQVNTIENBQ29udGV4dDsKIAotI2lmIFBMQVRGT1JNKE1BQykgJiYgX19N QUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMDkwCi0jZGVmaW5lIFVTRV9KUEVHX1ZJ RVdfU05BUFNIT1RTIGZhbHNlCisjaWYgUExBVEZPUk0oTUFDKQogI2RlZmluZSBVU0VfSU9TVVJG QUNFX1ZJRVdfU05BUFNIT1RTIHRydWUKICNkZWZpbmUgVVNFX1JFTkRFUl9TRVJWRVJfVklFV19T TkFQU0hPVFMgZmFsc2UKLSNlbGlmIFBMQVRGT1JNKE1BQykKLS8vIE1vdW50YWluIExpb24gYW5k IGJlZm9yZSBkbyBub3Qgc3VwcG9ydCBJT1N1cmZhY2UgcHVyZ2VhYmlsaXR5LgotI2RlZmluZSBV U0VfSlBFR19WSUVXX1NOQVBTSE9UUyB0cnVlCi0jZGVmaW5lIFVTRV9JT1NVUkZBQ0VfVklFV19T TkFQU0hPVFMgZmFsc2UKLSNkZWZpbmUgVVNFX1JFTkRFUl9TRVJWRVJfVklFV19TTkFQU0hPVFMg ZmFsc2UKICNlbHNlCi0jZGVmaW5lIFVTRV9KUEVHX1ZJRVdfU05BUFNIT1RTIGZhbHNlCiAjZGVm aW5lIFVTRV9JT1NVUkZBQ0VfVklFV19TTkFQU0hPVFMgZmFsc2UKICNkZWZpbmUgVVNFX1JFTkRF Ul9TRVJWRVJfVklFV19TTkFQU0hPVFMgdHJ1ZQogI2VuZGlmCkBAIC01OCw5ICs1MSw4IEBAIGNs YXNzIFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW07CiBjbGFzcyBXZWJQYWdlUHJveHk7CiAKIHN0cnVj dCBWaWV3U25hcHNob3QgewotI2lmIFVTRV9KUEVHX1ZJRVdfU05BUFNIT1RTIHx8IFVTRV9JT1NV UkZBQ0VfVklFV19TTkFQU0hPVFMKKyNpZiBVU0VfSU9TVVJGQUNFX1ZJRVdfU05BUFNIT1RTCiAg ICAgUmVmUHRyPFdlYkNvcmU6OklPU3VyZmFjZT4gc3VyZmFjZTsKLSAgICBSZXRhaW5QdHI8Q0dJ bWFnZVJlZj4gaW1hZ2U7CiAjZW5kaWYKICNpZiBVU0VfUkVOREVSX1NFUlZFUl9WSUVXX1NOQVBT SE9UUwogICAgIHVpbnQzMl90IHNsb3RJRCA9IDA7CkBAIC0xMDEsMTIgKzkzLDYgQEAgcHVibGlj OgogcHJpdmF0ZToKICAgICB2b2lkIHBydW5lU25hcHNob3RzKFdlYlBhZ2VQcm94eSYpOwogICAg IHZvaWQgcmVtb3ZlU25hcHNob3RJbWFnZShWaWV3U25hcHNob3QmKTsKLSAgICB2b2lkIHJlZHVj ZVNuYXBzaG90TWVtb3J5Q29zdChjb25zdCBTdHJpbmcmIHV1aWQpOwotCi0jaWYgVVNFX0pQRUdf VklFV19TTkFQU0hPVFMKLSAgICB2b2lkIGRpZENvbXByZXNzU25hcHNob3QoY29uc3QgU3RyaW5n JiB1dWlkLCBSZXRhaW5QdHI8Q0dJbWFnZVJlZj4gbmV3SW1hZ2UsIHNpemVfdCBuZXdJbWFnZVNp emUpOwotICAgIGRpc3BhdGNoX3F1ZXVlX3QgbV9jb21wcmVzc2lvblF1ZXVlOwotI2VuZGlmCiAK ICAgICBIYXNoTWFwPFN0cmluZywgVmlld1NuYXBzaG90PiBtX3NuYXBzaG90TWFwOwogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1ZpZXdTbmFwc2hvdFN0b3JlLm1t IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9WaWV3U25hcHNob3RTdG9yZS5tbQppbmRl eCBmOTk5MmYyLi45NzFiZmY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv bWFjL1ZpZXdTbmFwc2hvdFN0b3JlLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9t YWMvVmlld1NuYXBzaG90U3RvcmUubW0KQEAgLTQwLDggKzQwLDggQEAgdXNpbmcgbmFtZXNwYWNl IFdlYkNvcmU7CiAKICNpZiBVU0VfSU9TVVJGQUNFX1ZJRVdfU05BUFNIT1RTCiBzdGF0aWMgY29u c3Qgc2l6ZV90IG1heGltdW1TbmFwc2hvdENhY2hlU2l6ZSA9IDQwMCAqICgxMDI0ICogMTAyNCk7 Ci0jZWxpZiBVU0VfSlBFR19WSUVXX1NOQVBTSE9UUyB8fCBVU0VfUkVOREVSX1NFUlZFUl9WSUVX X1NOQVBTSE9UUwotLy8gQmVjYXVzZSBub24tSU9TdXJmYWNlIHNuYXBzaG90cyBhcmUgbm90IHB1 cmdlYWJsZSwgd2Ugc2hvdWxkIGtlZXAgZmV3ZXIgYXJvdW5kLgorI2VsaWYgVVNFX1JFTkRFUl9T RVJWRVJfVklFV19TTkFQU0hPVFMKKy8vIEJlY2F1c2UgcmVuZGVyIHNlcnZlciBzbmFwc2hvdHMg YXJlIG5vdCBwdXJnZWFibGUsIHdlIHNob3VsZCBrZWVwIGZld2VyIGFyb3VuZC4KIHN0YXRpYyBj b25zdCBzaXplX3QgbWF4aW11bVNuYXBzaG90Q2FjaGVTaXplID0gNTAgKiAoMTAyNCAqIDEwMjQp OwogI2VuZGlmCiAKQEAgLTUxLDE2ICs1MSwxMCBAQCBWaWV3U25hcHNob3RTdG9yZTo6Vmlld1Nu YXBzaG90U3RvcmUoKQogICAgIDogbV9lbmFibGVkKHRydWUpCiAgICAgLCBtX3NuYXBzaG90Q2Fj aGVTaXplKDApCiB7Ci0jaWYgVVNFX0pQRUdfVklFV19TTkFQU0hPVFMKLSAgICBtX2NvbXByZXNz aW9uUXVldWUgPSBkaXNwYXRjaF9xdWV1ZV9jcmVhdGUoImNvbS5hcHBsZS5XZWJLaXQuVmlld1Nu YXBzaG90U3RvcmUuQ29tcHJlc3Npb25RdWV1ZSIsIG51bGxwdHIpOwotI2VuZGlmCiB9CiAKIFZp ZXdTbmFwc2hvdFN0b3JlOjp+Vmlld1NuYXBzaG90U3RvcmUoKQogewotI2lmIFVTRV9KUEVHX1ZJ RVdfU05BUFNIT1RTCi0gICAgZGlzcGF0Y2hfcmVsZWFzZShtX2NvbXByZXNzaW9uUXVldWUpOwot I2VuZGlmCiAgICAgZGlzY2FyZFNuYXBzaG90cygpOwogfQogCkBAIC0xODUsOCArMTc5LDYgQEAg dm9pZCBWaWV3U25hcHNob3RTdG9yZTo6cmVjb3JkU25hcHNob3QoV2ViUGFnZVByb3h5JiB3ZWJQ YWdlUHJveHkpCiAKICAgICBtX3NuYXBzaG90TWFwLmFkZChpdGVtLT5zbmFwc2hvdFVVSUQoKSwg c25hcHNob3QpOwogICAgIG1fc25hcHNob3RDYWNoZVNpemUgKz0gc25hcHNob3QuaW1hZ2VTaXpl SW5CeXRlczsKLQotICAgIHJlZHVjZVNuYXBzaG90TWVtb3J5Q29zdChpdGVtLT5zbmFwc2hvdFVV SUQoKSk7CiB9CiAKIGJvb2wgVmlld1NuYXBzaG90U3RvcmU6OmdldFNuYXBzaG90KFdlYkJhY2tG b3J3YXJkTGlzdEl0ZW0qIGl0ZW0sIFZpZXdTbmFwc2hvdCYgc25hcHNob3QpCkBAIC0yMDcsODQg KzE5OSw2IEBAIHZvaWQgVmlld1NuYXBzaG90U3RvcmU6OmRpc2NhcmRTbmFwc2hvdHMoKQogICAg ICAgICByZW1vdmVTbmFwc2hvdEltYWdlKHNuYXBzaG90KTsKIH0KIAotI2lmIFVTRV9JT1NVUkZB Q0VfVklFV19TTkFQU0hPVFMKLXN0YXRpYyBSZWZQdHI8SU9TdXJmYWNlPiBjcmVhdGVJT1N1cmZh Y2VGcm9tSW1hZ2UoQ0dJbWFnZVJlZiBpbWFnZSkKLXsKLSAgICBzaXplX3Qgd2lkdGggPSBDR0lt YWdlR2V0V2lkdGgoaW1hZ2UpOwotICAgIHNpemVfdCBoZWlnaHQgPSBDR0ltYWdlR2V0SGVpZ2h0 KGltYWdlKTsKLQotICAgIFJlZlB0cjxJT1N1cmZhY2U+IHN1cmZhY2UgPSBJT1N1cmZhY2U6OmNy ZWF0ZShJbnRTaXplKHdpZHRoLCBoZWlnaHQpLCBDb2xvclNwYWNlRGV2aWNlUkdCKTsKLSAgICBS ZXRhaW5QdHI8Q0dDb250ZXh0UmVmPiBzdXJmYWNlQ29udGV4dCA9IHN1cmZhY2UtPmVuc3VyZVBs YXRmb3JtQ29udGV4dCgpOwotICAgIENHQ29udGV4dERyYXdJbWFnZShzdXJmYWNlQ29udGV4dC5n ZXQoKSwgQ0dSZWN0TWFrZSgwLCAwLCB3aWR0aCwgaGVpZ2h0KSwgaW1hZ2UpOwotICAgIENHQ29u dGV4dEZsdXNoKHN1cmZhY2VDb250ZXh0LmdldCgpKTsKLQotICAgIHN1cmZhY2UtPnNldElzVm9s YXRpbGUodHJ1ZSk7Ci0KLSAgICByZXR1cm4gc3VyZmFjZTsKLX0KLSNlbmRpZgotCi0jaWYgVVNF X0pQRUdfVklFV19TTkFQU0hPVFMKLXN0YXRpYyBzdGQ6OnBhaXI8UmV0YWluUHRyPENHSW1hZ2VS ZWY+LCBzaXplX3Q+IGNvbXByZXNzSW1hZ2VBc0pQRUcoQ0dJbWFnZVJlZiBpbWFnZSkKLXsKLSAg ICBSZXRhaW5QdHI8TlNEYXRhPiBjb21wcmVzc2VkRGF0YSA9IGFkb3B0TlMoW1tOU011dGFibGVE YXRhIGFsbG9jXSBpbml0XSk7Ci0gICAgUmV0YWluUHRyPENHSW1hZ2VEZXN0aW5hdGlvblJlZj4g ZGVzdGluYXRpb24gPSBhZG9wdENGKENHSW1hZ2VEZXN0aW5hdGlvbkNyZWF0ZVdpdGhEYXRhKChD Rk11dGFibGVEYXRhUmVmKWNvbXByZXNzZWREYXRhLmdldCgpLCBrVVRUeXBlSlBFRywgMSwgMCkp OwotCi0gICAgUmV0YWluUHRyPE5TRGljdGlvbmFyeT4gb3B0aW9ucyA9IEB7Ci0gICAgICAgIChO U1N0cmluZyopa0NHSW1hZ2VEZXN0aW5hdGlvbkxvc3N5Q29tcHJlc3Npb25RdWFsaXR5OiBAMC45 Ci0gICAgfTsKLQotICAgIENHSW1hZ2VEZXN0aW5hdGlvbkFkZEltYWdlKGRlc3RpbmF0aW9uLmdl dCgpLCBpbWFnZSwgKENGRGljdGlvbmFyeVJlZilvcHRpb25zLmdldCgpKTsKLSAgICBDR0ltYWdl RGVzdGluYXRpb25GaW5hbGl6ZShkZXN0aW5hdGlvbi5nZXQoKSk7Ci0KLSAgICBSZXRhaW5QdHI8 Q0dJbWFnZVNvdXJjZVJlZj4gaW1hZ2VTb3VyY2VSZWYgPSBhZG9wdENGKENHSW1hZ2VTb3VyY2VD cmVhdGVXaXRoRGF0YSgoQ0ZEYXRhUmVmKWNvbXByZXNzZWREYXRhLmdldCgpLCAwKSk7Ci0gICAg UmV0YWluUHRyPENHSW1hZ2VSZWY+IGNvbXByZXNzZWRTbmFwc2hvdCA9IGFkb3B0Q0YoQ0dJbWFn ZVNvdXJjZUNyZWF0ZUltYWdlQXRJbmRleChpbWFnZVNvdXJjZVJlZi5nZXQoKSwgMCwgMCkpOwot ICAgIAotICAgIHJldHVybiBzdGQ6Om1ha2VfcGFpcihjb21wcmVzc2VkU25hcHNob3QsIFtjb21w cmVzc2VkRGF0YSBsZW5ndGhdKTsKLX0KLSNlbmRpZgotCi12b2lkIFZpZXdTbmFwc2hvdFN0b3Jl OjpyZWR1Y2VTbmFwc2hvdE1lbW9yeUNvc3QoY29uc3QgU3RyaW5nJiB1dWlkKQotewotICAgIGNv bnN0IGF1dG8mIHNuYXBzaG90SXRlcmF0b3IgPSBtX3NuYXBzaG90TWFwLmZpbmQodXVpZCk7Ci0g ICAgaWYgKHNuYXBzaG90SXRlcmF0b3IgPT0gbV9zbmFwc2hvdE1hcC5lbmQoKSkKLSAgICAgICAg cmV0dXJuOwotICAgIFZpZXdTbmFwc2hvdCYgc25hcHNob3QgPSBzbmFwc2hvdEl0ZXJhdG9yLT52 YWx1ZTsKLSAgICBpZiAoIXNuYXBzaG90Lmhhc0ltYWdlKCkpCi0gICAgICAgIHJldHVybjsKLQot I2lmIFVTRV9JT1NVUkZBQ0VfVklFV19TTkFQU0hPVFMKLSAgICBzbmFwc2hvdC5zdXJmYWNlID0g Y3JlYXRlSU9TdXJmYWNlRnJvbUltYWdlKHNuYXBzaG90LmltYWdlLmdldCgpKTsKLSAgICBzbmFw c2hvdC5pbWFnZSA9IG51bGxwdHI7Ci0jZWxpZiBVU0VfSlBFR19WSUVXX1NOQVBTSE9UUwotICAg IFJldGFpblB0cjxDR0ltYWdlUmVmPiBvcmlnaW5hbEltYWdlID0gc25hcHNob3QuaW1hZ2UuZ2V0 KCk7Ci0gICAgZGlzcGF0Y2hfYXN5bmMobV9jb21wcmVzc2lvblF1ZXVlLCBbdXVpZCwgb3JpZ2lu YWxJbWFnZV0gewotICAgICAgICBhdXRvIGltYWdlQW5kQnl0ZXMgPSBjb21wcmVzc0ltYWdlQXNK UEVHKG9yaWdpbmFsSW1hZ2UuZ2V0KCkpOwotICAgICAgICBkaXNwYXRjaF9hc3luYyhkaXNwYXRj aF9nZXRfbWFpbl9xdWV1ZSgpLCBbdXVpZCwgaW1hZ2VBbmRCeXRlc10gewotICAgICAgICAgICAg Vmlld1NuYXBzaG90U3RvcmU6OnNoYXJlZCgpLmRpZENvbXByZXNzU25hcHNob3QodXVpZCwgaW1h Z2VBbmRCeXRlcy5maXJzdCwgaW1hZ2VBbmRCeXRlcy5zZWNvbmQpOwotICAgICAgICB9KTsKLSAg ICB9KTsKLSNlbmRpZgotfQotCi0jaWYgVVNFX0pQRUdfVklFV19TTkFQU0hPVFMKLXZvaWQgVmll d1NuYXBzaG90U3RvcmU6OmRpZENvbXByZXNzU25hcHNob3QoY29uc3QgU3RyaW5nJiB1dWlkLCBS ZXRhaW5QdHI8Q0dJbWFnZVJlZj4gbmV3SW1hZ2UsIHNpemVfdCBuZXdJbWFnZVNpemUpCi17Ci0g ICAgY29uc3QgYXV0byYgc25hcHNob3RJdGVyYXRvciA9IG1fc25hcHNob3RNYXAuZmluZCh1dWlk KTsKLSAgICBpZiAoc25hcHNob3RJdGVyYXRvciA9PSBtX3NuYXBzaG90TWFwLmVuZCgpKQotICAg ICAgICByZXR1cm47Ci0gICAgVmlld1NuYXBzaG90JiBzbmFwc2hvdCA9IHNuYXBzaG90SXRlcmF0 b3ItPnZhbHVlOwotCi0gICAgc2l6ZV90IG9yaWdpbmFsSW1hZ2VTaXplID0gc25hcHNob3QuaW1h Z2VTaXplSW5CeXRlczsKLSAgICBpZiAoIW5ld0ltYWdlIHx8IG5ld0ltYWdlU2l6ZSA+IG9yaWdp bmFsSW1hZ2VTaXplKQotICAgICAgICByZXR1cm47Ci0gICAgc25hcHNob3QuaW1hZ2UgPSBuZXdJ bWFnZTsKLSAgICBzbmFwc2hvdC5pbWFnZVNpemVJbkJ5dGVzID0gbmV3SW1hZ2VTaXplOwotICAg IG1fc25hcHNob3RDYWNoZVNpemUgKz0gbmV3SW1hZ2VTaXplOwotICAgIG1fc25hcHNob3RDYWNo ZVNpemUgLT0gb3JpZ2luYWxJbWFnZVNpemU7Ci19Ci0jZW5kaWYKLQogYm9vbCBWaWV3U25hcHNo b3Q6Omhhc0ltYWdlKCkgY29uc3QKIHsKICAgICByZXR1cm4gaW1hZ2VTaXplSW5CeXRlczsKQEAg LTI5NCwxMSArMjA4LDcgQEAgdm9pZCBWaWV3U25hcHNob3Q6OmNsZWFySW1hZ2UoKQogewogI2lm IFVTRV9JT1NVUkZBQ0VfVklFV19TTkFQU0hPVFMKICAgICBzdXJmYWNlID0gbnVsbHB0cjsKLSNl bmRpZgotI2lmIFVTRV9JT1NVUkZBQ0VfVklFV19TTkFQU0hPVFMgfHwgVVNFX0pQRUdfVklFV19T TkFQU0hPVFMKLSAgICBpbWFnZSA9IG51bGxwdHI7Ci0jZW5kaWYKLSNpZiBVU0VfUkVOREVSX1NF UlZFUl9WSUVXX1NOQVBTSE9UUworI2VsaWYgVVNFX1JFTkRFUl9TRVJWRVJfVklFV19TTkFQU0hP VFMKICAgICBpZiAoc2xvdElEKQogICAgICAgICBbVmlld1NuYXBzaG90U3RvcmU6OnNuYXBzaG90 dGluZ0NvbnRleHQoKSBkZWxldGVTbG90OnNsb3RJRF07CiAgICAgc2xvdElEID0gMDsKQEAgLTMw OSwxNyArMjE5LDE1IEBAIHZvaWQgVmlld1NuYXBzaG90OjpjbGVhckltYWdlKCkKIGlkIFZpZXdT bmFwc2hvdDo6YXNMYXllckNvbnRlbnRzKCkKIHsKICNpZiBVU0VfSU9TVVJGQUNFX1ZJRVdfU05B UFNIT1RTCi0gICAgaWYgKHN1cmZhY2UpIHsKLSAgICAgICAgaWYgKHN1cmZhY2UtPnNldElzVm9s YXRpbGUoZmFsc2UpICE9IElPU3VyZmFjZTo6U3VyZmFjZVN0YXRlOjpWYWxpZCkKLSAgICAgICAg ICAgIHJldHVybiBudWxscHRyOworICAgIGlmICghc3VyZmFjZSkKKyAgICAgICAgcmV0dXJuIG51 bGxwdHI7CiAKLSAgICAgICAgcmV0dXJuIChpZClzdXJmYWNlLT5zdXJmYWNlKCk7Ci0gICAgfQot I2VuZGlmCi0jaWYgVVNFX0lPU1VSRkFDRV9WSUVXX1NOQVBTSE9UUyB8fCBVU0VfSlBFR19WSUVX X1NOQVBTSE9UUwotICAgIHJldHVybiAoaWQpaW1hZ2UuZ2V0KCk7Ci0jZW5kaWYKLSNpZiBVU0Vf UkVOREVSX1NFUlZFUl9WSUVXX1NOQVBTSE9UUworICAgIC8vIEZJWE1FOiBUaGlzIHNob3VsZCBk ZXN0cm95IHRoZSBzdXJmYWNlIGFuZCBpbmZvcm0gdGhlIFZpZXdTbmFwc2hvdFN0b3JlIHRvIHJl ZHVjZSBtX3NuYXBzaG90Q2FjaGVTaXplLgorICAgIGlmIChzdXJmYWNlLT5zZXRJc1ZvbGF0aWxl KGZhbHNlKSAhPSBJT1N1cmZhY2U6OlN1cmZhY2VTdGF0ZTo6VmFsaWQpCisgICAgICAgIHJldHVy biBudWxscHRyOworCisgICAgcmV0dXJuIChpZClzdXJmYWNlLT5zdXJmYWNlKCk7CisjZWxpZiBV U0VfUkVOREVSX1NFUlZFUl9WSUVXX1NOQVBTSE9UUwogICAgIHJldHVybiBbQ0FDb250ZXh0IG9i amVjdEZvclNsb3Q6c2xvdElEXTsKICNlbmRpZgogfQo=