55771 2011-03-04 06:29:40 -0800 Move shared code into SVGStyledTransformableElement::svgAttributeChanged 2011-03-05 04:29:49 -0800 1 1 1 Unclassified WebKit SVG 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 55675 1 paroga paroga commit-queue krit zimmermann oldest_to_newest 362456 0 paroga 2011-03-04 06:29:40 -0800 see patch 362470 1 84742 paroga 2011-03-04 06:48:28 -0800 Created attachment 84742 Patch 362481 2 84742 zimmermann 2011-03-04 07:18:51 -0800 Comment on attachment 84742 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=84742&action=review Good catch, please fix the base class call before landing though! If you want cq, please upload a new version. > Source/WebCore/svg/SVGStyledTransformableElement.cpp:86 > + SVGStyledLocatableElement::synchronizeProperty(attrName); Erm, you mean svgAttributeChanged here? 362483 3 84746 paroga 2011-03-04 07:24:37 -0800 Created attachment 84746 Patch 362484 4 84746 zimmermann 2011-03-04 07:35:11 -0800 Comment on attachment 84746 Patch r=me. 362566 5 84746 commit-queue 2011-03-04 09:38:41 -0800 Comment on attachment 84746 Patch Clearing flags on attachment: 84746 Committed r80362: <http://trac.webkit.org/changeset/80362> 362567 6 commit-queue 2011-03-04 09:38:47 -0800 All reviewed patches have been landed. Closing bug. 362590 7 krit 2011-03-04 10:00:52 -0800 SVGClipElement and SVGMaskElement are SVGStyledTransformableElements as well, but didn't had this function. Doesn't it influence both elements as well some how? 362934 8 zimmermann 2011-03-05 04:29:49 -0800 (In reply to comment #7) > SVGClipElement and SVGMaskElement are SVGStyledTransformableElements as well, but didn't had this function. Doesn't it influence both elements as well some how? I'd say this is related to the new bug regarding transform + clipPath, we just don't handle it correctly for these elements. 84742 2011-03-04 06:48:28 -0800 2011-03-04 07:24:37 -0800 Patch bug-55771.patch text/plain 10902 paroga ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA0N2YyYzlmLi4xZWM0YTZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzcg QEAKKzIwMTEtMDMtMDQgIFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdlYmtpdC5vcmc+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTW92ZSBzaGFy ZWQgY29kZSBpbnRvIFNWR1N0eWxlZFRyYW5zZm9ybWFibGVFbGVtZW50OjpzdmdBdHRyaWJ1dGVD aGFuZ2VkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01 NTc3MQorCisgICAgICAgIEFsbCBzdWIgY2xhc3NlcyBvZiBTVkdTdHlsZWRUcmFuc2Zvcm1hYmxl RWxlbWVudCByZXF1ZXN0IGEgcmVsYXlvdXQKKyAgICAgICAgdGhlIHNhbWUgd2F5LiBTbyBtb3Zl IHRoYXQgY29kZSBpbnRvIHRoZSBjb21tb24gYmFzZSBjbGFzcy4KKworICAgICAgICAqIHN2Zy9T VkdDaXJjbGVFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNWR0NpcmNsZUVsZW1lbnQ6 OnN2Z0F0dHJpYnV0ZUNoYW5nZWQpOgorICAgICAgICAqIHN2Zy9TVkdFbGxpcHNlRWxlbWVudC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpTVkdFbGxpcHNlRWxlbWVudDo6c3ZnQXR0cmlidXRlQ2hh bmdlZCk6CisgICAgICAgICogc3ZnL1NWR0ZvcmVpZ25PYmplY3RFbGVtZW50LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlNWR0ZvcmVpZ25PYmplY3RFbGVtZW50OjpzdmdBdHRyaWJ1dGVDaGFuZ2Vk KToKKyAgICAgICAgKiBzdmcvU1ZHR0VsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U1ZH R0VsZW1lbnQ6OnN2Z0F0dHJpYnV0ZUNoYW5nZWQpOgorICAgICAgICAqIHN2Zy9TVkdJbWFnZUVs ZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U1ZHSW1hZ2VFbGVtZW50OjpzdmdBdHRyaWJ1 dGVDaGFuZ2VkKToKKyAgICAgICAgKiBzdmcvU1ZHTGluZUVsZW1lbnQuY3BwOgorICAgICAgICAo V2ViQ29yZTo6U1ZHTGluZUVsZW1lbnQ6OnN2Z0F0dHJpYnV0ZUNoYW5nZWQpOgorICAgICAgICAq IHN2Zy9TVkdQYXRoRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTVkdQYXRoRWxlbWVu dDo6c3ZnQXR0cmlidXRlQ2hhbmdlZCk6CisgICAgICAgICogc3ZnL1NWR1BvbHlFbGVtZW50LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlNWR1BvbHlFbGVtZW50OjpzdmdBdHRyaWJ1dGVDaGFuZ2Vk KToKKyAgICAgICAgKiBzdmcvU1ZHUmVjdEVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 U1ZHUmVjdEVsZW1lbnQ6OnN2Z0F0dHJpYnV0ZUNoYW5nZWQpOgorICAgICAgICAqIHN2Zy9TVkdT dHlsZWRUcmFuc2Zvcm1hYmxlRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTVkdTdHls ZWRUcmFuc2Zvcm1hYmxlRWxlbWVudDo6c3ZnQXR0cmlidXRlQ2hhbmdlZCk6CisgICAgICAgICog c3ZnL1NWR1N0eWxlZFRyYW5zZm9ybWFibGVFbGVtZW50Lmg6CisgICAgICAgICogc3ZnL1NWR1Vz ZUVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U1ZHVXNlRWxlbWVudDo6c3ZnQXR0cmli dXRlQ2hhbmdlZCk6CisKIDIwMTEtMDItMjggIFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdl YmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCBidWlsZCBmaXggZm9yICFFTkFCTEUoU1ZH X0FOSU1BVElPTikgYWZ0ZXIgcjc5NTY5LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3Zn L1NWR0NpcmNsZUVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvc3ZnL1NWR0NpcmNsZUVsZW1l bnQuY3BwCmluZGV4IDZhM2EwZDQuLjJhYjA2NDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3N2Zy9TVkdDaXJjbGVFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHQ2ly Y2xlRWxlbWVudC5jcHAKQEAgLTkwLDEyICs5MCw2IEBAIHZvaWQgU1ZHQ2lyY2xlRWxlbWVudDo6 c3ZnQXR0cmlidXRlQ2hhbmdlZChjb25zdCBRdWFsaWZpZWROYW1lJiBhdHRyTmFtZSkKICAgICBp ZiAoIXJlbmRlcmVyKQogICAgICAgICByZXR1cm47CiAKLSAgICBpZiAoU1ZHU3R5bGVkVHJhbnNm b3JtYWJsZUVsZW1lbnQ6OmlzS25vd25BdHRyaWJ1dGUoYXR0ck5hbWUpKSB7Ci0gICAgICAgIHJl bmRlcmVyLT5zZXROZWVkc1RyYW5zZm9ybVVwZGF0ZSgpOwotICAgICAgICBSZW5kZXJTVkdSZXNv dXJjZTo6bWFya0ZvckxheW91dEFuZFBhcmVudFJlc291cmNlSW52YWxpZGF0aW9uKHJlbmRlcmVy KTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KLQogICAgIGlmIChpc0xlbmd0aEF0dHJpYnV0ZSkg ewogICAgICAgICByZW5kZXJlci0+c2V0TmVlZHNQYXRoVXBkYXRlKCk7CiAgICAgICAgIFJlbmRl clNWR1Jlc291cmNlOjptYXJrRm9yTGF5b3V0QW5kUGFyZW50UmVzb3VyY2VJbnZhbGlkYXRpb24o cmVuZGVyZXIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3ZnL1NWR0VsbGlwc2VFbGVt ZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdFbGxpcHNlRWxlbWVudC5jcHAKaW5kZXgg MTI5ZTFjZC4uNzNmOTIxZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3ZnL1NWR0VsbGlw c2VFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHRWxsaXBzZUVsZW1lbnQu Y3BwCkBAIC05NywxMiArOTcsNiBAQCB2b2lkIFNWR0VsbGlwc2VFbGVtZW50OjpzdmdBdHRyaWJ1 dGVDaGFuZ2VkKGNvbnN0IFF1YWxpZmllZE5hbWUmIGF0dHJOYW1lKQogICAgIGlmICghcmVuZGVy ZXIpCiAgICAgICAgIHJldHVybjsKIAotICAgIGlmIChTVkdTdHlsZWRUcmFuc2Zvcm1hYmxlRWxl bWVudDo6aXNLbm93bkF0dHJpYnV0ZShhdHRyTmFtZSkpIHsKLSAgICAgICAgcmVuZGVyZXItPnNl dE5lZWRzVHJhbnNmb3JtVXBkYXRlKCk7Ci0gICAgICAgIFJlbmRlclNWR1Jlc291cmNlOjptYXJr Rm9yTGF5b3V0QW5kUGFyZW50UmVzb3VyY2VJbnZhbGlkYXRpb24ocmVuZGVyZXIpOwotICAgICAg ICByZXR1cm47Ci0gICAgfQotCiAgICAgaWYgKGlzTGVuZ3RoQXR0cmlidXRlKSB7CiAgICAgICAg IHJlbmRlcmVyLT5zZXROZWVkc1BhdGhVcGRhdGUoKTsKICAgICAgICAgUmVuZGVyU1ZHUmVzb3Vy Y2U6Om1hcmtGb3JMYXlvdXRBbmRQYXJlbnRSZXNvdXJjZUludmFsaWRhdGlvbihyZW5kZXJlcik7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHRm9yZWlnbk9iamVjdEVsZW1lbnQu Y3BwIGIvU291cmNlL1dlYkNvcmUvc3ZnL1NWR0ZvcmVpZ25PYmplY3RFbGVtZW50LmNwcAppbmRl eCBmMjE3NWFjLi43YzQ4YmYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHRm9y ZWlnbk9iamVjdEVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdGb3JlaWdu T2JqZWN0RWxlbWVudC5jcHAKQEAgLTk2LDEyICs5Niw2IEBAIHZvaWQgU1ZHRm9yZWlnbk9iamVj dEVsZW1lbnQ6OnN2Z0F0dHJpYnV0ZUNoYW5nZWQoY29uc3QgUXVhbGlmaWVkTmFtZSYgYXR0ck5h bWUpCiAgICAgaWYgKCFyZW5kZXJlcikKICAgICAgICAgcmV0dXJuOwogCi0gICAgaWYgKFNWR1N0 eWxlZFRyYW5zZm9ybWFibGVFbGVtZW50Ojppc0tub3duQXR0cmlidXRlKGF0dHJOYW1lKSkgewot ICAgICAgICByZW5kZXJlci0+c2V0TmVlZHNUcmFuc2Zvcm1VcGRhdGUoKTsKLSAgICAgICAgUmVu ZGVyU1ZHUmVzb3VyY2U6Om1hcmtGb3JMYXlvdXRBbmRQYXJlbnRSZXNvdXJjZUludmFsaWRhdGlv bihyZW5kZXJlcik7Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0KICAgICBpZiAoaXNMZW5ndGhB dHRyaWJ1dGUKICAgICAgICAgfHwgU1ZHTGFuZ1NwYWNlOjppc0tub3duQXR0cmlidXRlKGF0dHJO YW1lKQogICAgICAgICB8fCBTVkdFeHRlcm5hbFJlc291cmNlc1JlcXVpcmVkOjppc0tub3duQXR0 cmlidXRlKGF0dHJOYW1lKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdHRWxl bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHR0VsZW1lbnQuY3BwCmluZGV4IDYxMDUx OTQuLmY3YTQ4ZWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdHRWxlbWVudC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvc3ZnL1NWR0dFbGVtZW50LmNwcApAQCAtNjYsMTIgKzY2 LDYgQEAgdm9pZCBTVkdHRWxlbWVudDo6c3ZnQXR0cmlidXRlQ2hhbmdlZChjb25zdCBRdWFsaWZp ZWROYW1lJiBhdHRyTmFtZSkKICAgICBpZiAoIXJlbmRlcmVyKQogICAgICAgICByZXR1cm47CiAK LSAgICBpZiAoU1ZHU3R5bGVkVHJhbnNmb3JtYWJsZUVsZW1lbnQ6OmlzS25vd25BdHRyaWJ1dGUo YXR0ck5hbWUpKSB7Ci0gICAgICAgIHJlbmRlcmVyLT5zZXROZWVkc1RyYW5zZm9ybVVwZGF0ZSgp OwotICAgICAgICBSZW5kZXJTVkdSZXNvdXJjZTo6bWFya0ZvckxheW91dEFuZFBhcmVudFJlc291 cmNlSW52YWxpZGF0aW9uKHJlbmRlcmVyKTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KLQogICAg IGlmIChTVkdMYW5nU3BhY2U6OmlzS25vd25BdHRyaWJ1dGUoYXR0ck5hbWUpCiAgICAgICAgIHx8 IFNWR0V4dGVybmFsUmVzb3VyY2VzUmVxdWlyZWQ6OmlzS25vd25BdHRyaWJ1dGUoYXR0ck5hbWUp KQogICAgICAgICBSZW5kZXJTVkdSZXNvdXJjZTo6bWFya0ZvckxheW91dEFuZFBhcmVudFJlc291 cmNlSW52YWxpZGF0aW9uKHJlbmRlcmVyKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N2 Zy9TVkdJbWFnZUVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvc3ZnL1NWR0ltYWdlRWxlbWVu dC5jcHAKaW5kZXggNzg0YzFhYi4uMjFiYjM5MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv c3ZnL1NWR0ltYWdlRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvc3ZnL1NWR0ltYWdl RWxlbWVudC5jcHAKQEAgLTExMiwxMiArMTEyLDYgQEAgdm9pZCBTVkdJbWFnZUVsZW1lbnQ6OnN2 Z0F0dHJpYnV0ZUNoYW5nZWQoY29uc3QgUXVhbGlmaWVkTmFtZSYgYXR0ck5hbWUpCiAgICAgaWYg KCFyZW5kZXJlcikKICAgICAgICAgcmV0dXJuOwogCi0gICAgaWYgKFNWR1N0eWxlZFRyYW5zZm9y bWFibGVFbGVtZW50Ojppc0tub3duQXR0cmlidXRlKGF0dHJOYW1lKSkgewotICAgICAgICByZW5k ZXJlci0+c2V0TmVlZHNUcmFuc2Zvcm1VcGRhdGUoKTsKLSAgICAgICAgUmVuZGVyU1ZHUmVzb3Vy Y2U6Om1hcmtGb3JMYXlvdXRBbmRQYXJlbnRSZXNvdXJjZUludmFsaWRhdGlvbihyZW5kZXJlcik7 Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0KICAgICBpZiAoaXNMZW5ndGhBdHRyaWJ1dGUpIHsK ICAgICAgICAgcmVuZGVyZXItPnVwZGF0ZUZyb21FbGVtZW50KCk7CiAgICAgICAgIFJlbmRlclNW R1Jlc291cmNlOjptYXJrRm9yTGF5b3V0QW5kUGFyZW50UmVzb3VyY2VJbnZhbGlkYXRpb24ocmVu ZGVyZXIsIGZhbHNlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdMaW5lRWxl bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHTGluZUVsZW1lbnQuY3BwCmluZGV4IDJl NDM1YzUuLmMzZDVmMGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdMaW5lRWxl bWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvc3ZnL1NWR0xpbmVFbGVtZW50LmNwcApAQCAt OTMsMTIgKzkzLDYgQEAgdm9pZCBTVkdMaW5lRWxlbWVudDo6c3ZnQXR0cmlidXRlQ2hhbmdlZChj b25zdCBRdWFsaWZpZWROYW1lJiBhdHRyTmFtZSkKICAgICBpZiAoIXJlbmRlcmVyKQogICAgICAg ICByZXR1cm47CiAKLSAgICBpZiAoU1ZHU3R5bGVkVHJhbnNmb3JtYWJsZUVsZW1lbnQ6OmlzS25v d25BdHRyaWJ1dGUoYXR0ck5hbWUpKSB7Ci0gICAgICAgIHJlbmRlcmVyLT5zZXROZWVkc1RyYW5z Zm9ybVVwZGF0ZSgpOwotICAgICAgICBSZW5kZXJTVkdSZXNvdXJjZTo6bWFya0ZvckxheW91dEFu ZFBhcmVudFJlc291cmNlSW52YWxpZGF0aW9uKHJlbmRlcmVyKTsKLSAgICAgICAgcmV0dXJuOwot ICAgIH0KLQogICAgIGlmIChpc0xlbmd0aEF0dHJpYnV0ZSkgewogICAgICAgICByZW5kZXJlci0+ c2V0TmVlZHNQYXRoVXBkYXRlKCk7CiAgICAgICAgIFJlbmRlclNWR1Jlc291cmNlOjptYXJrRm9y TGF5b3V0QW5kUGFyZW50UmVzb3VyY2VJbnZhbGlkYXRpb24ocmVuZGVyZXIpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvc3ZnL1NWR1BhdGhFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3N2Zy9TVkdQYXRoRWxlbWVudC5jcHAKaW5kZXggYzU2ODczYi4uZTc5OGVhZiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvc3ZnL1NWR1BhdGhFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9zdmcvU1ZHUGF0aEVsZW1lbnQuY3BwCkBAIC0yMzAsMTIgKzIzMCw2IEBAIHZvaWQgU1ZH UGF0aEVsZW1lbnQ6OnN2Z0F0dHJpYnV0ZUNoYW5nZWQoY29uc3QgUXVhbGlmaWVkTmFtZSYgYXR0 ck5hbWUpCiAgICAgaWYgKCFyZW5kZXJlcikKICAgICAgICAgcmV0dXJuOwogCi0gICAgaWYgKFNW R1N0eWxlZFRyYW5zZm9ybWFibGVFbGVtZW50Ojppc0tub3duQXR0cmlidXRlKGF0dHJOYW1lKSkg ewotICAgICAgICByZW5kZXJlci0+c2V0TmVlZHNUcmFuc2Zvcm1VcGRhdGUoKTsKLSAgICAgICAg UmVuZGVyU1ZHUmVzb3VyY2U6Om1hcmtGb3JMYXlvdXRBbmRQYXJlbnRSZXNvdXJjZUludmFsaWRh dGlvbihyZW5kZXJlcik7Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0KICAgICBpZiAoYXR0ck5h bWUgPT0gU1ZHTmFtZXM6OnBhdGhMZW5ndGhBdHRyCiAgICAgICAgIHx8IFNWR0xhbmdTcGFjZTo6 aXNLbm93bkF0dHJpYnV0ZShhdHRyTmFtZSkKICAgICAgICAgfHwgU1ZHRXh0ZXJuYWxSZXNvdXJj ZXNSZXF1aXJlZDo6aXNLbm93bkF0dHJpYnV0ZShhdHRyTmFtZSkpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9zdmcvU1ZHUG9seUVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvc3ZnL1NW R1BvbHlFbGVtZW50LmNwcAppbmRleCA4YTcwMzQ3Li4zMzFlNWVjIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9zdmcvU1ZHUG9seUVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N2 Zy9TVkdQb2x5RWxlbWVudC5jcHAKQEAgLTc2LDEyICs3Niw2IEBAIHZvaWQgU1ZHUG9seUVsZW1l bnQ6OnN2Z0F0dHJpYnV0ZUNoYW5nZWQoY29uc3QgUXVhbGlmaWVkTmFtZSYgYXR0ck5hbWUpCiAg ICAgaWYgKCFyZW5kZXJlcikKICAgICAgICAgcmV0dXJuOwogCi0gICAgaWYgKFNWR1N0eWxlZFRy YW5zZm9ybWFibGVFbGVtZW50Ojppc0tub3duQXR0cmlidXRlKGF0dHJOYW1lKSkgewotICAgICAg ICByZW5kZXJlci0+c2V0TmVlZHNUcmFuc2Zvcm1VcGRhdGUoKTsKLSAgICAgICAgUmVuZGVyU1ZH UmVzb3VyY2U6Om1hcmtGb3JMYXlvdXRBbmRQYXJlbnRSZXNvdXJjZUludmFsaWRhdGlvbihyZW5k ZXJlcik7Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0KICAgICBpZiAoYXR0ck5hbWUgPT0gU1ZH TmFtZXM6OnBvaW50c0F0dHIpIHsKICAgICAgICAgcmVuZGVyZXItPnNldE5lZWRzUGF0aFVwZGF0 ZSgpOwogICAgICAgICBSZW5kZXJTVkdSZXNvdXJjZTo6bWFya0ZvckxheW91dEFuZFBhcmVudFJl c291cmNlSW52YWxpZGF0aW9uKHJlbmRlcmVyKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3N2Zy9TVkdSZWN0RWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHUmVjdEVsZW1l bnQuY3BwCmluZGV4IDEwYzU3NDMuLjJjNmVlODcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3N2Zy9TVkdSZWN0RWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvc3ZnL1NWR1JlY3RF bGVtZW50LmNwcApAQCAtMTEwLDEyICsxMTAsNiBAQCB2b2lkIFNWR1JlY3RFbGVtZW50OjpzdmdB dHRyaWJ1dGVDaGFuZ2VkKGNvbnN0IFF1YWxpZmllZE5hbWUmIGF0dHJOYW1lKQogICAgIGlmICgh cmVuZGVyZXIpCiAgICAgICAgIHJldHVybjsKIAotICAgIGlmIChTVkdTdHlsZWRUcmFuc2Zvcm1h YmxlRWxlbWVudDo6aXNLbm93bkF0dHJpYnV0ZShhdHRyTmFtZSkpIHsKLSAgICAgICAgcmVuZGVy ZXItPnNldE5lZWRzVHJhbnNmb3JtVXBkYXRlKCk7Ci0gICAgICAgIFJlbmRlclNWR1Jlc291cmNl OjptYXJrRm9yTGF5b3V0QW5kUGFyZW50UmVzb3VyY2VJbnZhbGlkYXRpb24ocmVuZGVyZXIpOwot ICAgICAgICByZXR1cm47Ci0gICAgfQotCiAgICAgaWYgKGlzTGVuZ3RoQXR0cmlidXRlKSB7CiAg ICAgICAgIHJlbmRlcmVyLT5zZXROZWVkc1BhdGhVcGRhdGUoKTsKICAgICAgICAgUmVuZGVyU1ZH UmVzb3VyY2U6Om1hcmtGb3JMYXlvdXRBbmRQYXJlbnRSZXNvdXJjZUludmFsaWRhdGlvbihyZW5k ZXJlcik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHU3R5bGVkVHJhbnNmb3Jt YWJsZUVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvc3ZnL1NWR1N0eWxlZFRyYW5zZm9ybWFi bGVFbGVtZW50LmNwcAppbmRleCBjZTFjNWZkLi5iYWZhM2I2IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9zdmcvU1ZHU3R5bGVkVHJhbnNmb3JtYWJsZUVsZW1lbnQuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3N2Zy9TVkdTdHlsZWRUcmFuc2Zvcm1hYmxlRWxlbWVudC5jcHAKQEAgLTI2LDYg KzI2LDcgQEAKICNpbmNsdWRlICJBZmZpbmVUcmFuc2Zvcm0uaCIKICNpbmNsdWRlICJBdHRyaWJ1 dGUuaCIKICNpbmNsdWRlICJSZW5kZXJTVkdQYXRoLmgiCisjaW5jbHVkZSAiUmVuZGVyU1ZHUmVz b3VyY2UuaCIKICNpbmNsdWRlICJTVkdOYW1lcy5oIgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CkBA IC04MCw2ICs4MSwyMSBAQCB2b2lkIFNWR1N0eWxlZFRyYW5zZm9ybWFibGVFbGVtZW50OjpwYXJz ZU1hcHBlZEF0dHJpYnV0ZShBdHRyaWJ1dGUqIGF0dHIpCiAgICAgICAgIFNWR1N0eWxlZExvY2F0 YWJsZUVsZW1lbnQ6OnBhcnNlTWFwcGVkQXR0cmlidXRlKGF0dHIpOwogfQogCit2b2lkIFNWR1N0 eWxlZFRyYW5zZm9ybWFibGVFbGVtZW50OjpzdmdBdHRyaWJ1dGVDaGFuZ2VkKGNvbnN0IFF1YWxp ZmllZE5hbWUmIGF0dHJOYW1lKQoreworICAgIFNWR1N0eWxlZExvY2F0YWJsZUVsZW1lbnQ6OnN5 bmNocm9uaXplUHJvcGVydHkoYXR0ck5hbWUpOworCisgICAgaWYgKCFTVkdTdHlsZWRUcmFuc2Zv cm1hYmxlRWxlbWVudDo6aXNLbm93bkF0dHJpYnV0ZShhdHRyTmFtZSkpCisgICAgICAgIHJldHVy bjsKKworICAgIFJlbmRlck9iamVjdCogb2JqZWN0ID0gcmVuZGVyZXIoKTsKKyAgICBpZiAoIW9i amVjdCkKKyAgICAgICAgcmV0dXJuOworCisgICAgb2JqZWN0LT5zZXROZWVkc1RyYW5zZm9ybVVw ZGF0ZSgpOworICAgIFJlbmRlclNWR1Jlc291cmNlOjptYXJrRm9yTGF5b3V0QW5kUGFyZW50UmVz b3VyY2VJbnZhbGlkYXRpb24ob2JqZWN0KTsKK30KKwogdm9pZCBTVkdTdHlsZWRUcmFuc2Zvcm1h YmxlRWxlbWVudDo6c3luY2hyb25pemVQcm9wZXJ0eShjb25zdCBRdWFsaWZpZWROYW1lJiBhdHRy TmFtZSkKIHsKICAgICBTVkdTdHlsZWRMb2NhdGFibGVFbGVtZW50OjpzeW5jaHJvbml6ZVByb3Bl cnR5KGF0dHJOYW1lKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdTdHlsZWRU cmFuc2Zvcm1hYmxlRWxlbWVudC5oIGIvU291cmNlL1dlYkNvcmUvc3ZnL1NWR1N0eWxlZFRyYW5z Zm9ybWFibGVFbGVtZW50LmgKaW5kZXggY2JkNzBlZC4uOWQ2ODM0YSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvc3ZnL1NWR1N0eWxlZFRyYW5zZm9ybWFibGVFbGVtZW50LmgKKysrIGIvU291 cmNlL1dlYkNvcmUvc3ZnL1NWR1N0eWxlZFRyYW5zZm9ybWFibGVFbGVtZW50LmgKQEAgLTU4LDYg KzU4LDcgQEAgcHJvdGVjdGVkOgogICAgIFNWR1N0eWxlZFRyYW5zZm9ybWFibGVFbGVtZW50KGNv bnN0IFF1YWxpZmllZE5hbWUmLCBEb2N1bWVudCopOwogCiAgICAgdmlydHVhbCB2b2lkIHBhcnNl TWFwcGVkQXR0cmlidXRlKEF0dHJpYnV0ZSopOworICAgIHZpcnR1YWwgdm9pZCBzdmdBdHRyaWJ1 dGVDaGFuZ2VkKGNvbnN0IFF1YWxpZmllZE5hbWUmKTsKICAgICB2aXJ0dWFsIHZvaWQgc3luY2hy b25pemVQcm9wZXJ0eShjb25zdCBRdWFsaWZpZWROYW1lJik7CiAgICAgdm9pZCBmaWxsUGFzc2Vk QXR0cmlidXRlVG9Qcm9wZXJ0eVR5cGVNYXAoQXR0cmlidXRlVG9Qcm9wZXJ0eVR5cGVNYXAmKTsK IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3ZnL1NWR1VzZUVsZW1lbnQuY3BwIGIvU291 cmNlL1dlYkNvcmUvc3ZnL1NWR1VzZUVsZW1lbnQuY3BwCmluZGV4IGE4YTFjZjkuLjQyMzlmNjY4 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHVXNlRWxlbWVudC5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvc3ZnL1NWR1VzZUVsZW1lbnQuY3BwCkBAIC0xODUsMTIgKzE4NSw2IEBA IHZvaWQgU1ZHVXNlRWxlbWVudDo6c3ZnQXR0cmlidXRlQ2hhbmdlZChjb25zdCBRdWFsaWZpZWRO YW1lJiBhdHRyTmFtZSkKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIGlmIChTVkdTdHls ZWRUcmFuc2Zvcm1hYmxlRWxlbWVudDo6aXNLbm93bkF0dHJpYnV0ZShhdHRyTmFtZSkpIHsKLSAg ICAgICAgb2JqZWN0LT5zZXROZWVkc1RyYW5zZm9ybVVwZGF0ZSgpOwotICAgICAgICBSZW5kZXJT VkdSZXNvdXJjZTo6bWFya0ZvckxheW91dEFuZFBhcmVudFJlc291cmNlSW52YWxpZGF0aW9uKG9i amVjdCk7Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0KICAgICBpZiAoU1ZHTGFuZ1NwYWNlOjpp c0tub3duQXR0cmlidXRlKGF0dHJOYW1lKQogICAgICAgICB8fCBTVkdFeHRlcm5hbFJlc291cmNl c1JlcXVpcmVkOjppc0tub3duQXR0cmlidXRlKGF0dHJOYW1lKSkKICAgICAgICAgaW52YWxpZGF0 ZVNoYWRvd1RyZWUoKTsK 84746 2011-03-04 07:24:37 -0800 2011-03-04 09:38:41 -0800 Patch bug-55771.patch text/plain 10906 paroga ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA0N2YyYzlmLi4xZWM0YTZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzcg QEAKKzIwMTEtMDMtMDQgIFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdlYmtpdC5vcmc+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTmlrb2xhcyBaaW1tZXJtYW5uLgorCisgICAgICAgIE1vdmUg c2hhcmVkIGNvZGUgaW50byBTVkdTdHlsZWRUcmFuc2Zvcm1hYmxlRWxlbWVudDo6c3ZnQXR0cmli dXRlQ2hhbmdlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NTU3NzEKKworICAgICAgICBBbGwgc3ViIGNsYXNzZXMgb2YgU1ZHU3R5bGVkVHJhbnNmb3Jt YWJsZUVsZW1lbnQgcmVxdWVzdCBhIHJlbGF5b3V0CisgICAgICAgIHRoZSBzYW1lIHdheS4gU28g bW92ZSB0aGF0IGNvZGUgaW50byB0aGUgY29tbW9uIGJhc2UgY2xhc3MuCisKKyAgICAgICAgKiBz dmcvU1ZHQ2lyY2xlRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTVkdDaXJjbGVFbGVt ZW50OjpzdmdBdHRyaWJ1dGVDaGFuZ2VkKToKKyAgICAgICAgKiBzdmcvU1ZHRWxsaXBzZUVsZW1l bnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U1ZHRWxsaXBzZUVsZW1lbnQ6OnN2Z0F0dHJpYnV0 ZUNoYW5nZWQpOgorICAgICAgICAqIHN2Zy9TVkdGb3JlaWduT2JqZWN0RWxlbWVudC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpTVkdGb3JlaWduT2JqZWN0RWxlbWVudDo6c3ZnQXR0cmlidXRlQ2hh bmdlZCk6CisgICAgICAgICogc3ZnL1NWR0dFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlNWR0dFbGVtZW50OjpzdmdBdHRyaWJ1dGVDaGFuZ2VkKToKKyAgICAgICAgKiBzdmcvU1ZHSW1h Z2VFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNWR0ltYWdlRWxlbWVudDo6c3ZnQXR0 cmlidXRlQ2hhbmdlZCk6CisgICAgICAgICogc3ZnL1NWR0xpbmVFbGVtZW50LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlNWR0xpbmVFbGVtZW50OjpzdmdBdHRyaWJ1dGVDaGFuZ2VkKToKKyAgICAg ICAgKiBzdmcvU1ZHUGF0aEVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U1ZHUGF0aEVs ZW1lbnQ6OnN2Z0F0dHJpYnV0ZUNoYW5nZWQpOgorICAgICAgICAqIHN2Zy9TVkdQb2x5RWxlbWVu dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTVkdQb2x5RWxlbWVudDo6c3ZnQXR0cmlidXRlQ2hh bmdlZCk6CisgICAgICAgICogc3ZnL1NWR1JlY3RFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlNWR1JlY3RFbGVtZW50OjpzdmdBdHRyaWJ1dGVDaGFuZ2VkKToKKyAgICAgICAgKiBzdmcv U1ZHU3R5bGVkVHJhbnNmb3JtYWJsZUVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U1ZH U3R5bGVkVHJhbnNmb3JtYWJsZUVsZW1lbnQ6OnN2Z0F0dHJpYnV0ZUNoYW5nZWQpOgorICAgICAg ICAqIHN2Zy9TVkdTdHlsZWRUcmFuc2Zvcm1hYmxlRWxlbWVudC5oOgorICAgICAgICAqIHN2Zy9T VkdVc2VFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNWR1VzZUVsZW1lbnQ6OnN2Z0F0 dHJpYnV0ZUNoYW5nZWQpOgorCiAyMDExLTAyLTI4ICBQYXRyaWNrIEdhbnN0ZXJlciAgPHBhcm9n YUB3ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQgYnVpbGQgZml4IGZvciAhRU5BQkxF KFNWR19BTklNQVRJT04pIGFmdGVyIHI3OTU2OS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3N2Zy9TVkdDaXJjbGVFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdDaXJjbGVF bGVtZW50LmNwcAppbmRleCA2YTNhMGQ0Li4yYWIwNjQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9zdmcvU1ZHQ2lyY2xlRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvc3ZnL1NW R0NpcmNsZUVsZW1lbnQuY3BwCkBAIC05MCwxMiArOTAsNiBAQCB2b2lkIFNWR0NpcmNsZUVsZW1l bnQ6OnN2Z0F0dHJpYnV0ZUNoYW5nZWQoY29uc3QgUXVhbGlmaWVkTmFtZSYgYXR0ck5hbWUpCiAg ICAgaWYgKCFyZW5kZXJlcikKICAgICAgICAgcmV0dXJuOwogCi0gICAgaWYgKFNWR1N0eWxlZFRy YW5zZm9ybWFibGVFbGVtZW50Ojppc0tub3duQXR0cmlidXRlKGF0dHJOYW1lKSkgewotICAgICAg ICByZW5kZXJlci0+c2V0TmVlZHNUcmFuc2Zvcm1VcGRhdGUoKTsKLSAgICAgICAgUmVuZGVyU1ZH UmVzb3VyY2U6Om1hcmtGb3JMYXlvdXRBbmRQYXJlbnRSZXNvdXJjZUludmFsaWRhdGlvbihyZW5k ZXJlcik7Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0KICAgICBpZiAoaXNMZW5ndGhBdHRyaWJ1 dGUpIHsKICAgICAgICAgcmVuZGVyZXItPnNldE5lZWRzUGF0aFVwZGF0ZSgpOwogICAgICAgICBS ZW5kZXJTVkdSZXNvdXJjZTo6bWFya0ZvckxheW91dEFuZFBhcmVudFJlc291cmNlSW52YWxpZGF0 aW9uKHJlbmRlcmVyKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdFbGxpcHNl RWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHRWxsaXBzZUVsZW1lbnQuY3BwCmlu ZGV4IDEyOWUxY2QuLjczZjkyMWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdF bGxpcHNlRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvc3ZnL1NWR0VsbGlwc2VFbGVt ZW50LmNwcApAQCAtOTcsMTIgKzk3LDYgQEAgdm9pZCBTVkdFbGxpcHNlRWxlbWVudDo6c3ZnQXR0 cmlidXRlQ2hhbmdlZChjb25zdCBRdWFsaWZpZWROYW1lJiBhdHRyTmFtZSkKICAgICBpZiAoIXJl bmRlcmVyKQogICAgICAgICByZXR1cm47CiAKLSAgICBpZiAoU1ZHU3R5bGVkVHJhbnNmb3JtYWJs ZUVsZW1lbnQ6OmlzS25vd25BdHRyaWJ1dGUoYXR0ck5hbWUpKSB7Ci0gICAgICAgIHJlbmRlcmVy LT5zZXROZWVkc1RyYW5zZm9ybVVwZGF0ZSgpOwotICAgICAgICBSZW5kZXJTVkdSZXNvdXJjZTo6 bWFya0ZvckxheW91dEFuZFBhcmVudFJlc291cmNlSW52YWxpZGF0aW9uKHJlbmRlcmVyKTsKLSAg ICAgICAgcmV0dXJuOwotICAgIH0KLQogICAgIGlmIChpc0xlbmd0aEF0dHJpYnV0ZSkgewogICAg ICAgICByZW5kZXJlci0+c2V0TmVlZHNQYXRoVXBkYXRlKCk7CiAgICAgICAgIFJlbmRlclNWR1Jl c291cmNlOjptYXJrRm9yTGF5b3V0QW5kUGFyZW50UmVzb3VyY2VJbnZhbGlkYXRpb24ocmVuZGVy ZXIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3ZnL1NWR0ZvcmVpZ25PYmplY3RFbGVt ZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdGb3JlaWduT2JqZWN0RWxlbWVudC5jcHAK aW5kZXggZjIxNzVhYy4uN2M0OGJmMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3ZnL1NW R0ZvcmVpZ25PYmplY3RFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHRm9y ZWlnbk9iamVjdEVsZW1lbnQuY3BwCkBAIC05NiwxMiArOTYsNiBAQCB2b2lkIFNWR0ZvcmVpZ25P YmplY3RFbGVtZW50OjpzdmdBdHRyaWJ1dGVDaGFuZ2VkKGNvbnN0IFF1YWxpZmllZE5hbWUmIGF0 dHJOYW1lKQogICAgIGlmICghcmVuZGVyZXIpCiAgICAgICAgIHJldHVybjsKIAotICAgIGlmIChT VkdTdHlsZWRUcmFuc2Zvcm1hYmxlRWxlbWVudDo6aXNLbm93bkF0dHJpYnV0ZShhdHRyTmFtZSkp IHsKLSAgICAgICAgcmVuZGVyZXItPnNldE5lZWRzVHJhbnNmb3JtVXBkYXRlKCk7Ci0gICAgICAg IFJlbmRlclNWR1Jlc291cmNlOjptYXJrRm9yTGF5b3V0QW5kUGFyZW50UmVzb3VyY2VJbnZhbGlk YXRpb24ocmVuZGVyZXIpOwotICAgICAgICByZXR1cm47Ci0gICAgfQotCiAgICAgaWYgKGlzTGVu Z3RoQXR0cmlidXRlCiAgICAgICAgIHx8IFNWR0xhbmdTcGFjZTo6aXNLbm93bkF0dHJpYnV0ZShh dHRyTmFtZSkKICAgICAgICAgfHwgU1ZHRXh0ZXJuYWxSZXNvdXJjZXNSZXF1aXJlZDo6aXNLbm93 bkF0dHJpYnV0ZShhdHRyTmFtZSkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZH R0VsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvc3ZnL1NWR0dFbGVtZW50LmNwcAppbmRleCA2 MTA1MTk0Li5mN2E0OGVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHR0VsZW1l bnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdHRWxlbWVudC5jcHAKQEAgLTY2LDEy ICs2Niw2IEBAIHZvaWQgU1ZHR0VsZW1lbnQ6OnN2Z0F0dHJpYnV0ZUNoYW5nZWQoY29uc3QgUXVh bGlmaWVkTmFtZSYgYXR0ck5hbWUpCiAgICAgaWYgKCFyZW5kZXJlcikKICAgICAgICAgcmV0dXJu OwogCi0gICAgaWYgKFNWR1N0eWxlZFRyYW5zZm9ybWFibGVFbGVtZW50Ojppc0tub3duQXR0cmli dXRlKGF0dHJOYW1lKSkgewotICAgICAgICByZW5kZXJlci0+c2V0TmVlZHNUcmFuc2Zvcm1VcGRh dGUoKTsKLSAgICAgICAgUmVuZGVyU1ZHUmVzb3VyY2U6Om1hcmtGb3JMYXlvdXRBbmRQYXJlbnRS ZXNvdXJjZUludmFsaWRhdGlvbihyZW5kZXJlcik7Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0K ICAgICBpZiAoU1ZHTGFuZ1NwYWNlOjppc0tub3duQXR0cmlidXRlKGF0dHJOYW1lKQogICAgICAg ICB8fCBTVkdFeHRlcm5hbFJlc291cmNlc1JlcXVpcmVkOjppc0tub3duQXR0cmlidXRlKGF0dHJO YW1lKSkKICAgICAgICAgUmVuZGVyU1ZHUmVzb3VyY2U6Om1hcmtGb3JMYXlvdXRBbmRQYXJlbnRS ZXNvdXJjZUludmFsaWRhdGlvbihyZW5kZXJlcik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9zdmcvU1ZHSW1hZ2VFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdJbWFnZUVs ZW1lbnQuY3BwCmluZGV4IDc4NGMxYWIuLjIxYmIzOTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3N2Zy9TVkdJbWFnZUVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdJ bWFnZUVsZW1lbnQuY3BwCkBAIC0xMTIsMTIgKzExMiw2IEBAIHZvaWQgU1ZHSW1hZ2VFbGVtZW50 OjpzdmdBdHRyaWJ1dGVDaGFuZ2VkKGNvbnN0IFF1YWxpZmllZE5hbWUmIGF0dHJOYW1lKQogICAg IGlmICghcmVuZGVyZXIpCiAgICAgICAgIHJldHVybjsKIAotICAgIGlmIChTVkdTdHlsZWRUcmFu c2Zvcm1hYmxlRWxlbWVudDo6aXNLbm93bkF0dHJpYnV0ZShhdHRyTmFtZSkpIHsKLSAgICAgICAg cmVuZGVyZXItPnNldE5lZWRzVHJhbnNmb3JtVXBkYXRlKCk7Ci0gICAgICAgIFJlbmRlclNWR1Jl c291cmNlOjptYXJrRm9yTGF5b3V0QW5kUGFyZW50UmVzb3VyY2VJbnZhbGlkYXRpb24ocmVuZGVy ZXIpOwotICAgICAgICByZXR1cm47Ci0gICAgfQotCiAgICAgaWYgKGlzTGVuZ3RoQXR0cmlidXRl KSB7CiAgICAgICAgIHJlbmRlcmVyLT51cGRhdGVGcm9tRWxlbWVudCgpOwogICAgICAgICBSZW5k ZXJTVkdSZXNvdXJjZTo6bWFya0ZvckxheW91dEFuZFBhcmVudFJlc291cmNlSW52YWxpZGF0aW9u KHJlbmRlcmVyLCBmYWxzZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHTGlu ZUVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvc3ZnL1NWR0xpbmVFbGVtZW50LmNwcAppbmRl eCAyZTQzNWM1Li5jM2Q1ZjBiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHTGlu ZUVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdMaW5lRWxlbWVudC5jcHAK QEAgLTkzLDEyICs5Myw2IEBAIHZvaWQgU1ZHTGluZUVsZW1lbnQ6OnN2Z0F0dHJpYnV0ZUNoYW5n ZWQoY29uc3QgUXVhbGlmaWVkTmFtZSYgYXR0ck5hbWUpCiAgICAgaWYgKCFyZW5kZXJlcikKICAg ICAgICAgcmV0dXJuOwogCi0gICAgaWYgKFNWR1N0eWxlZFRyYW5zZm9ybWFibGVFbGVtZW50Ojpp c0tub3duQXR0cmlidXRlKGF0dHJOYW1lKSkgewotICAgICAgICByZW5kZXJlci0+c2V0TmVlZHNU cmFuc2Zvcm1VcGRhdGUoKTsKLSAgICAgICAgUmVuZGVyU1ZHUmVzb3VyY2U6Om1hcmtGb3JMYXlv dXRBbmRQYXJlbnRSZXNvdXJjZUludmFsaWRhdGlvbihyZW5kZXJlcik7Ci0gICAgICAgIHJldHVy bjsKLSAgICB9Ci0KICAgICBpZiAoaXNMZW5ndGhBdHRyaWJ1dGUpIHsKICAgICAgICAgcmVuZGVy ZXItPnNldE5lZWRzUGF0aFVwZGF0ZSgpOwogICAgICAgICBSZW5kZXJTVkdSZXNvdXJjZTo6bWFy a0ZvckxheW91dEFuZFBhcmVudFJlc291cmNlSW52YWxpZGF0aW9uKHJlbmRlcmVyKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdQYXRoRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9zdmcvU1ZHUGF0aEVsZW1lbnQuY3BwCmluZGV4IGM1Njg3M2IuLmU3OThlYWYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdQYXRoRWxlbWVudC5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvc3ZnL1NWR1BhdGhFbGVtZW50LmNwcApAQCAtMjMwLDEyICsyMzAsNiBAQCB2b2lk IFNWR1BhdGhFbGVtZW50OjpzdmdBdHRyaWJ1dGVDaGFuZ2VkKGNvbnN0IFF1YWxpZmllZE5hbWUm IGF0dHJOYW1lKQogICAgIGlmICghcmVuZGVyZXIpCiAgICAgICAgIHJldHVybjsKIAotICAgIGlm IChTVkdTdHlsZWRUcmFuc2Zvcm1hYmxlRWxlbWVudDo6aXNLbm93bkF0dHJpYnV0ZShhdHRyTmFt ZSkpIHsKLSAgICAgICAgcmVuZGVyZXItPnNldE5lZWRzVHJhbnNmb3JtVXBkYXRlKCk7Ci0gICAg ICAgIFJlbmRlclNWR1Jlc291cmNlOjptYXJrRm9yTGF5b3V0QW5kUGFyZW50UmVzb3VyY2VJbnZh bGlkYXRpb24ocmVuZGVyZXIpOwotICAgICAgICByZXR1cm47Ci0gICAgfQotCiAgICAgaWYgKGF0 dHJOYW1lID09IFNWR05hbWVzOjpwYXRoTGVuZ3RoQXR0cgogICAgICAgICB8fCBTVkdMYW5nU3Bh Y2U6OmlzS25vd25BdHRyaWJ1dGUoYXR0ck5hbWUpCiAgICAgICAgIHx8IFNWR0V4dGVybmFsUmVz b3VyY2VzUmVxdWlyZWQ6OmlzS25vd25BdHRyaWJ1dGUoYXR0ck5hbWUpKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvc3ZnL1NWR1BvbHlFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N2 Zy9TVkdQb2x5RWxlbWVudC5jcHAKaW5kZXggOGE3MDM0Ny4uMzMxZTVlYyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvc3ZnL1NWR1BvbHlFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9zdmcvU1ZHUG9seUVsZW1lbnQuY3BwCkBAIC03NiwxMiArNzYsNiBAQCB2b2lkIFNWR1BvbHlF bGVtZW50OjpzdmdBdHRyaWJ1dGVDaGFuZ2VkKGNvbnN0IFF1YWxpZmllZE5hbWUmIGF0dHJOYW1l KQogICAgIGlmICghcmVuZGVyZXIpCiAgICAgICAgIHJldHVybjsKIAotICAgIGlmIChTVkdTdHls ZWRUcmFuc2Zvcm1hYmxlRWxlbWVudDo6aXNLbm93bkF0dHJpYnV0ZShhdHRyTmFtZSkpIHsKLSAg ICAgICAgcmVuZGVyZXItPnNldE5lZWRzVHJhbnNmb3JtVXBkYXRlKCk7Ci0gICAgICAgIFJlbmRl clNWR1Jlc291cmNlOjptYXJrRm9yTGF5b3V0QW5kUGFyZW50UmVzb3VyY2VJbnZhbGlkYXRpb24o cmVuZGVyZXIpOwotICAgICAgICByZXR1cm47Ci0gICAgfQotCiAgICAgaWYgKGF0dHJOYW1lID09 IFNWR05hbWVzOjpwb2ludHNBdHRyKSB7CiAgICAgICAgIHJlbmRlcmVyLT5zZXROZWVkc1BhdGhV cGRhdGUoKTsKICAgICAgICAgUmVuZGVyU1ZHUmVzb3VyY2U6Om1hcmtGb3JMYXlvdXRBbmRQYXJl bnRSZXNvdXJjZUludmFsaWRhdGlvbihyZW5kZXJlcik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9zdmcvU1ZHUmVjdEVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvc3ZnL1NWR1JlY3RF bGVtZW50LmNwcAppbmRleCAxMGM1NzQzLi4yYzZlZTg3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9zdmcvU1ZHUmVjdEVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdS ZWN0RWxlbWVudC5jcHAKQEAgLTExMCwxMiArMTEwLDYgQEAgdm9pZCBTVkdSZWN0RWxlbWVudDo6 c3ZnQXR0cmlidXRlQ2hhbmdlZChjb25zdCBRdWFsaWZpZWROYW1lJiBhdHRyTmFtZSkKICAgICBp ZiAoIXJlbmRlcmVyKQogICAgICAgICByZXR1cm47CiAKLSAgICBpZiAoU1ZHU3R5bGVkVHJhbnNm b3JtYWJsZUVsZW1lbnQ6OmlzS25vd25BdHRyaWJ1dGUoYXR0ck5hbWUpKSB7Ci0gICAgICAgIHJl bmRlcmVyLT5zZXROZWVkc1RyYW5zZm9ybVVwZGF0ZSgpOwotICAgICAgICBSZW5kZXJTVkdSZXNv dXJjZTo6bWFya0ZvckxheW91dEFuZFBhcmVudFJlc291cmNlSW52YWxpZGF0aW9uKHJlbmRlcmVy KTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KLQogICAgIGlmIChpc0xlbmd0aEF0dHJpYnV0ZSkg ewogICAgICAgICByZW5kZXJlci0+c2V0TmVlZHNQYXRoVXBkYXRlKCk7CiAgICAgICAgIFJlbmRl clNWR1Jlc291cmNlOjptYXJrRm9yTGF5b3V0QW5kUGFyZW50UmVzb3VyY2VJbnZhbGlkYXRpb24o cmVuZGVyZXIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3ZnL1NWR1N0eWxlZFRyYW5z Zm9ybWFibGVFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdTdHlsZWRUcmFuc2Zv cm1hYmxlRWxlbWVudC5jcHAKaW5kZXggY2UxYzVmZC4uYmFmYTNiNiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvc3ZnL1NWR1N0eWxlZFRyYW5zZm9ybWFibGVFbGVtZW50LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9zdmcvU1ZHU3R5bGVkVHJhbnNmb3JtYWJsZUVsZW1lbnQuY3BwCkBAIC0y Niw2ICsyNiw3IEBACiAjaW5jbHVkZSAiQWZmaW5lVHJhbnNmb3JtLmgiCiAjaW5jbHVkZSAiQXR0 cmlidXRlLmgiCiAjaW5jbHVkZSAiUmVuZGVyU1ZHUGF0aC5oIgorI2luY2x1ZGUgIlJlbmRlclNW R1Jlc291cmNlLmgiCiAjaW5jbHVkZSAiU1ZHTmFtZXMuaCIKIAogbmFtZXNwYWNlIFdlYkNvcmUg ewpAQCAtODAsNiArODEsMjEgQEAgdm9pZCBTVkdTdHlsZWRUcmFuc2Zvcm1hYmxlRWxlbWVudDo6 cGFyc2VNYXBwZWRBdHRyaWJ1dGUoQXR0cmlidXRlKiBhdHRyKQogICAgICAgICBTVkdTdHlsZWRM b2NhdGFibGVFbGVtZW50OjpwYXJzZU1hcHBlZEF0dHJpYnV0ZShhdHRyKTsKIH0KIAordm9pZCBT VkdTdHlsZWRUcmFuc2Zvcm1hYmxlRWxlbWVudDo6c3ZnQXR0cmlidXRlQ2hhbmdlZChjb25zdCBR dWFsaWZpZWROYW1lJiBhdHRyTmFtZSkKK3sKKyAgICBTVkdTdHlsZWRMb2NhdGFibGVFbGVtZW50 OjpzdmdBdHRyaWJ1dGVDaGFuZ2VkKGF0dHJOYW1lKTsKKworICAgIGlmICghU1ZHU3R5bGVkVHJh bnNmb3JtYWJsZUVsZW1lbnQ6OmlzS25vd25BdHRyaWJ1dGUoYXR0ck5hbWUpKQorICAgICAgICBy ZXR1cm47CisKKyAgICBSZW5kZXJPYmplY3QqIG9iamVjdCA9IHJlbmRlcmVyKCk7CisgICAgaWYg KCFvYmplY3QpCisgICAgICAgIHJldHVybjsKKworICAgIG9iamVjdC0+c2V0TmVlZHNUcmFuc2Zv cm1VcGRhdGUoKTsKKyAgICBSZW5kZXJTVkdSZXNvdXJjZTo6bWFya0ZvckxheW91dEFuZFBhcmVu dFJlc291cmNlSW52YWxpZGF0aW9uKG9iamVjdCk7Cit9CisKIHZvaWQgU1ZHU3R5bGVkVHJhbnNm b3JtYWJsZUVsZW1lbnQ6OnN5bmNocm9uaXplUHJvcGVydHkoY29uc3QgUXVhbGlmaWVkTmFtZSYg YXR0ck5hbWUpCiB7CiAgICAgU1ZHU3R5bGVkTG9jYXRhYmxlRWxlbWVudDo6c3luY2hyb25pemVQ cm9wZXJ0eShhdHRyTmFtZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHU3R5 bGVkVHJhbnNmb3JtYWJsZUVsZW1lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdTdHlsZWRU cmFuc2Zvcm1hYmxlRWxlbWVudC5oCmluZGV4IGNiZDcwZWQuLjlkNjgzNGEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdTdHlsZWRUcmFuc2Zvcm1hYmxlRWxlbWVudC5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdTdHlsZWRUcmFuc2Zvcm1hYmxlRWxlbWVudC5oCkBAIC01 OCw2ICs1OCw3IEBAIHByb3RlY3RlZDoKICAgICBTVkdTdHlsZWRUcmFuc2Zvcm1hYmxlRWxlbWVu dChjb25zdCBRdWFsaWZpZWROYW1lJiwgRG9jdW1lbnQqKTsKIAogICAgIHZpcnR1YWwgdm9pZCBw YXJzZU1hcHBlZEF0dHJpYnV0ZShBdHRyaWJ1dGUqKTsKKyAgICB2aXJ0dWFsIHZvaWQgc3ZnQXR0 cmlidXRlQ2hhbmdlZChjb25zdCBRdWFsaWZpZWROYW1lJik7CiAgICAgdmlydHVhbCB2b2lkIHN5 bmNocm9uaXplUHJvcGVydHkoY29uc3QgUXVhbGlmaWVkTmFtZSYpOwogICAgIHZvaWQgZmlsbFBh c3NlZEF0dHJpYnV0ZVRvUHJvcGVydHlUeXBlTWFwKEF0dHJpYnV0ZVRvUHJvcGVydHlUeXBlTWFw Jik7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdVc2VFbGVtZW50LmNwcCBi L1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdVc2VFbGVtZW50LmNwcAppbmRleCBhOGExY2Y5Li40MjM5 ZjY2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3ZnL1NWR1VzZUVsZW1lbnQuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdVc2VFbGVtZW50LmNwcApAQCAtMTg1LDEyICsxODUs NiBAQCB2b2lkIFNWR1VzZUVsZW1lbnQ6OnN2Z0F0dHJpYnV0ZUNoYW5nZWQoY29uc3QgUXVhbGlm aWVkTmFtZSYgYXR0ck5hbWUpCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBpZiAoU1ZH U3R5bGVkVHJhbnNmb3JtYWJsZUVsZW1lbnQ6OmlzS25vd25BdHRyaWJ1dGUoYXR0ck5hbWUpKSB7 Ci0gICAgICAgIG9iamVjdC0+c2V0TmVlZHNUcmFuc2Zvcm1VcGRhdGUoKTsKLSAgICAgICAgUmVu ZGVyU1ZHUmVzb3VyY2U6Om1hcmtGb3JMYXlvdXRBbmRQYXJlbnRSZXNvdXJjZUludmFsaWRhdGlv bihvYmplY3QpOwotICAgICAgICByZXR1cm47Ci0gICAgfQotCiAgICAgaWYgKFNWR0xhbmdTcGFj ZTo6aXNLbm93bkF0dHJpYnV0ZShhdHRyTmFtZSkKICAgICAgICAgfHwgU1ZHRXh0ZXJuYWxSZXNv dXJjZXNSZXF1aXJlZDo6aXNLbm93bkF0dHJpYnV0ZShhdHRyTmFtZSkpCiAgICAgICAgIGludmFs aWRhdGVTaGFkb3dUcmVlKCk7Cg==