184513 2018-04-11 12:29:12 -0700 [WPE] Make WebKitWebViewBackend object mandatory for webkit_web_view_new*() constructors 2018-04-11 22:54:16 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 184357 1 zan zan berto bugs-noreply cgarcia ews-watchlist gustavo mcatanzaro webkit-bug-importer oldest_to_newest 1413769 0 zan 2018-04-11 12:29:12 -0700 [WPE] Make WebKitWebViewBackend object mandatory for webkit_web_view_new*() constructors 1413772 1 337721 zan 2018-04-11 12:36:21 -0700 Created attachment 337721 Patch 1413774 2 ews-watchlist 2018-04-11 12:38:51 -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 http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1413829 3 337721 mcatanzaro 2018-04-11 14:58:38 -0700 Comment on attachment 337721 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=337721&action=review > Tools/TestWebKitAPI/glib/WebKitGLib/TestMain.h:149 > + auto* backend = wpe_view_backend_create(); > + return webkit_web_view_backend_new(backend, reinterpret_cast<GDestroyNotify>(wpe_view_backend_destroy), backend); I would write it in one line 1413930 4 337721 zan 2018-04-11 22:50:32 -0700 Comment on attachment 337721 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=337721&action=review >> Tools/TestWebKitAPI/glib/WebKitGLib/TestMain.h:149 >> + return webkit_web_view_backend_new(backend, reinterpret_cast<GDestroyNotify>(wpe_view_backend_destroy), backend); > > I would write it in one line You can't, because the backend value is passed in as two separate arguments. 1413932 5 337721 zan 2018-04-11 22:53:28 -0700 Comment on attachment 337721 Patch Clearing flags on attachment: 337721 Committed r230557: <https://trac.webkit.org/changeset/230557> 1413933 6 zan 2018-04-11 22:53:32 -0700 All reviewed patches have been landed. Closing bug. 1413934 7 webkit-bug-importer 2018-04-11 22:54:16 -0700 <rdar://problem/39372308> 337721 2018-04-11 12:36:21 -0700 2018-04-11 22:53:28 -0700 Patch bug-184513-20180411213620.patch text/plain 12603 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMjMwNTIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQ3MTZjOGMzMzE4ZjczNDFm ZmFhMWUyYTEwYzkxZGEyNDEwNmY4MjYuLmUzNDkxMDczMWM5OWJhOTYwNTdjNDhhNzE3YTA5YzM3 OTg1M2ZhMDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMgQEAKKzIwMTgtMDQtMTEgIFphbiBEb2Jl cnNlayAgPHpkb2JlcnNla0BpZ2FsaWEuY29tPgorCisgICAgICAgIFtXUEVdIE1ha2UgV2ViS2l0 V2ViVmlld0JhY2tlbmQgb2JqZWN0IG1hbmRhdG9yeSBmb3Igd2Via2l0X3dlYl92aWV3X25ldyoo KSBjb25zdHJ1Y3RvcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE4NDUxMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIHdlYmtpdF93ZWJfdmlld19uZXcqKCkgY29uc3RydWN0b3JzIHNob3VsZCBhbHdheXMg ZXhwZWN0IGEgbm9uLW51bGwKKyAgICAgICAgV2ViS2l0V2ViVmlld0JhY2tlbmQgb2JqZWN0LCBm b3JjaW5nIHRoZSB1c2VyIHRvIHNwZWNpZnkgaG93IHRoZQorICAgICAgICB3cGVfdmlld19iYWNr ZW5kIG9iamVjdCBpcyBtYW5hZ2VkIGZvciB0aGUgV2ViS2l0V2ViVmlldyB0aGF0J3MgYmVpbmcK KyAgICAgICAgY3JlYXRlZC4KKworICAgICAgICB3ZWJraXRXZWJWaWV3QmFja2VuZENyZWF0ZURl ZmF1bHQoKSBhbmQgdGhlIGRlZmF1bHQKKyAgICAgICAgX1dlYktpdFdlYlZpZXdCYWNrZW5kKCkg Y29uc3RydWN0b3IgYXJlIHJlbW92ZWQuIFdQRS1zcGVjaWZpYworICAgICAgICB3ZWJraXRfd2Vi X3ZpZXdfbmV3KigpIGVudHJ5cG9pbnRzIGFyZSB1cGRhdGVkIHRvIGJhaWwgaWYgdGhlIHBhc3Nl ZC1pbgorICAgICAgICBXZWJLaXRXZWJWaWV3QmFja2VuZCBvYmplY3QgaXMgbnVsbC4gRG9jdW1l bnRhdGlvbiBpcyB1cGRhdGVkCisgICAgICAgIGFjY29yZGluZ2x5LgorCisgICAgICAgICogVUlQ cm9jZXNzL0FQSS9nbGliL1dlYktpdFdlYlZpZXcuY3BwOgorICAgICAgICAod2Via2l0V2ViVmll d0NvbnN0cnVjdGVkKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3dwZS9XZWJLaXRXZWJWaWV3 QmFja2VuZC5jcHA6CisgICAgICAgICh3ZWJraXRXZWJWaWV3QmFja2VuZENyZWF0ZURlZmF1bHQp OiBEZWxldGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvd3BlL1dlYktpdFdlYlZpZXdCYWNr ZW5kUHJpdmF0ZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvd3BlL1dlYktpdFdlYlZpZXdX UEUuY3BwOgorICAgICAgICAod2Via2l0X3dlYl92aWV3X25ldyk6CisgICAgICAgICh3ZWJraXRf d2ViX3ZpZXdfbmV3X3dpdGhfY29udGV4dCk6CisgICAgICAgICh3ZWJraXRfd2ViX3ZpZXdfbmV3 X3dpdGhfcmVsYXRlZF92aWV3KToKKyAgICAgICAgKHdlYmtpdF93ZWJfdmlld19uZXdfd2l0aF9z ZXR0aW5ncyk6CisgICAgICAgICh3ZWJraXRfd2ViX3ZpZXdfbmV3X3dpdGhfdXNlcl9jb250ZW50 X21hbmFnZXIpOgorCiAyMDE4LTA0LTEwICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUu Y29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQgdGVzdCBmaXggYWZ0ZXIgcjIzMDQ2OApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2dsaWIvV2ViS2l0V2ViVmlldy5jcHAg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9XZWJLaXRXZWJWaWV3LmNwcAppbmRl eCAxMTM1ODVlYTM3NzFhOTlmM2M4MTM3ODFmYzcyNzA1ZmRlYjRkN2QxLi4yN2U2MzIyYzM3YmVl Y2ExNTZiZjhkMTBlMjExMWI5MDk3MTI0NzMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvZ2xpYi9XZWJLaXRXZWJWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvZ2xpYi9XZWJLaXRXZWJWaWV3LmNwcApAQCAtNjIzLDEwICs2MjMsNiBAQCBz dGF0aWMgdm9pZCB3ZWJraXRXZWJWaWV3Q29uc3RydWN0ZWQoR09iamVjdCogb2JqZWN0KQogCiAg ICAgV2ViS2l0V2ViVmlldyogd2ViVmlldyA9IFdFQktJVF9XRUJfVklFVyhvYmplY3QpOwogICAg IFdlYktpdFdlYlZpZXdQcml2YXRlKiBwcml2ID0gd2ViVmlldy0+cHJpdjsKLSNpZiBQTEFURk9S TShXUEUpCi0gICAgaWYgKCFwcml2LT5iYWNrZW5kKQotICAgICAgICBwcml2LT5iYWNrZW5kID0g d2Via2l0V2ViVmlld0JhY2tlbmRDcmVhdGVEZWZhdWx0KCk7Ci0jZW5kaWYKICAgICBpZiAocHJp di0+cmVsYXRlZFZpZXcpIHsKICAgICAgICAgcHJpdi0+Y29udGV4dCA9IHdlYmtpdF93ZWJfdmll d19nZXRfY29udGV4dChwcml2LT5yZWxhdGVkVmlldyk7CiAgICAgICAgIHByaXYtPmlzRXBoZW1l cmFsID0gd2Via2l0X3dlYl92aWV3X2lzX2VwaGVtZXJhbChwcml2LT5yZWxhdGVkVmlldyk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvd3BlL1dlYktpdFdlYlZpZXdC YWNrZW5kLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS93cGUvV2ViS2l0V2ViVmll d0JhY2tlbmQuY3BwCmluZGV4IGQ0Y2FkZWU2MjcxM2I3NGYzZWQ1MDM0ZjE1OTdiNWJkMzJlMGY0 NzguLmUwZmMyMDViMzkwOTVjZjhhYWUyMDFhMWRjY2E1MjA0NjFjNjBkZTQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS93cGUvV2ViS2l0V2ViVmlld0JhY2tlbmQuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS93cGUvV2ViS2l0V2ViVmlld0JhY2tl bmQuY3BwCkBAIC00NiwxMyArNDYsNiBAQCBzdHJ1Y3QgX1dlYktpdFdlYlZpZXdCYWNrZW5kIHsK ICAgICAgICAgQVNTRVJUKG5vdGlmeUNhbGxiYWNrRGF0YSk7CiAgICAgfQogCi0gICAgX1dlYktp dFdlYlZpZXdCYWNrZW5kKCkKLSAgICAgICAgOiBiYWNrZW5kKHdwZV92aWV3X2JhY2tlbmRfY3Jl YXRlKCkpCi0gICAgICAgICwgbm90aWZ5Q2FsbGJhY2socmVpbnRlcnByZXRfY2FzdDxHRGVzdHJv eU5vdGlmeT4od3BlX3ZpZXdfYmFja2VuZF9kZXN0cm95KSkKLSAgICAgICAgLCBub3RpZnlDYWxs YmFja0RhdGEoYmFja2VuZCkKLSAgICB7Ci0gICAgfQotCiAgICAgfl9XZWJLaXRXZWJWaWV3QmFj a2VuZCgpCiAgICAgewogICAgICAgICBub3RpZnlDYWxsYmFjayhub3RpZnlDYWxsYmFja0RhdGEp OwpAQCAtODIsMTMgKzc1LDYgQEAgdm9pZCB3ZWJraXRXZWJWaWV3QmFja2VuZFVucmVmKFdlYktp dFdlYlZpZXdCYWNrZW5kKiB2aWV3QmFja2VuZCkKICAgICB9CiB9CiAKLUdSZWZQdHI8V2ViS2l0 V2ViVmlld0JhY2tlbmQ+IHdlYmtpdFdlYlZpZXdCYWNrZW5kQ3JlYXRlRGVmYXVsdCgpCi17Ci0g ICAgYXV0byogdmlld0JhY2tlbmQgPSBzdGF0aWNfY2FzdDxXZWJLaXRXZWJWaWV3QmFja2VuZCo+ KGZhc3RNYWxsb2Moc2l6ZW9mKFdlYktpdFdlYlZpZXdCYWNrZW5kKSkpOwotICAgIG5ldyAodmll d0JhY2tlbmQpIFdlYktpdFdlYlZpZXdCYWNrZW5kKCk7Ci0gICAgcmV0dXJuIGFkb3B0R1JlZih2 aWV3QmFja2VuZCk7Ci19Ci0KIC8qKgogICogd2Via2l0X3dlYl92aWV3X2JhY2tlbmRfbmV3Ogog ICogQGJhY2tlbmQ6ICh0cmFuc2ZlciBmdWxsKTogYSAjd3BlX3ZpZXdfYmFja2VuZApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL3dwZS9XZWJLaXRXZWJWaWV3QmFja2Vu ZFByaXZhdGUuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS93cGUvV2ViS2l0V2ViVmll d0JhY2tlbmRQcml2YXRlLmgKaW5kZXggZDhkNjVlOGQ2MWRlZTE4MzZjNTQ3ZGM3Yjg0ZjE3MjE3 MDcwYjdkNy4uZTRiOTJhY2UxNTMxMDkwYWUzOGE3YWVjM2QzZDRmZWJmMTlhZWU4NCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL3dwZS9XZWJLaXRXZWJWaWV3QmFja2Vu ZFByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvd3BlL1dlYktpdFdl YlZpZXdCYWNrZW5kUHJpdmF0ZS5oCkBAIC0zMSw0ICszMSwzIEBAIHRlbXBsYXRlIDw+IHZvaWQg ZGVyZWZHUHRyKFdlYktpdFdlYlZpZXdCYWNrZW5kKiBwdHIpOwogfQogCiB2b2lkIHdlYmtpdFdl YlZpZXdCYWNrZW5kVW5yZWYoV2ViS2l0V2ViVmlld0JhY2tlbmQqKTsKLUdSZWZQdHI8V2ViS2l0 V2ViVmlld0JhY2tlbmQ+IHdlYmtpdFdlYlZpZXdCYWNrZW5kQ3JlYXRlRGVmYXVsdCgpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL3dwZS9XZWJLaXRXZWJWaWV3V1BF LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS93cGUvV2ViS2l0V2ViVmlld1dQRS5j cHAKaW5kZXggMGIyOWMxNzhmNGJhNWFjMmVkYTc1Y2E1YWI4MzU2Y2VkNDI5ZmE5Yy4uNDk1OGU3 YjExMjNjYTM5ZjdlMDk1Yzg5MzcwYWRkOGE4NzgxNDcwYiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQVBJL3dwZS9XZWJLaXRXZWJWaWV3V1BFLmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9BUEkvd3BlL1dlYktpdFdlYlZpZXdXUEUuY3BwCkBAIC0zOSw3ICsz OSw3IEBAIGdib29sZWFuIHdlYmtpdFdlYlZpZXdSdW5GaWxlQ2hvb3NlcihXZWJLaXRXZWJWaWV3 KiwgV2ViS2l0RmlsZUNob29zZXJSZXF1ZXN0KikKIAogLyoqCiAgKiB3ZWJraXRfd2ViX3ZpZXdf bmV3OgotICogQGJhY2tlbmQ6IChudWxsYWJsZSkgKHRyYW5zZmVyIGZ1bGwpOiBhICNXZWJLaXRX ZWJWaWV3QmFja2VuZCwgb3IgJU5VTEwgdG8gdXNlIHRoZSBkZWZhdWx0CisgKiBAYmFja2VuZDog KHRyYW5zZmVyIGZ1bGwpOiBhICNXZWJLaXRXZWJWaWV3QmFja2VuZAogICoKICAqIENyZWF0ZXMg YSBuZXcgI1dlYktpdFdlYlZpZXcgd2l0aCB0aGUgZGVmYXVsdCAjV2ViS2l0V2ViQ29udGV4dCBh bmQKICAqIG5vICNXZWJLaXRVc2VyQ29udGVudE1hbmFnZXIgYXNzb2NpYXRlZCB3aXRoIGl0LgpA QCAtNTEsNiArNTEsOCBAQCBnYm9vbGVhbiB3ZWJraXRXZWJWaWV3UnVuRmlsZUNob29zZXIoV2Vi S2l0V2ViVmlldyosIFdlYktpdEZpbGVDaG9vc2VyUmVxdWVzdCopCiAgKi8KIFdlYktpdFdlYlZp ZXcqIHdlYmtpdF93ZWJfdmlld19uZXcoV2ViS2l0V2ViVmlld0JhY2tlbmQqIGJhY2tlbmQpCiB7 CisgICAgZ19yZXR1cm5fdmFsX2lmX2ZhaWwoYmFja2VuZCwgbnVsbHB0cik7CisKICAgICByZXR1 cm4gV0VCS0lUX1dFQl9WSUVXKGdfb2JqZWN0X25ldyhXRUJLSVRfVFlQRV9XRUJfVklFVywKICAg ICAgICAgImJhY2tlbmQiLCBiYWNrZW5kLAogICAgICAgICAid2ViLWNvbnRleHQiLCB3ZWJraXRf d2ViX2NvbnRleHRfZ2V0X2RlZmF1bHQoKSwKQEAgLTU5LDcgKzYxLDcgQEAgV2ViS2l0V2ViVmll dyogd2Via2l0X3dlYl92aWV3X25ldyhXZWJLaXRXZWJWaWV3QmFja2VuZCogYmFja2VuZCkKIAog LyoqCiAgKiB3ZWJraXRfd2ViX3ZpZXdfbmV3X3dpdGhfY29udGV4dDoKLSAqIEBiYWNrZW5kOiAo bnVsbGFibGUpICh0cmFuc2ZlciBmdWxsKTogYSAjV2ViS2l0V2ViVmlld0JhY2tlbmQsIG9yICVO VUxMIHRvIHVzZSB0aGUgZGVmYXVsdAorICogQGJhY2tlbmQ6ICh0cmFuc2ZlciBmdWxsKTogYSAj V2ViS2l0V2ViVmlld0JhY2tlbmQKICAqIEBjb250ZXh0OiB0aGUgI1dlYktpdFdlYkNvbnRleHQg dG8gYmUgdXNlZCBieSB0aGUgI1dlYktpdFdlYlZpZXcKICAqCiAgKiBDcmVhdGVzIGEgbmV3ICNX ZWJLaXRXZWJWaWV3IHdpdGggdGhlIGdpdmVuICNXZWJLaXRXZWJDb250ZXh0IGFuZApAQCAtNzEs NiArNzMsNyBAQCBXZWJLaXRXZWJWaWV3KiB3ZWJraXRfd2ViX3ZpZXdfbmV3KFdlYktpdFdlYlZp ZXdCYWNrZW5kKiBiYWNrZW5kKQogICovCiBXZWJLaXRXZWJWaWV3KiB3ZWJraXRfd2ViX3ZpZXdf bmV3X3dpdGhfY29udGV4dChXZWJLaXRXZWJWaWV3QmFja2VuZCogYmFja2VuZCwgV2ViS2l0V2Vi Q29udGV4dCogY29udGV4dCkKIHsKKyAgICBnX3JldHVybl92YWxfaWZfZmFpbChiYWNrZW5kLCBu dWxscHRyKTsKICAgICBnX3JldHVybl92YWxfaWZfZmFpbChXRUJLSVRfSVNfV0VCX0NPTlRFWFQo Y29udGV4dCksIG51bGxwdHIpOwogCiAgICAgcmV0dXJuIFdFQktJVF9XRUJfVklFVyhnX29iamVj dF9uZXcoV0VCS0lUX1RZUEVfV0VCX1ZJRVcsCkBAIC04Miw3ICs4NSw3IEBAIFdlYktpdFdlYlZp ZXcqIHdlYmtpdF93ZWJfdmlld19uZXdfd2l0aF9jb250ZXh0KFdlYktpdFdlYlZpZXdCYWNrZW5k KiBiYWNrZW5kLCBXCiAKIC8qKgogICogd2Via2l0X3dlYl92aWV3X25ld193aXRoX3JlbGF0ZWRf dmlldzogKGNvbnN0cnVjdG9yKQotICogQGJhY2tlbmQ6IChudWxsYWJsZSkgKHRyYW5zZmVyIGZ1 bGwpOiBhICNXZWJLaXRXZWJWaWV3QmFja2VuZCwgb3IgJU5VTEwgdG8gdXNlIHRoZSBkZWZhdWx0 CisgKiBAYmFja2VuZDogKHRyYW5zZmVyIGZ1bGwpOiBhICNXZWJLaXRXZWJWaWV3QmFja2VuZAog ICogQHdlYl92aWV3OiB0aGUgcmVsYXRlZCAjV2ViS2l0V2ViVmlldwogICoKICAqIENyZWF0ZXMg YSBuZXcgI1dlYktpdFdlYlZpZXcgc2hhcmluZyB0aGUgc2FtZSB3ZWIgcHJvY2VzcyB3aXRoIEB3 ZWJfdmlldy4KQEAgLTEwMiw2ICsxMDUsNyBAQCBXZWJLaXRXZWJWaWV3KiB3ZWJraXRfd2ViX3Zp ZXdfbmV3X3dpdGhfY29udGV4dChXZWJLaXRXZWJWaWV3QmFja2VuZCogYmFja2VuZCwgVwogICov CiBXZWJLaXRXZWJWaWV3KiB3ZWJraXRfd2ViX3ZpZXdfbmV3X3dpdGhfcmVsYXRlZF92aWV3KFdl YktpdFdlYlZpZXdCYWNrZW5kKiBiYWNrZW5kLCBXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KQogewor ICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKGJhY2tlbmQsIG51bGxwdHIpOwogICAgIGdfcmV0dXJu X3ZhbF9pZl9mYWlsKFdFQktJVF9JU19XRUJfVklFVyh3ZWJWaWV3KSwgbnVsbHB0cik7CiAKICAg ICByZXR1cm4gV0VCS0lUX1dFQl9WSUVXKGdfb2JqZWN0X25ldyhXRUJLSVRfVFlQRV9XRUJfVklF VywKQEAgLTEyNyw2ICsxMzEsNyBAQCBXZWJLaXRXZWJWaWV3KiB3ZWJraXRfd2ViX3ZpZXdfbmV3 X3dpdGhfcmVsYXRlZF92aWV3KFdlYktpdFdlYlZpZXdCYWNrZW5kKiBiYWNrZQogICovCiBXZWJL aXRXZWJWaWV3KiB3ZWJraXRfd2ViX3ZpZXdfbmV3X3dpdGhfc2V0dGluZ3MoV2ViS2l0V2ViVmll d0JhY2tlbmQqIGJhY2tlbmQsIFdlYktpdFNldHRpbmdzKiBzZXR0aW5ncykKIHsKKyAgICBnX3Jl dHVybl92YWxfaWZfZmFpbChiYWNrZW5kLCBudWxscHRyKTsKICAgICBnX3JldHVybl92YWxfaWZf ZmFpbChXRUJLSVRfSVNfU0VUVElOR1Moc2V0dGluZ3MpLCBudWxscHRyKTsKIAogICAgIHJldHVy biBXRUJLSVRfV0VCX1ZJRVcoZ19vYmplY3RfbmV3KFdFQktJVF9UWVBFX1dFQl9WSUVXLApAQCAt MTM3LDcgKzE0Miw3IEBAIFdlYktpdFdlYlZpZXcqIHdlYmtpdF93ZWJfdmlld19uZXdfd2l0aF9z ZXR0aW5ncyhXZWJLaXRXZWJWaWV3QmFja2VuZCogYmFja2VuZCwKIAogLyoqCiAgKiB3ZWJraXRf d2ViX3ZpZXdfbmV3X3dpdGhfdXNlcl9jb250ZW50X21hbmFnZXI6Ci0gKiBAYmFja2VuZDogKG51 bGxhYmxlKSAodHJhbnNmZXIgZnVsbCk6IGEgI1dlYktpdFdlYlZpZXdCYWNrZW5kLCBvciAlTlVM TCB0byB1c2UgdGhlIGRlZmF1bHQKKyAqIEBiYWNrZW5kOiAodHJhbnNmZXIgZnVsbCk6IGEgI1dl YktpdFdlYlZpZXdCYWNrZW5kCiAgKiBAdXNlcl9jb250ZW50X21hbmFnZXI6IGEgI1dlYktpdFVz ZXJDb250ZW50TWFuYWdlci4KICAqCiAgKiBDcmVhdGVzIGEgbmV3ICNXZWJLaXRXZWJWaWV3IHdp dGggdGhlIGdpdmVuICNXZWJLaXRVc2VyQ29udGVudE1hbmFnZXIuCkBAIC0xNTAsNiArMTU1LDcg QEAgV2ViS2l0V2ViVmlldyogd2Via2l0X3dlYl92aWV3X25ld193aXRoX3NldHRpbmdzKFdlYktp dFdlYlZpZXdCYWNrZW5kKiBiYWNrZW5kLAogICovCiBXZWJLaXRXZWJWaWV3KiB3ZWJraXRfd2Vi X3ZpZXdfbmV3X3dpdGhfdXNlcl9jb250ZW50X21hbmFnZXIoV2ViS2l0V2ViVmlld0JhY2tlbmQq IGJhY2tlbmQsIFdlYktpdFVzZXJDb250ZW50TWFuYWdlciogdXNlckNvbnRlbnRNYW5hZ2VyKQog eworICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKGJhY2tlbmQsIG51bGxwdHIpOwogICAgIGdfcmV0 dXJuX3ZhbF9pZl9mYWlsKFdFQktJVF9JU19VU0VSX0NPTlRFTlRfTUFOQUdFUih1c2VyQ29udGVu dE1hbmFnZXIpLCBudWxscHRyKTsKIAogICAgIHJldHVybiBXRUJLSVRfV0VCX1ZJRVcoZ19vYmpl Y3RfbmV3KFdFQktJVF9UWVBFX1dFQl9WSUVXLApkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9n IGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGZmYzEyNTBhNDdkYjRmNWQwNjRlMmYyZTM4MGRiZTc1 ODRkY2M0ZTYuLmNiNDA3MDVjZmNmY2ZiYzUyYzk2YTQ4NTcxMTYxY2M3MWUyYjc0NDAgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwy NCBAQAorMjAxOC0wNC0xMSAgWmFuIERvYmVyc2VrICA8emRvYmVyc2VrQGlnYWxpYS5jb20+CisK KyAgICAgICAgW1dQRV0gTWFrZSBXZWJLaXRXZWJWaWV3QmFja2VuZCBvYmplY3QgbWFuZGF0b3J5 IGZvciB3ZWJraXRfd2ViX3ZpZXdfbmV3KigpIGNvbnN0cnVjdG9ycworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg0NTEzCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXBkYXRlIHRoZSBXUEUtc3BlY2lmaWMg dGVzdFdlYlZpZXdXZWJCYWNrZW5kKCkgdGVzdCBjYXNlLCByZW1vdmluZyB0aGUKKyAgICAgICAg dGVzdCB0aGF0IHBhc3NlcyBhIG51bGwgV2ViS2l0V2ViVmlld0JhY2tlbmQgb2JqZWN0IHRvIHRo ZQorICAgICAgICB3ZWJraXRfd2ViX3ZpZXdfbmV3KCkgY2FsbC4KKworICAgICAgICBIZWxwZXIg Y3JlYXRlV2ViVmlld0JhY2tlbmQoKSB0aGF0J3MgY2FsbGVkIHZpYSBUZXN0OjpjcmVhdGVXZWJW aWV3KCkKKyAgICAgICAgdmFyaWF0aW9ucyBpcyB1cGRhdGVkIHRvLCBpbiBjYXNlIG9mIG5vdCB1 c2luZyB0aGUgaGVhZGxlc3MgYmFja2VuZCwKKyAgICAgICAgcmV0dXJuIGEgV2ViS2l0V2ViVmll d0JhY2tlbmQgaW5zdGFuY2UgdGhhdCB3cmFwcyBhcm91bmQgYQorICAgICAgICBkZWZhdWx0IHdw ZV92aWV3X2JhY2tlbmQgb2JqZWN0LgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9X ZWJLaXRHTGliL1Rlc3RXZWJLaXRXZWJWaWV3LmNwcDoKKyAgICAgICAgKHRlc3RXZWJWaWV3V2Vi QmFja2VuZCk6CisgICAgICAgICogVGVzdFdlYktpdEFQSS9nbGliL1dlYktpdEdMaWIvVGVzdE1h aW4uaDoKKyAgICAgICAgKFRlc3Q6OmNyZWF0ZVdlYlZpZXdCYWNrZW5kKToKKwogMjAxOC0wNC0x MCAgTmFuIFdhbmcgIDxuX3dhbmdAYXBwbGUuY29tPgogCiAgICAgICAgIEFYOiBFeHBvc2Ugc3Ry b25nIHBhc3N3b3JkIGZpZWxkcyBvbiBpT1MKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRB UEkvVGVzdHMvV2ViS2l0R0xpYi9UZXN0V2ViS2l0V2ViVmlldy5jcHAgYi9Ub29scy9UZXN0V2Vi S2l0QVBJL1Rlc3RzL1dlYktpdEdMaWIvVGVzdFdlYktpdFdlYlZpZXcuY3BwCmluZGV4IDU0MTE0 MzRkNGU2NDI3YzFjYjI3YjlhNmY4MTc3Mzk0MjM4NDEwOTEuLjYyZjliNDQzNzVhNGYzNDc0ODA2 M2E5NzA4ODViNGE2ZGMxMjk0MzcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVz dHMvV2ViS2l0R0xpYi9UZXN0V2ViS2l0V2ViVmlldy5jcHAKKysrIGIvVG9vbHMvVGVzdFdlYktp dEFQSS9UZXN0cy9XZWJLaXRHTGliL1Rlc3RXZWJLaXRXZWJWaWV3LmNwcApAQCAtMTA4LDggKzEw OCw4IEBAIHN0YXRpYyB2b2lkIHRlc3RXZWJWaWV3V2ViQ29udGV4dExpZmV0aW1lKFdlYlZpZXdU ZXN0KiB0ZXN0LCBnY29uc3Rwb2ludGVyKQogI2lmIFBMQVRGT1JNKFdQRSkKIHN0YXRpYyB2b2lk IHRlc3RXZWJWaWV3V2ViQmFja2VuZChUZXN0KiB0ZXN0LCBnY29uc3Rwb2ludGVyKQogewotICAg IC8vIFVzZSB0aGUgZGVmYXVsdCBiYWNrZW5kICh3ZSBkb24ndCBoYXZlIGEgd2F5IHRvIGNoZWNr IHRoZSBiYWNrZW5kIHdpbGwgYmUgYWN0dWFsbHkgZnJlZWQpLgotICAgIEdSZWZQdHI8V2ViS2l0 V2ViVmlldz4gd2ViVmlldyA9IGFkb3B0R1JlZih3ZWJraXRfd2ViX3ZpZXdfbmV3KG51bGxwdHIp KTsKKyAgICAvLyBVc2VyIHByb3ZpZGVkIGJhY2tlbmQgd2l0aCBkZWZhdWx0IGRlbGV0ZXIgKHdl IGRvbid0IGhhdmUgYSB3YXkgdG8gY2hlY2sgdGhlIGJhY2tlbmQgd2lsbCBiZSBhY3R1YWxseSBm cmVlZCkuCisgICAgR1JlZlB0cjxXZWJLaXRXZWJWaWV3PiB3ZWJWaWV3ID0gYWRvcHRHUmVmKHdl YmtpdF93ZWJfdmlld19uZXcod2Via2l0X3dlYl92aWV3X2JhY2tlbmRfbmV3KHdwZV92aWV3X2Jh Y2tlbmRfY3JlYXRlKCksIG51bGxwdHIsIG51bGxwdHIpKSk7CiAgICAgdGVzdC0+YXNzZXJ0T2Jq ZWN0SXNEZWxldGVkV2hlblRlc3RGaW5pc2hlcyhHX09CSkVDVCh3ZWJWaWV3LmdldCgpKSk7CiAg ICAgYXV0byogdmlld0JhY2tlbmQgPSB3ZWJraXRfd2ViX3ZpZXdfZ2V0X2JhY2tlbmQod2ViVmll dy5nZXQoKSk7CiAgICAgZ19hc3NlcnQodmlld0JhY2tlbmQpOwpAQCAtMTE3LDE1ICsxMTcsNiBA QCBzdGF0aWMgdm9pZCB0ZXN0V2ViVmlld1dlYkJhY2tlbmQoVGVzdCogdGVzdCwgZ2NvbnN0cG9p bnRlcikKICAgICBnX2Fzc2VydCh3cGVCYWNrZW5kKTsKICAgICB3ZWJWaWV3ID0gbnVsbHB0cjsK IAotICAgIC8vIFVzZXIgcHJvdmlkZWQgYmFja2VuZCB3aXRoIGRlZmF1bHQgZGVsZXRlciAod2Ug ZG9uJ3QgaGF2ZSBhIHdheSB0byBjaGVjayB0aGUgYmFja2VuZCB3aWxsIGJlIGFjdHVhbGx5IGZy ZWVkKS4KLSAgICB3ZWJWaWV3ID0gYWRvcHRHUmVmKHdlYmtpdF93ZWJfdmlld19uZXcod2Via2l0 X3dlYl92aWV3X2JhY2tlbmRfbmV3KHdwZV92aWV3X2JhY2tlbmRfY3JlYXRlKCksIG51bGxwdHIs IG51bGxwdHIpKSk7Ci0gICAgdGVzdC0+YXNzZXJ0T2JqZWN0SXNEZWxldGVkV2hlblRlc3RGaW5p c2hlcyhHX09CSkVDVCh3ZWJWaWV3LmdldCgpKSk7Ci0gICAgdmlld0JhY2tlbmQgPSB3ZWJraXRf d2ViX3ZpZXdfZ2V0X2JhY2tlbmQod2ViVmlldy5nZXQoKSk7Ci0gICAgZ19hc3NlcnQodmlld0Jh Y2tlbmQpOwotICAgIHdwZUJhY2tlbmQgPSB3ZWJraXRfd2ViX3ZpZXdfYmFja2VuZF9nZXRfd3Bl X2JhY2tlbmQodmlld0JhY2tlbmQpOwotICAgIGdfYXNzZXJ0KHdwZUJhY2tlbmQpOwotICAgIHdl YlZpZXcgPSBudWxscHRyOwotCiAgICAgLy8gVXNlciBwcm92aWRlZCBiYWNrZW5kIHdpdGggZGVz dHJveSBub3RpZnkuCiAgICAgd3BlQmFja2VuZCA9IHdwZV92aWV3X2JhY2tlbmRfY3JlYXRlKCk7 CiAgICAgd2ViVmlldyA9IGFkb3B0R1JlZih3ZWJraXRfd2ViX3ZpZXdfbmV3KHdlYmtpdF93ZWJf dmlld19iYWNrZW5kX25ldyh3cGVCYWNrZW5kLCBbXShncG9pbnRlciB1c2VyRGF0YSkgewpkaWZm IC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9nbGliL1dlYktpdEdMaWIvVGVzdE1haW4uaCBi L1Rvb2xzL1Rlc3RXZWJLaXRBUEkvZ2xpYi9XZWJLaXRHTGliL1Rlc3RNYWluLmgKaW5kZXggMmM3 NTc5M2JkZmNhNDM1NDc4NjA4ZWU5ZWE3NTE2YWEwY2I3ZmVhMy4uN2NmNTFkOTJmNTYyNjdkYTdm Y2Y2ZDkxMmI0Y2U2YTE1MTlkMDU3YSAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9n bGliL1dlYktpdEdMaWIvVGVzdE1haW4uaAorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL2dsaWIv V2ViS2l0R0xpYi9UZXN0TWFpbi5oCkBAIC0xNDQsOCArMTQ0LDEwIEBAIHB1YmxpYzoKICAgICBz dGF0aWMgV2ViS2l0V2ViVmlld0JhY2tlbmQqIGNyZWF0ZVdlYlZpZXdCYWNrZW5kKCkKICAgICB7 CiAgICAgICAgIGNvbnN0IGNoYXIqIHVzZUhlYWRsZXNzVmlld0JhY2tlbmQgPSBnX2dldGVudigi V1BFX1VTRV9IRUFETEVTU19WSUVXX0JBQ0tFTkQiKTsKLSAgICAgICAgaWYgKCF1c2VIZWFkbGVz c1ZpZXdCYWNrZW5kIHx8ICFzdHJjbXAodXNlSGVhZGxlc3NWaWV3QmFja2VuZCwgIjAiKSkKLSAg ICAgICAgICAgIHJldHVybiBudWxscHRyOworICAgICAgICBpZiAoIXVzZUhlYWRsZXNzVmlld0Jh Y2tlbmQgfHwgIXN0cmNtcCh1c2VIZWFkbGVzc1ZpZXdCYWNrZW5kLCAiMCIpKSB7CisgICAgICAg ICAgICBhdXRvKiBiYWNrZW5kID0gd3BlX3ZpZXdfYmFja2VuZF9jcmVhdGUoKTsKKyAgICAgICAg ICAgIHJldHVybiB3ZWJraXRfd2ViX3ZpZXdfYmFja2VuZF9uZXcoYmFja2VuZCwgcmVpbnRlcnBy ZXRfY2FzdDxHRGVzdHJveU5vdGlmeT4od3BlX3ZpZXdfYmFja2VuZF9kZXN0cm95KSwgYmFja2Vu ZCk7CisgICAgICAgIH0KICAgICAgICAgYXV0byogaGVhZGxlc3NCYWNrZW5kID0gbmV3IEhlYWRs ZXNzVmlld0JhY2tlbmQ7CiAgICAgICAgIHJldHVybiB3ZWJraXRfd2ViX3ZpZXdfYmFja2VuZF9u ZXcoaGVhZGxlc3NCYWNrZW5kLT5iYWNrZW5kKCksIFtdKGdwb2ludGVyIHVzZXJEYXRhKSB7CiAg ICAgICAgICAgICBkZWxldGUgc3RhdGljX2Nhc3Q8SGVhZGxlc3NWaWV3QmFja2VuZCo+KHVzZXJE YXRhKTsK