137456 2014-10-06 12:35:06 -0700 CanvasPattern always has an internal WebCore::Pattern. 2014-10-06 20:28:58 -0700 1 1 1 Unclassified WebKit Canvas 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kling kling commit-queue dino d-r esprehn+autocc fmalita glenn gyuyoung.kim kondapallykalyan pdr schenney sergio oldest_to_newest 1039792 0 kling 2014-10-06 12:35:06 -0700 Light refactoring incoming. 1039793 1 239349 kling 2014-10-06 12:36:10 -0700 Created attachment 239349 Patch 1039930 2 239349 commit-queue 2014-10-06 20:28:35 -0700 Comment on attachment 239349 Patch Clearing flags on attachment: 239349 Committed r174382: <http://trac.webkit.org/changeset/174382> 1039931 3 commit-queue 2014-10-06 20:28:58 -0700 All reviewed patches have been landed. Closing bug. 239349 2014-10-06 12:36:10 -0700 2014-10-06 20:28:35 -0700 Patch bug-137456.diff text/plain 8947 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA2ZWFjNjAwLi4wNzk0ZmMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEg QEAKKzIwMTQtMTAtMDYgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgorCisgICAg ICAgIENhbnZhc1BhdHRlcm4gYWx3YXlzIGhhcyBhbiBpbnRlcm5hbCBXZWJDb3JlOjpQYXR0ZXJu LgorICAgICAgICA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMTM3NDU2PgorCisgICAgICAgIFVzZSBt b3JlIFJlZiAmIFBhc3NSZWYgZm9yIENhbnZhc1BhdHRlcm4gYW5kIFBhdHRlcm4uCisKKyAgICAg ICAgUmVtb3ZlZCBzb21lIGltcG9zc2libGUgbnVsbCBjaGVja3MgaW4gR3JhcGhpY3NDb250ZXh0 IHRoYXQKKyAgICAgICAgZ290IGV4cG9zZWQgYXMgY29tcGlsZSBlcnJvcnMgd2l0aCB0aGVzZSBj aGFuZ2VzLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogaHRtbC9jYW52YXMvQ2FudmFzUGF0dGVybi5oOgorICAgICAgICAoV2ViQ29yZTo6Q2FudmFz UGF0dGVybjo6cGF0dGVybik6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3ND b250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDo6c2V0U3Ryb2tl UGF0dGVybik6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OnNldEZpbGxQYXR0 ZXJuKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuaDoKKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9QYXR0ZXJuLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlBhdHRlcm46OmNyZWF0ZSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvUGF0dGVybi5o OgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2ZpbHRlcnMvRkVUaWxlLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkZFVGlsZTo6cGxhdGZvcm1BcHBseVNvZnR3YXJlKToKKyAgICAgICAgKiBy ZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1BhdGguY3BwOgorICAgICAgICAoV2ViQ29yZTo6dXNlU3Ry b2tlU3R5bGVUb0ZpbGwpOgorICAgICAgICAqIHJlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3Vy Y2VQYXR0ZXJuLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclNWR1Jlc291cmNlUGF0dGVy bjo6YXBwbHlSZXNvdXJjZSk6CisKIDIwMTQtMTAtMDYgIENocmlzIEZsZWl6YWNoICA8Y2ZsZWl6 YWNoQGFwcGxlLmNvbT4KIAogICAgICAgICBBWDogUGVyZm9ybWFuY2U6IENlcnRhaW4gV2ViIHNp dGUgY2F1c2VzIFNhZmFyaSB0byBoYW5nIGNvbXBsZXRlbHkgd2hpbGUgZW50ZXJpbmcgZm9ybSBk YXRhCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9DYW52YXNQYXR0ZXJu LmggYi9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9DYW52YXNQYXR0ZXJuLmgKaW5kZXggZTI0 ZjFmYS4uMGVhMGJjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvQ2Fu dmFzUGF0dGVybi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL0NhbnZhc1BhdHRl cm4uaApAQCAtMjgsOCArMjgsOCBAQAogCiAjaW5jbHVkZSA8d3RmL0ZvcndhcmQuaD4KICNpbmNs dWRlIDx3dGYvUGFzc1JlZlB0ci5oPgorI2luY2x1ZGUgPHd0Zi9SZWYuaD4KICNpbmNsdWRlIDx3 dGYvUmVmQ291bnRlZC5oPgotI2luY2x1ZGUgPHd0Zi9SZWZQdHIuaD4KIAogbmFtZXNwYWNlIFdl YkNvcmUgewogCkBAIC00NSwxNCArNDUsMTUgQEAgcHVibGljOgogCiAgICAgc3RhdGljIHZvaWQg cGFyc2VSZXBldGl0aW9uVHlwZShjb25zdCBTdHJpbmcmLCBib29sJiByZXBlYXRYLCBib29sJiBy ZXBlYXRZLCBFeGNlcHRpb25Db2RlJik7CiAKLSAgICBQYXR0ZXJuKiBwYXR0ZXJuKCkgY29uc3Qg eyByZXR1cm4gbV9wYXR0ZXJuLmdldCgpOyB9CisgICAgUGF0dGVybiYgcGF0dGVybigpIHsgcmV0 dXJuIG1fcGF0dGVybi5nZXQoKTsgfQorICAgIGNvbnN0IFBhdHRlcm4mIHBhdHRlcm4oKSBjb25z dCB7IHJldHVybiBtX3BhdHRlcm4uZ2V0KCk7IH0KIAogICAgIGJvb2wgb3JpZ2luQ2xlYW4oKSBj b25zdCB7IHJldHVybiBtX29yaWdpbkNsZWFuOyB9CiAKIHByaXZhdGU6CiAgICAgQ2FudmFzUGF0 dGVybihQYXNzUmVmUHRyPEltYWdlPiwgYm9vbCByZXBlYXRYLCBib29sIHJlcGVhdFksIGJvb2wg b3JpZ2luQ2xlYW4pOwogCi0gICAgUmVmUHRyPFBhdHRlcm4+IG1fcGF0dGVybjsKKyAgICBSZWY8 UGF0dGVybj4gbV9wYXR0ZXJuOwogICAgIGJvb2wgbV9vcmlnaW5DbGVhbjsKIH07CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuY3Bw CmluZGV4IGY0MDg3MjUuLmM2YTBiZmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmNwcApAQCAtMzM1LDI2ICszMzUsMTYgQEAg Y29uc3QgR3JhcGhpY3NDb250ZXh0U3RhdGUmIEdyYXBoaWNzQ29udGV4dDo6c3RhdGUoKSBjb25z dAogICAgIHJldHVybiBtX3N0YXRlOwogfQogCi12b2lkIEdyYXBoaWNzQ29udGV4dDo6c2V0U3Ry b2tlUGF0dGVybihQYXNzUmVmUHRyPFBhdHRlcm4+IHBhdHRlcm4pCit2b2lkIEdyYXBoaWNzQ29u dGV4dDo6c2V0U3Ryb2tlUGF0dGVybihQYXNzUmVmPFBhdHRlcm4+IHBhdHRlcm4pCiB7Ci0gICAg QVNTRVJUKHBhdHRlcm4pOwotICAgIGlmICghcGF0dGVybikgewotICAgICAgICBzZXRTdHJva2VD b2xvcihDb2xvcjo6YmxhY2ssIENvbG9yU3BhY2VEZXZpY2VSR0IpOwotICAgICAgICByZXR1cm47 Ci0gICAgfQogICAgIG1fc3RhdGUuc3Ryb2tlR3JhZGllbnQuY2xlYXIoKTsKLSAgICBtX3N0YXRl LnN0cm9rZVBhdHRlcm4gPSBwYXR0ZXJuOworICAgIG1fc3RhdGUuc3Ryb2tlUGF0dGVybiA9IFdU Rjo6bW92ZShwYXR0ZXJuKTsKIH0KIAotdm9pZCBHcmFwaGljc0NvbnRleHQ6OnNldEZpbGxQYXR0 ZXJuKFBhc3NSZWZQdHI8UGF0dGVybj4gcGF0dGVybikKK3ZvaWQgR3JhcGhpY3NDb250ZXh0Ojpz ZXRGaWxsUGF0dGVybihQYXNzUmVmPFBhdHRlcm4+IHBhdHRlcm4pCiB7Ci0gICAgQVNTRVJUKHBh dHRlcm4pOwotICAgIGlmICghcGF0dGVybikgewotICAgICAgICBzZXRGaWxsQ29sb3IoQ29sb3I6 OmJsYWNrLCBDb2xvclNwYWNlRGV2aWNlUkdCKTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KICAg ICBtX3N0YXRlLmZpbGxHcmFkaWVudC5jbGVhcigpOwotICAgIG1fc3RhdGUuZmlsbFBhdHRlcm4g PSBwYXR0ZXJuOworICAgIG1fc3RhdGUuZmlsbFBhdHRlcm4gPSBXVEY6Om1vdmUocGF0dGVybik7 CiB9CiAKIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpzZXRTdHJva2VHcmFkaWVudChQYXNzUmVmUHRy PEdyYWRpZW50PiBncmFkaWVudCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvR3JhcGhpY3NDb250ZXh0LmgKaW5kZXggN2YyYTAzMy4uYjc3MTcyMCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmgKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmgKQEAg LTIzNCw3ICsyMzQsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIENvbG9yU3BhY2Ug c3Ryb2tlQ29sb3JTcGFjZSgpIGNvbnN0OwogICAgICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHNl dFN0cm9rZUNvbG9yKGNvbnN0IENvbG9yJiwgQ29sb3JTcGFjZSk7CiAKLSAgICAgICAgdm9pZCBz ZXRTdHJva2VQYXR0ZXJuKFBhc3NSZWZQdHI8UGF0dGVybj4pOworICAgICAgICB2b2lkIHNldFN0 cm9rZVBhdHRlcm4oUGFzc1JlZjxQYXR0ZXJuPik7CiAgICAgICAgIFBhdHRlcm4qIHN0cm9rZVBh dHRlcm4oKSBjb25zdDsKIAogICAgICAgICB2b2lkIHNldFN0cm9rZUdyYWRpZW50KFBhc3NSZWZQ dHI8R3JhZGllbnQ+KTsKQEAgLTI0Niw3ICsyNDYsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAg ICAgICAgIENvbG9yU3BhY2UgZmlsbENvbG9yU3BhY2UoKSBjb25zdDsKICAgICAgICAgV0VCQ09S RV9FWFBPUlQgdm9pZCBzZXRGaWxsQ29sb3IoY29uc3QgQ29sb3ImLCBDb2xvclNwYWNlKTsKIAot ICAgICAgICB2b2lkIHNldEZpbGxQYXR0ZXJuKFBhc3NSZWZQdHI8UGF0dGVybj4pOworICAgICAg ICB2b2lkIHNldEZpbGxQYXR0ZXJuKFBhc3NSZWY8UGF0dGVybj4pOwogICAgICAgICBQYXR0ZXJu KiBmaWxsUGF0dGVybigpIGNvbnN0OwogCiAgICAgICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgc2V0 RmlsbEdyYWRpZW50KFBhc3NSZWZQdHI8R3JhZGllbnQ+KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1BhdHRlcm4uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvUGF0dGVybi5jcHAKaW5kZXggMjNkOGNkZi4uOWUxMTRjNiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvUGF0dGVybi5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvUGF0dGVybi5jcHAKQEAgLTMxLDkgKzMx LDkgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1QYXNzUmVmUHRyPFBhdHRlcm4+IFBhdHRl cm46OmNyZWF0ZShQYXNzUmVmUHRyPEltYWdlPiB0aWxlSW1hZ2UsIGJvb2wgcmVwZWF0WCwgYm9v bCByZXBlYXRZKQorUGFzc1JlZjxQYXR0ZXJuPiBQYXR0ZXJuOjpjcmVhdGUoUGFzc1JlZlB0cjxJ bWFnZT4gdGlsZUltYWdlLCBib29sIHJlcGVhdFgsIGJvb2wgcmVwZWF0WSkKIHsKLSAgICByZXR1 cm4gYWRvcHRSZWYobmV3IFBhdHRlcm4odGlsZUltYWdlLCByZXBlYXRYLCByZXBlYXRZKSk7Cisg ICAgcmV0dXJuIGFkb3B0UmVmKCpuZXcgUGF0dGVybih0aWxlSW1hZ2UsIHJlcGVhdFgsIHJlcGVh dFkpKTsKIH0KIAogUGF0dGVybjo6UGF0dGVybihQYXNzUmVmUHRyPEltYWdlPiBpbWFnZSwgYm9v bCByZXBlYXRYLCBib29sIHJlcGVhdFkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9QYXR0ZXJuLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9QYXR0ZXJuLmgKaW5kZXggZWRiMDBiMS4uZTc3MzZkMyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvUGF0dGVybi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL1BhdHRlcm4uaApAQCAtNTEsNyArNTEsNyBAQCBjbGFzcyBJbWFnZTsK IAogY2xhc3MgUGF0dGVybiA6IHB1YmxpYyBSZWZDb3VudGVkPFBhdHRlcm4+IHsKIHB1YmxpYzoK LSAgICBzdGF0aWMgUGFzc1JlZlB0cjxQYXR0ZXJuPiBjcmVhdGUoUGFzc1JlZlB0cjxJbWFnZT4g dGlsZUltYWdlLCBib29sIHJlcGVhdFgsIGJvb2wgcmVwZWF0WSk7CisgICAgc3RhdGljIFBhc3NS ZWY8UGF0dGVybj4gY3JlYXRlKFBhc3NSZWZQdHI8SW1hZ2U+IHRpbGVJbWFnZSwgYm9vbCByZXBl YXRYLCBib29sIHJlcGVhdFkpOwogICAgIHZpcnR1YWwgflBhdHRlcm4oKTsKIAogICAgIEltYWdl KiB0aWxlSW1hZ2UoKSBjb25zdCB7IHJldHVybiBtX3RpbGVJbWFnZS5nZXQoKTsgfQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZmlsdGVycy9GRVRpbGUuY3Bw IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZmlsdGVycy9GRVRpbGUuY3BwCmlu ZGV4IDE1MDQ5N2YuLjVlMjE3N2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2ZpbHRlcnMvRkVUaWxlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9maWx0ZXJzL0ZFVGlsZS5jcHAKQEAgLTcxLDEzICs3MSwxMyBAQCB2b2lkIEZF VGlsZTo6cGxhdGZvcm1BcHBseVNvZnR3YXJlKCkKICAgICB0aWxlSW1hZ2VDb250ZXh0LT50cmFu c2xhdGUoLWluTWF4RWZmZWN0TG9jYXRpb24ueCgpLCAtaW5NYXhFZmZlY3RMb2NhdGlvbi55KCkp OwogICAgIHRpbGVJbWFnZUNvbnRleHQtPmRyYXdJbWFnZUJ1ZmZlcihpbi0+YXNJbWFnZUJ1ZmZl cigpLCBDb2xvclNwYWNlRGV2aWNlUkdCLCBpbi0+YWJzb2x1dGVQYWludFJlY3QoKS5sb2NhdGlv bigpKTsKIAotICAgIFJlZlB0cjxQYXR0ZXJuPiBwYXR0ZXJuID0gUGF0dGVybjo6Y3JlYXRlKHRp bGVJbWFnZS0+Y29weUltYWdlKENvcHlCYWNraW5nU3RvcmUpLCB0cnVlLCB0cnVlKTsKKyAgICBh dXRvIHBhdHRlcm4gPSBQYXR0ZXJuOjpjcmVhdGUodGlsZUltYWdlLT5jb3B5SW1hZ2UoQ29weUJh Y2tpbmdTdG9yZSksIHRydWUsIHRydWUpOwogCiAgICAgQWZmaW5lVHJhbnNmb3JtIHBhdHRlcm5U cmFuc2Zvcm07CiAgICAgcGF0dGVyblRyYW5zZm9ybS50cmFuc2xhdGUoaW5NYXhFZmZlY3RMb2Nh dGlvbi54KCkgLSBtYXhFZmZlY3RMb2NhdGlvbi54KCksIGluTWF4RWZmZWN0TG9jYXRpb24ueSgp IC0gbWF4RWZmZWN0TG9jYXRpb24ueSgpKTsKLSAgICBwYXR0ZXJuLT5zZXRQYXR0ZXJuU3BhY2VU cmFuc2Zvcm0ocGF0dGVyblRyYW5zZm9ybSk7CisgICAgcGF0dGVybi5nZXQoKS5zZXRQYXR0ZXJu U3BhY2VUcmFuc2Zvcm0ocGF0dGVyblRyYW5zZm9ybSk7CiAgICAgR3JhcGhpY3NDb250ZXh0KiBm aWx0ZXJDb250ZXh0ID0gcmVzdWx0SW1hZ2UtPmNvbnRleHQoKTsKLSAgICBmaWx0ZXJDb250ZXh0 LT5zZXRGaWxsUGF0dGVybihwYXR0ZXJuKTsKKyAgICBmaWx0ZXJDb250ZXh0LT5zZXRGaWxsUGF0 dGVybihXVEY6Om1vdmUocGF0dGVybikpOwogICAgIGZpbHRlckNvbnRleHQtPmZpbGxSZWN0KEZs b2F0UmVjdChGbG9hdFBvaW50KCksIGFic29sdXRlUGFpbnRSZWN0KCkuc2l6ZSgpKSk7CiB9CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUGF0aC5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1BhdGguY3BwCmluZGV4 IDcxYTE2MmIuLmNlZDBmZWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9z dmcvUmVuZGVyU1ZHUGF0aC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9S ZW5kZXJTVkdQYXRoLmNwcApAQCAtNjksNyArNjksNyBAQCBzdGF0aWMgdm9pZCB1c2VTdHJva2VT dHlsZVRvRmlsbChHcmFwaGljc0NvbnRleHQqIGNvbnRleHQpCiAgICAgaWYgKEdyYWRpZW50KiBn cmFkaWVudCA9IGNvbnRleHQtPnN0cm9rZUdyYWRpZW50KCkpCiAgICAgICAgIGNvbnRleHQtPnNl dEZpbGxHcmFkaWVudChncmFkaWVudCk7CiAgICAgZWxzZSBpZiAoUGF0dGVybiogcGF0dGVybiA9 IGNvbnRleHQtPnN0cm9rZVBhdHRlcm4oKSkKLSAgICAgICAgY29udGV4dC0+c2V0RmlsbFBhdHRl cm4ocGF0dGVybik7CisgICAgICAgIGNvbnRleHQtPnNldEZpbGxQYXR0ZXJuKCpwYXR0ZXJuKTsK ICAgICBlbHNlCiAgICAgICAgIGNvbnRleHQtPnNldEZpbGxDb2xvcihjb250ZXh0LT5zdHJva2VD b2xvcigpLCBjb250ZXh0LT5zdHJva2VDb2xvclNwYWNlKCkpOwogfQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZVBhdHRlcm4uY3BwIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZVBhdHRlcm4uY3Bw CmluZGV4IDBiNTM1ZTIuLmIwMjQ4YzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VQYXR0ZXJuLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlUGF0dGVybi5jcHAKQEAgLTE1NCwxMyAr MTU0LDEzIEBAIGJvb2wgUmVuZGVyU1ZHUmVzb3VyY2VQYXR0ZXJuOjphcHBseVJlc291cmNlKFJl bmRlckVsZW1lbnQmIHJlbmRlcmVyLCBjb25zdCBSZW5kCiAKICAgICBpZiAocmVzb3VyY2VNb2Rl ICYgQXBwbHlUb0ZpbGxNb2RlKSB7CiAgICAgICAgIGNvbnRleHQtPnNldEFscGhhKHN2Z1N0eWxl LmZpbGxPcGFjaXR5KCkpOwotICAgICAgICBjb250ZXh0LT5zZXRGaWxsUGF0dGVybihwYXR0ZXJu RGF0YS0+cGF0dGVybik7CisgICAgICAgIGNvbnRleHQtPnNldEZpbGxQYXR0ZXJuKCpwYXR0ZXJu RGF0YS0+cGF0dGVybik7CiAgICAgICAgIGNvbnRleHQtPnNldEZpbGxSdWxlKHN2Z1N0eWxlLmZp bGxSdWxlKCkpOwogICAgIH0gZWxzZSBpZiAocmVzb3VyY2VNb2RlICYgQXBwbHlUb1N0cm9rZU1v ZGUpIHsKICAgICAgICAgaWYgKHN2Z1N0eWxlLnZlY3RvckVmZmVjdCgpID09IFZFX05PTl9TQ0FM SU5HX1NUUk9LRSkKICAgICAgICAgICAgIHBhdHRlcm5EYXRhLT5wYXR0ZXJuLT5zZXRQYXR0ZXJu U3BhY2VUcmFuc2Zvcm0odHJhbnNmb3JtT25Ob25TY2FsaW5nU3Ryb2tlKCZyZW5kZXJlciwgcGF0 dGVybkRhdGEtPnRyYW5zZm9ybSkpOwogICAgICAgICBjb250ZXh0LT5zZXRBbHBoYShzdmdTdHls ZS5zdHJva2VPcGFjaXR5KCkpOwotICAgICAgICBjb250ZXh0LT5zZXRTdHJva2VQYXR0ZXJuKHBh dHRlcm5EYXRhLT5wYXR0ZXJuKTsKKyAgICAgICAgY29udGV4dC0+c2V0U3Ryb2tlUGF0dGVybigq cGF0dGVybkRhdGEtPnBhdHRlcm4pOwogICAgICAgICBTVkdSZW5kZXJTdXBwb3J0OjphcHBseVN0 cm9rZVN0eWxlVG9Db250ZXh0KGNvbnRleHQsIHN0eWxlLCByZW5kZXJlcik7CiAgICAgfQogCg==