58956 2011-04-19 18:17:40 -0700 WebGL context drawing buffer may not be cleared if FBO bound 2011-04-21 23:08:43 -0700 1 1 1 Unclassified WebKit WebGL 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 jbauman jbauman commit-queue kbr zmo oldest_to_newest 388977 0 jbauman 2011-04-19 18:17:40 -0700 Currently, we don't clear the drawing buffer after compositing while an FBO is bound to the context. This is normally ok, as the drawing buffer will be cleared when it's bound and something happens to it, but it will cause any texImage2D/drawImage/toDataURL from the canvas to see the old contents. 389044 1 90302 jbauman 2011-04-19 21:24:07 -0700 Created attachment 90302 Patch 389337 2 90302 zmo 2011-04-20 10:40:27 -0700 Comment on attachment 90302 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=90302&action=review Looks good. > Source/WebCore/html/canvas/WebGLRenderingContext.h:454 > + bool m_depthMask; Please use GC3Dboolean instead of bool. 389482 3 90302 kbr 2011-04-20 13:34:47 -0700 Comment on attachment 90302 Patch Looks good overall. Could you please submit a revised patch addressing Mo's feedback? 390452 4 90632 jbauman 2011-04-21 16:42:29 -0700 Created attachment 90632 Patch 390455 5 90632 kbr 2011-04-21 16:45:39 -0700 Comment on attachment 90632 Patch Looks good. 390627 6 commit-queue 2011-04-21 23:07:11 -0700 The commit-queue encountered the following flaky tests while processing attachment 90632: http/tests/xmlhttprequest/encode-request-url-2.html bug 51765 (author: ap@webkit.org) The commit-queue is continuing to process your patch. 390629 7 90632 commit-queue 2011-04-21 23:08:38 -0700 Comment on attachment 90632 Patch Clearing flags on attachment: 90632 Committed r84602: <http://trac.webkit.org/changeset/84602> 390630 8 commit-queue 2011-04-21 23:08:43 -0700 All reviewed patches have been landed. Closing bug. 90302 2011-04-19 21:24:07 -0700 2011-04-21 16:42:26 -0700 Patch bug-58956-20110419212406.patch text/plain 5433 jbauman U3VidmVyc2lvbiBSZXZpc2lvbjogODQwNDYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAxYjEyYzNkZWUyY2ZjYTUw M2FmOTZkZTQ0YmM1MWVmZDQ0M2NjNmUyLi43MDU3YjFiOTUzZDEzZWI2YzRiNDI0MWRiNzAyYTU4 YTA1ZTQ3ZmI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMDQtMTkgIEpvaG4g QmF1bWFuICA8amJhdW1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViR0wgY29udGV4dCBkcmF3aW5nIGJ1ZmZlciBtYXkg bm90IGJlIGNsZWFyZWQgaWYgRkJPIGJvdW5kCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD01ODk1NgorCisgICAgICAgIENsZWFyIHRoZSBkcmF3aW5nIGJ1 ZmZlciBldmVuIGlmIGl0J3Mgbm90IGN1cnJlbnRseSBib3VuZCwgYnkKKyAgICAgICAgc3dpdGNo aW5nIGJldHdlZW4gRkJPcyBhcm91bmQgdGhlIGNsZWFyLiBBbHNvLCBtYWtlIHN1cmUgdGhhdCB3 ZQorICAgICAgICBoYW5kbGUgZGVwdGggYW5kIHN0ZW5jaWwgbWFza3MgcHJvcGVybHkuCisKKyAg ICAgICAgTm8gbmV3IHRlc3RzLCBiZWNhdXNlIHRlc3RpbmcgdGhpcyB1bmRlciBEUlQgZG9lc24n dCB3b3JrLgorCisgICAgICAgICogaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OldlYkdMUmVuZGVyaW5nQ29udGV4dDo6aW5pdGlhbGl6ZU5l d0NvbnRleHQpOgorICAgICAgICAoV2ViQ29yZTo6V2ViR0xSZW5kZXJpbmdDb250ZXh0OjpjbGVh cklmQ29tcG9zaXRlZCk6CisgICAgICAgIChXZWJDb3JlOjpXZWJHTFJlbmRlcmluZ0NvbnRleHQ6 OmRlcHRoTWFzayk6CisgICAgICAgICogaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0 Lmg6CisKIDIwMTEtMDQtMTUgIEtlbm5ldGggUnVzc2VsbCAgPGtickBnb29nbGUuY29tPgogCiAg ICAgICAgIFVucmV2aWV3ZWQuIENocm9taXVtIExpbnV4IFJlbGVhc2UgYnVpbGQgZml4IGR1ZSB0 byB1bnVzZWQgdmFyaWFibGVzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52 YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFz L1dlYkdMUmVuZGVyaW5nQ29udGV4dC5jcHAKaW5kZXggOTMzZDM3ZmZjYTAwMDhlN2NhNGJlM2Uy Yjk3NTFkZGFhYjBmY2M1MC4uZmRlYWNlZWY5MDJhZDE5OTY2MmYzOGJhY2U3ZGEwNGY1OWEyNzZj YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdD b250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFJlbmRlcmlu Z0NvbnRleHQuY3BwCkBAIC00MDYsNiArNDA2LDcgQEAgdm9pZCBXZWJHTFJlbmRlcmluZ0NvbnRl eHQ6OmluaXRpYWxpemVOZXdDb250ZXh0KCkKICAgICBtX2N1cnJlbnRQcm9ncmFtID0gMDsKICAg ICBtX2ZyYW1lYnVmZmVyQmluZGluZyA9IDA7CiAgICAgbV9yZW5kZXJidWZmZXJCaW5kaW5nID0g MDsKKyAgICBtX2RlcHRoTWFzayA9IHRydWU7CiAgICAgbV9zdGVuY2lsTWFzayA9IDB4RkZGRkZG RkY7CiAgICAgbV9zdGVuY2lsTWFza0JhY2sgPSAweEZGRkZGRkZGOwogICAgIG1fc3RlbmNpbEZ1 bmNSZWYgPSAwOwpAQCAtNTAzLDcgKzUwNCw3IEBAIGJvb2wgV2ViR0xSZW5kZXJpbmdDb250ZXh0 OjpjbGVhcklmQ29tcG9zaXRlZChHQzNEYml0ZmllbGQgbWFzaykKICAgICAgICAgcmV0dXJuIGZh bHNlOwogCiAgICAgaWYgKCFtX2NvbnRleHQtPmxheWVyQ29tcG9zaXRlZCgpIHx8IG1fbGF5ZXJD bGVhcmVkCi0gICAgICAgIHx8IG1fYXR0cmlidXRlcy5wcmVzZXJ2ZURyYXdpbmdCdWZmZXIgfHwg bV9mcmFtZWJ1ZmZlckJpbmRpbmcpCisgICAgICAgIHx8IG1fYXR0cmlidXRlcy5wcmVzZXJ2ZURy YXdpbmdCdWZmZXIgfHwgKG1hc2sgJiYgbV9mcmFtZWJ1ZmZlckJpbmRpbmcpKQogICAgICAgICBy ZXR1cm4gZmFsc2U7CiAKICAgICBSZWZQdHI8V2ViR0xDb250ZXh0QXR0cmlidXRlcz4gY29udGV4 dEF0dHJpYnV0ZXMgPSBnZXRDb250ZXh0QXR0cmlidXRlcygpOwpAQCAtNTExLDYgKzUxMiw4IEBA IGJvb2wgV2ViR0xSZW5kZXJpbmdDb250ZXh0OjpjbGVhcklmQ29tcG9zaXRlZChHQzNEYml0Zmll bGQgbWFzaykKICAgICAvLyBEZXRlcm1pbmUgaWYgaXQncyBwb3NzaWJsZSB0byBjb21iaW5lIHRo ZSBjbGVhciB0aGUgdXNlciBhc2tlZCBmb3IgYW5kIHRoaXMgY2xlYXIuCiAgICAgYm9vbCBjb21i aW5lZENsZWFyID0gbWFzayAmJiAhbV9zY2lzc29yRW5hYmxlZDsKIAorICAgIGlmIChtX2ZyYW1l YnVmZmVyQmluZGluZykKKyAgICAgICAgbV9jb250ZXh0LT5iaW5kRnJhbWVidWZmZXIoR3JhcGhp Y3NDb250ZXh0M0Q6OkZSQU1FQlVGRkVSLCAwKTsKICAgICBtX2NvbnRleHQtPmRpc2FibGUoR3Jh cGhpY3NDb250ZXh0M0Q6OlNDSVNTT1JfVEVTVCk7CiAgICAgaWYgKGNvbWJpbmVkQ2xlYXIgJiYg KG1hc2sgJiBHcmFwaGljc0NvbnRleHQzRDo6Q09MT1JfQlVGRkVSX0JJVCkpCiAgICAgICAgIG1f Y29udGV4dC0+Y2xlYXJDb2xvcihtX2NvbG9yTWFza1swXSA/IG1fY2xlYXJDb2xvclswXSA6IDAs CkBAIC01MjAsMTUgKzUyMywyMSBAQCBib29sIFdlYkdMUmVuZGVyaW5nQ29udGV4dDo6Y2xlYXJJ ZkNvbXBvc2l0ZWQoR0MzRGJpdGZpZWxkIG1hc2spCiAgICAgZWxzZQogICAgICAgICBtX2NvbnRl eHQtPmNsZWFyQ29sb3IoMCwgMCwgMCwgMCk7CiAgICAgbV9jb250ZXh0LT5jb2xvck1hc2sodHJ1 ZSwgdHJ1ZSwgdHJ1ZSwgdHJ1ZSk7Ci0gICAgaWYgKGNvbnRleHRBdHRyaWJ1dGVzLT5kZXB0aCgp ICYmICghY29tYmluZWRDbGVhciB8fCAhKG1hc2sgJiBHcmFwaGljc0NvbnRleHQzRDo6REVQVEhf QlVGRkVSX0JJVCkpKQotICAgICAgICBtX2NvbnRleHQtPmNsZWFyRGVwdGgoMS4wZik7Ci0gICAg aWYgKGNvbnRleHRBdHRyaWJ1dGVzLT5zdGVuY2lsKCkgJiYgKCFjb21iaW5lZENsZWFyIHx8ICEo bWFzayAmIEdyYXBoaWNzQ29udGV4dDNEOjpTVEVOQ0lMX0JVRkZFUl9CSVQpKSkKLSAgICAgICAg bV9jb250ZXh0LT5jbGVhclN0ZW5jaWwoMCk7CiAgICAgR0MzRGJpdGZpZWxkIGNsZWFyTWFzayA9 IEdyYXBoaWNzQ29udGV4dDNEOjpDT0xPUl9CVUZGRVJfQklUOwotICAgIGlmIChjb250ZXh0QXR0 cmlidXRlcy0+ZGVwdGgoKSkKKyAgICBpZiAoY29udGV4dEF0dHJpYnV0ZXMtPmRlcHRoKCkpIHsK KyAgICAgICAgaWYgKCFjb21iaW5lZENsZWFyIHx8ICFtX2RlcHRoTWFzayB8fCAhKG1hc2sgJiBH cmFwaGljc0NvbnRleHQzRDo6REVQVEhfQlVGRkVSX0JJVCkpCisgICAgICAgICAgICBtX2NvbnRl eHQtPmNsZWFyRGVwdGgoMS4wZik7CiAgICAgICAgIGNsZWFyTWFzayB8PSBHcmFwaGljc0NvbnRl eHQzRDo6REVQVEhfQlVGRkVSX0JJVDsKLSAgICBpZiAoY29udGV4dEF0dHJpYnV0ZXMtPnN0ZW5j aWwoKSkKKyAgICAgICAgbV9jb250ZXh0LT5kZXB0aE1hc2sodHJ1ZSk7CisgICAgfQorICAgIGlm IChjb250ZXh0QXR0cmlidXRlcy0+c3RlbmNpbCgpKSB7CisgICAgICAgIGlmIChjb21iaW5lZENs ZWFyICYmIChtYXNrICYgR3JhcGhpY3NDb250ZXh0M0Q6OlNURU5DSUxfQlVGRkVSX0JJVCkpCisg ICAgICAgICAgICBtX2NvbnRleHQtPmNsZWFyU3RlbmNpbChtX2NsZWFyU3RlbmNpbCAmIG1fc3Rl bmNpbE1hc2spOworICAgICAgICBlbHNlCisgICAgICAgICAgICBtX2NvbnRleHQtPmNsZWFyU3Rl bmNpbCgwKTsKICAgICAgICAgY2xlYXJNYXNrIHw9IEdyYXBoaWNzQ29udGV4dDNEOjpTVEVOQ0lM X0JVRkZFUl9CSVQ7CisgICAgICAgIG1fY29udGV4dC0+c3RlbmNpbE1hc2tTZXBhcmF0ZShHcmFw aGljc0NvbnRleHQzRDo6RlJPTlQsIDB4RkZGRkZGRkYpOworICAgIH0KICAgICBtX2NvbnRleHQt PmNsZWFyKGNsZWFyTWFzayk7CiAKICAgICAvLyBSZXN0b3JlIHRoZSBzdGF0ZSB0aGF0IHRoZSBj b250ZXh0IHNldC4KQEAgLTU0MCw2ICs1NDksMTAgQEAgYm9vbCBXZWJHTFJlbmRlcmluZ0NvbnRl eHQ6OmNsZWFySWZDb21wb3NpdGVkKEdDM0RiaXRmaWVsZCBtYXNrKQogICAgICAgICAgICAgICAg ICAgICAgICAgIG1fY29sb3JNYXNrWzJdLCBtX2NvbG9yTWFza1szXSk7CiAgICAgbV9jb250ZXh0 LT5jbGVhckRlcHRoKG1fY2xlYXJEZXB0aCk7CiAgICAgbV9jb250ZXh0LT5jbGVhclN0ZW5jaWwo bV9jbGVhclN0ZW5jaWwpOworICAgIG1fY29udGV4dC0+c3RlbmNpbE1hc2tTZXBhcmF0ZShHcmFw aGljc0NvbnRleHQzRDo6RlJPTlQsIG1fc3RlbmNpbE1hc2spOworICAgIG1fY29udGV4dC0+ZGVw dGhNYXNrKG1fZGVwdGhNYXNrKTsKKyAgICBpZiAobV9mcmFtZWJ1ZmZlckJpbmRpbmcpCisgICAg ICAgIG1fY29udGV4dC0+YmluZEZyYW1lYnVmZmVyKEdyYXBoaWNzQ29udGV4dDNEOjpGUkFNRUJV RkZFUiwgb2JqZWN0T3JaZXJvKG1fZnJhbWVidWZmZXJCaW5kaW5nLmdldCgpKSk7CiAgICAgbV9s YXllckNsZWFyZWQgPSB0cnVlOwogCiAgICAgcmV0dXJuIGNvbWJpbmVkQ2xlYXI7CkBAIC0xMjkw LDYgKzEzMDMsNyBAQCB2b2lkIFdlYkdMUmVuZGVyaW5nQ29udGV4dDo6ZGVwdGhNYXNrKEdDM0Ri b29sZWFuIGZsYWcpCiB7CiAgICAgaWYgKGlzQ29udGV4dExvc3QoKSkKICAgICAgICAgcmV0dXJu OworICAgIG1fZGVwdGhNYXNrID0gZmxhZzsKICAgICBtX2NvbnRleHQtPmRlcHRoTWFzayhmbGFn KTsKICAgICBjbGVhbnVwQWZ0ZXJHcmFwaGljc0NhbGwoZmFsc2UpOwogfQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0LmggYi9Tb3Vy Y2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHQuaAppbmRleCAyM2Mx NDdkYjNlZjJhOGMzMTM5ZjlmMjZiYmVlMmMwOWUyMmVkYTgxLi44ZTUwNjMxZjg3NzVlNWQwOGNl MmE1MjNiOTcxOTExMGNmYTFiYmFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL2Nh bnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL2Nh bnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHQuaApAQCAtNDUxLDYgKzQ1MSw3IEBAIHB1YmxpYzoK ICAgICBHQzNEZmxvYXQgbV9jbGVhckRlcHRoOwogICAgIEdDM0RpbnQgbV9jbGVhclN0ZW5jaWw7 CiAgICAgR0MzRGJvb2xlYW4gbV9jb2xvck1hc2tbNF07CisgICAgYm9vbCBtX2RlcHRoTWFzazsK IAogICAgIGxvbmcgbV9zdGVuY2lsQml0czsKICAgICBHQzNEdWludCBtX3N0ZW5jaWxNYXNrLCBt X3N0ZW5jaWxNYXNrQmFjazsK 90632 2011-04-21 16:42:29 -0700 2011-04-21 23:08:38 -0700 Patch bug-58956-20110421164228.patch text/plain 5410 jbauman U3VidmVyc2lvbiBSZXZpc2lvbjogODQzNTAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBiYTk2MDA0OGVlMzMyMDk4 MDM3MTBiMGIwN2NmN2EzYzQ3OWNiMjZjLi43MmVmOWU3MWZmZmIxYjA1NmMwZTJlOTBmYjhlNjk3 NWRjN2EyMzE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMDQtMjEgIEpvaG4g QmF1bWFuICA8amJhdW1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViR0wgY29udGV4dCBkcmF3aW5nIGJ1ZmZlciBtYXkg bm90IGJlIGNsZWFyZWQgaWYgRkJPIGJvdW5kCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD01ODk1NgorCisgICAgICAgIENsZWFyIHRoZSBkcmF3aW5nIGJ1 ZmZlciBldmVuIGlmIGl0J3Mgbm90IGN1cnJlbnRseSBib3VuZCwgYnkKKyAgICAgICAgc3dpdGNo aW5nIGJldHdlZW4gRkJPcyBhcm91bmQgdGhlIGNsZWFyLiBBbHNvLCBtYWtlIHN1cmUgdGhhdCB3 ZQorICAgICAgICBoYW5kbGUgZGVwdGggYW5kIHN0ZW5jaWwgbWFza3MgcHJvcGVybHkuCisKKyAg ICAgICAgTm8gbmV3IHRlc3RzLCBiZWNhdXNlIHRlc3RpbmcgdGhpcyB1bmRlciBEUlQgZG9lc24n dCB3b3JrLgorCisgICAgICAgICogaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OldlYkdMUmVuZGVyaW5nQ29udGV4dDo6aW5pdGlhbGl6ZU5l d0NvbnRleHQpOgorICAgICAgICAoV2ViQ29yZTo6V2ViR0xSZW5kZXJpbmdDb250ZXh0OjpjbGVh cklmQ29tcG9zaXRlZCk6CisgICAgICAgIChXZWJDb3JlOjpXZWJHTFJlbmRlcmluZ0NvbnRleHQ6 OmRlcHRoTWFzayk6CisgICAgICAgICogaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0 Lmg6CisgICAgICAgICoKIDIwMTEtMDQtMjAgIExlbyBZYW5nICA8bGVvLnlhbmdAdG9yY2htb2Jp bGUuY29tLmNuPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgU2VpZGVsLgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0LmNwcCBi L1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMUmVuZGVyaW5nQ29udGV4dC5jcHAKaW5k ZXggOTMzZDM3ZmZjYTAwMDhlN2NhNGJlM2UyYjk3NTFkZGFhYjBmY2M1MC4uZmRlYWNlZWY5MDJh ZDE5OTY2MmYzOGJhY2U3ZGEwNGY1OWEyNzZjYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9odG1sL2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHQuY3BwCkBAIC00MDYsNiArNDA2LDcg QEAgdm9pZCBXZWJHTFJlbmRlcmluZ0NvbnRleHQ6OmluaXRpYWxpemVOZXdDb250ZXh0KCkKICAg ICBtX2N1cnJlbnRQcm9ncmFtID0gMDsKICAgICBtX2ZyYW1lYnVmZmVyQmluZGluZyA9IDA7CiAg ICAgbV9yZW5kZXJidWZmZXJCaW5kaW5nID0gMDsKKyAgICBtX2RlcHRoTWFzayA9IHRydWU7CiAg ICAgbV9zdGVuY2lsTWFzayA9IDB4RkZGRkZGRkY7CiAgICAgbV9zdGVuY2lsTWFza0JhY2sgPSAw eEZGRkZGRkZGOwogICAgIG1fc3RlbmNpbEZ1bmNSZWYgPSAwOwpAQCAtNTAzLDcgKzUwNCw3IEBA IGJvb2wgV2ViR0xSZW5kZXJpbmdDb250ZXh0OjpjbGVhcklmQ29tcG9zaXRlZChHQzNEYml0Zmll bGQgbWFzaykKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgaWYgKCFtX2NvbnRleHQtPmxh eWVyQ29tcG9zaXRlZCgpIHx8IG1fbGF5ZXJDbGVhcmVkCi0gICAgICAgIHx8IG1fYXR0cmlidXRl cy5wcmVzZXJ2ZURyYXdpbmdCdWZmZXIgfHwgbV9mcmFtZWJ1ZmZlckJpbmRpbmcpCisgICAgICAg IHx8IG1fYXR0cmlidXRlcy5wcmVzZXJ2ZURyYXdpbmdCdWZmZXIgfHwgKG1hc2sgJiYgbV9mcmFt ZWJ1ZmZlckJpbmRpbmcpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBSZWZQdHI8V2Vi R0xDb250ZXh0QXR0cmlidXRlcz4gY29udGV4dEF0dHJpYnV0ZXMgPSBnZXRDb250ZXh0QXR0cmli dXRlcygpOwpAQCAtNTExLDYgKzUxMiw4IEBAIGJvb2wgV2ViR0xSZW5kZXJpbmdDb250ZXh0Ojpj bGVhcklmQ29tcG9zaXRlZChHQzNEYml0ZmllbGQgbWFzaykKICAgICAvLyBEZXRlcm1pbmUgaWYg aXQncyBwb3NzaWJsZSB0byBjb21iaW5lIHRoZSBjbGVhciB0aGUgdXNlciBhc2tlZCBmb3IgYW5k IHRoaXMgY2xlYXIuCiAgICAgYm9vbCBjb21iaW5lZENsZWFyID0gbWFzayAmJiAhbV9zY2lzc29y RW5hYmxlZDsKIAorICAgIGlmIChtX2ZyYW1lYnVmZmVyQmluZGluZykKKyAgICAgICAgbV9jb250 ZXh0LT5iaW5kRnJhbWVidWZmZXIoR3JhcGhpY3NDb250ZXh0M0Q6OkZSQU1FQlVGRkVSLCAwKTsK ICAgICBtX2NvbnRleHQtPmRpc2FibGUoR3JhcGhpY3NDb250ZXh0M0Q6OlNDSVNTT1JfVEVTVCk7 CiAgICAgaWYgKGNvbWJpbmVkQ2xlYXIgJiYgKG1hc2sgJiBHcmFwaGljc0NvbnRleHQzRDo6Q09M T1JfQlVGRkVSX0JJVCkpCiAgICAgICAgIG1fY29udGV4dC0+Y2xlYXJDb2xvcihtX2NvbG9yTWFz a1swXSA/IG1fY2xlYXJDb2xvclswXSA6IDAsCkBAIC01MjAsMTUgKzUyMywyMSBAQCBib29sIFdl YkdMUmVuZGVyaW5nQ29udGV4dDo6Y2xlYXJJZkNvbXBvc2l0ZWQoR0MzRGJpdGZpZWxkIG1hc2sp CiAgICAgZWxzZQogICAgICAgICBtX2NvbnRleHQtPmNsZWFyQ29sb3IoMCwgMCwgMCwgMCk7CiAg ICAgbV9jb250ZXh0LT5jb2xvck1hc2sodHJ1ZSwgdHJ1ZSwgdHJ1ZSwgdHJ1ZSk7Ci0gICAgaWYg KGNvbnRleHRBdHRyaWJ1dGVzLT5kZXB0aCgpICYmICghY29tYmluZWRDbGVhciB8fCAhKG1hc2sg JiBHcmFwaGljc0NvbnRleHQzRDo6REVQVEhfQlVGRkVSX0JJVCkpKQotICAgICAgICBtX2NvbnRl eHQtPmNsZWFyRGVwdGgoMS4wZik7Ci0gICAgaWYgKGNvbnRleHRBdHRyaWJ1dGVzLT5zdGVuY2ls KCkgJiYgKCFjb21iaW5lZENsZWFyIHx8ICEobWFzayAmIEdyYXBoaWNzQ29udGV4dDNEOjpTVEVO Q0lMX0JVRkZFUl9CSVQpKSkKLSAgICAgICAgbV9jb250ZXh0LT5jbGVhclN0ZW5jaWwoMCk7CiAg ICAgR0MzRGJpdGZpZWxkIGNsZWFyTWFzayA9IEdyYXBoaWNzQ29udGV4dDNEOjpDT0xPUl9CVUZG RVJfQklUOwotICAgIGlmIChjb250ZXh0QXR0cmlidXRlcy0+ZGVwdGgoKSkKKyAgICBpZiAoY29u dGV4dEF0dHJpYnV0ZXMtPmRlcHRoKCkpIHsKKyAgICAgICAgaWYgKCFjb21iaW5lZENsZWFyIHx8 ICFtX2RlcHRoTWFzayB8fCAhKG1hc2sgJiBHcmFwaGljc0NvbnRleHQzRDo6REVQVEhfQlVGRkVS X0JJVCkpCisgICAgICAgICAgICBtX2NvbnRleHQtPmNsZWFyRGVwdGgoMS4wZik7CiAgICAgICAg IGNsZWFyTWFzayB8PSBHcmFwaGljc0NvbnRleHQzRDo6REVQVEhfQlVGRkVSX0JJVDsKLSAgICBp ZiAoY29udGV4dEF0dHJpYnV0ZXMtPnN0ZW5jaWwoKSkKKyAgICAgICAgbV9jb250ZXh0LT5kZXB0 aE1hc2sodHJ1ZSk7CisgICAgfQorICAgIGlmIChjb250ZXh0QXR0cmlidXRlcy0+c3RlbmNpbCgp KSB7CisgICAgICAgIGlmIChjb21iaW5lZENsZWFyICYmIChtYXNrICYgR3JhcGhpY3NDb250ZXh0 M0Q6OlNURU5DSUxfQlVGRkVSX0JJVCkpCisgICAgICAgICAgICBtX2NvbnRleHQtPmNsZWFyU3Rl bmNpbChtX2NsZWFyU3RlbmNpbCAmIG1fc3RlbmNpbE1hc2spOworICAgICAgICBlbHNlCisgICAg ICAgICAgICBtX2NvbnRleHQtPmNsZWFyU3RlbmNpbCgwKTsKICAgICAgICAgY2xlYXJNYXNrIHw9 IEdyYXBoaWNzQ29udGV4dDNEOjpTVEVOQ0lMX0JVRkZFUl9CSVQ7CisgICAgICAgIG1fY29udGV4 dC0+c3RlbmNpbE1hc2tTZXBhcmF0ZShHcmFwaGljc0NvbnRleHQzRDo6RlJPTlQsIDB4RkZGRkZG RkYpOworICAgIH0KICAgICBtX2NvbnRleHQtPmNsZWFyKGNsZWFyTWFzayk7CiAKICAgICAvLyBS ZXN0b3JlIHRoZSBzdGF0ZSB0aGF0IHRoZSBjb250ZXh0IHNldC4KQEAgLTU0MCw2ICs1NDksMTAg QEAgYm9vbCBXZWJHTFJlbmRlcmluZ0NvbnRleHQ6OmNsZWFySWZDb21wb3NpdGVkKEdDM0RiaXRm aWVsZCBtYXNrKQogICAgICAgICAgICAgICAgICAgICAgICAgIG1fY29sb3JNYXNrWzJdLCBtX2Nv bG9yTWFza1szXSk7CiAgICAgbV9jb250ZXh0LT5jbGVhckRlcHRoKG1fY2xlYXJEZXB0aCk7CiAg ICAgbV9jb250ZXh0LT5jbGVhclN0ZW5jaWwobV9jbGVhclN0ZW5jaWwpOworICAgIG1fY29udGV4 dC0+c3RlbmNpbE1hc2tTZXBhcmF0ZShHcmFwaGljc0NvbnRleHQzRDo6RlJPTlQsIG1fc3RlbmNp bE1hc2spOworICAgIG1fY29udGV4dC0+ZGVwdGhNYXNrKG1fZGVwdGhNYXNrKTsKKyAgICBpZiAo bV9mcmFtZWJ1ZmZlckJpbmRpbmcpCisgICAgICAgIG1fY29udGV4dC0+YmluZEZyYW1lYnVmZmVy KEdyYXBoaWNzQ29udGV4dDNEOjpGUkFNRUJVRkZFUiwgb2JqZWN0T3JaZXJvKG1fZnJhbWVidWZm ZXJCaW5kaW5nLmdldCgpKSk7CiAgICAgbV9sYXllckNsZWFyZWQgPSB0cnVlOwogCiAgICAgcmV0 dXJuIGNvbWJpbmVkQ2xlYXI7CkBAIC0xMjkwLDYgKzEzMDMsNyBAQCB2b2lkIFdlYkdMUmVuZGVy aW5nQ29udGV4dDo6ZGVwdGhNYXNrKEdDM0Rib29sZWFuIGZsYWcpCiB7CiAgICAgaWYgKGlzQ29u dGV4dExvc3QoKSkKICAgICAgICAgcmV0dXJuOworICAgIG1fZGVwdGhNYXNrID0gZmxhZzsKICAg ICBtX2NvbnRleHQtPmRlcHRoTWFzayhmbGFnKTsKICAgICBjbGVhbnVwQWZ0ZXJHcmFwaGljc0Nh bGwoZmFsc2UpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2Vi R0xSZW5kZXJpbmdDb250ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFJl bmRlcmluZ0NvbnRleHQuaAppbmRleCAyM2MxNDdkYjNlZjJhOGMzMTM5ZjlmMjZiYmVlMmMwOWUy MmVkYTgxLi45Y2ZmMGRhODUzNzQ5ZjgzYzdjNWYxNmIwOWFhNzNhYjk5Y2ZhZmYxIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHQuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHQuaApA QCAtNDUxLDYgKzQ1MSw3IEBAIHB1YmxpYzoKICAgICBHQzNEZmxvYXQgbV9jbGVhckRlcHRoOwog ICAgIEdDM0RpbnQgbV9jbGVhclN0ZW5jaWw7CiAgICAgR0MzRGJvb2xlYW4gbV9jb2xvck1hc2tb NF07CisgICAgR0MzRGJvb2xlYW4gbV9kZXB0aE1hc2s7CiAKICAgICBsb25nIG1fc3RlbmNpbEJp dHM7CiAgICAgR0MzRHVpbnQgbV9zdGVuY2lsTWFzaywgbV9zdGVuY2lsTWFza0JhY2s7Cg==