89387 2012-06-18 15:05:17 -0700 Fix framebuffer-object-attachment.html failures 2012-06-18 15:38:28 -0700 1 1 1 Unclassified WebKit WebGL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zmo zmo gman kbr oldest_to_newest 651771 0 zmo 2012-06-18 15:05:17 -0700 A few bugs 1) in DEPTH_STENCIL_ATTACHMENT we put DEPTH_STENCIL 2) we should always do the re-attachments after removing an attachment buffer (either through framebufferRenderbuffer/framebufferTexture using a null buffer or deleteRenderbuffer/deleteTexture) due to the depth/stencil/depth_stencil conflicts 3) getParameter(DEPTH_BITS/STENCIL_BITS) bug: right now we assume it's always from drawing buffer 651787 1 148185 zmo 2012-06-18 15:15:32 -0700 Created attachment 148185 Patch 651792 2 zmo 2012-06-18 15:17:47 -0700 Test change will be added in a separate patch. This is because likely this patch needs to be merged back to chrome M21, and separating the tests change in another patch will reduce the possibility of conflicts. 651802 3 148185 kbr 2012-06-18 15:24:14 -0700 Comment on attachment 148185 Patch Looks good. I understand that this is being checked in separately from an updated version of the framebuffer-object-attachment.html layout test to make it easier to backport this fix; let's please update that test and its expectations ASAP though. r=me 651814 4 zmo 2012-06-18 15:38:28 -0700 Committed r120636: <http://trac.webkit.org/changeset/120636> 148185 2012-06-18 15:15:32 -0700 2012-06-18 15:24:14 -0700 Patch bug-89387-20120618151531.patch text/plain 11264 zmo SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyMDYzMCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDEyLTA2LTE4ICBaaGVueWFv IE1vICA8em1vQGdvb2dsZS5jb20+CisKKyAgICAgICAgRml4IGZyYW1lYnVmZmVyLW9iamVjdC1h dHRhY2htZW50Lmh0bWwgZmFpbHVyZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTg5Mzg3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBodG1sL2NhbnZhcy9XZWJHTEZyYW1lYnVmZmVyLmNwcDogZml4IGRl dGFjaG1lbnQgYmVoYXZpb3Igd2l0aCBkZXB0aC9zdGVuY2lsL2RlcHRoX3N0ZW5jaWwgY29uZmxp Y3RzCisgICAgICAgIChXZWJDb3JlOjpXZWJHTEZyYW1lYnVmZmVyOjpzZXRBdHRhY2htZW50Rm9y Qm91bmRGcmFtZWJ1ZmZlcik6CisgICAgICAgIChXZWJDb3JlOjpXZWJHTEZyYW1lYnVmZmVyOjpy ZW1vdmVBdHRhY2htZW50RnJvbUJvdW5kRnJhbWVidWZmZXIpOgorICAgICAgICAqIGh0bWwvY2Fu dmFzL1dlYkdMRnJhbWVidWZmZXIuaDoKKyAgICAgICAgKFdlYkdMRnJhbWVidWZmZXIpOgorICAg ICAgICAqIGh0bWwvY2FudmFzL1dlYkdMUmVuZGVyaW5nQ29udGV4dC5jcHA6CisgICAgICAgIChX ZWJDb3JlKToKKyAgICAgICAgKFdlYkNvcmU6OldlYkdMUmVuZGVyaW5nQ29udGV4dDo6ZnJhbWVi dWZmZXJSZW5kZXJidWZmZXIpOiBtb3ZlIGxvZ2ljIHRvIFdlYkdMRnJhbWVidWZmZXIKKyAgICAg ICAgKFdlYkNvcmU6OldlYkdMUmVuZGVyaW5nQ29udGV4dDo6ZnJhbWVidWZmZXJUZXh0dXJlMkQp OiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OldlYkdMUmVuZGVyaW5nQ29udGV4dDo6Z2V0UGFy YW1ldGVyKTogQ29ycmVjdCB0aGUgd3JvbmcgYXNzdW1wdGlvbiB0aGF0IGl0J3MgYWx3YXlzIGNo ZWNraW5nIHRoZSBkcmF3aW5nYnVmZmVyJ3MgREVQVEhfQklUUy9TVEVOQ0lMX0JJVFMKKyAgICAg ICAgKiBodG1sL2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHQuaDoKKyAgICAgICAgKFdlYkdM UmVuZGVyaW5nQ29udGV4dCk6CisKIDIwMTItMDYtMTggIE5pY28gV2ViZXIgIDx0aGFraXNAY2hy b21pdW0ub3JnPgogCiAgICAgICAgIFtjaHJvbWl1bS9tYWNdIFVuYnJlYWsgc21vb3RoIHNjcm9s bGluZy4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMRnJhbWVidWZmZXIu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMRnJhbWVi dWZmZXIuY3BwCShyZXZpc2lvbiAxMjA2MDcpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZh cy9XZWJHTEZyYW1lYnVmZmVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTI4LDcgKzEyOCw3IEBA IG5hbWVzcGFjZSB7CiAKICAgICB2b2lkIFdlYkdMUmVuZGVyYnVmZmVyQXR0YWNobWVudDo6dW5h dHRhY2goR3JhcGhpY3NDb250ZXh0M0QqIGNvbnRleHQsIEdDM0RlbnVtIGF0dGFjaG1lbnQpCiAg ICAgewotICAgICAgICBpZiAoYXR0YWNobWVudCA9PSBHcmFwaGljc0NvbnRleHQzRDo6REVQVEhf U1RFTkNJTCkgeworICAgICAgICBpZiAoYXR0YWNobWVudCA9PSBHcmFwaGljc0NvbnRleHQzRDo6 REVQVEhfU1RFTkNJTF9BVFRBQ0hNRU5UKSB7CiAgICAgICAgICAgICBjb250ZXh0LT5mcmFtZWJ1 ZmZlclJlbmRlcmJ1ZmZlcihHcmFwaGljc0NvbnRleHQzRDo6RlJBTUVCVUZGRVIsIEdyYXBoaWNz Q29udGV4dDNEOjpERVBUSF9BVFRBQ0hNRU5ULCBHcmFwaGljc0NvbnRleHQzRDo6UkVOREVSQlVG RkVSLCAwKTsKICAgICAgICAgICAgIGNvbnRleHQtPmZyYW1lYnVmZmVyUmVuZGVyYnVmZmVyKEdy YXBoaWNzQ29udGV4dDNEOjpGUkFNRUJVRkZFUiwgR3JhcGhpY3NDb250ZXh0M0Q6OlNURU5DSUxf QVRUQUNITUVOVCwgR3JhcGhpY3NDb250ZXh0M0Q6OlJFTkRFUkJVRkZFUiwgMCk7CiAgICAgICAg IH0gZWxzZQpAQCAtMjgzLDExICsyODMsMTAgQEAgV2ViR0xGcmFtZWJ1ZmZlcjo6fldlYkdMRnJh bWVidWZmZXIoKQogdm9pZCBXZWJHTEZyYW1lYnVmZmVyOjpzZXRBdHRhY2htZW50Rm9yQm91bmRG cmFtZWJ1ZmZlcihHQzNEZW51bSBhdHRhY2htZW50LCBHQzNEZW51bSB0ZXhUYXJnZXQsIFdlYkdM VGV4dHVyZSogdGV4dHVyZSwgR0MzRGludCBsZXZlbCkKIHsKICAgICBBU1NFUlQoaXNCb3VuZCgp KTsKKyAgICByZW1vdmVBdHRhY2htZW50RnJvbUJvdW5kRnJhbWVidWZmZXIoYXR0YWNobWVudCk7 CiAgICAgaWYgKCFvYmplY3QoKSkKICAgICAgICAgcmV0dXJuOwotICAgIHJlbW92ZUF0dGFjaG1l bnRGcm9tQm91bmRGcmFtZWJ1ZmZlcihhdHRhY2htZW50KTsKICAgICBpZiAodGV4dHVyZSAmJiB0 ZXh0dXJlLT5vYmplY3QoKSkgewotCiAgICAgICAgIG1fYXR0YWNobWVudHMuYWRkKGF0dGFjaG1l bnQsIFdlYkdMVGV4dHVyZUF0dGFjaG1lbnQ6OmNyZWF0ZSh0ZXh0dXJlLCB0ZXhUYXJnZXQsIGxl dmVsKSk7CiAgICAgICAgIHRleHR1cmUtPm9uQXR0YWNoZWQoKTsKICAgICB9CkBAIC0yOTYsOSAr Mjk1LDkgQEAgdm9pZCBXZWJHTEZyYW1lYnVmZmVyOjpzZXRBdHRhY2htZW50Rm9yQgogdm9pZCBX ZWJHTEZyYW1lYnVmZmVyOjpzZXRBdHRhY2htZW50Rm9yQm91bmRGcmFtZWJ1ZmZlcihHQzNEZW51 bSBhdHRhY2htZW50LCBXZWJHTFJlbmRlcmJ1ZmZlciogcmVuZGVyYnVmZmVyKQogewogICAgIEFT U0VSVChpc0JvdW5kKCkpOworICAgIHJlbW92ZUF0dGFjaG1lbnRGcm9tQm91bmRGcmFtZWJ1ZmZl cihhdHRhY2htZW50KTsKICAgICBpZiAoIW9iamVjdCgpKQogICAgICAgICByZXR1cm47Ci0gICAg cmVtb3ZlQXR0YWNobWVudEZyb21Cb3VuZEZyYW1lYnVmZmVyKGF0dGFjaG1lbnQpOwogICAgIGlm IChyZW5kZXJidWZmZXIgJiYgcmVuZGVyYnVmZmVyLT5vYmplY3QoKSkgewogICAgICAgICBtX2F0 dGFjaG1lbnRzLmFkZChhdHRhY2htZW50LCBXZWJHTFJlbmRlcmJ1ZmZlckF0dGFjaG1lbnQ6OmNy ZWF0ZShyZW5kZXJidWZmZXIpKTsKICAgICAgICAgcmVuZGVyYnVmZmVyLT5vbkF0dGFjaGVkKCk7 CkBAIC0zMzcsNiArMzM2LDE4IEBAIHZvaWQgV2ViR0xGcmFtZWJ1ZmZlcjo6cmVtb3ZlQXR0YWNo bWVudEYKICAgICBpZiAoYXR0YWNobWVudE9iamVjdCkgewogICAgICAgICBhdHRhY2htZW50T2Jq ZWN0LT5vbkRldGFjaGVkKGNvbnRleHQoKS0+Z3JhcGhpY3NDb250ZXh0M0QoKSk7CiAgICAgICAg IG1fYXR0YWNobWVudHMucmVtb3ZlKGF0dGFjaG1lbnQpOworICAgICAgICBzd2l0Y2ggKGF0dGFj aG1lbnQpIHsKKyAgICAgICAgY2FzZSBHcmFwaGljc0NvbnRleHQzRDo6REVQVEhfU1RFTkNJTF9B VFRBQ0hNRU5UOgorICAgICAgICAgICAgYXR0YWNoKEdyYXBoaWNzQ29udGV4dDNEOjpERVBUSF9B VFRBQ0hNRU5ULCBHcmFwaGljc0NvbnRleHQzRDo6REVQVEhfQVRUQUNITUVOVCk7CisgICAgICAg ICAgICBhdHRhY2goR3JhcGhpY3NDb250ZXh0M0Q6OlNURU5DSUxfQVRUQUNITUVOVCwgR3JhcGhp Y3NDb250ZXh0M0Q6OlNURU5DSUxfQVRUQUNITUVOVCk7CisgICAgICAgICAgICBicmVhazsKKyAg ICAgICAgY2FzZSBHcmFwaGljc0NvbnRleHQzRDo6REVQVEhfQVRUQUNITUVOVDoKKyAgICAgICAg ICAgIGF0dGFjaChHcmFwaGljc0NvbnRleHQzRDo6REVQVEhfU1RFTkNJTF9BVFRBQ0hNRU5ULCBH cmFwaGljc0NvbnRleHQzRDo6REVQVEhfQVRUQUNITUVOVCk7CisgICAgICAgICAgICBicmVhazsK KyAgICAgICAgY2FzZSBHcmFwaGljc0NvbnRleHQzRDo6U1RFTkNJTF9BVFRBQ0hNRU5UOgorICAg ICAgICAgICAgYXR0YWNoKEdyYXBoaWNzQ29udGV4dDNEOjpERVBUSF9TVEVOQ0lMX0FUVEFDSE1F TlQsIEdyYXBoaWNzQ29udGV4dDNEOjpTVEVOQ0lMX0FUVEFDSE1FTlQpOworICAgICAgICAgICAg YnJlYWs7CisgICAgICAgIH0KICAgICB9CiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwv Y2FudmFzL1dlYkdMRnJhbWVidWZmZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9o dG1sL2NhbnZhcy9XZWJHTEZyYW1lYnVmZmVyLmgJKHJldmlzaW9uIDEyMDYwNykKKysrIFNvdXJj ZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMRnJhbWVidWZmZXIuaAkod29ya2luZyBjb3B5KQpA QCAtNzEsOSArNzEsNiBAQCBwdWJsaWM6CiAgICAgdm9pZCByZW1vdmVBdHRhY2htZW50RnJvbUJv dW5kRnJhbWVidWZmZXIoR0MzRGVudW0pOwogICAgIFdlYkdMU2hhcmVkT2JqZWN0KiBnZXRBdHRh Y2htZW50T2JqZWN0KEdDM0RlbnVtKSBjb25zdDsKIAotICAgIC8vIGF0dGFjaCAnYXR0YWNobWVu dCcgYXQgJ2F0dGFjaG1lbnRQb2ludCcuCi0gICAgdm9pZCBhdHRhY2goR0MzRGVudW0gYXR0YWNo bWVudCwgR0MzRGVudW0gYXR0YWNobWVudFBvaW50KTsKLQogICAgIEdDM0RlbnVtIGdldENvbG9y QnVmZmVyRm9ybWF0KCkgY29uc3Q7CiAgICAgR0MzRHNpemVpIGdldENvbG9yQnVmZmVyV2lkdGgo KSBjb25zdDsKICAgICBHQzNEc2l6ZWkgZ2V0Q29sb3JCdWZmZXJIZWlnaHQoKSBjb25zdDsKQEAg LTExNCw2ICsxMTEsOSBAQCBwcml2YXRlOgogICAgIC8vIENoZWNrIGlmIHRoZSBmcmFtZWJ1ZmZl ciBpcyBjdXJyZW50bHkgYm91bmQuCiAgICAgYm9vbCBpc0JvdW5kKCkgY29uc3Q7CiAKKyAgICAv LyBhdHRhY2ggJ2F0dGFjaG1lbnQnIGF0ICdhdHRhY2htZW50UG9pbnQnLgorICAgIHZvaWQgYXR0 YWNoKEdDM0RlbnVtIGF0dGFjaG1lbnQsIEdDM0RlbnVtIGF0dGFjaG1lbnRQb2ludCk7CisKICAg ICB0eXBlZGVmIFdURjo6SGFzaE1hcDxHQzNEZW51bSwgUmVmUHRyPFdlYkdMQXR0YWNobWVudD4g PiBBdHRhY2htZW50TWFwOwogCiAgICAgQXR0YWNobWVudE1hcCBtX2F0dGFjaG1lbnRzOwpJbmRl eDogU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0LmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFJlbmRlcmluZ0Nv bnRleHQuY3BwCShyZXZpc2lvbiAxMjA2MDcpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZh cy9XZWJHTFJlbmRlcmluZ0NvbnRleHQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMDU5LDUwICsy MDU5LDI1IEBAIHZvaWQgV2ViR0xSZW5kZXJpbmdDb250ZXh0OjpmcmFtZWJ1ZmZlclIKICAgICAg ICAgcmV0dXJuOwogICAgIH0KICAgICBQbGF0Zm9ybTNET2JqZWN0IGJ1ZmZlck9iamVjdCA9IG9i amVjdE9yWmVybyhidWZmZXIpOwotICAgIGJvb2wgcmVhdHRhY2hEZXB0aCA9IGZhbHNlOwotICAg IGJvb2wgcmVhdHRhY2hTdGVuY2lsID0gZmFsc2U7Ci0gICAgYm9vbCByZWF0dGFjaERlcHRoU3Rl bmNpbERlcHRoID0gZmFsc2U7Ci0gICAgYm9vbCByZWF0dGFjaERlcHRoU3RlbmNpbFN0ZW5jaWwg PSBmYWxzZTsKICAgICBzd2l0Y2ggKGF0dGFjaG1lbnQpIHsKICAgICBjYXNlIEdyYXBoaWNzQ29u dGV4dDNEOjpERVBUSF9TVEVOQ0lMX0FUVEFDSE1FTlQ6CiAgICAgICAgIG1fY29udGV4dC0+ZnJh bWVidWZmZXJSZW5kZXJidWZmZXIodGFyZ2V0LCBHcmFwaGljc0NvbnRleHQzRDo6REVQVEhfQVRU QUNITUVOVCwgcmVuZGVyYnVmZmVydGFyZ2V0LCBidWZmZXJPYmplY3QpOwogICAgICAgICBtX2Nv bnRleHQtPmZyYW1lYnVmZmVyUmVuZGVyYnVmZmVyKHRhcmdldCwgR3JhcGhpY3NDb250ZXh0M0Q6 OlNURU5DSUxfQVRUQUNITUVOVCwgcmVuZGVyYnVmZmVydGFyZ2V0LCBidWZmZXJPYmplY3QpOwot ICAgICAgICBpZiAoIWJ1ZmZlck9iamVjdCkgewotICAgICAgICAgICAgcmVhdHRhY2hEZXB0aCA9 IHRydWU7Ci0gICAgICAgICAgICByZWF0dGFjaFN0ZW5jaWwgPSB0cnVlOwotICAgICAgICB9CiAg ICAgICAgIGJyZWFrOwogICAgIGNhc2UgR3JhcGhpY3NDb250ZXh0M0Q6OkRFUFRIX0FUVEFDSE1F TlQ6CiAgICAgICAgIG1fY29udGV4dC0+ZnJhbWVidWZmZXJSZW5kZXJidWZmZXIodGFyZ2V0LCBh dHRhY2htZW50LCByZW5kZXJidWZmZXJ0YXJnZXQsIGJ1ZmZlck9iamVjdCk7Ci0gICAgICAgIGlm ICghYnVmZmVyT2JqZWN0KQotICAgICAgICAgICAgcmVhdHRhY2hEZXB0aFN0ZW5jaWxEZXB0aCA9 IHRydWU7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgR3JhcGhpY3NDb250ZXh0M0Q6OlNURU5D SUxfQVRUQUNITUVOVDoKICAgICAgICAgbV9jb250ZXh0LT5mcmFtZWJ1ZmZlclJlbmRlcmJ1ZmZl cih0YXJnZXQsIGF0dGFjaG1lbnQsIHJlbmRlcmJ1ZmZlcnRhcmdldCwgYnVmZmVyT2JqZWN0KTsK LSAgICAgICAgaWYgKCFidWZmZXJPYmplY3QpCi0gICAgICAgICAgICByZWF0dGFjaERlcHRoU3Rl bmNpbFN0ZW5jaWwgPSB0cnVlOwogICAgICAgICBicmVhazsKICAgICBkZWZhdWx0OgogICAgICAg ICBtX2NvbnRleHQtPmZyYW1lYnVmZmVyUmVuZGVyYnVmZmVyKHRhcmdldCwgYXR0YWNobWVudCwg cmVuZGVyYnVmZmVydGFyZ2V0LCBidWZmZXJPYmplY3QpOwogICAgIH0KICAgICBtX2ZyYW1lYnVm ZmVyQmluZGluZy0+c2V0QXR0YWNobWVudEZvckJvdW5kRnJhbWVidWZmZXIoYXR0YWNobWVudCwg YnVmZmVyKTsKLSAgICByZWF0dGFjaERlcHRoU3RlbmNpbEF0dGFjaG1lbnRzKHJlYXR0YWNoRGVw dGgsIHJlYXR0YWNoU3RlbmNpbCwgcmVhdHRhY2hEZXB0aFN0ZW5jaWxEZXB0aCwgcmVhdHRhY2hE ZXB0aFN0ZW5jaWxTdGVuY2lsKTsKICAgICBhcHBseVN0ZW5jaWxUZXN0KCk7CiAgICAgY2xlYW51 cEFmdGVyR3JhcGhpY3NDYWxsKGZhbHNlKTsKIH0KIAotdm9pZCBXZWJHTFJlbmRlcmluZ0NvbnRl eHQ6OnJlYXR0YWNoRGVwdGhTdGVuY2lsQXR0YWNobWVudHMoYm9vbCByZWF0dGFjaERlcHRoLCBi b29sIHJlYXR0YWNoU3RlbmNpbCwgYm9vbCByZWF0dGFjaERlcHRoU3RlbmNpbERlcHRoLCBib29s IHJlYXR0YWNoRGVwdGhTdGVuY2lsU3RlbmNpbCkKLXsKLSAgICBpZiAocmVhdHRhY2hEZXB0aCkK LSAgICAgICAgbV9mcmFtZWJ1ZmZlckJpbmRpbmctPmF0dGFjaChHcmFwaGljc0NvbnRleHQzRDo6 REVQVEhfQVRUQUNITUVOVCwgR3JhcGhpY3NDb250ZXh0M0Q6OkRFUFRIX0FUVEFDSE1FTlQpOwot ICAgIGlmIChyZWF0dGFjaFN0ZW5jaWwpCi0gICAgICAgIG1fZnJhbWVidWZmZXJCaW5kaW5nLT5h dHRhY2goR3JhcGhpY3NDb250ZXh0M0Q6OlNURU5DSUxfQVRUQUNITUVOVCwgR3JhcGhpY3NDb250 ZXh0M0Q6OlNURU5DSUxfQVRUQUNITUVOVCk7Ci0gICAgaWYgKHJlYXR0YWNoRGVwdGhTdGVuY2ls RGVwdGgpCi0gICAgICAgIG1fZnJhbWVidWZmZXJCaW5kaW5nLT5hdHRhY2goR3JhcGhpY3NDb250 ZXh0M0Q6OkRFUFRIX1NURU5DSUxfQVRUQUNITUVOVCwgR3JhcGhpY3NDb250ZXh0M0Q6OkRFUFRI X0FUVEFDSE1FTlQpOwotICAgIGlmIChyZWF0dGFjaERlcHRoU3RlbmNpbFN0ZW5jaWwpCi0gICAg ICAgIG1fZnJhbWVidWZmZXJCaW5kaW5nLT5hdHRhY2goR3JhcGhpY3NDb250ZXh0M0Q6OkRFUFRI X1NURU5DSUxfQVRUQUNITUVOVCwgR3JhcGhpY3NDb250ZXh0M0Q6OlNURU5DSUxfQVRUQUNITUVO VCk7Ci19Ci0KIHZvaWQgV2ViR0xSZW5kZXJpbmdDb250ZXh0OjpmcmFtZWJ1ZmZlclRleHR1cmUy RChHQzNEZW51bSB0YXJnZXQsIEdDM0RlbnVtIGF0dGFjaG1lbnQsIEdDM0RlbnVtIHRleHRhcmdl dCwgV2ViR0xUZXh0dXJlKiB0ZXh0dXJlLCBHQzNEaW50IGxldmVsLCBFeGNlcHRpb25Db2RlJiBl YykKIHsKICAgICBVTlVTRURfUEFSQU0oZWMpOwpAQCAtMjEyNCwzNCArMjA5OSwyMSBAQCB2b2lk IFdlYkdMUmVuZGVyaW5nQ29udGV4dDo6ZnJhbWVidWZmZXJUCiAgICAgICAgIHJldHVybjsKICAg ICB9CiAgICAgUGxhdGZvcm0zRE9iamVjdCB0ZXh0dXJlT2JqZWN0ID0gb2JqZWN0T3JaZXJvKHRl eHR1cmUpOwotICAgIGJvb2wgcmVhdHRhY2hEZXB0aCA9IGZhbHNlOwotICAgIGJvb2wgcmVhdHRh Y2hTdGVuY2lsID0gZmFsc2U7Ci0gICAgYm9vbCByZWF0dGFjaERlcHRoU3RlbmNpbERlcHRoID0g ZmFsc2U7Ci0gICAgYm9vbCByZWF0dGFjaERlcHRoU3RlbmNpbFN0ZW5jaWwgPSBmYWxzZTsKICAg ICBzd2l0Y2ggKGF0dGFjaG1lbnQpIHsKICAgICBjYXNlIEdyYXBoaWNzQ29udGV4dDNEOjpERVBU SF9TVEVOQ0lMX0FUVEFDSE1FTlQ6CiAgICAgICAgIG1fY29udGV4dC0+ZnJhbWVidWZmZXJUZXh0 dXJlMkQodGFyZ2V0LCBHcmFwaGljc0NvbnRleHQzRDo6REVQVEhfQVRUQUNITUVOVCwgdGV4dGFy Z2V0LCB0ZXh0dXJlT2JqZWN0LCBsZXZlbCk7CiAgICAgICAgIG1fY29udGV4dC0+ZnJhbWVidWZm ZXJUZXh0dXJlMkQodGFyZ2V0LCBHcmFwaGljc0NvbnRleHQzRDo6U1RFTkNJTF9BVFRBQ0hNRU5U LCB0ZXh0YXJnZXQsIHRleHR1cmVPYmplY3QsIGxldmVsKTsKLSAgICAgICAgaWYgKCF0ZXh0dXJl T2JqZWN0KSB7Ci0gICAgICAgICAgICByZWF0dGFjaERlcHRoID0gdHJ1ZTsKLSAgICAgICAgICAg IHJlYXR0YWNoU3RlbmNpbCA9IHRydWU7Ci0gICAgICAgIH0KICAgICAgICAgYnJlYWs7CiAgICAg Y2FzZSBHcmFwaGljc0NvbnRleHQzRDo6REVQVEhfQVRUQUNITUVOVDoKICAgICAgICAgbV9jb250 ZXh0LT5mcmFtZWJ1ZmZlclRleHR1cmUyRCh0YXJnZXQsIGF0dGFjaG1lbnQsIHRleHRhcmdldCwg dGV4dHVyZU9iamVjdCwgbGV2ZWwpOwotICAgICAgICBpZiAoIXRleHR1cmVPYmplY3QpCi0gICAg ICAgICAgICByZWF0dGFjaERlcHRoU3RlbmNpbERlcHRoID0gdHJ1ZTsKICAgICAgICAgYnJlYWs7 CiAgICAgY2FzZSBHcmFwaGljc0NvbnRleHQzRDo6U1RFTkNJTF9BVFRBQ0hNRU5UOgogICAgICAg ICBtX2NvbnRleHQtPmZyYW1lYnVmZmVyVGV4dHVyZTJEKHRhcmdldCwgYXR0YWNobWVudCwgdGV4 dGFyZ2V0LCB0ZXh0dXJlT2JqZWN0LCBsZXZlbCk7Ci0gICAgICAgIGlmICghdGV4dHVyZU9iamVj dCkKLSAgICAgICAgICAgIHJlYXR0YWNoRGVwdGhTdGVuY2lsU3RlbmNpbCA9IHRydWU7CiAgICAg ICAgIGJyZWFrOwogICAgIGRlZmF1bHQ6CiAgICAgICAgIG1fY29udGV4dC0+ZnJhbWVidWZmZXJU ZXh0dXJlMkQodGFyZ2V0LCBhdHRhY2htZW50LCB0ZXh0YXJnZXQsIHRleHR1cmVPYmplY3QsIGxl dmVsKTsKICAgICB9CiAgICAgbV9mcmFtZWJ1ZmZlckJpbmRpbmctPnNldEF0dGFjaG1lbnRGb3JC b3VuZEZyYW1lYnVmZmVyKGF0dGFjaG1lbnQsIHRleHRhcmdldCwgdGV4dHVyZSwgbGV2ZWwpOwot ICAgIHJlYXR0YWNoRGVwdGhTdGVuY2lsQXR0YWNobWVudHMocmVhdHRhY2hEZXB0aCwgcmVhdHRh Y2hTdGVuY2lsLCByZWF0dGFjaERlcHRoU3RlbmNpbERlcHRoLCByZWF0dGFjaERlcHRoU3RlbmNp bFN0ZW5jaWwpOwogICAgIGFwcGx5U3RlbmNpbFRlc3QoKTsKICAgICBjbGVhbnVwQWZ0ZXJHcmFw aGljc0NhbGwoZmFsc2UpOwogfQpAQCAtMjQ3MCw3ICsyNDMyLDcgQEAgV2ViR0xHZXRJbmZvIFdl YkdMUmVuZGVyaW5nQ29udGV4dDo6Z2V0UAogICAgIGNhc2UgR3JhcGhpY3NDb250ZXh0M0Q6OkNV UlJFTlRfUFJPR1JBTToKICAgICAgICAgcmV0dXJuIFdlYkdMR2V0SW5mbyhQYXNzUmVmUHRyPFdl YkdMUHJvZ3JhbT4obV9jdXJyZW50UHJvZ3JhbSkpOwogICAgIGNhc2UgR3JhcGhpY3NDb250ZXh0 M0Q6OkRFUFRIX0JJVFM6Ci0gICAgICAgIGlmICghbV9hdHRyaWJ1dGVzLmRlcHRoKQorICAgICAg ICBpZiAoIW1fZnJhbWVidWZmZXJCaW5kaW5nICYmICFtX2F0dHJpYnV0ZXMuZGVwdGgpCiAgICAg ICAgICAgICByZXR1cm4gV2ViR0xHZXRJbmZvKGludFplcm8pOwogICAgICAgICByZXR1cm4gZ2V0 SW50UGFyYW1ldGVyKHBuYW1lKTsKICAgICBjYXNlIEdyYXBoaWNzQ29udGV4dDNEOjpERVBUSF9D TEVBUl9WQUxVRToKQEAgLTI1NjUsNyArMjUyNyw3IEBAIFdlYkdMR2V0SW5mbyBXZWJHTFJlbmRl cmluZ0NvbnRleHQ6OmdldFAKICAgICBjYXNlIEdyYXBoaWNzQ29udGV4dDNEOjpTVEVOQ0lMX0JB Q0tfV1JJVEVNQVNLOgogICAgICAgICByZXR1cm4gZ2V0VW5zaWduZWRJbnRQYXJhbWV0ZXIocG5h bWUpOwogICAgIGNhc2UgR3JhcGhpY3NDb250ZXh0M0Q6OlNURU5DSUxfQklUUzoKLSAgICAgICAg aWYgKCFtX2F0dHJpYnV0ZXMuc3RlbmNpbCkKKyAgICAgICAgaWYgKCFtX2ZyYW1lYnVmZmVyQmlu ZGluZyAmJiAhbV9hdHRyaWJ1dGVzLnN0ZW5jaWwpCiAgICAgICAgICAgICByZXR1cm4gV2ViR0xH ZXRJbmZvKGludFplcm8pOwogICAgICAgICByZXR1cm4gZ2V0SW50UGFyYW1ldGVyKHBuYW1lKTsK ICAgICBjYXNlIEdyYXBoaWNzQ29udGV4dDNEOjpTVEVOQ0lMX0NMRUFSX1ZBTFVFOgpJbmRleDog U291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0LmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0 LmgJKHJldmlzaW9uIDEyMDYwNykKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdM UmVuZGVyaW5nQ29udGV4dC5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNjgsOSArMzY4LDYgQEAgcHVi bGljOgogICAgIC8vIEFkZHMgYSBjb21wcmVzc2VkIHRleHR1cmUgZm9ybWF0LgogICAgIHZvaWQg YWRkQ29tcHJlc3NlZFRleHR1cmVGb3JtYXQoR0MzRGVudW0pOwogCi0gICAgLy8gUmVhdHRhY2hl cyBkZXB0aCBhbmQgc3RlbmNpbCBhdHRhY2htZW50cyBhZnRlciBvbmUgaGFzIGJlZW4gdW5hdHRh Y2hlZC4KLSAgICB2b2lkIHJlYXR0YWNoRGVwdGhTdGVuY2lsQXR0YWNobWVudHMoYm9vbCByZWF0 dGFjaERlcHRoLCBib29sIHJlYXR0YWNoU3RlbmNpbCwgYm9vbCByZWF0dGFjaERlcHRoU3RlbmNp bERlcHRoLCBib29sIHJlYXR0YWNoRGVwdGhTdGVuY2lsU3RlbmNpbCk7Ci0KICNpZiBFTkFCTEUo VklERU8pCiAgICAgUGFzc1JlZlB0cjxJbWFnZT4gdmlkZW9GcmFtZVRvSW1hZ2UoSFRNTFZpZGVv RWxlbWVudCosIEV4Y2VwdGlvbkNvZGUmKTsKICNlbmRpZgo=