119583 2013-08-08 11:18:43 -0700 [Win] URL printing code in DumpRenderTree doesn't match WTR or Mac DRT 2013-08-16 11:05:01 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ap bfulgham bfulgham roger_fong oldest_to_newest 915519 0 ap 2013-08-08 11:18:43 -0700 urlSuitableForTestResult() in DumpRenderTree/win/DumpRenderTree.cpp removes a prefix from url without checking whether the url actually has this prefix: -------------------------- RetainPtr<CFStringRef> basePath = adoptCF(CFURLCopyPath(baseURL.get())); RetainPtr<CFStringRef> path = adoptCF(CFURLCopyPath(url.get())); return cfStringRefToWString(substringFromIndex(path.get(), CFStringGetLength(basePath.get())).get()); -------------------------- When it doesn't match - or when base URL cannot be determined - we should print last path component. 917977 1 ap 2013-08-16 09:37:47 -0700 Either WebKitTestRunner code or Mac DRT could probably serve as a good model to follow. 917987 2 208928 bfulgham 2013-08-16 10:01:43 -0700 Created attachment 208928 Patch 917988 3 208929 bfulgham 2013-08-16 10:04:18 -0700 Created attachment 208929 Patch 917991 4 208929 ap 2013-08-16 10:14:18 -0700 Comment on attachment 208929 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=208929&action=review There are more instances of "return urlString;" above the changed code, all except the very first one should be changed to return the last path component. We never want a full file:// path! > Tools/DumpRenderTree/win/DumpRenderTree.cpp:172 > + if (path.get() && CFStringHasPrefix(path.get(), basePath.get())) This null check should be for basePath, not for path. 917992 5 208929 bfulgham 2013-08-16 10:15:16 -0700 Comment on attachment 208929 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=208929&action=review >> Tools/DumpRenderTree/win/DumpRenderTree.cpp:172 >> + if (path.get() && CFStringHasPrefix(path.get(), basePath.get())) > > This null check should be for basePath, not for path. Oops! 918005 6 208931 bfulgham 2013-08-16 10:40:29 -0700 Created attachment 208931 Patch 918013 7 208931 ap 2013-08-16 10:52:09 -0700 Comment on attachment 208931 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=208931&action=review Great, thank you for tackling this! > Tools/DumpRenderTree/win/DumpRenderTree.cpp:144 > +static wstring fallbackString(CFURLRef url) I'd name this function after what it does - in this case, it seems more straightforward than naming it by what it is used for. What about lastPathComponent() as the name? 918014 8 ap 2013-08-16 10:52:49 -0700 Or something like lastPathComponentAsWString(). 918016 9 bfulgham 2013-08-16 10:54:11 -0700 (In reply to comment #8) > Or something like lastPathComponentAsWString(). That's a good idea. I'll change it while landing. 918024 10 bfulgham 2013-08-16 11:05:01 -0700 Committed r154194: <http://trac.webkit.org/changeset/154194> 208928 2013-08-16 10:01:43 -0700 2013-08-16 10:04:16 -0700 Patch bug-119583-20130816100122.patch text/plain 1709 bfulgham SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE1NDE4OCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE0IEBACisyMDEzLTA4LTE2ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29t PgorCisgICAgICAgIFtXaW5kb3dzXSBVUkwgcHJpbnRpbmcgY29kZSBpbiBEUlQgZG9lc24ndCBt YXRjaCBXVFIgb3IgTWFjIERSVAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTE5NTgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS93aW4vRHVtcFJlbmRlclRyZWUuY3BwOgorICAg ICAgICAodXJsU3VpdGFibGVGb3JUZXN0UmVzdWx0KTogUmV2aXNlIFVSTCBvdXRwdXQgdG8gbWF0 Y2ggTWFjIERSVCBieSBlbWl0aW5nIGxhc3QgcGF0aAorICAgICAgICBjb21wb25lbnQgaWYgdGhl IFVSTCBkb2VzIG5vdCBjb250YWluIHRoZSBleHBlY3RlZCBiYXNlIFVSTC4KKwogMjAxMy0wOC0x NSAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQGFwcGxlLmNvbT4KIAogICAgICAgICBbV0syXSBO ZXR3b3JrUHJvY2VzcyBzaG91bGQgdXNlIGEgdGVtcG9yYXJ5IHN0b3JhZ2Ugc2Vzc2lvbiBmb3Ig dGVzdApJbmRleDogVG9vbHMvRHVtcFJlbmRlclRyZWUvd2luL0R1bXBSZW5kZXJUcmVlLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBUb29scy9EdW1wUmVuZGVyVHJlZS93aW4vRHVtcFJlbmRlclRyZWUuY3Bw CShyZXZpc2lvbiAxNTQxODcpCisrKyBUb29scy9EdW1wUmVuZGVyVHJlZS93aW4vRHVtcFJlbmRl clRyZWUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNzAsNyArMTcwLDExIEBAIHdzdHJpbmcgdXJs U3VpdGFibGVGb3JUZXN0UmVzdWx0KGNvbnN0IHcKICAgICBSZXRhaW5QdHI8Q0ZTdHJpbmdSZWY+ IGJhc2VQYXRoID0gYWRvcHRDRihDRlVSTENvcHlQYXRoKGJhc2VVUkwuZ2V0KCkpKTsKICAgICBS ZXRhaW5QdHI8Q0ZTdHJpbmdSZWY+IHBhdGggPSBhZG9wdENGKENGVVJMQ29weVBhdGgodXJsLmdl dCgpKSk7CiAKLSAgICByZXR1cm4gY2ZTdHJpbmdSZWZUb1dTdHJpbmcoc3Vic3RyaW5nRnJvbUlu ZGV4KHBhdGguZ2V0KCksIENGU3RyaW5nR2V0TGVuZ3RoKGJhc2VQYXRoLmdldCgpKSkuZ2V0KCkp OworICAgIGlmIChwYXRoLmdldCgpICYmIENGU3RyaW5nSGFzUHJlZml4KHBhdGguZ2V0KCksIGJh c2VQYXRoLmdldCgpKSkKKyAgICAgICAgcmV0dXJuIGNmU3RyaW5nUmVmVG9XU3RyaW5nKHN1YnN0 cmluZ0Zyb21JbmRleChwYXRoLmdldCgpLCBDRlN0cmluZ0dldExlbmd0aChiYXNlUGF0aC5nZXQo KSkpLmdldCgpKTsKKworICAgIFJldGFpblB0cjxDRlN0cmluZ1JlZj4gbGFzdFBhdGhDb21wb25l bnQgPSBhZG9wdENGKENGVVJMQ29weUxhc3RQYXRoQ29tcG9uZW50KHVybC5nZXQoKSkpOworICAg IHJldHVybiBjZlN0cmluZ1JlZlRvV1N0cmluZyhsYXN0UGF0aENvbXBvbmVudC5nZXQoKSk7CiB9 CiAKIHdzdHJpbmcgbGFzdFBhdGhDb21wb25lbnQoY29uc3Qgd3N0cmluZyYgdXJsU3RyaW5nKQo= 208929 2013-08-16 10:04:18 -0700 2013-08-16 10:40:27 -0700 Patch bug-119583-20130816100357.patch text/plain 2243 bfulgham SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE1NDE4OCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE0IEBACisyMDEzLTA4LTE2ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29t PgorCisgICAgICAgIFtXaW5kb3dzXSBVUkwgcHJpbnRpbmcgY29kZSBpbiBEUlQgZG9lc24ndCBt YXRjaCBXVFIgb3IgTWFjIERSVAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTE5NTgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS93aW4vRHVtcFJlbmRlclRyZWUuY3BwOgorICAg ICAgICAodXJsU3VpdGFibGVGb3JUZXN0UmVzdWx0KTogUmV2aXNlIFVSTCBvdXRwdXQgdG8gbWF0 Y2ggTWFjIERSVCBieSBlbWl0aW5nIGxhc3QgcGF0aAorICAgICAgICBjb21wb25lbnQgaWYgdGhl IFVSTCBkb2VzIG5vdCBjb250YWluIHRoZSBleHBlY3RlZCBiYXNlIFVSTC4KKwogMjAxMy0wOC0x NSAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQGFwcGxlLmNvbT4KIAogICAgICAgICBbV0syXSBO ZXR3b3JrUHJvY2VzcyBzaG91bGQgdXNlIGEgdGVtcG9yYXJ5IHN0b3JhZ2Ugc2Vzc2lvbiBmb3Ig dGVzdApJbmRleDogVG9vbHMvRHVtcFJlbmRlclRyZWUvd2luL0R1bXBSZW5kZXJUcmVlLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBUb29scy9EdW1wUmVuZGVyVHJlZS93aW4vRHVtcFJlbmRlclRyZWUuY3Bw CShyZXZpc2lvbiAxNTQxODcpCisrKyBUb29scy9EdW1wUmVuZGVyVHJlZS93aW4vRHVtcFJlbmRl clRyZWUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNDEsNyArMTQxLDYgQEAgc3RhdGljIFJldGFp blB0cjxDRlN0cmluZ1JlZj4gc3Vic3RyaW5nRgogICAgIHJldHVybiBhZG9wdENGKENGU3RyaW5n Q3JlYXRlV2l0aFN1YnN0cmluZyhrQ0ZBbGxvY2F0b3JEZWZhdWx0LCBzdHJpbmcsIENGUmFuZ2VN YWtlKGluZGV4LCBDRlN0cmluZ0dldExlbmd0aChzdHJpbmcpIC0gaW5kZXgpKSk7CiB9CiAKLS8v IEZJWE1FICgxMTk1ODMpOiBNYWtlIHRoaXMgbWF0Y2ggb3RoZXIgcGxhdGZvcm1zIGJldHRlci4K IHdzdHJpbmcgdXJsU3VpdGFibGVGb3JUZXN0UmVzdWx0KGNvbnN0IHdzdHJpbmcmIHVybFN0cmlu ZykKIHsKICAgICBSZXRhaW5QdHI8Q0ZVUkxSZWY+IHVybCA9IGFkb3B0Q0YoQ0ZVUkxDcmVhdGVX aXRoQnl0ZXMoa0NGQWxsb2NhdG9yRGVmYXVsdCwgcmVpbnRlcnByZXRfY2FzdDxjb25zdCBVSW50 OCo+KHVybFN0cmluZy5jX3N0cigpKSwgdXJsU3RyaW5nLmxlbmd0aCgpICogc2l6ZW9mKHdzdHJp bmc6OnZhbHVlX3R5cGUpLCBrQ0ZTdHJpbmdFbmNvZGluZ1VURjE2LCAwKSk7CkBAIC0xNzAsNyAr MTY5LDExIEBAIHdzdHJpbmcgdXJsU3VpdGFibGVGb3JUZXN0UmVzdWx0KGNvbnN0IHcKICAgICBS ZXRhaW5QdHI8Q0ZTdHJpbmdSZWY+IGJhc2VQYXRoID0gYWRvcHRDRihDRlVSTENvcHlQYXRoKGJh c2VVUkwuZ2V0KCkpKTsKICAgICBSZXRhaW5QdHI8Q0ZTdHJpbmdSZWY+IHBhdGggPSBhZG9wdENG KENGVVJMQ29weVBhdGgodXJsLmdldCgpKSk7CiAKLSAgICByZXR1cm4gY2ZTdHJpbmdSZWZUb1dT dHJpbmcoc3Vic3RyaW5nRnJvbUluZGV4KHBhdGguZ2V0KCksIENGU3RyaW5nR2V0TGVuZ3RoKGJh c2VQYXRoLmdldCgpKSkuZ2V0KCkpOworICAgIGlmIChwYXRoLmdldCgpICYmIENGU3RyaW5nSGFz UHJlZml4KHBhdGguZ2V0KCksIGJhc2VQYXRoLmdldCgpKSkKKyAgICAgICAgcmV0dXJuIGNmU3Ry aW5nUmVmVG9XU3RyaW5nKHN1YnN0cmluZ0Zyb21JbmRleChwYXRoLmdldCgpLCBDRlN0cmluZ0dl dExlbmd0aChiYXNlUGF0aC5nZXQoKSkpLmdldCgpKTsKKworICAgIFJldGFpblB0cjxDRlN0cmlu Z1JlZj4gbGFzdFBhdGhDb21wb25lbnQgPSBhZG9wdENGKENGVVJMQ29weUxhc3RQYXRoQ29tcG9u ZW50KHVybC5nZXQoKSkpOworICAgIHJldHVybiBjZlN0cmluZ1JlZlRvV1N0cmluZyhsYXN0UGF0 aENvbXBvbmVudC5nZXQoKSk7CiB9CiAKIHdzdHJpbmcgbGFzdFBhdGhDb21wb25lbnQoY29uc3Qg d3N0cmluZyYgdXJsU3RyaW5nKQo= 208931 2013-08-16 10:40:29 -0700 2013-08-16 10:52:09 -0700 Patch bug-119583-20130816104008.patch text/plain 3315 bfulgham SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE1NDE4OCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE0IEBACisyMDEzLTA4LTE2ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29t PgorCisgICAgICAgIFtXaW5kb3dzXSBVUkwgcHJpbnRpbmcgY29kZSBpbiBEUlQgZG9lc24ndCBt YXRjaCBXVFIgb3IgTWFjIERSVAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTE5NTgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS93aW4vRHVtcFJlbmRlclRyZWUuY3BwOgorICAg ICAgICAodXJsU3VpdGFibGVGb3JUZXN0UmVzdWx0KTogUmV2aXNlIFVSTCBvdXRwdXQgdG8gbWF0 Y2ggTWFjIERSVCBieSBlbWl0aW5nIGxhc3QgcGF0aAorICAgICAgICBjb21wb25lbnQgaWYgdGhl IFVSTCBkb2VzIG5vdCBjb250YWluIHRoZSBleHBlY3RlZCBiYXNlIFVSTC4KKwogMjAxMy0wOC0x NSAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQGFwcGxlLmNvbT4KIAogICAgICAgICBbV0syXSBO ZXR3b3JrUHJvY2VzcyBzaG91bGQgdXNlIGEgdGVtcG9yYXJ5IHN0b3JhZ2Ugc2Vzc2lvbiBmb3Ig dGVzdApJbmRleDogVG9vbHMvRHVtcFJlbmRlclRyZWUvd2luL0R1bXBSZW5kZXJUcmVlLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBUb29scy9EdW1wUmVuZGVyVHJlZS93aW4vRHVtcFJlbmRlclRyZWUuY3Bw CShyZXZpc2lvbiAxNTQxODcpCisrKyBUb29scy9EdW1wUmVuZGVyVHJlZS93aW4vRHVtcFJlbmRl clRyZWUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNDEsNyArMTQxLDEyIEBAIHN0YXRpYyBSZXRh aW5QdHI8Q0ZTdHJpbmdSZWY+IHN1YnN0cmluZ0YKICAgICByZXR1cm4gYWRvcHRDRihDRlN0cmlu Z0NyZWF0ZVdpdGhTdWJzdHJpbmcoa0NGQWxsb2NhdG9yRGVmYXVsdCwgc3RyaW5nLCBDRlJhbmdl TWFrZShpbmRleCwgQ0ZTdHJpbmdHZXRMZW5ndGgoc3RyaW5nKSAtIGluZGV4KSkpOwogfQogCi0v LyBGSVhNRSAoMTE5NTgzKTogTWFrZSB0aGlzIG1hdGNoIG90aGVyIHBsYXRmb3JtcyBiZXR0ZXIu CitzdGF0aWMgd3N0cmluZyBmYWxsYmFja1N0cmluZyhDRlVSTFJlZiB1cmwpCit7CisgICAgUmV0 YWluUHRyPENGU3RyaW5nUmVmPiBsYXN0UGF0aENvbXBvbmVudCA9IGFkb3B0Q0YoQ0ZVUkxDb3B5 TGFzdFBhdGhDb21wb25lbnQodXJsKSk7CisgICAgcmV0dXJuIGNmU3RyaW5nUmVmVG9XU3RyaW5n KGxhc3RQYXRoQ29tcG9uZW50LmdldCgpKTsKK30KKwogd3N0cmluZyB1cmxTdWl0YWJsZUZvclRl c3RSZXN1bHQoY29uc3Qgd3N0cmluZyYgdXJsU3RyaW5nKQogewogICAgIFJldGFpblB0cjxDRlVS TFJlZj4gdXJsID0gYWRvcHRDRihDRlVSTENyZWF0ZVdpdGhCeXRlcyhrQ0ZBbGxvY2F0b3JEZWZh dWx0LCByZWludGVycHJldF9jYXN0PGNvbnN0IFVJbnQ4Kj4odXJsU3RyaW5nLmNfc3RyKCkpLCB1 cmxTdHJpbmcubGVuZ3RoKCkgKiBzaXplb2Yod3N0cmluZzo6dmFsdWVfdHlwZSksIGtDRlN0cmlu Z0VuY29kaW5nVVRGMTYsIDApKTsKQEAgLTE1MywxNiArMTU4LDE2IEBAIHdzdHJpbmcgdXJsU3Vp dGFibGVGb3JUZXN0UmVzdWx0KGNvbnN0IHcKICAgICBDT01QdHI8SVdlYkRhdGFTb3VyY2U+IGRh dGFTb3VyY2U7CiAgICAgaWYgKEZBSUxFRChmcmFtZS0+ZGF0YVNvdXJjZSgmZGF0YVNvdXJjZSkp KSB7CiAgICAgICAgIGlmIChGQUlMRUQoZnJhbWUtPnByb3Zpc2lvbmFsRGF0YVNvdXJjZSgmZGF0 YVNvdXJjZSkpKQotICAgICAgICAgICAgcmV0dXJuIHVybFN0cmluZzsKKyAgICAgICAgICAgIHJl dHVybiBmYWxsYmFja1N0cmluZyh1cmwuZ2V0KCkpOwogICAgIH0KIAogICAgIENPTVB0cjxJV2Vi TXV0YWJsZVVSTFJlcXVlc3Q+IHJlcXVlc3Q7CiAgICAgaWYgKEZBSUxFRChkYXRhU291cmNlLT5y ZXF1ZXN0KCZyZXF1ZXN0KSkpCi0gICAgICAgIHJldHVybiB1cmxTdHJpbmc7CisgICAgICAgIHJl dHVybiBmYWxsYmFja1N0cmluZyh1cmwuZ2V0KCkpOwogCiAgICAgX2JzdHJfdCByZXF1ZXN0VVJM U3RyaW5nOwogICAgIGlmIChGQUlMRUQocmVxdWVzdC0+VVJMKHJlcXVlc3RVUkxTdHJpbmcuR2V0 QWRkcmVzcygpKSkpCi0gICAgICAgIHJldHVybiB1cmxTdHJpbmc7CisgICAgICAgIHJldHVybiBm YWxsYmFja1N0cmluZyh1cmwuZ2V0KCkpOwogCiAgICAgUmV0YWluUHRyPENGVVJMUmVmPiByZXF1 ZXN0VVJMID0gYWRvcHRDRihDRlVSTENyZWF0ZVdpdGhCeXRlcyhrQ0ZBbGxvY2F0b3JEZWZhdWx0 LCByZWludGVycHJldF9jYXN0PGNvbnN0IFVJbnQ4Kj4ocmVxdWVzdFVSTFN0cmluZy5HZXRCU1RS KCkpLCByZXF1ZXN0VVJMU3RyaW5nLmxlbmd0aCgpICogc2l6ZW9mKE9MRUNIQVIpLCBrQ0ZTdHJp bmdFbmNvZGluZ1VURjE2LCAwKSk7CiAgICAgUmV0YWluUHRyPENGVVJMUmVmPiBiYXNlVVJMID0g YWRvcHRDRihDRlVSTENyZWF0ZUNvcHlEZWxldGluZ0xhc3RQYXRoQ29tcG9uZW50KGtDRkFsbG9j YXRvckRlZmF1bHQsIHJlcXVlc3RVUkwuZ2V0KCkpKTsKQEAgLTE3MCw3ICsxNzUsMTAgQEAgd3N0 cmluZyB1cmxTdWl0YWJsZUZvclRlc3RSZXN1bHQoY29uc3QgdwogICAgIFJldGFpblB0cjxDRlN0 cmluZ1JlZj4gYmFzZVBhdGggPSBhZG9wdENGKENGVVJMQ29weVBhdGgoYmFzZVVSTC5nZXQoKSkp OwogICAgIFJldGFpblB0cjxDRlN0cmluZ1JlZj4gcGF0aCA9IGFkb3B0Q0YoQ0ZVUkxDb3B5UGF0 aCh1cmwuZ2V0KCkpKTsKIAotICAgIHJldHVybiBjZlN0cmluZ1JlZlRvV1N0cmluZyhzdWJzdHJp bmdGcm9tSW5kZXgocGF0aC5nZXQoKSwgQ0ZTdHJpbmdHZXRMZW5ndGgoYmFzZVBhdGguZ2V0KCkp KS5nZXQoKSk7CisgICAgaWYgKGJhc2VQYXRoLmdldCgpICYmIENGU3RyaW5nSGFzUHJlZml4KHBh dGguZ2V0KCksIGJhc2VQYXRoLmdldCgpKSkKKyAgICAgICAgcmV0dXJuIGNmU3RyaW5nUmVmVG9X U3RyaW5nKHN1YnN0cmluZ0Zyb21JbmRleChwYXRoLmdldCgpLCBDRlN0cmluZ0dldExlbmd0aChi YXNlUGF0aC5nZXQoKSkpLmdldCgpKTsKKworICAgIHJldHVybiBmYWxsYmFja1N0cmluZyh1cmwu Z2V0KCkpOwogfQogCiB3c3RyaW5nIGxhc3RQYXRoQ29tcG9uZW50KGNvbnN0IHdzdHJpbmcmIHVy bFN0cmluZykK