202388 2019-09-30 19:08:13 -0700 [FTW] Correct additional canvas test failures 2019-10-01 14:27:17 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 bfulgham bfulgham achristensen bfulgham commit-queue don.olmstead fujii pvollan webkit-bug-importer oldest_to_newest 1575410 0 bfulgham 2019-09-30 19:08:13 -0700 This patch cleans up a few errors in the Path and ImageData code causing some test failures. 1575411 1 379871 bfulgham 2019-09-30 19:14:00 -0700 Created attachment 379871 Patch 1575441 2 379871 fujii 2019-09-30 22:41:45 -0700 Comment on attachment 379871 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=379871&action=review > Source/WebCore/platform/graphics/win/Direct2DOperations.cpp:714 > + auto transformedRectToClear = transform.mapRect(rectToClear); mapRect returns a bounding rect if transform is rotated. Do you need to use fillPath? Path path; path.addRect(rect); fillPath(platformContext, path, Color::transparent); 1575615 3 379871 bfulgham 2019-10-01 11:40:33 -0700 Comment on attachment 379871 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=379871&action=review >> Source/WebCore/platform/graphics/win/Direct2DOperations.cpp:714 >> + auto transformedRectToClear = transform.mapRect(rectToClear); > > mapRect returns a bounding rect if transform is rotated. Do you need to use fillPath? > Path path; > path.addRect(rect); > fillPath(platformContext, path, Color::transparent); Oh! Good point. I'll simplify the high-level Path commands to the appropriate D2D set for this use case, and only do this when we are not translating. It seems like this path is only needed if the transform is not axis-aligned. 1575620 4 379920 bfulgham 2019-10-01 11:46:23 -0700 Created attachment 379920 Patch 1575627 5 bfulgham 2019-10-01 11:53:59 -0700 Before this change: 681 / 775 Pass After this change: 684 / 775 Pass 1575738 6 379920 commit-queue 2019-10-01 14:26:13 -0700 Comment on attachment 379920 Patch Clearing flags on attachment: 379920 Committed r250581: <https://trac.webkit.org/changeset/250581> 1575739 7 commit-queue 2019-10-01 14:26:15 -0700 All reviewed patches have been landed. Closing bug. 1575740 8 webkit-bug-importer 2019-10-01 14:27:17 -0700 <rdar://problem/55889950> 379871 2019-09-30 19:14:00 -0700 2019-10-01 11:46:22 -0700 Patch bug-202388-20190930191356.patch text/plain 5475 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI1MDU0MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDE5LTA5LTMwICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtGVFddIENvcnJlY3QgYWRk aXRpb25hbCBjYW52YXMgdGVzdCBmYWlsdXJlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAyMzg4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBjb3JyZWN0cyBhIGhhbmRmdWwgb2YgZXJy b3JzIGluIERpcmVjdDJEJ3MgZHJhd2luZyBjb2RlLgorCisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3Mvd2luL0RpcmVjdDJET3BlcmF0aW9ucy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEaXJl Y3QyRDo6Y2xlYXJSZWN0KTogVXNlIHRoZSB0cmFuc2Zvcm1lZCBkaW1lbnNpb25zIG9mCisgICAg ICAgIHJlY3RzIHRvIGRldGVybWluZSB3aGV0aGVyIHRoZXkgaW50ZXJzZWN0IHdpdGggdGhlIHJl bmRlciB0YXJnZXQuCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0ltYWdlQnVmZmVy RGF0YURpcmVjdDJELmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkltYWdlQnVmZmVyRGF0YTo6Y29w eVJlY3RGcm9tRGF0YSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZUJ1ZmZlckRhdGE6 OmxvYWREYXRhVG9CaXRtYXBJZk5lZWRlZCk6IEl0IGlzIG5vdAorICAgICAgICBuZWNlc3Nhcnkg KG9yIGNvcnJlY3QpIHRvICdlbmREcmF3JyB3aGVuIGxvYWRpbmcgaW1hZ2UgZGF0YSB0byB0aGUK KyAgICAgICAgQml0bWFwIHRhcmdldC4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy93aW4v UGF0aERpcmVjdDJELmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBhdGg6OnN0cm9rZUJvdW5kaW5n UmVjdCBjb25zdCk6IFByb3ZpZGUgYW4gaW1wbGVtZW50YXRpb24uCisKIDIwMTktMDktMzAgIENo cmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBJREJUcmFuc2FjdGlvbiAv IElEQk9iamVjdFN0b3JlIHNob3VsZCBub3QgcHJldmVudCBhIHBhZ2UgZnJvbSBlbnRlcmluZyB0 aGUgYmFjayAvIGZvcndhcmQgY2FjaGUKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL3dpbi9EaXJlY3QyRE9wZXJhdGlvbnMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9EaXJlY3QyRE9wZXJhdGlvbnMuY3BwCShyZXZp c2lvbiAyNTA0OTIpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vRGly ZWN0MkRPcGVyYXRpb25zLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzA3LDE2ICs3MDcsMjYgQEAg dm9pZCBjbGVhclJlY3QoUGxhdGZvcm1Db250ZXh0RGlyZWN0MkQmCiAgICAgICAgIEZsb2F0UmVj dCByZW5kZXJUYXJnZXRSZWN0KEZsb2F0UG9pbnQoKSwgcmVuZGVyVGFyZ2V0LT5HZXRTaXplKCkp OwogICAgICAgICBGbG9hdFJlY3QgcmVjdFRvQ2xlYXIocmVjdCk7CiAKLSAgICAgICAgaWYgKHJl Y3RUb0NsZWFyLmNvbnRhaW5zKHJlbmRlclRhcmdldFJlY3QpKSB7CisgICAgICAgIEQyRDFfTUFU UklYXzNYMl9GIG1hdHJpeDsKKyAgICAgICAgcmVuZGVyVGFyZ2V0LT5HZXRUcmFuc2Zvcm0oJm1h dHJpeCk7CisKKyAgICAgICAgQWZmaW5lVHJhbnNmb3JtIHRyYW5zZm9ybShtYXRyaXgpOworICAg ICAgICBhdXRvIHRyYW5zZm9ybWVkUmVjdFRvQ2xlYXIgPSB0cmFuc2Zvcm0ubWFwUmVjdChyZWN0 VG9DbGVhcik7CisKKyAgICAgICAgaWYgKHRyYW5zZm9ybWVkUmVjdFRvQ2xlYXIuY29udGFpbnMo cmVuZGVyVGFyZ2V0UmVjdCkpIHsKICAgICAgICAgICAgIHBsYXRmb3JtQ29udGV4dC5zZXRUYWdz KDEsIF9fTElORV9fKTsKICAgICAgICAgICAgIHJlbmRlclRhcmdldC0+Q2xlYXIoRDJEMTo6Q29s b3JGKDAsIDAsIDAsIDApKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCi0gICAg ICAgIGlmICghcmVjdFRvQ2xlYXIuaW50ZXJzZWN0cyhyZW5kZXJUYXJnZXRSZWN0KSkKKyAgICAg ICAgaWYgKCF0cmFuc2Zvcm1lZFJlY3RUb0NsZWFyLmludGVyc2VjdHMocmVuZGVyVGFyZ2V0UmVj dCkpCiAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgcmVjdFRvQ2xlYXIuaW50ZXJzZWN0 KHJlbmRlclRhcmdldFJlY3QpOworICAgICAgICB0cmFuc2Zvcm1lZFJlY3RUb0NsZWFyLmludGVy c2VjdChyZW5kZXJUYXJnZXRSZWN0KTsKKworICAgICAgICBhdXRvIGludmVydGVkID0gdHJhbnNm b3JtLmludmVyc2UoKTsKKyAgICAgICAgaWYgKGludmVydGVkKQorICAgICAgICAgICAgdHJhbnNm b3JtZWRSZWN0VG9DbGVhciA9IGludmVydGVkLT5tYXBSZWN0KHRyYW5zZm9ybWVkUmVjdFRvQ2xl YXIpOwogCiAgICAgICAgIHBsYXRmb3JtQ29udGV4dC5zZXRUYWdzKDEsIF9fTElORV9fKTsKICAg ICAgICAgcmVuZGVyVGFyZ2V0LT5QdXNoQXhpc0FsaWduZWRDbGlwKHJlY3RUb0NsZWFyLCBEMkQx X0FOVElBTElBU19NT0RFX1BFUl9QUklNSVRJVkUpOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3Mvd2luL0ltYWdlQnVmZmVyRGF0YURpcmVjdDJELmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vSW1hZ2VCdWZmZXJEYXRh RGlyZWN0MkQuY3BwCShyZXZpc2lvbiAyNTA0OTIpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy93aW4vSW1hZ2VCdWZmZXJEYXRhRGlyZWN0MkQuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0xNjksOCArMTY5LDExIEBAIGJvb2wgSW1hZ2VCdWZmZXJEYXRhOjpjb3B5UmVjdEZyb21E YXRhKGMKICAgICBJbnRSZWN0IHNjYWxlZFJlY3QgPSByZWN0OwogICAgIHNjYWxlZFJlY3Quc2Nh bGUoc2NhbGVGYWN0b3IpOwogCi0gICAgaWYgKCFJbnRSZWN0KEludFBvaW50KCksIGJhY2tpbmdT dG9yZVNpemUpLmNvbnRhaW5zKHNjYWxlZFJlY3QpKQotICAgICAgICByZXR1cm4gZmFsc2U7Cisg ICAgaWYgKCFJbnRSZWN0KEludFBvaW50KCksIGJhY2tpbmdTdG9yZVNpemUpLmNvbnRhaW5zKHNj YWxlZFJlY3QpKSB7CisgICAgICAgIC8vIFJlcXVlc3RlZCByZWN0IGlzIG91dHNpZGUgdGhlIGJ1 ZmZlci4gUmV0dXJuIHplcm8tZmlsbGVkIGJ1ZmZlci4KKyAgICAgICAgcmVzdWx0LT56ZXJvRmls bCgpOworICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9CiAKICAgICByZXR1cm4gY29weVJlY3RG cm9tU291cmNlVG9EZXN0KHNjYWxlZFJlY3QsIGJhY2tpbmdTdG9yZVNpemUsIGRhdGEuZGF0YSgp LCByZWN0LnNpemUoKSwgcmVzdWx0LT5kYXRhKCksIEludFBvaW50KCkpOwogfQpAQCAtNDUzLDIx ICs0NTYsMTEgQEAgdm9pZCBJbWFnZUJ1ZmZlckRhdGE6OmxvYWREYXRhVG9CaXRtYXBJZgogICAg IGVsc2UKICAgICAgICAgaW5QbGFjZVN3aXp6bGU8QWxwaGFQcmVtdWx0aXBsaWNhdGlvbjo6UHJl bXVsdGlwbGllZD4oZGF0YS5kYXRhKCksIGRhdGEuc2l6ZSgpKTsgLy8gUFJHQkEgLT4gUEJHUkEK IAotICAgIC8vIENvcHkgdGhlIGJpdHMgZnJvbSBjdXJyZW50IHJlbmRlclRhcmdldCB0byB0aGUg b3V0cHV0IHRhcmdldC4KLSAgICAvLyBXZSBjYW5ub3QgYWNjZXNzIHRoZSBkYXRhIGJhY2tpbmcg YW4gSVdJQ0JpdG1hcCBvciBJRDJEMUJpdG1hcCB3aGlsZSBhbiBhY3RpdmUgZHJhdyBzZXNzaW9u IGlzIG9wZW4uCi0gICAgY29udGV4dC0+ZW5kRHJhdygpOwotCi0gICAgQ09NUHRyPElEMkQxQml0 bWFwUmVuZGVyVGFyZ2V0PiBiaXRtYXBSZW5kZXJUYXJnZXQ7Ci0gICAgSFJFU1VMVCBociA9IHBs YXRmb3JtQ29udGV4dC0+cmVuZGVyVGFyZ2V0KCktPlF1ZXJ5SW50ZXJmYWNlKCZiaXRtYXBSZW5k ZXJUYXJnZXQpOwotICAgIEFTU0VSVChTVUNDRUVERUQoaHIpKTsKLQogICAgIGF1dG8gYnl0ZXNQ ZXJSb3dJbkRhdGEgPSBiYWNraW5nU3RvcmVTaXplLndpZHRoKCkgKiA0OwogCi0gICAgaHIgPSBi aXRtYXAtPkNvcHlGcm9tTWVtb3J5KG51bGxwdHIsIGRhdGEuZGF0YSgpLCBieXRlc1BlclJvd0lu RGF0YSk7CisgICAgSFJFU1VMVCBociA9IGJpdG1hcC0+Q29weUZyb21NZW1vcnkobnVsbHB0ciwg ZGF0YS5kYXRhKCksIGJ5dGVzUGVyUm93SW5EYXRhKTsKICAgICBBU1NFUlQoU1VDQ0VFREVEKGhy KSk7CiAKLSAgICBjb250ZXh0LT5iZWdpbkRyYXcoKTsKLQogICAgIGJpdG1hcEJ1ZmZlclN5bmMg PSBCaXRtYXBCdWZmZXJTeW5jOjpJblN5bmM7CiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL3dpbi9QYXRoRGlyZWN0MkQuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9QYXRoRGlyZWN0MkQuY3BwCShyZXZpc2lv biAyNTA0OTIpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vUGF0aERp cmVjdDJELmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzQ4LDE0ICszNDgsMTMgQEAgRmxvYXRSZWN0 IFBhdGg6OnN0cm9rZUJvdW5kaW5nUmVjdChTdHJvawogICAgIGlmIChpc051bGwoKSkKICAgICAg ICAgcmV0dXJuIEZsb2F0UmVjdCgpOwogCi0gICAgaWYgKCFhcHBsaWVyKQotICAgICAgICByZXR1 cm4gYm91bmRpbmdSZWN0KCk7CisgICAgUGxhdGZvcm1Db250ZXh0RGlyZWN0MkQgc2NyYXRjaENv bnRleHREMkQoc2NyYXRjaFJlbmRlclRhcmdldCgpKTsKKyAgICBHcmFwaGljc0NvbnRleHQgc2Ny YXRjaENvbnRleHQoJnNjcmF0Y2hDb250ZXh0RDJELCBHcmFwaGljc0NvbnRleHQ6OkJpdG1hcFJl bmRlcmluZ0NvbnRleHRUeXBlOjpHUFVNZW1vcnkpOwogCi0gICAgVU5VU0VEX1BBUkFNKGFwcGxp ZXIpOwotICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAgaWYgKGFwcGxpZXIpCisgICAgICAgIGFw cGxpZXItPnN0cm9rZVN0eWxlKCZzY3JhdGNoQ29udGV4dCk7CiAKLSAgICAvLyBKdXN0IHJldHVy biByZWd1bGFyIGJvdW5kaW5nIHJlY3QgZm9yIG5vdy4KLSAgICByZXR1cm4gYm91bmRpbmdSZWN0 KCk7CisgICAgcmV0dXJuIGZhc3RCb3VuZGluZ1JlY3RGb3JTdHJva2Uoc2NyYXRjaENvbnRleHRE MkQpOwogfQogCiB2b2lkIFBhdGg6Om9wZW5GaWd1cmVBdEN1cnJlbnRQb2ludElmTmVjZXNzYXJ5 KCkK 379920 2019-10-01 11:46:23 -0700 2019-10-01 14:26:13 -0700 Patch bug-202388-20191001114622.patch text/plain 5690 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI1MDU0MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDE5LTA5LTMwICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtGVFddIENvcnJlY3QgYWRk aXRpb25hbCBjYW52YXMgdGVzdCBmYWlsdXJlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAyMzg4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBjb3JyZWN0cyBhIGhhbmRmdWwgb2YgZXJy b3JzIGluIERpcmVjdDJEJ3MgZHJhd2luZyBjb2RlLgorCisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3Mvd2luL0RpcmVjdDJET3BlcmF0aW9ucy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEaXJl Y3QyRDo6Y2xlYXJSZWN0KTogVXNlIHRoZSB0cmFuc2Zvcm1lZCBkaW1lbnNpb25zIG9mCisgICAg ICAgIHJlY3RzIHRvIGRldGVybWluZSB3aGV0aGVyIHRoZXkgaW50ZXJzZWN0IHdpdGggdGhlIHJl bmRlciB0YXJnZXQuCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0ltYWdlQnVmZmVy RGF0YURpcmVjdDJELmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkltYWdlQnVmZmVyRGF0YTo6Y29w eVJlY3RGcm9tRGF0YSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZUJ1ZmZlckRhdGE6 OmxvYWREYXRhVG9CaXRtYXBJZk5lZWRlZCk6IEl0IGlzIG5vdAorICAgICAgICBuZWNlc3Nhcnkg KG9yIGNvcnJlY3QpIHRvICdlbmREcmF3JyB3aGVuIGxvYWRpbmcgaW1hZ2UgZGF0YSB0byB0aGUK KyAgICAgICAgQml0bWFwIHRhcmdldC4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy93aW4v UGF0aERpcmVjdDJELmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBhdGg6OnN0cm9rZUJvdW5kaW5n UmVjdCBjb25zdCk6IFByb3ZpZGUgYW4gaW1wbGVtZW50YXRpb24uCisKIDIwMTktMDktMzAgIENo cmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBJREJUcmFuc2FjdGlvbiAv IElEQk9iamVjdFN0b3JlIHNob3VsZCBub3QgcHJldmVudCBhIHBhZ2UgZnJvbSBlbnRlcmluZyB0 aGUgYmFjayAvIGZvcndhcmQgY2FjaGUKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL3dpbi9EaXJlY3QyRE9wZXJhdGlvbnMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9EaXJlY3QyRE9wZXJhdGlvbnMuY3BwCShyZXZp c2lvbiAyNTA0OTIpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vRGly ZWN0MkRPcGVyYXRpb25zLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzA1LDcgKzcwNSwyMiBAQCB2 b2lkIGNsZWFyUmVjdChQbGF0Zm9ybUNvbnRleHREaXJlY3QyRCYKIHsKICAgICBkcmF3V2l0aG91 dFNoYWRvdyhwbGF0Zm9ybUNvbnRleHQsIFsmcGxhdGZvcm1Db250ZXh0LCByZWN0XShJRDJEMVJl bmRlclRhcmdldCogcmVuZGVyVGFyZ2V0KSB7CiAgICAgICAgIEZsb2F0UmVjdCByZW5kZXJUYXJn ZXRSZWN0KEZsb2F0UG9pbnQoKSwgcmVuZGVyVGFyZ2V0LT5HZXRTaXplKCkpOworCisgICAgICAg IEQyRDE6Ok1hdHJpeDN4MkYgbWF0cml4OworICAgICAgICByZW5kZXJUYXJnZXQtPkdldFRyYW5z Zm9ybSgmbWF0cml4KTsKKworICAgICAgICBBZmZpbmVUcmFuc2Zvcm0gdHJhbnNmb3JtKG1hdHJp eCk7CisKICAgICAgICAgRmxvYXRSZWN0IHJlY3RUb0NsZWFyKHJlY3QpOworICAgICAgICBpZiAo IXRyYW5zZm9ybS5wcmVzZXJ2ZXNBeGlzQWxpZ25tZW50KCkpIHsKKyAgICAgICAgICAgIENPTVB0 cjxJRDJEMVJlY3RhbmdsZUdlb21ldHJ5PiByZWN0YW5nbGU7CisgICAgICAgICAgICBIUkVTVUxU IGhyID0gR3JhcGhpY3NDb250ZXh0OjpzeXN0ZW1GYWN0b3J5KCktPkNyZWF0ZVJlY3RhbmdsZUdl b21ldHJ5KHJlY3RUb0NsZWFyLCAmcmVjdGFuZ2xlKTsKKyAgICAgICAgICAgIFJFTEVBU0VfQVNT RVJUKFNVQ0NFRURFRChocikpOworICAgICAgICAgICAgcmVuZGVyVGFyZ2V0LT5GaWxsR2VvbWV0 cnkocmVjdGFuZ2xlLmdldCgpLCBwbGF0Zm9ybUNvbnRleHQuYnJ1c2hXaXRoQ29sb3IoRDJEMTo6 Q29sb3JGKDAsIDAsIDAsIDApKS5nZXQoKSk7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAg IH0KKworICAgICAgICByZWN0VG9DbGVhciA9IHRyYW5zZm9ybS5tYXBSZWN0KHJlY3RUb0NsZWFy KTsKIAogICAgICAgICBpZiAocmVjdFRvQ2xlYXIuY29udGFpbnMocmVuZGVyVGFyZ2V0UmVjdCkp IHsKICAgICAgICAgICAgIHBsYXRmb3JtQ29udGV4dC5zZXRUYWdzKDEsIF9fTElORV9fKTsKQEAg LTcxMywxMSArNzI4LDYgQEAgdm9pZCBjbGVhclJlY3QoUGxhdGZvcm1Db250ZXh0RGlyZWN0MkQm CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIAotICAgICAgICBpZiAoIXJlY3RUb0Ns ZWFyLmludGVyc2VjdHMocmVuZGVyVGFyZ2V0UmVjdCkpCi0gICAgICAgICAgICByZXR1cm47Ci0K LSAgICAgICAgcmVjdFRvQ2xlYXIuaW50ZXJzZWN0KHJlbmRlclRhcmdldFJlY3QpOwotCiAgICAg ICAgIHBsYXRmb3JtQ29udGV4dC5zZXRUYWdzKDEsIF9fTElORV9fKTsKICAgICAgICAgcmVuZGVy VGFyZ2V0LT5QdXNoQXhpc0FsaWduZWRDbGlwKHJlY3RUb0NsZWFyLCBEMkQxX0FOVElBTElBU19N T0RFX1BFUl9QUklNSVRJVkUpOwogICAgICAgICByZW5kZXJUYXJnZXQtPkNsZWFyKEQyRDE6OkNv bG9yRigwLCAwLCAwLCAwKSk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy93aW4vSW1hZ2VCdWZmZXJEYXRhRGlyZWN0MkQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9JbWFnZUJ1ZmZlckRhdGFEaXJlY3QyRC5jcHAJ KHJldmlzaW9uIDI1MDQ5MikKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dp bi9JbWFnZUJ1ZmZlckRhdGFEaXJlY3QyRC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE2OSw4ICsx NjksMTEgQEAgYm9vbCBJbWFnZUJ1ZmZlckRhdGE6OmNvcHlSZWN0RnJvbURhdGEoYwogICAgIElu dFJlY3Qgc2NhbGVkUmVjdCA9IHJlY3Q7CiAgICAgc2NhbGVkUmVjdC5zY2FsZShzY2FsZUZhY3Rv cik7CiAKLSAgICBpZiAoIUludFJlY3QoSW50UG9pbnQoKSwgYmFja2luZ1N0b3JlU2l6ZSkuY29u dGFpbnMoc2NhbGVkUmVjdCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBpZiAoIUludFJl Y3QoSW50UG9pbnQoKSwgYmFja2luZ1N0b3JlU2l6ZSkuY29udGFpbnMoc2NhbGVkUmVjdCkpIHsK KyAgICAgICAgLy8gUmVxdWVzdGVkIHJlY3QgaXMgb3V0c2lkZSB0aGUgYnVmZmVyLiBSZXR1cm4g emVyby1maWxsZWQgYnVmZmVyLgorICAgICAgICByZXN1bHQtPnplcm9GaWxsKCk7CisgICAgICAg IHJldHVybiB0cnVlOworICAgIH0KIAogICAgIHJldHVybiBjb3B5UmVjdEZyb21Tb3VyY2VUb0Rl c3Qoc2NhbGVkUmVjdCwgYmFja2luZ1N0b3JlU2l6ZSwgZGF0YS5kYXRhKCksIHJlY3Quc2l6ZSgp LCByZXN1bHQtPmRhdGEoKSwgSW50UG9pbnQoKSk7CiB9CkBAIC00NTMsMjEgKzQ1NiwxMSBAQCB2 b2lkIEltYWdlQnVmZmVyRGF0YTo6bG9hZERhdGFUb0JpdG1hcElmCiAgICAgZWxzZQogICAgICAg ICBpblBsYWNlU3dpenpsZTxBbHBoYVByZW11bHRpcGxpY2F0aW9uOjpQcmVtdWx0aXBsaWVkPihk YXRhLmRhdGEoKSwgZGF0YS5zaXplKCkpOyAvLyBQUkdCQSAtPiBQQkdSQQogCi0gICAgLy8gQ29w eSB0aGUgYml0cyBmcm9tIGN1cnJlbnQgcmVuZGVyVGFyZ2V0IHRvIHRoZSBvdXRwdXQgdGFyZ2V0 LgotICAgIC8vIFdlIGNhbm5vdCBhY2Nlc3MgdGhlIGRhdGEgYmFja2luZyBhbiBJV0lDQml0bWFw IG9yIElEMkQxQml0bWFwIHdoaWxlIGFuIGFjdGl2ZSBkcmF3IHNlc3Npb24gaXMgb3Blbi4KLSAg ICBjb250ZXh0LT5lbmREcmF3KCk7Ci0KLSAgICBDT01QdHI8SUQyRDFCaXRtYXBSZW5kZXJUYXJn ZXQ+IGJpdG1hcFJlbmRlclRhcmdldDsKLSAgICBIUkVTVUxUIGhyID0gcGxhdGZvcm1Db250ZXh0 LT5yZW5kZXJUYXJnZXQoKS0+UXVlcnlJbnRlcmZhY2UoJmJpdG1hcFJlbmRlclRhcmdldCk7Ci0g ICAgQVNTRVJUKFNVQ0NFRURFRChocikpOwotCiAgICAgYXV0byBieXRlc1BlclJvd0luRGF0YSA9 IGJhY2tpbmdTdG9yZVNpemUud2lkdGgoKSAqIDQ7CiAKLSAgICBociA9IGJpdG1hcC0+Q29weUZy b21NZW1vcnkobnVsbHB0ciwgZGF0YS5kYXRhKCksIGJ5dGVzUGVyUm93SW5EYXRhKTsKKyAgICBI UkVTVUxUIGhyID0gYml0bWFwLT5Db3B5RnJvbU1lbW9yeShudWxscHRyLCBkYXRhLmRhdGEoKSwg Ynl0ZXNQZXJSb3dJbkRhdGEpOwogICAgIEFTU0VSVChTVUNDRUVERUQoaHIpKTsKIAotICAgIGNv bnRleHQtPmJlZ2luRHJhdygpOwotCiAgICAgYml0bWFwQnVmZmVyU3luYyA9IEJpdG1hcEJ1ZmZl clN5bmM6OkluU3luYzsKIH0KIApJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3Mvd2luL1BhdGhEaXJlY3QyRC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3Mvd2luL1BhdGhEaXJlY3QyRC5jcHAJKHJldmlzaW9uIDI1MDQ5MikKKysr IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9QYXRoRGlyZWN0MkQuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0zNDgsMTQgKzM0OCwxMyBAQCBGbG9hdFJlY3QgUGF0aDo6c3Ryb2tl Qm91bmRpbmdSZWN0KFN0cm9rCiAgICAgaWYgKGlzTnVsbCgpKQogICAgICAgICByZXR1cm4gRmxv YXRSZWN0KCk7CiAKLSAgICBpZiAoIWFwcGxpZXIpCi0gICAgICAgIHJldHVybiBib3VuZGluZ1Jl Y3QoKTsKKyAgICBQbGF0Zm9ybUNvbnRleHREaXJlY3QyRCBzY3JhdGNoQ29udGV4dEQyRChzY3Jh dGNoUmVuZGVyVGFyZ2V0KCkpOworICAgIEdyYXBoaWNzQ29udGV4dCBzY3JhdGNoQ29udGV4dCgm c2NyYXRjaENvbnRleHREMkQsIEdyYXBoaWNzQ29udGV4dDo6Qml0bWFwUmVuZGVyaW5nQ29udGV4 dFR5cGU6OkdQVU1lbW9yeSk7CiAKLSAgICBVTlVTRURfUEFSQU0oYXBwbGllcik7Ci0gICAgbm90 SW1wbGVtZW50ZWQoKTsKKyAgICBpZiAoYXBwbGllcikKKyAgICAgICAgYXBwbGllci0+c3Ryb2tl U3R5bGUoJnNjcmF0Y2hDb250ZXh0KTsKIAotICAgIC8vIEp1c3QgcmV0dXJuIHJlZ3VsYXIgYm91 bmRpbmcgcmVjdCBmb3Igbm93LgotICAgIHJldHVybiBib3VuZGluZ1JlY3QoKTsKKyAgICByZXR1 cm4gZmFzdEJvdW5kaW5nUmVjdEZvclN0cm9rZShzY3JhdGNoQ29udGV4dEQyRCk7CiB9CiAKIHZv aWQgUGF0aDo6b3BlbkZpZ3VyZUF0Q3VycmVudFBvaW50SWZOZWNlc3NhcnkoKQo=