121293 2013-09-13 05:01:49 -0700 [CTTE] RenderSVGRoot always has a SVGSVGElement. 2013-09-13 05:23:52 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kling kling commit-queue d-r esprehn+autocc fmalita glenn kling kondapallykalyan pdr schenney oldest_to_newest 928773 0 kling 2013-09-13 05:01:49 -0700 [CTTE] RenderSVGRoot always has a SVGSVGElement. 928774 1 211539 kling 2013-09-13 05:02:16 -0700 Created attachment 211539 Patch 928775 2 211539 koivisto 2013-09-13 05:06:10 -0700 Comment on attachment 211539 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=211539&action=review > Source/WebCore/rendering/svg/RenderSVGRoot.h:42 > + SVGSVGElement& svgElement() const; svgSVGElement? 928791 3 kling 2013-09-13 05:23:52 -0700 Committed r155690: <http://trac.webkit.org/changeset/155690> 211539 2013-09-13 05:02:16 -0700 2013-09-13 05:06:10 -0700 Patch bug-121293.diff text/plain 12070 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBhMzEyNjc0Li5hNmMyNDM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTUg QEAKIDIwMTMtMDktMTMgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgogCisgICAg ICAgIFtDVFRFXSBSZW5kZXJTVkdSb290IGFsd2F5cyBoYXMgYSBTVkdTVkdFbGVtZW50LgorICAg ICAgICA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMTIxMjkzPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgcmVuZGVyZXIgaXMgbmV2ZXIgYW5vbnlt b3VzLCBhbmQgYWx3YXlzIGhhcyBhIGNvcnJlc3BvbmRpbmcgPHN2Zz4gZWxlbWVudC4KKyAgICAg ICAgVGlnaHRlbiB0aGlzIHVwIGFuZCByZW1vdmUgc29tZSBwb2ludGxlc3MgbnVsbCBjaGVja3Mg YW5kIGFzc2VydGlvbnMuCisKKzIwMTMtMDktMTMgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBw bGUuY29tPgorCiAgICAgICAgIFtDVFRFXSBSZW5kZXJNdWx0aUNvbHVtbkJsb2NrIGlzIG5ldmVy IGFub255bW91cy4KICAgICAgICAgPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzEyMTI5Mj4KIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSb290LmNwcCBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUm9vdC5jcHAKaW5kZXggM2Vk NTU3OS4uMjVhOGY4YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9S ZW5kZXJTVkdSb290LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRl clNWR1Jvb3QuY3BwCkBAIC01Niw4ICs1Niw4IEBAIHVzaW5nIG5hbWVzcGFjZSBzdGQ7CiAKIG5h bWVzcGFjZSBXZWJDb3JlIHsKIAotUmVuZGVyU1ZHUm9vdDo6UmVuZGVyU1ZHUm9vdChTVkdFbGVt ZW50KiBub2RlKQotICAgIDogUmVuZGVyUmVwbGFjZWQobm9kZSkKK1JlbmRlclNWR1Jvb3Q6OlJl bmRlclNWR1Jvb3QoU1ZHU1ZHRWxlbWVudCYgZWxlbWVudCkKKyAgICA6IFJlbmRlclJlcGxhY2Vk KCZlbGVtZW50KQogICAgICwgbV9vYmplY3RCb3VuZGluZ0JveFZhbGlkKGZhbHNlKQogICAgICwg bV9pc0xheW91dFNpemVDaGFuZ2VkKGZhbHNlKQogICAgICwgbV9uZWVkc0JvdW5kYXJpZXNPclRy YW5zZm9ybVVwZGF0ZSh0cnVlKQpAQCAtNjksNiArNjksMTEgQEAgUmVuZGVyU1ZHUm9vdDo6flJl bmRlclNWR1Jvb3QoKQogewogfQogCitTVkdTVkdFbGVtZW50JiBSZW5kZXJTVkdSb290OjpzdmdF bGVtZW50KCkgY29uc3QKK3sKKyAgICByZXR1cm4gdG9TVkdTVkdFbGVtZW50KCpSZW5kZXJSZXBs YWNlZDo6ZWxlbWVudCgpKTsKK30KKwogdm9pZCBSZW5kZXJTVkdSb290Ojpjb21wdXRlSW50cmlu c2ljUmF0aW9JbmZvcm1hdGlvbihGbG9hdFNpemUmIGludHJpbnNpY1NpemUsIGRvdWJsZSYgaW50 cmluc2ljUmF0aW8sIGJvb2wmIGlzUGVyY2VudGFnZUludHJpbnNpY1NpemUpIGNvbnN0CiB7CiAg ICAgLy8gU3BlYzogaHR0cDovL3d3dy53My5vcmcvVFIvU1ZHL2Nvb3Jkcy5odG1sI0ludHJpbnNp Y1NpemluZwpAQCAtNzgsMTAgKzgzLDggQEAgdm9pZCBSZW5kZXJTVkdSb290Ojpjb21wdXRlSW50 cmluc2ljUmF0aW9JbmZvcm1hdGlvbihGbG9hdFNpemUmIGludHJpbnNpY1NpemUsIGQKICAgICAv LyB0aGUgc2FtZSBhcyB0aGUgQ1NTIHdpZHRoIGFuZCBoZWlnaHQgcHJvcGVydGllcy4gU3BlY2lm aWNhbGx5LCBwZXJjZW50YWdlIHZhbHVlcyBkbyBub3QgcHJvdmlkZSBhbiBpbnRyaW5zaWMgd2lk dGggb3IgaGVpZ2h0LAogICAgIC8vIGFuZCBkbyBub3QgaW5kaWNhdGUgYSBwZXJjZW50YWdlIG9m IHRoZSBjb250YWluaW5nIGJsb2NrLiBSYXRoZXIsIG9uY2UgdGhlIHZpZXdwb3J0IGlzIGVzdGFi bGlzaGVkLCB0aGV5IGluZGljYXRlIHRoZSBwb3J0aW9uCiAgICAgLy8gb2YgdGhlIHZpZXdwb3J0 IHRoYXQgaXMgYWN0dWFsbHkgY292ZXJlZCBieSBpbWFnZSBkYXRhLgotICAgIFNWR1NWR0VsZW1l bnQqIHN2ZyA9IHRvU1ZHU1ZHRWxlbWVudChlbGVtZW50KCkpOwotICAgIEFTU0VSVChzdmcpOwot ICAgIExlbmd0aCBpbnRyaW5zaWNXaWR0aEF0dHJpYnV0ZSA9IHN2Zy0+aW50cmluc2ljV2lkdGgo U1ZHU1ZHRWxlbWVudDo6SWdub3JlQ1NTUHJvcGVydGllcyk7Ci0gICAgTGVuZ3RoIGludHJpbnNp Y0hlaWdodEF0dHJpYnV0ZSA9IHN2Zy0+aW50cmluc2ljSGVpZ2h0KFNWR1NWR0VsZW1lbnQ6Okln bm9yZUNTU1Byb3BlcnRpZXMpOworICAgIExlbmd0aCBpbnRyaW5zaWNXaWR0aEF0dHJpYnV0ZSA9 IHN2Z0VsZW1lbnQoKS5pbnRyaW5zaWNXaWR0aChTVkdTVkdFbGVtZW50OjpJZ25vcmVDU1NQcm9w ZXJ0aWVzKTsKKyAgICBMZW5ndGggaW50cmluc2ljSGVpZ2h0QXR0cmlidXRlID0gc3ZnRWxlbWVu dCgpLmludHJpbnNpY0hlaWdodChTVkdTVkdFbGVtZW50OjpJZ25vcmVDU1NQcm9wZXJ0aWVzKTsK IAogICAgIC8vIFRoZSBpbnRyaW5zaWMgYXNwZWN0IHJhdGlvIG9mIHRoZSB2aWV3cG9ydCBvZiBT VkcgY29udGVudCBpcyBuZWNlc3NhcnkgZm9yIGV4YW1wbGUsIHdoZW4gaW5jbHVkaW5nIFNWRyBm cm9tIGFuIOKAmG9iamVjdOKAmQogICAgIC8vIGVsZW1lbnQgaW4gSFRNTCBzdHlsZWQgd2l0aCBD U1MuIEl0IGlzIHBvc3NpYmxlIChpbmRlZWQsIGNvbW1vbikgZm9yIGFuIFNWRyBncmFwaGljIHRv IGhhdmUgYW4gaW50cmluc2ljIGFzcGVjdCByYXRpbyBidXQKQEAgLTEwNCw3ICsxMDcsNyBAQCB2 b2lkIFJlbmRlclNWR1Jvb3Q6OmNvbXB1dGVJbnRyaW5zaWNSYXRpb0luZm9ybWF0aW9uKEZsb2F0 U2l6ZSYgaW50cmluc2ljU2l6ZSwgZAogICAgIC8vICAgYXNwZWN0IHJhdGlvIGlzIGNhbGN1bGF0 ZWQgZnJvbSB0aGUgd2lkdGggYW5kIGhlaWdodCB2YWx1ZXMgb2YgdGhlIOKAmHZpZXdCb3jigJkg c3BlY2lmaWVkIGZvciB0aGUgY3VycmVudCBTVkcgZG9jdW1lbnQKICAgICAvLyAgIGZyYWdtZW50 LiBJZiB0aGUg4oCYdmlld0JveOKAmSBpcyBub3QgY29ycmVjdGx5IHNwZWNpZmllZCwgb3Igc2V0 IHRvICdub25lJywgdGhlIGludHJpbnNpYyBhc3BlY3QgcmF0aW8gY2Fubm90IGJlCiAgICAgLy8g ICBjYWxjdWxhdGVkIGFuZCBpcyBjb25zaWRlcmVkIHVuc3BlY2lmaWVkLgotICAgIGludHJpbnNp Y1NpemUgPSBzdmctPnZpZXdCb3goKS5zaXplKCk7CisgICAgaW50cmluc2ljU2l6ZSA9IHN2Z0Vs ZW1lbnQoKS52aWV3Qm94KCkuc2l6ZSgpOwogICAgIGlmICghaW50cmluc2ljU2l6ZS5pc0VtcHR5 KCkpIHsKICAgICAgICAgLy8gVGhlIHZpZXdCb3ggY2FuIG9ubHkgeWllbGQgYW4gaW50cmluc2lj IHJhdGlvLCBub3QgYW4gaW50cmluc2ljIHNpemUuCiAgICAgICAgIGludHJpbnNpY1JhdGlvID0g aW50cmluc2ljU2l6ZS53aWR0aCgpIC8gc3RhdGljX2Nhc3Q8ZG91YmxlPihpbnRyaW5zaWNTaXpl LmhlaWdodCgpKTsKQEAgLTEyMiwxNiArMTI1LDExIEBAIHZvaWQgUmVuZGVyU1ZHUm9vdDo6Y29t cHV0ZUludHJpbnNpY1JhdGlvSW5mb3JtYXRpb24oRmxvYXRTaXplJiBpbnRyaW5zaWNTaXplLCBk CiAKIGJvb2wgUmVuZGVyU1ZHUm9vdDo6aXNFbWJlZGRlZFRocm91Z2hTVkdJbWFnZSgpIGNvbnN0 CiB7Ci0gICAgaWYgKCFlbGVtZW50KCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICByZXR1 cm4gaXNJblNWR0ltYWdlKHRvU1ZHU1ZHRWxlbWVudChlbGVtZW50KCkpKTsKKyAgICByZXR1cm4g aXNJblNWR0ltYWdlKCZzdmdFbGVtZW50KCkpOwogfQogCiBib29sIFJlbmRlclNWR1Jvb3Q6Omlz RW1iZWRkZWRUaHJvdWdoRnJhbWVDb250YWluaW5nU1ZHRG9jdW1lbnQoKSBjb25zdAogewotICAg IGlmICghZWxlbWVudCgpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KICAgICAvLyBJZiBvdXIg ZnJhbWUgaGFzIGFuIG93bmVyIHJlbmRlcmVyLCB3ZSdyZSBlbWJlZGRlZCB0aHJvdWdoIGVnLiBv YmplY3QvZW1iZWQvaWZyYW1lLAogICAgIC8vIGJ1dCB3ZSBvbmx5IG5lZ290aWF0ZSBpZiB3ZSdy ZSBpbiBhbiBTVkcgZG9jdW1lbnQuCiAgICAgaWYgKCFmcmFtZSgpLm93bmVyUmVuZGVyZXIoKSkK QEAgLTE0Niw5ICsxNDQsNiBAQCBzdGF0aWMgaW5saW5lIExheW91dFVuaXQgcmVzb2x2ZUxlbmd0 aEF0dHJpYnV0ZUZvclNWRyhjb25zdCBMZW5ndGgmIGxlbmd0aCwgZmxvYQogCiBMYXlvdXRVbml0 IFJlbmRlclNWR1Jvb3Q6OmNvbXB1dGVSZXBsYWNlZExvZ2ljYWxXaWR0aChTaG91bGRDb21wdXRl UHJlZmVycmVkIHNob3VsZENvbXB1dGVQcmVmZXJyZWQpIGNvbnN0CiB7Ci0gICAgU1ZHU1ZHRWxl bWVudCogc3ZnID0gdG9TVkdTVkdFbGVtZW50KGVsZW1lbnQoKSk7Ci0gICAgQVNTRVJUKHN2Zyk7 Ci0KICAgICAvLyBXaGVuIHdlJ3JlIGVtYmVkZGVkIHRocm91Z2ggU1ZHSW1hZ2UgKGJvcmRlci1p bWFnZS9iYWNrZ3JvdW5kLWltYWdlLzxodG1sOmltZz4vLi4uKSB3ZSdyZSBmb3JjZWQgdG8gcmVz aXplIHRvIGEgc3BlY2lmaWMgc2l6ZS4KICAgICBpZiAoIW1fY29udGFpbmVyU2l6ZS5pc0VtcHR5 KCkpCiAgICAgICAgIHJldHVybiBtX2NvbnRhaW5lclNpemUud2lkdGgoKTsKQEAgLTE1Niw4ICsx NTEsOCBAQCBMYXlvdXRVbml0IFJlbmRlclNWR1Jvb3Q6OmNvbXB1dGVSZXBsYWNlZExvZ2ljYWxX aWR0aChTaG91bGRDb21wdXRlUHJlZmVycmVkIHNobwogICAgIGlmIChzdHlsZSgpLT5sb2dpY2Fs V2lkdGgoKS5pc1NwZWNpZmllZCgpIHx8IHN0eWxlKCktPmxvZ2ljYWxNYXhXaWR0aCgpLmlzU3Bl Y2lmaWVkKCkpCiAgICAgICAgIHJldHVybiBSZW5kZXJSZXBsYWNlZDo6Y29tcHV0ZVJlcGxhY2Vk TG9naWNhbFdpZHRoKHNob3VsZENvbXB1dGVQcmVmZXJyZWQpOwogCi0gICAgaWYgKHN2Zy0+d2lk dGhBdHRyaWJ1dGVFc3RhYmxpc2hlc1ZpZXdwb3J0KCkpCi0gICAgICAgIHJldHVybiByZXNvbHZl TGVuZ3RoQXR0cmlidXRlRm9yU1ZHKHN2Zy0+aW50cmluc2ljV2lkdGgoU1ZHU1ZHRWxlbWVudDo6 SWdub3JlQ1NTUHJvcGVydGllcyksIHN0eWxlKCktPmVmZmVjdGl2ZVpvb20oKSwgY29udGFpbmlu Z0Jsb2NrKCktPmF2YWlsYWJsZUxvZ2ljYWxXaWR0aCgpLCAmdmlldygpKTsKKyAgICBpZiAoc3Zn RWxlbWVudCgpLndpZHRoQXR0cmlidXRlRXN0YWJsaXNoZXNWaWV3cG9ydCgpKQorICAgICAgICBy ZXR1cm4gcmVzb2x2ZUxlbmd0aEF0dHJpYnV0ZUZvclNWRyhzdmdFbGVtZW50KCkuaW50cmluc2lj V2lkdGgoU1ZHU1ZHRWxlbWVudDo6SWdub3JlQ1NTUHJvcGVydGllcyksIHN0eWxlKCktPmVmZmVj dGl2ZVpvb20oKSwgY29udGFpbmluZ0Jsb2NrKCktPmF2YWlsYWJsZUxvZ2ljYWxXaWR0aCgpLCAm dmlldygpKTsKIAogICAgIC8vIFNWRyBlbWJlZGRlZCB0aHJvdWdoIG9iamVjdC9lbWJlZC9pZnJh bWUuCiAgICAgaWYgKGlzRW1iZWRkZWRUaHJvdWdoRnJhbWVDb250YWluaW5nU1ZHRG9jdW1lbnQo KSkKQEAgLTE2OSw5ICsxNjQsNiBAQCBMYXlvdXRVbml0IFJlbmRlclNWR1Jvb3Q6OmNvbXB1dGVS ZXBsYWNlZExvZ2ljYWxXaWR0aChTaG91bGRDb21wdXRlUHJlZmVycmVkIHNobwogCiBMYXlvdXRV bml0IFJlbmRlclNWR1Jvb3Q6OmNvbXB1dGVSZXBsYWNlZExvZ2ljYWxIZWlnaHQoKSBjb25zdAog ewotICAgIFNWR1NWR0VsZW1lbnQqIHN2ZyA9IHRvU1ZHU1ZHRWxlbWVudChlbGVtZW50KCkpOwot ICAgIEFTU0VSVChzdmcpOwotCiAgICAgLy8gV2hlbiB3ZSdyZSBlbWJlZGRlZCB0aHJvdWdoIFNW R0ltYWdlIChib3JkZXItaW1hZ2UvYmFja2dyb3VuZC1pbWFnZS88aHRtbDppbWc+Ly4uLikgd2Un cmUgZm9yY2VkIHRvIHJlc2l6ZSB0byBhIHNwZWNpZmljIHNpemUuCiAgICAgaWYgKCFtX2NvbnRh aW5lclNpemUuaXNFbXB0eSgpKQogICAgICAgICByZXR1cm4gbV9jb250YWluZXJTaXplLmhlaWdo dCgpOwpAQCAtMTc5LDggKzE3MSw4IEBAIExheW91dFVuaXQgUmVuZGVyU1ZHUm9vdDo6Y29tcHV0 ZVJlcGxhY2VkTG9naWNhbEhlaWdodCgpIGNvbnN0CiAgICAgaWYgKHN0eWxlKCktPmxvZ2ljYWxI ZWlnaHQoKS5pc1NwZWNpZmllZCgpIHx8IHN0eWxlKCktPmxvZ2ljYWxNYXhIZWlnaHQoKS5pc1Nw ZWNpZmllZCgpKQogICAgICAgICByZXR1cm4gUmVuZGVyUmVwbGFjZWQ6OmNvbXB1dGVSZXBsYWNl ZExvZ2ljYWxIZWlnaHQoKTsKIAotICAgIGlmIChzdmctPmhlaWdodEF0dHJpYnV0ZUVzdGFibGlz aGVzVmlld3BvcnQoKSkgewotICAgICAgICBMZW5ndGggaGVpZ2h0ID0gc3ZnLT5pbnRyaW5zaWNI ZWlnaHQoU1ZHU1ZHRWxlbWVudDo6SWdub3JlQ1NTUHJvcGVydGllcyk7CisgICAgaWYgKHN2Z0Vs ZW1lbnQoKS5oZWlnaHRBdHRyaWJ1dGVFc3RhYmxpc2hlc1ZpZXdwb3J0KCkpIHsKKyAgICAgICAg TGVuZ3RoIGhlaWdodCA9IHN2Z0VsZW1lbnQoKS5pbnRyaW5zaWNIZWlnaHQoU1ZHU1ZHRWxlbWVu dDo6SWdub3JlQ1NTUHJvcGVydGllcyk7CiAgICAgICAgIGlmIChoZWlnaHQuaXNQZXJjZW50KCkp IHsKICAgICAgICAgICAgIFJlbmRlckJsb2NrKiBjYiA9IGNvbnRhaW5pbmdCbG9jaygpOwogICAg ICAgICAgICAgQVNTRVJUKGNiKTsKQEAgLTIyMCw5ICsyMTIsNyBAQCB2b2lkIFJlbmRlclNWR1Jv b3Q6OmxheW91dCgpCiAgICAgdXBkYXRlTG9naWNhbEhlaWdodCgpOwogICAgIGJ1aWxkTG9jYWxU b0JvcmRlckJveFRyYW5zZm9ybSgpOwogCi0gICAgU1ZHU1ZHRWxlbWVudCogc3ZnID0gdG9TVkdT VkdFbGVtZW50KGVsZW1lbnQoKSk7Ci0gICAgQVNTRVJUKHN2Zyk7Ci0gICAgbV9pc0xheW91dFNp emVDaGFuZ2VkID0gbmVlZHNMYXlvdXQgfHwgKHN2Zy0+aGFzUmVsYXRpdmVMZW5ndGhzKCkgJiYg b2xkU2l6ZSAhPSBzaXplKCkpOworICAgIG1faXNMYXlvdXRTaXplQ2hhbmdlZCA9IG5lZWRzTGF5 b3V0IHx8IChzdmdFbGVtZW50KCkuaGFzUmVsYXRpdmVMZW5ndGhzKCkgJiYgb2xkU2l6ZSAhPSBz aXplKCkpOwogICAgIFNWR1JlbmRlclN1cHBvcnQ6OmxheW91dENoaWxkcmVuKHRoaXMsIG5lZWRz TGF5b3V0IHx8IFNWR1JlbmRlclN1cHBvcnQ6OmZpbHRlcnNGb3JjZUNvbnRhaW5lckxheW91dCh0 aGlzKSk7CiAKICAgICBpZiAoIW1fcmVzb3VyY2VzTmVlZGluZ1RvSW52YWxpZGF0ZUNsaWVudHMu aXNFbXB0eSgpKSB7CkBAIC0yNjEsOSArMjUxLDcgQEAgdm9pZCBSZW5kZXJTVkdSb290OjpwYWlu dFJlcGxhY2VkKFBhaW50SW5mbyYgcGFpbnRJbmZvLCBjb25zdCBMYXlvdXRQb2ludCYgcGFpbnQK IAogICAgIC8vIEFuIGVtcHR5IHZpZXdCb3ggYWxzbyBkaXNhYmxlcyByZW5kZXJpbmcuCiAgICAg Ly8gKGh0dHA6Ly93d3cudzMub3JnL1RSL1NWRy9jb29yZHMuaHRtbCNWaWV3Qm94QXR0cmlidXRl KQotICAgIFNWR1NWR0VsZW1lbnQqIHN2ZyA9IHRvU1ZHU1ZHRWxlbWVudChlbGVtZW50KCkpOwot ICAgIEFTU0VSVChzdmcpOwotICAgIGlmIChzdmctPmhhc0VtcHR5Vmlld0JveCgpKQorICAgIGlm IChzdmdFbGVtZW50KCkuaGFzRW1wdHlWaWV3Qm94KCkpCiAgICAgICAgIHJldHVybjsKIAogICAg IFBhZ2UqIHBhZ2UgPSBmcmFtZSgpLnBhZ2UoKTsKQEAgLTM0NywxMiArMzM1LDEwIEBAIHZvaWQg UmVuZGVyU1ZHUm9vdDo6cmVtb3ZlQ2hpbGQoUmVuZGVyT2JqZWN0KiBjaGlsZCkKIC8vIHJlbGF0 aXZlIHRvIG91ciBib3JkZXJCb3ggb3JpZ2luLiAgVGhpcyBtZXRob2QgZ2l2ZXMgdXMgZXhhY3Rs eSB0aGF0Lgogdm9pZCBSZW5kZXJTVkdSb290OjpidWlsZExvY2FsVG9Cb3JkZXJCb3hUcmFuc2Zv cm0oKQogewotICAgIFNWR1NWR0VsZW1lbnQqIHN2ZyA9IHRvU1ZHU1ZHRWxlbWVudChlbGVtZW50 KCkpOwotICAgIEFTU0VSVChzdmcpOwogICAgIGZsb2F0IHNjYWxlID0gc3R5bGUoKS0+ZWZmZWN0 aXZlWm9vbSgpOwotICAgIFNWR1BvaW50IHRyYW5zbGF0ZSA9IHN2Zy0+Y3VycmVudFRyYW5zbGF0 ZSgpOworICAgIFNWR1BvaW50IHRyYW5zbGF0ZSA9IHN2Z0VsZW1lbnQoKS5jdXJyZW50VHJhbnNs YXRlKCk7CiAgICAgTGF5b3V0U2l6ZSBib3JkZXJBbmRQYWRkaW5nKGJvcmRlckxlZnQoKSArIHBh ZGRpbmdMZWZ0KCksIGJvcmRlclRvcCgpICsgcGFkZGluZ1RvcCgpKTsKLSAgICBtX2xvY2FsVG9C b3JkZXJCb3hUcmFuc2Zvcm0gPSBzdmctPnZpZXdCb3hUb1ZpZXdUcmFuc2Zvcm0oY29udGVudFdp ZHRoKCkgLyBzY2FsZSwgY29udGVudEhlaWdodCgpIC8gc2NhbGUpOworICAgIG1fbG9jYWxUb0Jv cmRlckJveFRyYW5zZm9ybSA9IHN2Z0VsZW1lbnQoKS52aWV3Qm94VG9WaWV3VHJhbnNmb3JtKGNv bnRlbnRXaWR0aCgpIC8gc2NhbGUsIGNvbnRlbnRIZWlnaHQoKSAvIHNjYWxlKTsKICAgICBpZiAo Ym9yZGVyQW5kUGFkZGluZy5pc0VtcHR5KCkgJiYgc2NhbGUgPT0gMSAmJiB0cmFuc2xhdGUgPT0g U1ZHUG9pbnQ6Onplcm8oKSkKICAgICAgICAgcmV0dXJuOwogICAgIG1fbG9jYWxUb0JvcmRlckJv eFRyYW5zZm9ybSA9IEFmZmluZVRyYW5zZm9ybShzY2FsZSwgMCwgMCwgc2NhbGUsIGJvcmRlckFu ZFBhZGRpbmcud2lkdGgoKSArIHRyYW5zbGF0ZS54KCksIGJvcmRlckFuZFBhZGRpbmcuaGVpZ2h0 KCkgKyB0cmFuc2xhdGUueSgpKSAqIG1fbG9jYWxUb0JvcmRlckJveFRyYW5zZm9ybTsKQEAgLTQ0 Nyw3ICs0MzMsNyBAQCBib29sIFJlbmRlclNWR1Jvb3Q6Om5vZGVBdFBvaW50KGNvbnN0IEhpdFRl c3RSZXF1ZXN0JiByZXF1ZXN0LCBIaXRUZXN0UmVzdWx0JiByZQogICAgICAgICBMYXlvdXRSZWN0 IGJvdW5kc1JlY3QoYWNjdW11bGF0ZWRPZmZzZXQgKyBsb2NhdGlvbigpLCBzaXplKCkpOwogICAg ICAgICBpZiAobG9jYXRpb25JbkNvbnRhaW5lci5pbnRlcnNlY3RzKGJvdW5kc1JlY3QpKSB7CiAg ICAgICAgICAgICB1cGRhdGVIaXRUZXN0UmVzdWx0KHJlc3VsdCwgcG9pbnRJbkJvcmRlckJveCk7 Ci0gICAgICAgICAgICBpZiAoIXJlc3VsdC5hZGROb2RlVG9SZWN0QmFzZWRUZXN0UmVzdWx0KGVs ZW1lbnQoKSwgcmVxdWVzdCwgbG9jYXRpb25JbkNvbnRhaW5lciwgYm91bmRzUmVjdCkpCisgICAg ICAgICAgICBpZiAoIXJlc3VsdC5hZGROb2RlVG9SZWN0QmFzZWRUZXN0UmVzdWx0KCZzdmdFbGVt ZW50KCksIHJlcXVlc3QsIGxvY2F0aW9uSW5Db250YWluZXIsIGJvdW5kc1JlY3QpKQogICAgICAg ICAgICAgICAgIHJldHVybiB0cnVlOwogICAgICAgICB9CiAgICAgfQpAQCAtNDU3LDI1ICs0NDMs MTcgQEAgYm9vbCBSZW5kZXJTVkdSb290Ojpub2RlQXRQb2ludChjb25zdCBIaXRUZXN0UmVxdWVz dCYgcmVxdWVzdCwgSGl0VGVzdFJlc3VsdCYgcmUKIAogYm9vbCBSZW5kZXJTVkdSb290OjpoYXNS ZWxhdGl2ZURpbWVuc2lvbnMoKSBjb25zdAogewotICAgIFNWR1NWR0VsZW1lbnQqIHN2ZyA9IHRv U1ZHU1ZHRWxlbWVudChlbGVtZW50KCkpOwotICAgIEFTU0VSVChzdmcpOwotCi0gICAgcmV0dXJu IHN2Zy0+aW50cmluc2ljSGVpZ2h0KFNWR1NWR0VsZW1lbnQ6Oklnbm9yZUNTU1Byb3BlcnRpZXMp LmlzUGVyY2VudCgpIHx8IHN2Zy0+aW50cmluc2ljV2lkdGgoU1ZHU1ZHRWxlbWVudDo6SWdub3Jl Q1NTUHJvcGVydGllcykuaXNQZXJjZW50KCk7CisgICAgcmV0dXJuIHN2Z0VsZW1lbnQoKS5pbnRy aW5zaWNIZWlnaHQoU1ZHU1ZHRWxlbWVudDo6SWdub3JlQ1NTUHJvcGVydGllcykuaXNQZXJjZW50 KCkgfHwgc3ZnRWxlbWVudCgpLmludHJpbnNpY1dpZHRoKFNWR1NWR0VsZW1lbnQ6Oklnbm9yZUNT U1Byb3BlcnRpZXMpLmlzUGVyY2VudCgpOwogfQogCiBib29sIFJlbmRlclNWR1Jvb3Q6Omhhc1Jl bGF0aXZlSW50cmluc2ljTG9naWNhbFdpZHRoKCkgY29uc3QKIHsKLSAgICBTVkdTVkdFbGVtZW50 KiBzdmcgPSB0b1NWR1NWR0VsZW1lbnQoZWxlbWVudCgpKTsKLSAgICBBU1NFUlQoc3ZnKTsKLSAg ICByZXR1cm4gc3ZnLT5pbnRyaW5zaWNXaWR0aChTVkdTVkdFbGVtZW50OjpJZ25vcmVDU1NQcm9w ZXJ0aWVzKS5pc1BlcmNlbnQoKTsKKyAgICByZXR1cm4gc3ZnRWxlbWVudCgpLmludHJpbnNpY1dp ZHRoKFNWR1NWR0VsZW1lbnQ6Oklnbm9yZUNTU1Byb3BlcnRpZXMpLmlzUGVyY2VudCgpOwogfQog CiBib29sIFJlbmRlclNWR1Jvb3Q6Omhhc1JlbGF0aXZlTG9naWNhbEhlaWdodCgpIGNvbnN0CiB7 Ci0gICAgU1ZHU1ZHRWxlbWVudCogc3ZnID0gdG9TVkdTVkdFbGVtZW50KGVsZW1lbnQoKSk7Ci0g ICAgQVNTRVJUKHN2Zyk7Ci0KLSAgICByZXR1cm4gc3ZnLT5pbnRyaW5zaWNIZWlnaHQoU1ZHU1ZH RWxlbWVudDo6SWdub3JlQ1NTUHJvcGVydGllcykuaXNQZXJjZW50KCk7CisgICAgcmV0dXJuIHN2 Z0VsZW1lbnQoKS5pbnRyaW5zaWNIZWlnaHQoU1ZHU1ZHRWxlbWVudDo6SWdub3JlQ1NTUHJvcGVy dGllcykuaXNQZXJjZW50KCk7CiB9CiAKIHZvaWQgUmVuZGVyU1ZHUm9vdDo6YWRkUmVzb3VyY2VG b3JDbGllbnRJbnZhbGlkYXRpb24oUmVuZGVyU1ZHUmVzb3VyY2VDb250YWluZXIqIHJlc291cmNl KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSb290 LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jvb3QuaAppbmRleCAz ZWIwNDFmLi45MDIxZWRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3Zn L1JlbmRlclNWR1Jvb3QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRl clNWR1Jvb3QuaApAQCAtMzIsMTMgKzMyLDE1IEBACiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIGNs YXNzIEFmZmluZVRyYW5zZm9ybTsKLWNsYXNzIFNWR0VsZW1lbnQ7CitjbGFzcyBTVkdTVkdFbGVt ZW50OwogCiBjbGFzcyBSZW5kZXJTVkdSb290IEZJTkFMIDogcHVibGljIFJlbmRlclJlcGxhY2Vk IHsKIHB1YmxpYzoKLSAgICBleHBsaWNpdCBSZW5kZXJTVkdSb290KFNWR0VsZW1lbnQqKTsKKyAg ICBleHBsaWNpdCBSZW5kZXJTVkdSb290KFNWR1NWR0VsZW1lbnQmKTsKICAgICB2aXJ0dWFsIH5S ZW5kZXJTVkdSb290KCk7CiAKKyAgICBTVkdTVkdFbGVtZW50JiBzdmdFbGVtZW50KCkgY29uc3Q7 CisKICAgICBib29sIGlzRW1iZWRkZWRUaHJvdWdoU1ZHSW1hZ2UoKSBjb25zdDsKICAgICBib29s IGlzRW1iZWRkZWRUaHJvdWdoRnJhbWVDb250YWluaW5nU1ZHRG9jdW1lbnQoKSBjb25zdDsKIApA QCAtNzMsNiArNzUsOCBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRIYXNTVkdTaGFkb3coYm9vbCBo YXNTaGFkb3cpIHsgbV9oYXNTVkdTaGFkb3cgPSBoYXNTaGFkb3c7IH0KIAogcHJpdmF0ZToKKyAg ICB2b2lkIGVsZW1lbnQoKSBjb25zdCBXVEZfREVMRVRFRF9GVU5DVElPTjsKKwogICAgIHZpcnR1 YWwgUmVuZGVyT2JqZWN0Q2hpbGRMaXN0KiB2aXJ0dWFsQ2hpbGRyZW4oKSB7IHJldHVybiBjaGls ZHJlbigpOyB9CiAgICAgdmlydHVhbCBjb25zdCBSZW5kZXJPYmplY3RDaGlsZExpc3QqIHZpcnR1 YWxDaGlsZHJlbigpIGNvbnN0IHsgcmV0dXJuIGNoaWxkcmVuKCk7IH0KIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvc3ZnL1NWR1NWR0VsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvc3Zn L1NWR1NWR0VsZW1lbnQuY3BwCmluZGV4IGIwN2Y4N2YuLmEyZjk2ZTMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3N2Zy9TVkdTVkdFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9z dmcvU1ZHU1ZHRWxlbWVudC5jcHAKQEAgLTQ4Myw3ICs0ODMsNyBAQCBib29sIFNWR1NWR0VsZW1l bnQ6OnJlbmRlcmVySXNOZWVkZWQoY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlKQogUmVuZGVyT2Jq ZWN0KiBTVkdTVkdFbGVtZW50OjpjcmVhdGVSZW5kZXJlcihSZW5kZXJBcmVuYSogYXJlbmEsIFJl bmRlclN0eWxlKikKIHsKICAgICBpZiAoaXNPdXRlcm1vc3RTVkdTVkdFbGVtZW50KCkpCi0gICAg ICAgIHJldHVybiBuZXcgKGFyZW5hKSBSZW5kZXJTVkdSb290KHRoaXMpOworICAgICAgICByZXR1 cm4gbmV3IChhcmVuYSkgUmVuZGVyU1ZHUm9vdCgqdGhpcyk7CiAKICAgICByZXR1cm4gbmV3IChh cmVuYSkgUmVuZGVyU1ZHVmlld3BvcnRDb250YWluZXIodGhpcyk7CiB9Cg==