132536 2014-05-03 15:59:49 -0700 RenderSVGResourcePattern should deal in RenderElement&. 2014-05-03 20:43:53 -0700 1 1 1 Unclassified WebKit SVG 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kling kling commit-queue d-r esprehn+autocc fmalita glenn gyuyoung.kim kondapallykalyan pdr schenney sergio zimmermann oldest_to_newest 1006406 0 kling 2014-05-03 15:59:49 -0700 Have patch. 1006407 1 230769 kling 2014-05-03 16:00:13 -0700 Created attachment 230769 Patch 1006459 2 230769 commit-queue 2014-05-03 20:43:48 -0700 Comment on attachment 230769 Patch Clearing flags on attachment: 230769 Committed r168237: <http://trac.webkit.org/changeset/168237> 1006460 3 commit-queue 2014-05-03 20:43:53 -0700 All reviewed patches have been landed. Closing bug. 230769 2014-05-03 16:00:13 -0700 2014-05-03 20:43:48 -0700 Patch bug-132536.diff text/plain 10985 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBmZmYwMTY5Li5iM2U1OTViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjcg QEAKIDIwMTQtMDUtMDMgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgogCisgICAg ICAgIFJlbmRlclNWR1Jlc291cmNlUGF0dGVybiBzaG91bGQgZGVhbCBpbiBSZW5kZXJFbGVtZW50 Ji4KKyAgICAgICAgPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzEzMjUzNj4KKworICAgICAgICBUd2Vh ayBidWlsZFBhdHRlcm4oKSBhbmQgYnVpbGRUaWxlSW1hZ2VUcmFuc2Zvcm0oKSB0byB0YWtlIFJl bmRlckVsZW1lbnQmCisgICAgICAgIGluc3RlYWQgb2YgUmVuZGVyT2JqZWN0KiBzaW5jZSB3ZSBr bm93IHRoYXQgdGhlc2UgZnVuY3Rpb25zIHdpbGwgYWx3YXlzCisgICAgICAgIGJlIGNhbGxlZCB3 aXRoIG5vbi1udWxsIFJlbmRlckVsZW1lbnQgc3ViY2xhc3Nlcy4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHJlbmRlcmluZy9zdmcvUmVuZGVyU1ZH UmVzb3VyY2VDb250YWluZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU1ZHUmVzb3Vy Y2VDb250YWluZXI6OnNob3VsZFRyYW5zZm9ybU9uVGV4dFBhaW50aW5nKToKKyAgICAgICAgKiBy ZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlQ29udGFpbmVyLmg6CisgICAgICAgICogcmVu ZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZUdyYWRpZW50LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlclNWR1Jlc291cmNlR3JhZGllbnQ6OmFwcGx5UmVzb3VyY2UpOgorICAgICAgICAq IHJlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VQYXR0ZXJuLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlclNWR1Jlc291cmNlUGF0dGVybjo6YnVpbGRQYXR0ZXJuKToKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlclNWR1Jlc291cmNlUGF0dGVybjo6YXBwbHlSZXNvdXJjZSk6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJTVkdSZXNvdXJjZVBhdHRlcm46OmJ1aWxkVGlsZUltYWdlVHJh bnNmb3JtKToKKyAgICAgICAgKiByZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlUGF0dGVy bi5oOgorCisyMDE0LTA1LTAzICBBbmRyZWFzIEtsaW5nICA8YWtsaW5nQGFwcGxlLmNvbT4KKwog ICAgICAgICBQYXNzIGFyb3VuZCBSZW5kZXJTdHlsZSBieSBjb25zdC1yZWZlcmVuY2UgaW5zaWRl IFNWR0lubGluZVRleHRCb3guCiAgICAgICAgIDxodHRwczovL3dlYmtpdC5vcmcvYi8xMzI1MzM+ CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVz b3VyY2VDb250YWluZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJT VkdSZXNvdXJjZUNvbnRhaW5lci5jcHAKaW5kZXggM2VlNjRjMC4uMDM2OWM3MiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZUNvbnRhaW5l ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJj ZUNvbnRhaW5lci5jcHAKQEAgLTE4NywyMCArMTg3LDIwIEBAIHZvaWQgUmVuZGVyU1ZHUmVzb3Vy Y2VDb250YWluZXI6OnJlZ2lzdGVyUmVzb3VyY2UoKQogICAgIH0KIH0KIAotYm9vbCBSZW5kZXJT VkdSZXNvdXJjZUNvbnRhaW5lcjo6c2hvdWxkVHJhbnNmb3JtT25UZXh0UGFpbnRpbmcoUmVuZGVy T2JqZWN0KiBvYmplY3QsIEFmZmluZVRyYW5zZm9ybSYgcmVzb3VyY2VUcmFuc2Zvcm0pCitib29s IFJlbmRlclNWR1Jlc291cmNlQ29udGFpbmVyOjpzaG91bGRUcmFuc2Zvcm1PblRleHRQYWludGlu Zyhjb25zdCBSZW5kZXJFbGVtZW50JiByZW5kZXJlciwgQWZmaW5lVHJhbnNmb3JtJiByZXNvdXJj ZVRyYW5zZm9ybSkKIHsKLSAgICBBU1NFUlRfVU5VU0VEKG9iamVjdCwgb2JqZWN0KTsKICNpZiBV U0UoQ0cpCisgICAgVU5VU0VEX1BBUkFNKHJlbmRlcmVyKTsKICAgICBVTlVTRURfUEFSQU0ocmVz b3VyY2VUcmFuc2Zvcm0pOwogICAgIHJldHVybiBmYWxzZTsKICNlbHNlCiAgICAgLy8gVGhpcyBt ZXRob2Qgc2hvdWxkIG9ubHkgYmUgY2FsbGVkIGZvciBSZW5kZXJPYmplY3RzIHRoYXQgZGVhbCB3 aXRoIHRleHQgcmVuZGVyaW5nLiBDbXAuIFJlbmRlck9iamVjdC5oJ3MgaXMqKCkgbWV0aG9kcy4K LSAgICBBU1NFUlQob2JqZWN0LT5pc1NWR1RleHQoKSB8fCBvYmplY3QtPmlzU1ZHVGV4dFBhdGgo KSB8fCBvYmplY3QtPmlzU1ZHSW5saW5lKCkpOworICAgIEFTU0VSVChyZW5kZXJlci5pc1NWR1Rl eHQoKSB8fCByZW5kZXJlci5pc1NWR1RleHRQYXRoKCkgfHwgcmVuZGVyZXIuaXNTVkdJbmxpbmUo KSk7CiAKICAgICAvLyBJbiB0ZXh0IGRyYXdpbmcsIHRoZSBzY2FsaW5nIHBhcnQgb2YgdGhlIGdy YXBoaWNzIGNvbnRleHQgQ1RNIGlzIHJlbW92ZWQsIGNvbXBhcmUgU1ZHSW5saW5lVGV4dEJveDo6 cGFpbnRUZXh0V2l0aFNoYWRvd3MuCiAgICAgLy8gU28sIHdlIHVzZSB0aGF0IHNjYWxpbmcgZmFj dG9yIGhlcmUsIHRvbywgYW5kIHRoZW4gcHVzaCBpdCBkb3duIHRvIHBhdHRlcm4gb3IgZ3JhZGll bnQgc3BhY2UKICAgICAvLyBpbiBvcmRlciB0byBrZWVwIHRoZSBwYXR0ZXJuIG9yIGdyYWRpZW50 IGNvcnJlY3RseSBzY2FsZWQuCi0gICAgZmxvYXQgc2NhbGluZ0ZhY3RvciA9IFNWR1JlbmRlcmlu Z0NvbnRleHQ6OmNhbGN1bGF0ZVNjcmVlbkZvbnRTaXplU2NhbGluZ0ZhY3Rvcigqb2JqZWN0KTsK KyAgICBmbG9hdCBzY2FsaW5nRmFjdG9yID0gU1ZHUmVuZGVyaW5nQ29udGV4dDo6Y2FsY3VsYXRl U2NyZWVuRm9udFNpemVTY2FsaW5nRmFjdG9yKHJlbmRlcmVyKTsKICAgICBpZiAoc2NhbGluZ0Zh Y3RvciA9PSAxKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgcmVzb3VyY2VUcmFuc2Zvcm0u c2NhbGUoc2NhbGluZ0ZhY3Rvcik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlQ29udGFpbmVyLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlQ29udGFpbmVyLmgKaW5kZXggNDI0Yjg2Mi4uNGE4 NzNiNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdS ZXNvdXJjZUNvbnRhaW5lci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVu ZGVyU1ZHUmVzb3VyY2VDb250YWluZXIuaApAQCAtMzcsNyArMzcsNyBAQCBwdWJsaWM6CiAKICAg ICB2aXJ0dWFsIGJvb2wgaXNTVkdSZXNvdXJjZUNvbnRhaW5lcigpIGNvbnN0IG92ZXJyaWRlIGZp bmFsIHsgcmV0dXJuIHRydWU7IH0KIAotICAgIHN0YXRpYyBib29sIHNob3VsZFRyYW5zZm9ybU9u VGV4dFBhaW50aW5nKFJlbmRlck9iamVjdCosIEFmZmluZVRyYW5zZm9ybSYpOworICAgIHN0YXRp YyBib29sIHNob3VsZFRyYW5zZm9ybU9uVGV4dFBhaW50aW5nKGNvbnN0IFJlbmRlckVsZW1lbnQm LCBBZmZpbmVUcmFuc2Zvcm0mKTsKICAgICBzdGF0aWMgQWZmaW5lVHJhbnNmb3JtIHRyYW5zZm9y bU9uTm9uU2NhbGluZ1N0cm9rZShSZW5kZXJPYmplY3QqLCBjb25zdCBBZmZpbmVUcmFuc2Zvcm0m IHJlc291cmNlVHJhbnNmb3JtKTsKIAogICAgIHZvaWQgaWRDaGFuZ2VkKCk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlR3JhZGllbnQu Y3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZUdyYWRp ZW50LmNwcAppbmRleCBmZTE5MGQzLi42MWUxNzVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlR3JhZGllbnQuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VHcmFkaWVudC5jcHAKQEAg LTE1MCw3ICsxNTAsNyBAQCBib29sIFJlbmRlclNWR1Jlc291cmNlR3JhZGllbnQ6OmFwcGx5UmVz b3VyY2UoUmVuZGVyRWxlbWVudCYgcmVuZGVyZXIsIGNvbnN0IFJlbgogICAgICAgICAgICAgLy8g RGVwZW5kaW5nIG9uIGZvbnQgc2NhbGluZyBmYWN0b3IsIHdlIG1heSBuZWVkIHRvIHJlc2NhbGUg dGhlIGdyYWRpZW50IGhlcmUgc2luY2UKICAgICAgICAgICAgIC8vIHRleHQgcGFpbnRpbmcgcmVt b3ZlcyB0aGUgc2NhbGUgZmFjdG9yIGZyb20gdGhlIGNvbnRleHQuCiAgICAgICAgICAgICBBZmZp bmVUcmFuc2Zvcm0gYWRkaXRpb25hbFRleHRUcmFuc2Zvcm07Ci0gICAgICAgICAgICBpZiAoc2hv dWxkVHJhbnNmb3JtT25UZXh0UGFpbnRpbmcoJnJlbmRlcmVyLCBhZGRpdGlvbmFsVGV4dFRyYW5z Zm9ybSkpCisgICAgICAgICAgICBpZiAoc2hvdWxkVHJhbnNmb3JtT25UZXh0UGFpbnRpbmcocmVu ZGVyZXIsIGFkZGl0aW9uYWxUZXh0VHJhbnNmb3JtKSkKICAgICAgICAgICAgICAgICBncmFkaWVu dERhdGEtPnVzZXJzcGFjZVRyYW5zZm9ybSAqPSBhZGRpdGlvbmFsVGV4dFRyYW5zZm9ybTsKICAg ICAgICAgfQogICAgICAgICBncmFkaWVudERhdGEtPmdyYWRpZW50LT5zZXRHcmFkaWVudFNwYWNl VHJhbnNmb3JtKGdyYWRpZW50RGF0YS0+dXNlcnNwYWNlVHJhbnNmb3JtKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VQYXR0ZXJuLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VQYXR0ZXJu LmNwcAppbmRleCBlZjBlNDkxLi5iZmFlN2YyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlUGF0dGVybi5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZVBhdHRlcm4uY3BwCkBAIC01Niw5 ICs1Niw5IEBAIHZvaWQgUmVuZGVyU1ZHUmVzb3VyY2VQYXR0ZXJuOjpyZW1vdmVDbGllbnRGcm9t Q2FjaGUoUmVuZGVyRWxlbWVudCYgY2xpZW50LCBib29sCiAgICAgbWFya0NsaWVudEZvckludmFs aWRhdGlvbihjbGllbnQsIG1hcmtGb3JJbnZhbGlkYXRpb24gPyBSZXBhaW50SW52YWxpZGF0aW9u IDogUGFyZW50T25seUludmFsaWRhdGlvbik7CiB9CiAKLVBhdHRlcm5EYXRhKiBSZW5kZXJTVkdS ZXNvdXJjZVBhdHRlcm46OmJ1aWxkUGF0dGVybihSZW5kZXJPYmplY3QqIG9iamVjdCwgdW5zaWdu ZWQgc2hvcnQgcmVzb3VyY2VNb2RlKQorUGF0dGVybkRhdGEqIFJlbmRlclNWR1Jlc291cmNlUGF0 dGVybjo6YnVpbGRQYXR0ZXJuKFJlbmRlckVsZW1lbnQmIHJlbmRlcmVyLCB1bnNpZ25lZCBzaG9y dCByZXNvdXJjZU1vZGUpCiB7Ci0gICAgUGF0dGVybkRhdGEqIGN1cnJlbnREYXRhID0gbV9wYXR0 ZXJuTWFwLmdldChvYmplY3QpOworICAgIFBhdHRlcm5EYXRhKiBjdXJyZW50RGF0YSA9IG1fcGF0 dGVybk1hcC5nZXQoJnJlbmRlcmVyKTsKICAgICBpZiAoY3VycmVudERhdGEgJiYgY3VycmVudERh dGEtPnBhdHRlcm4pCiAgICAgICAgIHJldHVybiBjdXJyZW50RGF0YTsKIApAQCAtODEsMTEgKzgx LDExIEBAIFBhdHRlcm5EYXRhKiBSZW5kZXJTVkdSZXNvdXJjZVBhdHRlcm46OmJ1aWxkUGF0dGVy bihSZW5kZXJPYmplY3QqIG9iamVjdCwgdW5zaWduCiAgICAgLy8gQ29tcHV0ZSBhbGwgbmVjZXNz YXJ5IHRyYW5zZm9ybWF0aW9ucyB0byBidWlsZCB0aGUgdGlsZSBpbWFnZSAmIHRoZSBwYXR0ZXJu LgogICAgIEZsb2F0UmVjdCB0aWxlQm91bmRhcmllczsKICAgICBBZmZpbmVUcmFuc2Zvcm0gdGls ZUltYWdlVHJhbnNmb3JtOwotICAgIGlmICghYnVpbGRUaWxlSW1hZ2VUcmFuc2Zvcm0ob2JqZWN0 LCBtX2F0dHJpYnV0ZXMsIHBhdHRlcm5FbGVtZW50KCksIHRpbGVCb3VuZGFyaWVzLCB0aWxlSW1h Z2VUcmFuc2Zvcm0pKQorICAgIGlmICghYnVpbGRUaWxlSW1hZ2VUcmFuc2Zvcm0ocmVuZGVyZXIs IG1fYXR0cmlidXRlcywgcGF0dGVybkVsZW1lbnQoKSwgdGlsZUJvdW5kYXJpZXMsIHRpbGVJbWFn ZVRyYW5zZm9ybSkpCiAgICAgICAgIHJldHVybiAwOwogCiAgICAgQWZmaW5lVHJhbnNmb3JtIGFi c29sdXRlVHJhbnNmb3JtSWdub3JpbmdSb3RhdGlvbjsKLSAgICBTVkdSZW5kZXJpbmdDb250ZXh0 OjpjYWxjdWxhdGVUcmFuc2Zvcm1hdGlvblRvT3V0ZXJtb3N0Q29vcmRpbmF0ZVN5c3RlbSgqb2Jq ZWN0LCBhYnNvbHV0ZVRyYW5zZm9ybUlnbm9yaW5nUm90YXRpb24pOworICAgIFNWR1JlbmRlcmlu Z0NvbnRleHQ6OmNhbGN1bGF0ZVRyYW5zZm9ybWF0aW9uVG9PdXRlcm1vc3RDb29yZGluYXRlU3lz dGVtKHJlbmRlcmVyLCBhYnNvbHV0ZVRyYW5zZm9ybUlnbm9yaW5nUm90YXRpb24pOwogCiAgICAg Ly8gSWdub3JlIDJEIHJvdGF0aW9uLCBhcyBpdCBkb2Vzbid0IGFmZmVjdCB0aGUgc2l6ZSBvZiB0 aGUgdGlsZS4KICAgICBTVkdSZW5kZXJpbmdDb250ZXh0OjpjbGVhcjJEUm90YXRpb24oYWJzb2x1 dGVUcmFuc2Zvcm1JZ25vcmluZ1JvdGF0aW9uKTsKQEAgLTEyMSw3ICsxMjEsNyBAQCBQYXR0ZXJu RGF0YSogUmVuZGVyU1ZHUmVzb3VyY2VQYXR0ZXJuOjpidWlsZFBhdHRlcm4oUmVuZGVyT2JqZWN0 KiBvYmplY3QsIHVuc2lnbgogICAgIC8vIEFjY291bnQgZm9yIHRleHQgZHJhd2luZyByZXNldHRp bmcgdGhlIGNvbnRleHQgdG8gbm9uLXNjYWxlZCwgc2VlIFNWR0lubGluZVRleHRCb3g6OnBhaW50 VGV4dFdpdGhTaGFkb3dzLgogICAgIGlmIChyZXNvdXJjZU1vZGUgJiBBcHBseVRvVGV4dE1vZGUp IHsKICAgICAgICAgQWZmaW5lVHJhbnNmb3JtIGFkZGl0aW9uYWxUZXh0VHJhbnNmb3JtYXRpb247 Ci0gICAgICAgIGlmIChzaG91bGRUcmFuc2Zvcm1PblRleHRQYWludGluZyhvYmplY3QsIGFkZGl0 aW9uYWxUZXh0VHJhbnNmb3JtYXRpb24pKQorICAgICAgICBpZiAoc2hvdWxkVHJhbnNmb3JtT25U ZXh0UGFpbnRpbmcocmVuZGVyZXIsIGFkZGl0aW9uYWxUZXh0VHJhbnNmb3JtYXRpb24pKQogICAg ICAgICAgICAgcGF0dGVybkRhdGEtPnRyYW5zZm9ybSAqPSBhZGRpdGlvbmFsVGV4dFRyYW5zZm9y bWF0aW9uOwogICAgIH0KICAgICBwYXR0ZXJuRGF0YS0+cGF0dGVybi0+c2V0UGF0dGVyblNwYWNl VHJhbnNmb3JtKHBhdHRlcm5EYXRhLT50cmFuc2Zvcm0pOwpAQCAtMTI5LDcgKzEyOSw3IEBAIFBh dHRlcm5EYXRhKiBSZW5kZXJTVkdSZXNvdXJjZVBhdHRlcm46OmJ1aWxkUGF0dGVybihSZW5kZXJP YmplY3QqIG9iamVjdCwgdW5zaWduCiAgICAgLy8gVmFyaW91cyBjYWxscyBhYm92ZSBtYXkgdHJp Z2dlciBpbnZhbGlkYXRpb25zIGluIHNvbWUgZnJpbmdlIGNhc2VzIChJbWFnZUJ1ZmZlciBhbGxv Y2F0aW9uCiAgICAgLy8gZmFpbHVyZXMgaW4gdGhlIFNWRyBpbWFnZSBjYWNoZSBmb3IgZXhhbXBs ZSkuIFRvIGF2b2lkIGhhdmluZyBvdXIgUGF0dGVybkRhdGEgZGVsZXRlZCBieQogICAgIC8vIHJl bW92ZUFsbENsaWVudHNGcm9tQ2FjaGUoKSwgd2Ugb25seSBtYWtlIGl0IHZpc2libGUgaW4gdGhl IGNhY2hlIGF0IHRoZSB2ZXJ5IGVuZC4KLSAgICByZXR1cm4gbV9wYXR0ZXJuTWFwLnNldChvYmpl Y3QsIHN0ZDo6bW92ZShwYXR0ZXJuRGF0YSkpLml0ZXJhdG9yLT52YWx1ZS5nZXQoKTsKKyAgICBy ZXR1cm4gbV9wYXR0ZXJuTWFwLnNldCgmcmVuZGVyZXIsIHN0ZDo6bW92ZShwYXR0ZXJuRGF0YSkp Lml0ZXJhdG9yLT52YWx1ZS5nZXQoKTsKIH0KIAogYm9vbCBSZW5kZXJTVkdSZXNvdXJjZVBhdHRl cm46OmFwcGx5UmVzb3VyY2UoUmVuZGVyRWxlbWVudCYgcmVuZGVyZXIsIGNvbnN0IFJlbmRlclN0 eWxlJiBzdHlsZSwgR3JhcGhpY3NDb250ZXh0KiYgY29udGV4dCwgdW5zaWduZWQgc2hvcnQgcmVz b3VyY2VNb2RlKQpAQCAtMTQzLDcgKzE0Myw3IEBAIGJvb2wgUmVuZGVyU1ZHUmVzb3VyY2VQYXR0 ZXJuOjphcHBseVJlc291cmNlKFJlbmRlckVsZW1lbnQmIHJlbmRlcmVyLCBjb25zdCBSZW5kCiAg ICAgaWYgKG1fYXR0cmlidXRlcy5wYXR0ZXJuVW5pdHMoKSA9PSBTVkdVbml0VHlwZXM6OlNWR19V TklUX1RZUEVfT0JKRUNUQk9VTkRJTkdCT1ggJiYgb2JqZWN0Qm91bmRpbmdCb3guaXNFbXB0eSgp KQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBQYXR0ZXJuRGF0YSogcGF0dGVybkRhdGEg PSBidWlsZFBhdHRlcm4oJnJlbmRlcmVyLCByZXNvdXJjZU1vZGUpOworICAgIFBhdHRlcm5EYXRh KiBwYXR0ZXJuRGF0YSA9IGJ1aWxkUGF0dGVybihyZW5kZXJlciwgcmVzb3VyY2VNb2RlKTsKICAg ICBpZiAoIXBhdHRlcm5EYXRhKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKQEAgLTIxMSwxNSAr MjExLDEzIEBAIHN0YXRpYyBpbmxpbmUgRmxvYXRSZWN0IGNhbGN1bGF0ZVBhdHRlcm5Cb3VuZGFy aWVzKGNvbnN0IFBhdHRlcm5BdHRyaWJ1dGVzJiBhdHRyCiAgICAgcmV0dXJuIFNWR0xlbmd0aENv bnRleHQ6OnJlc29sdmVSZWN0YW5nbGUoJnBhdHRlcm5FbGVtZW50LCBhdHRyaWJ1dGVzLnBhdHRl cm5Vbml0cygpLCBvYmplY3RCb3VuZGluZ0JveCwgYXR0cmlidXRlcy54KCksIGF0dHJpYnV0ZXMu eSgpLCBhdHRyaWJ1dGVzLndpZHRoKCksIGF0dHJpYnV0ZXMuaGVpZ2h0KCkpOwogfQogCi1ib29s IFJlbmRlclNWR1Jlc291cmNlUGF0dGVybjo6YnVpbGRUaWxlSW1hZ2VUcmFuc2Zvcm0oUmVuZGVy T2JqZWN0KiByZW5kZXJlciwKK2Jvb2wgUmVuZGVyU1ZHUmVzb3VyY2VQYXR0ZXJuOjpidWlsZFRp bGVJbWFnZVRyYW5zZm9ybShSZW5kZXJFbGVtZW50JiByZW5kZXJlciwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBQYXR0ZXJuQXR0 cmlidXRlcyYgYXR0cmlidXRlcywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBjb25zdCBTVkdQYXR0ZXJuRWxlbWVudCYgcGF0dGVybkVsZW1l bnQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgRmxvYXRSZWN0JiBwYXR0ZXJuQm91bmRhcmllcywKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBBZmZpbmVUcmFuc2Zvcm0mIHRpbGVJbWFn ZVRyYW5zZm9ybSkgY29uc3QKIHsKLSAgICBBU1NFUlQocmVuZGVyZXIpOwotCi0gICAgRmxvYXRS ZWN0IG9iamVjdEJvdW5kaW5nQm94ID0gcmVuZGVyZXItPm9iamVjdEJvdW5kaW5nQm94KCk7Cisg ICAgRmxvYXRSZWN0IG9iamVjdEJvdW5kaW5nQm94ID0gcmVuZGVyZXIub2JqZWN0Qm91bmRpbmdC b3goKTsKICAgICBwYXR0ZXJuQm91bmRhcmllcyA9IGNhbGN1bGF0ZVBhdHRlcm5Cb3VuZGFyaWVz KGF0dHJpYnV0ZXMsIG9iamVjdEJvdW5kaW5nQm94LCBwYXR0ZXJuRWxlbWVudCk7IAogICAgIGlm IChwYXR0ZXJuQm91bmRhcmllcy53aWR0aCgpIDw9IDAgfHwgcGF0dGVybkJvdW5kYXJpZXMuaGVp Z2h0KCkgPD0gMCkKICAgICAgICAgcmV0dXJuIGZhbHNlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZVBhdHRlcm4uaCBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VQYXR0ZXJuLmgKaW5kZXggZmMz MzhmZC4uZjY2ZDU1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9S ZW5kZXJTVkdSZXNvdXJjZVBhdHRlcm4uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv c3ZnL1JlbmRlclNWR1Jlc291cmNlUGF0dGVybi5oCkBAIC01OCwxNSArNTgsMTUgQEAgcHJpdmF0 ZToKICAgICB2b2lkIGVsZW1lbnQoKSBjb25zdCA9IGRlbGV0ZTsKICAgICB2aXJ0dWFsIGNvbnN0 IGNoYXIqIHJlbmRlck5hbWUoKSBjb25zdCBvdmVycmlkZSB7IHJldHVybiAiUmVuZGVyU1ZHUmVz b3VyY2VQYXR0ZXJuIjsgfQogCi0gICAgYm9vbCBidWlsZFRpbGVJbWFnZVRyYW5zZm9ybShSZW5k ZXJPYmplY3QqLCBjb25zdCBQYXR0ZXJuQXR0cmlidXRlcyYsIGNvbnN0IFNWR1BhdHRlcm5FbGVt ZW50JiwgRmxvYXRSZWN0JiBwYXR0ZXJuQm91bmRhcmllcywgQWZmaW5lVHJhbnNmb3JtJiB0aWxl SW1hZ2VUcmFuc2Zvcm0pIGNvbnN0OworICAgIGJvb2wgYnVpbGRUaWxlSW1hZ2VUcmFuc2Zvcm0o UmVuZGVyRWxlbWVudCYsIGNvbnN0IFBhdHRlcm5BdHRyaWJ1dGVzJiwgY29uc3QgU1ZHUGF0dGVy bkVsZW1lbnQmLCBGbG9hdFJlY3QmIHBhdHRlcm5Cb3VuZGFyaWVzLCBBZmZpbmVUcmFuc2Zvcm0m IHRpbGVJbWFnZVRyYW5zZm9ybSkgY29uc3Q7CiAKICAgICBzdGQ6OnVuaXF1ZV9wdHI8SW1hZ2VC dWZmZXI+IGNyZWF0ZVRpbGVJbWFnZShjb25zdCBQYXR0ZXJuQXR0cmlidXRlcyYsIGNvbnN0IEZs b2F0UmVjdCYgdGlsZUJvdW5kYXJpZXMsIGNvbnN0IEZsb2F0UmVjdCYgYWJzb2x1dGVUaWxlQm91 bmRhcmllcywgY29uc3QgQWZmaW5lVHJhbnNmb3JtJiB0aWxlSW1hZ2VUcmFuc2Zvcm0sIEZsb2F0 UmVjdCYgY2xhbXBlZEFic29sdXRlVGlsZUJvdW5kYXJpZXMpIGNvbnN0OwogCi0gICAgUGF0dGVy bkRhdGEqIGJ1aWxkUGF0dGVybihSZW5kZXJPYmplY3QqLCB1bnNpZ25lZCBzaG9ydCByZXNvdXJj ZU1vZGUpOworICAgIFBhdHRlcm5EYXRhKiBidWlsZFBhdHRlcm4oUmVuZGVyRWxlbWVudCYsIHVu c2lnbmVkIHNob3J0IHJlc291cmNlTW9kZSk7CiAKICAgICBib29sIG1fc2hvdWxkQ29sbGVjdFBh dHRlcm5BdHRyaWJ1dGVzIDogMTsKICAgICBQYXR0ZXJuQXR0cmlidXRlcyBtX2F0dHJpYnV0ZXM7 Ci0gICAgSGFzaE1hcDxSZW5kZXJPYmplY3QqLCBzdGQ6OnVuaXF1ZV9wdHI8UGF0dGVybkRhdGE+ PiBtX3BhdHRlcm5NYXA7CisgICAgSGFzaE1hcDxSZW5kZXJFbGVtZW50Kiwgc3RkOjp1bmlxdWVf cHRyPFBhdHRlcm5EYXRhPj4gbV9wYXR0ZXJuTWFwOwogfTsKIAogfQo=