65173 2011-07-26 04:35:08 -0700 Use AtomicString as return value for SVGURIReference::getTarget() 2023-12-28 10:35:05 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED CONFIGURATION CHANGED P2 Normal --- 65172 1 paroga paroga ahmad.saleem792 annevk bfulgham dbates krit rwlbuis webkit.review.bot zimmermann oldest_to_newest 442176 0 paroga 2011-07-26 04:35:08 -0700 Use AtomicString as return value for SVGURIReference::getTarget() 442178 1 101985 paroga 2011-07-26 04:42:15 -0700 Created attachment 101985 Patch 500016 2 101985 bfulgham 2011-11-10 09:57:41 -0800 Comment on attachment 101985 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=101985&action=review Looks good to me. Build bots seem happy, so let's r+ it. > Source/WebCore/ChangeLog:8 > + Use AtomicString instead of String to avoid unnecessary type conversations. I think you mean "type conversions" here. ;-) > Source/WebCore/rendering/svg/SVGResources.cpp:142 > if (element->hasTagName(SVGNames::patternTag)) It would be neat if the href calls in the implementation returned AtomicStrings as well, but that would be a much bigger change! :-) 1903583 3 ahmad.saleem792 2022-10-05 16:10:10 -0700 It seems this r+ patch didn't landed. Do we need this anymore? Thanks! 2002158 4 annevk 2023-12-28 10:35:05 -0800 This appears to have been refactored already. 101985 2011-07-26 04:42:15 -0700 2011-11-10 23:53:58 -0800 Patch bug-65173.patch text/plain 8834 paroga ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBlZTJiZjAzLi42MjE3Yzg4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkg QEAKKzIwMTEtMDctMjYgIFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdlYmtpdC5vcmc+CisK KyAgICAgICAgVXNlIEF0b21pY1N0cmluZyBhcyByZXR1cm4gdmFsdWUgZm9yIFNWR1VSSVJlZmVy ZW5jZTo6Z2V0VGFyZ2V0KCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTY1MTczCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgVXNlIEF0b21pY1N0cmluZyBpbnN0ZWFkIG9mIFN0cmluZyB0byBhdm9pZCB1bm5l Y2Vzc2FyeSB0eXBlIGNvbnZlcnNhdGlvbnMuCisKKyAgICAgICAgKiByZW5kZXJpbmcvc3ZnL1Jl bmRlclNWR1RleHRQYXRoLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclNWR1RleHRQYXRo OjpsYXlvdXRQYXRoKToKKyAgICAgICAgKiByZW5kZXJpbmcvc3ZnL1NWR1Jlc291cmNlcy5jcHA6 CisgICAgICAgIChXZWJDb3JlOjp0YXJnZXRSZWZlcmVuY2VGcm9tUmVzb3VyY2UpOgorICAgICAg ICAoV2ViQ29yZTo6U1ZHUmVzb3VyY2VzOjpidWlsZENhY2hlZFJlc291cmNlcyk6CisgICAgICAg ICogc3ZnL1NWR0FsdEdseXBoRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTVkdBbHRH bHlwaEVsZW1lbnQ6Omhhc1ZhbGlkR2x5cGhFbGVtZW50cyk6CisgICAgICAgICogc3ZnL1NWR1Rl eHRQYXRoRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTVkdUZXh0UGF0aEVsZW1lbnQ6 Omluc2VydGVkSW50b0RvY3VtZW50KToKKyAgICAgICAgKiBzdmcvU1ZHVVJJUmVmZXJlbmNlLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlNWR1VSSVJlZmVyZW5jZTo6Z2V0VGFyZ2V0KToKKyAgICAg ICAgKiBzdmcvU1ZHVVJJUmVmZXJlbmNlLmg6CisgICAgICAgICogc3ZnL1NWR1VzZUVsZW1lbnQu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6U1ZHVXNlRWxlbWVudDo6YnVpbGRQZW5kaW5nUmVzb3Vy Y2UpOgorICAgICAgICAoV2ViQ29yZTo6U1ZHVXNlRWxlbWVudDo6aGFzQ3ljbGVVc2VSZWZlcmVu Y2luZyk6CisgICAgICAgIChXZWJDb3JlOjpTVkdVc2VFbGVtZW50OjpleHBhbmRVc2VFbGVtZW50 c0luU2hhZG93VHJlZSk6CisKIDIwMTEtMDctMjIgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtp dC5vcmc+CiAKICAgICAgICAgUmV2ZXJ0IHI5MTU5NSBmb3IgaXQgYnJva2UgQ2hyb21pdW0gV2lu ZG93cyBidWlsZC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVu ZGVyU1ZHVGV4dFBhdGguY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJT VkdUZXh0UGF0aC5jcHAKaW5kZXggODY4MmZiMS4uN2FlZjYzMyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdUZXh0UGF0aC5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdUZXh0UGF0aC5jcHAKQEAgLTQ0LDEzICs0 NCwxMyBAQCBSZW5kZXJTVkdUZXh0UGF0aDo6UmVuZGVyU1ZHVGV4dFBhdGgoTm9kZSogbikKIFBh dGggUmVuZGVyU1ZHVGV4dFBhdGg6OmxheW91dFBhdGgoKSBjb25zdAogewogICAgIFNWR1RleHRQ YXRoRWxlbWVudCogdGV4dFBhdGhFbGVtZW50ID0gc3RhdGljX2Nhc3Q8U1ZHVGV4dFBhdGhFbGVt ZW50Kj4obm9kZSgpKTsKLSAgICAgICAgU3RyaW5nIHBhdGhJZCA9IFNWR1VSSVJlZmVyZW5jZTo6 Z2V0VGFyZ2V0KHRleHRQYXRoRWxlbWVudC0+aHJlZigpKTsKLSAgICBFbGVtZW50KiB0YXJnZXRF bGVtZW50ID0gdGV4dFBhdGhFbGVtZW50LT50cmVlU2NvcGUoKS0+Z2V0RWxlbWVudEJ5SWQocGF0 aElkKTsgICAgCisgICAgQXRvbWljU3RyaW5nIHBhdGhJZCA9IFNWR1VSSVJlZmVyZW5jZTo6Z2V0 VGFyZ2V0KHRleHRQYXRoRWxlbWVudC0+aHJlZigpKTsKKyAgICBFbGVtZW50KiB0YXJnZXRFbGVt ZW50ID0gdGV4dFBhdGhFbGVtZW50LT50cmVlU2NvcGUoKS0+Z2V0RWxlbWVudEJ5SWQocGF0aElk KTsKICAgICBpZiAoIXRhcmdldEVsZW1lbnQgfHwgIXRhcmdldEVsZW1lbnQtPmhhc1RhZ05hbWUo U1ZHTmFtZXM6OnBhdGhUYWcpKQogICAgICAgICByZXR1cm4gUGF0aCgpOwotICAgIAorCiAgICAg U1ZHUGF0aEVsZW1lbnQqIHBhdGhFbGVtZW50ID0gc3RhdGljX2Nhc3Q8U1ZHUGF0aEVsZW1lbnQq Pih0YXJnZXRFbGVtZW50KTsKLSAgICAKKwogICAgIFBhdGggcGF0aERhdGE7CiAgICAgcGF0aEVs ZW1lbnQtPnRvUGF0aERhdGEocGF0aERhdGEpOwogICAgIC8vIFNwZWM6ICBUaGUgdHJhbnNmb3Jt IGF0dHJpYnV0ZSBvbiB0aGUgcmVmZXJlbmNlZCAncGF0aCcgZWxlbWVudCByZXByZXNlbnRzIGEK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvU1ZHUmVzb3VyY2VzLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvU1ZHUmVzb3VyY2VzLmNwcAppbmRleCA1 OWY0NDJhLi41ZWU0ZWYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3Zn L1NWR1Jlc291cmNlcy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9TVkdS ZXNvdXJjZXMuY3BwCkBAIC0xMzYsNyArMTM2LDcgQEAgc3RhdGljIEhhc2hTZXQ8QXRvbWljU3Ry aW5nSW1wbCo+JiBjaGFpbmFibGVSZXNvdXJjZVRhZ3MoKQogICAgIHJldHVybiBzX3RhZ0xpc3Q7 CiB9CiAKLXN0YXRpYyBpbmxpbmUgU3RyaW5nIHRhcmdldFJlZmVyZW5jZUZyb21SZXNvdXJjZShT VkdFbGVtZW50KiBlbGVtZW50KQorc3RhdGljIGlubGluZSBBdG9taWNTdHJpbmcgdGFyZ2V0UmVm ZXJlbmNlRnJvbVJlc291cmNlKFNWR0VsZW1lbnQqIGVsZW1lbnQpCiB7CiAgICAgU3RyaW5nIHRh cmdldDsKICAgICBpZiAoZWxlbWVudC0+aGFzVGFnTmFtZShTVkdOYW1lczo6cGF0dGVyblRhZykp CkBAIC0yNzIsNyArMjcyLDcgQEAgYm9vbCBTVkdSZXNvdXJjZXM6OmJ1aWxkQ2FjaGVkUmVzb3Vy Y2VzKGNvbnN0IFJlbmRlck9iamVjdCogb2JqZWN0LCBjb25zdCBTVkdSZW4KICAgICB9CiAKICAg ICBpZiAoY2hhaW5hYmxlUmVzb3VyY2VUYWdzKCkuY29udGFpbnModGFnTmFtZUltcGwpKSB7Ci0g ICAgICAgIEF0b21pY1N0cmluZyBpZCh0YXJnZXRSZWZlcmVuY2VGcm9tUmVzb3VyY2UoZWxlbWVu dCkpOworICAgICAgICBBdG9taWNTdHJpbmcgaWQgPSB0YXJnZXRSZWZlcmVuY2VGcm9tUmVzb3Vy Y2UoZWxlbWVudCk7CiAgICAgICAgIGlmIChzZXRMaW5rZWRSZXNvdXJjZShnZXRSZW5kZXJTVkdS ZXNvdXJjZUNvbnRhaW5lckJ5SWQoZG9jdW1lbnQsIGlkKSkpCiAgICAgICAgICAgICBmb3VuZFJl c291cmNlcyA9IHRydWU7CiAgICAgICAgIGVsc2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3N2Zy9TVkdBbHRHbHlwaEVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvc3ZnL1NWR0FsdEds eXBoRWxlbWVudC5jcHAKaW5kZXggZmI2NTY4MS4uMmVhMjAzNSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvc3ZnL1NWR0FsdEdseXBoRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv c3ZnL1NWR0FsdEdseXBoRWxlbWVudC5jcHAKQEAgLTg5LDcgKzg5LDcgQEAgUmVuZGVyT2JqZWN0 KiBTVkdBbHRHbHlwaEVsZW1lbnQ6OmNyZWF0ZVJlbmRlcmVyKFJlbmRlckFyZW5hKiBhcmVuYSwg UmVuZGVyU3R5bGUKIAogYm9vbCBTVkdBbHRHbHlwaEVsZW1lbnQ6Omhhc1ZhbGlkR2x5cGhFbGVt ZW50cyhWZWN0b3I8U3RyaW5nPiYgZ2x5cGhOYW1lcykgY29uc3QKIHsKLSAgICBTdHJpbmcgdGFy Z2V0ID0gZ2V0VGFyZ2V0KGZhc3RHZXRBdHRyaWJ1dGUoWExpbmtOYW1lczo6aHJlZkF0dHIpKTsK KyAgICBBdG9taWNTdHJpbmcgdGFyZ2V0ID0gZ2V0VGFyZ2V0KGZhc3RHZXRBdHRyaWJ1dGUoWExp bmtOYW1lczo6aHJlZkF0dHIpKTsKICAgICBFbGVtZW50KiBlbGVtZW50ID0gdHJlZVNjb3BlKCkt PmdldEVsZW1lbnRCeUlkKHRhcmdldCk7CiAgICAgaWYgKCFlbGVtZW50KQogICAgICAgICByZXR1 cm4gZmFsc2U7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHVGV4dFBhdGhFbGVt ZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdUZXh0UGF0aEVsZW1lbnQuY3BwCmluZGV4 IGY5NDZmNWEuLjJjMWM4MmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdUZXh0 UGF0aEVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdUZXh0UGF0aEVsZW1l bnQuY3BwCkBAIC0xNTEsNyArMTUxLDcgQEAgdm9pZCBTVkdUZXh0UGF0aEVsZW1lbnQ6Omluc2Vy dGVkSW50b0RvY3VtZW50KCkKIHsKICAgICBTVkdUZXh0Q29udGVudEVsZW1lbnQ6Omluc2VydGVk SW50b0RvY3VtZW50KCk7CiAKLSAgICBTdHJpbmcgaWQgPSBTVkdVUklSZWZlcmVuY2U6OmdldFRh cmdldChocmVmKCkpOworICAgIEF0b21pY1N0cmluZyBpZCA9IFNWR1VSSVJlZmVyZW5jZTo6Z2V0 VGFyZ2V0KGhyZWYoKSk7CiAgICAgRWxlbWVudCogdGFyZ2V0RWxlbWVudCA9IHRyZWVTY29wZSgp LT5nZXRFbGVtZW50QnlJZChpZCk7CiAgICAgaWYgKCF0YXJnZXRFbGVtZW50KSB7CiAgICAgICAg IGRvY3VtZW50KCktPmFjY2Vzc1NWR0V4dGVuc2lvbnMoKS0+YWRkUGVuZGluZ1Jlc291cmNlKGlk LCB0aGlzKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdVUklSZWZlcmVuY2Uu Y3BwIGIvU291cmNlL1dlYkNvcmUvc3ZnL1NWR1VSSVJlZmVyZW5jZS5jcHAKaW5kZXggNmYxYWRm ZS4uNTIzYzljZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3ZnL1NWR1VSSVJlZmVyZW5j ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvc3ZnL1NWR1VSSVJlZmVyZW5jZS5jcHAKQEAgLTQy LDIwICs0MiwyMCBAQCBib29sIFNWR1VSSVJlZmVyZW5jZTo6aXNLbm93bkF0dHJpYnV0ZShjb25z dCBRdWFsaWZpZWROYW1lJiBhdHRyTmFtZSkKICAgICByZXR1cm4gYXR0ck5hbWUubWF0Y2hlcyhY TGlua05hbWVzOjpocmVmQXR0cik7CiB9CiAKLVN0cmluZyBTVkdVUklSZWZlcmVuY2U6OmdldFRh cmdldChjb25zdCBTdHJpbmcmIHVybCkKK0F0b21pY1N0cmluZyBTVkdVUklSZWZlcmVuY2U6Omdl dFRhcmdldChjb25zdCBTdHJpbmcmIHVybCkKIHsKICAgICBpZiAodXJsLnN0YXJ0c1dpdGgoInVy bCgiKSkgeyAvLyBVUkkgUmVmZXJlbmNlcywgaWUuIGZpbGw6dXJsKCN0YXJnZXQpCiAgICAgICAg IHNpemVfdCBzdGFydCA9IHVybC5maW5kKCcjJykgKyAxOwogICAgICAgICBzaXplX3QgZW5kID0g dXJsLnJldmVyc2VGaW5kKCcpJyk7Ci0gICAgICAgIHJldHVybiB1cmwuc3Vic3RyaW5nKHN0YXJ0 LCBlbmQgLSBzdGFydCk7CisgICAgICAgIHJldHVybiBBdG9taWNTdHJpbmcodXJsLmNoYXJhY3Rl cnMoKSArIHN0YXJ0LCBlbmQgLSBzdGFydCk7CiAgICAgfQogICAgIGlmICh1cmwuZmluZCgnIycp ICE9IG5vdEZvdW5kKSB7IC8vIGZvcm1hdCBpcyAjdGFyZ2V0CiAgICAgICAgIHNpemVfdCBzdGFy dCA9IHVybC5maW5kKCcjJykgKyAxOwotICAgICAgICByZXR1cm4gdXJsLnN1YnN0cmluZyhzdGFy dCwgdXJsLmxlbmd0aCgpIC0gc3RhcnQpOworICAgICAgICByZXR1cm4gQXRvbWljU3RyaW5nKHVy bC5jaGFyYWN0ZXJzKCkgKyBzdGFydCwgdXJsLmxlbmd0aCgpIC0gc3RhcnQpOwogICAgIH0KIAog ICAgIC8vIFRoZSB1cmwgZG9lc24ndCBoYXZlIGFueSB0YXJnZXQuCi0gICAgcmV0dXJuIFN0cmlu ZygpOworICAgIHJldHVybiBudWxsQXRvbTsKIH0KIAogdm9pZCBTVkdVUklSZWZlcmVuY2U6OmFk ZFN1cHBvcnRlZEF0dHJpYnV0ZXMoSGFzaFNldDxRdWFsaWZpZWROYW1lPiYgc3VwcG9ydGVkQXR0 cmlidXRlcykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdVUklSZWZlcmVuY2Uu aCBiL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdVUklSZWZlcmVuY2UuaAppbmRleCA5Y2QxNTI5Li4x NTgzZGRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHVVJJUmVmZXJlbmNlLmgK KysrIGIvU291cmNlL1dlYkNvcmUvc3ZnL1NWR1VSSVJlZmVyZW5jZS5oCkBAIC0zNyw3ICszNyw3 IEBAIHB1YmxpYzoKICAgICBib29sIGlzS25vd25BdHRyaWJ1dGUoY29uc3QgUXVhbGlmaWVkTmFt ZSYpOwogICAgIHZvaWQgYWRkU3VwcG9ydGVkQXR0cmlidXRlcyhIYXNoU2V0PFF1YWxpZmllZE5h bWU+Jik7CiAKLSAgICBzdGF0aWMgU3RyaW5nIGdldFRhcmdldChjb25zdCBTdHJpbmcmIHVybCk7 CisgICAgc3RhdGljIEF0b21pY1N0cmluZyBnZXRUYXJnZXQoY29uc3QgU3RyaW5nJiB1cmwpOwog CiBwcm90ZWN0ZWQ6CiAgICAgdmlydHVhbCB2b2lkIHNldEhyZWZCYXNlVmFsdWUoY29uc3QgU3Ry aW5nJikgPSAwOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3ZnL1NWR1VzZUVsZW1lbnQu Y3BwIGIvU291cmNlL1dlYkNvcmUvc3ZnL1NWR1VzZUVsZW1lbnQuY3BwCmluZGV4IDc0ODg4N2Yu LjUwNmI1NmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdVc2VFbGVtZW50LmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHVXNlRWxlbWVudC5jcHAKQEAgLTQ3NCw3ICs0 NzQsNyBAQCB2b2lkIFNWR1VzZUVsZW1lbnQ6OmJ1aWxkUGVuZGluZ1Jlc291cmNlKCkKICAgICAv LyBJZiB3ZSdyZSBjYWxsZWQgdGhlIGZpcnN0IHRpbWUgKGR1cmluZyBzaGFkb3cgdHJlZSByb290 IGNyZWF0aW9uIGZyb20gUmVuZGVyU1ZHU2hhZG93VHJlZVJvb3RDb250YWluZXIpCiAgICAgLy8g d2UgZWl0aGVyIGRldGVybWluZSB0aGF0IG91ciB0YXJnZXQgaXMgYXZhaWxhYmxlIG9yIG5vdCAt IHRoZW4gd2UgYWRkIG91cnNlbHZlcyB0byB0aGUgcGVuZGluZyByZXNvdXJjZSBsaXN0CiAgICAg Ly8gT25jZSB0aGUgcGVuZGluZyByZXNvdXJjZSBhcHBlYXJzLCBpdCB3aWxsIGNhbGwgYnVpbGRQ ZW5kaW5nUmVzb3VyY2UoKSwgc28gd2UncmUgY2FsbGVkIGEgc2Vjb25kIHRpbWUuCi0gICAgU3Ry aW5nIGlkID0gU1ZHVVJJUmVmZXJlbmNlOjpnZXRUYXJnZXQoaHJlZigpKTsKKyAgICBBdG9taWNT dHJpbmcgaWQgPSBTVkdVUklSZWZlcmVuY2U6OmdldFRhcmdldChocmVmKCkpOwogICAgIEVsZW1l bnQqIHRhcmdldEVsZW1lbnQgPSB0cmVlU2NvcGUoKS0+Z2V0RWxlbWVudEJ5SWQoaWQpOwogICAg IEFTU0VSVCghbV90YXJnZXRFbGVtZW50SW5zdGFuY2UpOwogCkBAIC01MTksNyArNTE5LDcgQEAg dm9pZCBTVkdVc2VFbGVtZW50OjpidWlsZFNoYWRvd0FuZEluc3RhbmNlVHJlZShTVkdTaGFkb3dU cmVlUm9vdEVsZW1lbnQqIHNoYWRvd1IKICAgICAvLyBTb2x1dGlvbjogYmxvY2sgYW55IHVwZGF0 ZXMgdG8gdGhlIHNoYWRvdyB0cmVlIHdoaWxlIHdlJ3JlIGJ1aWxkaW5nIGl0LgogICAgIFNoYWRv d1RyZWVVcGRhdGVCbG9ja2VyIGJsb2NrZXIodGhpcyk7CiAKLSAgICBTdHJpbmcgaWQgPSBTVkdV UklSZWZlcmVuY2U6OmdldFRhcmdldChocmVmKCkpOworICAgIEF0b21pY1N0cmluZyBpZCA9IFNW R1VSSVJlZmVyZW5jZTo6Z2V0VGFyZ2V0KGhyZWYoKSk7CiAgICAgRWxlbWVudCogdGFyZ2V0RWxl bWVudCA9IHRyZWVTY29wZSgpLT5nZXRFbGVtZW50QnlJZChpZCk7CiAgICAgaWYgKCF0YXJnZXRF bGVtZW50KSB7CiAgICAgICAgIC8vIFRoZSBvbmx5IHRpbWUgd2Ugc2hvdWxkIGdldCBoZXJlIGlz IHdoZW4gdGhlIHVzZSBlbGVtZW50IGhhcyBub3QgYmVlbgpAQCAtNzcxLDcgKzc3MSw3IEBAIHZv aWQgU1ZHVXNlRWxlbWVudDo6YnVpbGRJbnN0YW5jZVRyZWUoU1ZHRWxlbWVudCogdGFyZ2V0LCBT VkdFbGVtZW50SW5zdGFuY2UqIHRhCiAKIGJvb2wgU1ZHVXNlRWxlbWVudDo6aGFzQ3ljbGVVc2VS ZWZlcmVuY2luZyhTVkdVc2VFbGVtZW50KiB1c2UsIFNWR0VsZW1lbnRJbnN0YW5jZSogdGFyZ2V0 SW5zdGFuY2UsIFNWR0VsZW1lbnQqJiBuZXdUYXJnZXQpCiB7Ci0gICAgU3RyaW5nIGlkID0gU1ZH VVJJUmVmZXJlbmNlOjpnZXRUYXJnZXQodXNlLT5ocmVmKCkpOworICAgIEF0b21pY1N0cmluZyBp ZCA9IFNWR1VSSVJlZmVyZW5jZTo6Z2V0VGFyZ2V0KHVzZS0+aHJlZigpKTsKICAgICBFbGVtZW50 KiB0YXJnZXRFbGVtZW50ID0gdHJlZVNjb3BlKCktPmdldEVsZW1lbnRCeUlkKGlkKTsgCiAgICAg bmV3VGFyZ2V0ID0gMDsKICAgICBpZiAodGFyZ2V0RWxlbWVudCAmJiB0YXJnZXRFbGVtZW50LT5p c1NWR0VsZW1lbnQoKSkKQEAgLTg1Miw3ICs4NTIsNyBAQCB2b2lkIFNWR1VzZUVsZW1lbnQ6OmV4 cGFuZFVzZUVsZW1lbnRzSW5TaGFkb3dUcmVlKE5vZGUqIGVsZW1lbnQpCiAgICAgaWYgKGVsZW1l bnQtPmhhc1RhZ05hbWUoU1ZHTmFtZXM6OnVzZVRhZykpIHsKICAgICAgICAgU1ZHVXNlRWxlbWVu dCogdXNlID0gc3RhdGljX2Nhc3Q8U1ZHVXNlRWxlbWVudCo+KGVsZW1lbnQpOwogCi0gICAgICAg IFN0cmluZyBpZCA9IFNWR1VSSVJlZmVyZW5jZTo6Z2V0VGFyZ2V0KHVzZS0+aHJlZigpKTsKKyAg ICAgICAgQXRvbWljU3RyaW5nIGlkID0gU1ZHVVJJUmVmZXJlbmNlOjpnZXRUYXJnZXQodXNlLT5o cmVmKCkpOwogICAgICAgICBFbGVtZW50KiB0YXJnZXRFbGVtZW50ID0gdHJlZVNjb3BlKCktPmdl dEVsZW1lbnRCeUlkKGlkKTsgCiAgICAgICAgIFNWR0VsZW1lbnQqIHRhcmdldCA9IDA7CiAgICAg ICAgIGlmICh0YXJnZXRFbGVtZW50ICYmIHRhcmdldEVsZW1lbnQtPmlzU1ZHRWxlbWVudCgpKQo=