65175 2011-07-26 05:47:08 -0700 Fix AtomicString vs. String usage in XPath code 2012-03-01 14:01:31 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All NEW P2 Normal --- 65172 1 paroga paroga ap bfulgham dglazkov gustavo.noronha gustavo webkit.review.bot xan.lopez oldest_to_newest 442191 0 paroga 2011-07-26 05:47:08 -0700 Fix AtomicString vs. String usage in XPath code 442194 1 101989 paroga 2011-07-26 05:49:52 -0700 Created attachment 101989 Patch 442195 2 webkit.review.bot 2011-07-26 05:51:42 -0700 Attachment 101989 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebCore/xml/XPathStep.h:61: Missing space inside { }. [whitespace/braces] [5] Source/WebCore/xml/XPathStep.h:62: Missing space inside { }. [whitespace/braces] [5] Total errors found: 2 in 15 files If any of these errors are false positives, please file a bug against check-webkit-style. 442196 3 101989 gyuyoung.kim 2011-07-26 05:54:07 -0700 Comment on attachment 101989 Patch Attachment 101989 did not pass efl-ews (efl): Output: http://queues.webkit.org/results/9249423 442198 4 101989 gustavo.noronha 2011-07-26 05:56:45 -0700 Comment on attachment 101989 Patch Attachment 101989 did not pass gtk-ews (gtk): Output: http://queues.webkit.org/results/9249424 442201 5 101989 webkit-ews 2011-07-26 06:02:04 -0700 Comment on attachment 101989 Patch Attachment 101989 did not pass qt-ews (qt): Output: http://queues.webkit.org/results/9244428 442204 6 101989 webkit.review.bot 2011-07-26 06:05:07 -0700 Comment on attachment 101989 Patch Attachment 101989 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/9245430 442217 7 101989 webkit.review.bot 2011-07-26 06:40:26 -0700 Comment on attachment 101989 Patch Attachment 101989 did not pass cr-mac-ews (chromium): Output: http://queues.webkit.org/results/9249430 442312 8 101989 paroga 2011-07-26 09:34:45 -0700 Comment on attachment 101989 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=101989&action=review > Source/WebCore/xml/NativeXPathNSResolver.cpp:53 > + return m_node ? m_node->lookupNamespaceURI(prefix) : nullAtom; The build break is caused by this line. This change depends on an other patch, which changes the return value of lookupNamespaceURI to AtomicString too. Please ignore the build break on the EWS for now. 442423 9 101989 webkit.review.bot 2011-07-26 12:01:42 -0700 Comment on attachment 101989 Patch Attachment 101989 did not pass mac-ews (mac): Output: http://queues.webkit.org/results/9248436 442456 10 101989 ap 2011-07-26 12:34:00 -0700 Comment on attachment 101989 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=101989&action=review I see that the patch adds a number of String->AtomicString conversions, but I don't see which ones are removed. Could you please explain that in ChangeLog, for the benefit of lazy reviewers and everyone else reading patches? > Source/WebCore/ChangeLog:8 > + Use AtomicString instead of String to avoid unnecessary type conversations. conversations - > conversions. 500020 11 bfulgham 2011-11-10 09:59:23 -0800 Could you link the bug ID with the patch that is required before this one can build properly? 568896 12 101989 eric 2012-03-01 14:01:31 -0800 Comment on attachment 101989 Patch We should do this in smaller pieces, or with more explanation in the ChangeLog. 101989 2011-07-26 05:49:52 -0700 2012-03-01 14:01:31 -0800 Patch bug-65175.patch text/plain 12416 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 ZG93cyBidWlsZC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTQ3Vz dG9tWFBhdGhOU1Jlc29sdmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTQ3Vz dG9tWFBhdGhOU1Jlc29sdmVyLmNwcAppbmRleCA1YjJlZDdlLi5kMzcxMGEyIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0N1c3RvbVhQYXRoTlNSZXNvbHZlci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNDdXN0b21YUGF0aE5TUmVzb2x2ZXIu Y3BwCkBAIC02NSw3ICs2NSw3IEBAIEpTQ3VzdG9tWFBhdGhOU1Jlc29sdmVyOjp+SlNDdXN0b21Y UGF0aE5TUmVzb2x2ZXIoKQogewogfQogCi1TdHJpbmcgSlNDdXN0b21YUGF0aE5TUmVzb2x2ZXI6 Omxvb2t1cE5hbWVzcGFjZVVSSShjb25zdCBTdHJpbmcmIHByZWZpeCkKK0F0b21pY1N0cmluZyBK U0N1c3RvbVhQYXRoTlNSZXNvbHZlcjo6bG9va3VwTmFtZXNwYWNlVVJJKGNvbnN0IFN0cmluZyYg cHJlZml4KQogewogICAgIEFTU0VSVChtX2N1c3RvbVJlc29sdmVyKTsKIApAQCAtOTUsMTIgKzk1 LDEyIEBAIFN0cmluZyBKU0N1c3RvbVhQYXRoTlNSZXNvbHZlcjo6bG9va3VwTmFtZXNwYWNlVVJJ KGNvbnN0IFN0cmluZyYgcHJlZml4KQogICAgIEpTVmFsdWUgcmV0dmFsID0gSlNDOjpjYWxsKGV4 ZWMsIGZ1bmN0aW9uLCBjYWxsVHlwZSwgY2FsbERhdGEsIG1fY3VzdG9tUmVzb2x2ZXIsIGFyZ3Mp OwogICAgIG1fZ2xvYmFsT2JqZWN0LT5nbG9iYWxEYXRhKCkudGltZW91dENoZWNrZXIuc3RvcCgp OwogCi0gICAgU3RyaW5nIHJlc3VsdDsKKyAgICBBdG9taWNTdHJpbmcgcmVzdWx0OwogICAgIGlm IChleGVjLT5oYWRFeGNlcHRpb24oKSkKICAgICAgICAgcmVwb3J0Q3VycmVudEV4Y2VwdGlvbihl eGVjKTsKICAgICBlbHNlIHsKICAgICAgICAgaWYgKCFyZXR2YWwuaXNVbmRlZmluZWRPck51bGwo KSkKLSAgICAgICAgICAgIHJlc3VsdCA9IHVzdHJpbmdUb1N0cmluZyhyZXR2YWwudG9TdHJpbmco ZXhlYykpOworICAgICAgICAgICAgcmVzdWx0ID0gdXN0cmluZ1RvQXRvbWljU3RyaW5nKHJldHZh bC50b1N0cmluZyhleGVjKSk7CiAgICAgfQogCiAgICAgRG9jdW1lbnQ6OnVwZGF0ZVN0eWxlRm9y QWxsRG9jdW1lbnRzKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9K U0N1c3RvbVhQYXRoTlNSZXNvbHZlci5oIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlND dXN0b21YUGF0aE5TUmVzb2x2ZXIuaAppbmRleCA3ZDY2NDk0Li4yNmExNTEwIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0N1c3RvbVhQYXRoTlNSZXNvbHZlci5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTQ3VzdG9tWFBhdGhOU1Jlc29sdmVyLmgK QEAgLTQ5LDcgKzQ5LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICAKICAgICAgICAg dmlydHVhbCB+SlNDdXN0b21YUGF0aE5TUmVzb2x2ZXIoKTsKIAotICAgICAgICB2aXJ0dWFsIFN0 cmluZyBsb29rdXBOYW1lc3BhY2VVUkkoY29uc3QgU3RyaW5nJiBwcmVmaXgpOworICAgICAgICB2 aXJ0dWFsIEF0b21pY1N0cmluZyBsb29rdXBOYW1lc3BhY2VVUkkoY29uc3QgU3RyaW5nJiBwcmVm aXgpOwogCiAgICAgcHJpdmF0ZToKICAgICAgICAgSlNDdXN0b21YUGF0aE5TUmVzb2x2ZXIoSlND OjpKU09iamVjdCosIEpTRE9NV2luZG93Kik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy9vYmpjL0RPTUN1c3RvbVhQYXRoTlNSZXNvbHZlci5oIGIvU291cmNlL1dlYkNvcmUv YmluZGluZ3Mvb2JqYy9ET01DdXN0b21YUGF0aE5TUmVzb2x2ZXIuaAppbmRleCAyNjA5ZTkwLi4w MzJmNTI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9vYmpjL0RPTUN1c3Rv bVhQYXRoTlNSZXNvbHZlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL29iamMvRE9N Q3VzdG9tWFBhdGhOU1Jlc29sdmVyLmgKQEAgLTQyLDcgKzQyLDcgQEAgbmFtZXNwYWNlIFdlYkNv cmUgewogICAgICAgICBzdGF0aWMgUGFzc1JlZlB0cjxET01DdXN0b21YUGF0aE5TUmVzb2x2ZXI+ IGNyZWF0ZShpZCA8RE9NWFBhdGhOU1Jlc29sdmVyPiBjdXN0b21SZXNvbHZlcikgeyByZXR1cm4g YWRvcHRSZWYobmV3IERPTUN1c3RvbVhQYXRoTlNSZXNvbHZlcihjdXN0b21SZXNvbHZlcikpOyB9 CiAgICAgICAgIHZpcnR1YWwgfkRPTUN1c3RvbVhQYXRoTlNSZXNvbHZlcigpOwogCi0gICAgICAg IHZpcnR1YWwgU3RyaW5nIGxvb2t1cE5hbWVzcGFjZVVSSShjb25zdCBTdHJpbmcmIHByZWZpeCk7 CisgICAgICAgIHZpcnR1YWwgQXRvbWljU3RyaW5nIGxvb2t1cE5hbWVzcGFjZVVSSShjb25zdCBT dHJpbmcmIHByZWZpeCk7CiAKICAgICBwcml2YXRlOgogICAgICAgICBET01DdXN0b21YUGF0aE5T UmVzb2x2ZXIoaWQgPERPTVhQYXRoTlNSZXNvbHZlcj4pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvYmluZGluZ3Mvb2JqYy9ET01DdXN0b21YUGF0aE5TUmVzb2x2ZXIubW0gYi9Tb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy9vYmpjL0RPTUN1c3RvbVhQYXRoTlNSZXNvbHZlci5tbQppbmRleCA2 NzBjODM2Li41MmNjMzIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9vYmpj L0RPTUN1c3RvbVhQYXRoTlNSZXNvbHZlci5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy9vYmpjL0RPTUN1c3RvbVhQYXRoTlNSZXNvbHZlci5tbQpAQCAtNDIsNyArNDIsNyBAQCBET01D dXN0b21YUGF0aE5TUmVzb2x2ZXI6On5ET01DdXN0b21YUGF0aE5TUmVzb2x2ZXIoKQogewogfQog Ci1TdHJpbmcgRE9NQ3VzdG9tWFBhdGhOU1Jlc29sdmVyOjpsb29rdXBOYW1lc3BhY2VVUkkoY29u c3QgU3RyaW5nJiBwcmVmaXgpCitBdG9taWNTdHJpbmcgRE9NQ3VzdG9tWFBhdGhOU1Jlc29sdmVy Ojpsb29rdXBOYW1lc3BhY2VVUkkoY29uc3QgU3RyaW5nJiBwcmVmaXgpCiB7CiAgICAgTlNTdHJp bmcgKm5hbWVzcGFjZVVSSSA9IG5pbDsKICAgICAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEN1c3RvbVhQYXRoTlNSZXNvbHZlci5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhDdXN0b21YUGF0aE5TUmVzb2x2ZXIuY3BwCmlu ZGV4IDAxNDQ4ZDkuLjI2OWI3ZDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L3Y4L2N1c3RvbS9WOEN1c3RvbVhQYXRoTlNSZXNvbHZlci5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4Q3VzdG9tWFBhdGhOU1Jlc29sdmVyLmNwcApAQCAtNTIs NyArNTIsNyBAQCBWOEN1c3RvbVhQYXRoTlNSZXNvbHZlcjo6flY4Q3VzdG9tWFBhdGhOU1Jlc29s dmVyKCkKIHsKIH0KIAotU3RyaW5nIFY4Q3VzdG9tWFBhdGhOU1Jlc29sdmVyOjpsb29rdXBOYW1l c3BhY2VVUkkoY29uc3QgU3RyaW5nJiBwcmVmaXgpCitBdG9taWNTdHJpbmcgVjhDdXN0b21YUGF0 aE5TUmVzb2x2ZXI6Omxvb2t1cE5hbWVzcGFjZVVSSShjb25zdCBTdHJpbmcmIHByZWZpeCkKIHsK ICAgICB2ODo6SGFuZGxlPHY4OjpGdW5jdGlvbj4gbG9va3VwTmFtZXNwYWNlVVJJRnVuYzsKICAg ICB2ODo6SGFuZGxlPHY4OjpTdHJpbmc+IGxvb2t1cE5hbWVzcGFjZVVSSU5hbWUgPSB2ODo6U3Ry aW5nOjpOZXcoImxvb2t1cE5hbWVzcGFjZVVSSSIpOwpAQCAtODYsNyArODYsNyBAQCBTdHJpbmcg VjhDdXN0b21YUGF0aE5TUmVzb2x2ZXI6Omxvb2t1cE5hbWVzcGFjZVVSSShjb25zdCBTdHJpbmcm IHByZWZpeCkKICAgICBpZiAodHJ5X2NhdGNoLkhhc0NhdWdodCgpKQogICAgICAgICByZXR1cm4g U3RyaW5nKCk7CiAKLSAgICByZXR1cm4gdG9XZWJDb3JlU3RyaW5nV2l0aE51bGxDaGVjayhyZXR2 YWwpOworICAgIHJldHVybiB0b0F0b21pY1dlYkNvcmVTdHJpbmdXaXRoTnVsbENoZWNrKHJldHZh bCk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEN1c3RvbVhQYXRoTlNSZXNvbHZlci5oIGIvU291cmNl L1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4Q3VzdG9tWFBhdGhOU1Jlc29sdmVyLmgKaW5k ZXggOTY3NzI1Mi4uYzBlMTQ4MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv djgvY3VzdG9tL1Y4Q3VzdG9tWFBhdGhOU1Jlc29sdmVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUv YmluZGluZ3MvdjgvY3VzdG9tL1Y4Q3VzdG9tWFBhdGhOU1Jlc29sdmVyLmgKQEAgLTUxLDcgKzUx LDcgQEAgcHVibGljOgogICAgIHN0YXRpYyBQYXNzUmVmUHRyPFY4Q3VzdG9tWFBhdGhOU1Jlc29s dmVyPiBjcmVhdGUodjg6OkhhbmRsZTx2ODo6T2JqZWN0PiByZXNvbHZlcik7CiAKICAgICB2aXJ0 dWFsIH5WOEN1c3RvbVhQYXRoTlNSZXNvbHZlcigpOwotICAgIHZpcnR1YWwgU3RyaW5nIGxvb2t1 cE5hbWVzcGFjZVVSSShjb25zdCBTdHJpbmcmIHByZWZpeCk7CisgICAgdmlydHVhbCBBdG9taWNT dHJpbmcgbG9va3VwTmFtZXNwYWNlVVJJKGNvbnN0IFN0cmluZyYgcHJlZml4KTsKIAogcHJpdmF0 ZToKICAgICBleHBsaWNpdCBWOEN1c3RvbVhQYXRoTlNSZXNvbHZlcih2ODo6SGFuZGxlPHY4OjpP YmplY3Q+IHJlc29sdmVyKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3htbC9OYXRpdmVY UGF0aE5TUmVzb2x2ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUveG1sL05hdGl2ZVhQYXRoTlNSZXNv bHZlci5jcHAKaW5kZXggMTFmYWVhNi4uNDMwNDU5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUveG1sL05hdGl2ZVhQYXRoTlNSZXNvbHZlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUveG1s L05hdGl2ZVhQYXRoTlNSZXNvbHZlci5jcHAKQEAgLTQzLDE0ICs0MywxNCBAQCBOYXRpdmVYUGF0 aE5TUmVzb2x2ZXI6On5OYXRpdmVYUGF0aE5TUmVzb2x2ZXIoKQogewogfQogCi1TdHJpbmcgTmF0 aXZlWFBhdGhOU1Jlc29sdmVyOjpsb29rdXBOYW1lc3BhY2VVUkkoY29uc3QgU3RyaW5nJiBwcmVm aXgpCitBdG9taWNTdHJpbmcgTmF0aXZlWFBhdGhOU1Jlc29sdmVyOjpsb29rdXBOYW1lc3BhY2VV UkkoY29uc3QgU3RyaW5nJiBwcmVmaXgpCiB7CiAgICAgLy8gVGhpcyBpcyBub3QgZG9uZSBieSBO b2RlOjpsb29rdXBOYW1lc3BhY2VVUkkgYXMgcGVyIHRoZSBET00zIENvcmUgc3BlYywKICAgICAv LyBidXQgdGhlIFhQYXRoIHNwZWMgc2F5cyB0aGF0IHdlIHNob3VsZCBkbyBpdCBmb3IgWFBhdGhO U1Jlc29sdmVyLgotICAgIGlmIChwcmVmaXggPT0gInhtbCIpCisgICAgaWYgKHByZWZpeCA9PSB4 bWxBdG9tKQogICAgICAgICByZXR1cm4gWE1MTmFtZXM6OnhtbE5hbWVzcGFjZVVSSTsKLSAgICAK LSAgICByZXR1cm4gbV9ub2RlID8gbV9ub2RlLT5sb29rdXBOYW1lc3BhY2VVUkkocHJlZml4KSA6 IFN0cmluZygpOworCisgICAgcmV0dXJuIG1fbm9kZSA/IG1fbm9kZS0+bG9va3VwTmFtZXNwYWNl VVJJKHByZWZpeCkgOiBudWxsQXRvbTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUveG1sL05hdGl2ZVhQYXRoTlNSZXNvbHZlci5oIGIvU291 cmNlL1dlYkNvcmUveG1sL05hdGl2ZVhQYXRoTlNSZXNvbHZlci5oCmluZGV4IDIxMmI5MjkuLjll M2VjYmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3htbC9OYXRpdmVYUGF0aE5TUmVzb2x2 ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS94bWwvTmF0aXZlWFBhdGhOU1Jlc29sdmVyLmgKQEAg LTM5LDcgKzM5LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBzdGF0aWMgUGFzc1Jl ZlB0cjxOYXRpdmVYUGF0aE5TUmVzb2x2ZXI+IGNyZWF0ZShQYXNzUmVmUHRyPE5vZGU+IG5vZGUp IHsgcmV0dXJuIGFkb3B0UmVmKG5ldyBOYXRpdmVYUGF0aE5TUmVzb2x2ZXIobm9kZSkpOyB9CiAg ICAgICAgIHZpcnR1YWwgfk5hdGl2ZVhQYXRoTlNSZXNvbHZlcigpOwogCi0gICAgICAgIHZpcnR1 YWwgU3RyaW5nIGxvb2t1cE5hbWVzcGFjZVVSSShjb25zdCBTdHJpbmcmIHByZWZpeCk7CisgICAg ICAgIHZpcnR1YWwgQXRvbWljU3RyaW5nIGxvb2t1cE5hbWVzcGFjZVVSSShjb25zdCBTdHJpbmcm IHByZWZpeCk7CiAKICAgICBwcml2YXRlOgogICAgICAgICBOYXRpdmVYUGF0aE5TUmVzb2x2ZXIo UGFzc1JlZlB0cjxOb2RlPik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS94bWwvWFBhdGhG dW5jdGlvbnMuY3BwIGIvU291cmNlL1dlYkNvcmUveG1sL1hQYXRoRnVuY3Rpb25zLmNwcAppbmRl eCBkMzQzYTU5Li5kYzM5Y2Y0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS94bWwvWFBhdGhG dW5jdGlvbnMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3htbC9YUGF0aEZ1bmN0aW9ucy5jcHAK QEAgLTM1MSw3ICszNTEsNyBAQCBWYWx1ZSBGdW5JZDo6ZXZhbHVhdGUoKSBjb25zdAogCiAgICAg ICAgIC8vIElmIHRoZXJlIGFyZSBzZXZlcmFsIG5vZGVzIHdpdGggdGhlIHNhbWUgaWQsIGlkKCkg c2hvdWxkIHJldHVybiB0aGUgZmlyc3Qgb25lLgogICAgICAgICAvLyBJbiBXZWJLaXQsIGdldEVs ZW1lbnRCeUlkIGJlaGF2ZXMgc28sIHRvbywgYWx0aG91Z2ggaXRzIGJlaGF2aW9yIGluIHRoaXMg Y2FzZSBpcyBmb3JtYWxseSB1bmRlZmluZWQuCi0gICAgICAgIE5vZGUqIG5vZGUgPSBjb250ZXh0 U2NvcGUtPmdldEVsZW1lbnRCeUlkKFN0cmluZygmaWRMaXN0W3N0YXJ0UG9zXSwgZW5kUG9zIC0g c3RhcnRQb3MpKTsKKyAgICAgICAgTm9kZSogbm9kZSA9IGNvbnRleHRTY29wZS0+Z2V0RWxlbWVu dEJ5SWQoQXRvbWljU3RyaW5nKCZpZExpc3Rbc3RhcnRQb3NdLCBlbmRQb3MgLSBzdGFydFBvcykp OwogICAgICAgICBpZiAobm9kZSAmJiByZXN1bHRTZXQuYWRkKG5vZGUpLnNlY29uZCkKICAgICAg ICAgICAgIHJlc3VsdC5hcHBlbmQobm9kZSk7CiAgICAgICAgIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUveG1sL1hQYXRoR3JhbW1hci55IGIvU291cmNlL1dlYkNvcmUveG1sL1hQYXRoR3Jh bW1hci55CmluZGV4IDE0ZTlmYTMuLmY4ODgzNzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3htbC9YUGF0aEdyYW1tYXIueQorKysgYi9Tb3VyY2UvV2ViQ29yZS94bWwvWFBhdGhHcmFtbWFy LnkKQEAgLTE5NCw4ICsxOTQsOCBAQCBTdGVwOgogICAgIHwKICAgICBOQU1FVEVTVCBPcHRpb25h bFByZWRpY2F0ZUxpc3QKICAgICB7Ci0gICAgICAgIFN0cmluZyBsb2NhbE5hbWU7Ci0gICAgICAg IFN0cmluZyBuYW1lc3BhY2VVUkk7CisgICAgICAgIEF0b21pY1N0cmluZyBsb2NhbE5hbWU7Cisg ICAgICAgIEF0b21pY1N0cmluZyBuYW1lc3BhY2VVUkk7CiAgICAgICAgIGlmICghUEFSU0VSLT5l eHBhbmRRTmFtZSgqJDEsIGxvY2FsTmFtZSwgbmFtZXNwYWNlVVJJKSkgewogICAgICAgICAgICAg UEFSU0VSLT5tX2dvdE5hbWVzcGFjZUVycm9yID0gdHJ1ZTsKICAgICAgICAgICAgIFlZQUJPUlQ7 CkBAIC0yMjMsOCArMjIzLDggQEAgU3RlcDoKICAgICB8CiAgICAgQXhpc1NwZWNpZmllciBOQU1F VEVTVCBPcHRpb25hbFByZWRpY2F0ZUxpc3QKICAgICB7Ci0gICAgICAgIFN0cmluZyBsb2NhbE5h bWU7Ci0gICAgICAgIFN0cmluZyBuYW1lc3BhY2VVUkk7CisgICAgICAgIEF0b21pY1N0cmluZyBs b2NhbE5hbWU7CisgICAgICAgIEF0b21pY1N0cmluZyBuYW1lc3BhY2VVUkk7CiAgICAgICAgIGlm ICghUEFSU0VSLT5leHBhbmRRTmFtZSgqJDIsIGxvY2FsTmFtZSwgbmFtZXNwYWNlVVJJKSkgewog ICAgICAgICAgICAgUEFSU0VSLT5tX2dvdE5hbWVzcGFjZUVycm9yID0gdHJ1ZTsKICAgICAgICAg ICAgIFlZQUJPUlQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS94bWwvWFBhdGhOU1Jlc29s dmVyLmggYi9Tb3VyY2UvV2ViQ29yZS94bWwvWFBhdGhOU1Jlc29sdmVyLmgKaW5kZXggN2I3ZmQy ZS4uNGU1YzAzNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUveG1sL1hQYXRoTlNSZXNvbHZl ci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3htbC9YUGF0aE5TUmVzb2x2ZXIuaApAQCAtMzcsOCAr MzcsOCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgY2xhc3MgWFBhdGhOU1Jlc29sdmVyIDog cHVibGljIFJlZkNvdW50ZWQ8WFBhdGhOU1Jlc29sdmVyPiB7CiAgICAgcHVibGljOgogICAgICAg ICB2aXJ0dWFsIH5YUGF0aE5TUmVzb2x2ZXIoKTsKLSAgICAgICAgdmlydHVhbCBTdHJpbmcgbG9v a3VwTmFtZXNwYWNlVVJJKGNvbnN0IFN0cmluZyYgcHJlZml4KSA9IDA7Ci0gICAgICAgIAorICAg ICAgICB2aXJ0dWFsIEF0b21pY1N0cmluZyBsb29rdXBOYW1lc3BhY2VVUkkoY29uc3QgU3RyaW5n JiBwcmVmaXgpID0gMDsKKwogICAgIHByb3RlY3RlZDoKICAgICAgICAgWFBhdGhOU1Jlc29sdmVy KCkgeyB9CiAgICAgfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3htbC9YUGF0aFBhcnNl ci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS94bWwvWFBhdGhQYXJzZXIuY3BwCmluZGV4IGJhNmRhN2Uu LmM3YzRhNDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3htbC9YUGF0aFBhcnNlci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUveG1sL1hQYXRoUGFyc2VyLmNwcApAQCAtNDUzLDcgKzQ1Myw3 IEBAIGludCBQYXJzZXI6OmxleCh2b2lkKiBkYXRhKQogICAgIHJldHVybiB0b2sudHlwZTsKIH0K IAotYm9vbCBQYXJzZXI6OmV4cGFuZFFOYW1lKGNvbnN0IFN0cmluZyYgcU5hbWUsIFN0cmluZyYg bG9jYWxOYW1lLCBTdHJpbmcmIG5hbWVzcGFjZVVSSSkKK2Jvb2wgUGFyc2VyOjpleHBhbmRRTmFt ZShjb25zdCBTdHJpbmcmIHFOYW1lLCBBdG9taWNTdHJpbmcmIGxvY2FsTmFtZSwgQXRvbWljU3Ry aW5nJiBuYW1lc3BhY2VVUkkpCiB7CiAgICAgc2l6ZV90IGNvbG9uID0gcU5hbWUuZmluZCgnOicp OwogICAgIGlmIChjb2xvbiAhPSBub3RGb3VuZCkgewpAQCAtNDYyLDEwICs0NjIsMTAgQEAgYm9v bCBQYXJzZXI6OmV4cGFuZFFOYW1lKGNvbnN0IFN0cmluZyYgcU5hbWUsIFN0cmluZyYgbG9jYWxO YW1lLCBTdHJpbmcmIG5hbWVzcGEKICAgICAgICAgbmFtZXNwYWNlVVJJID0gbV9yZXNvbHZlci0+ bG9va3VwTmFtZXNwYWNlVVJJKHFOYW1lLmxlZnQoY29sb24pKTsKICAgICAgICAgaWYgKG5hbWVz cGFjZVVSSS5pc051bGwoKSkKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgbG9j YWxOYW1lID0gcU5hbWUuc3Vic3RyaW5nKGNvbG9uICsgMSk7CisgICAgICAgIGxvY2FsTmFtZSA9 IEF0b21pY1N0cmluZyhxTmFtZS5jaGFyYWN0ZXJzKCkgKyAxLCBxTmFtZS5sZW5ndGgoKSAtIDEp OwogICAgIH0gZWxzZQotICAgICAgICBsb2NhbE5hbWUgPSBxTmFtZTsKLSAgICAKKyAgICAgICAg bG9jYWxOYW1lID0gQXRvbWljU3RyaW5nKHFOYW1lKTsKKwogICAgIHJldHVybiB0cnVlOwogfQog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS94bWwvWFBhdGhQYXJzZXIuaCBiL1NvdXJjZS9X ZWJDb3JlL3htbC9YUGF0aFBhcnNlci5oCmluZGV4IGY0OWI0NGIuLmE3YWZjN2EgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3htbC9YUGF0aFBhcnNlci5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3htbC9YUGF0aFBhcnNlci5oCkBAIC02NSw3ICs2NSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsK ICAgICAgICAgICAgIH5QYXJzZXIoKTsKIAogICAgICAgICAgICAgWFBhdGhOU1Jlc29sdmVyKiBy ZXNvbHZlcigpIGNvbnN0IHsgcmV0dXJuIG1fcmVzb2x2ZXIuZ2V0KCk7IH0KLSAgICAgICAgICAg IGJvb2wgZXhwYW5kUU5hbWUoY29uc3QgU3RyaW5nJiBxTmFtZSwgU3RyaW5nJiBsb2NhbE5hbWUs IFN0cmluZyYgbmFtZXNwYWNlVVJJKTsKKyAgICAgICAgICAgIGJvb2wgZXhwYW5kUU5hbWUoY29u c3QgU3RyaW5nJiBxTmFtZSwgQXRvbWljU3RyaW5nJiBsb2NhbE5hbWUsIEF0b21pY1N0cmluZyYg bmFtZXNwYWNlVVJJKTsKIAogICAgICAgICAgICAgRXhwcmVzc2lvbiogcGFyc2VTdGF0ZW1lbnQo Y29uc3QgU3RyaW5nJiBzdGF0ZW1lbnQsIFBhc3NSZWZQdHI8WFBhdGhOU1Jlc29sdmVyPiwgRXhj ZXB0aW9uQ29kZSYpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS94bWwvWFBhdGhTdGVw LmggYi9Tb3VyY2UvV2ViQ29yZS94bWwvWFBhdGhTdGVwLmgKaW5kZXggYjAzMWJhZi4uZjNlYzA3 OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUveG1sL1hQYXRoU3RlcC5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3htbC9YUGF0aFN0ZXAuaApAQCAtNTgsOCArNTgsOCBAQCBuYW1lc3BhY2UgV2Vi Q29yZSB7CiAgICAgICAgICAgICAgICAgfTsKICAgICAgICAgICAgICAgICAKICAgICAgICAgICAg ICAgICBOb2RlVGVzdChLaW5kIGtpbmQpIDogbV9raW5kKGtpbmQpIHt9Ci0gICAgICAgICAgICAg ICAgTm9kZVRlc3QoS2luZCBraW5kLCBjb25zdCBTdHJpbmcmIGRhdGEpIDogbV9raW5kKGtpbmQp LCBtX2RhdGEoZGF0YSkge30KLSAgICAgICAgICAgICAgICBOb2RlVGVzdChLaW5kIGtpbmQsIGNv bnN0IFN0cmluZyYgZGF0YSwgY29uc3QgU3RyaW5nJiBuYW1lc3BhY2VVUkkpIDogbV9raW5kKGtp bmQpLCBtX2RhdGEoZGF0YSksIG1fbmFtZXNwYWNlVVJJKG5hbWVzcGFjZVVSSSkge30KKyAgICAg ICAgICAgICAgICBOb2RlVGVzdChLaW5kIGtpbmQsIGNvbnN0IEF0b21pY1N0cmluZyYgZGF0YSkg OiBtX2tpbmQoa2luZCksIG1fZGF0YShkYXRhKSB7fQorICAgICAgICAgICAgICAgIE5vZGVUZXN0 KEtpbmQga2luZCwgY29uc3QgQXRvbWljU3RyaW5nJiBkYXRhLCBjb25zdCBBdG9taWNTdHJpbmcm IG5hbWVzcGFjZVVSSSkgOiBtX2tpbmQoa2luZCksIG1fZGF0YShkYXRhKSwgbV9uYW1lc3BhY2VV UkkobmFtZXNwYWNlVVJJKSB7fQogICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgIEtp bmQga2luZCgpIGNvbnN0IHsgcmV0dXJuIG1fa2luZDsgfQogICAgICAgICAgICAgICAgIGNvbnN0 IEF0b21pY1N0cmluZyYgZGF0YSgpIGNvbnN0IHsgcmV0dXJuIG1fZGF0YTsgfQo=