50501 2010-12-03 15:55:48 -0800 Postpone gl delete* calls until shaders/programs are no longer attached 2010-12-06 15:17:24 -0800 1 1 1 Unclassified WebKit WebGL 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 zmo zmo cmarrin enne gman kbr oldest_to_newest 317139 0 zmo 2010-12-03 15:55:48 -0800 By doing this, chromium command buffer won't have to change its behavior and will pass the conformance test 317153 1 75571 zmo 2010-12-03 16:05:55 -0800 Created attachment 75571 patch Manually ran chrome with command buffer, object-deletion-behavior.html is passing with this patch. 317843 2 75571 kbr 2010-12-06 14:21:06 -0800 Comment on attachment 75571 patch The changes look good, but do the existing layout tests sufficiently cover these code paths? 317851 3 zmo 2010-12-06 14:38:31 -0800 We have object-deletion-behavior.html checked into LayoutTests, which covers this deletion code path. 317852 4 75571 kbr 2010-12-06 14:39:43 -0800 Comment on attachment 75571 patch OK. 317870 5 zmo 2010-12-06 15:17:24 -0800 Committed r73406: <http://trac.webkit.org/changeset/73406> 75571 2010-12-03 16:05:55 -0800 2010-12-06 14:39:43 -0800 patch delete.patch text/plain 9430 zmo SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA3MzMxNikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzIgQEAKKzIwMTAtMTItMDMgIFpoZW55YW8gTW8gIDx6bW9AZ29vZ2xlLmNvbT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQb3N0cG9u ZSBnbCBkZWxldGUqIGNhbGxzIHVudGlsIHNoYWRlcnMvcHJvZ3JhbXMgYXJlIG5vIGxvbmdlciBh dHRhY2hlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NTA1MDEKKworICAgICAgICAqIGh0bWwvY2FudmFzL1dlYkdMQnVmZmVyLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OldlYkdMQnVmZmVyOjpkZWxldGVPYmplY3RJbXBsKTogU2ltcGx5IGRlbGV0ZSBH TCByZXNvdXJjZS4KKyAgICAgICAgKiBodG1sL2NhbnZhcy9XZWJHTEZyYW1lYnVmZmVyLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OldlYkdMRnJhbWVidWZmZXI6OmRlbGV0ZU9iamVjdEltcGwpOiBE aXR0by4KKyAgICAgICAgKiBodG1sL2NhbnZhcy9XZWJHTE9iamVjdC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpXZWJHTE9iamVjdDo6ZGVsZXRlT2JqZWN0KTogVHJhY2tpbmcgd2hldGhlciBkZWxl dGVPYmplY3RJbXBsIHNob3VsZCBiZSBjYWxsZWQgb3Igbm90LgorICAgICAgICAqIGh0bWwvY2Fu dmFzL1dlYkdMT2JqZWN0Lmg6CisgICAgICAgIChXZWJDb3JlOjpXZWJHTE9iamVjdDo6ZGV0YWNo Q29udGV4dCk6IFNldCBhdHRhY2htZW50Q291bnQgdG8gMCB0byBlbnN1cmUgT3BlbkdMIHJlc291 cmNlIGRlbGV0aW9uLgorICAgICAgICAoV2ViQ29yZTo6V2ViR0xPYmplY3Q6Om9uRGV0YWNoZWQp OiBObyBuZWVkIHRvIHRyYWNrIGF0dGFjaG1lbnRDb3VudCBoZXJlIGFzIHdlIHRyYWNrIGl0IGlu IGRlbGV0ZU9iamVjdC4KKyAgICAgICAgKFdlYkNvcmU6OldlYkdMT2JqZWN0Ojppc0RlbGV0ZWQp OiBNYWtlIHRoaXMgcHVibGljLgorICAgICAgICAqIGh0bWwvY2FudmFzL1dlYkdMUHJvZ3JhbS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpXZWJHTFByb2dyYW06OmRlbGV0ZU9iamVjdEltcGwpOiBT aW1wbHkgZGVsZXRlIEdMIHJlc291cmNlLgorICAgICAgICAqIGh0bWwvY2FudmFzL1dlYkdMUmVu ZGVyYnVmZmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldlYkdMUmVuZGVyYnVmZmVyOjpkZWxl dGVPYmplY3RJbXBsKTogRGl0dG8uCisgICAgICAgICogaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJp bmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldlYkdMUmVuZGVyaW5nQ29udGV4dDo6 Z2V0UHJvZ3JhbVBhcmFtZXRlcik6IGludGVyY2VwdCBERUxFVEVfU1RBVFVTLgorICAgICAgICAo V2ViQ29yZTo6V2ViR0xSZW5kZXJpbmdDb250ZXh0OjpnZXRTaGFkZXJQYXJhbWV0ZXIpOiBEaXR0 by4KKyAgICAgICAgKiBodG1sL2NhbnZhcy9XZWJHTFNoYWRlci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpXZWJHTFNoYWRlcjo6ZGVsZXRlT2JqZWN0SW1wbCk6IFNpbXBseSBkZWxldGUgR0wgcmVz b3VyY2UuCisgICAgICAgICogaHRtbC9jYW52YXMvV2ViR0xUZXh0dXJlLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OldlYkdMVGV4dHVyZTo6ZGVsZXRlT2JqZWN0SW1wbCk6IFNpbXBseSBkZWxldGUg R0wgcmVzb3VyY2UuCisKIDIwMTAtMTItMDEgIElseWEgVGlraG9ub3Zza3kgIDxsb2lzbG9AY2hy b21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFBhdmVsIEZlbGRtYW4uCkluZGV4OiBX ZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMQnVmZmVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3Jl L2h0bWwvY2FudmFzL1dlYkdMQnVmZmVyLmNwcAkocmV2aXNpb24gNzMxOTkpCisrKyBXZWJDb3Jl L2h0bWwvY2FudmFzL1dlYkdMQnVmZmVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTIsOCArNTIs NyBAQCBXZWJHTEJ1ZmZlcjo6V2ViR0xCdWZmZXIoV2ViR0xSZW5kZXJpbmdDCiAKIHZvaWQgV2Vi R0xCdWZmZXI6OmRlbGV0ZU9iamVjdEltcGwoUGxhdGZvcm0zRE9iamVjdCBvYmplY3QpCiB7Ci0g ICAgaWYgKCFpc0RlbGV0ZWQoKSkKLSAgICAgICAgY29udGV4dCgpLT5ncmFwaGljc0NvbnRleHQz RCgpLT5kZWxldGVCdWZmZXIob2JqZWN0KTsKKyAgICBjb250ZXh0KCktPmdyYXBoaWNzQ29udGV4 dDNEKCktPmRlbGV0ZUJ1ZmZlcihvYmplY3QpOwogfQogCiBib29sIFdlYkdMQnVmZmVyOjphc3Nv Y2lhdGVCdWZmZXJEYXRhSW1wbChBcnJheUJ1ZmZlciogYXJyYXksIHVuc2lnbmVkIGJ5dGVPZmZz ZXQsIHVuc2lnbmVkIGJ5dGVMZW5ndGgpCkluZGV4OiBXZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdM RnJhbWVidWZmZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xG cmFtZWJ1ZmZlci5jcHAJKHJldmlzaW9uIDczMTk5KQorKysgV2ViQ29yZS9odG1sL2NhbnZhcy9X ZWJHTEZyYW1lYnVmZmVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTkwLDggKzE5MCw3IEBAIGJv b2wgV2ViR0xGcmFtZWJ1ZmZlcjo6b25BY2Nlc3MoKQogCiB2b2lkIFdlYkdMRnJhbWVidWZmZXI6 OmRlbGV0ZU9iamVjdEltcGwoUGxhdGZvcm0zRE9iamVjdCBvYmplY3QpCiB7Ci0gICAgaWYgKCFp c0RlbGV0ZWQoKSkKLSAgICAgICAgY29udGV4dCgpLT5ncmFwaGljc0NvbnRleHQzRCgpLT5kZWxl dGVGcmFtZWJ1ZmZlcihvYmplY3QpOworICAgIGNvbnRleHQoKS0+Z3JhcGhpY3NDb250ZXh0M0Qo KS0+ZGVsZXRlRnJhbWVidWZmZXIob2JqZWN0KTsKICAgICBtX2NvbG9yQXR0YWNobWVudCA9IDA7 CiAgICAgbV9kZXB0aEF0dGFjaG1lbnQgPSAwOwogICAgIG1fc3RlbmNpbEF0dGFjaG1lbnQgPSAw OwpJbmRleDogV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTE9iamVjdC5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTE9iamVjdC5jcHAJKHJldmlzaW9uIDczMTk5KQor KysgV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTE9iamVjdC5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTU2LDE0ICs1NiwxMyBAQCB2b2lkIFdlYkdMT2JqZWN0OjpzZXRPYmplY3QoUGxhdGZvcm0zRE9i CiAKIHZvaWQgV2ViR0xPYmplY3Q6OmRlbGV0ZU9iamVjdCgpCiB7Ci0gICAgaWYgKG1fb2JqZWN0 KSB7Ci0gICAgICAgIGlmIChtX2NvbnRleHQpIHsKLSAgICAgICAgICAgIG1fY29udGV4dC0+Z3Jh cGhpY3NDb250ZXh0M0QoKS0+bWFrZUNvbnRleHRDdXJyZW50KCk7Ci0gICAgICAgICAgICBkZWxl dGVPYmplY3RJbXBsKG1fb2JqZWN0KTsKLSAgICAgICAgfQotICAgICAgICBpZiAoIW1fYXR0YWNo bWVudENvdW50KQotICAgICAgICAgICAgbV9vYmplY3QgPSAwOwotICAgICAgICBtX2RlbGV0ZWQg PSB0cnVlOworICAgIG1fZGVsZXRlZCA9IHRydWU7CisgICAgaWYgKCFtX2NvbnRleHQgfHwgIW1f b2JqZWN0KQorICAgICAgICByZXR1cm47CisgICAgaWYgKCFtX2F0dGFjaG1lbnRDb3VudCkgewor ICAgICAgICBtX2NvbnRleHQtPmdyYXBoaWNzQ29udGV4dDNEKCktPm1ha2VDb250ZXh0Q3VycmVu dCgpOworICAgICAgICBkZWxldGVPYmplY3RJbXBsKG1fb2JqZWN0KTsKKyAgICAgICAgbV9vYmpl Y3QgPSAwOwogICAgIH0KIH0KIApJbmRleDogV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTE9iamVj dC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xPYmplY3QuaAkocmV2 aXNpb24gNzMxOTkpCisrKyBXZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMT2JqZWN0LmgJKHdvcmtp bmcgY29weSkKQEAgLTQwLDEwICs0MCwxNSBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB+V2ViR0xP YmplY3QoKTsKIAogICAgIFBsYXRmb3JtM0RPYmplY3Qgb2JqZWN0KCkgY29uc3QgeyByZXR1cm4g bV9vYmplY3Q7IH0KKworICAgIC8vIGRlbGV0ZU9iamVjdCBtYXkgbm90IGFsd2F5cyBkZWxldGUg dGhlIE9wZW5HTCByZXNvdXJjZS4gIEZvciBwcm9ncmFtcyBhbmQKKyAgICAvLyBzaGFkZXJzLCBk ZWxldGlvbiBpcyBkZWxheWVkIHVudGlsIHRoZXkgYXJlIG5vIGxvbmdlciBhdHRhY2hlZC4KKyAg ICAvLyBGSVhNRTogcmV2aXNpdCB0aGlzIHdoZW4gcmVzb3VyY2Ugc2hhcmluZyBiZXR3ZWVuIGNv bnRleHRzIGFyZSBpbXBsZW1lbnRlZC4KICAgICB2b2lkIGRlbGV0ZU9iamVjdCgpOwogCiAgICAg dm9pZCBkZXRhY2hDb250ZXh0KCkKICAgICB7CisgICAgICAgIG1fYXR0YWNobWVudENvdW50ID0g MDsgLy8gTWFrZSBzdXJlIE9wZW5HTCByZXNvdXJjZSBpcyBkZWxldGVkLgogICAgICAgICBkZWxl dGVPYmplY3QoKTsKICAgICAgICAgbV9jb250ZXh0ID0gMDsKICAgICB9CkBAIC02MiwxMCArNjcs MTQgQEAgcHVibGljOgogICAgIHsKICAgICAgICAgaWYgKG1fYXR0YWNobWVudENvdW50KQogICAg ICAgICAgICAgLS1tX2F0dGFjaG1lbnRDb3VudDsKLSAgICAgICAgaWYgKCFtX2F0dGFjaG1lbnRD b3VudCAmJiBtX2RlbGV0ZWQpCisgICAgICAgIGlmIChtX2RlbGV0ZWQpCiAgICAgICAgICAgICBk ZWxldGVPYmplY3QoKTsKICAgICB9Ci0gICAgdW5zaWduZWQgZ2V0QXR0YWNobWVudENvdW50KCkg eyByZXR1cm4gbV9hdHRhY2htZW50Q291bnQ7IH0KKworICAgIC8vIFRoaXMgaW5kaWNhdGVzIHdo ZXRoZXIgdGhlIGNsaWVudCBzaWRlIGlzc3VlIGEgZGVsZXRlIGNhbGwgYWxyZWFkeSwgbm90Cisg ICAgLy8gd2hldGhlciB0aGUgT3BlbkdMIHJlc291cmNlIGlzIGRlbGV0ZWQuCisgICAgLy8gb2Jq ZWN0KCk9PTAgaW5kaWNhdGVzIHRoZSBPcGVuR0wgcmVzb3VyY2UgaXMgZGVsZXRlZC4KKyAgICBi b29sIGlzRGVsZXRlZCgpIHsgcmV0dXJuIG1fZGVsZXRlZDsgfQogCiBwcm90ZWN0ZWQ6CiAgICAg V2ViR0xPYmplY3QoV2ViR0xSZW5kZXJpbmdDb250ZXh0Kik7CkBAIC03MywxMiArODIsOCBAQCBw cm90ZWN0ZWQ6CiAgICAgLy8gc2V0T2JqZWN0IHNob3VsZCBiZSBvbmx5IGNhbGxlZCBvbmNlIHJp Z2h0IGFmdGVyIGNyZWF0aW5nIGEgV2ViR0xPYmplY3QuCiAgICAgdm9pZCBzZXRPYmplY3QoUGxh dGZvcm0zRE9iamVjdCk7CiAKLSAgICAvLyBkZWxldGVPYmplY3RJbXBsKCkgbWF5IGJlIGNhbGxl ZCBtdWx0aXBsZSB0aW1lcyBmb3IgdGhlIHNhbWUgb2JqZWN0OwotICAgIC8vIGlzRGVsZXRlZCgp IG5lZWRzIHRvIGJlIHRlc3RlZCBpbiBpbXBsZW1lbnRhdGlvbnMgd2hlbiBkZWNpZGluZyB3aGV0 aGVyCi0gICAgLy8gdG8gZGVsZXRlIHRoZSBPcGVuR0wgcmVzb3VyY2UuCisgICAgLy8gZGVsZXRl T2JqZWN0SW1wbCBzaG91bGQgYmUgb25seSBjYWxsZWQgb25jZSB0byBkZWxldGUgdGhlIE9wZW5H TCByZXNvdXJjZS4KICAgICB2aXJ0dWFsIHZvaWQgZGVsZXRlT2JqZWN0SW1wbChQbGF0Zm9ybTNE T2JqZWN0KSA9IDA7Ci0gICAgYm9vbCBpc0RlbGV0ZWQoKSB7IHJldHVybiBtX2RlbGV0ZWQ7IH0K LSAgICB2b2lkIHNldERldGVsZWQoKSB7IG1fZGVsZXRlZCA9IHRydWU7IH0KIAogcHJpdmF0ZToK ICAgICBQbGF0Zm9ybTNET2JqZWN0IG1fb2JqZWN0OwpJbmRleDogV2ViQ29yZS9odG1sL2NhbnZh cy9XZWJHTFByb2dyYW0uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvaHRtbC9jYW52YXMvV2Vi R0xQcm9ncmFtLmNwcAkocmV2aXNpb24gNzMxOTkpCisrKyBXZWJDb3JlL2h0bWwvY2FudmFzL1dl YkdMUHJvZ3JhbS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ3LDE3ICs0NywxNCBAQCBXZWJHTFBy b2dyYW06OldlYkdMUHJvZ3JhbShXZWJHTFJlbmRlcmluCiAKIHZvaWQgV2ViR0xQcm9ncmFtOjpk ZWxldGVPYmplY3RJbXBsKFBsYXRmb3JtM0RPYmplY3Qgb2JqKQogewotICAgIGlmICghaXNEZWxl dGVkKCkpCi0gICAgICAgIGNvbnRleHQoKS0+Z3JhcGhpY3NDb250ZXh0M0QoKS0+ZGVsZXRlUHJv Z3JhbShvYmopOwotICAgIGlmICghZ2V0QXR0YWNobWVudENvdW50KCkpIHsKLSAgICAgICAgaWYg KG1fdmVydGV4U2hhZGVyKSB7Ci0gICAgICAgICAgICBtX3ZlcnRleFNoYWRlci0+b25EZXRhY2hl ZCgpOwotICAgICAgICAgICAgbV92ZXJ0ZXhTaGFkZXIgPSAwOwotICAgICAgICB9Ci0gICAgICAg IGlmIChtX2ZyYWdtZW50U2hhZGVyKSB7Ci0gICAgICAgICAgICBtX2ZyYWdtZW50U2hhZGVyLT5v bkRldGFjaGVkKCk7Ci0gICAgICAgICAgICBtX2ZyYWdtZW50U2hhZGVyID0gMDsKLSAgICAgICAg fQorICAgIGNvbnRleHQoKS0+Z3JhcGhpY3NDb250ZXh0M0QoKS0+ZGVsZXRlUHJvZ3JhbShvYmop OworICAgIGlmIChtX3ZlcnRleFNoYWRlcikgeworICAgICAgICBtX3ZlcnRleFNoYWRlci0+b25E ZXRhY2hlZCgpOworICAgICAgICBtX3ZlcnRleFNoYWRlciA9IDA7CisgICAgfQorICAgIGlmICht X2ZyYWdtZW50U2hhZGVyKSB7CisgICAgICAgIG1fZnJhZ21lbnRTaGFkZXItPm9uRGV0YWNoZWQo KTsKKyAgICAgICAgbV9mcmFnbWVudFNoYWRlciA9IDA7CiAgICAgfQogfQogCkluZGV4OiBXZWJD b3JlL2h0bWwvY2FudmFzL1dlYkdMUmVuZGVyYnVmZmVyLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJD b3JlL2h0bWwvY2FudmFzL1dlYkdMUmVuZGVyYnVmZmVyLmNwcAkocmV2aXNpb24gNzMxOTkpCisr KyBXZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMUmVuZGVyYnVmZmVyLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtNTIsOCArNTIsNyBAQCBXZWJHTFJlbmRlcmJ1ZmZlcjo6V2ViR0xSZW5kZXJidWZmZXIo V2ViCiAKIHZvaWQgV2ViR0xSZW5kZXJidWZmZXI6OmRlbGV0ZU9iamVjdEltcGwoUGxhdGZvcm0z RE9iamVjdCBvYmplY3QpCiB7Ci0gICAgaWYgKCFpc0RlbGV0ZWQoKSkKLSAgICAgICAgY29udGV4 dCgpLT5ncmFwaGljc0NvbnRleHQzRCgpLT5kZWxldGVSZW5kZXJidWZmZXIob2JqZWN0KTsKKyAg ICBjb250ZXh0KCktPmdyYXBoaWNzQ29udGV4dDNEKCktPmRlbGV0ZVJlbmRlcmJ1ZmZlcihvYmpl Y3QpOwogfQogCiB9CkluZGV4OiBXZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMUmVuZGVyaW5nQ29u dGV4dC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFJlbmRlcmlu Z0NvbnRleHQuY3BwCShyZXZpc2lvbiA3MzE5OSkKKysrIFdlYkNvcmUvaHRtbC9jYW52YXMvV2Vi R0xSZW5kZXJpbmdDb250ZXh0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTY4NSw2ICsxNjg1LDcg QEAgV2ViR0xHZXRJbmZvIFdlYkdMUmVuZGVyaW5nQ29udGV4dDo6Z2V0UAogICAgIGludCB2YWx1 ZSA9IDA7CiAgICAgc3dpdGNoIChwbmFtZSkgewogICAgIGNhc2UgR3JhcGhpY3NDb250ZXh0M0Q6 OkRFTEVURV9TVEFUVVM6CisgICAgICAgIHJldHVybiBXZWJHTEdldEluZm8ocHJvZ3JhbS0+aXNE ZWxldGVkKCkpOwogICAgIGNhc2UgR3JhcGhpY3NDb250ZXh0M0Q6OlZBTElEQVRFX1NUQVRVUzoK ICAgICAgICAgbV9jb250ZXh0LT5nZXRQcm9ncmFtaXYob2JqZWN0T3JaZXJvKHByb2dyYW0pLCBw bmFtZSwgJnZhbHVlKTsKICAgICAgICAgcmV0dXJuIFdlYkdMR2V0SW5mbyhzdGF0aWNfY2FzdDxi b29sPih2YWx1ZSkpOwpAQCAtMTc5MSw2ICsxNzkyLDcgQEAgV2ViR0xHZXRJbmZvIFdlYkdMUmVu ZGVyaW5nQ29udGV4dDo6Z2V0UwogICAgIGludCB2YWx1ZSA9IDA7CiAgICAgc3dpdGNoIChwbmFt ZSkgewogICAgIGNhc2UgR3JhcGhpY3NDb250ZXh0M0Q6OkRFTEVURV9TVEFUVVM6CisgICAgICAg IHJldHVybiBXZWJHTEdldEluZm8oc2hhZGVyLT5pc0RlbGV0ZWQoKSk7CiAgICAgY2FzZSBHcmFw aGljc0NvbnRleHQzRDo6Q09NUElMRV9TVEFUVVM6CiAgICAgICAgIG1fY29udGV4dC0+Z2V0U2hh ZGVyaXYob2JqZWN0T3JaZXJvKHNoYWRlciksIHBuYW1lLCAmdmFsdWUpOwogICAgICAgICByZXR1 cm4gV2ViR0xHZXRJbmZvKHN0YXRpY19jYXN0PGJvb2w+KHZhbHVlKSk7CkluZGV4OiBXZWJDb3Jl L2h0bWwvY2FudmFzL1dlYkdMU2hhZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2h0bWwv Y2FudmFzL1dlYkdMU2hhZGVyLmNwcAkocmV2aXNpb24gNzMxOTkpCisrKyBXZWJDb3JlL2h0bWwv Y2FudmFzL1dlYkdMU2hhZGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDcsOCArNDcsNyBAQCBX ZWJHTFNoYWRlcjo6V2ViR0xTaGFkZXIoV2ViR0xSZW5kZXJpbmdDCiAKIHZvaWQgV2ViR0xTaGFk ZXI6OmRlbGV0ZU9iamVjdEltcGwoUGxhdGZvcm0zRE9iamVjdCBvYmplY3QpCiB7Ci0gICAgaWYg KCFpc0RlbGV0ZWQoKSkKLSAgICAgICAgY29udGV4dCgpLT5ncmFwaGljc0NvbnRleHQzRCgpLT5k ZWxldGVTaGFkZXIob2JqZWN0KTsKKyAgICBjb250ZXh0KCktPmdyYXBoaWNzQ29udGV4dDNEKCkt PmRlbGV0ZVNoYWRlcihvYmplY3QpOwogfQogCiB9CkluZGV4OiBXZWJDb3JlL2h0bWwvY2FudmFz L1dlYkdMVGV4dHVyZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJH TFRleHR1cmUuY3BwCShyZXZpc2lvbiA3MzE5OSkKKysrIFdlYkNvcmUvaHRtbC9jYW52YXMvV2Vi R0xUZXh0dXJlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjAyLDggKzIwMiw3IEBAIGJvb2wgV2Vi R0xUZXh0dXJlOjpuZWVkVG9Vc2VCbGFja1RleHR1cmUKIAogdm9pZCBXZWJHTFRleHR1cmU6OmRl bGV0ZU9iamVjdEltcGwoUGxhdGZvcm0zRE9iamVjdCBvYmplY3QpCiB7Ci0gICAgaWYgKCFpc0Rl bGV0ZWQoKSkKLSAgICAgICAgY29udGV4dCgpLT5ncmFwaGljc0NvbnRleHQzRCgpLT5kZWxldGVU ZXh0dXJlKG9iamVjdCk7CisgICAgY29udGV4dCgpLT5ncmFwaGljc0NvbnRleHQzRCgpLT5kZWxl dGVUZXh0dXJlKG9iamVjdCk7CiB9CiAKIGludCBXZWJHTFRleHR1cmU6Om1hcFRhcmdldFRvSW5k ZXgodW5zaWduZWQgbG9uZyB0YXJnZXQpCg==