84613 2012-04-23 10:45:47 -0700 Insert source file and line number for v8 function calls into tracing 2012-05-17 11:22:10 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 enne enne abarth enne haraken japhet nduca webkit.review.bot oldest_to_newest 607826 0 enne 2012-04-23 10:45:47 -0700 Insert source file and line number for v8 function calls into tracing 607828 1 138381 enne 2012-04-23 10:46:39 -0700 Created attachment 138381 Patch 624738 2 enne 2012-05-15 16:56:30 -0700 Do any of y'all know who the right person to review this would be? 624751 3 138381 haraken 2012-05-15 17:13:36 -0700 Comment on attachment 138381 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=138381&action=review > Source/WebCore/ChangeLog:7 > + Please explain the rational for the change. > Source/WebCore/bindings/v8/V8Proxy.cpp:435 > + Vector<UChar> combine; > + append(combine, resourceName); > + combine.append(':'); > + appendNumber(combine, lineNumber); > + > + String final; > + final = String::adopt(combine); > + return final; Shall we use StringBuilder? > Source/WebCore/platform/chromium/TraceEvent.h:677 > + explicit TraceStringWithCopy(const unsigned char* str) : m_str(reinterpret_cast<const char*>(str)) { } What is this change for? 626001 4 142369 enne 2012-05-16 16:35:49 -0700 Created attachment 142369 Patch 626002 5 enne 2012-05-16 16:36:06 -0700 (In reply to comment #3) > (From update of attachment 138381 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=138381&action=review > > > Source/WebCore/ChangeLog:7 > > + > > Please explain the rational for the change. Done. > > Source/WebCore/bindings/v8/V8Proxy.cpp:435 > > + Vector<UChar> combine; > > + append(combine, resourceName); > > + combine.append(':'); > > + appendNumber(combine, lineNumber); > > + > > + String final; > > + final = String::adopt(combine); > > + return final; > > Shall we use StringBuilder? Done. > > Source/WebCore/platform/chromium/TraceEvent.h:677 > > + explicit TraceStringWithCopy(const unsigned char* str) : m_str(reinterpret_cast<const char*>(str)) { } > > What is this change for? It looks like this is no longer needed. Removed. 626071 6 142369 haraken 2012-05-16 17:44:11 -0700 Comment on attachment 142369 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=142369&action=review Looks OK > Source/WebCore/bindings/v8/V8Proxy.cpp:412 > + builder.append(String::String::number(lineNumber)); String::String::number() => String::number() 626746 7 enne 2012-05-17 11:22:10 -0700 Committed r117466: <http://trac.webkit.org/changeset/117466> 138381 2012-04-23 10:46:39 -0700 2012-05-16 16:35:46 -0700 Patch bug-84613-20120423104638.patch text/plain 4244 enne U3VidmVyc2lvbiBSZXZpc2lvbjogMTE0NzkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTY3NmU5ZGI5MDMwNjQ4 ZWExZTU1ZWEwNThiOTNhMmIxNjhhNzM1Yi4uODk2MzNkMTEwYTQ3OGVkZWQ1NGNlNjcwZGU0NGE1 NmQxNmQ2NTQ1MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTA0LTIzICBBZHJp ZW5uZSBXYWxrZXIgIDxlbm5lQGdvb2dsZS5jb20+CisKKyAgICAgICAgSW5zZXJ0IHNvdXJjZSBm aWxlIGFuZCBsaW5lIG51bWJlciBmb3IgdjggZnVuY3Rpb24gY2FsbHMgaW50byB0cmFjaW5nCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NDYxMworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogYmluZGluZ3Mv djgvVjhQcm94eS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpyZXNvdXJjZUluZm8pOgorICAgICAg ICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3JlOjpyZXNvdXJjZVN0cmluZyk6CisgICAgICAg IChXZWJDb3JlOjpWOFByb3h5OjppbnN0cnVtZW50ZWRDYWxsRnVuY3Rpb24pOgorICAgICAgICAq IHBsYXRmb3JtL2Nocm9taXVtL1RyYWNlRXZlbnQuaDoKKyAgICAgICAgKFdlYkNvcmU6OlRyYWNl RXZlbnQ6OlRyYWNlU3RyaW5nV2l0aENvcHk6OlRyYWNlU3RyaW5nV2l0aENvcHkpOgorCiAyMDEy LTA0LTIwICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAg UmUtbGFuZC4gVGhlIG5vbi1mYXN0IHNjcm9sbGFibGUgcmVnaW9uIGlzIG5vdyBhbHdheXMgdXBk YXRlZCBhZnRlciBsYXlvdXQsIGFuZCBmcmFtZVZpZXdTY3JvbGxhYmxlQXJlYXNEaWRDaGFuZ2Ug aGFzIGJlZW4gcmVtb3ZlZC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4 L1Y4UHJveHkuY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhQcm94eS5jcHAKaW5k ZXggMjRkYWFlNDIyNDI1N2M4ZTE1MThiN2UyNmI4MTE4MTIzZDQ3NTA5NC4uY2FhZTdkNjUwNjQ3 MTg0NDkxNGIxYTI2ZjkxODk3ZDFkMGE1NTZiMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv YmluZGluZ3MvdjgvVjhQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvdjgv VjhQcm94eS5jcHAKQEAgLTQwNyw2ICs0MDcsMzQgQEAgdjg6OkxvY2FsPHY4OjpWYWx1ZT4gVjhQ cm94eTo6Y2FsbEZ1bmN0aW9uKHY4OjpIYW5kbGU8djg6OkZ1bmN0aW9uPiBmdW5jdGlvbiwgdjgK ICAgICByZXR1cm4gVjhQcm94eTo6aW5zdHJ1bWVudGVkQ2FsbEZ1bmN0aW9uKGZyYW1lKCksIGZ1 bmN0aW9uLCByZWNlaXZlciwgYXJnYywgYXJncyk7CiB9CiAKK3N0YXRpYyBpbmxpbmUgdm9pZCBy ZXNvdXJjZUluZm8oY29uc3Qgdjg6OkhhbmRsZTx2ODo6RnVuY3Rpb24+IGZ1bmN0aW9uLCBTdHJp bmcmIHJlc291cmNlTmFtZSwgaW50JiBsaW5lTnVtYmVyKQoreworICAgIHY4OjpTY3JpcHRPcmln aW4gb3JpZ2luID0gZnVuY3Rpb24tPkdldFNjcmlwdE9yaWdpbigpOworICAgIGlmIChvcmlnaW4u UmVzb3VyY2VOYW1lKCkuSXNFbXB0eSgpKSB7CisgICAgICAgIHJlc291cmNlTmFtZSA9ICJ1bmRl ZmluZWQiOworICAgICAgICBsaW5lTnVtYmVyID0gMTsKKyAgICB9IGVsc2UgeworICAgICAgICBy ZXNvdXJjZU5hbWUgPSB0b1dlYkNvcmVTdHJpbmcob3JpZ2luLlJlc291cmNlTmFtZSgpKTsKKyAg ICAgICAgbGluZU51bWJlciA9IGZ1bmN0aW9uLT5HZXRTY3JpcHRMaW5lTnVtYmVyKCkgKyAxOwor ICAgIH0KK30KKworc3RhdGljIGlubGluZSBTdHJpbmcgcmVzb3VyY2VTdHJpbmcoY29uc3Qgdjg6 OkhhbmRsZTx2ODo6RnVuY3Rpb24+IGZ1bmN0aW9uKQoreworICAgIFN0cmluZyByZXNvdXJjZU5h bWU7CisgICAgaW50IGxpbmVOdW1iZXI7CisgICAgcmVzb3VyY2VJbmZvKGZ1bmN0aW9uLCByZXNv dXJjZU5hbWUsIGxpbmVOdW1iZXIpOworCisgICAgVmVjdG9yPFVDaGFyPiBjb21iaW5lOworICAg IGFwcGVuZChjb21iaW5lLCByZXNvdXJjZU5hbWUpOworICAgIGNvbWJpbmUuYXBwZW5kKCc6Jyk7 CisgICAgYXBwZW5kTnVtYmVyKGNvbWJpbmUsIGxpbmVOdW1iZXIpOworCisgICAgU3RyaW5nIGZp bmFsOworICAgIGZpbmFsID0gU3RyaW5nOjphZG9wdChjb21iaW5lKTsKKyAgICByZXR1cm4gZmlu YWw7Cit9CisKIHY4OjpMb2NhbDx2ODo6VmFsdWU+IFY4UHJveHk6Omluc3RydW1lbnRlZENhbGxG dW5jdGlvbihGcmFtZSogZnJhbWUsIHY4OjpIYW5kbGU8djg6OkZ1bmN0aW9uPiBmdW5jdGlvbiwg djg6OkhhbmRsZTx2ODo6T2JqZWN0PiByZWNlaXZlciwgaW50IGFyZ2MsIHY4OjpIYW5kbGU8djg6 OlZhbHVlPiBhcmdzW10pCiB7CiAgICAgVjhHQ0NvbnRyb2xsZXI6OmNoZWNrTWVtb3J5VXNhZ2Uo KTsKQEAgLTQxOCwyMCArNDQ2LDE2IEBAIHY4OjpMb2NhbDx2ODo6VmFsdWU+IFY4UHJveHk6Omlu c3RydW1lbnRlZENhbGxGdW5jdGlvbihGcmFtZSogZnJhbWUsIHY4OjpIYW5kbGU8CiAKICAgICBJ bnNwZWN0b3JJbnN0cnVtZW50YXRpb25Db29raWUgY29va2llOwogICAgIGlmIChJbnNwZWN0b3JJ bnN0cnVtZW50YXRpb246Omhhc0Zyb250ZW5kcygpICYmIGNvbnRleHQpIHsKLSAgICAgICAgU3Ry aW5nIHJlc291cmNlTmFtZSgidW5kZWZpbmVkIik7Ci0gICAgICAgIGludCBsaW5lTnVtYmVyID0g MTsKLSAgICAgICAgdjg6OlNjcmlwdE9yaWdpbiBvcmlnaW4gPSBmdW5jdGlvbi0+R2V0U2NyaXB0 T3JpZ2luKCk7Ci0gICAgICAgIGlmICghb3JpZ2luLlJlc291cmNlTmFtZSgpLklzRW1wdHkoKSkg ewotICAgICAgICAgICAgcmVzb3VyY2VOYW1lID0gdG9XZWJDb3JlU3RyaW5nKG9yaWdpbi5SZXNv dXJjZU5hbWUoKSk7Ci0gICAgICAgICAgICBsaW5lTnVtYmVyID0gZnVuY3Rpb24tPkdldFNjcmlw dExpbmVOdW1iZXIoKSArIDE7Ci0gICAgICAgIH0KKyAgICAgICAgU3RyaW5nIHJlc291cmNlTmFt ZTsKKyAgICAgICAgaW50IGxpbmVOdW1iZXI7CisgICAgICAgIHJlc291cmNlSW5mbyhmdW5jdGlv biwgcmVzb3VyY2VOYW1lLCBsaW5lTnVtYmVyKTsKICAgICAgICAgY29va2llID0gSW5zcGVjdG9y SW5zdHJ1bWVudGF0aW9uOjp3aWxsQ2FsbEZ1bmN0aW9uKGNvbnRleHQsIHJlc291cmNlTmFtZSwg bGluZU51bWJlcik7CiAgICAgfQogCiAgICAgdjg6OkxvY2FsPHY4OjpWYWx1ZT4gcmVzdWx0Owog ICAgIHsKICNpZiBQTEFURk9STShDSFJPTUlVTSkKLSAgICAgICAgVFJBQ0VfRVZFTlQwKCJ2OCIs ICJ2OC5jYWxsRnVuY3Rpb24iKTsKKyAgICAgICAgVFJBQ0VfRVZFTlQxKCJ2OCIsICJ2OC5jYWxs RnVuY3Rpb24iLCAiY2FsbHNpdGUiLCByZXNvdXJjZVN0cmluZyhmdW5jdGlvbikudXRmOCgpKTsK ICNlbmRpZgogICAgICAgICBWOFJlY3Vyc2lvblNjb3BlIHJlY3Vyc2lvblNjb3BlKGNvbnRleHQp OwogICAgICAgICByZXN1bHQgPSBmdW5jdGlvbi0+Q2FsbChyZWNlaXZlciwgYXJnYywgYXJncyk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9UcmFjZUV2ZW50 LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9UcmFjZUV2ZW50LmgKaW5kZXgg MjA2ZDk0MWYxYTAyNTk0M2NiZDY0MzlhNzk1ZGQ5OTVmMmNkMDQ2YS4uMjgwMmQyNTdlY2UzZGE0 MGMxZDc5MmVjMTM0YjNmNzdkOWY1M2FiNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vY2hyb21pdW0vVHJhY2VFdmVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2Nocm9taXVtL1RyYWNlRXZlbnQuaApAQCAtNjc0LDYgKzY3NCw3IEBAIHVuaW9uIFRyYWNlVmFs dWVVbmlvbiB7CiBjbGFzcyBUcmFjZVN0cmluZ1dpdGhDb3B5IHsKIHB1YmxpYzoKICAgICBleHBs aWNpdCBUcmFjZVN0cmluZ1dpdGhDb3B5KGNvbnN0IGNoYXIqIHN0cikgOiBtX3N0cihzdHIpIHsg fQorICAgIGV4cGxpY2l0IFRyYWNlU3RyaW5nV2l0aENvcHkoY29uc3QgdW5zaWduZWQgY2hhciog c3RyKSA6IG1fc3RyKHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgY2hhcio+KHN0cikpIHsgfQogICAg IG9wZXJhdG9yIGNvbnN0IGNoYXIqICgpIGNvbnN0IHsgcmV0dXJuIG1fc3RyOyB9CiBwcml2YXRl OgogICAgIGNvbnN0IGNoYXIqIG1fc3RyOwo= 142369 2012-05-16 16:35:49 -0700 2012-05-16 17:44:11 -0700 Patch bug-84613-20120516163548.patch text/plain 3882 enne U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3MzE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjA2MjExNzA1Y2FkOTM5 YzUzYmIzZDJlZmMwYjQyMzc5ODQyNjM1ZC4uMGZiNmE0ODc1ZTYwOTRlZGYwMmU5NjEwOTQxZDRk OWM4YmIwN2ZiMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTA1LTE2ICBBZHJp ZW5uZSBXYWxrZXIgIDxlbm5lQGdvb2dsZS5jb20+CisKKyAgICAgICAgSW5zZXJ0IHNvdXJjZSBm aWxlIGFuZCBsaW5lIG51bWJlciBmb3IgdjggZnVuY3Rpb24gY2FsbHMgaW50byB0cmFjaW5nCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NDYxMworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSB0cmFjZSBm b3IgdjggZnVuY3Rpb24gY2FsbHMgZG9lc24ndCBpbmNsdWRlIGFueSBpbmZvcm1hdGlvbiBhYm91 dAorICAgICAgICB3aGF0IGZ1bmN0aW9uIGlzIGJlaW5nIGNhbGxlZC4gUGFzcyB0aGlzIGluZm9y bWF0aW9uIGFsb25nIHNvIGl0IGNhbgorICAgICAgICBiZSBsZXNzIG9wYXF1ZS4KKworICAgICAg ICAqIGJpbmRpbmdzL3Y4L1Y4UHJveHkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6cmVzb3VyY2VJ bmZvKToKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAoV2ViQ29yZTo6cmVzb3VyY2VTdHJp bmcpOgorICAgICAgICAoV2ViQ29yZTo6VjhQcm94eTo6aW5zdHJ1bWVudGVkQ2FsbEZ1bmN0aW9u KToKKyAgICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS9UcmFjZUV2ZW50Lmg6CisgICAgICAgIChX ZWJDb3JlOjpUcmFjZUV2ZW50OjpUcmFjZVN0cmluZ1dpdGhDb3B5OjpUcmFjZVN0cmluZ1dpdGhD b3B5KToKKwogMjAxMi0wNS0xNiAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNv bT4KIAogICAgICAgICBTY3JvbGxiYXIgbGF5ZXJzIHNob3VsZCByZXNwZWN0IGFjY2VsZXJhdGVk IGRyYXdpbmcgc2V0dGluZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvdjgv VjhQcm94eS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOFByb3h5LmNwcAppbmRl eCBkYjczMzg5OGIyNmZhOWIzNGJkODc1MTQyNmM2OGY1ZmNkN2Q1YzFlLi41ZmE3ODIzMzFmMWM4 MDM4NzU0M2E3ZmFiYzE2OTU2NDhiNDVlYTA4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy92OC9WOFByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9W OFByb3h5LmNwcApAQCAtNjksNiArNjksNyBAQAogI2luY2x1ZGUgPHd0Zi9TdGRMaWJFeHRyYXMu aD4KICNpbmNsdWRlIDx3dGYvU3RyaW5nRXh0cmFzLmg+CiAjaW5jbHVkZSA8d3RmL1VudXNlZFBh cmFtLmg+CisjaW5jbHVkZSA8d3RmL3RleHQvU3RyaW5nQnVpbGRlci5oPgogI2luY2x1ZGUgPHd0 Zi90ZXh0L1dURlN0cmluZy5oPgogCiAjaWYgUExBVEZPUk0oQ0hST01JVU0pCkBAIC0zODcsNiAr Mzg4LDMxIEBAIHY4OjpMb2NhbDx2ODo6VmFsdWU+IFY4UHJveHk6OmNhbGxGdW5jdGlvbih2ODo6 SGFuZGxlPHY4OjpGdW5jdGlvbj4gZnVuY3Rpb24sIHY4CiAgICAgcmV0dXJuIFY4UHJveHk6Omlu c3RydW1lbnRlZENhbGxGdW5jdGlvbihmcmFtZSgpLCBmdW5jdGlvbiwgcmVjZWl2ZXIsIGFyZ2Ms IGFyZ3MpOwogfQogCitzdGF0aWMgaW5saW5lIHZvaWQgcmVzb3VyY2VJbmZvKGNvbnN0IHY4OjpI YW5kbGU8djg6OkZ1bmN0aW9uPiBmdW5jdGlvbiwgU3RyaW5nJiByZXNvdXJjZU5hbWUsIGludCYg bGluZU51bWJlcikKK3sKKyAgICB2ODo6U2NyaXB0T3JpZ2luIG9yaWdpbiA9IGZ1bmN0aW9uLT5H ZXRTY3JpcHRPcmlnaW4oKTsKKyAgICBpZiAob3JpZ2luLlJlc291cmNlTmFtZSgpLklzRW1wdHko KSkgeworICAgICAgICByZXNvdXJjZU5hbWUgPSAidW5kZWZpbmVkIjsKKyAgICAgICAgbGluZU51 bWJlciA9IDE7CisgICAgfSBlbHNlIHsKKyAgICAgICAgcmVzb3VyY2VOYW1lID0gdG9XZWJDb3Jl U3RyaW5nKG9yaWdpbi5SZXNvdXJjZU5hbWUoKSk7CisgICAgICAgIGxpbmVOdW1iZXIgPSBmdW5j dGlvbi0+R2V0U2NyaXB0TGluZU51bWJlcigpICsgMTsKKyAgICB9Cit9CisKK3N0YXRpYyBpbmxp bmUgU3RyaW5nIHJlc291cmNlU3RyaW5nKGNvbnN0IHY4OjpIYW5kbGU8djg6OkZ1bmN0aW9uPiBm dW5jdGlvbikKK3sKKyAgICBTdHJpbmcgcmVzb3VyY2VOYW1lOworICAgIGludCBsaW5lTnVtYmVy OworICAgIHJlc291cmNlSW5mbyhmdW5jdGlvbiwgcmVzb3VyY2VOYW1lLCBsaW5lTnVtYmVyKTsK KworICAgIFN0cmluZ0J1aWxkZXIgYnVpbGRlcjsKKyAgICBidWlsZGVyLmFwcGVuZChyZXNvdXJj ZU5hbWUpOworICAgIGJ1aWxkZXIuYXBwZW5kKCc6Jyk7CisgICAgYnVpbGRlci5hcHBlbmQoU3Ry aW5nOjpTdHJpbmc6Om51bWJlcihsaW5lTnVtYmVyKSk7CisgICAgcmV0dXJuIGJ1aWxkZXIudG9T dHJpbmcoKTsKK30KKwogdjg6OkxvY2FsPHY4OjpWYWx1ZT4gVjhQcm94eTo6aW5zdHJ1bWVudGVk Q2FsbEZ1bmN0aW9uKEZyYW1lKiBmcmFtZSwgdjg6OkhhbmRsZTx2ODo6RnVuY3Rpb24+IGZ1bmN0 aW9uLCB2ODo6SGFuZGxlPHY4OjpPYmplY3Q+IHJlY2VpdmVyLCBpbnQgYXJnYywgdjg6OkhhbmRs ZTx2ODo6VmFsdWU+IGFyZ3NbXSkKIHsKICAgICBWOEdDQ29udHJvbGxlcjo6Y2hlY2tNZW1vcnlV c2FnZSgpOwpAQCAtMzk4LDIwICs0MjQsMTYgQEAgdjg6OkxvY2FsPHY4OjpWYWx1ZT4gVjhQcm94 eTo6aW5zdHJ1bWVudGVkQ2FsbEZ1bmN0aW9uKEZyYW1lKiBmcmFtZSwgdjg6OkhhbmRsZTwKIAog ICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbkNvb2tpZSBjb29raWU7CiAgICAgaWYgKEluc3Bl Y3Rvckluc3RydW1lbnRhdGlvbjo6aGFzRnJvbnRlbmRzKCkgJiYgY29udGV4dCkgewotICAgICAg ICBTdHJpbmcgcmVzb3VyY2VOYW1lKCJ1bmRlZmluZWQiKTsKLSAgICAgICAgaW50IGxpbmVOdW1i ZXIgPSAxOwotICAgICAgICB2ODo6U2NyaXB0T3JpZ2luIG9yaWdpbiA9IGZ1bmN0aW9uLT5HZXRT Y3JpcHRPcmlnaW4oKTsKLSAgICAgICAgaWYgKCFvcmlnaW4uUmVzb3VyY2VOYW1lKCkuSXNFbXB0 eSgpKSB7Ci0gICAgICAgICAgICByZXNvdXJjZU5hbWUgPSB0b1dlYkNvcmVTdHJpbmcob3JpZ2lu LlJlc291cmNlTmFtZSgpKTsKLSAgICAgICAgICAgIGxpbmVOdW1iZXIgPSBmdW5jdGlvbi0+R2V0 U2NyaXB0TGluZU51bWJlcigpICsgMTsKLSAgICAgICAgfQorICAgICAgICBTdHJpbmcgcmVzb3Vy Y2VOYW1lOworICAgICAgICBpbnQgbGluZU51bWJlcjsKKyAgICAgICAgcmVzb3VyY2VJbmZvKGZ1 bmN0aW9uLCByZXNvdXJjZU5hbWUsIGxpbmVOdW1iZXIpOwogICAgICAgICBjb29raWUgPSBJbnNw ZWN0b3JJbnN0cnVtZW50YXRpb246OndpbGxDYWxsRnVuY3Rpb24oY29udGV4dCwgcmVzb3VyY2VO YW1lLCBsaW5lTnVtYmVyKTsKICAgICB9CiAKICAgICB2ODo6TG9jYWw8djg6OlZhbHVlPiByZXN1 bHQ7CiAgICAgewogI2lmIFBMQVRGT1JNKENIUk9NSVVNKQotICAgICAgICBUUkFDRV9FVkVOVDAo InY4IiwgInY4LmNhbGxGdW5jdGlvbiIpOworICAgICAgICBUUkFDRV9FVkVOVDEoInY4IiwgInY4 LmNhbGxGdW5jdGlvbiIsICJjYWxsc2l0ZSIsIHJlc291cmNlU3RyaW5nKGZ1bmN0aW9uKS51dGY4 KCkpOwogI2VuZGlmCiAgICAgICAgIFY4UmVjdXJzaW9uU2NvcGUgcmVjdXJzaW9uU2NvcGUoY29u dGV4dCk7CiAgICAgICAgIHJlc3VsdCA9IGZ1bmN0aW9uLT5DYWxsKHJlY2VpdmVyLCBhcmdjLCBh cmdzKTsK