100110 2012-10-23 05:06:08 -0700 [EFL][WK2] ecore_x should be initialised in WebProcess to avoid re-initialization by PlatformScreenEfl utilities and systemBeep() function 2012-10-23 06:20:19 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 alexander.shalamov alexander.shalamov gyuyoung.kim kenneth lucas.de.marchi rakuco webkit.review.bot oldest_to_newest 748514 0 alexander.shalamov 2012-10-23 05:06:08 -0700 Netscape Plugin and MediaQueries depend on ecore_x functionality, therefore, ecore_x should be initialized when process starts to avoid re-initialization. 748540 1 170134 alexander.shalamov 2012-10-23 05:44:27 -0700 Created attachment 170134 Patch 1 - initialize ecore_x in WebProcess - removed old workaround for ecore_x_init 748542 2 170134 cdumez 2012-10-23 05:48:27 -0700 Comment on attachment 170134 Patch 1 View in context: https://bugs.webkit.org/attachment.cgi?id=170134&action=review > Source/WebKit2/WebProcess/efl/WebProcessMainEfl.cpp:71 > + if (!ecore_x_init(0)) { Where do we shutdown those libs? > Source/WebKit2/WebProcess/efl/WebProcessMainEfl.cpp:75 > + ecore_shutdown(); Missing eina_shutdown() 748544 3 170134 kenneth 2012-10-23 05:53:32 -0700 Comment on attachment 170134 Patch 1 View in context: https://bugs.webkit.org/attachment.cgi?id=170134&action=review > Source/WebKit2/ChangeLog:9 > + PlatformScreenEfl functions and systemBeep() depend on ecore_x functionality, therefore, > + ecore_x should be initialized when web process starts to avoid re-initialization. Does using ecore_x buy os anything than using X directly? and potentially share code with chrome/linux 748546 4 170137 alexander.shalamov 2012-10-23 05:55:19 -0700 Created attachment 170137 Patch 2 - Applied fixes according to review comments 748549 5 170137 kenneth 2012-10-23 05:58:25 -0700 Comment on attachment 170137 Patch 2 r=me though I would rather share the Chrome WebScreenInfo code than use ecore_x 748553 6 alexander.shalamov 2012-10-23 06:01:21 -0700 (In reply to comment #3) > (From update of attachment 170134 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=170134&action=review > > > Source/WebKit2/ChangeLog:9 > > + PlatformScreenEfl functions and systemBeep() depend on ecore_x functionality, therefore, > > + ecore_x should be initialized when web process starts to avoid re-initialization. > > Does using ecore_x buy os anything than using X directly? and potentially share code with chrome/linux That might be good idea to add shared code for the ports that use X. I think we need to discuss about that on mailing list and ask opinion from chromium folks. 748561 7 170137 webkit.review.bot 2012-10-23 06:20:15 -0700 Comment on attachment 170137 Patch 2 Clearing flags on attachment: 170137 Committed r132212: <http://trac.webkit.org/changeset/132212> 748562 8 webkit.review.bot 2012-10-23 06:20:19 -0700 All reviewed patches have been landed. Closing bug. 170134 2012-10-23 05:44:27 -0700 2012-10-23 05:55:19 -0700 Patch 1 efl_ecore_x_init_1.patch text/plain 5180 alexander.shalamov ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBiZGRiZTFhLi45NmYxZmZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAg QEAKKzIwMTItMTAtMjMgIEFsZXhhbmRlciBTaGFsYW1vdiAgPGFsZXhhbmRlci5zaGFsYW1vdkBp bnRlbC5jb20+CisKKyAgICAgICAgW0VGTF1bV0syXSBlY29yZV94IHNob3VsZCBiZSBpbml0aWFs aXNlZCBpbiBXZWJQcm9jZXNzIHRvIGF2b2lkIHJlLWluaXRpYWxpemF0aW9uIGJ5IFBsYXRmb3Jt U2NyZWVuRWZsIHV0aWxpdGllcyBhbmQgc3lzdGVtQmVlcCgpIGZ1bmN0aW9uCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDAxMTAKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmVkIGluaXRpYWxpemF0 aW9uIG9mIGVjb3JlX3gsIHNpbmNlIGl0IGlzIGluaXRpYWxpemVkIHdoZW4gcHJvY2VzcyBzdGFy dHMuCisKKyAgICAgICAgdGVzdDogZmFzdC9tZWRpYS8qCisKKyAgICAgICAgKiBwbGF0Zm9ybS9l ZmwvUGxhdGZvcm1TY3JlZW5FZmwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6c2NyZWVuRGVwdGgp OgorICAgICAgICAoV2ViQ29yZTo6c2NyZWVuUmVjdCk6CisgICAgICAgICogcGxhdGZvcm0vZWZs L1NvdW5kRWZsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnN5c3RlbUJlZXApOgorCiAyMDEyLTEw LTIxICBLZW50IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KIAogICAgICAgICBQYWdlIHBv cHVwOiBGaXggY3Jhc2ggYnkgZXZlbnRzIGFmdGVyIGNsb3NpbmcKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2VmbC9QbGF0Zm9ybVNjcmVlbkVmbC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9lZmwvUGxhdGZvcm1TY3JlZW5FZmwuY3BwCmluZGV4IDQzMGJjOTYuLjBl MjA3YWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VmbC9QbGF0Zm9ybVNj cmVlbkVmbC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZWZsL1BsYXRmb3JtU2Ny ZWVuRWZsLmNwcApAQCAtNDgsMjEgKzQ4LDYgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi0j aWZkZWYgSEFWRV9FQ09SRV9YCi0KLSNkZWZpbmUgQ0FMTF9XSVRIX0VDT1JFX1goRUNPUkVfWF9D QUxMKSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKLSAgICBkbyB7ICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwK LSAgICAgICAgaW50IHN1Y2Nlc3MgPSBlY29yZV94X2luaXQoMCk7ICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIFwKLSAgICAgICAgaWYgKHN1Y2Nlc3MpIHsgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKLSAgICAgICAgICAgIEVjb3JlX1hf U2NyZWVuKiBzY3JlZW4gPSBlY29yZV94X2RlZmF1bHRfc2NyZWVuX2dldCgpOyAgICAgIFwKLSAg ICAgICAgICAgIGlmIChzY3JlZW4pICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIFwKLSAgICAgICAgICAgICAgICBFQ09SRV9YX0NBTEw7ICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKLSAgICAgICAgICAgIGVjb3JlX3hfc2h1 dGRvd24oKTsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKLSAgICAg ICAgfSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIFwKLSAgICB9IHdoaWxlICgwKSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKLQotI2VuZGlmCi0KIGludCBzY3JlZW5Ib3Jp em9udGFsRFBJKFdpZGdldCopCiB7CiAgICAgbm90SW1wbGVtZW50ZWQoKTsKQEAgLTc4LDkgKzYz LDcgQEAgaW50IHNjcmVlblZlcnRpY2FsRFBJKFdpZGdldCopCiBpbnQgc2NyZWVuRGVwdGgoV2lk Z2V0KikKIHsKICNpZmRlZiBIQVZFX0VDT1JFX1gKLSAgICBpbnQgZGVwdGggPSAyNDsKLSAgICBD QUxMX1dJVEhfRUNPUkVfWChkZXB0aCA9IGVjb3JlX3hfZGVmYXVsdF9kZXB0aF9nZXQoZWNvcmVf eF9kaXNwbGF5X2dldCgpLCBzY3JlZW4pKTsKLSAgICByZXR1cm4gZGVwdGg7CisgICAgcmV0dXJu IGVjb3JlX3hfZGVmYXVsdF9kZXB0aF9nZXQoZWNvcmVfeF9kaXNwbGF5X2dldCgpLCBlY29yZV94 X2RlZmF1bHRfc2NyZWVuX2dldCgpKTsKICNlbHNlCiAgICAgcmV0dXJuIDI0OwogI2VuZGlmCkBA IC0xMTQsMTIgKzk3LDEyIEBAIGJvb2wgc2NyZWVuSXNNb25vY2hyb21lKFdpZGdldCogd2lkZ2V0 KQogRmxvYXRSZWN0IHNjcmVlblJlY3QoV2lkZ2V0KiB3aWRnZXQpCiB7CiAjaWZkZWYgSEFWRV9F Q09SRV9YCisgICAgVU5VU0VEX1BBUkFNKHdpZGdldCk7CiAgICAgLy8gRmFsbGJhY2sgdG8gcmVh bGlzdGljIHZhbHVlcyBpZiB0aGUgRWNvcmVYIGNhbGwgZmFpbHMKICAgICAvLyBhbmQgd2UgY2Fu bm90IGFjY3VyYXRlbHkgZGV0ZWN0IHRoZSBzY3JlZW4gc2l6ZS4KICAgICBpbnQgd2lkdGggPSA4 MDA7CiAgICAgaW50IGhlaWdodCA9IDYwMDsKLSAgICBDQUxMX1dJVEhfRUNPUkVfWChlY29yZV94 X3NjcmVlbl9zaXplX2dldChzY3JlZW4sICZ3aWR0aCwgJmhlaWdodCkpOwotICAgIFVOVVNFRF9Q QVJBTSh3aWRnZXQpOworICAgIGVjb3JlX3hfc2NyZWVuX3NpemVfZ2V0KGVjb3JlX3hfZGVmYXVs dF9zY3JlZW5fZ2V0KCksICZ3aWR0aCwgJmhlaWdodCk7CiAgICAgcmV0dXJuIEZsb2F0UmVjdCgw LCAwLCB3aWR0aCwgaGVpZ2h0KTsKICNlbHNlCiAgICAgaWYgKCF3aWRnZXQgfHwgIXdpZGdldC0+ ZXZhcygpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZWZsL1NvdW5kRWZs LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VmbC9Tb3VuZEVmbC5jcHAKaW5kZXggYzNk ODNiYzUuLjA5MWRlN2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VmbC9T b3VuZEVmbC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZWZsL1NvdW5kRWZsLmNw cApAQCAtMzksMTAgKzM5LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogdm9pZCBzeXN0ZW1CZWVw KCkKIHsKICNpZmRlZiBIQVZFX0VDT1JFX1gKLSAgICBpZiAoZWNvcmVfeF9pbml0KDApKSB7Ci0g ICAgICAgIGVjb3JlX3hfYmVsbCgwKTsKLSAgICAgICAgZWNvcmVfeF9zaHV0ZG93bigpOwotICAg IH0KKyAgICBlY29yZV94X2JlbGwoMCk7CiAjZW5kaWYKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IDE0YWM1 MjYuLjk4MDJmZGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9T b3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMi0xMC0yMyAgQWxl eGFuZGVyIFNoYWxhbW92ICA8YWxleGFuZGVyLnNoYWxhbW92QGludGVsLmNvbT4KKworICAgICAg ICBbRUZMXVtXSzJdIGVjb3JlX3ggc2hvdWxkIGJlIGluaXRpYWxpc2VkIGluIFdlYlByb2Nlc3Mg dG8gYXZvaWQgcmUtaW5pdGlhbGl6YXRpb24gYnkgUGxhdGZvcm1TY3JlZW5FZmwgdXRpbGl0aWVz IGFuZCBzeXN0ZW1CZWVwKCkgZnVuY3Rpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEwMDExMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFBsYXRmb3JtU2NyZWVuRWZsIGZ1bmN0aW9ucyBhbmQgc3lzdGVt QmVlcCgpIGRlcGVuZCBvbiBlY29yZV94IGZ1bmN0aW9uYWxpdHksIHRoZXJlZm9yZSwKKyAgICAg ICAgZWNvcmVfeCBzaG91bGQgYmUgaW5pdGlhbGl6ZWQgd2hlbiB3ZWIgcHJvY2VzcyBzdGFydHMg dG8gYXZvaWQgcmUtaW5pdGlhbGl6YXRpb24uCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL2VmbC9X ZWJQcm9jZXNzTWFpbkVmbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NNYWluRWZs KTogSW5pdGlhbGl6ZWQgZWNvcmVfeCBtb2R1bGUuCisKIDIwMTItMTAtMjEgIEh5dW5nY2hhbiBL aW0gIDxoeXVuZ2NoYW4yLmtpbUBsZ2UuY29tPgogCiAgICAgICAgIEFkZCBhIHNlcGFyYXRlIGZs YWcgZm9yIHJnYiBzd2l6emxpbmcgd2hldGhlciBpdCBjYW4gYmUgbW9kaWZpZWQgb3Igbm90CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL2VmbC9XZWJQcm9jZXNzTWFpbkVm bC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL2VmbC9XZWJQcm9jZXNzTWFpbkVmbC5j cHAKaW5kZXggNTg5YWE3MC4uNmNlN2IyMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9lZmwvV2ViUHJvY2Vzc01haW5FZmwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvZWZsL1dlYlByb2Nlc3NNYWluRWZsLmNwcApAQCAtNDEsNiArNDEsMTAgQEAKICNp bmNsdWRlIDx3dGYvTWFpblRocmVhZC5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4K IAorI2lmZGVmIEhBVkVfRUNPUkVfWAorI2luY2x1ZGUgPEVjb3JlX1guaD4KKyNlbmRpZgorCiAj aWYgVVNFKENPT1JESU5BVEVEX0dSQVBISUNTKQogI2luY2x1ZGUgIkNvb3JkaW5hdGVkR3JhcGhp Y3NMYXllci5oIgogI2VuZGlmCkBAIC02NCw2ICs2OCwxNCBAQCBXS19FWFBPUlQgaW50IFdlYlBy b2Nlc3NNYWluRWZsKGludCBhcmdjLCBjaGFyKiBhcmd2W10pCiAgICAgICAgIHJldHVybiAxOwog ICAgIH0KIAorICAgIGlmICghZWNvcmVfeF9pbml0KDApKSB7CisgICAgICAgIC8vIENvdWxkIG5v dCBpbml0IGVjb3JlX3guCisgICAgICAgIC8vIFBsYXRmb3JtU2NyZWVuRWZsIGFuZCBzeXN0ZW1C ZWVwKCkgZnVuY3Rpb25zCisgICAgICAgIC8vIGRlcGVuZCBvbiBlY29yZV94IGZ1bmN0aW9uYWxp dHkuCisgICAgICAgIGVjb3JlX3NodXRkb3duKCk7CisgICAgICAgIHJldHVybiAxOworICAgIH0K KwogI2lmIEVOQUJMRShHTElCX1NVUFBPUlQpCiAgICAgZ190eXBlX2luaXQoKTsKIAo= 170137 2012-10-23 05:55:19 -0700 2012-10-23 06:20:15 -0700 Patch 2 efl_ecore_x_init_2.patch text/plain 5442 alexander.shalamov ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBiZGRiZTFhLi45NmYxZmZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAg QEAKKzIwMTItMTAtMjMgIEFsZXhhbmRlciBTaGFsYW1vdiAgPGFsZXhhbmRlci5zaGFsYW1vdkBp bnRlbC5jb20+CisKKyAgICAgICAgW0VGTF1bV0syXSBlY29yZV94IHNob3VsZCBiZSBpbml0aWFs aXNlZCBpbiBXZWJQcm9jZXNzIHRvIGF2b2lkIHJlLWluaXRpYWxpemF0aW9uIGJ5IFBsYXRmb3Jt U2NyZWVuRWZsIHV0aWxpdGllcyBhbmQgc3lzdGVtQmVlcCgpIGZ1bmN0aW9uCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDAxMTAKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmVkIGluaXRpYWxpemF0 aW9uIG9mIGVjb3JlX3gsIHNpbmNlIGl0IGlzIGluaXRpYWxpemVkIHdoZW4gcHJvY2VzcyBzdGFy dHMuCisKKyAgICAgICAgdGVzdDogZmFzdC9tZWRpYS8qCisKKyAgICAgICAgKiBwbGF0Zm9ybS9l ZmwvUGxhdGZvcm1TY3JlZW5FZmwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6c2NyZWVuRGVwdGgp OgorICAgICAgICAoV2ViQ29yZTo6c2NyZWVuUmVjdCk6CisgICAgICAgICogcGxhdGZvcm0vZWZs L1NvdW5kRWZsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnN5c3RlbUJlZXApOgorCiAyMDEyLTEw LTIxICBLZW50IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KIAogICAgICAgICBQYWdlIHBv cHVwOiBGaXggY3Jhc2ggYnkgZXZlbnRzIGFmdGVyIGNsb3NpbmcKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2VmbC9QbGF0Zm9ybVNjcmVlbkVmbC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9lZmwvUGxhdGZvcm1TY3JlZW5FZmwuY3BwCmluZGV4IDQzMGJjOTYuLjBl MjA3YWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VmbC9QbGF0Zm9ybVNj cmVlbkVmbC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZWZsL1BsYXRmb3JtU2Ny ZWVuRWZsLmNwcApAQCAtNDgsMjEgKzQ4LDYgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi0j aWZkZWYgSEFWRV9FQ09SRV9YCi0KLSNkZWZpbmUgQ0FMTF9XSVRIX0VDT1JFX1goRUNPUkVfWF9D QUxMKSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKLSAgICBkbyB7ICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwK LSAgICAgICAgaW50IHN1Y2Nlc3MgPSBlY29yZV94X2luaXQoMCk7ICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIFwKLSAgICAgICAgaWYgKHN1Y2Nlc3MpIHsgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKLSAgICAgICAgICAgIEVjb3JlX1hf U2NyZWVuKiBzY3JlZW4gPSBlY29yZV94X2RlZmF1bHRfc2NyZWVuX2dldCgpOyAgICAgIFwKLSAg ICAgICAgICAgIGlmIChzY3JlZW4pICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIFwKLSAgICAgICAgICAgICAgICBFQ09SRV9YX0NBTEw7ICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKLSAgICAgICAgICAgIGVjb3JlX3hfc2h1 dGRvd24oKTsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKLSAgICAg ICAgfSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIFwKLSAgICB9IHdoaWxlICgwKSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKLQotI2VuZGlmCi0KIGludCBzY3JlZW5Ib3Jp em9udGFsRFBJKFdpZGdldCopCiB7CiAgICAgbm90SW1wbGVtZW50ZWQoKTsKQEAgLTc4LDkgKzYz LDcgQEAgaW50IHNjcmVlblZlcnRpY2FsRFBJKFdpZGdldCopCiBpbnQgc2NyZWVuRGVwdGgoV2lk Z2V0KikKIHsKICNpZmRlZiBIQVZFX0VDT1JFX1gKLSAgICBpbnQgZGVwdGggPSAyNDsKLSAgICBD QUxMX1dJVEhfRUNPUkVfWChkZXB0aCA9IGVjb3JlX3hfZGVmYXVsdF9kZXB0aF9nZXQoZWNvcmVf eF9kaXNwbGF5X2dldCgpLCBzY3JlZW4pKTsKLSAgICByZXR1cm4gZGVwdGg7CisgICAgcmV0dXJu IGVjb3JlX3hfZGVmYXVsdF9kZXB0aF9nZXQoZWNvcmVfeF9kaXNwbGF5X2dldCgpLCBlY29yZV94 X2RlZmF1bHRfc2NyZWVuX2dldCgpKTsKICNlbHNlCiAgICAgcmV0dXJuIDI0OwogI2VuZGlmCkBA IC0xMTQsMTIgKzk3LDEyIEBAIGJvb2wgc2NyZWVuSXNNb25vY2hyb21lKFdpZGdldCogd2lkZ2V0 KQogRmxvYXRSZWN0IHNjcmVlblJlY3QoV2lkZ2V0KiB3aWRnZXQpCiB7CiAjaWZkZWYgSEFWRV9F Q09SRV9YCisgICAgVU5VU0VEX1BBUkFNKHdpZGdldCk7CiAgICAgLy8gRmFsbGJhY2sgdG8gcmVh bGlzdGljIHZhbHVlcyBpZiB0aGUgRWNvcmVYIGNhbGwgZmFpbHMKICAgICAvLyBhbmQgd2UgY2Fu bm90IGFjY3VyYXRlbHkgZGV0ZWN0IHRoZSBzY3JlZW4gc2l6ZS4KICAgICBpbnQgd2lkdGggPSA4 MDA7CiAgICAgaW50IGhlaWdodCA9IDYwMDsKLSAgICBDQUxMX1dJVEhfRUNPUkVfWChlY29yZV94 X3NjcmVlbl9zaXplX2dldChzY3JlZW4sICZ3aWR0aCwgJmhlaWdodCkpOwotICAgIFVOVVNFRF9Q QVJBTSh3aWRnZXQpOworICAgIGVjb3JlX3hfc2NyZWVuX3NpemVfZ2V0KGVjb3JlX3hfZGVmYXVs dF9zY3JlZW5fZ2V0KCksICZ3aWR0aCwgJmhlaWdodCk7CiAgICAgcmV0dXJuIEZsb2F0UmVjdCgw LCAwLCB3aWR0aCwgaGVpZ2h0KTsKICNlbHNlCiAgICAgaWYgKCF3aWRnZXQgfHwgIXdpZGdldC0+ ZXZhcygpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZWZsL1NvdW5kRWZs LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VmbC9Tb3VuZEVmbC5jcHAKaW5kZXggYzNk ODNiYzUuLjA5MWRlN2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VmbC9T b3VuZEVmbC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZWZsL1NvdW5kRWZsLmNw cApAQCAtMzksMTAgKzM5LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogdm9pZCBzeXN0ZW1CZWVw KCkKIHsKICNpZmRlZiBIQVZFX0VDT1JFX1gKLSAgICBpZiAoZWNvcmVfeF9pbml0KDApKSB7Ci0g ICAgICAgIGVjb3JlX3hfYmVsbCgwKTsKLSAgICAgICAgZWNvcmVfeF9zaHV0ZG93bigpOwotICAg IH0KKyAgICBlY29yZV94X2JlbGwoMCk7CiAjZW5kaWYKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IDE0YWM1 MjYuLjk4MDJmZGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9T b3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMi0xMC0yMyAgQWxl eGFuZGVyIFNoYWxhbW92ICA8YWxleGFuZGVyLnNoYWxhbW92QGludGVsLmNvbT4KKworICAgICAg ICBbRUZMXVtXSzJdIGVjb3JlX3ggc2hvdWxkIGJlIGluaXRpYWxpc2VkIGluIFdlYlByb2Nlc3Mg dG8gYXZvaWQgcmUtaW5pdGlhbGl6YXRpb24gYnkgUGxhdGZvcm1TY3JlZW5FZmwgdXRpbGl0aWVz IGFuZCBzeXN0ZW1CZWVwKCkgZnVuY3Rpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEwMDExMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFBsYXRmb3JtU2NyZWVuRWZsIGZ1bmN0aW9ucyBhbmQgc3lzdGVt QmVlcCgpIGRlcGVuZCBvbiBlY29yZV94IGZ1bmN0aW9uYWxpdHksIHRoZXJlZm9yZSwKKyAgICAg ICAgZWNvcmVfeCBzaG91bGQgYmUgaW5pdGlhbGl6ZWQgd2hlbiB3ZWIgcHJvY2VzcyBzdGFydHMg dG8gYXZvaWQgcmUtaW5pdGlhbGl6YXRpb24uCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL2VmbC9X ZWJQcm9jZXNzTWFpbkVmbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NNYWluRWZs KTogSW5pdGlhbGl6ZWQgZWNvcmVfeCBtb2R1bGUuCisKIDIwMTItMTAtMjEgIEh5dW5nY2hhbiBL aW0gIDxoeXVuZ2NoYW4yLmtpbUBsZ2UuY29tPgogCiAgICAgICAgIEFkZCBhIHNlcGFyYXRlIGZs YWcgZm9yIHJnYiBzd2l6emxpbmcgd2hldGhlciBpdCBjYW4gYmUgbW9kaWZpZWQgb3Igbm90CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL2VmbC9XZWJQcm9jZXNzTWFpbkVm bC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL2VmbC9XZWJQcm9jZXNzTWFpbkVmbC5j cHAKaW5kZXggNTg5YWE3MC4uYWZmYjBiYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9lZmwvV2ViUHJvY2Vzc01haW5FZmwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvZWZsL1dlYlByb2Nlc3NNYWluRWZsLmNwcApAQCAtNDEsNiArNDEsMTAgQEAKICNp bmNsdWRlIDx3dGYvTWFpblRocmVhZC5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4K IAorI2lmZGVmIEhBVkVfRUNPUkVfWAorI2luY2x1ZGUgPEVjb3JlX1guaD4KKyNlbmRpZgorCiAj aWYgVVNFKENPT1JESU5BVEVEX0dSQVBISUNTKQogI2luY2x1ZGUgIkNvb3JkaW5hdGVkR3JhcGhp Y3NMYXllci5oIgogI2VuZGlmCkBAIC02NCw2ICs2OCwxNSBAQCBXS19FWFBPUlQgaW50IFdlYlBy b2Nlc3NNYWluRWZsKGludCBhcmdjLCBjaGFyKiBhcmd2W10pCiAgICAgICAgIHJldHVybiAxOwog ICAgIH0KIAorICAgIGlmICghZWNvcmVfeF9pbml0KDApKSB7CisgICAgICAgIC8vIENvdWxkIG5v dCBpbml0IGVjb3JlX3guCisgICAgICAgIC8vIFBsYXRmb3JtU2NyZWVuRWZsIGFuZCBzeXN0ZW1C ZWVwKCkgZnVuY3Rpb25zCisgICAgICAgIC8vIGRlcGVuZCBvbiBlY29yZV94IGZ1bmN0aW9uYWxp dHkuCisgICAgICAgIGVjb3JlX3NodXRkb3duKCk7CisgICAgICAgIGVpbmFfc2h1dGRvd24oKTsK KyAgICAgICAgcmV0dXJuIDE7CisgICAgfQorCiAjaWYgRU5BQkxFKEdMSUJfU1VQUE9SVCkKICAg ICBnX3R5cGVfaW5pdCgpOwogCkBAIC0xMDUsNiArMTE4LDEwIEBAIFdLX0VYUE9SVCBpbnQgV2Vi UHJvY2Vzc01haW5FZmwoaW50IGFyZ2MsIGNoYXIqIGFyZ3ZbXSkKICAgICBzb3VwX2NhY2hlX2R1 bXAoc291cENhY2hlKTsKICAgICBnX29iamVjdF91bnJlZihzb3VwQ2FjaGUpOwogCisgICAgZWNv cmVfeF9zaHV0ZG93bigpOworICAgIGVjb3JlX3NodXRkb3duKCk7CisgICAgZWluYV9zaHV0ZG93 bigpOworCiAgICAgcmV0dXJuIDA7CiAKIH0K