98231 2012-10-02 22:38:36 -0700 [EFL] Enable use of X11 in DumpRenderTree / WebKitTestRunner 2012-10-04 02:44:02 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 98162 98341 98389 1 cdumez cdumez alexander.shalamov d-r gyuyoung.kim hausmann kenneth laszlo.gombos lucas.de.marchi rakuco tonikitoo webkit.review.bot oldest_to_newest 733364 0 cdumez 2012-10-02 22:38:36 -0700 We should start using X11 in EFL's DumpRenderTree now that we are using XvfbDriver for the layout tests. 733377 1 166810 cdumez 2012-10-02 23:13:59 -0700 Created attachment 166810 Patch 733388 2 166810 cdumez 2012-10-02 23:25:38 -0700 Comment on attachment 166810 Patch Needs the same in WKTR. 733390 3 166813 cdumez 2012-10-02 23:30:07 -0700 Created attachment 166813 Patch Apply same change to WebKitTestRunner. 733398 4 166816 cdumez 2012-10-02 23:52:01 -0700 Created attachment 166816 Patch Properly initialize ecore_x library in ewk_main. 733410 5 166816 alexander.shalamov 2012-10-03 00:43:10 -0700 Comment on attachment 166816 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=166816&action=review > Source/WebKit/efl/ewk/ewk_main.cpp:101 > + if (!ecore_x_init(0)) { Are those init calls are order dependant? ecore_x_init is not, but I'm just curious how edje and evas objects are initialized. > Source/WebKit/efl/ewk/ewk_main.cpp:116 > + edje_shutdown(); Should it be ecore_x_shutdown() ? 733412 6 166816 cdumez 2012-10-03 00:48:06 -0700 Comment on attachment 166816 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=166816&action=review >> Source/WebKit/efl/ewk/ewk_main.cpp:101 >> + if (!ecore_x_init(0)) { > > Are those init calls are order dependant? > ecore_x_init is not, but I'm just curious how edje and evas objects are initialized. I don't believe they are. >> Source/WebKit/efl/ewk/ewk_main.cpp:116 >> + edje_shutdown(); > > Should it be ecore_x_shutdown() ? No, this is correct. We come to this label if ecore_x_init() failed so there is no need to call ecore_x_shutdown(). We however, need to shutdown the previously intialized library (edje). See error_edje: 2 lines below, it calls ecore_evas_shutdown(), not edje_shutdown(). 733416 7 alexander.shalamov 2012-10-03 00:56:44 -0700 (In reply to comment #6) > (From update of attachment 166816 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=166816&action=review > > >> Source/WebKit/efl/ewk/ewk_main.cpp:101 > >> + if (!ecore_x_init(0)) { > > > > Are those init calls are order dependant? > > ecore_x_init is not, but I'm just curious how edje and evas objects are initialized. > > I don't believe they are. > > >> Source/WebKit/efl/ewk/ewk_main.cpp:116 > >> + edje_shutdown(); > > > > Should it be ecore_x_shutdown() ? > > No, this is correct. We come to this label if ecore_x_init() failed so there is no need to call ecore_x_shutdown(). We however, need to shutdown the previously intialized library (edje). See error_edje: 2 lines below, it calls ecore_evas_shutdown(), not edje_shutdown(). LGTM! Thanks. 733488 8 166816 rakuco 2012-10-03 02:33:20 -0700 Comment on attachment 166816 Patch Alright, looks fine, thanks! 734372 9 166816 webkit.review.bot 2012-10-03 22:42:36 -0700 Comment on attachment 166816 Patch Clearing flags on attachment: 166816 Committed r130363: <http://trac.webkit.org/changeset/130363> 734373 10 webkit.review.bot 2012-10-03 22:42:40 -0700 All reviewed patches have been landed. Closing bug. 166810 2012-10-02 23:13:59 -0700 2012-10-02 23:30:07 -0700 Patch 98231_drt_x11.patch text/plain 1794 cdumez ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBiYzRk NmYwLi44NGUxMzRjIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xICsxLDE2IEBACisyMDEyLTEwLTAyICBDaHJpc3RvcGhlIER1bWV6ICA8Y2hy aXN0b3BoZS5kdW1lekBpbnRlbC5jb20+CisKKyAgICAgICAgW0VGTF1bRFJUXSBVc2UgWDExIGlu IER1bXBSZW5kZXJUcmVlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD05ODIzMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIENhbGwgZWNvcmVfZXZhc19uZXcoKSBpbnN0ZWFkIG9mIGVjb3JlX2V2YXNfYnVmZmVy X25ldygpCisgICAgICAgIGluIEVGTCdzIER1bXBSZW5kZXJUcmVlLiBJdCBpcyBzYWZlIHRvIGRv IHRoaXMgbm93IHRoYXQKKyAgICAgICAgd2UgYXJlIHVzaW5nIFh2ZmJEcml2ZXIgZm9yIHRoZSBs YXlvdXQgdGVzdHMuCisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9lZmwvRHVtcFJlbmRlclRy ZWUuY3BwOgorICAgICAgICAocGFyc2VDb21tYW5kTGluZU9wdGlvbnMpOgorICAgICAgICAoaW5p dEVjb3JlRXZhcyk6CisKID09IFJvbGxlZCBvdmVyIHRvIENoYW5nZUxvZy0yMDEyLTEwLTAyID09 CmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9lZmwvRHVtcFJlbmRlclRyZWUuY3Bw IGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvZWZsL0R1bXBSZW5kZXJUcmVlLmNwcAppbmRleCBjMWU0 ODAxLi42OWE0MjExIDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9lZmwvRHVtcFJl bmRlclRyZWUuY3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2VmbC9EdW1wUmVuZGVyVHJl ZS5jcHAKQEAgLTY4LDcgKzY4LDYgQEAgdm9sYXRpbGUgYm9vbCBkb25lID0gZmFsc2U7CiBzdGF0 aWMgYm9vbCBkdW1wUGl4ZWxzRm9yQ3VycmVudFRlc3Q7CiBzdGF0aWMgaW50IGR1bXBUcmVlID0g dHJ1ZTsKIHN0YXRpYyBpbnQgcHJpbnRTZXBhcmF0b3JzID0gdHJ1ZTsKLXN0YXRpYyBpbnQgdXNl WDExV2luZG93ID0gZmFsc2U7CiAKIHN0YXRpYyBTdHJpbmcgZHVtcEZyYW1lc0FzVGV4dChFdmFz X09iamVjdCogZnJhbWUpCiB7CkBAIC0xOTQsNyArMTkzLDYgQEAgc3RhdGljIGJvb2wgcGFyc2VD b21tYW5kTGluZU9wdGlvbnMoaW50IGFyZ2MsIGNoYXIqKiBhcmd2KQogICAgIHN0YXRpYyBjb25z dCBvcHRpb24gb3B0aW9uc1tdID0gewogICAgICAgICB7Im5vdHJlZSIsIG5vX2FyZ3VtZW50LCAm ZHVtcFRyZWUsIGZhbHNlfSwKICAgICAgICAgeyJ0cmVlIiwgbm9fYXJndW1lbnQsICZkdW1wVHJl ZSwgdHJ1ZX0sCi0gICAgICAgIHsiZ3VpIiwgbm9fYXJndW1lbnQsICZ1c2VYMTFXaW5kb3csIHRy dWV9LAogICAgICAgICB7MCwgMCwgMCwgMH0KICAgICB9OwogCkBAIC00MjAsNyArNDE4LDcgQEAg dm9pZCBkdW1wKCkKIAogc3RhdGljIEVjb3JlX0V2YXMqIGluaXRFY29yZUV2YXMoKQogewotICAg IEVjb3JlX0V2YXMqIGVjb3JlRXZhcyA9IHVzZVgxMVdpbmRvdyA/IGVjb3JlX2V2YXNfbmV3KDAs IDAsIDAsIDgwMCwgNjAwLCAwKSA6IGVjb3JlX2V2YXNfYnVmZmVyX25ldyg4MDAsIDYwMCk7Cisg ICAgRWNvcmVfRXZhcyogZWNvcmVFdmFzID0gZWNvcmVfZXZhc19uZXcoMCwgMCwgMCwgODAwLCA2 MDAsIDApOwogICAgIGlmICghZWNvcmVFdmFzKSB7CiAgICAgICAgIHNodXRkb3duRWZsKCk7CiAg ICAgICAgIGV4aXQoRVhJVF9GQUlMVVJFKTsK 166813 2012-10-02 23:30:07 -0700 2012-10-02 23:52:01 -0700 Patch 98231_drt_x11.patch text/plain 2557 cdumez ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBiYzRk NmYwLi5hNzVkODVmIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xICsxLDE5IEBACisyMDEyLTEwLTAyICBDaHJpc3RvcGhlIER1bWV6ICA8Y2hy aXN0b3BoZS5kdW1lekBpbnRlbC5jb20+CisKKyAgICAgICAgW0VGTF0gRW5hYmxlIHVzZSBvZiBY MTEgaW4gRHVtcFJlbmRlclRyZWUgLyBXZWJLaXRUZXN0UnVubmVyCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05ODIzMQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENhbGwgZWNvcmVfZXZhc19uZXcoKSBpbnN0 ZWFkIG9mIGVjb3JlX2V2YXNfYnVmZmVyX25ldygpCisgICAgICAgIGluIEVGTCdzIER1bXBSZW5k ZXJUcmVlIGFuZCBXZWJLaXRUZXN0UnVubmVyLiBJdCBpcworICAgICAgICBzYWZlIHRvIGRvIHRo aXMgbm93IHRoYXQgd2UgYXJlIHVzaW5nIFh2ZmJEcml2ZXIgZm9yIHRoZQorICAgICAgICBsYXlv dXQgdGVzdHMuCisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9lZmwvRHVtcFJlbmRlclRyZWUu Y3BwOgorICAgICAgICAocGFyc2VDb21tYW5kTGluZU9wdGlvbnMpOgorICAgICAgICAoaW5pdEVj b3JlRXZhcyk6CisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9lZmwvUGxhdGZvcm1XZWJWaWV3 RWZsLmNwcDoKKyAgICAgICAgKFdUUjo6aW5pdEVjb3JlRXZhcyk6CisKID09IFJvbGxlZCBvdmVy IHRvIENoYW5nZUxvZy0yMDEyLTEwLTAyID09CmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVy VHJlZS9lZmwvRHVtcFJlbmRlclRyZWUuY3BwIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvZWZsL0R1 bXBSZW5kZXJUcmVlLmNwcAppbmRleCBjMWU0ODAxLi42OWE0MjExIDEwMDY0NAotLS0gYS9Ub29s cy9EdW1wUmVuZGVyVHJlZS9lZmwvRHVtcFJlbmRlclRyZWUuY3BwCisrKyBiL1Rvb2xzL0R1bXBS ZW5kZXJUcmVlL2VmbC9EdW1wUmVuZGVyVHJlZS5jcHAKQEAgLTY4LDcgKzY4LDYgQEAgdm9sYXRp bGUgYm9vbCBkb25lID0gZmFsc2U7CiBzdGF0aWMgYm9vbCBkdW1wUGl4ZWxzRm9yQ3VycmVudFRl c3Q7CiBzdGF0aWMgaW50IGR1bXBUcmVlID0gdHJ1ZTsKIHN0YXRpYyBpbnQgcHJpbnRTZXBhcmF0 b3JzID0gdHJ1ZTsKLXN0YXRpYyBpbnQgdXNlWDExV2luZG93ID0gZmFsc2U7CiAKIHN0YXRpYyBT dHJpbmcgZHVtcEZyYW1lc0FzVGV4dChFdmFzX09iamVjdCogZnJhbWUpCiB7CkBAIC0xOTQsNyAr MTkzLDYgQEAgc3RhdGljIGJvb2wgcGFyc2VDb21tYW5kTGluZU9wdGlvbnMoaW50IGFyZ2MsIGNo YXIqKiBhcmd2KQogICAgIHN0YXRpYyBjb25zdCBvcHRpb24gb3B0aW9uc1tdID0gewogICAgICAg ICB7Im5vdHJlZSIsIG5vX2FyZ3VtZW50LCAmZHVtcFRyZWUsIGZhbHNlfSwKICAgICAgICAgeyJ0 cmVlIiwgbm9fYXJndW1lbnQsICZkdW1wVHJlZSwgdHJ1ZX0sCi0gICAgICAgIHsiZ3VpIiwgbm9f YXJndW1lbnQsICZ1c2VYMTFXaW5kb3csIHRydWV9LAogICAgICAgICB7MCwgMCwgMCwgMH0KICAg ICB9OwogCkBAIC00MjAsNyArNDE4LDcgQEAgdm9pZCBkdW1wKCkKIAogc3RhdGljIEVjb3JlX0V2 YXMqIGluaXRFY29yZUV2YXMoKQogewotICAgIEVjb3JlX0V2YXMqIGVjb3JlRXZhcyA9IHVzZVgx MVdpbmRvdyA/IGVjb3JlX2V2YXNfbmV3KDAsIDAsIDAsIDgwMCwgNjAwLCAwKSA6IGVjb3JlX2V2 YXNfYnVmZmVyX25ldyg4MDAsIDYwMCk7CisgICAgRWNvcmVfRXZhcyogZWNvcmVFdmFzID0gZWNv cmVfZXZhc19uZXcoMCwgMCwgMCwgODAwLCA2MDAsIDApOwogICAgIGlmICghZWNvcmVFdmFzKSB7 CiAgICAgICAgIHNodXRkb3duRWZsKCk7CiAgICAgICAgIGV4aXQoRVhJVF9GQUlMVVJFKTsKZGlm ZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvZWZsL1BsYXRmb3JtV2ViVmlld0VmbC5j cHAgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL2VmbC9QbGF0Zm9ybVdlYlZpZXdFZmwuY3BwCmlu ZGV4IDBiZGIyMzYuLmY0MzAwZGMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIv ZWZsL1BsYXRmb3JtV2ViVmlld0VmbC5jcHAKKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9l ZmwvUGxhdGZvcm1XZWJWaWV3RWZsLmNwcApAQCAtMjgsMTEgKzI4LDkgQEAgdXNpbmcgbmFtZXNw YWNlIFdlYktpdDsKIAogbmFtZXNwYWNlIFdUUiB7CiAKLXN0YXRpYyBib29sIHVzZVgxMVdpbmRv dyA9IGZhbHNlOwotCiBzdGF0aWMgRWNvcmVfRXZhcyogaW5pdEVjb3JlRXZhcygpCiB7Ci0gICAg RWNvcmVfRXZhcyogZWNvcmVFdmFzID0gdXNlWDExV2luZG93ID8gZWNvcmVfZXZhc19uZXcoMCwg MCwgMCwgODAwLCA2MDAsIDApIDogZWNvcmVfZXZhc19idWZmZXJfbmV3KDgwMCwgNjAwKTsKKyAg ICBFY29yZV9FdmFzKiBlY29yZUV2YXMgPSBlY29yZV9ldmFzX25ldygwLCAwLCAwLCA4MDAsIDYw MCwgMCk7CiAgICAgaWYgKCFlY29yZUV2YXMpCiAgICAgICAgIHJldHVybiAwOwogCg== 166816 2012-10-02 23:52:01 -0700 2012-10-03 22:42:35 -0700 Patch 98231_drt_x11.patch text/plain 7422 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv ZWZsL0NoYW5nZUxvZwppbmRleCA4MDVjZjNlLi45Y2NlYmE0IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2VmbC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTItMTAtMDIgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhl LmR1bWV6QGludGVsLmNvbT4KKworICAgICAgICBbRUZMXSBFbmFibGUgdXNlIG9mIFgxMSBpbiBE dW1wUmVuZGVyVHJlZSAvIFdlYktpdFRlc3RSdW5uZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk4MjMxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgSW5pdGlhbGl6ZSBlY29yZV94IGxpYnJhcnkgaW4gZXdr X21haW4gc2luY2UgaXQgaXMgdXNlZCBieQorICAgICAgICBXZWJLaXRFRkwuCisKKyAgICAgICAg KiBld2svZXdrX21haW4uY3BwOgorICAgICAgICAoZXdrX2luaXQpOgorICAgICAgICAoZXdrX3No dXRkb3duKToKKwogMjAxMi0xMC0wMiAgS3J6eXN6dG9mIEN6ZWNoICA8ay5jemVjaEBzYW1zdW5n LmNvbT4KIAogICAgICAgICBbRUZMXVtVVF0gUmVmYWN0b3JpbmcgYW4gaW1wbGVtZW50YXRpb24g b2YgdGVzdGluZyBmcmFtZXdvcmsgZm9yIHdrMS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv ZWZsL2V3ay9ld2tfbWFpbi5jcHAgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX21haW4uY3Bw CmluZGV4IGVmYTMzOTguLmU2NjcyZmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZWZsL2V3 ay9ld2tfbWFpbi5jcHAKKysrIGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19tYWluLmNwcApA QCAtNDksNiArNDksMTAgQEAKICNpbmNsdWRlIDxzeXMvc3RhdC5oPgogI2luY2x1ZGUgPHd0Zi9U aHJlYWRpbmcuaD4KIAorI2lmZGVmIEhBVkVfRUNPUkVfWAorI2luY2x1ZGUgPEVjb3JlX1guaD4K KyNlbmRpZgorCiBzdGF0aWMgaW50IF9ld2tJbml0Q291bnQgPSAwOwogCiAvKioKQEAgLTkzLDYg Kzk3LDEzIEBAIGludCBld2tfaW5pdCh2b2lkKQogICAgICAgICBnb3RvIGVycm9yX2VkamU7CiAg ICAgfQogCisjaWZkZWYgSEFWRV9FQ09SRV9YCisgICAgaWYgKCFlY29yZV94X2luaXQoMCkpIHsK KyAgICAgICAgQ1JJVElDQUwoImNvdWxkIG5vdCBpbml0IGVjb3JlX3guIik7CisgICAgICAgIGdv dG8gZXJyb3JfZWNvcmVfeDsKKyAgICB9CisjZW5kaWYKKwogICAgIGlmICghX2V3a19pbml0X2Jv ZHkoKSkgewogICAgICAgICBDUklUSUNBTCgiY291bGQgbm90IGluaXQgYm9keSIpOwogICAgICAg ICBnb3RvIGVycm9yX2VkamU7CkBAIC0xMDAsNiArMTExLDEwIEBAIGludCBld2tfaW5pdCh2b2lk KQogCiAgICAgcmV0dXJuICsrX2V3a0luaXRDb3VudDsKIAorI2lmZGVmIEhBVkVfRUNPUkVfWAor ZXJyb3JfZWNvcmVfeDoKKyAgICBlZGplX3NodXRkb3duKCk7CisjZW5kaWYKIGVycm9yX2VkamU6 CiAgICAgZWNvcmVfZXZhc19zaHV0ZG93bigpOwogZXJyb3JfZWNvcmVfZXZhczoKQEAgLTEyMSw2 ICsxMzYsMTAgQEAgaW50IGV3a19zaHV0ZG93bih2b2lkKQogICAgIGlmIChfZXdrSW5pdENvdW50 KQogICAgICAgICByZXR1cm4gX2V3a0luaXRDb3VudDsKIAorI2lmZGVmIEhBVkVfRUNPUkVfWAor ICAgIGVjb3JlX3hfc2h1dGRvd24oKTsKKyNlbmRpZgorICAgIGVkamVfc2h1dGRvd24oKTsKICAg ICBlY29yZV9ldmFzX3NodXRkb3duKCk7CiAgICAgZWNvcmVfc2h1dGRvd24oKTsKICAgICBldmFz X3NodXRkb3duKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3Vy Y2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZmE0YTg5OS4uYzBkNDA2OSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpA QCAtMSwzICsxLDE4IEBACisyMDEyLTEwLTAyICBDaHJpc3RvcGhlIER1bWV6ICA8Y2hyaXN0b3Bo ZS5kdW1lekBpbnRlbC5jb20+CisKKyAgICAgICAgW0VGTF0gRW5hYmxlIHVzZSBvZiBYMTEgaW4g RHVtcFJlbmRlclRyZWUgLyBXZWJLaXRUZXN0UnVubmVyCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05ODIzMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEluaXRpYWxpemUgZWNvcmVfeCBsaWJyYXJ5IGluIGV3 a19tYWluIGluc3RlYWQgb2YKKyAgICAgICAgV2ViS2l0VGVzdFJ1bm5lciBzaW5jZSBXZWJLaXQg aXMgdXNpbmcgZWNvcmVfeAorICAgICAgICBub3QgV2ViS2l0VGVzdFJ1bm5lciBpdHNlbGYuCisK KyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfbWFpbi5jcHA6CisgICAgICAgIChld2tf aW5pdCk6CisgICAgICAgIChld2tfc2h1dGRvd24pOgorCiAyMDEyLTEwLTAyICBKb29uZSBIdXIg IDxqb29uZS5odXJAaW50ZWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIEdUSyssRWZsIGRl YnVnIGJ1aWxkIGZpeCBhZnRlciByMTMwMjI1LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9lZmwvZXdrX21haW4uY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9lZmwvZXdrX21haW4uY3BwCmluZGV4IGZjYzlmYWYxLi41Njg4NmNjIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfbWFpbi5jcHAKKysrIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX21haW4uY3BwCkBAIC0zMSw2ICszMSwx MCBAQAogI2luY2x1ZGUgPGdsaWItb2JqZWN0Lmg+CiAjaW5jbHVkZSA8Z2xpYi5oPgogCisjaWZk ZWYgSEFWRV9FQ09SRV9YCisjaW5jbHVkZSA8RWNvcmVfWC5oPgorI2VuZGlmCisKIHN0YXRpYyBp bnQgX2V3a0luaXRDb3VudCA9IDA7CiAKIC8qKgpAQCAtNjgsNiArNzIsMTMgQEAgaW50IGV3a19p bml0KHZvaWQpCiAgICAgICAgIGdvdG8gZXJyb3JfZWNvcmVfZXZhczsKICAgICB9CiAKKyNpZmRl ZiBIQVZFX0VDT1JFX1gKKyAgICBpZiAoIWVjb3JlX3hfaW5pdCgwKSkgeworICAgICAgICBDUklU SUNBTCgiY291bGQgbm90IGluaXQgZWNvcmVfeC4iKTsKKyAgICAgICAgZ290byBlcnJvcl9lY29y ZV94OworICAgIH0KKyNlbmRpZgorCiAgICAgZ190eXBlX2luaXQoKTsKIAogICAgIGlmICghZWNv cmVfbWFpbl9sb29wX2dsaWJfaW50ZWdyYXRlKCkpIHsKQEAgLTc3LDYgKzg4LDEwIEBAIGludCBl d2tfaW5pdCh2b2lkKQogCiAgICAgcmV0dXJuICsrX2V3a0luaXRDb3VudDsKIAorI2lmZGVmIEhB VkVfRUNPUkVfWAorZXJyb3JfZWNvcmVfeDoKKyAgICBlZGplX3NodXRkb3duKCk7CisjZW5kaWYK IGVycm9yX2Vjb3JlX2V2YXM6CiAgICAgZWNvcmVfc2h1dGRvd24oKTsKIGVycm9yX2Vjb3JlOgpA QCAtOTUsNiArMTEwLDEwIEBAIGludCBld2tfc2h1dGRvd24odm9pZCkKICAgICBpZiAoLS1fZXdr SW5pdENvdW50KQogICAgICAgICByZXR1cm4gX2V3a0luaXRDb3VudDsKIAorI2lmZGVmIEhBVkVf RUNPUkVfWAorICAgIGVjb3JlX3hfc2h1dGRvd24oKTsKKyNlbmRpZgorICAgIGVkamVfc2h1dGRv d24oKTsKICAgICBlY29yZV9ldmFzX3NodXRkb3duKCk7CiAgICAgZWNvcmVfc2h1dGRvd24oKTsK ICAgICBldmFzX3NodXRkb3duKCk7CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29s cy9DaGFuZ2VMb2cKaW5kZXggYmM0ZDZmMC4uOWVlODU3NiAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hh bmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSArMSwyMiBAQAorMjAxMi0xMC0wMiAg Q2hyaXN0b3BoZSBEdW1leiAgPGNocmlzdG9waGUuZHVtZXpAaW50ZWwuY29tPgorCisgICAgICAg IFtFRkxdIEVuYWJsZSB1c2Ugb2YgWDExIGluIER1bXBSZW5kZXJUcmVlIC8gV2ViS2l0VGVzdFJ1 bm5lcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTgy MzEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBFbmFi bGUgdXNlIG9mIFgxMSBpbiBEdW1wUmVuZGVyVHJlZSAvIFdlYktpdFRlc3RSdW5uZXIuCisgICAg ICAgIENhbGwgZWNvcmVfZXZhc19uZXcoKSBpbnN0ZWFkIG9mIGVjb3JlX2V2YXNfYnVmZmVyX25l dygpCisgICAgICAgIGluIEVGTCdzIER1bXBSZW5kZXJUcmVlIGFuZCBXZWJLaXRUZXN0UnVubmVy LgorICAgICAgICBJdCBpcyBzYWZlIHRvIGRvIHRoaXMgbm93IHRoYXQgd2UgYXJlIHVzaW5nIFh2 ZmJEcml2ZXIKKyAgICAgICAgZm9yIHRoZSBsYXlvdXQgdGVzdHMuCisKKyAgICAgICAgKiBEdW1w UmVuZGVyVHJlZS9lZmwvRHVtcFJlbmRlclRyZWUuY3BwOgorICAgICAgICAocGFyc2VDb21tYW5k TGluZU9wdGlvbnMpOgorICAgICAgICAoaW5pdEVjb3JlRXZhcyk6CisgICAgICAgICogV2ViS2l0 VGVzdFJ1bm5lci9lZmwvUGxhdGZvcm1XZWJWaWV3RWZsLmNwcDoKKyAgICAgICAgKFdUUjo6aW5p dEVjb3JlRXZhcyk6CisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9lZmwvbWFpbi5jcHA6Cisg ICAgICAgIChtYWluKToKKwogPT0gUm9sbGVkIG92ZXIgdG8gQ2hhbmdlTG9nLTIwMTItMTAtMDIg PT0KZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2VmbC9EdW1wUmVuZGVyVHJlZS5j cHAgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9lZmwvRHVtcFJlbmRlclRyZWUuY3BwCmluZGV4IGMx ZTQ4MDEuLjY5YTQyMTEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2VmbC9EdW1w UmVuZGVyVHJlZS5jcHAKKysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvZWZsL0R1bXBSZW5kZXJU cmVlLmNwcApAQCAtNjgsNyArNjgsNiBAQCB2b2xhdGlsZSBib29sIGRvbmUgPSBmYWxzZTsKIHN0 YXRpYyBib29sIGR1bXBQaXhlbHNGb3JDdXJyZW50VGVzdDsKIHN0YXRpYyBpbnQgZHVtcFRyZWUg PSB0cnVlOwogc3RhdGljIGludCBwcmludFNlcGFyYXRvcnMgPSB0cnVlOwotc3RhdGljIGludCB1 c2VYMTFXaW5kb3cgPSBmYWxzZTsKIAogc3RhdGljIFN0cmluZyBkdW1wRnJhbWVzQXNUZXh0KEV2 YXNfT2JqZWN0KiBmcmFtZSkKIHsKQEAgLTE5NCw3ICsxOTMsNiBAQCBzdGF0aWMgYm9vbCBwYXJz ZUNvbW1hbmRMaW5lT3B0aW9ucyhpbnQgYXJnYywgY2hhcioqIGFyZ3YpCiAgICAgc3RhdGljIGNv bnN0IG9wdGlvbiBvcHRpb25zW10gPSB7CiAgICAgICAgIHsibm90cmVlIiwgbm9fYXJndW1lbnQs ICZkdW1wVHJlZSwgZmFsc2V9LAogICAgICAgICB7InRyZWUiLCBub19hcmd1bWVudCwgJmR1bXBU cmVlLCB0cnVlfSwKLSAgICAgICAgeyJndWkiLCBub19hcmd1bWVudCwgJnVzZVgxMVdpbmRvdywg dHJ1ZX0sCiAgICAgICAgIHswLCAwLCAwLCAwfQogICAgIH07CiAKQEAgLTQyMCw3ICs0MTgsNyBA QCB2b2lkIGR1bXAoKQogCiBzdGF0aWMgRWNvcmVfRXZhcyogaW5pdEVjb3JlRXZhcygpCiB7Ci0g ICAgRWNvcmVfRXZhcyogZWNvcmVFdmFzID0gdXNlWDExV2luZG93ID8gZWNvcmVfZXZhc19uZXco MCwgMCwgMCwgODAwLCA2MDAsIDApIDogZWNvcmVfZXZhc19idWZmZXJfbmV3KDgwMCwgNjAwKTsK KyAgICBFY29yZV9FdmFzKiBlY29yZUV2YXMgPSBlY29yZV9ldmFzX25ldygwLCAwLCAwLCA4MDAs IDYwMCwgMCk7CiAgICAgaWYgKCFlY29yZUV2YXMpIHsKICAgICAgICAgc2h1dGRvd25FZmwoKTsK ICAgICAgICAgZXhpdChFWElUX0ZBSUxVUkUpOwpkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVz dFJ1bm5lci9lZmwvUGxhdGZvcm1XZWJWaWV3RWZsLmNwcCBiL1Rvb2xzL1dlYktpdFRlc3RSdW5u ZXIvZWZsL1BsYXRmb3JtV2ViVmlld0VmbC5jcHAKaW5kZXggMGJkYjIzNi4uZjQzMDBkYyAxMDA2 NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9lZmwvUGxhdGZvcm1XZWJWaWV3RWZsLmNw cAorKysgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL2VmbC9QbGF0Zm9ybVdlYlZpZXdFZmwuY3Bw CkBAIC0yOCwxMSArMjgsOSBAQCB1c2luZyBuYW1lc3BhY2UgV2ViS2l0OwogCiBuYW1lc3BhY2Ug V1RSIHsKIAotc3RhdGljIGJvb2wgdXNlWDExV2luZG93ID0gZmFsc2U7Ci0KIHN0YXRpYyBFY29y ZV9FdmFzKiBpbml0RWNvcmVFdmFzKCkKIHsKLSAgICBFY29yZV9FdmFzKiBlY29yZUV2YXMgPSB1 c2VYMTFXaW5kb3cgPyBlY29yZV9ldmFzX25ldygwLCAwLCAwLCA4MDAsIDYwMCwgMCkgOiBlY29y ZV9ldmFzX2J1ZmZlcl9uZXcoODAwLCA2MDApOworICAgIEVjb3JlX0V2YXMqIGVjb3JlRXZhcyA9 IGVjb3JlX2V2YXNfbmV3KDAsIDAsIDAsIDgwMCwgNjAwLCAwKTsKICAgICBpZiAoIWVjb3JlRXZh cykKICAgICAgICAgcmV0dXJuIDA7CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRlc3RSdW5u ZXIvZWZsL21haW4uY3BwIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9lZmwvbWFpbi5jcHAKaW5k ZXggOThiY2RlMi4uNzBiMmE0NCAxMDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9l ZmwvbWFpbi5jcHAKKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9lZmwvbWFpbi5jcHAKQEAg LTI0LDEwICsyNCw2IEBACiAjaW5jbHVkZSA8d3RmL0Fzc2VydGlvbnMuaD4KICNpbmNsdWRlIDxz dGRsaWIuaD4KIAotI2lmZGVmIEhBVkVfRUNPUkVfWAotI2luY2x1ZGUgPEVjb3JlX1guaD4KLSNl bmRpZgotCiBpbnQgbWFpbihpbnQgYXJnYywgY2hhcioqIGFyZ3YpCiB7CiAgICAgV1RGSW5zdGFs bFJlcG9ydEJhY2t0cmFjZU9uQ3Jhc2hIb29rKCk7CkBAIC0zNSwyNiArMzEsOSBAQCBpbnQgbWFp bihpbnQgYXJnYywgY2hhcioqIGFyZ3YpCiAgICAgaWYgKCFld2tfaW5pdCgpKQogICAgICAgICBy ZXR1cm4gMTsKIAotI2lmZGVmIEhBVkVfRUNPUkVfWAotICAgIGNvbnN0IGNoYXIqIGRpc3BsYXkg PSBnZXRlbnYoIkRJU1BMQVkiKTsKLSAgICBpbnQgaW50aWFsaXplZCA9IDA7Ci0gICAgaWYgKGRp c3BsYXkpIHsKLSAgICAgICAgaW50aWFsaXplZCA9IGVjb3JlX3hfaW5pdCgwKTsKLSAgICAgICAg aWYgKCFpbnRpYWxpemVkKSB7Ci0gICAgICAgICAgICBld2tfc2h1dGRvd24oKTsKLSAgICAgICAg ICAgIHJldHVybiAxOwotICAgICAgICB9Ci0gICAgfQotI2VuZGlmCi0KICAgICAvLyBQcmVmZXIg dGhlIG5vdCBpbnN0YWxsZWQgd2ViIGFuZCBwbHVnaW4gcHJvY2Vzc2VzLgogICAgIFdUUjo6VGVz dENvbnRyb2xsZXIgY29udHJvbGxlcihhcmdjLCBjb25zdF9jYXN0PGNvbnN0IGNoYXIqKj4oYXJn dikpOwogCi0jaWZkZWYgSEFWRV9FQ09SRV9YCi0gICAgaWYgKGludGlhbGl6ZWQpCi0gICAgICAg IGVjb3JlX3hfc2h1dGRvd24oKTsKLSNlbmRpZgotCiAgICAgZXdrX3NodXRkb3duKCk7CiAKICAg ICByZXR1cm4gMDsK