119585 2013-08-08 11:30:40 -0700 [EFL][WK1] URL printing code in DumpRenderTree doesn't match WTR or Mac DRT 2013-08-12 22:54:52 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ap ryuan.choi cdumez commit-queue gyuyoung.kim gyuyoung.kim rakuco ryuan.choi oldest_to_newest 915524 0 ap 2013-08-08 11:30:40 -0700 pathSuitableForTestResult() in DumpRenderTreeChrome has some code that doesn't match other platforms. If should return a path that's relative to main frame URL, or just the file name if the resource is not in the same directory subtree. 916218 1 cdumez 2013-08-12 03:00:20 -0700 Adding Ryuan and Gyuyoung in CC since I believe they are maintaining EFL WK1. 916266 2 gyuyoung.kim 2013-08-12 05:50:03 -0700 ap, will you submit a patch for this bug ? Otherwise, do you want we make a patch for this bug ? 916267 3 cdumez 2013-08-12 05:59:17 -0700 (In reply to comment #2) > ap, will you submit a patch for this bug ? Otherwise, do you want we make a patch for this bug ? I really think it is up to us to fix EFL bugs. 916268 4 gyuyoung.kim 2013-08-12 06:02:26 -0700 (In reply to comment #3) > (In reply to comment #2) > > ap, will you submit a patch for this bug ? Otherwise, do you want we make a patch for this bug ? > > I really think it is up to us to fix EFL bugs. Looks like that as well. Ryuan or I will fix this soon. ;) 916285 5 ap 2013-08-12 08:47:25 -0700 Thank you! It would be much better for someone with a EFL build to do this, as there is likely to be quite a bit of test expectation cleanup. WebKitTestRunner code can probably serve as a model here. 916488 6 208583 ryuan.choi 2013-08-12 19:10:31 -0700 Created attachment 208583 Patch 916492 7 ryuan.choi 2013-08-12 19:20:56 -0700 (In reply to comment #5) > Thank you! It would be much better for someone with a EFL build to do this, as there is likely to be quite a bit of test expectation cleanup. > > WebKitTestRunner code can probably serve as a model here. WebKitTestRunner was good reference. I made patch similarly. 916494 8 208583 gyuyoung.kim 2013-08-12 19:26:05 -0700 Comment on attachment 208583 Patch This patch lets the EFL port follow r153852. LGTM. However, ap might want to have final look before landing. 916507 9 208583 ap 2013-08-12 20:25:25 -0700 Comment on attachment 208583 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=208583&action=review Looks good to me too. > Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp:226 > +const WebCore::KURL DumpRenderTreeSupportEfl::provisionalUrl(const Evas_Object* ewkFrame) WebKit style would be "provisionalURL". I do not know if this code is intended to follow common WebKit style. > Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp:350 > + KURL mainFrameUrl = KURL(ParsedURLString, ewk_frame_uri_get(browser->mainFrame())); Ditto. 916537 10 208593 ryuan.choi 2013-08-12 22:05:25 -0700 Created attachment 208593 StyleFixed 916554 11 208593 commit-queue 2013-08-12 22:54:49 -0700 Comment on attachment 208593 StyleFixed Clearing flags on attachment: 208593 Committed r153977: <http://trac.webkit.org/changeset/153977> 916555 12 commit-queue 2013-08-12 22:54:52 -0700 All reviewed patches have been landed. Closing bug. 208583 2013-08-12 19:10:31 -0700 2013-08-12 22:05:16 -0700 Patch bug-119585-20130813111028.patch text/plain 8620 ryuan.choi U3VidmVyc2lvbiBSZXZpc2lvbjogMTUzOTcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Vm bC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2VmbC9DaGFuZ2VMb2cKaW5kZXggODA0MmZmY2M1 NzQ2ODE0MmRjNzQ3Njk2OTkzMjRhMGQ4MWEwMGE5Mi4uMDNmNjJiMzJkMGFjYTJjMjdlNmQ4NmU2 NmZkOTNmMWYyNzdiZThkZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEz LTA4LTEyICBSeXVhbiBDaG9pICA8cnl1YW4uY2hvaUBzYW1zdW5nLmNvbT4KKworICAgICAgICBb RUZMXVtXSzFdIFVSTCBwcmludGluZyBjb2RlIGluIER1bXBSZW5kZXJUcmVlIGRvZXNuJ3QgbWF0 Y2ggV1RSIG9yIE1hYyBEUlQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTExOTU4NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvRHVtcFJlbmRlclRyZWVTdXBwb3J0RWZsLmNwcDoK KyAgICAgICAgKER1bXBSZW5kZXJUcmVlU3VwcG9ydEVmbDo6cHJvdmlzaW9uYWxVcmwpOgorICAg ICAgICBJbXBsZW1lbnRlZCB0byBwYXNzIHByb3Zpc2lvbmFsVXJsIG9mIG1haW4gZnJhbWUgdG8g RHVtcFJlbmRlclRyZWVDaHJvbWUuCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvRHVtcFJlbmRl clRyZWVTdXBwb3J0RWZsLmg6CisKIDIwMTMtMDgtMDkgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxh cEBhcHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTiAocjE0Mjc1NSk6IHdpbmRvdy5vcGVu IGNyZWF0ZXMgYW4gaW52aXNpYmxlIHdpbmRvdyB3aGVuIHdpZHRoIGFuZCBoZWlnaHQgYXJlIDAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL1dlYkNvcmVTdXBwb3J0L0R1bXBSZW5kZXJU cmVlU3VwcG9ydEVmbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9EdW1w UmVuZGVyVHJlZVN1cHBvcnRFZmwuY3BwCmluZGV4IGUxNTNlNjFmNDA4MTczZDRhZmNmMWYwYWMz ZjQ3MmZhNzI2MmZiNGQuLjk4MTdkZGU2ZjQ3ZDNjZjNkNWZiYzgxMjQ2NGU0Y2JkY2NiNWY4NTQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZWZsL1dlYkNvcmVTdXBwb3J0L0R1bXBSZW5kZXJU cmVlU3VwcG9ydEVmbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQv RHVtcFJlbmRlclRyZWVTdXBwb3J0RWZsLmNwcApAQCAtMjIzLDYgKzIyMywxNyBAQCBTdHJpbmcg RHVtcFJlbmRlclRyZWVTdXBwb3J0RWZsOjpzdWl0YWJsZURSVEZyYW1lTmFtZShjb25zdCBFdmFz X09iamVjdCogZXdrRnJhbQogICAgIHJldHVybiBTdHJpbmcoImZyYW1lIChhbm9ueW1vdXMpIik7 CiB9CiAKK2NvbnN0IFdlYkNvcmU6OktVUkwgRHVtcFJlbmRlclRyZWVTdXBwb3J0RWZsOjpwcm92 aXNpb25hbFVybChjb25zdCBFdmFzX09iamVjdCogZXdrRnJhbWUpCit7CisgICAgRFJUX1NVUFBP UlRfRlJBTUVfR0VUX09SX1JFVFVSTihld2tGcmFtZSwgZnJhbWUsIFdlYkNvcmU6OktVUkwoKSk7 CisKKyAgICBXZWJDb3JlOjpEb2N1bWVudExvYWRlciogcHJvdmlzaW9uYWxEb2N1bWVudExvYWRl ciA9IGZyYW1lLT5sb2FkZXIoKS0+cHJvdmlzaW9uYWxEb2N1bWVudExvYWRlcigpOworICAgIGlm ICghcHJvdmlzaW9uYWxEb2N1bWVudExvYWRlcikKKyAgICAgICAgcmV0dXJuIFdlYkNvcmU6OktV UkwoKTsKKworICAgIHJldHVybiBwcm92aXNpb25hbERvY3VtZW50TG9hZGVyLT51cmwoKTsKK30K Kwogdm9pZCBEdW1wUmVuZGVyVHJlZVN1cHBvcnRFZmw6OnNldFZhbHVlRm9yVXNlcihKU0NvbnRl eHRSZWYgY29udGV4dCwgSlNWYWx1ZVJlZiBub2RlT2JqZWN0LCBjb25zdCBTdHJpbmcmIHZhbHVl KQogewogICAgIEpTQzo6RXhlY1N0YXRlKiBleGVjID0gdG9KUyhjb250ZXh0KTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvZWZsL1dlYkNvcmVTdXBwb3J0L0R1bXBSZW5kZXJUcmVlU3VwcG9y dEVmbC5oIGIvU291cmNlL1dlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvRHVtcFJlbmRlclRyZWVT dXBwb3J0RWZsLmgKaW5kZXggM2JjMmI0ZmZlMmY4N2MwMGZmZjAyZjhkOWNkNWNkOTQ2MmFmZTY1 Yy4uN2FmYTY3NWViZTllMzBiZDcyMjUwOWUwODVjMzI2NGEwMjJjM2U5NCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvRHVtcFJlbmRlclRyZWVTdXBwb3J0RWZs LmgKKysrIGIvU291cmNlL1dlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvRHVtcFJlbmRlclRyZWVT dXBwb3J0RWZsLmgKQEAgLTIyLDYgKzIyLDcgQEAKICNpZm5kZWYgRHVtcFJlbmRlclRyZWVTdXBw b3J0RWZsX2gKICNkZWZpbmUgRHVtcFJlbmRlclRyZWVTdXBwb3J0RWZsX2gKIAorI2luY2x1ZGUg IktVUkwuaCIKICNpbmNsdWRlIDxFaW5hLmg+CiAjaW5jbHVkZSA8RmluZE9wdGlvbnMuaD4KICNp bmNsdWRlIDxJbnRSZWN0Lmg+CkBAIC02NSw2ICs2Niw3IEBAIHB1YmxpYzoKICAgICBzdGF0aWMg U3RyaW5nIHJlc3BvbnNlTWltZVR5cGUoY29uc3QgRXZhc19PYmplY3QqIGV3a0ZyYW1lKTsKICAg ICBzdGF0aWMgV2ViQ29yZTo6SW50UmVjdCBzZWxlY3Rpb25SZWN0YW5nbGUoY29uc3QgRXZhc19P YmplY3QqIGV3a0ZyYW1lKTsKICAgICBzdGF0aWMgU3RyaW5nIHN1aXRhYmxlRFJURnJhbWVOYW1l KGNvbnN0IEV2YXNfT2JqZWN0KiBld2tGcmFtZSk7CisgICAgc3RhdGljIGNvbnN0IFdlYkNvcmU6 OktVUkwgcHJvdmlzaW9uYWxVcmwoY29uc3QgRXZhc19PYmplY3QqIGV3a0ZyYW1lKTsKICAgICBz dGF0aWMgU3RyaW5nIGxheWVyVHJlZUFzVGV4dChjb25zdCBFdmFzX09iamVjdCogZXdrRnJhbWUp OwogICAgIHN0YXRpYyB2b2lkIHNldFZhbHVlRm9yVXNlcihKU0NvbnRleHRSZWYsIEpTVmFsdWVS ZWYgbm9kZU9iamVjdCwgY29uc3QgU3RyaW5nJiB2YWx1ZSk7CiAgICAgc3RhdGljIHZvaWQgc2V0 RGVmZXJzTG9hZGluZyhFdmFzX09iamVjdCogZXdrVmlldywgYm9vbCBkZWZlcnMpOwpkaWZmIC0t Z2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGI1YzgyNTk2NjRh YmE0NGZhZTI4NDliZDhjYjdiMTc3N2Y1NjkxODQuLjUyYjgwODhhOTQyYTVkYmQ2Njk4MWRmMjY5 NzUzYjljYmE3NTY4YWMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9D aGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMy0wOC0xMiAgUnl1YW4gQ2hvaSAgPHJ5dWFu LmNob2lAc2Ftc3VuZy5jb20+CisKKyAgICAgICAgW0VGTF1bV0sxXSBVUkwgcHJpbnRpbmcgY29k ZSBpbiBEdW1wUmVuZGVyVHJlZSBkb2Vzbid0IG1hdGNoIFdUUiBvciBNYWMgRFJUCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTk1ODUKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIER1bXBSZW5kZXJUcmVl L2VmbC9EdW1wUmVuZGVyVHJlZUNocm9tZS5jcHA6CisgICAgICAgIChwYXRoU3VpdGFibGVGb3JU ZXN0UmVzdWx0KToKKyAgICAgICAgUmV0dXJuIHBhdGggc3RyaW5nIHRoYXQncyByZWxhdGl2ZSB0 byBtYWluIGZyYW1lIFVSTCwgb3IganVzdCBmaWxlIG5hbWUgaWYKKyAgICAgICAgdGhlIHJlc291 cmNlIGlzIG5vdCBpbiB0aGUgc2FtZSBkaXJlY3Rvcnkgc3VidHJlZS4KKyAgICAgICAgUmVmZXJl bmNlZCBXZWJLaXRUZXN0UnVubmVyIGNvZGUgaW4gcjE1Mzg1Mi4KKyAgICAgICAgKGRlc2NyaXB0 aW9uU3VpdGFibGVGb3JUZXN0UmVzdWx0KToKKyAgICAgICAgKER1bXBSZW5kZXJUcmVlQ2hyb21l OjpvbkZyYW1lUmVkaXJlY3RSZXF1ZXN0ZWQpOgorICAgICAgICAoRHVtcFJlbmRlclRyZWVDaHJv bWU6Om9uTmV3UmVzb3VyY2VSZXF1ZXN0KTogRm9sbG93ZWQgY2hhbmdlcyBvZiByMTUzOTAzLgor CiAyMDEzLTA4LTEyICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgogCiAgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTk2OTMKZGlmZiAt LWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2VmbC9EdW1wUmVuZGVyVHJlZUNocm9tZS5jcHAg Yi9Ub29scy9EdW1wUmVuZGVyVHJlZS9lZmwvRHVtcFJlbmRlclRyZWVDaHJvbWUuY3BwCmluZGV4 IGJjOTcxODhjNjVkYzRlMGM0ZGZlNTU2MTdlYWYxNjc4MGNhN2ZhMTAuLjA0ODEzZmZiOGQxNzA2 ZjM1ODUwMDIwYjY2NDQ5NTkzNWMwZWUwZGIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJU cmVlL2VmbC9EdW1wUmVuZGVyVHJlZUNocm9tZS5jcHAKKysrIGIvVG9vbHMvRHVtcFJlbmRlclRy ZWUvZWZsL0R1bXBSZW5kZXJUcmVlQ2hyb21lLmNwcApAQCAtMzM2LDUzICszMzYsMzggQEAgdm9p ZCBEdW1wUmVuZGVyVHJlZUNocm9tZTo6cmVzZXREZWZhdWx0c1RvQ29uc2lzdGVudFZhbHVlcygp CiAgICAgcG9saWN5RGVsZWdhdGVQZXJtaXNzaXZlID0gZmFsc2U7CiB9CiAKLS8vIEZJWE1FICgx MTk1ODUpOiBNYWtlIHRoaXMgbWF0Y2ggb3RoZXIgcGxhdGZvcm1zIGJldHRlci4KLXN0YXRpYyBD U3RyaW5nIHBhdGhTdWl0YWJsZUZvclRlc3RSZXN1bHQoY29uc3QgY2hhciogdXJpU3RyaW5nKQot ewotICAgIGlmICghdXJpU3RyaW5nKQotICAgICAgICByZXR1cm4gQ1N0cmluZygpOworc3RhdGlj IGNvbnN0IGNoYXIgZGl2aWRlciA9ICcvJzsKIAorc3RhdGljIFN0cmluZyBwYXRoU3VpdGFibGVG b3JUZXN0UmVzdWx0KGNvbnN0IGNoYXIqIHVyaVN0cmluZykKK3sKICAgICBLVVJMIHVyaSA9IEtV UkwoUGFyc2VkVVJMU3RyaW5nLCB1cmlTdHJpbmcpOworICAgIGlmICh1cmkuaXNFbXB0eSgpKQor ICAgICAgICByZXR1cm4gIihudWxsKSI7CiAKICAgICBpZiAoIXVyaS5pc0xvY2FsRmlsZSgpKQot ICAgICAgICByZXR1cm4gdXJpLnN0cmluZygpLnV0ZjgoKTsKKyAgICAgICAgcmV0dXJuIHVyaS5z dHJpbmcoKTsKIAotICAgIFN0cmluZyBwYXRoU3RyaW5nID0gdXJpLnBhdGgoKTsKLSAgICBzaXpl X3QgaW5kZXhCYXNlTmFtZSA9IHBhdGhTdHJpbmcucmV2ZXJzZUZpbmQoJy8nKTsKLSAgICBTdHJp bmcgYmFzZU5hbWU7Ci0gICAgaWYgKGluZGV4QmFzZU5hbWUgPT0gbm90Rm91bmQpCi0gICAgICAg IGJhc2VOYW1lID0gcGF0aFN0cmluZzsKLSAgICBlbHNlCi0gICAgICAgIGJhc2VOYW1lID0gcGF0 aFN0cmluZy5zdWJzdHJpbmcoaW5kZXhCYXNlTmFtZSArIDEpOworICAgIEtVUkwgbWFpbkZyYW1l VXJsID0gS1VSTChQYXJzZWRVUkxTdHJpbmcsIGV3a19mcmFtZV91cmlfZ2V0KGJyb3dzZXItPm1h aW5GcmFtZSgpKSk7CisgICAgaWYgKG1haW5GcmFtZVVybC5pc0VtcHR5KCkpCisgICAgICAgIG1h aW5GcmFtZVVybCA9IER1bXBSZW5kZXJUcmVlU3VwcG9ydEVmbDo6cHJvdmlzaW9uYWxVcmwoYnJv d3Nlci0+bWFpbkZyYW1lKCkpOwogCi0gICAgU3RyaW5nIGRpck5hbWU7Ci0gICAgaWYgKGluZGV4 QmFzZU5hbWUgIT0gbm90Rm91bmQpIHsKLSAgICAgICAgc2l6ZV90IGluZGV4RGlyTmFtZSA9IHBh dGhTdHJpbmcucmV2ZXJzZUZpbmQoJy8nLCBpbmRleEJhc2VOYW1lIC0gMSk7Ci0gICAgICAgIGlm IChpbmRleERpck5hbWUgIT0gbm90Rm91bmQpCi0gICAgICAgICAgICBkaXJOYW1lID0gcGF0aFN0 cmluZy5zdWJzdHJpbmcoaW5kZXhEaXJOYW1lICsgMSwgaW5kZXhCYXNlTmFtZSAtIGluZGV4RGly TmFtZSAtIDEpOwotICAgIH0KLQotICAgIFN0cmluZyByZXQgPSBkaXJOYW1lICsgIi8iICsgYmFz ZU5hbWU7Ci0gICAgcmV0dXJuIHJldC51dGY4KCk7Ci19CisgICAgU3RyaW5nIG1haW5GcmFtZVVy bFBhdGhTdHJpbmcgPSBtYWluRnJhbWVVcmwucGF0aCgpOworICAgIFN0cmluZyBwYXRoU3RyaW5n ID0gdXJpLnBhdGgoKTsKKyAgICBTdHJpbmcgYmFzZVBhdGggPSBtYWluRnJhbWVVcmxQYXRoU3Ry aW5nLnN1YnN0cmluZygwLCBtYWluRnJhbWVVcmxQYXRoU3RyaW5nLnJldmVyc2VGaW5kKGRpdmlk ZXIpICsgMSk7CiAKLXN0YXRpYyBDU3RyaW5nIHVybFN1aXRhYmxlRm9yVGVzdFJlc3VsdChjb25z dCBjaGFyKiB1cmlTdHJpbmcpCi17Ci0gICAgS1VSTCB1cmkgPSBLVVJMKFBhcnNlZFVSTFN0cmlu ZywgdXJpU3RyaW5nKTsKLSAgICBpZiAoIXVyaS5pc0xvY2FsRmlsZSgpKQotICAgICAgICByZXR1 cm4gQ1N0cmluZyh1cmlTdHJpbmcpOworICAgIGlmICghYmFzZVBhdGguaXNFbXB0eSgpICYmIHBh dGhTdHJpbmcuc3RhcnRzV2l0aChiYXNlUGF0aCkpCisgICAgICAgIHJldHVybiBwYXRoU3RyaW5n LnN1YnN0cmluZyhiYXNlUGF0aC5sZW5ndGgoKSk7CiAKLSAgICB1bnNpZ25lZCBzdGFydEluZGV4 ID0gdXJpLnBhdGhBZnRlckxhc3RTbGFzaCgpOwotICAgIHJldHVybiB1cmkuc3RyaW5nKCkuc3Vi c3RyaW5nKHN0YXJ0SW5kZXgpLnV0ZjgoKTsKKyAgICByZXR1cm4gdXJpLmxhc3RQYXRoQ29tcG9u ZW50KCk7CiB9CiAKIHN0YXRpYyBDU3RyaW5nIGRlc2NyaXB0aW9uU3VpdGFibGVGb3JUZXN0UmVz dWx0KEV3a19GcmFtZV9SZXNvdXJjZV9SZXF1ZXN0KiByZXF1ZXN0KQogewogICAgIFN0cmluZ0J1 aWxkZXIgYnVpbGRlcjsKICAgICBidWlsZGVyLmFwcGVuZExpdGVyYWwoIjxOU1VSTFJlcXVlc3Qg VVJMICIpOwotICAgIGJ1aWxkZXIuYXBwZW5kKHBhdGhTdWl0YWJsZUZvclRlc3RSZXN1bHQocmVx dWVzdC0+dXJsKS5kYXRhKCkpOworICAgIGJ1aWxkZXIuYXBwZW5kKHBhdGhTdWl0YWJsZUZvclRl c3RSZXN1bHQocmVxdWVzdC0+dXJsKSk7CiAgICAgYnVpbGRlci5hcHBlbmRMaXRlcmFsKCIsIG1h aW4gZG9jdW1lbnQgVVJMICIpOwotICAgIGJ1aWxkZXIuYXBwZW5kKHVybFN1aXRhYmxlRm9yVGVz dFJlc3VsdChyZXF1ZXN0LT5maXJzdF9wYXJ0eSkuZGF0YSgpKTsKKyAgICBidWlsZGVyLmFwcGVu ZChwYXRoU3VpdGFibGVGb3JUZXN0UmVzdWx0KHJlcXVlc3QtPmZpcnN0X3BhcnR5KSk7CiAgICAg YnVpbGRlci5hcHBlbmRMaXRlcmFsKCIsIGh0dHAgbWV0aG9kICIpOwogCiAgICAgaWYgKHJlcXVl c3QtPmh0dHBfbWV0aG9kKQpAQCAtNDAxLDcgKzM4Niw3IEBAIHN0YXRpYyBDU3RyaW5nIGRlc2Ny aXB0aW9uU3VpdGFibGVGb3JUZXN0UmVzdWx0KGNvbnN0IEV3a19GcmFtZV9SZXNvdXJjZV9SZXNw b25zCiAKICAgICBTdHJpbmdCdWlsZGVyIGJ1aWxkZXI7CiAgICAgYnVpbGRlci5hcHBlbmRMaXRl cmFsKCI8TlNVUkxSZXNwb25zZSAiKTsKLSAgICBidWlsZGVyLmFwcGVuZChwYXRoU3VpdGFibGVG b3JUZXN0UmVzdWx0KHJlc3BvbnNlLT51cmwpLmRhdGEoKSk7CisgICAgYnVpbGRlci5hcHBlbmQo cGF0aFN1aXRhYmxlRm9yVGVzdFJlc3VsdChyZXNwb25zZS0+dXJsKSk7CiAgICAgYnVpbGRlci5h cHBlbmRMaXRlcmFsKCIsIGh0dHAgc3RhdHVzIGNvZGUgIik7CiAgICAgYnVpbGRlci5hcHBlbmQo U3RyaW5nOjpudW1iZXIocmVzcG9uc2UtPnN0YXR1c19jb2RlKSk7CiAgICAgYnVpbGRlci5hcHBl bmQoJz4nKTsKQEAgLTc5NSw3ICs3ODAsNyBAQCB2b2lkIER1bXBSZW5kZXJUcmVlQ2hyb21lOjpv bkZyYW1lUmVkaXJlY3RSZXF1ZXN0ZWQodm9pZCosIEV2YXNfT2JqZWN0KiBmcmFtZSwgdgogCiAg ICAgaWYgKCFkb25lICYmIGdUZXN0UnVubmVyLT5kdW1wRnJhbWVMb2FkQ2FsbGJhY2tzKCkpIHsK ICAgICAgICAgY29uc3QgU3RyaW5nIGZyYW1lTmFtZShEdW1wUmVuZGVyVHJlZVN1cHBvcnRFZmw6 OnN1aXRhYmxlRFJURnJhbWVOYW1lKGZyYW1lKSk7Ci0gICAgICAgIHByaW50ZigiJXMgLSB3aWxs UGVyZm9ybUNsaWVudFJlZGlyZWN0VG9VUkw6ICVzIFxuIiwgZnJhbWVOYW1lLnV0ZjgoKS5kYXRh KCksIHBhdGhTdWl0YWJsZUZvclRlc3RSZXN1bHQodXJsKS5kYXRhKCkpOworICAgICAgICBwcmlu dGYoIiVzIC0gd2lsbFBlcmZvcm1DbGllbnRSZWRpcmVjdFRvVVJMOiAlcyBcbiIsIGZyYW1lTmFt ZS51dGY4KCkuZGF0YSgpLCBwYXRoU3VpdGFibGVGb3JUZXN0UmVzdWx0KHVybCkudXRmOCgpLmRh dGEoKSk7CiAgICAgfQogfQogCkBAIC04NDYsOCArODMxLDggQEAgdm9pZCBEdW1wUmVuZGVyVHJl ZUNocm9tZTo6b25OZXdSZXNvdXJjZVJlcXVlc3Qodm9pZCosIEV2YXNfT2JqZWN0Kiwgdm9pZCog ZXZlbnQKIHsKICAgICBFd2tfRnJhbWVfUmVzb3VyY2VfUmVxdWVzdCogcmVxdWVzdCA9IHN0YXRp Y19jYXN0PEV3a19GcmFtZV9SZXNvdXJjZV9SZXF1ZXN0Kj4oZXZlbnRJbmZvKTsKIAotICAgIGlm ICghZG9uZSAmJiBnVGVzdFJ1bm5lci0+ZHVtcFJlc291cmNlTG9hZENhbGxiYWNrcygpKQotICAg ICAgICBtX2R1bXBBc3NpZ25lZFVybHMuYWRkKHJlcXVlc3QtPmlkZW50aWZpZXIsIHBhdGhTdWl0 YWJsZUZvclRlc3RSZXN1bHQocmVxdWVzdC0+dXJsKSk7CisgICAgaWYgKCFkb25lKQorICAgICAg ICBtX2R1bXBBc3NpZ25lZFVybHMuYWRkKHJlcXVlc3QtPmlkZW50aWZpZXIsIHBhdGhTdWl0YWJs ZUZvclRlc3RSZXN1bHQocmVxdWVzdC0+dXJsKS51dGY4KCkpOwogfQogCiB2b2lkIER1bXBSZW5k ZXJUcmVlQ2hyb21lOjpvbkRvd25sb2FkUmVxdWVzdCh2b2lkKiwgRXZhc19PYmplY3QqLCB2b2lk KiBldmVudEluZm8pCg== 208593 2013-08-12 22:05:25 -0700 2013-08-12 22:54:49 -0700 StyleFixed bug-119585-20130813140523.patch text/plain 8635 ryuan.choi U3VidmVyc2lvbiBSZXZpc2lvbjogMTUzOTczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Vm bC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2VmbC9DaGFuZ2VMb2cKaW5kZXggODA0MmZmY2M1 NzQ2ODE0MmRjNzQ3Njk2OTkzMjRhMGQ4MWEwMGE5Mi4uMzFiNzMxN2ZlY2MxMTNkYTViOWUwODVl ZDhlZDViYzNhMTM2YjVlMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEz LTA4LTEyICBSeXVhbiBDaG9pICA8cnl1YW4uY2hvaUBzYW1zdW5nLmNvbT4KKworICAgICAgICBb RUZMXVtXSzFdIFVSTCBwcmludGluZyBjb2RlIGluIER1bXBSZW5kZXJUcmVlIGRvZXNuJ3QgbWF0 Y2ggV1RSIG9yIE1hYyBEUlQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTExOTU4NQorCisgICAgICAgIFJldmlld2VkIGJ5IEd5dXlvdW5nIEtpbS4KKwor ICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0R1bXBSZW5kZXJUcmVlU3VwcG9ydEVmbC5jcHA6Cisg ICAgICAgIChEdW1wUmVuZGVyVHJlZVN1cHBvcnRFZmw6OnByb3Zpc2lvbmFsVVJMKToKKyAgICAg ICAgSW1wbGVtZW50ZWQgdG8gcGFzcyBwcm92aXNpb25hbFVSTCBvZiBtYWluIGZyYW1lIHRvIER1 bXBSZW5kZXJUcmVlQ2hyb21lLgorICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0R1bXBSZW5kZXJU cmVlU3VwcG9ydEVmbC5oOgorCiAyMDEzLTA4LTA5ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBA YXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04gKHIxNDI3NTUpOiB3aW5kb3cub3BlbiBj cmVhdGVzIGFuIGludmlzaWJsZSB3aW5kb3cgd2hlbiB3aWR0aCBhbmQgaGVpZ2h0IGFyZSAwCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9EdW1wUmVuZGVyVHJl ZVN1cHBvcnRFZmwuY3BwIGIvU291cmNlL1dlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvRHVtcFJl bmRlclRyZWVTdXBwb3J0RWZsLmNwcAppbmRleCBlMTUzZTYxZjQwODE3M2Q0YWZjZjFmMGFjM2Y0 NzJmYTcyNjJmYjRkLi5kMDQzYzE3YWVlZGYxYjNhMWVlYzkwMzVlNDJkN2Y1YmE3MzMzYmE4IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9EdW1wUmVuZGVyVHJl ZVN1cHBvcnRFZmwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvZWZsL1dlYkNvcmVTdXBwb3J0L0R1 bXBSZW5kZXJUcmVlU3VwcG9ydEVmbC5jcHAKQEAgLTIyMyw2ICsyMjMsMTcgQEAgU3RyaW5nIER1 bXBSZW5kZXJUcmVlU3VwcG9ydEVmbDo6c3VpdGFibGVEUlRGcmFtZU5hbWUoY29uc3QgRXZhc19P YmplY3QqIGV3a0ZyYW0KICAgICByZXR1cm4gU3RyaW5nKCJmcmFtZSAoYW5vbnltb3VzKSIpOwog fQogCitjb25zdCBXZWJDb3JlOjpLVVJMIER1bXBSZW5kZXJUcmVlU3VwcG9ydEVmbDo6cHJvdmlz aW9uYWxVUkwoY29uc3QgRXZhc19PYmplY3QqIGV3a0ZyYW1lKQoreworICAgIERSVF9TVVBQT1JU X0ZSQU1FX0dFVF9PUl9SRVRVUk4oZXdrRnJhbWUsIGZyYW1lLCBXZWJDb3JlOjpLVVJMKCkpOwor CisgICAgV2ViQ29yZTo6RG9jdW1lbnRMb2FkZXIqIHByb3Zpc2lvbmFsRG9jdW1lbnRMb2FkZXIg PSBmcmFtZS0+bG9hZGVyKCktPnByb3Zpc2lvbmFsRG9jdW1lbnRMb2FkZXIoKTsKKyAgICBpZiAo IXByb3Zpc2lvbmFsRG9jdW1lbnRMb2FkZXIpCisgICAgICAgIHJldHVybiBXZWJDb3JlOjpLVVJM KCk7CisKKyAgICByZXR1cm4gcHJvdmlzaW9uYWxEb2N1bWVudExvYWRlci0+dXJsKCk7Cit9CisK IHZvaWQgRHVtcFJlbmRlclRyZWVTdXBwb3J0RWZsOjpzZXRWYWx1ZUZvclVzZXIoSlNDb250ZXh0 UmVmIGNvbnRleHQsIEpTVmFsdWVSZWYgbm9kZU9iamVjdCwgY29uc3QgU3RyaW5nJiB2YWx1ZSkK IHsKICAgICBKU0M6OkV4ZWNTdGF0ZSogZXhlYyA9IHRvSlMoY29udGV4dCk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9EdW1wUmVuZGVyVHJlZVN1cHBvcnRF ZmwuaCBiL1NvdXJjZS9XZWJLaXQvZWZsL1dlYkNvcmVTdXBwb3J0L0R1bXBSZW5kZXJUcmVlU3Vw cG9ydEVmbC5oCmluZGV4IDNiYzJiNGZmZTJmODdjMDBmZmYwMmY4ZDljZDVjZDk0NjJhZmU2NWMu LmI5NzRjZjY5MjVlMTEwYjM1NDJlZTZlODg3Y2UwNGEzNWYxNDE2NGEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvZWZsL1dlYkNvcmVTdXBwb3J0L0R1bXBSZW5kZXJUcmVlU3VwcG9ydEVmbC5o CisrKyBiL1NvdXJjZS9XZWJLaXQvZWZsL1dlYkNvcmVTdXBwb3J0L0R1bXBSZW5kZXJUcmVlU3Vw cG9ydEVmbC5oCkBAIC0yMiw2ICsyMiw3IEBACiAjaWZuZGVmIER1bXBSZW5kZXJUcmVlU3VwcG9y dEVmbF9oCiAjZGVmaW5lIER1bXBSZW5kZXJUcmVlU3VwcG9ydEVmbF9oCiAKKyNpbmNsdWRlICJL VVJMLmgiCiAjaW5jbHVkZSA8RWluYS5oPgogI2luY2x1ZGUgPEZpbmRPcHRpb25zLmg+CiAjaW5j bHVkZSA8SW50UmVjdC5oPgpAQCAtNjUsNiArNjYsNyBAQCBwdWJsaWM6CiAgICAgc3RhdGljIFN0 cmluZyByZXNwb25zZU1pbWVUeXBlKGNvbnN0IEV2YXNfT2JqZWN0KiBld2tGcmFtZSk7CiAgICAg c3RhdGljIFdlYkNvcmU6OkludFJlY3Qgc2VsZWN0aW9uUmVjdGFuZ2xlKGNvbnN0IEV2YXNfT2Jq ZWN0KiBld2tGcmFtZSk7CiAgICAgc3RhdGljIFN0cmluZyBzdWl0YWJsZURSVEZyYW1lTmFtZShj b25zdCBFdmFzX09iamVjdCogZXdrRnJhbWUpOworICAgIHN0YXRpYyBjb25zdCBXZWJDb3JlOjpL VVJMIHByb3Zpc2lvbmFsVVJMKGNvbnN0IEV2YXNfT2JqZWN0KiBld2tGcmFtZSk7CiAgICAgc3Rh dGljIFN0cmluZyBsYXllclRyZWVBc1RleHQoY29uc3QgRXZhc19PYmplY3QqIGV3a0ZyYW1lKTsK ICAgICBzdGF0aWMgdm9pZCBzZXRWYWx1ZUZvclVzZXIoSlNDb250ZXh0UmVmLCBKU1ZhbHVlUmVm IG5vZGVPYmplY3QsIGNvbnN0IFN0cmluZyYgdmFsdWUpOwogICAgIHN0YXRpYyB2b2lkIHNldERl ZmVyc0xvYWRpbmcoRXZhc19PYmplY3QqIGV3a1ZpZXcsIGJvb2wgZGVmZXJzKTsKZGlmZiAtLWdp dCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAyOTk5N2FmMDU3ZTI3 NWE4MmRjY2EzM2ZiYzIyNWU5MjJiZmVjYTJjLi5iMDVhN2U4NjFiZGVjMjgyODY4ZjVmNWZiNzVk ZmQ0MThmMDVkMDE1IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTMtMDgtMTIgIFJ5dWFuIENob2kgIDxyeXVhbi5j aG9pQHNhbXN1bmcuY29tPgorCisgICAgICAgIFtFRkxdW1dLMV0gVVJMIHByaW50aW5nIGNvZGUg aW4gRHVtcFJlbmRlclRyZWUgZG9lc24ndCBtYXRjaCBXVFIgb3IgTWFjIERSVAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE5NTg1CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgR3l1eW91bmcgS2ltLgorCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvZWZs L0R1bXBSZW5kZXJUcmVlQ2hyb21lLmNwcDoKKyAgICAgICAgKHBhdGhTdWl0YWJsZUZvclRlc3RS ZXN1bHQpOgorICAgICAgICBSZXR1cm4gcGF0aCBzdHJpbmcgdGhhdCdzIHJlbGF0aXZlIHRvIG1h aW4gZnJhbWUgVVJMLCBvciBqdXN0IGZpbGUgbmFtZSBpZgorICAgICAgICB0aGUgcmVzb3VyY2Ug aXMgbm90IGluIHRoZSBzYW1lIGRpcmVjdG9yeSBzdWJ0cmVlLgorICAgICAgICBSZWZlcmVuY2Vk IFdlYktpdFRlc3RSdW5uZXIgY29kZSBpbiByMTUzODUyLgorICAgICAgICAoZGVzY3JpcHRpb25T dWl0YWJsZUZvclRlc3RSZXN1bHQpOgorICAgICAgICAoRHVtcFJlbmRlclRyZWVDaHJvbWU6Om9u RnJhbWVSZWRpcmVjdFJlcXVlc3RlZCk6CisgICAgICAgIChEdW1wUmVuZGVyVHJlZUNocm9tZTo6 b25OZXdSZXNvdXJjZVJlcXVlc3QpOiBGb2xsb3dlZCBjaGFuZ2VzIG9mIHIxNTM5MDMuCisKIDIw MTMtMDgtMTIgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+CiAKICAgICAgICAg aHR0cC90ZXN0cy9zZWN1cml0eS9zYW5kYm94ZWQtaWZyYW1lLWludmFsaWQuaHRtbCBpcyBmbGFr eSBvbiBNYWMKZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2VmbC9EdW1wUmVuZGVy VHJlZUNocm9tZS5jcHAgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9lZmwvRHVtcFJlbmRlclRyZWVD aHJvbWUuY3BwCmluZGV4IGJjOTcxODhjNjVkYzRlMGM0ZGZlNTU2MTdlYWYxNjc4MGNhN2ZhMTAu LjU4NmE5YjNiZjkxMTEzMGI2NzNjMjU3OTZkYWQxN2VlZDdjZGE3OGMgMTAwNjQ0Ci0tLSBhL1Rv b2xzL0R1bXBSZW5kZXJUcmVlL2VmbC9EdW1wUmVuZGVyVHJlZUNocm9tZS5jcHAKKysrIGIvVG9v bHMvRHVtcFJlbmRlclRyZWUvZWZsL0R1bXBSZW5kZXJUcmVlQ2hyb21lLmNwcApAQCAtMzM2LDUz ICszMzYsMzggQEAgdm9pZCBEdW1wUmVuZGVyVHJlZUNocm9tZTo6cmVzZXREZWZhdWx0c1RvQ29u c2lzdGVudFZhbHVlcygpCiAgICAgcG9saWN5RGVsZWdhdGVQZXJtaXNzaXZlID0gZmFsc2U7CiB9 CiAKLS8vIEZJWE1FICgxMTk1ODUpOiBNYWtlIHRoaXMgbWF0Y2ggb3RoZXIgcGxhdGZvcm1zIGJl dHRlci4KLXN0YXRpYyBDU3RyaW5nIHBhdGhTdWl0YWJsZUZvclRlc3RSZXN1bHQoY29uc3QgY2hh ciogdXJpU3RyaW5nKQotewotICAgIGlmICghdXJpU3RyaW5nKQotICAgICAgICByZXR1cm4gQ1N0 cmluZygpOworc3RhdGljIGNvbnN0IGNoYXIgZGl2aWRlciA9ICcvJzsKIAorc3RhdGljIFN0cmlu ZyBwYXRoU3VpdGFibGVGb3JUZXN0UmVzdWx0KGNvbnN0IGNoYXIqIHVyaVN0cmluZykKK3sKICAg ICBLVVJMIHVyaSA9IEtVUkwoUGFyc2VkVVJMU3RyaW5nLCB1cmlTdHJpbmcpOworICAgIGlmICh1 cmkuaXNFbXB0eSgpKQorICAgICAgICByZXR1cm4gIihudWxsKSI7CiAKICAgICBpZiAoIXVyaS5p c0xvY2FsRmlsZSgpKQotICAgICAgICByZXR1cm4gdXJpLnN0cmluZygpLnV0ZjgoKTsKKyAgICAg ICAgcmV0dXJuIHVyaS5zdHJpbmcoKTsKIAotICAgIFN0cmluZyBwYXRoU3RyaW5nID0gdXJpLnBh dGgoKTsKLSAgICBzaXplX3QgaW5kZXhCYXNlTmFtZSA9IHBhdGhTdHJpbmcucmV2ZXJzZUZpbmQo Jy8nKTsKLSAgICBTdHJpbmcgYmFzZU5hbWU7Ci0gICAgaWYgKGluZGV4QmFzZU5hbWUgPT0gbm90 Rm91bmQpCi0gICAgICAgIGJhc2VOYW1lID0gcGF0aFN0cmluZzsKLSAgICBlbHNlCi0gICAgICAg IGJhc2VOYW1lID0gcGF0aFN0cmluZy5zdWJzdHJpbmcoaW5kZXhCYXNlTmFtZSArIDEpOworICAg IEtVUkwgbWFpbkZyYW1lVVJMID0gS1VSTChQYXJzZWRVUkxTdHJpbmcsIGV3a19mcmFtZV91cmlf Z2V0KGJyb3dzZXItPm1haW5GcmFtZSgpKSk7CisgICAgaWYgKG1haW5GcmFtZVVSTC5pc0VtcHR5 KCkpCisgICAgICAgIG1haW5GcmFtZVVSTCA9IER1bXBSZW5kZXJUcmVlU3VwcG9ydEVmbDo6cHJv dmlzaW9uYWxVUkwoYnJvd3Nlci0+bWFpbkZyYW1lKCkpOwogCi0gICAgU3RyaW5nIGRpck5hbWU7 Ci0gICAgaWYgKGluZGV4QmFzZU5hbWUgIT0gbm90Rm91bmQpIHsKLSAgICAgICAgc2l6ZV90IGlu ZGV4RGlyTmFtZSA9IHBhdGhTdHJpbmcucmV2ZXJzZUZpbmQoJy8nLCBpbmRleEJhc2VOYW1lIC0g MSk7Ci0gICAgICAgIGlmIChpbmRleERpck5hbWUgIT0gbm90Rm91bmQpCi0gICAgICAgICAgICBk aXJOYW1lID0gcGF0aFN0cmluZy5zdWJzdHJpbmcoaW5kZXhEaXJOYW1lICsgMSwgaW5kZXhCYXNl TmFtZSAtIGluZGV4RGlyTmFtZSAtIDEpOwotICAgIH0KLQotICAgIFN0cmluZyByZXQgPSBkaXJO YW1lICsgIi8iICsgYmFzZU5hbWU7Ci0gICAgcmV0dXJuIHJldC51dGY4KCk7Ci19CisgICAgU3Ry aW5nIG1haW5GcmFtZVVybFBhdGhTdHJpbmcgPSBtYWluRnJhbWVVUkwucGF0aCgpOworICAgIFN0 cmluZyBwYXRoU3RyaW5nID0gdXJpLnBhdGgoKTsKKyAgICBTdHJpbmcgYmFzZVBhdGggPSBtYWlu RnJhbWVVcmxQYXRoU3RyaW5nLnN1YnN0cmluZygwLCBtYWluRnJhbWVVcmxQYXRoU3RyaW5nLnJl dmVyc2VGaW5kKGRpdmlkZXIpICsgMSk7CiAKLXN0YXRpYyBDU3RyaW5nIHVybFN1aXRhYmxlRm9y VGVzdFJlc3VsdChjb25zdCBjaGFyKiB1cmlTdHJpbmcpCi17Ci0gICAgS1VSTCB1cmkgPSBLVVJM KFBhcnNlZFVSTFN0cmluZywgdXJpU3RyaW5nKTsKLSAgICBpZiAoIXVyaS5pc0xvY2FsRmlsZSgp KQotICAgICAgICByZXR1cm4gQ1N0cmluZyh1cmlTdHJpbmcpOworICAgIGlmICghYmFzZVBhdGgu aXNFbXB0eSgpICYmIHBhdGhTdHJpbmcuc3RhcnRzV2l0aChiYXNlUGF0aCkpCisgICAgICAgIHJl dHVybiBwYXRoU3RyaW5nLnN1YnN0cmluZyhiYXNlUGF0aC5sZW5ndGgoKSk7CiAKLSAgICB1bnNp Z25lZCBzdGFydEluZGV4ID0gdXJpLnBhdGhBZnRlckxhc3RTbGFzaCgpOwotICAgIHJldHVybiB1 cmkuc3RyaW5nKCkuc3Vic3RyaW5nKHN0YXJ0SW5kZXgpLnV0ZjgoKTsKKyAgICByZXR1cm4gdXJp Lmxhc3RQYXRoQ29tcG9uZW50KCk7CiB9CiAKIHN0YXRpYyBDU3RyaW5nIGRlc2NyaXB0aW9uU3Vp dGFibGVGb3JUZXN0UmVzdWx0KEV3a19GcmFtZV9SZXNvdXJjZV9SZXF1ZXN0KiByZXF1ZXN0KQog ewogICAgIFN0cmluZ0J1aWxkZXIgYnVpbGRlcjsKICAgICBidWlsZGVyLmFwcGVuZExpdGVyYWwo IjxOU1VSTFJlcXVlc3QgVVJMICIpOwotICAgIGJ1aWxkZXIuYXBwZW5kKHBhdGhTdWl0YWJsZUZv clRlc3RSZXN1bHQocmVxdWVzdC0+dXJsKS5kYXRhKCkpOworICAgIGJ1aWxkZXIuYXBwZW5kKHBh dGhTdWl0YWJsZUZvclRlc3RSZXN1bHQocmVxdWVzdC0+dXJsKSk7CiAgICAgYnVpbGRlci5hcHBl bmRMaXRlcmFsKCIsIG1haW4gZG9jdW1lbnQgVVJMICIpOwotICAgIGJ1aWxkZXIuYXBwZW5kKHVy bFN1aXRhYmxlRm9yVGVzdFJlc3VsdChyZXF1ZXN0LT5maXJzdF9wYXJ0eSkuZGF0YSgpKTsKKyAg ICBidWlsZGVyLmFwcGVuZChwYXRoU3VpdGFibGVGb3JUZXN0UmVzdWx0KHJlcXVlc3QtPmZpcnN0 X3BhcnR5KSk7CiAgICAgYnVpbGRlci5hcHBlbmRMaXRlcmFsKCIsIGh0dHAgbWV0aG9kICIpOwog CiAgICAgaWYgKHJlcXVlc3QtPmh0dHBfbWV0aG9kKQpAQCAtNDAxLDcgKzM4Niw3IEBAIHN0YXRp YyBDU3RyaW5nIGRlc2NyaXB0aW9uU3VpdGFibGVGb3JUZXN0UmVzdWx0KGNvbnN0IEV3a19GcmFt ZV9SZXNvdXJjZV9SZXNwb25zCiAKICAgICBTdHJpbmdCdWlsZGVyIGJ1aWxkZXI7CiAgICAgYnVp bGRlci5hcHBlbmRMaXRlcmFsKCI8TlNVUkxSZXNwb25zZSAiKTsKLSAgICBidWlsZGVyLmFwcGVu ZChwYXRoU3VpdGFibGVGb3JUZXN0UmVzdWx0KHJlc3BvbnNlLT51cmwpLmRhdGEoKSk7CisgICAg YnVpbGRlci5hcHBlbmQocGF0aFN1aXRhYmxlRm9yVGVzdFJlc3VsdChyZXNwb25zZS0+dXJsKSk7 CiAgICAgYnVpbGRlci5hcHBlbmRMaXRlcmFsKCIsIGh0dHAgc3RhdHVzIGNvZGUgIik7CiAgICAg YnVpbGRlci5hcHBlbmQoU3RyaW5nOjpudW1iZXIocmVzcG9uc2UtPnN0YXR1c19jb2RlKSk7CiAg ICAgYnVpbGRlci5hcHBlbmQoJz4nKTsKQEAgLTc5NSw3ICs3ODAsNyBAQCB2b2lkIER1bXBSZW5k ZXJUcmVlQ2hyb21lOjpvbkZyYW1lUmVkaXJlY3RSZXF1ZXN0ZWQodm9pZCosIEV2YXNfT2JqZWN0 KiBmcmFtZSwgdgogCiAgICAgaWYgKCFkb25lICYmIGdUZXN0UnVubmVyLT5kdW1wRnJhbWVMb2Fk Q2FsbGJhY2tzKCkpIHsKICAgICAgICAgY29uc3QgU3RyaW5nIGZyYW1lTmFtZShEdW1wUmVuZGVy VHJlZVN1cHBvcnRFZmw6OnN1aXRhYmxlRFJURnJhbWVOYW1lKGZyYW1lKSk7Ci0gICAgICAgIHBy aW50ZigiJXMgLSB3aWxsUGVyZm9ybUNsaWVudFJlZGlyZWN0VG9VUkw6ICVzIFxuIiwgZnJhbWVO YW1lLnV0ZjgoKS5kYXRhKCksIHBhdGhTdWl0YWJsZUZvclRlc3RSZXN1bHQodXJsKS5kYXRhKCkp OworICAgICAgICBwcmludGYoIiVzIC0gd2lsbFBlcmZvcm1DbGllbnRSZWRpcmVjdFRvVVJMOiAl cyBcbiIsIGZyYW1lTmFtZS51dGY4KCkuZGF0YSgpLCBwYXRoU3VpdGFibGVGb3JUZXN0UmVzdWx0 KHVybCkudXRmOCgpLmRhdGEoKSk7CiAgICAgfQogfQogCkBAIC04NDYsOCArODMxLDggQEAgdm9p ZCBEdW1wUmVuZGVyVHJlZUNocm9tZTo6b25OZXdSZXNvdXJjZVJlcXVlc3Qodm9pZCosIEV2YXNf T2JqZWN0Kiwgdm9pZCogZXZlbnQKIHsKICAgICBFd2tfRnJhbWVfUmVzb3VyY2VfUmVxdWVzdCog cmVxdWVzdCA9IHN0YXRpY19jYXN0PEV3a19GcmFtZV9SZXNvdXJjZV9SZXF1ZXN0Kj4oZXZlbnRJ bmZvKTsKIAotICAgIGlmICghZG9uZSAmJiBnVGVzdFJ1bm5lci0+ZHVtcFJlc291cmNlTG9hZENh bGxiYWNrcygpKQotICAgICAgICBtX2R1bXBBc3NpZ25lZFVybHMuYWRkKHJlcXVlc3QtPmlkZW50 aWZpZXIsIHBhdGhTdWl0YWJsZUZvclRlc3RSZXN1bHQocmVxdWVzdC0+dXJsKSk7CisgICAgaWYg KCFkb25lKQorICAgICAgICBtX2R1bXBBc3NpZ25lZFVybHMuYWRkKHJlcXVlc3QtPmlkZW50aWZp ZXIsIHBhdGhTdWl0YWJsZUZvclRlc3RSZXN1bHQocmVxdWVzdC0+dXJsKS51dGY4KCkpOwogfQog CiB2b2lkIER1bXBSZW5kZXJUcmVlQ2hyb21lOjpvbkRvd25sb2FkUmVxdWVzdCh2b2lkKiwgRXZh c19PYmplY3QqLCB2b2lkKiBldmVudEluZm8pCg==