125919 2013-12-18 04:03:35 -0800 [EFL][WK2] Replace ecore_main_loop_iterate with waitUntilTrue in ewk tests 2013-12-30 02:22:24 -0800 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mpakulavelrutka mpakulavelrutka cdumez commit-queue gyuyoung.kim lucas.de.marchi rakuco oldest_to_newest 960891 0 mpakulavelrutka 2013-12-18 04:03:35 -0800 ecore_main_loop may result in test hang-up, it should be replaced with waitUntilTrue. 960893 1 219520 mpakulavelrutka 2013-12-18 04:06:04 -0800 Created attachment 219520 proposed patch 963300 2 219520 commit-queue 2013-12-30 02:22:21 -0800 Comment on attachment 219520 proposed patch Clearing flags on attachment: 219520 Committed r161139: <http://trac.webkit.org/changeset/161139> 963301 3 commit-queue 2013-12-30 02:22:24 -0800 All reviewed patches have been landed. Closing bug. 219520 2013-12-18 04:06:04 -0800 2013-12-30 02:22:21 -0800 proposed patch iterate.diff text/plain 10987 mpakulavelrutka ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA4ZDc5Y2JiLi5hMjU4YTNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcg QEAKKzIwMTMtMTItMTggIE1pY2hhxYIgUGFrdcWCYSB2ZWwgUnV0a2EgIDxtLnBha3VsYUBzYW1z dW5nLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIFJlcGxhY2UgZWNvcmVfbWFpbl9sb29wX2l0 ZXJhdGUgd2l0aCB3YWl0VW50aWxUcnVlIGluIGV3ayB0ZXN0cworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI1OTE5CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXNpbmcgZWNvcmVfbWFpbl9sb29wX2l0ZXJh dGUgaW4gd2hpbGUgbG9vcCBtYXkgcmVzdWx0IGluIHRlc3RzIGhhbmctdXAgd2hlbgorICAgICAg ICBjb25kaXRpb24gaXMgbm90IG1ldC4gUmVwbGFjaW5nIGl0IHdpdGggd2FpdFVudGlsVHJ1ZSBp bnRyb2R1Y2VzIGEgdGltZXIKKyAgICAgICAgYWZ0ZXIgd2hpY2ggaW50ZXJuYWwgbG9vcCBpcyBj YW5jZWxlZC4gVGhpcyB3aWxsIGNhdXNlIHRlc3QgdG8gZmFpbCBpbnN0ZWFkCisgICAgICAgIG9m IHJ1bm5pbmcgaW5maW5pdGVseS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL3Rlc3Rz L3Rlc3RfZXdrMl9hdXRoX3JlcXVlc3QuY3BwOgorICAgICAgICAoVEVTVF9GKToKKyAgICAgICAg KiBVSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfY29sb3JfcGlja2VyLmNwcDoKKyAg ICAgICAgKFRFU1RfRik6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9l d2syX2Nvb2tpZV9tYW5hZ2VyLmNwcDoKKyAgICAgICAgKFRFU1RfRik6CisgICAgICAgICogVUlQ cm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX3ZpZXcuY3BwOgorICAgICAgICAoRVdLMlZp ZXdUZXN0OjpvblZpYnJhdGUpOgorICAgICAgICAoRVdLMlZpZXdUZXN0OjpvbkNhbmNlbFZpYnJh dGlvbik6CisgICAgICAgIChFV0syVmlld1Rlc3Q6OmxvYWRWaWJyYXRpb25IVE1MU3RyaW5nKToK KyAgICAgICAgKFRFU1RfRik6CisKIDIwMTMtMTItMTcgIEphZSBIeXVuIFBhcmsgIDxqYWUucGFy a0Bjb21wYW55MTAwLm5ldD4KIAogICAgICAgICBbR1RLXSBCdWlsZCBmaXggYWZ0ZXIgcjE2MDcz NwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVz dF9ld2syX2F1dGhfcmVxdWVzdC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2Vm bC90ZXN0cy90ZXN0X2V3azJfYXV0aF9yZXF1ZXN0LmNwcAppbmRleCBiNjNiYzlmLi4yMzMwODI0 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0 X2V3azJfYXV0aF9yZXF1ZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2VmbC90ZXN0cy90ZXN0X2V3azJfYXV0aF9yZXF1ZXN0LmNwcApAQCAtMTgyLDggKzE4Miw3IEBA IFRFU1RfRihFV0syQXV0aFJlcXVlc3RUZXN0LCBld2tfYXV0aF9yZXF1ZXN0X2NhbmNlbCkKICAg ICAvLyBXaWxsIGF0dGVtcHQgdG8gY29udGludWUgd2l0aG91dCBhdXRoZW50aWNhdGlvbiBieSBk ZWZhdWx0LgogICAgIGV3a19vYmplY3RfdW5yZWYoYXV0aGVudGljYXRpb25SZXF1ZXN0KTsKIAot ICAgIHdoaWxlICghaXNGaW5pc2hlZCkKLSAgICAgICAgZWNvcmVfbWFpbl9sb29wX2l0ZXJhdGUo KTsKKyAgICB3YWl0VW50aWxUcnVlKGlzRmluaXNoZWQpOwogCiAgICAgQVNTRVJUX1NUUk5FKGV4 cGVjdGVkU3VjY2Vzc1RpdGxlLCBld2tfdmlld190aXRsZV9nZXQod2ViVmlldygpKSk7CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdr Ml9jb2xvcl9waWNrZXIuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVz dHMvdGVzdF9ld2syX2NvbG9yX3BpY2tlci5jcHAKaW5kZXggZjYxNjMxZS4uM2I4OTgzNSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2sy X2NvbG9yX3BpY2tlci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwv dGVzdHMvdGVzdF9ld2syX2NvbG9yX3BpY2tlci5jcHAKQEAgLTE1NSwyMSArMTU1LDE4IEBAIFRF U1RfRihFV0syQ29sb3JQaWNrZXJUZXN0LCBld2tfY29sb3JfcGlja2VyX2NvbG9yX3NldCkKIAog ICAgIGJvb2wgaGFuZGxlZCA9IGZhbHNlOwogICAgIGV2YXNfb2JqZWN0X3NtYXJ0X2NhbGxiYWNr X2FkZCh3ZWJWaWV3KCksICJpbnB1dCx0eXBlLGNvbG9yLHJlcXVlc3QiLCBvbkNvbG9yUGlja2Vy RG9uZSwgJmhhbmRsZWQpOwotICAgIHdoaWxlICghaGFuZGxlZCkKLSAgICAgICAgZWNvcmVfbWFp bl9sb29wX2l0ZXJhdGUoKTsKKyAgICB3YWl0VW50aWxUcnVlKGhhbmRsZWQpOwogCiAgICAgY2xp Y2tCdXR0b24oU2hvd0NvbG9yUGlja2VyQnV0dG9uKTsKIAogICAgIGhhbmRsZWQgPSBmYWxzZTsK LSAgICB3aGlsZSAoIWhhbmRsZWQpCi0gICAgICAgIGVjb3JlX21haW5fbG9vcF9pdGVyYXRlKCk7 CisgICAgd2FpdFVudGlsVHJ1ZShoYW5kbGVkKTsKIAogICAgIGFwaS0+aW5wdXRfcGlja2VyX2Nv bG9yX2Rpc21pc3MgPSBoaWRlQ29sb3JQaWNrZXJCeVJlbW92aW5nRWxlbWVudDsKICAgICBjbGlj a0J1dHRvbihIaWRlQ29sb3JQaWNrZXJCdXR0b24pOwogCiAgICAgaGFuZGxlZCA9IGZhbHNlOwot ICAgIHdoaWxlICghaGFuZGxlZCkKLSAgICAgICAgZWNvcmVfbWFpbl9sb29wX2l0ZXJhdGUoKTsK KyAgICB3YWl0VW50aWxUcnVlKGhhbmRsZWQpOwogICAgIGV2YXNfb2JqZWN0X3NtYXJ0X2NhbGxi YWNrX2RlbCh3ZWJWaWV3KCksICJpbnB1dCx0eXBlLGNvbG9yLHJlcXVlc3QiLCBvbkNvbG9yUGlj a2VyRG9uZSk7CiB9CiAjZW5kaWYgLy8gRU5BQkxFKElOUFVUX1RZUEVfQ09MT1IpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfY29v a2llX21hbmFnZXIuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMv dGVzdF9ld2syX2Nvb2tpZV9tYW5hZ2VyLmNwcAppbmRleCA0MDM5ZGJhLi43M2IxODJjIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJf Y29va2llX21hbmFnZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZs L3Rlc3RzL3Rlc3RfZXdrMl9jb29raWVfbWFuYWdlci5jcHAKQEAgLTE4MiwxNSArMTgyLDExIEBA IFRFU1RfRihFV0syQ29va2llTWFuYWdlclRlc3QsIGV3a19jb29raWVfbWFuYWdlcl9jaGFuZ2Vz X3dhdGNoKQogICAgIC8vIENoZWNrIGZvciBjb29raWUgY2hhbmdlcyBub3RpZmljYXRpb25zCiAg ICAgQVNTRVJUX1RSVUUobG9hZFVybFN5bmMoaHR0cFNlcnZlci0+Z2V0VVJMRm9yUGF0aCgiL2lu ZGV4Lmh0bWwiKS5kYXRhKCkpKTsKIAotICAgIHdoaWxlICghY29va2llc0NoYW5nZWQpCi0gICAg ICAgIGVjb3JlX21haW5fbG9vcF9pdGVyYXRlKCk7Ci0gICAgQVNTRVJUX1RSVUUoY29va2llc0No YW5nZWQpOworICAgIEFTU0VSVF9UUlVFKHdhaXRVbnRpbFRydWUoY29va2llc0NoYW5nZWQpKTsK IAogICAgIGNvb2tpZXNDaGFuZ2VkID0gZmFsc2U7CiAgICAgZXdrX2Nvb2tpZV9tYW5hZ2VyX2Nv b2tpZXNfY2xlYXIoY29va2llTWFuYWdlcik7Ci0gICAgd2hpbGUgKCFjb29raWVzQ2hhbmdlZCkK LSAgICAgICAgZWNvcmVfbWFpbl9sb29wX2l0ZXJhdGUoKTsKLSAgICBBU1NFUlRfVFJVRShjb29r aWVzQ2hhbmdlZCk7CisgICAgQVNTRVJUX1RSVUUod2FpdFVudGlsVHJ1ZShjb29raWVzQ2hhbmdl ZCkpOwogCiAgICAgLy8gU3RvcCB3YXRjaGluZyBmb3Igbm90aWZpY2F0aW9ucwogICAgIGV3a19j b29raWVfbWFuYWdlcl9jaGFuZ2VzX3dhdGNoKGNvb2tpZU1hbmFnZXIsIDAsIDApOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX3Zp ZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2sy X3ZpZXcuY3BwCmluZGV4IGZjZDczNmUuLmM0M2Y2NmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl92aWV3LmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfdmlldy5jcHAKQEAg LTU0LDYgKzU0LDcgQEAgcHVibGljOgogICAgIHN0cnVjdCBWaWJyYXRpb25DYkRhdGEgewogICAg ICAgICBib29sIGRpZFJlY2VpdmVWaWJyYXRlOyAvLyBXaGV0aGVyIHRoZSB2aWJyYXRpb24gZXZl bnQgcmVjZWl2ZWQuCiAgICAgICAgIGJvb2wgZGlkUmVjZWl2ZUNhbmNlbFZpYnJhdGlvbjsgLy8g V2hldGhlciB0aGUgY2FuY2VsIHZpYnJhdGlvbiBldmVudCByZWNlaXZlZC4KKyAgICAgICAgYm9v bCB0ZXN0RmluaXNoZWQ7CiAgICAgICAgIHVuc2lnbmVkIHZpYnJhdGVDYWxsZWRDb3VudDsgLy8g VmlicmF0ZSBjYWxsYmFja3MgY291bnQuCiAgICAgICAgIHVuc2lnbmVkIGV4cGVjdGVkVmlicmF0 aW9uVGltZTsgLy8gRXhwZWN0ZWQgdmlicmF0aW9uIHRpbWUuCiAgICAgfTsKQEAgLTE1OCw4ICsx NTksMTAgQEAgcHVibGljOgogICAgIHsKICAgICAgICAgVmlicmF0aW9uQ2JEYXRhKiBkYXRhID0g c3RhdGljX2Nhc3Q8VmlicmF0aW9uQ2JEYXRhKj4odXNlckRhdGEpOwogICAgICAgICB1bnNpZ25l ZCogdmlicmF0aW9uVGltZSA9IHN0YXRpY19jYXN0PHVuc2lnbmVkKj4oZXZlbnRJbmZvKTsKLSAg ICAgICAgaWYgKCp2aWJyYXRpb25UaW1lID09IGRhdGEtPmV4cGVjdGVkVmlicmF0aW9uVGltZSkK KyAgICAgICAgaWYgKCp2aWJyYXRpb25UaW1lID09IGRhdGEtPmV4cGVjdGVkVmlicmF0aW9uVGlt ZSkgewogICAgICAgICAgICAgZGF0YS0+ZGlkUmVjZWl2ZVZpYnJhdGUgPSB0cnVlOworICAgICAg ICAgICAgZGF0YS0+dGVzdEZpbmlzaGVkID0gdHJ1ZTsKKyAgICAgICAgfQogICAgICAgICBkYXRh LT52aWJyYXRlQ2FsbGVkQ291bnQrKzsKICAgICB9CiAKQEAgLTE2Nyw2ICsxNzAsNyBAQCBwdWJs aWM6CiAgICAgewogICAgICAgICBWaWJyYXRpb25DYkRhdGEqIGRhdGEgPSBzdGF0aWNfY2FzdDxW aWJyYXRpb25DYkRhdGEqPih1c2VyRGF0YSk7CiAgICAgICAgIGRhdGEtPmRpZFJlY2VpdmVDYW5j ZWxWaWJyYXRpb24gPSB0cnVlOworICAgICAgICBkYXRhLT50ZXN0RmluaXNoZWQgPSB0cnVlOwog ICAgIH0KIAogICAgIHN0YXRpYyB2b2lkIGxvYWRWaWJyYXRpb25IVE1MU3RyaW5nKEV2YXNfT2Jq ZWN0KiB3ZWJWaWV3LCBjb25zdCBjaGFyKiB2aWJyYXRpb25QYXR0ZXJuLCBib29sIHdhaXRGb3JW aWJyYXRpb25FdmVudCwgVmlicmF0aW9uQ2JEYXRhKiBkYXRhKQpAQCAtMTc4LDYgKzE4Miw3IEBA IHB1YmxpYzoKICAgICAgICAgZGF0YS0+ZGlkUmVjZWl2ZVZpYnJhdGUgPSBmYWxzZTsKICAgICAg ICAgZGF0YS0+ZGlkUmVjZWl2ZUNhbmNlbFZpYnJhdGlvbiA9IGZhbHNlOwogICAgICAgICBkYXRh LT52aWJyYXRlQ2FsbGVkQ291bnQgPSAwOworICAgICAgICBkYXRhLT50ZXN0RmluaXNoZWQgPSBm YWxzZTsKICAgICAgICAgRWluYV9TdHJidWYqIGJ1ZmZlciA9IGVpbmFfc3RyYnVmX25ldygpOwog ICAgICAgICBlaW5hX3N0cmJ1Zl9hcHBlbmRfcHJpbnRmKGJ1ZmZlciwgY29udGVudCwgdmlicmF0 aW9uUGF0dGVybik7CiAgICAgICAgIGV3a192aWV3X2h0bWxfc3RyaW5nX2xvYWQod2ViVmlldywg ZWluYV9zdHJidWZfc3RyaW5nX2dldChidWZmZXIpLCAwLCAwKTsKQEAgLTE4NSw5ICsxOTAsNiBA QCBwdWJsaWM6CiAKICAgICAgICAgaWYgKCF3YWl0Rm9yVmlicmF0aW9uRXZlbnQpCiAgICAgICAg ICAgICByZXR1cm47Ci0KLSAgICAgICAgd2hpbGUgKCFkYXRhLT5kaWRSZWNlaXZlVmlicmF0ZSAm JiAhZGF0YS0+ZGlkUmVjZWl2ZUNhbmNlbFZpYnJhdGlvbikKLSAgICAgICAgICAgIGVjb3JlX21h aW5fbG9vcF9pdGVyYXRlKCk7CiAgICAgfQogCiAgICAgc3RhdGljIHZvaWQgb25Db250ZW50c1Np emVDaGFuZ2VkUG9ydHJhaXQodm9pZCogdXNlckRhdGEsIEV2YXNfT2JqZWN0Kiwgdm9pZCogZXZl bnRJbmZvKQpAQCAtMzYxLDkgKzM2Myw3IEBAIFRFU1RfRihFV0syVmlld1Rlc3QsIGV3a192aWV3 X2Zvcm1fc3VibWlzc2lvbl9yZXF1ZXN0KQogICAgIGV3a192aWV3X2h0bWxfc3RyaW5nX2xvYWQo d2ViVmlldygpLCBmb3JtSFRNTCwgImZpbGU6Ly8vIiwgMCk7CiAgICAgYm9vbCBoYW5kbGVkID0g ZmFsc2U7CiAgICAgZXZhc19vYmplY3Rfc21hcnRfY2FsbGJhY2tfYWRkKHdlYlZpZXcoKSwgImZv cm0sc3VibWlzc2lvbixyZXF1ZXN0Iiwgb25Gb3JtQWJvdXRUb0JlU3VibWl0dGVkLCAmaGFuZGxl ZCk7Ci0gICAgd2hpbGUgKCFoYW5kbGVkKQotICAgICAgICBlY29yZV9tYWluX2xvb3BfaXRlcmF0 ZSgpOwotICAgIEFTU0VSVF9UUlVFKGhhbmRsZWQpOworICAgIEFTU0VSVF9UUlVFKHdhaXRVbnRp bFRydWUoaGFuZGxlZCkpOwogICAgIGV2YXNfb2JqZWN0X3NtYXJ0X2NhbGxiYWNrX2RlbCh3ZWJW aWV3KCksICJmb3JtLHN1Ym1pc3Npb24scmVxdWVzdCIsIG9uRm9ybUFib3V0VG9CZVN1Ym1pdHRl ZCk7CiB9CiAKQEAgLTkyNCwxOSArOTI0LDIzIEBAIFRFU1RfRihFV0syVmlld1Rlc3QsIGV3a19j b250ZXh0X3ZpYnJhdGlvbl9jbGllbnRfY2FsbGJhY2tzX3NldCkKIAogICAgIC8vIFZpYnJhdGUg Zm9yIDUgc2Vjb25kcy4KICAgICBsb2FkVmlicmF0aW9uSFRNTFN0cmluZyh3ZWJWaWV3KCksICI1 MDAwIiwgdHJ1ZSwgJmRhdGEpOworICAgIHdhaXRVbnRpbFRydWUoZGF0YS50ZXN0RmluaXNoZWQp OwogICAgIEFTU0VSVF9UUlVFKGRhdGEuZGlkUmVjZWl2ZVZpYnJhdGUpOwogCiAgICAgLy8gQ2Fu Y2VsIGFueSBleGlzdGluZyB2aWJyYXRpb25zLgogICAgIGxvYWRWaWJyYXRpb25IVE1MU3RyaW5n KHdlYlZpZXcoKSwgIjAiLCB0cnVlLCAmZGF0YSk7CisgICAgd2FpdFVudGlsVHJ1ZShkYXRhLnRl c3RGaW5pc2hlZCk7CiAgICAgQVNTRVJUX1RSVUUoZGF0YS5kaWRSZWNlaXZlQ2FuY2VsVmlicmF0 aW9uKTsKIAogICAgIC8vIFRoaXMgY2FzZSB0aGUgcGF0dGVybiB3aWxsIGNhdXNlIHRoZSBkZXZp Y2UgdG8gdmlicmF0ZSBmb3IgMjAwIG1zLCBiZSBzdGlsbCBmb3IgMTAwIG1zLCBhbmQgdGhlbiB2 aWJyYXRlIGZvciA1MDAwIG1zLgogICAgIGxvYWRWaWJyYXRpb25IVE1MU3RyaW5nKHdlYlZpZXco KSwgIlsyMDAsIDEwMCwgNTAwMF0iLCB0cnVlLCAmZGF0YSk7CisgICAgd2FpdFVudGlsVHJ1ZShk YXRhLnRlc3RGaW5pc2hlZCk7CiAgICAgQVNTRVJUX0VRKDIsIGRhdGEudmlicmF0ZUNhbGxlZENv dW50KTsKICAgICBBU1NFUlRfVFJVRShkYXRhLmRpZFJlY2VpdmVWaWJyYXRlKTsKIAogICAgIC8v IENhbmNlbCBvdXRzdGFuZGluZyB2aWJyYXRpb24gcGF0dGVybi4KICAgICBsb2FkVmlicmF0aW9u SFRNTFN0cmluZyh3ZWJWaWV3KCksICJbMF0iLCB0cnVlLCAmZGF0YSk7CisgICAgd2FpdFVudGls VHJ1ZShkYXRhLnRlc3RGaW5pc2hlZCk7CiAgICAgQVNTRVJUX1RSVUUoZGF0YS5kaWRSZWNlaXZl Q2FuY2VsVmlicmF0aW9uKTsKIAogICAgIC8vIFN0b3AgbGlzdGVuaW5nIGZvciB2aWJyYXRpb24g ZXZlbnRzLCBieSBjYWxsaW5nIHRoZSBmdW5jdGlvbiB3aXRoIG51bGwgZm9yIHRoZSBjYWxsYmFj a3MuCkBAIC05NDUsMTIgKzk0OSwxNCBAQCBURVNUX0YoRVdLMlZpZXdUZXN0LCBld2tfY29udGV4 dF92aWJyYXRpb25fY2xpZW50X2NhbGxiYWNrc19zZXQpCiAKICAgICAvLyBNYWtlIHN1cmUgd2Ug ZG9uJ3QgcmVjZWl2ZSB2aWJyYXRpb24gZXZlbnQuCiAgICAgbG9hZFZpYnJhdGlvbkhUTUxTdHJp bmcod2ViVmlldygpLCAiWzUwMDBdIiwgZmFsc2UsICZkYXRhKTsKKyAgICB3YWl0VW50aWxUcnVl KGRhdGEudGVzdEZpbmlzaGVkKTsKICAgICBBU1NFUlRfVFJVRSh3YWl0VW50aWxUaXRsZUNoYW5n ZWRUbygiTG9hZGVkIikpOwogICAgIEFTU0VSVF9TVFJFUSgiTG9hZGVkIiwgZXdrX3ZpZXdfdGl0 bGVfZ2V0KHdlYlZpZXcoKSkpOwogICAgIEFTU0VSVF9GQUxTRShkYXRhLmRpZFJlY2VpdmVWaWJy YXRlKTsKIAogICAgIC8vIE1ha2Ugc3VyZSB3ZSBkb24ndCByZWNlaXZlIGNhbmNlbCB2aWJyYXRp b24gZXZlbnQuCiAgICAgbG9hZFZpYnJhdGlvbkhUTUxTdHJpbmcod2ViVmlldygpLCAiMCIsIGZh bHNlLCAmZGF0YSk7CisgICAgd2FpdFVudGlsVHJ1ZShkYXRhLnRlc3RGaW5pc2hlZCk7CiAgICAg QVNTRVJUX1RSVUUod2FpdFVudGlsVGl0bGVDaGFuZ2VkVG8oIkxvYWRlZCIpKTsKICAgICBBU1NF UlRfU1RSRVEoIkxvYWRlZCIsIGV3a192aWV3X3RpdGxlX2dldCh3ZWJWaWV3KCkpKTsKICAgICBB U1NFUlRfRkFMU0UoZGF0YS5kaWRSZWNlaXZlQ2FuY2VsVmlicmF0aW9uKTsKQEAgLTk2OCwzMCAr OTc0LDI2IEBAIFRFU1RfRihFV0syVmlld1Rlc3QsIGV3a192aWV3X2NvbnRlbnRzX3NpemVfY2hh bmdlZCkKICAgICBib29sIHNpemVDaGFuZ2VkID0gZmFsc2U7CiAgICAgZXZhc19vYmplY3Rfc21h cnRfY2FsbGJhY2tfYWRkKHdlYlZpZXcoKSwgImNvbnRlbnRzLHNpemUsY2hhbmdlZCIsIG9uQ29u dGVudHNTaXplQ2hhbmdlZFBvcnRyYWl0LCAmc2l6ZUNoYW5nZWQpOwogICAgIGV3a192aWV3X2h0 bWxfc3RyaW5nX2xvYWQod2ViVmlldygpLCBjb250ZW50c1NpemVIVE1MUG9ydHJhaXQsIDAsIDAp OwotICAgIHdoaWxlICghc2l6ZUNoYW5nZWQpCi0gICAgICAgIGVjb3JlX21haW5fbG9vcF9pdGVy YXRlKCk7CisgICAgd2FpdFVudGlsVHJ1ZShzaXplQ2hhbmdlZCk7CiAgICAgZXZhc19vYmplY3Rf c21hcnRfY2FsbGJhY2tfZGVsKHdlYlZpZXcoKSwgImNvbnRlbnRzLHNpemUsY2hhbmdlZCIsIG9u Q29udGVudHNTaXplQ2hhbmdlZFBvcnRyYWl0KTsKIAogICAgIGV2YXNfb2JqZWN0X3NtYXJ0X2Nh bGxiYWNrX2FkZCh3ZWJWaWV3KCksICJjb250ZW50cyxzaXplLGNoYW5nZWQiLCBvbkNvbnRlbnRz U2l6ZUNoYW5nZWRMYW5kc2NhcGUsICZzaXplQ2hhbmdlZCk7CiAgICAgZXdrX3ZpZXdfZGV2aWNl X3BpeGVsX3JhdGlvX3NldCh3ZWJWaWV3KCksIDIpOwogICAgIGV3a192aWV3X2h0bWxfc3RyaW5n X2xvYWQod2ViVmlldygpLCBjb250ZW50c1NpemVIVE1MTGFuZHNjYXBlLCAwLCAwKTsKICAgICBz aXplQ2hhbmdlZCA9IGZhbHNlOwotICAgIHdoaWxlICghc2l6ZUNoYW5nZWQpCi0gICAgICAgIGVj b3JlX21haW5fbG9vcF9pdGVyYXRlKCk7CisgICAgd2FpdFVudGlsVHJ1ZShzaXplQ2hhbmdlZCk7 CiAgICAgZXZhc19vYmplY3Rfc21hcnRfY2FsbGJhY2tfZGVsKHdlYlZpZXcoKSwgImNvbnRlbnRz LHNpemUsY2hhbmdlZCIsIG9uQ29udGVudHNTaXplQ2hhbmdlZExhbmRzY2FwZSk7CiAKICAgICBl dmFzX29iamVjdF9zbWFydF9jYWxsYmFja19hZGQod2ViVmlldygpLCAiY29udGVudHMsc2l6ZSxj aGFuZ2VkIiwgb25Db250ZW50c1NpemVDaGFuZ2VkUG9ydHJhaXQsICZzaXplQ2hhbmdlZCk7CiAg ICAgZXdrX3ZpZXdfc2NhbGVfc2V0KHdlYlZpZXcoKSwgMywgMCwgMCk7CiAgICAgZXdrX3ZpZXdf aHRtbF9zdHJpbmdfbG9hZCh3ZWJWaWV3KCksIGNvbnRlbnRzU2l6ZUhUTUxQb3J0cmFpdCwgMCwg MCk7CiAgICAgc2l6ZUNoYW5nZWQgPSBmYWxzZTsKLSAgICB3aGlsZSAoIXNpemVDaGFuZ2VkKQot ICAgICAgICBlY29yZV9tYWluX2xvb3BfaXRlcmF0ZSgpOworICAgIHdhaXRVbnRpbFRydWUoc2l6 ZUNoYW5nZWQpOwogCiAgICAgLy8gTWFrZSBzdXJlIHdlIGdldCBzaWduYWwgYWZ0ZXIgbG9hZGVk IHRoZSBjb250ZW50cyBoYXZpbmcgc2FtZSBzaXplIHdpdGggcHJldmlvdXMgb25lLgogICAgIHNp emVDaGFuZ2VkID0gZmFsc2U7CiAgICAgZXdrX3ZpZXdfaHRtbF9zdHJpbmdfbG9hZCh3ZWJWaWV3 KCksIGNvbnRlbnRzU2l6ZUhUTUxQb3J0cmFpdCwgMCwgMCk7Ci0gICAgd2hpbGUgKCFzaXplQ2hh bmdlZCkKLSAgICAgICAgZWNvcmVfbWFpbl9sb29wX2l0ZXJhdGUoKTsKKyAgICB3YWl0VW50aWxU cnVlKHNpemVDaGFuZ2VkKTsKIAogICAgIGV2YXNfb2JqZWN0X3NtYXJ0X2NhbGxiYWNrX2RlbCh3 ZWJWaWV3KCksICJjb250ZW50cyxzaXplLGNoYW5nZWQiLCBvbkNvbnRlbnRzU2l6ZUNoYW5nZWRQ b3J0cmFpdCk7CiB9CkBAIC0xMDAzLDEzICsxMDA1LDExIEBAIFRFU1RfRihFV0syVmlld1Rlc3Qs IGV3a192aWV3X3BhZ2VfY29udGVudHNfZ2V0KQogICAgIHdhaXRVbnRpbExvYWRGaW5pc2hlZCgp OwogCiAgICAgQVNTRVJUX1RSVUUoZXdrX3ZpZXdfcGFnZV9jb250ZW50c19nZXQod2ViVmlldygp LCBFV0tfUEFHRV9DT05URU5UU19UWVBFX01IVE1MLCBQYWdlQ29udGVudHNBc01IVE1MQ2FsbGJh Y2ssIDApKTsKLSAgICB3aGlsZSAoIW9idGFpbmVkUGFnZUNvbnRlbnRzKQotICAgICAgICBlY29y ZV9tYWluX2xvb3BfaXRlcmF0ZSgpOworICAgIHdhaXRVbnRpbFRydWUob2J0YWluZWRQYWdlQ29u dGVudHMpOwogCiAgICAgb2J0YWluZWRQYWdlQ29udGVudHMgPSBmYWxzZTsKICAgICBBU1NFUlRf VFJVRShld2tfdmlld19wYWdlX2NvbnRlbnRzX2dldCh3ZWJWaWV3KCksIEVXS19QQUdFX0NPTlRF TlRTX1RZUEVfU1RSSU5HLCBQYWdlQ29udGVudHNBc1N0cmluZ0NhbGxiYWNrLCAwKSk7Ci0gICAg d2hpbGUgKCFvYnRhaW5lZFBhZ2VDb250ZW50cykKLSAgICAgICAgZWNvcmVfbWFpbl9sb29wX2l0 ZXJhdGUoKTsKKyAgICB3YWl0VW50aWxUcnVlKG9idGFpbmVkUGFnZUNvbnRlbnRzKTsKIH0KIAog VEVTVF9GKEVXSzJWaWV3VGVzdCwgZXdrX3ZpZXdfc291cmNlX21vZGUpCg==