221771 2021-02-11 12:33:27 -0800 [GTK][WPE] Signal "window-object-cleared" not emitted unless frame js context is get before 2021-06-07 01:22:17 -0700 1 1 1 Unclassified WebKit WebKit API WebKit Local Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 aperez webkit-unassigned berto cgarcia ews-watchlist gustavo mcatanzaro psaavedra webkit-bug-importer oldest_to_newest 1728237 0 420028 aperez 2021-02-11 12:33:27 -0800 Created attachment 420028 Example web process extension source Using a custom WebKitScriptWorld in a web process extension never triggers the “window-object-cleared” signal. This can be verified with a simple web process extension like the attached one (“ext.c”). To reproduce the issue: 1. Build the example extension: $CC -shared -o libext.so ext.c \ $(pkg-config --libs --cflags wpe-web-extension-1.0) 2. The run Cog passing the path to the directory containing the built “libext.so” file: cog -P fdo --web-extensions-dir="$(pwd)" ddg.gg The expected (correct) output should include the following two lines: ** Message: 19:17:26.517: --> on_window_object_cleared ** Message: 19:17:26.517: <-- on_window_object_cleared Building the extension with “-DHACK_FOR_CUSTOM_SCRIPT_WORLD” will use a workaround that GNOME Web is currently using, see: https://gitlab.gnome.org/GNOME/epiphany/-/blob/8f833666c384a9c9f5d376ff15595e8bbece90a3/embed/web-process-extension/ephy-web-process-extension.c#L234 Current trunk and stable versions of WebKit (2.30.x, both GTK and WPE ports) do *not* need the workaround when using the default WebKitScriptWorld. 1766748 1 cgarcia 2021-06-04 06:57:02 -0700 This is happening for default script world too. 1766749 2 430573 cgarcia 2021-06-04 07:03:20 -0700 Created attachment 430573 Patch 1766750 3 ews-watchlist 2021-06-04 07:04:10 -0700 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See https://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1767342 4 cgarcia 2021-06-07 01:21:13 -0700 Committed r278548 (238546@main): <https://commits.webkit.org/238546@main> 1767344 5 webkit-bug-importer 2021-06-07 01:22:17 -0700 <rdar://problem/78938532> 420028 2021-02-11 12:33:27 -0800 2021-02-11 12:33:27 -0800 Example web process extension source ext.c text/x-csrc 2047 aperez LyoKICogQnVpbGQgd2l0aDoKICoKICogICAkQ0MgLXNoYXJlZCAtbyBsaWJleHQuc28gZXh0LmMg JChwa2ctY29uZmlnIC0tbGlicyAtLWNmbGFncyB3cGUtd2ViLWV4dGVuc2lvbi0xLjApCiAqIAog KiBUaGUgcnVuIENvZyBwYXNzaW5nIHRoZSBwYXRoIHRvIHRoZSBkaXJlY3RvcnkgY29udGFpbmlu ZyBsaWJleHQuc286CiAqCiAqICAgY29nIC1QIGZkbyAtLXdlYi1leHRlbnNpb25zLWRpcj0iJChw d2QpIiBkZGcuZ2cKICovCgojaWZkZWYgVVNFX1dFQktJVEdUSwojIGluY2x1ZGUgPHdlYmtpdDIv d2Via2l0LXdlYi1leHRlbnNpb24uaD4KI2Vsc2UKIyBpbmNsdWRlIDx3cGUvd2Via2l0LXdlYi1l eHRlbnNpb24uaD4KI2VuZGlmCgojaW5jbHVkZSA8anNjL2pzYy5oPgoKCnN0YXRpYyB2b2lkCm9u X3dpbmRvd19vYmplY3RfY2xlYXJlZCAoV2ViS2l0U2NyaXB0V29ybGQgKndvcmxkLAogICAgICAg ICAgICAgICAgICAgICAgICAgIFdlYktpdFdlYlBhZ2UgKndlYl9wYWdlLAogICAgICAgICAgICAg ICAgICAgICAgICAgIFdlYktpdEZyYW1lICpmcmFtZSkKewogICAgZ19tZXNzYWdlKCItLT4gJXMi LCBHX1NUUkZVTkMpOwoKI2lmIEhBQ0tfRk9SX0NVU1RPTV9TQ1JJUFRfV09STEQKICAgIC8qCiAg ICAgKiBCYXNlZCBvbiBhIHNuaXBwZXQgb2YgY29kZSBzZWVuIGluIHRoZSBFcGlwaGFueSBzb3Vy Y2UgY29kZToKICAgICAqIGh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9lcGlwaGFueS8t L2Jsb2IvOGY4MzM2NjZjMzg0YTljOWY1ZDM3NmZmMTU1OTVlOGJiZWNlOTBhMy9lbWJlZC93ZWIt cHJvY2Vzcy1leHRlbnNpb24vZXBoeS13ZWItcHJvY2Vzcy1leHRlbnNpb24uYyNMMjM0CiAgICAg Ki8KICAgIGdfYXV0b3B0cihKU0NDb250ZXh0KSBjb250ZXh0ID0KICAgICAgICB3ZWJraXRfZnJh bWVfZ2V0X2pzX2NvbnRleHRfZm9yX3NjcmlwdF93b3JsZChmcmFtZSwgd29ybGQpOwogICAgKHZv aWQpIGNvbnRleHQ7CiNlbmRpZgoKICAgIGdfbWVzc2FnZSgiPC0tICVzIiwgR19TVFJGVU5DKTsK fQoKCnN0YXRpYyB2b2lkCm9uX3BhZ2VfY3JlYXRlZCAoV2ViS2l0V2ViRXh0ZW5zaW9uICpleHRl bnNpb24sCiAgICAgICAgICAgICAgICAgV2ViS2l0V2ViUGFnZSAqd2ViX3BhZ2UsCiAgICAgICAg ICAgICAgICAgV2ViS2l0U2NyaXB0V29ybGQgKndvcmxkKQp7CiAgICBnX21lc3NhZ2UoIi0tPiAl cyIsIEdfU1RSRlVOQyk7CgogICAgZ19hdXRvcHRyKEpTQ0NvbnRleHQpIGNvbnRleHQgPQogICAg ICAgIHdlYmtpdF9mcmFtZV9nZXRfanNfY29udGV4dF9mb3Jfc2NyaXB0X3dvcmxkKHdlYmtpdF93 ZWJfcGFnZV9nZXRfbWFpbl9mcmFtZSh3ZWJfcGFnZSksIHdvcmxkKTsKICAgICh2b2lkKSBjb250 ZXh0OwoKICAgIGdfbWVzc2FnZSgiPC0tICVzIiwgR19TVFJGVU5DKTsKfQoKCkdfTU9EVUxFX0VY UE9SVAp2b2lkCndlYmtpdF93ZWJfZXh0ZW5zaW9uX2luaXRpYWxpemVfd2l0aF91c2VyX2RhdGEg KFdlYktpdFdlYkV4dGVuc2lvbiAqZXh0ZW5zaW9uLAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBHVmFyaWFudCAqdXNlcl9kYXRhKQp7CiAgICBn X21lc3NhZ2UoIi0tPiAlcyIsIEdfU1RSRlVOQyk7CgogICAgLyoKICAgICAqIFJlcGxhY2luZyB3 aXRoIHdlYmtpdF9zY3JpcHRfd29ybGRfZ2V0X2RlZmF1bHQoKSBkb2VzIG5vdCBuZWVkIHRoZSBo YWNrIGFib3ZlLgogICAgICovCiAgICBXZWJLaXRTY3JpcHRXb3JsZCAqd29ybGQgPSB3ZWJraXRf c2NyaXB0X3dvcmxkX25ld193aXRoX25hbWUoInRlc3QiKTsKCiAgICBnX3NpZ25hbF9jb25uZWN0 KHdvcmxkLCAid2luZG93LW9iamVjdC1jbGVhcmVkIiwKICAgICAgICAgICAgICAgICAgICAgR19D QUxMQkFDSyhvbl93aW5kb3dfb2JqZWN0X2NsZWFyZWQpLCBOVUxMKTsKCiAgICBnX3NpZ25hbF9j b25uZWN0KGV4dGVuc2lvbiwgInBhZ2UtY3JlYXRlZCIsIEdfQ0FMTEJBQ0sob25fcGFnZV9jcmVh dGVkKSwgd29ybGQpOwogICAgZ19tZXNzYWdlKCI8LS0gJXMiLCBHX1NUUkZVTkMpOwp9Cg== 430573 2021-06-04 07:03:20 -0700 2021-06-04 07:23:07 -0700 Patch wk-window-object-cleared.diff text/plain 12866 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggYTMzMzY2NGI2Mjc4Li5lOWE5ZTM5OTUzYWIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMTcgQEAKKzIwMjEtMDYtMDQgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2Fs aWEuY29tPgorCisgICAgICAgIFtHVEtdW1dQRV0gU2lnbmFsICJ3aW5kb3ctb2JqZWN0LWNsZWFy ZWQiIG5vdCBlbWl0dGVkIHVubGVzcyBmcmFtZSBqcyBjb250ZXh0IGlzIGdldCBiZWZvcmUKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMTc3MQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgaXMgYmVj YXVzZSB3aGVuIEZyYW1lTG9hZGVyOjpkaXNwYXRjaERpZENsZWFyV2luZG93T2JqZWN0SW5Xb3Js ZCgpIGlzIGNhbGxlZCwgdGhlIEpTV2luZG93UHJveHkgZm9yIHRoZQorICAgICAgICB3b3JsZCBo YXNuJ3QgYmVlbiBjcmVhdGVkIHlldCwgc28gaXQgcmV0dXJucyBlYXJseS4gQnV0IHdlIHdhbnQg dG8gZGlzcGF0Y2ggaXQgYWx3YXlzIGZvciB3b3JsZHMgY3JlYXRlZCBieSB0aGUKKyAgICAgICAg QVBJLCB0byBlbnN1cmUgdGhhdCBXZWJLaXRTY3JpcHRXb3JsZDo6d2luZG93LW9iamVjdC1jbGVh cmVkIGlzIGVtbWl0dGVkLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9B UEkvZ2xpYi9XZWJLaXRXZWJQYWdlLmNwcDogSW1wbGVtZW50IGdsb2JhbE9iamVjdElzQXZhaWxh YmxlRm9yRnJhbWUoKSB0byBmb3JjZSB0aGUKKyAgICAgICAgY3JlYXRpb24gb2YgdGhlIEphdmFT Y3JpcHQgY29udGV4dCBmb3IgZXhpc3RpbmcgV2ViS2l0U2NyaXB0V29ybGRzLgorCiAyMDIxLTA2 LTAzICBTaWh1aSBMaXUgIDxzaWh1aV9saXVAYXBwbGUuY29tPgogCiAgICAgICAgIE1ha2UgV2Vi SURCU2VydmVyIHVzZSBXb3JrUXVldWUgaW5zdGVhZCBvZiBUaHJlYWQKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvZ2xpYi9XZWJLaXRXZWJQ YWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvZ2xp Yi9XZWJLaXRXZWJQYWdlLmNwcAppbmRleCAxOGIwNjQzYjMzMTIuLmZjZTYxMWZhYTlkYSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9nbGli L1dlYktpdFdlYlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9JbmplY3Rl ZEJ1bmRsZS9BUEkvZ2xpYi9XZWJLaXRXZWJQYWdlLmNwcApAQCAtMjE4LDYgKzIxOCwxNSBAQCBw cml2YXRlOgogICAgICAgICAgICAgd2Via2l0U2NyaXB0V29ybGRXaW5kb3dPYmplY3RDbGVhcmVk KHdrV29ybGQsIG1fd2ViUGFnZSwgd2Via2l0RnJhbWVHZXRPckNyZWF0ZSgmZnJhbWUpKTsKICAg ICB9CiAKKyAgICB2b2lkIGdsb2JhbE9iamVjdElzQXZhaWxhYmxlRm9yRnJhbWUoV2ViUGFnZSYs IFdlYkZyYW1lJiBmcmFtZSwgRE9NV3JhcHBlcldvcmxkJiB3b3JsZCkgb3ZlcnJpZGUKKyAgICB7 CisgICAgICAgIC8vIEZvcmNlIHRoZSBjcmVhdGlvbiBvZiB0aGUgSmF2YVNjcmlwdCBjb250ZXh0 IGZvciBleGlzdGluZyBXZWJLaXRTY3JpcHRXb3JsZHMgdG8KKyAgICAgICAgLy8gZW5zdXJlIFdl YktpdFNjcmlwdFdvcmxkOjp3aW5kb3ctb2JqZWN0LWNsZWFyZWQgc2lnbmFsIGlzIGVtaXR0ZWQu CisgICAgICAgIGF1dG8gaW5qZWN0ZWRXb3JsZCA9IEluamVjdGVkQnVuZGxlU2NyaXB0V29ybGQ6 OmdldE9yQ3JlYXRlKHdvcmxkKTsKKyAgICAgICAgaWYgKHdlYmtpdFNjcmlwdFdvcmxkR2V0KGlu amVjdGVkV29ybGQucHRyKCkpKQorICAgICAgICAgICAgZnJhbWUuanNDb250ZXh0Rm9yV29ybGQo aW5qZWN0ZWRXb3JsZC5wdHIoKSk7CisgICAgfQorCiAgICAgV2ViS2l0V2ViUGFnZSogbV93ZWJQ YWdlOwogfTsKIApkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9n CmluZGV4IDU4OTkxYTdjZjA0My4uMDdhOTI0NDdiOGIzIDEwMDY0NAotLS0gYS9Ub29scy9DaGFu Z2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMjEtMDYtMDQg IENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisgICAgICAgIFtH VEtdW1dQRV0gU2lnbmFsICJ3aW5kb3ctb2JqZWN0LWNsZWFyZWQiIG5vdCBlbWl0dGVkIHVubGVz cyBmcmFtZSBqcyBjb250ZXh0IGlzIGdldCBiZWZvcmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMTc3MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFVwZGF0ZSB3aW5kb3ctb2JqZWN0LWNsZWFyZWQgdGVz dCB0byBjaGVjayB0aGF0IHRoZSBzaWduYWwgaXMgZW1pdHRlZCBmb3IgdGhlIFdlYktpdFNjcmlw dFdvcmxkIG9iamVjdHMgY3JlYXRlZAorICAgICAgICBieSB0aGUgZXh0ZW5zaW9uLgorCisgICAg ICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRHTGliL1Rlc3RXZWJFeHRlbnNpb25zLmNw cDoKKyAgICAgICAgKFVzZXJNZXNzYWdlVGVzdDo6c2VuZE1lc3NhZ2UpOgorICAgICAgICAoVXNl ck1lc3NhZ2VUZXN0Ojp2aWV3VXNlck1lc3NhZ2VSZWNlaXZlZCk6CisgICAgICAgIChVc2VyTWVz c2FnZVRlc3Q6OndhaXRVbnRpbFZpZXdNZXNzYWdlc1JlY2VpdmVkKToKKyAgICAgICAgKFVzZXJN ZXNzYWdlVGVzdDo6d2FpdFVudGlsVmlld01lc3NhZ2VSZWNlaXZlZCk6CisgICAgICAgICh0ZXN0 V2ViRXh0ZW5zaW9uV2luZG93T2JqZWN0Q2xlYXJlZCk6CisgICAgICAgIChiZWZvcmVBbGwpOgor ICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0R0xpYi9XZWJFeHRlbnNpb25UZXN0 LmNwcDoKKyAgICAgICAgKHdpbmRvd09iamVjdENsZWFyZWQpOgorICAgICAgICAoaXNvbGF0ZWRX b3JsZFdpbmRvd09iamVjdENsZWFyZWQpOgorICAgICAgICAod2Via2l0X3dlYl9leHRlbnNpb25f aW5pdGlhbGl6ZV93aXRoX3VzZXJfZGF0YSk6CisKIDIwMjEtMDYtMDQgIENhcmxvcyBHYXJjaWEg Q2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtdIE1pbmlCcm93c2Vy OiBhZGQgc3VwcG9ydCBmb3Igc2F2aW5nIG11bHRpcGxlIHRhYnMgaW4gc2Vzc2lvbiBzdGF0ZQpk aWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRHTGliL1Rlc3RXZWJF eHRlbnNpb25zLmNwcCBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0R0xpYi9UZXN0 V2ViRXh0ZW5zaW9ucy5jcHAKaW5kZXggZmEyZjA0YzQwZGY5Li5kODA3NjFlNTgwMmIgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0R0xpYi9UZXN0V2ViRXh0ZW5z aW9ucy5jcHAKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRHTGliL1Rlc3RX ZWJFeHRlbnNpb25zLmNwcApAQCAtMTY1LDI2ICsxNjUsNiBAQCBzdGF0aWMgdm9pZCB0ZXN0V2Vi S2l0V2ViVmlld1Byb2Nlc3NDcmFzaGVkKFdlYlZpZXdUZXN0KiB0ZXN0LCBnY29uc3Rwb2ludGVy KQogICAgIHRlc3QtPm1fZXhwZWN0ZWRXZWJQcm9jZXNzQ3Jhc2ggPSBmYWxzZTsKIH0KIAotc3Rh dGljIHZvaWQgdGVzdFdlYkV4dGVuc2lvbldpbmRvd09iamVjdENsZWFyZWQoV2ViVmlld1Rlc3Qq IHRlc3QsIGdjb25zdHBvaW50ZXIpCi17Ci0gICAgdGVzdC0+bG9hZEh0bWwoIjxodG1sPjxoZWFk ZXI+PC9oZWFkZXI+PGJvZHk+PC9ib2R5PjwvaHRtbD4iLCAwKTsKLSAgICB0ZXN0LT53YWl0VW50 aWxMb2FkRmluaXNoZWQoKTsKLQotICAgIEdVbmlxdWVPdXRQdHI8R0Vycm9yPiBlcnJvcjsKLSAg ICBXZWJLaXRKYXZhc2NyaXB0UmVzdWx0KiBqYXZhc2NyaXB0UmVzdWx0ID0gdGVzdC0+cnVuSmF2 YVNjcmlwdEFuZFdhaXRVbnRpbEZpbmlzaGVkKCJ3aW5kb3cuZWNobygnRm9vJyk7IiwgJmVycm9y Lm91dFB0cigpKTsKLSAgICBnX2Fzc2VydF9ub25udWxsKGphdmFzY3JpcHRSZXN1bHQpOwotICAg IGdfYXNzZXJ0X25vX2Vycm9yKGVycm9yLmdldCgpKTsKLSAgICBHVW5pcXVlUHRyPGNoYXI+IHZh bHVlU3RyaW5nKFdlYlZpZXdUZXN0OjpqYXZhc2NyaXB0UmVzdWx0VG9DU3RyaW5nKGphdmFzY3Jp cHRSZXN1bHQpKTsKLSAgICBnX2Fzc2VydF9jbXBzdHIodmFsdWVTdHJpbmcuZ2V0KCksID09LCAi Rm9vIik7Ci0KLSAgICBqYXZhc2NyaXB0UmVzdWx0ID0gdGVzdC0+cnVuSmF2YVNjcmlwdEFuZFdh aXRVbnRpbEZpbmlzaGVkKCJ2YXIgZiA9IG5ldyBHRmlsZSgnLicpOyBmLnBhdGgoKTsiLCAmZXJy b3Iub3V0UHRyKCkpOwotICAgIGdfYXNzZXJ0X25vbm51bGwoamF2YXNjcmlwdFJlc3VsdCk7Ci0g ICAgZ19hc3NlcnRfbm9fZXJyb3IoZXJyb3IuZ2V0KCkpOwotICAgIHZhbHVlU3RyaW5nLnJlc2V0 KFdlYlZpZXdUZXN0OjpqYXZhc2NyaXB0UmVzdWx0VG9DU3RyaW5nKGphdmFzY3JpcHRSZXN1bHQp KTsKLSAgICBHVW5pcXVlUHRyPGNoYXI+IGN1cnJlbnREaXJlY3RvcnkoZ19nZXRfY3VycmVudF9k aXIoKSk7Ci0gICAgZ19hc3NlcnRfY21wc3RyKHZhbHVlU3RyaW5nLmdldCgpLCA9PSwgY3VycmVu dERpcmVjdG9yeS5nZXQoKSk7Ci19Ci0KIHN0YXRpYyBnYm9vbGVhbiBzY3JpcHREaWFsb2dDYWxs YmFjayhXZWJLaXRXZWJWaWV3KiwgV2ViS2l0U2NyaXB0RGlhbG9nKiBkaWFsb2csIGdwb2ludGVy KQogewogICAgIGdfYXNzZXJ0X2NtcHVpbnQod2Via2l0X3NjcmlwdF9kaWFsb2dfZ2V0X2RpYWxv Z190eXBlKGRpYWxvZyksID09LCBXRUJLSVRfU0NSSVBUX0RJQUxPR19BTEVSVCk7CkBAIC01Njcs MTIgKzU0NywxMiBAQCBwdWJsaWM6CiAgICAgV2ViS2l0VXNlck1lc3NhZ2UqIHNlbmRNZXNzYWdl KFdlYktpdFVzZXJNZXNzYWdlKiBtZXNzYWdlLCBHRXJyb3IqKiBlcnJvciA9IG51bGxwdHIpCiAg ICAgewogICAgICAgICBhc3NlcnRPYmplY3RJc0RlbGV0ZWRXaGVuVGVzdEZpbmlzaGVzKEdfT0JK RUNUKG1lc3NhZ2UpKTsKLSAgICAgICAgbV9yZWNlaXZlZFZpZXdNZXNzYWdlID0gbnVsbHB0cjsK KyAgICAgICAgbV9yZWNlaXZlZFZpZXdNZXNzYWdlcyA9IHsgfTsKICAgICAgICAgd2Via2l0X3dl Yl92aWV3X3NlbmRfbWVzc2FnZV90b19wYWdlKG1fd2ViVmlldywgbWVzc2FnZSwgbnVsbHB0ciwg W10oR09iamVjdCosIEdBc3luY1Jlc3VsdCogcmVzdWx0LCBncG9pbnRlciB1c2VyRGF0YSkgewog ICAgICAgICAgICAgYXV0byogdGVzdCA9IHN0YXRpY19jYXN0PFVzZXJNZXNzYWdlVGVzdCo+KHVz ZXJEYXRhKTsKLSAgICAgICAgICAgIHRlc3QtPm1fcmVjZWl2ZWRWaWV3TWVzc2FnZSA9IGFkb3B0 R1JlZih3ZWJraXRfd2ViX3ZpZXdfc2VuZF9tZXNzYWdlX3RvX3BhZ2VfZmluaXNoKHRlc3QtPm1f d2ViVmlldywgcmVzdWx0LCAmdGVzdC0+bV9yZWNlaXZlZEVycm9yLm91dFB0cigpKSk7Ci0gICAg ICAgICAgICBpZiAodGVzdC0+bV9yZWNlaXZlZFZpZXdNZXNzYWdlKQotICAgICAgICAgICAgICAg IHRlc3QtPmFzc2VydE9iamVjdElzRGVsZXRlZFdoZW5UZXN0RmluaXNoZXMoR19PQkpFQ1QodGVz dC0+bV9yZWNlaXZlZFZpZXdNZXNzYWdlLmdldCgpKSk7CisgICAgICAgICAgICB0ZXN0LT5tX3Jl Y2VpdmVkVmlld01lc3NhZ2VzLmFwcGVuZChhZG9wdEdSZWYod2Via2l0X3dlYl92aWV3X3NlbmRf bWVzc2FnZV90b19wYWdlX2ZpbmlzaCh0ZXN0LT5tX3dlYlZpZXcsIHJlc3VsdCwgJnRlc3QtPm1f cmVjZWl2ZWRFcnJvci5vdXRQdHIoKSkpKTsKKyAgICAgICAgICAgIGlmIChhdXRvIHJlY2VpdmVk TWVzc2FnZSA9IHRlc3QtPm1fcmVjZWl2ZWRWaWV3TWVzc2FnZXMuZmlyc3QoKSkKKyAgICAgICAg ICAgICAgICB0ZXN0LT5hc3NlcnRPYmplY3RJc0RlbGV0ZWRXaGVuVGVzdEZpbmlzaGVzKEdfT0JK RUNUKHJlY2VpdmVkTWVzc2FnZS5nZXQoKSkpOwogICAgICAgICAgICAgZWxzZQogICAgICAgICAg ICAgICAgIGdfYXNzZXJ0X25vbm51bGwodGVzdC0+bV9yZWNlaXZlZEVycm9yLmdldCgpKTsKICAg ICAgICAgICAgIHRlc3QtPnF1aXRNYWluTG9vcCgpOwpAQCAtNTgwLDcgKzU2MCw3IEBAIHB1Ymxp YzoKICAgICAgICAgZ19tYWluX2xvb3BfcnVuKG1fbWFpbkxvb3ApOwogICAgICAgICBpZiAoZXJy b3IpCiAgICAgICAgICAgICAqZXJyb3IgPSBtX3JlY2VpdmVkRXJyb3IuZ2V0KCk7Ci0gICAgICAg IHJldHVybiBtX3JlY2VpdmVkVmlld01lc3NhZ2UuZ2V0KCk7CisgICAgICAgIHJldHVybiBtX3Jl Y2VpdmVkVmlld01lc3NhZ2VzLmZpcnN0KCkuZ2V0KCk7CiAgICAgfQogCiAgICAgdm9pZCBzZW5k TWVzc2FnZVRvQWxsRXh0ZW5zaW9ucyhXZWJLaXRVc2VyTWVzc2FnZSogbWVzc2FnZSkKQEAgLTU5 MiwxMyArNTcyLDE1IEBAIHB1YmxpYzoKICAgICBib29sIHZpZXdVc2VyTWVzc2FnZVJlY2VpdmVk KFdlYktpdFVzZXJNZXNzYWdlKiBtZXNzYWdlKQogICAgIHsKICAgICAgICAgYXNzZXJ0T2JqZWN0 SXNEZWxldGVkV2hlblRlc3RGaW5pc2hlcyhHX09CSkVDVChtZXNzYWdlKSk7Ci0gICAgICAgIGlm ICghZ19zdHJjbXAwKG1fZXhwZWN0ZWRWaWV3TWVzc2FnZU5hbWUuZGF0YSgpLCB3ZWJraXRfdXNl cl9tZXNzYWdlX2dldF9uYW1lKG1lc3NhZ2UpKSkgewotICAgICAgICAgICAgbV9yZWNlaXZlZFZp ZXdNZXNzYWdlID0gbWVzc2FnZTsKLSAgICAgICAgICAgIHF1aXRNYWluTG9vcCgpOworICAgICAg ICBpZiAobV9leHBlY3RlZFZpZXdNZXNzYWdlTmFtZXMuaXNFbXB0eSgpKQorICAgICAgICAgICAg cmV0dXJuIGZhbHNlOwogCisgICAgICAgIGlmIChtX2V4cGVjdGVkVmlld01lc3NhZ2VOYW1lcy5j b250YWlucyh3ZWJraXRfdXNlcl9tZXNzYWdlX2dldF9uYW1lKG1lc3NhZ2UpKSkgeworICAgICAg ICAgICAgbV9yZWNlaXZlZFZpZXdNZXNzYWdlcy5hcHBlbmQobWVzc2FnZSk7CisgICAgICAgICAg ICBpZiAobV9yZWNlaXZlZFZpZXdNZXNzYWdlcy5zaXplKCkgPT0gbV9leHBlY3RlZFZpZXdNZXNz YWdlTmFtZXMuc2l6ZSgpKQorICAgICAgICAgICAgICAgIHF1aXRNYWluTG9vcCgpOwogICAgICAg ICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgIH0KLQogICAgICAgICByZXR1cm4gZmFsc2U7CiAg ICAgfQogCkBAIC02MTUsMTIgKzU5NywxOCBAQCBwdWJsaWM6CiAgICAgICAgIHJldHVybiBmYWxz ZTsKICAgICB9CiAKLSAgICBXZWJLaXRVc2VyTWVzc2FnZSogd2FpdFVudGlsVmlld01lc3NhZ2VS ZWNlaXZlZChjb25zdCBjaGFyKiBtZXNzYWdlTmFtZSkKKyAgICBjb25zdCBWZWN0b3I8R1JlZlB0 cjxXZWJLaXRVc2VyTWVzc2FnZT4+JiB3YWl0VW50aWxWaWV3TWVzc2FnZXNSZWNlaXZlZChWZWN0 b3I8Q1N0cmluZz4mJiBtZXNzYWdlTmFtZXMpCiAgICAgewotICAgICAgICBtX2V4cGVjdGVkVmll d01lc3NhZ2VOYW1lID0gbWVzc2FnZU5hbWU7CisgICAgICAgIG1fZXhwZWN0ZWRWaWV3TWVzc2Fn ZU5hbWVzID0gV1RGTW92ZShtZXNzYWdlTmFtZXMpOworICAgICAgICBtX3JlY2VpdmVkVmlld01l c3NhZ2VzID0geyB9OwogICAgICAgICBnX21haW5fbG9vcF9ydW4obV9tYWluTG9vcCk7Ci0gICAg ICAgIG1fZXhwZWN0ZWRWaWV3TWVzc2FnZU5hbWUgPSB7IH07Ci0gICAgICAgIHJldHVybiBtX3Jl Y2VpdmVkVmlld01lc3NhZ2UuZ2V0KCk7CisgICAgICAgIG1fZXhwZWN0ZWRWaWV3TWVzc2FnZU5h bWVzID0geyB9OworICAgICAgICByZXR1cm4gbV9yZWNlaXZlZFZpZXdNZXNzYWdlczsKKyAgICB9 CisKKyAgICBXZWJLaXRVc2VyTWVzc2FnZSogd2FpdFVudGlsVmlld01lc3NhZ2VSZWNlaXZlZChj b25zdCBjaGFyKiBtZXNzYWdlTmFtZSkKKyAgICB7CisgICAgICAgIHJldHVybiB3YWl0VW50aWxW aWV3TWVzc2FnZXNSZWNlaXZlZCh7IG1lc3NhZ2VOYW1lIH0pLmZpcnN0KCkuZ2V0KCk7CiAgICAg fQogCiAgICAgV2ViS2l0VXNlck1lc3NhZ2UqIHdhaXRVbnRpbENvbnRleHRNZXNzYWdlUmVjZWl2 ZWQoY29uc3QgY2hhciogbWVzc2FnZU5hbWUpCkBAIC02MzEsOSArNjE5LDEwIEBAIHB1YmxpYzoK ICAgICAgICAgcmV0dXJuIG1fcmVjZWl2ZWRDb250ZXh0TWVzc2FnZS5nZXQoKTsKICAgICB9CiAK LSAgICBHUmVmUHRyPFdlYktpdFVzZXJNZXNzYWdlPiBtX3JlY2VpdmVkVmlld01lc3NhZ2U7Cisg ICAgVmVjdG9yPEdSZWZQdHI8V2ViS2l0VXNlck1lc3NhZ2U+PiBtX3JlY2VpdmVkVmlld01lc3Nh Z2VzOwogICAgIEdSZWZQdHI8V2ViS2l0VXNlck1lc3NhZ2U+IG1fcmVjZWl2ZWRDb250ZXh0TWVz c2FnZTsKICAgICBHVW5pcXVlT3V0UHRyPEdFcnJvcj4gbV9yZWNlaXZlZEVycm9yOworICAgIFZl Y3RvcjxDU3RyaW5nPiBtX2V4cGVjdGVkVmlld01lc3NhZ2VOYW1lczsKICAgICBDU3RyaW5nIG1f ZXhwZWN0ZWRWaWV3TWVzc2FnZU5hbWU7CiAgICAgQ1N0cmluZyBtX2V4cGVjdGVkQ29udGV4dE1l c3NhZ2VOYW1lOwogfTsKQEAgLTc5NSw2ICs3ODQsMjggQEAgc3RhdGljIHZvaWQgdGVzdFdlYkV4 dGVuc2lvblVzZXJNZXNzYWdlcyhVc2VyTWVzc2FnZVRlc3QqIHRlc3QsIGdjb25zdHBvaW50ZXIp CiAgICAgdGVzdC0+d2FpdFVudGlsQ29udGV4dE1lc3NhZ2VSZWNlaXZlZCgiVGVzdC5GaW5pc2hl ZFBpbmdSZXF1ZXN0Iik7CiB9CiAKK3N0YXRpYyB2b2lkIHRlc3RXZWJFeHRlbnNpb25XaW5kb3dP YmplY3RDbGVhcmVkKFVzZXJNZXNzYWdlVGVzdCogdGVzdCwgZ2NvbnN0cG9pbnRlcikKK3sKKyAg ICB0ZXN0LT5sb2FkSHRtbCgiPGh0bWw+PGhlYWRlcj48L2hlYWRlcj48Ym9keT48L2JvZHk+PC9o dG1sPiIsIDApOworCisgICAgYXV0byBtZXNzYWdlcyA9IHRlc3QtPndhaXRVbnRpbFZpZXdNZXNz YWdlc1JlY2VpdmVkKHsgIldpbmRvd09iamVjdENsZWFyZWQiLCAiV2luZG93T2JqZWN0Q2xlYXJl ZElzb2xhdGVkV29ybGQiIH0pOworICAgIGdfYXNzZXJ0X2NtcHVpbnQobWVzc2FnZXMuc2l6ZSgp LCA9PSwgMik7CisKKyAgICBHVW5pcXVlT3V0UHRyPEdFcnJvcj4gZXJyb3I7CisgICAgV2ViS2l0 SmF2YXNjcmlwdFJlc3VsdCogamF2YXNjcmlwdFJlc3VsdCA9IHRlc3QtPnJ1bkphdmFTY3JpcHRB bmRXYWl0VW50aWxGaW5pc2hlZCgid2luZG93LmVjaG8oJ0ZvbycpOyIsICZlcnJvci5vdXRQdHIo KSk7CisgICAgZ19hc3NlcnRfbm9ubnVsbChqYXZhc2NyaXB0UmVzdWx0KTsKKyAgICBnX2Fzc2Vy dF9ub19lcnJvcihlcnJvci5nZXQoKSk7CisgICAgR1VuaXF1ZVB0cjxjaGFyPiB2YWx1ZVN0cmlu ZyhXZWJWaWV3VGVzdDo6amF2YXNjcmlwdFJlc3VsdFRvQ1N0cmluZyhqYXZhc2NyaXB0UmVzdWx0 KSk7CisgICAgZ19hc3NlcnRfY21wc3RyKHZhbHVlU3RyaW5nLmdldCgpLCA9PSwgIkZvbyIpOwor CisgICAgamF2YXNjcmlwdFJlc3VsdCA9IHRlc3QtPnJ1bkphdmFTY3JpcHRBbmRXYWl0VW50aWxG aW5pc2hlZCgidmFyIGYgPSBuZXcgR0ZpbGUoJy4nKTsgZi5wYXRoKCk7IiwgJmVycm9yLm91dFB0 cigpKTsKKyAgICBnX2Fzc2VydF9ub25udWxsKGphdmFzY3JpcHRSZXN1bHQpOworICAgIGdfYXNz ZXJ0X25vX2Vycm9yKGVycm9yLmdldCgpKTsKKyAgICB2YWx1ZVN0cmluZy5yZXNldChXZWJWaWV3 VGVzdDo6amF2YXNjcmlwdFJlc3VsdFRvQ1N0cmluZyhqYXZhc2NyaXB0UmVzdWx0KSk7CisgICAg R1VuaXF1ZVB0cjxjaGFyPiBjdXJyZW50RGlyZWN0b3J5KGdfZ2V0X2N1cnJlbnRfZGlyKCkpOwor ICAgIGdfYXNzZXJ0X2NtcHN0cih2YWx1ZVN0cmluZy5nZXQoKSwgPT0sIGN1cnJlbnREaXJlY3Rv cnkuZ2V0KCkpOworfQorCiB2b2lkIGJlZm9yZUFsbCgpCiB7CiAgICAgV2ViVmlld1Rlc3Q6OmFk ZCgiV2ViS2l0V2ViRXh0ZW5zaW9uIiwgImRvbS1kb2N1bWVudC10aXRsZSIsIHRlc3RXZWJFeHRl bnNpb25HZXRUaXRsZSk7CkBAIC04MDMsNyArODE0LDcgQEAgdm9pZCBiZWZvcmVBbGwoKQogI2Vu ZGlmCiAgICAgV2ViVmlld1Rlc3Q6OmFkZCgiV2ViS2l0V2ViRXh0ZW5zaW9uIiwgImRvY3VtZW50 LWxvYWRlZC1zaWduYWwiLCB0ZXN0RG9jdW1lbnRMb2FkZWRTaWduYWwpOwogICAgIFdlYlZpZXdU ZXN0OjphZGQoIldlYktpdFdlYlZpZXciLCAid2ViLXByb2Nlc3MtY3Jhc2hlZCIsIHRlc3RXZWJL aXRXZWJWaWV3UHJvY2Vzc0NyYXNoZWQpOwotICAgIFdlYlZpZXdUZXN0OjphZGQoIldlYktpdFdl YkV4dGVuc2lvbiIsICJ3aW5kb3ctb2JqZWN0LWNsZWFyZWQiLCB0ZXN0V2ViRXh0ZW5zaW9uV2lu ZG93T2JqZWN0Q2xlYXJlZCk7CisgICAgVXNlck1lc3NhZ2VUZXN0OjphZGQoIldlYktpdFdlYkV4 dGVuc2lvbiIsICJ3aW5kb3ctb2JqZWN0LWNsZWFyZWQiLCB0ZXN0V2ViRXh0ZW5zaW9uV2luZG93 T2JqZWN0Q2xlYXJlZCk7CiAgICAgV2ViVmlld1Rlc3Q6OmFkZCgiV2ViS2l0V2ViRXh0ZW5zaW9u IiwgImlzb2xhdGVkLXdvcmxkIiwgdGVzdFdlYkV4dGVuc2lvbklzb2xhdGVkV29ybGQpOwogI2lm IFBMQVRGT1JNKEdUSykKICAgICBXZWJWaWV3VGVzdDo6YWRkKCJXZWJLaXRXZWJWaWV3IiwgImlu c3RhbGwtbWlzc2luZy1wbHVnaW5zLXBlcm1pc3Npb24tcmVxdWVzdCIsIHRlc3RJbnN0YWxsTWlz c2luZ1BsdWdpbnNQZXJtaXNzaW9uUmVxdWVzdCk7CmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2Vi S2l0QVBJL1Rlc3RzL1dlYktpdEdMaWIvV2ViRXh0ZW5zaW9uVGVzdC5jcHAgYi9Ub29scy9UZXN0 V2ViS2l0QVBJL1Rlc3RzL1dlYktpdEdMaWIvV2ViRXh0ZW5zaW9uVGVzdC5jcHAKaW5kZXggYThk NDE4MTk4ZTJjLi5mM2MzNTU1NTQ1NDggMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkv VGVzdHMvV2ViS2l0R0xpYi9XZWJFeHRlbnNpb25UZXN0LmNwcAorKysgYi9Ub29scy9UZXN0V2Vi S2l0QVBJL1Rlc3RzL1dlYktpdEdMaWIvV2ViRXh0ZW5zaW9uVGVzdC5jcHAKQEAgLTU0OSw2ICs1 NDksNyBAQCBzdGF0aWMgY2hhciogZWNob0NhbGxiYWNrKGNvbnN0IGNoYXIqIG1lc3NhZ2UpCiAK IHN0YXRpYyB2b2lkIHdpbmRvd09iamVjdENsZWFyZWQoV2ViS2l0U2NyaXB0V29ybGQqIHdvcmxk LCBXZWJLaXRXZWJQYWdlKiBwYWdlLCBXZWJLaXRGcmFtZSogZnJhbWUsIGdwb2ludGVyKQogewor ICAgIHdlYmtpdF93ZWJfcGFnZV9zZW5kX21lc3NhZ2VfdG9fdmlldyhwYWdlLCB3ZWJraXRfdXNl cl9tZXNzYWdlX25ldygiV2luZG93T2JqZWN0Q2xlYXJlZCIsIG51bGxwdHIpLCBudWxscHRyLCBu dWxscHRyLCBudWxscHRyKTsKICAgICBHUmVmUHRyPEpTQ0NvbnRleHQ+IGpzQ29udGV4dCA9IGFk b3B0R1JlZih3ZWJraXRfZnJhbWVfZ2V0X2pzX2NvbnRleHRfZm9yX3NjcmlwdF93b3JsZChmcmFt ZSwgd29ybGQpKTsKICAgICBnX2Fzc2VydF90cnVlKEpTQ19JU19DT05URVhUKGpzQ29udGV4dC5n ZXQoKSkpOwogICAgIEdSZWZQdHI8SlNDVmFsdWU+IGZ1bmN0aW9uID0gYWRvcHRHUmVmKGpzY192 YWx1ZV9uZXdfZnVuY3Rpb24oanNDb250ZXh0LmdldCgpLCAiZWNobyIsIEdfQ0FMTEJBQ0soZWNo b0NhbGxiYWNrKSwgTlVMTCwgTlVMTCwgR19UWVBFX1NUUklORywgMSwgR19UWVBFX1NUUklORykp OwpAQCAtNTYwLDYgKzU2MSwxMSBAQCBzdGF0aWMgdm9pZCB3aW5kb3dPYmplY3RDbGVhcmVkKFdl YktpdFNjcmlwdFdvcmxkKiB3b3JsZCwgV2ViS2l0V2ViUGFnZSogcGFnZSwgVwogICAgIGpzY19j b250ZXh0X3NldF92YWx1ZShqc0NvbnRleHQuZ2V0KCksICJHRmlsZSIsIGNvbnN0cnVjdG9yLmdl dCgpKTsKIH0KIAorc3RhdGljIHZvaWQgaXNvbGF0ZWRXb3JsZFdpbmRvd09iamVjdENsZWFyZWQo V2ViS2l0U2NyaXB0V29ybGQqIHdvcmxkLCBXZWJLaXRXZWJQYWdlKiBwYWdlLCBXZWJLaXRGcmFt ZSogZnJhbWUsIGdwb2ludGVyKQoreworICAgIHdlYmtpdF93ZWJfcGFnZV9zZW5kX21lc3NhZ2Vf dG9fdmlldyhwYWdlLCB3ZWJraXRfdXNlcl9tZXNzYWdlX25ldygiV2luZG93T2JqZWN0Q2xlYXJl ZElzb2xhdGVkV29ybGQiLCBudWxscHRyKSwgbnVsbHB0ciwgbnVsbHB0ciwgbnVsbHB0cik7Cit9 CisKIHN0YXRpYyBXZWJLaXRXZWJQYWdlKiBnZXRXZWJQYWdlKFdlYktpdFdlYkV4dGVuc2lvbiog ZXh0ZW5zaW9uLCB1aW50NjRfdCBwYWdlSUQsIEdEQnVzTWV0aG9kSW52b2NhdGlvbiogaW52b2Nh dGlvbikKIHsKICAgICBXZWJLaXRXZWJQYWdlKiBwYWdlID0gd2Via2l0X3dlYl9leHRlbnNpb25f Z2V0X3BhZ2UoZXh0ZW5zaW9uLCBwYWdlSUQpOwpAQCAtNzE0LDYgKzcyMCw3IEBAIGV4dGVybiAi QyIgV1RGX0VYUE9SVF9ERUNMQVJBVElPTiB2b2lkIHdlYmtpdF93ZWJfZXh0ZW5zaW9uX2luaXRp YWxpemVfd2l0aF91c2VyCiAgICAgZ19zaWduYWxfY29ubmVjdChleHRlbnNpb24sICJ1c2VyLW1l c3NhZ2UtcmVjZWl2ZWQiLCBHX0NBTExCQUNLKGV4dGVuc2lvbk1lc3NhZ2VSZWNlaXZlZENhbGxi YWNrKSwgbnVsbHB0cik7CiAgICAgZ19zaWduYWxfY29ubmVjdChleHRlbnNpb24sICJwYWdlLWNy ZWF0ZWQiLCBHX0NBTExCQUNLKHBhZ2VDcmVhdGVkQ2FsbGJhY2spLCBleHRlbnNpb24pOwogICAg IGdfc2lnbmFsX2Nvbm5lY3Qod2Via2l0X3NjcmlwdF93b3JsZF9nZXRfZGVmYXVsdCgpLCAid2lu ZG93LW9iamVjdC1jbGVhcmVkIiwgR19DQUxMQkFDSyh3aW5kb3dPYmplY3RDbGVhcmVkKSwgbnVs bHB0cik7CisgICAgZ19zaWduYWxfY29ubmVjdChpc29sYXRlZFdvcmxkLCAid2luZG93LW9iamVj dC1jbGVhcmVkIiwgR19DQUxMQkFDSyhpc29sYXRlZFdvcmxkV2luZG93T2JqZWN0Q2xlYXJlZCks IG51bGxwdHIpOwogCiAgICAgcmVnaXN0ZXJHUmVzb3VyY2UoKTsKIAo=