151516 2015-11-20 14:20:30 -0800 Allow more buffer formats in the IOSurface pool 2015-11-23 03:35:17 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser ossy simon.fraser thorton webkit-bug-importer oldest_to_newest 1143819 0 simon.fraser 2015-11-20 14:20:30 -0800 Allow more buffer formats in the IOSurface pool 1143820 1 265998 simon.fraser 2015-11-20 14:22:23 -0800 Created attachment 265998 Patch 1143835 2 webkit-bug-importer 2015-11-20 14:42:05 -0800 <rdar://problem/23636684> 1144151 3 ossy 2015-11-23 03:23:49 -0800 Just to document, it landed in https://trac.webkit.org/changeset/192701 1144152 4 ossy 2015-11-23 03:24:15 -0800 (In reply to comment #3) > Just to document, it landed in https://trac.webkit.org/changeset/192701 ... and it broke the Apple Mac cmake build: In file included from /Volumes/Data/slave/elcapitan-cmake-debug/build/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm:38: In file included from /Volumes/Data/slave/elcapitan-cmake-debug/build/WebKitBuild/Debug/DerivedSources/ForwardingHeaders/WebCore/IOSurfacePool.h:1: /Volumes/Data/slave/elcapitan-cmake-debug/build/Source/WebCore/platform/graphics/cg/IOSurfacePool.h:32:10: fatal error: 'IOSurface.h' file not found #include "IOSurface.h" ^ 1 error generated. 1144153 5 ossy 2015-11-23 03:35:17 -0800 and the buildfix landed in https://trac.webkit.org/changeset/192742 265998 2015-11-20 14:22:23 -0800 2015-11-20 14:27:37 -0800 Patch bug-151516-20151120142210.patch text/plain 11116 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTkyNjg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODFjZGJjMzdkY2MzNDhm ZDkxZmE4OTU5ZDc1YjgxYTlkOTQ2ZDcyOC4uNDJlNTllOGI5MmIyMmUxZWZmYTI2Mzk5M2QzMTJm ODgwZjk5Y2Q5YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE1LTExLTIwICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIEFsbG93IG1vcmUg YnVmZmVyIGZvcm1hdHMgaW4gdGhlIElPU3VyZmFjZSBwb29sCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTE1MTYKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQcmV2aW91c2x5IElPU3VyZmFjZTo6Y3JlYXRl IHdhcyBvbmx5IGxvb2tpbiBpbiB0aGUgcG9vbCBmb3IgUkdCQS1mb3JtYXQgc3VyZmFjZXMuIENo YW5nZSB0aGF0IHRvCisgICAgICAgIGFsd2F5cyBsb29rIGluIHRoZSBwb29sLgorICAgICAgICAK KyAgICAgICAgSU9TdXJmYWNlUG9vbCBpdHNlbGYgbm93IGRldGVybWluZXMgd2hpY2ggZm9ybWF0 cyB0byBjYWNoZSwgYW5kIGFjY2VwdHMgZXZlcnl0aGluZyBvdGhlciB0aGFuIFlVVjQyMi4KKwor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NnL0lPU3VyZmFjZVBvb2wuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6c3VyZmFjZU1hdGNoZXNQYXJhbWV0ZXJzKToKKyAgICAgICAgKFdlYkNvcmU6 OklPU3VyZmFjZVBvb2w6OnRha2VTdXJmYWNlKToKKyAgICAgICAgKFdlYkNvcmU6OklPU3VyZmFj ZVBvb2w6OnNob3VsZENhY2hlRm9ybWF0KToKKyAgICAgICAgKFdlYkNvcmU6OklPU3VyZmFjZVBv b2w6OnNob3VsZENhY2hlU3VyZmFjZSk6CisgICAgICAgIChXZWJDb3JlOjpJT1N1cmZhY2VQb29s OjphZGRTdXJmYWNlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jZy9JT1N1cmZhY2VQ b29sLmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvSU9TdXJmYWNlLmg6Cisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvSU9TdXJmYWNlLm1tOgorICAgICAgICAo SU9TdXJmYWNlOjpzdXJmYWNlRnJvbVBvb2wpOgorICAgICAgICAoSU9TdXJmYWNlOjpjcmVhdGUp OgorICAgICAgICAoSU9TdXJmYWNlOjpJT1N1cmZhY2UpOgorCiAyMDE1LTExLTE5ICBTaW1vbiBG cmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIEJhY2stYnVmZmVyIHRv IGZyb250LWJ1ZmZlciBjb3B5IGZhaWxzIGZvciBzb21lIGJ1ZmZlciBmb3JtYXRzCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9JT1N1cmZhY2VQb29sLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NnL0lPU3VyZmFjZVBvb2wuY3Bw CmluZGV4IGZmMjBlZDMwYmFlZDA1MTE2MmYxMmVhZjllYWE2Mjg5N2ZkZWZmMjUuLjJhYTM4MDJm ZmRlMjdlZjYyYWI2OTkzYTljYjliYTRmNzI4ODM2NzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NnL0lPU3VyZmFjZVBvb2wuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NnL0lPU3VyZmFjZVBvb2wuY3BwCkBAIC0yOSw3ICsy OSw2IEBACiAjaWYgVVNFKElPU1VSRkFDRSkKIAogI2luY2x1ZGUgIkdyYXBoaWNzQ29udGV4dENH LmgiCi0jaW5jbHVkZSAiSU9TdXJmYWNlLmgiCiAjaW5jbHVkZSA8Q29yZUdyYXBoaWNzL0NvcmVH cmFwaGljcy5oPgogI2luY2x1ZGUgPGNocm9ubz4KICNpbmNsdWRlIDx3dGYvTmV2ZXJEZXN0cm95 ZWQuaD4KQEAgLTY1LDEyICs2NCwxMyBAQCBJT1N1cmZhY2VQb29sJiBJT1N1cmZhY2VQb29sOjpz aGFyZWRQb29sKCkKICAgICByZXR1cm4gcG9vbDsKIH0KIAotc3RhdGljIGJvb2wgc3VyZmFjZU1h dGNoZXNQYXJhbWV0ZXJzKElPU3VyZmFjZSYgc3VyZmFjZSwgY29uc3QgSW50U2l6ZSYgcmVxdWVz dGVkU2l6ZSwgQ29sb3JTcGFjZSBjb2xvclNwYWNlKQorc3RhdGljIGJvb2wgc3VyZmFjZU1hdGNo ZXNQYXJhbWV0ZXJzKElPU3VyZmFjZSYgc3VyZmFjZSwgSW50U2l6ZSByZXF1ZXN0ZWRTaXplLCBD b2xvclNwYWNlIGNvbG9yU3BhY2UsIElPU3VyZmFjZTo6Rm9ybWF0IGZvcm1hdCkKIHsKLSAgICBJ bnRTaXplIHN1cmZhY2VTaXplID0gc3VyZmFjZS5zaXplKCk7CisgICAgaWYgKGZvcm1hdCAhPSBz dXJmYWNlLmZvcm1hdCgpKQorICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgaWYgKGNvbG9yU3Bh Y2UgIT0gc3VyZmFjZS5jb2xvclNwYWNlKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICBp ZiAoc3VyZmFjZVNpemUgIT0gcmVxdWVzdGVkU2l6ZSkKKyAgICBpZiAocmVxdWVzdGVkU2l6ZSAh PSBzdXJmYWNlLnNpemUoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIHJldHVybiB0cnVl OwogfQpAQCAtMTA3LDggKzEwNywxMSBAQCB2b2lkIElPU3VyZmFjZVBvb2w6OmRpZFVzZVN1cmZh Y2VPZlNpemUoSW50U2l6ZSBzaXplKQogICAgIG1fc2l6ZXNJblBydW5lT3JkZXIuYXBwZW5kKHNp emUpOwogfQogCi1zdGQ6OnVuaXF1ZV9wdHI8SU9TdXJmYWNlPiBJT1N1cmZhY2VQb29sOjp0YWtl U3VyZmFjZShJbnRTaXplIHNpemUsIENvbG9yU3BhY2UgY29sb3JTcGFjZSkKK3N0ZDo6dW5pcXVl X3B0cjxJT1N1cmZhY2U+IElPU3VyZmFjZVBvb2w6OnRha2VTdXJmYWNlKEludFNpemUgc2l6ZSwg Q29sb3JTcGFjZSBjb2xvclNwYWNlLCBJT1N1cmZhY2U6OkZvcm1hdCBmb3JtYXQpCiB7CisgICAg aWYgKCFzaG91bGRDYWNoZUZvcm1hdChmb3JtYXQpKQorICAgICAgICByZXR1cm4gbnVsbHB0cjsK KwogICAgIENhY2hlZFN1cmZhY2VNYXA6Oml0ZXJhdG9yIG1hcEl0ZXIgPSBtX2NhY2hlZFN1cmZh Y2VzLmZpbmQoc2l6ZSk7CiAKICAgICBpZiAobWFwSXRlciA9PSBtX2NhY2hlZFN1cmZhY2VzLmVu ZCgpKSB7CkBAIC0xMTcsNyArMTIwLDcgQEAgc3RkOjp1bmlxdWVfcHRyPElPU3VyZmFjZT4gSU9T dXJmYWNlUG9vbDo6dGFrZVN1cmZhY2UoSW50U2l6ZSBzaXplLCBDb2xvclNwYWNlIGMKICAgICB9 CiAKICAgICBmb3IgKGF1dG8gc3VyZmFjZUl0ZXIgPSBtYXBJdGVyLT52YWx1ZS5iZWdpbigpOyBz dXJmYWNlSXRlciAhPSBtYXBJdGVyLT52YWx1ZS5lbmQoKTsgKytzdXJmYWNlSXRlcikgewotICAg ICAgICBpZiAoIXN1cmZhY2VNYXRjaGVzUGFyYW1ldGVycygqc3VyZmFjZUl0ZXItPmdldCgpLCBz aXplLCBjb2xvclNwYWNlKSkKKyAgICAgICAgaWYgKCFzdXJmYWNlTWF0Y2hlc1BhcmFtZXRlcnMo KnN1cmZhY2VJdGVyLT5nZXQoKSwgc2l6ZSwgY29sb3JTcGFjZSwgZm9ybWF0KSkKICAgICAgICAg ICAgIGNvbnRpbnVlOwogCiAgICAgICAgIGF1dG8gc3VyZmFjZSA9IFdURjo6bW92ZSgqc3VyZmFj ZUl0ZXIpOwpAQCAtMTQwLDcgKzE0Myw3IEBAIHN0ZDo6dW5pcXVlX3B0cjxJT1N1cmZhY2U+IElP U3VyZmFjZVBvb2w6OnRha2VTdXJmYWNlKEludFNpemUgc2l6ZSwgQ29sb3JTcGFjZSBjCiAKICAg ICAvLyBTb21lIG9mIHRoZSBpbi11c2Ugc3VyZmFjZXMgbWF5IG5vIGxvbmdlciBhY3R1YWxseSBi ZSBpbi11c2UsIGJ1dCB3ZSBoYXZlbid0IG1vdmVkIHRoZW0gb3ZlciB5ZXQuCiAgICAgZm9yIChh dXRvIHN1cmZhY2VJdGVyID0gbV9pblVzZVN1cmZhY2VzLmJlZ2luKCk7IHN1cmZhY2VJdGVyICE9 IG1faW5Vc2VTdXJmYWNlcy5lbmQoKTsgKytzdXJmYWNlSXRlcikgewotICAgICAgICBpZiAoIXN1 cmZhY2VNYXRjaGVzUGFyYW1ldGVycygqc3VyZmFjZUl0ZXItPmdldCgpLCBzaXplLCBjb2xvclNw YWNlKSkKKyAgICAgICAgaWYgKCFzdXJmYWNlTWF0Y2hlc1BhcmFtZXRlcnMoKnN1cmZhY2VJdGVy LT5nZXQoKSwgc2l6ZSwgY29sb3JTcGFjZSwgZm9ybWF0KSkKICAgICAgICAgICAgIGNvbnRpbnVl OwogICAgICAgICBpZiAoc3VyZmFjZUl0ZXItPmdldCgpLT5pc0luVXNlKCkpCiAgICAgICAgICAg ICBjb250aW51ZTsKQEAgLTE1OSwxNCArMTYyLDMwIEBAIHN0ZDo6dW5pcXVlX3B0cjxJT1N1cmZh Y2U+IElPU3VyZmFjZVBvb2w6OnRha2VTdXJmYWNlKEludFNpemUgc2l6ZSwgQ29sb3JTcGFjZSBj CiAgICAgcmV0dXJuIG51bGxwdHI7CiB9CiAKLXZvaWQgSU9TdXJmYWNlUG9vbDo6YWRkU3VyZmFj ZShzdGQ6OnVuaXF1ZV9wdHI8SU9TdXJmYWNlPiBzdXJmYWNlKQorYm9vbCBJT1N1cmZhY2VQb29s OjpzaG91bGRDYWNoZUZvcm1hdChJT1N1cmZhY2U6OkZvcm1hdCBmb3JtYXQpCiB7Ci0gICAgaWYg KHN1cmZhY2UtPnRvdGFsQnl0ZXMoKSA+IG1fbWF4aW11bUJ5dGVzQ2FjaGVkKQotICAgICAgICBy ZXR1cm47CisgICAgcmV0dXJuIGZvcm1hdCAhPSBJT1N1cmZhY2U6OkZvcm1hdDo6WVVWNDIyOwor fQorCitib29sIElPU3VyZmFjZVBvb2w6OnNob3VsZENhY2hlU3VyZmFjZShjb25zdCBJT1N1cmZh Y2UmIHN1cmZhY2UpIGNvbnN0Cit7CisgICAgaWYgKHN1cmZhY2UudG90YWxCeXRlcygpID4gbV9t YXhpbXVtQnl0ZXNDYWNoZWQpCisgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIC8vIFRoZXJl J3Mgbm8gcmVhc29uIHRvIHBvb2wgZW1wdHkgc3VyZmFjZXM7IHdlIHNob3VsZCBuZXZlciBhbGxv Y2F0ZSB0aGVtIGluIHRoZSBmaXJzdCBwbGFjZS4KICAgICAvLyBUaGlzIGFsc28gY292ZXJzIGlz WmVybygpLCB3aGljaCB3b3VsZCBjYXVzZSB0cm91YmxlIHdoZW4gdXNlZCBhcyB0aGUga2V5IGlu IG1fY2FjaGVkU3VyZmFjZXMuCi0gICAgaWYgKHN1cmZhY2UtPnNpemUoKS5pc0VtcHR5KCkpCisg ICAgaWYgKHN1cmZhY2Uuc2l6ZSgpLmlzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOwor CisgICAgaWYgKCFzaG91bGRDYWNoZUZvcm1hdChzdXJmYWNlLmZvcm1hdCgpKSkKKyAgICAgICAg cmV0dXJuIGZhbHNlOworCisgICAgcmV0dXJuIHRydWU7Cit9CisKK3ZvaWQgSU9TdXJmYWNlUG9v bDo6YWRkU3VyZmFjZShzdGQ6OnVuaXF1ZV9wdHI8SU9TdXJmYWNlPiBzdXJmYWNlKQoreworICAg IGlmICghc2hvdWxkQ2FjaGVTdXJmYWNlKCpzdXJmYWNlKSkKICAgICAgICAgcmV0dXJuOwogCiAg ICAgYm9vbCBzdXJmYWNlSXNJblVzZSA9IHN1cmZhY2UtPmlzSW5Vc2UoKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NnL0lPU3VyZmFjZVBvb2wuaCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NnL0lPU3VyZmFjZVBvb2wuaAppbmRleCBj ZjgzYjgyMWYzNDViMTkxNDEwY2ZhODcxMDk0ZDM1MWI1NDY4OWM1Li45ODFlOGM5NmY0YWEwNmEx Njk2M2ZmODk0YzNlMzdlMjQxNGFlZjQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jZy9JT1N1cmZhY2VQb29sLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2cvSU9TdXJmYWNlUG9vbC5oCkBAIC0yNyw2ICsyNyw3IEBACiAjZGVm aW5lIElPU3VyZmFjZVBvb2xfaAogCiAjaW5jbHVkZSAiQ29sb3JTcGFjZS5oIgorI2luY2x1ZGUg IklPU3VyZmFjZS5oIgogI2luY2x1ZGUgIkludFNpemUuaCIKICNpbmNsdWRlICJJbnRTaXplSGFz aC5oIgogI2luY2x1ZGUgIlRpbWVyLmgiCkBAIC0zOSw4ICs0MCw2IEBACiAKIG5hbWVzcGFjZSBX ZWJDb3JlIHsKIAotY2xhc3MgSU9TdXJmYWNlOwotCiBjbGFzcyBJT1N1cmZhY2VQb29sIHsKICAg ICBXVEZfTUFLRV9OT05DT1BZQUJMRShJT1N1cmZhY2VQb29sKTsKICAgICBXVEZfTUFLRV9GQVNU X0FMTE9DQVRFRDsKQEAgLTQ5LDcgKzQ4LDcgQEAgY2xhc3MgSU9TdXJmYWNlUG9vbCB7CiBwdWJs aWM6CiAgICAgV0VCQ09SRV9FWFBPUlQgc3RhdGljIElPU3VyZmFjZVBvb2wmIHNoYXJlZFBvb2wo KTsKIAotICAgIHN0ZDo6dW5pcXVlX3B0cjxJT1N1cmZhY2U+IHRha2VTdXJmYWNlKEludFNpemUs IENvbG9yU3BhY2UpOworICAgIHN0ZDo6dW5pcXVlX3B0cjxJT1N1cmZhY2U+IHRha2VTdXJmYWNl KEludFNpemUsIENvbG9yU3BhY2UsIElPU3VyZmFjZTo6Rm9ybWF0KTsKICAgICBXRUJDT1JFX0VY UE9SVCB2b2lkIGFkZFN1cmZhY2Uoc3RkOjp1bmlxdWVfcHRyPElPU3VyZmFjZT4pOwogCiAgICAg dm9pZCBkaXNjYXJkQWxsU3VyZmFjZXMoKTsKQEAgLTc1LDYgKzc0LDkgQEAgcHJpdmF0ZToKICAg ICB0eXBlZGVmIERlcXVlPHN0ZDo6dW5pcXVlX3B0cjxJT1N1cmZhY2U+PiBDYWNoZWRTdXJmYWNl UXVldWU7CiAgICAgdHlwZWRlZiBIYXNoTWFwPEludFNpemUsIENhY2hlZFN1cmZhY2VRdWV1ZT4g Q2FjaGVkU3VyZmFjZU1hcDsKICAgICB0eXBlZGVmIEhhc2hNYXA8SU9TdXJmYWNlKiwgQ2FjaGVk U3VyZmFjZURldGFpbHM+IENhY2hlZFN1cmZhY2VEZXRhaWxzTWFwOworICAgIAorICAgIHN0YXRp YyBib29sIHNob3VsZENhY2hlRm9ybWF0KElPU3VyZmFjZTo6Rm9ybWF0KTsKKyAgICBib29sIHNo b3VsZENhY2hlU3VyZmFjZShjb25zdCBJT1N1cmZhY2UmKSBjb25zdDsKIAogICAgIHZvaWQgd2ls bEFkZFN1cmZhY2UoSU9TdXJmYWNlJiwgYm9vbCBpblVzZSk7CiAgICAgdm9pZCBkaWRSZW1vdmVT dXJmYWNlKElPU3VyZmFjZSYsIGJvb2wgaW5Vc2UpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvSU9TdXJmYWNlLmggYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9JT1N1cmZhY2UuaAppbmRleCA4YWQxODMxMmFmMTRjZGIy MTFjNmQxZmU3ODY5NzZlNzU2ZjEyNmNkLi5lOTIyNjM1NzAyOWM4M2Y1ZWFjZTAyMjQzN2RjMGIy NzFkNDBmYmIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j b2NvYS9JT1N1cmZhY2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j b2NvYS9JT1N1cmZhY2UuaApAQCAtNDYsNyArNDYsNyBAQCBwdWJsaWM6CiAgICAgfTsKIAogICAg IFdFQkNPUkVfRVhQT1JUIHN0YXRpYyBzdGQ6OnVuaXF1ZV9wdHI8SU9TdXJmYWNlPiBjcmVhdGUo SW50U2l6ZSwgQ29sb3JTcGFjZSwgRm9ybWF0ID0gRm9ybWF0OjpSR0JBKTsKLSAgICBXRUJDT1JF X0VYUE9SVCBzdGF0aWMgc3RkOjp1bmlxdWVfcHRyPElPU3VyZmFjZT4gY3JlYXRlKEludFNpemUs IEludFNpemUgY29udGV4dFNpemUsIENvbG9yU3BhY2UpOworICAgIFdFQkNPUkVfRVhQT1JUIHN0 YXRpYyBzdGQ6OnVuaXF1ZV9wdHI8SU9TdXJmYWNlPiBjcmVhdGUoSW50U2l6ZSwgSW50U2l6ZSBj b250ZXh0U2l6ZSwgQ29sb3JTcGFjZSwgRm9ybWF0ID0gRm9ybWF0OjpSR0JBKTsKICAgICBXRUJD T1JFX0VYUE9SVCBzdGF0aWMgc3RkOjp1bmlxdWVfcHRyPElPU3VyZmFjZT4gY3JlYXRlRnJvbVNl bmRSaWdodChjb25zdCBNYWNoU2VuZFJpZ2h0JiwgQ29sb3JTcGFjZSk7CiAgICAgc3RhdGljIHN0 ZDo6dW5pcXVlX3B0cjxJT1N1cmZhY2U+IGNyZWF0ZUZyb21TdXJmYWNlKElPU3VyZmFjZVJlZiwg Q29sb3JTcGFjZSk7CiAgICAgV0VCQ09SRV9FWFBPUlQgc3RhdGljIHN0ZDo6dW5pcXVlX3B0cjxJ T1N1cmZhY2U+IGNyZWF0ZUZyb21JbWFnZShDR0ltYWdlUmVmKTsKQEAgLTk1LDEwICs5NSwxMCBA QCBwdWJsaWM6CiAKIHByaXZhdGU6CiAgICAgSU9TdXJmYWNlKEludFNpemUsIENvbG9yU3BhY2Us IEZvcm1hdCk7Ci0gICAgSU9TdXJmYWNlKEludFNpemUsIEludFNpemUgY29udGV4dFNpemUsIENv bG9yU3BhY2UpOworICAgIElPU3VyZmFjZShJbnRTaXplLCBJbnRTaXplIGNvbnRleHRTaXplLCBD b2xvclNwYWNlLCBGb3JtYXQpOwogICAgIElPU3VyZmFjZShJT1N1cmZhY2VSZWYsIENvbG9yU3Bh Y2UpOwogCi0gICAgc3RhdGljIHN0ZDo6dW5pcXVlX3B0cjxJT1N1cmZhY2U+IHN1cmZhY2VGcm9t UG9vbChJbnRTaXplLCBJbnRTaXplIGNvbnRleHRTaXplLCBDb2xvclNwYWNlKTsKKyAgICBzdGF0 aWMgc3RkOjp1bmlxdWVfcHRyPElPU3VyZmFjZT4gc3VyZmFjZUZyb21Qb29sKEludFNpemUsIElu dFNpemUgY29udGV4dFNpemUsIENvbG9yU3BhY2UsIEZvcm1hdCk7CiAgICAgSW50U2l6ZSBjb250 ZXh0U2l6ZSgpIGNvbnN0IHsgcmV0dXJuIG1fY29udGV4dFNpemU7IH0KICAgICB2b2lkIHNldENv bnRleHRTaXplKEludFNpemUpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jb2NvYS9JT1N1cmZhY2UubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jb2NvYS9JT1N1cmZhY2UubW0KaW5kZXggNDE4OTU4MGYyYTE0YzIzMjA1Mjg1ZDM3 ZWQwMmJkYjIzN2FjZjM2Ni4uZDJjYmQzY2VjNjYwZTkxOWExMTkyZjQxOGRlZmYxMjg3ZjliZmRj MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvSU9T dXJmYWNlLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0lP U3VyZmFjZS5tbQpAQCAtNDEsOSArNDEsOSBAQCBDR0ltYWdlUmVmIENHSU9TdXJmYWNlQ29udGV4 dENyZWF0ZUltYWdlKENHQ29udGV4dFJlZik7CiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwog Ci1pbmxpbmUgc3RkOjp1bmlxdWVfcHRyPElPU3VyZmFjZT4gSU9TdXJmYWNlOjpzdXJmYWNlRnJv bVBvb2woSW50U2l6ZSBzaXplLCBJbnRTaXplIGNvbnRleHRTaXplLCBDb2xvclNwYWNlIGNvbG9y U3BhY2UpCitpbmxpbmUgc3RkOjp1bmlxdWVfcHRyPElPU3VyZmFjZT4gSU9TdXJmYWNlOjpzdXJm YWNlRnJvbVBvb2woSW50U2l6ZSBzaXplLCBJbnRTaXplIGNvbnRleHRTaXplLCBDb2xvclNwYWNl IGNvbG9yU3BhY2UsIEZvcm1hdCBwaXhlbEZvcm1hdCkKIHsKLSAgICBhdXRvIGNhY2hlZFN1cmZh Y2UgPSBJT1N1cmZhY2VQb29sOjpzaGFyZWRQb29sKCkudGFrZVN1cmZhY2Uoc2l6ZSwgY29sb3JT cGFjZSk7CisgICAgYXV0byBjYWNoZWRTdXJmYWNlID0gSU9TdXJmYWNlUG9vbDo6c2hhcmVkUG9v bCgpLnRha2VTdXJmYWNlKHNpemUsIGNvbG9yU3BhY2UsIHBpeGVsRm9ybWF0KTsKICAgICBpZiAo IWNhY2hlZFN1cmZhY2UpCiAgICAgICAgIHJldHVybiBudWxscHRyOwogCkBAIC01MywyMSArNTMs MTcgQEAgaW5saW5lIHN0ZDo6dW5pcXVlX3B0cjxJT1N1cmZhY2U+IElPU3VyZmFjZTo6c3VyZmFj ZUZyb21Qb29sKEludFNpemUgc2l6ZSwgSW50U2kKIAogc3RkOjp1bmlxdWVfcHRyPElPU3VyZmFj ZT4gSU9TdXJmYWNlOjpjcmVhdGUoSW50U2l6ZSBzaXplLCBDb2xvclNwYWNlIGNvbG9yU3BhY2Us IEZvcm1hdCBwaXhlbEZvcm1hdCkKIHsKLSAgICAvLyBZVVY0MjIgSU9TdXJmYWNlcyBkbyBub3Qg Z28gaW4gdGhlIHBvb2wuCi0gICAgLy8gRklYTUU6IFdhbnQgcG9vbGluZyBvZiBSR0IxMCwgUkdC MTBBOC4KLSAgICBpZiAocGl4ZWxGb3JtYXQgPT0gRm9ybWF0OjpSR0JBKSB7Ci0gICAgICAgIGlm IChhdXRvIGNhY2hlZFN1cmZhY2UgPSBzdXJmYWNlRnJvbVBvb2woc2l6ZSwgc2l6ZSwgY29sb3JT cGFjZSkpCi0gICAgICAgICAgICByZXR1cm4gY2FjaGVkU3VyZmFjZTsKLSAgICB9CisgICAgaWYg KGF1dG8gY2FjaGVkU3VyZmFjZSA9IHN1cmZhY2VGcm9tUG9vbChzaXplLCBzaXplLCBjb2xvclNw YWNlLCBwaXhlbEZvcm1hdCkpCisgICAgICAgIHJldHVybiBjYWNoZWRTdXJmYWNlOwogCiAgICAg cmV0dXJuIHN0ZDo6dW5pcXVlX3B0cjxJT1N1cmZhY2U+KG5ldyBJT1N1cmZhY2Uoc2l6ZSwgY29s b3JTcGFjZSwgcGl4ZWxGb3JtYXQpKTsKIH0KIAotc3RkOjp1bmlxdWVfcHRyPElPU3VyZmFjZT4g SU9TdXJmYWNlOjpjcmVhdGUoSW50U2l6ZSBzaXplLCBJbnRTaXplIGNvbnRleHRTaXplLCBDb2xv clNwYWNlIGNvbG9yU3BhY2UpCitzdGQ6OnVuaXF1ZV9wdHI8SU9TdXJmYWNlPiBJT1N1cmZhY2U6 OmNyZWF0ZShJbnRTaXplIHNpemUsIEludFNpemUgY29udGV4dFNpemUsIENvbG9yU3BhY2UgY29s b3JTcGFjZSwgRm9ybWF0IHBpeGVsRm9ybWF0KQogewotICAgIGlmIChhdXRvIGNhY2hlZFN1cmZh Y2UgPSBzdXJmYWNlRnJvbVBvb2woc2l6ZSwgY29udGV4dFNpemUsIGNvbG9yU3BhY2UpKQorICAg IGlmIChhdXRvIGNhY2hlZFN1cmZhY2UgPSBzdXJmYWNlRnJvbVBvb2woc2l6ZSwgY29udGV4dFNp emUsIGNvbG9yU3BhY2UsIHBpeGVsRm9ybWF0KSkKICAgICAgICAgcmV0dXJuIGNhY2hlZFN1cmZh Y2U7Ci0gICAgcmV0dXJuIHN0ZDo6dW5pcXVlX3B0cjxJT1N1cmZhY2U+KG5ldyBJT1N1cmZhY2Uo c2l6ZSwgY29udGV4dFNpemUsIGNvbG9yU3BhY2UpKTsKKyAgICByZXR1cm4gc3RkOjp1bmlxdWVf cHRyPElPU3VyZmFjZT4obmV3IElPU3VyZmFjZShzaXplLCBjb250ZXh0U2l6ZSwgY29sb3JTcGFj ZSwgcGl4ZWxGb3JtYXQpKTsKIH0KIAogc3RkOjp1bmlxdWVfcHRyPElPU3VyZmFjZT4gSU9TdXJm YWNlOjpjcmVhdGVGcm9tU2VuZFJpZ2h0KGNvbnN0IE1hY2hTZW5kUmlnaHQmIHNlbmRSaWdodCwg Q29sb3JTcGFjZSBjb2xvclNwYWNlKQpAQCAtMjEyLDggKzIwOCw4IEBAIElPU3VyZmFjZTo6SU9T dXJmYWNlKEludFNpemUgc2l6ZSwgQ29sb3JTcGFjZSBjb2xvclNwYWNlLCBGb3JtYXQgZm9ybWF0 KQogICAgICAgICBOU0xvZyhAIlN1cmZhY2UgY3JlYXRpb24gZmFpbGVkIGZvciBvcHRpb25zICVA Iiwgb3B0aW9ucyk7CiB9CiAKLUlPU3VyZmFjZTo6SU9TdXJmYWNlKEludFNpemUgc2l6ZSwgSW50 U2l6ZSBjb250ZXh0U2l6ZSwgQ29sb3JTcGFjZSBjb2xvclNwYWNlKQotICAgIDogSU9TdXJmYWNl KHNpemUsIGNvbG9yU3BhY2UsIEZvcm1hdDo6UkdCQSkKK0lPU3VyZmFjZTo6SU9TdXJmYWNlKElu dFNpemUgc2l6ZSwgSW50U2l6ZSBjb250ZXh0U2l6ZSwgQ29sb3JTcGFjZSBjb2xvclNwYWNlLCBG b3JtYXQgcGl4ZWxGb3JtYXQpCisgICAgOiBJT1N1cmZhY2Uoc2l6ZSwgY29sb3JTcGFjZSwgcGl4 ZWxGb3JtYXQpCiB7CiAgICAgQVNTRVJUKGNvbnRleHRTaXplLndpZHRoKCkgPD0gc2l6ZS53aWR0 aCgpKTsKICAgICBBU1NFUlQoY29udGV4dFNpemUuaGVpZ2h0KCkgPD0gc2l6ZS5oZWlnaHQoKSk7 Cg==