128498 2014-02-09 03:32:08 -0800 [GTK] Add API to create a webview related to another one 2014-02-10 05:42:08 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned berto bunhere cdumez commit-queue gustavo gyuyoung.kim mrobinson sergio svillar oldest_to_newest 978584 0 cgarcia 2014-02-09 03:32:08 -0800 Related web view will shared the same web process. this is needed in some cases, like for window.open(9 but it also allows to implement other multi-process models in the app side. 978588 1 223626 cgarcia 2014-02-09 03:47:17 -0800 Created attachment 223626 Patch 978589 2 commit-queue 2014-02-09 03:49:13 -0800 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 978828 3 223626 gustavo 2014-02-10 04:43:56 -0800 Comment on attachment 223626 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=223626&action=review > Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:653 > + * > + * The related #WebKitWebView used when creating the view to share the > + * same web process. > + * We should explain here that you can't obtain the related view after the creation, or is the gtk-doc note for a write-only, consctruct-only property enough, you think (I don't recall seeing one)? 978841 4 cgarcia 2014-02-10 05:37:01 -0800 (In reply to comment #3) > (From update of attachment 223626 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=223626&action=review > > > Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:653 > > + * > > + * The related #WebKitWebView used when creating the view to share the > > + * same web process. > > + * > > We should explain here that you can't obtain the related view after the creation, or is the gtk-doc note for a write-only, consctruct-only property enough, you think (I don't recall seeing one)? I assumed that being writable/construct only property and the lack of public getter was clear enough, but I'll add a comment in the docs. 978843 5 cgarcia 2014-02-10 05:42:08 -0800 Committed r163781: <http://trac.webkit.org/changeset/163781> 223626 2014-02-09 03:47:17 -0800 2014-02-10 04:43:56 -0800 Patch wk2-related-view-api.diff text/plain 18693 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBmNGM0ODg1Li5jNDcwYTQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEg QEAKKzIwMTQtMDItMDkgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIEFkZCBBUEkgdG8gY3JlYXRlIGEgd2VidmlldyByZWxhdGVkIHRv IGFub3RoZXIgb25lCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMjg0OTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBBZGQgd2Via2l0X3dlYl92aWV3X25ld193aXRoX3JlbGF0ZWRfdmlldygpIHRvIGNyZWF0 ZSBhIG5ldworICAgICAgICBXZWJWaWV3IHNoYXJpbmcgdGhlIHNhbWUgd2ViIHByb2Nlc3MgYXMg dGhlIGdpdmVuIG9uZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYkNv bnRleHQuY3BwOgorICAgICAgICAod2Via2l0V2ViQ29udGV4dENyZWF0ZVBhZ2VGb3JXZWJWaWV3 KTogVXNlIHRoZSBnaXZlbiByZWxhdGVkCisgICAgICAgIFdlYlZpZXcgdG8gcGFzcyBhIHJlbGF0 ZWQgV2ViUGFnZVByb3h5IHRvIHdlYmtpdFdlYlZpZXdCYXNlQ3JlYXRlV2ViUGFnZSgpLgorICAg ICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYkNvbnRleHRQcml2YXRlLmg6CisgICAg ICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5jcHA6CisgICAgICAgICh3ZWJr aXRXZWJWaWV3Q29uc3RydWN0ZWQpOiBQYXNzIHRoZSByZWxhdGVkIHdlYiB2aWV3IHRvIHdlYmtp dFdlYkNvbnRleHRDcmVhdGVQYWdlRm9yV2ViVmlldygpLgorICAgICAgICAod2Via2l0V2ViVmll d1NldFByb3BlcnR5KToKKyAgICAgICAgKHdlYmtpdF93ZWJfdmlld19jbGFzc19pbml0KTogQWRk IHJlbGF0ZWQtdmlldyBjb25zdHJ1Y3Qtb25seSBwcm9wZXJ0eS4KKyAgICAgICAgKHdlYmtpdF93 ZWJfdmlld19uZXdfd2l0aF9yZWxhdGVkX3ZpZXcpOiBOZXcgcHVibGljIG1ldGhvZCB0bworICAg ICAgICBjcmVhdGUgYSB3ZWIgdmlldyB3aXRoIGEgcmVsYXRlZCBvbmUuCisgICAgICAgICogVUlQ cm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkv Z3RrL1dlYktpdFdlYlZpZXdCYXNlLmNwcDoKKyAgICAgICAgKHdlYmtpdFdlYlZpZXdCYXNlQ3Jl YXRlKTogUGFzcyBudWxscHRyIGFzIHJlbGF0ZWQgcGFnZSB0byB3ZWJraXRXZWJWaWV3QmFzZUNy ZWF0ZVdlYlBhZ2UoKS4KKyAgICAgICAgKHdlYmtpdFdlYlZpZXdCYXNlQ3JlYXRlV2ViUGFnZSk6 IFVzZSB0aGUgZ2l2ZW4gcmVsYXRlZAorICAgICAgICBXZWJQYWdlUHJveHkgdG8gaW5pdGlhbGl6 ZSB0aGUgd2ViIHBhZ2UgY29uZmlndXJhdGlvbi4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0 ay9XZWJLaXRXZWJWaWV3QmFzZVByaXZhdGUuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0 ay9kb2NzL3dlYmtpdDJndGstc2VjdGlvbnMudHh0OiBBZGQgbmV3IHN5bWJvbC4KKwogMjAxNC0w Mi0wOSAgQ2FybG9zIEdhcm5hY2hvICA8Y2FybG9zZ0Bnbm9tZS5vcmc+CiAKICAgICAgICAgW0dU S10gSW1wbGVtZW50IHN1cHBvcnQgdG91Y2ggZXZlbnRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYkNvbnRleHQuY3BwCmluZGV4IGZlNjI2YzQu LjNiZDg5MzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dl YktpdFdlYkNvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3Rr L1dlYktpdFdlYkNvbnRleHQuY3BwCkBAIC0xMDM4LDExICsxMDM4LDEyIEBAIHZvaWQgd2Via2l0 V2ViQ29udGV4dERpZEZpbmlzaExvYWRpbmdDdXN0b21Qcm90b2NvbChXZWJLaXRXZWJDb250ZXh0 KiBjb250ZXh0LCB1CiAgICAgY29udGV4dC0+cHJpdi0+dXJpU2NoZW1lUmVxdWVzdHMucmVtb3Zl KGN1c3RvbVByb3RvY29sSUQpOwogfQogCi12b2lkIHdlYmtpdFdlYkNvbnRleHRDcmVhdGVQYWdl Rm9yV2ViVmlldyhXZWJLaXRXZWJDb250ZXh0KiBjb250ZXh0LCBXZWJLaXRXZWJWaWV3KiB3ZWJW aWV3LCBXZWJLaXRXZWJWaWV3R3JvdXAqIHdlYlZpZXdHcm91cCkKK3ZvaWQgd2Via2l0V2ViQ29u dGV4dENyZWF0ZVBhZ2VGb3JXZWJWaWV3KFdlYktpdFdlYkNvbnRleHQqIGNvbnRleHQsIFdlYktp dFdlYlZpZXcqIHdlYlZpZXcsIFdlYktpdFdlYlZpZXdHcm91cCogd2ViVmlld0dyb3VwLCBXZWJL aXRXZWJWaWV3KiByZWxhdGVkVmlldykKIHsKICAgICBXZWJLaXRXZWJWaWV3QmFzZSogd2ViVmll d0Jhc2UgPSBXRUJLSVRfV0VCX1ZJRVdfQkFTRSh3ZWJWaWV3KTsKICAgICBXZWJQYWdlR3JvdXAq IHBhZ2VHcm91cCA9IHdlYlZpZXdHcm91cCA/IHdlYmtpdFdlYlZpZXdHcm91cEdldFBhZ2VHcm91 cCh3ZWJWaWV3R3JvdXApIDogMDsKLSAgICB3ZWJraXRXZWJWaWV3QmFzZUNyZWF0ZVdlYlBhZ2Uo d2ViVmlld0Jhc2UsIGNvbnRleHQtPnByaXYtPmNvbnRleHQuZ2V0KCksIHBhZ2VHcm91cCk7Cisg ICAgV2ViUGFnZVByb3h5KiByZWxhdGVkUGFnZSA9IHJlbGF0ZWRWaWV3ID8gd2Via2l0V2ViVmll d0Jhc2VHZXRQYWdlKFdFQktJVF9XRUJfVklFV19CQVNFKHJlbGF0ZWRWaWV3KSkgOiBudWxscHRy OworICAgIHdlYmtpdFdlYlZpZXdCYXNlQ3JlYXRlV2ViUGFnZSh3ZWJWaWV3QmFzZSwgY29udGV4 dC0+cHJpdi0+Y29udGV4dC5nZXQoKSwgcGFnZUdyb3VwLCByZWxhdGVkUGFnZSk7CiAKICAgICBX ZWJQYWdlUHJveHkqIHBhZ2UgPSB3ZWJraXRXZWJWaWV3QmFzZUdldFBhZ2Uod2ViVmlld0Jhc2Up OwogICAgIGNvbnRleHQtPnByaXYtPndlYlZpZXdzLnNldChwYWdlLT5wYWdlSUQoKSwgd2ViVmll dyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRX ZWJDb250ZXh0UHJpdmF0ZS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2Vi S2l0V2ViQ29udGV4dFByaXZhdGUuaAppbmRleCAwOWM1MjJlLi4wNjQ3NGExIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJDb250ZXh0UHJpdmF0 ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYkNvbnRl eHRQcml2YXRlLmgKQEAgLTQyLDcgKzQyLDcgQEAgV2ViS2l0OjpXZWJTb3VwQ3VzdG9tUHJvdG9j b2xSZXF1ZXN0TWFuYWdlciogd2Via2l0V2ViQ29udGV4dEdldFJlcXVlc3RNYW5hZ2VyKFcKIHZv aWQgd2Via2l0V2ViQ29udGV4dFN0YXJ0TG9hZGluZ0N1c3RvbVByb3RvY29sKFdlYktpdFdlYkNv bnRleHQqLCB1aW50NjRfdCBjdXN0b21Qcm90b2NvbElELCBBUEk6OlVSTFJlcXVlc3QqKTsKIHZv aWQgd2Via2l0V2ViQ29udGV4dFN0b3BMb2FkaW5nQ3VzdG9tUHJvdG9jb2woV2ViS2l0V2ViQ29u dGV4dCosIHVpbnQ2NF90IGN1c3RvbVByb3RvY29sSUQpOwogdm9pZCB3ZWJraXRXZWJDb250ZXh0 RGlkRmluaXNoTG9hZGluZ0N1c3RvbVByb3RvY29sKFdlYktpdFdlYkNvbnRleHQqLCB1aW50NjRf dCBjdXN0b21Qcm90b2NvbElEKTsKLXZvaWQgd2Via2l0V2ViQ29udGV4dENyZWF0ZVBhZ2VGb3JX ZWJWaWV3KFdlYktpdFdlYkNvbnRleHQqLCBXZWJLaXRXZWJWaWV3KiwgV2ViS2l0V2ViVmlld0dy b3VwKik7Cit2b2lkIHdlYmtpdFdlYkNvbnRleHRDcmVhdGVQYWdlRm9yV2ViVmlldyhXZWJLaXRX ZWJDb250ZXh0KiwgV2ViS2l0V2ViVmlldyosIFdlYktpdFdlYlZpZXdHcm91cCosIFdlYktpdFdl YlZpZXcqKTsKIHZvaWQgd2Via2l0V2ViQ29udGV4dFdlYlZpZXdEZXN0cm95ZWQoV2ViS2l0V2Vi Q29udGV4dCosIFdlYktpdFdlYlZpZXcqKTsKIFdlYktpdFdlYlZpZXcqIHdlYmtpdFdlYkNvbnRl eHRHZXRXZWJWaWV3Rm9yUGFnZShXZWJLaXRXZWJDb250ZXh0KiwgV2ViS2l0OjpXZWJQYWdlUHJv eHkqKTsKIFdlYktpdFdlYlZpZXdHcm91cCogd2Via2l0V2ViQ29udGV4dEdldERlZmF1bHRXZWJW aWV3R3JvdXAoV2ViS2l0V2ViQ29udGV4dCopOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmNwcAppbmRleCA1M2ExOWUzLi4xYjY1MjNkIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3 LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3 LmNwcApAQCAtMTMyLDYgKzEzMiw3IEBAIGVudW0gewogICAgIFBST1BfMCwKIAogICAgIFBST1Bf V0VCX0NPTlRFWFQsCisgICAgUFJPUF9SRUxBVEVEX1ZJRVcsCiAgICAgUFJPUF9HUk9VUCwKICAg ICBQUk9QX1RJVExFLAogICAgIFBST1BfRVNUSU1BVEVEX0xPQURfUFJPR1JFU1MsCkBAIC0xNTcs NiArMTU4LDcgQEAgc3RydWN0IF9XZWJLaXRXZWJWaWV3UHJpdmF0ZSB7CiAgICAgfQogCiAgICAg V2ViS2l0V2ViQ29udGV4dCogY29udGV4dDsKKyAgICBXZWJLaXRXZWJWaWV3KiByZWxhdGVkVmll dzsKICAgICBDU3RyaW5nIHRpdGxlOwogICAgIENTdHJpbmcgY3VzdG9tVGV4dEVuY29kaW5nOwog ICAgIGRvdWJsZSBlc3RpbWF0ZWRMb2FkUHJvZ3Jlc3M7CkBAIC01MDIsNyArNTA0LDkgQEAgc3Rh dGljIHZvaWQgd2Via2l0V2ViVmlld0NvbnN0cnVjdGVkKEdPYmplY3QqIG9iamVjdCkKIAogICAg IFdlYktpdFdlYlZpZXcqIHdlYlZpZXcgPSBXRUJLSVRfV0VCX1ZJRVcob2JqZWN0KTsKICAgICBX ZWJLaXRXZWJWaWV3UHJpdmF0ZSogcHJpdiA9IHdlYlZpZXctPnByaXY7Ci0gICAgd2Via2l0V2Vi Q29udGV4dENyZWF0ZVBhZ2VGb3JXZWJWaWV3KHByaXYtPmNvbnRleHQsIHdlYlZpZXcsIHByaXYt Pmdyb3VwLmdldCgpKTsKKyAgICB3ZWJraXRXZWJDb250ZXh0Q3JlYXRlUGFnZUZvcldlYlZpZXco cHJpdi0+Y29udGV4dCwgd2ViVmlldywgcHJpdi0+Z3JvdXAuZ2V0KCksIHByaXYtPnJlbGF0ZWRW aWV3KTsKKyAgICAvLyBUaGUgcmVsYXRlZCB2aWV3IGlzIG9ubHkgdmFsaWQgZHVyaW5nIHRoZSBj b25zdHJ1Y3Rpb24uCisgICAgcHJpdi0+cmVsYXRlZFZpZXcgPSBudWxscHRyOwogCiAgICAgd2Vi a2l0V2ViVmlld0Jhc2VTZXREb3dubG9hZFJlcXVlc3RIYW5kbGVyKFdFQktJVF9XRUJfVklFV19C QVNFKHdlYlZpZXcpLCB3ZWJraXRXZWJWaWV3SGFuZGxlRG93bmxvYWRSZXF1ZXN0KTsKIApAQCAt NTMxLDYgKzUzNSwxMSBAQCBzdGF0aWMgdm9pZCB3ZWJraXRXZWJWaWV3U2V0UHJvcGVydHkoR09i amVjdCogb2JqZWN0LCBndWludCBwcm9wSWQsIGNvbnN0IEdWYWx1ZQogICAgICAgICB3ZWJWaWV3 LT5wcml2LT5jb250ZXh0ID0gd2ViQ29udGV4dCA/IFdFQktJVF9XRUJfQ09OVEVYVCh3ZWJDb250 ZXh0KSA6IHdlYmtpdF93ZWJfY29udGV4dF9nZXRfZGVmYXVsdCgpOwogICAgICAgICBicmVhazsK ICAgICB9CisgICAgY2FzZSBQUk9QX1JFTEFURURfVklFVzogeworICAgICAgICBncG9pbnRlciBy ZWxhdGVkVmlldyA9IGdfdmFsdWVfZ2V0X29iamVjdCh2YWx1ZSk7CisgICAgICAgIHdlYlZpZXct PnByaXYtPnJlbGF0ZWRWaWV3ID0gcmVsYXRlZFZpZXcgPyBXRUJLSVRfV0VCX1ZJRVcocmVsYXRl ZFZpZXcpIDogbnVsbHB0cjsKKyAgICAgICAgYnJlYWs7CisgICAgfQogICAgIGNhc2UgUFJPUF9H Uk9VUDogewogICAgICAgICBncG9pbnRlciBncm91cCA9IGdfdmFsdWVfZ2V0X29iamVjdCh2YWx1 ZSk7CiAgICAgICAgIHdlYlZpZXctPnByaXYtPmdyb3VwID0gZ3JvdXAgPyBXRUJLSVRfV0VCX1ZJ RVdfR1JPVVAoZ3JvdXApIDogMDsKQEAgLTYzNyw2ICs2NDYsMjQgQEAgc3RhdGljIHZvaWQgd2Vi a2l0X3dlYl92aWV3X2NsYXNzX2luaXQoV2ViS2l0V2ViVmlld0NsYXNzKiB3ZWJWaWV3Q2xhc3Mp CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IFdFQktJVF9UWVBFX1dFQl9DT05URVhULAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBzdGF0aWNfY2FzdDxHUGFyYW1GbGFncz4oV0VCS0lU X1BBUkFNX1JFQURXUklURSB8IEdfUEFSQU1fQ09OU1RSVUNUX09OTFkpKSk7CiAgICAgLyoqCisg ICAgICogV2ViS2l0V2ViVmlldzpyZWxhdGVkLXZpZXc6CisgICAgICoKKyAgICAgKiBUaGUgcmVs YXRlZCAjV2ViS2l0V2ViVmlldyB1c2VkIHdoZW4gY3JlYXRpbmcgdGhlIHZpZXcgdG8gc2hhcmUg dGhlCisgICAgICogc2FtZSB3ZWIgcHJvY2Vzcy4KKyAgICAgKgorICAgICAqIFNpbmNlOiAyLjQK KyAgICAgKi8KKyAgICBnX29iamVjdF9jbGFzc19pbnN0YWxsX3Byb3BlcnR5KAorICAgICAgICBn T2JqZWN0Q2xhc3MsCisgICAgICAgIFBST1BfUkVMQVRFRF9WSUVXLAorICAgICAgICBnX3BhcmFt X3NwZWNfb2JqZWN0KAorICAgICAgICAgICAgInJlbGF0ZWQtdmlldyIsCisgICAgICAgICAgICBf KCJSZWxhdGVkIFdlYlZpZXciKSwKKyAgICAgICAgICAgIF8oIlRoZSByZWxhdGVkIFdlYktpdFdl YlZpZXcgdXNlZCB3aGVuIGNyZWF0aW5nIHRoZSB2aWV3IHRvIHNoYXJlIHRoZSBzYW1lIHdlYiBw cm9jZXNzIiksCisgICAgICAgICAgICBXRUJLSVRfVFlQRV9XRUJfVklFVywKKyAgICAgICAgICAg IHN0YXRpY19jYXN0PEdQYXJhbUZsYWdzPihXRUJLSVRfUEFSQU1fV1JJVEFCTEUgfCBHX1BBUkFN X0NPTlNUUlVDVF9PTkxZKSkpOworCisgICAgLyoqCiAgICAgICogV2ViS2l0V2ViVmlldzpncm91 cDoKICAgICAgKgogICAgICAqIFRoZSAjV2ViS2l0V2ViVmlld0dyb3VwIG9mIHRoZSB2aWV3LgpA QCAtODkwLDYgKzkxNywxMSBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3ZpZXdfY2xhc3NfaW5p dChXZWJLaXRXZWJWaWV3Q2xhc3MqIHdlYlZpZXdDbGFzcykKICAgICAgKiBJZiB0aGlzIHNpZ25h bCBpcyBoYW5kbGVkIHRoZSBzaWduYWwgaGFuZGxlciBzaG91bGQgcmV0dXJuIHRoZQogICAgICAq IG5ld2x5IGNyZWF0ZWQgI1dlYktpdFdlYlZpZXcuCiAgICAgICoKKyAgICAgKiBXaGVuIHVzaW5n ICVXRUJLSVRfUFJPQ0VTU19NT0RFTF9NVUxUSVBMRV9TRUNPTkRBUllfUFJPQ0VTU0VTCisgICAg ICogcHJvY2VzcyBtb2RlbCwgdGhlIG5ldyAjV2ViS2l0V2ViVmlldyBzaG91bGQgYmUgcmVsYXRl ZCB0bworICAgICAqIEB3ZWJfdmlldyB0byBzaGFyZSB0aGUgc2FtZSB3ZWIgcHJvY2Vzcywgc2Vl IHdlYmtpdF93ZWJfdmlld19uZXdfd2l0aF9yZWxhdGVkX3ZpZXcKKyAgICAgKiBmb3IgbW9yZSBk ZXRhaWxzLgorICAgICAqCiAgICAgICogVGhlIG5ldyAjV2ViS2l0V2ViVmlldyBzaG91bGQgbm90 IGJlIGRpc3BsYXllZCB0byB0aGUgdXNlcgogICAgICAqIHVudGlsIHRoZSAjV2ViS2l0V2ViVmll dzo6cmVhZHktdG8tc2hvdyBzaWduYWwgaXMgZW1pdHRlZC4KICAgICAgKgpAQCAtMTg4Miw2ICsx OTE0LDI5IEBAIEd0a1dpZGdldCogd2Via2l0X3dlYl92aWV3X25ld193aXRoX2NvbnRleHQoV2Vi S2l0V2ViQ29udGV4dCogY29udGV4dCkKIH0KIAogLyoqCisgKiB3ZWJraXRfd2ViX3ZpZXdfbmV3 X3dpdGhfcmVsYXRlZF92aWV3OgorICogQHdlYl92aWV3OiB0aGUgcmVsYXRlZCAjV2ViS2l0V2Vi VmlldworICoKKyAqIENyZWF0ZXMgYSBuZXcgI1dlYktpdFdlYlZpZXcgc2hhcmluZyB0aGUgc2Ft ZSB3ZWIgcHJvY2VzcyB3aXRoIEB3ZWJfdmlldy4KKyAqIFRoaXMgbWV0aG9kIGRvZXNuJ3QgaGF2 ZSBhbnkgZWZmZWN0IHdoZW4gJVdFQktJVF9QUk9DRVNTX01PREVMX1NIQVJFRF9TRUNPTkRBUllf UFJPQ0VTUworICogcHJvY2VzcyBtb2RlbCBpcyB1c2VkLCBiZWNhdXNlIGEgc2luZ2xlIHdlYiBw cm9jZXNzIGlzIHNoYXJlZCBmb3IgYWxsIHRoZSB3ZWIgdmlld3MgaW4gdGhlCisgKiBzYW1lICNX ZWJLaXRXZWJDb250ZXh0LiBXaGVuIHVzaW5nICVXRUJLSVRfUFJPQ0VTU19NT0RFTF9NVUxUSVBM RV9TRUNPTkRBUllfUFJPQ0VTU0VTIHByb2Nlc3MgbW9kZWwsCisgKiB0aGlzIG1ldGhvZCBzaG91 bGQgYWx3YXlzIGJlIHVzZWQgd2hlbiBjcmVhdGluZyB0aGUgI1dlYktpdFdlYlZpZXcgaW4gdGhl ICNXZWJLaXRXZWJWaWV3OjpjcmVhdGUgc2lnbmFsLgorICogWW91IGNhbiBhbHNvIHVzZSB0aGlz IG1ldGhvZCB0byBpbXBsZW1lbnQgb3RoZXIgcHJvY2VzcyBtb2RlbHMgYmFzZWQgb24gJVdFQktJ VF9QUk9DRVNTX01PREVMX01VTFRJUExFX1NFQ09OREFSWV9QUk9DRVNTRVMsCisgKiBsaWtlIGZv ciBleGFtcGxlLCBzaGFyaW5nIHRoZSBzYW1lIHdlYiBwcm9jZXNzIGZvciBhbGwgdGhlIHZpZXdz IGluIHRoZSBzYW1lIHNlY3VyaXR5IGRvbWFpbi4KKyAqCisgKiBSZXR1cm5zOiAodHJhbnNmZXIg ZnVsbCk6IFRoZSBuZXdseSBjcmVhdGVkICNXZWJLaXRXZWJWaWV3IHdpZGdldAorICoKKyAqIFNp bmNlOiAyLjQKKyAqLworR3RrV2lkZ2V0KiB3ZWJraXRfd2ViX3ZpZXdfbmV3X3dpdGhfcmVsYXRl ZF92aWV3KFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpCit7CisgICAgZ19yZXR1cm5fdmFsX2lmX2Zh aWwoV0VCS0lUX0lTX1dFQl9WSUVXKHdlYlZpZXcpLCBudWxscHRyKTsKKworICAgIHJldHVybiBH VEtfV0lER0VUKGdfb2JqZWN0X25ldyhXRUJLSVRfVFlQRV9XRUJfVklFVywgInJlbGF0ZWQtdmll dyIsIHdlYlZpZXcsIG51bGxwdHIpKTsKK30KKworLyoqCiAgKiB3ZWJraXRfd2ViX3ZpZXdfbmV3 X3dpdGhfZ3JvdXA6CiAgKiBAZ3JvdXA6IGEgI1dlYktpdFdlYlZpZXdHcm91cAogICoKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuaCBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuaAppbmRleCA2 ZTQzNGI1Li40OTNjNjhkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2d0ay9XZWJLaXRXZWJWaWV3LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9n dGsvV2ViS2l0V2ViVmlldy5oCkBAIC0yNjYsNiArMjY2LDkgQEAgV0VCS0lUX0FQSSBHdGtXaWRn ZXQgKgogd2Via2l0X3dlYl92aWV3X25ld193aXRoX2NvbnRleHQgICAgICAgICAgICAgICAgICAg ICAoV2ViS2l0V2ViQ29udGV4dCAgICAgICAgICAqY29udGV4dCk7CiAKIFdFQktJVF9BUEkgR3Rr V2lkZ2V0ICoKK3dlYmtpdF93ZWJfdmlld19uZXdfd2l0aF9yZWxhdGVkX3ZpZXcgICAgICAgICAg ICAgICAgKFdlYktpdFdlYlZpZXcgICAgICAgICAgICAgKndlYl92aWV3KTsKKworV0VCS0lUX0FQ SSBHdGtXaWRnZXQgKgogd2Via2l0X3dlYl92aWV3X25ld193aXRoX2dyb3VwICAgICAgICAgICAg ICAgICAgICAgICAoV2ViS2l0V2ViVmlld0dyb3VwICAgICAgICAqZ3JvdXApOwogCiBXRUJLSVRf QVBJIFdlYktpdFdlYkNvbnRleHQgKgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlld0Jhc2UuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlld0Jhc2UuY3BwCmluZGV4IDllNTQzNjEuLmVmOTcyMzcg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZp ZXdCYXNlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRX ZWJWaWV3QmFzZS5jcHAKQEAgLTkzOSw3ICs5MzksNyBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfd2Vi X3ZpZXdfYmFzZV9jbGFzc19pbml0KFdlYktpdFdlYlZpZXdCYXNlQ2xhc3MqIHdlYmtpdFdlYlZp ZQogV2ViS2l0V2ViVmlld0Jhc2UqIHdlYmtpdFdlYlZpZXdCYXNlQ3JlYXRlKFdlYkNvbnRleHQq IGNvbnRleHQsIFdlYlBhZ2VHcm91cCogcGFnZUdyb3VwKQogewogICAgIFdlYktpdFdlYlZpZXdC YXNlKiB3ZWJraXRXZWJWaWV3QmFzZSA9IFdFQktJVF9XRUJfVklFV19CQVNFKGdfb2JqZWN0X25l dyhXRUJLSVRfVFlQRV9XRUJfVklFV19CQVNFLCBOVUxMKSk7Ci0gICAgd2Via2l0V2ViVmlld0Jh c2VDcmVhdGVXZWJQYWdlKHdlYmtpdFdlYlZpZXdCYXNlLCBjb250ZXh0LCBwYWdlR3JvdXApOwor ICAgIHdlYmtpdFdlYlZpZXdCYXNlQ3JlYXRlV2ViUGFnZSh3ZWJraXRXZWJWaWV3QmFzZSwgY29u dGV4dCwgcGFnZUdyb3VwLCBudWxscHRyKTsKICAgICByZXR1cm4gd2Via2l0V2ViVmlld0Jhc2U7 CiB9CiAKQEAgLTk2NSwxMiArOTY1LDEzIEBAIHZvaWQgd2Via2l0V2ViVmlld0Jhc2VVcGRhdGVQ cmVmZXJlbmNlcyhXZWJLaXRXZWJWaWV3QmFzZSogd2Via2l0V2ViVmlld0Jhc2UpCiAgICAgcHJp di0+cGFnZVByb3h5LT5wYWdlR3JvdXAoKS5wcmVmZXJlbmNlcygpLnNldEFjY2VsZXJhdGVkQ29t cG9zaXRpbmdFbmFibGVkKGZhbHNlKTsKIH0KIAotdm9pZCB3ZWJraXRXZWJWaWV3QmFzZUNyZWF0 ZVdlYlBhZ2UoV2ViS2l0V2ViVmlld0Jhc2UqIHdlYmtpdFdlYlZpZXdCYXNlLCBXZWJDb250ZXh0 KiBjb250ZXh0LCBXZWJQYWdlR3JvdXAqIHBhZ2VHcm91cCkKK3ZvaWQgd2Via2l0V2ViVmlld0Jh c2VDcmVhdGVXZWJQYWdlKFdlYktpdFdlYlZpZXdCYXNlKiB3ZWJraXRXZWJWaWV3QmFzZSwgV2Vi Q29udGV4dCogY29udGV4dCwgV2ViUGFnZUdyb3VwKiBwYWdlR3JvdXAsIFdlYlBhZ2VQcm94eSog cmVsYXRlZFBhZ2UpCiB7CiAgICAgV2ViS2l0V2ViVmlld0Jhc2VQcml2YXRlKiBwcml2ID0gd2Vi a2l0V2ViVmlld0Jhc2UtPnByaXY7CiAKICAgICBXZWJQYWdlQ29uZmlndXJhdGlvbiB3ZWJQYWdl Q29uZmlndXJhdGlvbjsKICAgICB3ZWJQYWdlQ29uZmlndXJhdGlvbi5wYWdlR3JvdXAgPSBwYWdl R3JvdXA7CisgICAgd2ViUGFnZUNvbmZpZ3VyYXRpb24ucmVsYXRlZFBhZ2UgPSByZWxhdGVkUGFn ZTsKICAgICBwcml2LT5wYWdlUHJveHkgPSBjb250ZXh0LT5jcmVhdGVXZWJQYWdlKCpwcml2LT5w YWdlQ2xpZW50LCBzdGQ6Om1vdmUod2ViUGFnZUNvbmZpZ3VyYXRpb24pKTsKICAgICBwcml2LT5w YWdlUHJveHktPmluaXRpYWxpemVXZWJQYWdlKCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlUHJpdmF0ZS5oIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlld0Jhc2VQcml2YXRlLmgKaW5k ZXggYjM4OGUyZS4uNjA0Mjk2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9ndGsvV2ViS2l0V2ViVmlld0Jhc2VQcml2YXRlLmgKKysrIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlld0Jhc2VQcml2YXRlLmgKQEAgLTM3LDcgKzM3 LDcgQEAKIFdlYktpdFdlYlZpZXdCYXNlKiB3ZWJraXRXZWJWaWV3QmFzZUNyZWF0ZShXZWJLaXQ6 OldlYkNvbnRleHQqLCBXZWJLaXQ6OldlYlBhZ2VHcm91cCopOwogR3RrSU1Db250ZXh0KiB3ZWJr aXRXZWJWaWV3QmFzZUdldElNQ29udGV4dChXZWJLaXRXZWJWaWV3QmFzZSopOwogV2ViS2l0OjpX ZWJQYWdlUHJveHkqIHdlYmtpdFdlYlZpZXdCYXNlR2V0UGFnZShXZWJLaXRXZWJWaWV3QmFzZSop Owotdm9pZCB3ZWJraXRXZWJWaWV3QmFzZUNyZWF0ZVdlYlBhZ2UoV2ViS2l0V2ViVmlld0Jhc2Uq LCBXZWJLaXQ6OldlYkNvbnRleHQqLCBXZWJLaXQ6OldlYlBhZ2VHcm91cCopOwordm9pZCB3ZWJr aXRXZWJWaWV3QmFzZUNyZWF0ZVdlYlBhZ2UoV2ViS2l0V2ViVmlld0Jhc2UqLCBXZWJLaXQ6Oldl YkNvbnRleHQqLCBXZWJLaXQ6OldlYlBhZ2VHcm91cCosIFdlYktpdDo6V2ViUGFnZVByb3h5Kik7 CiB2b2lkIHdlYmtpdFdlYlZpZXdCYXNlU2V0VG9vbHRpcFRleHQoV2ViS2l0V2ViVmlld0Jhc2Uq LCBjb25zdCBjaGFyKik7CiB2b2lkIHdlYmtpdFdlYlZpZXdCYXNlU2V0VG9vbHRpcEFyZWEoV2Vi S2l0V2ViVmlld0Jhc2UqLCBjb25zdCBXZWJDb3JlOjpJbnRSZWN0Jik7CiB2b2lkIHdlYmtpdFdl YlZpZXdCYXNlRm9yd2FyZE5leHRLZXlFdmVudChXZWJLaXRXZWJWaWV3QmFzZSopOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvZG9jcy93ZWJraXQyZ3RrLXNl Y3Rpb25zLnR4dCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL2RvY3Mvd2Via2l0 Mmd0ay1zZWN0aW9ucy50eHQKaW5kZXggOTQyMTQ5Ni4uYTA5OGEwMCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvZG9jcy93ZWJraXQyZ3RrLXNlY3Rpb25zLnR4 dAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9kb2NzL3dlYmtpdDJndGst c2VjdGlvbnMudHh0CkBAIC05NSw2ICs5NSw3IEBAIFdFQktJVF9FRElUSU5HX0NPTU1BTkRfUkVE TwogPFNVQlNFQ1RJT04+CiB3ZWJraXRfd2ViX3ZpZXdfbmV3CiB3ZWJraXRfd2ViX3ZpZXdfbmV3 X3dpdGhfY29udGV4dAord2Via2l0X3dlYl92aWV3X25ld193aXRoX3JlbGF0ZWRfdmlldwogd2Vi a2l0X3dlYl92aWV3X25ld193aXRoX2dyb3VwCiB3ZWJraXRfd2ViX3ZpZXdfZ2V0X2NvbnRleHQK IHdlYmtpdF93ZWJfdmlld19nZXRfZ3JvdXAKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCA5ZjY1MGUyLi4xNzlhNTgzIDEwMDY0NAotLS0gYS9Ub29s cy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTQt MDItMDkgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisgICAg ICAgIFtHVEtdIEFkZCBBUEkgdG8gY3JlYXRlIGEgd2VidmlldyByZWxhdGVkIHRvIGFub3RoZXIg b25lCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjg0 OTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIE1p bmlCcm93c2VyL2d0ay9Ccm93c2VyV2luZG93LmM6CisgICAgICAgICh3ZWJWaWV3Q3JlYXRlKTog VXNlIHdlYmtpdF93ZWJfdmlld19uZXdfd2l0aF9yZWxhdGVkX3ZpZXcoKSB3aGVuCisgICAgICAg IGNyZWF0aW5nIGEgbmV3IHdlYiB2aWV3IGZvciB3aW5kb3cub3BlbigpLgorICAgICAgICAqIFRl c3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mkd0ay9UZXN0TXVsdGlwcm9jZXNzLmNwcDoKKyAgICAg ICAgKHRlc3RNdWx0aXByb2Nlc3NXZWJWaWV3Q3JlYXRlUmVhZHlDbG9zZSk6IEFkZCB0ZXN0IGNh c2UgdG8gY2hlY2sKKyAgICAgICAgdGhhdCB3aW5kb3cub3BlbigpIHdvcmtzIHdoZW4gY3JlYXRp bmcgdGhlIG5ldyBXZWJWaWV3IHJlbGF0ZWQgdG8KKyAgICAgICAgdGhlIGV4aXN0aW5nIG9uZSwg YW5kIHRoYXQgbm8gbmV3IHdlYiBwcm9jZXNzIGlzIHNwYXduZWQgd2hlbgorICAgICAgICB1c2lu ZyB3ZWJraXRfd2ViX3ZpZXdfbmV3X3dpdGhfcmVsYXRlZF92aWV3KCkuCisgICAgICAgIChiZWZv cmVBbGwpOgorCiAyMDE0LTAyLTA5ICBDYXJsb3MgR2FybmFjaG8gIDxjYXJsb3NnQGdub21lLm9y Zz4KIAogICAgICAgICBbR1RLXSBFbmFibGUgdG91Y2ggZmVhdHVyZXMKZGlmZiAtLWdpdCBhL1Rv b2xzL01pbmlCcm93c2VyL2d0ay9Ccm93c2VyV2luZG93LmMgYi9Ub29scy9NaW5pQnJvd3Nlci9n dGsvQnJvd3NlcldpbmRvdy5jCmluZGV4IGY1MDBhMTQuLmI4YTBkMDUgMTAwNjQ0Ci0tLSBhL1Rv b2xzL01pbmlCcm93c2VyL2d0ay9Ccm93c2VyV2luZG93LmMKKysrIGIvVG9vbHMvTWluaUJyb3dz ZXIvZ3RrL0Jyb3dzZXJXaW5kb3cuYwpAQCAtMzQ2LDcgKzM0Niw3IEBAIHN0YXRpYyBnYm9vbGVh biB3ZWJWaWV3TGVhdmVGdWxsU2NyZWVuKFdlYktpdFdlYlZpZXcgKndlYlZpZXcsIEJyb3dzZXJX aW5kb3cgKndpCiAKIHN0YXRpYyBHdGtXaWRnZXQgKndlYlZpZXdDcmVhdGUoV2ViS2l0V2ViVmll dyAqd2ViVmlldywgQnJvd3NlcldpbmRvdyAqd2luZG93KQogewotICAgIFdlYktpdFdlYlZpZXcg Km5ld1dlYlZpZXcgPSBXRUJLSVRfV0VCX1ZJRVcod2Via2l0X3dlYl92aWV3X25ld193aXRoX2Nv bnRleHQod2Via2l0X3dlYl92aWV3X2dldF9jb250ZXh0KHdlYlZpZXcpKSk7CisgICAgV2ViS2l0 V2ViVmlldyAqbmV3V2ViVmlldyA9IFdFQktJVF9XRUJfVklFVyh3ZWJraXRfd2ViX3ZpZXdfbmV3 X3dpdGhfcmVsYXRlZF92aWV3KHdlYlZpZXcpKTsKICAgICB3ZWJraXRfd2ViX3ZpZXdfc2V0X3Nl dHRpbmdzKG5ld1dlYlZpZXcsIHdlYmtpdF93ZWJfdmlld19nZXRfc2V0dGluZ3Mod2ViVmlldykp OwogCiAgICAgR3RrV2lkZ2V0ICpuZXdXaW5kb3cgPSBicm93c2VyX3dpbmRvd19uZXcobmV3V2Vi VmlldywgR1RLX1dJTkRPVyh3aW5kb3cpKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRB UEkvVGVzdHMvV2ViS2l0Mkd0ay9UZXN0TXVsdGlwcm9jZXNzLmNwcCBiL1Rvb2xzL1Rlc3RXZWJL aXRBUEkvVGVzdHMvV2ViS2l0Mkd0ay9UZXN0TXVsdGlwcm9jZXNzLmNwcAppbmRleCAwZGFkNWRj Li40YWI1ZWRmIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJH dGsvVGVzdE11bHRpcHJvY2Vzcy5jcHAKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9X ZWJLaXQyR3RrL1Rlc3RNdWx0aXByb2Nlc3MuY3BwCkBAIC0yMSw2ICsyMSw3IEBACiAKICNpbmNs dWRlICJUZXN0TWFpbi5oIgogI2luY2x1ZGUgIldlYktpdFRlc3RCdXMuaCIKKyNpbmNsdWRlICJX ZWJWaWV3VGVzdC5oIgogI2luY2x1ZGUgPHdlYmtpdDIvd2Via2l0Mi5oPgogI2luY2x1ZGUgPHd0 Zi9WZWN0b3IuaD4KIApAQCAtMTA0LDYgKzEwNSw5OSBAQCBzdGF0aWMgdm9pZCB0ZXN0UHJvY2Vz c1BlcldlYlZpZXcoTXVsdGlwcm9jZXNzVGVzdCogdGVzdCwgZ2NvbnN0cG9pbnRlcikKICAgICBn X2Fzc2VydF9jbXB1aW50KHRlc3QtPndlYlByb2Nlc3NQaWQoMCksICE9LCB0ZXN0LT53ZWJQcm9j ZXNzUGlkKDEpKTsKIH0KIAorY2xhc3MgVUlDbGllbnRNdWx0aXByb2Nlc3NUZXN0OiBwdWJsaWMg V2ViVmlld1Rlc3QgeworcHVibGljOgorICAgIE1BS0VfR0xJQl9URVNUX0ZJWFRVUkUoVUlDbGll bnRNdWx0aXByb2Nlc3NUZXN0KTsKKworICAgIGVudW0gV2ViVmlld0V2ZW50cyB7CisgICAgICAg IENyZWF0ZSwKKyAgICAgICAgUmVhZHlUb1Nob3csCisgICAgICAgIENsb3NlCisgICAgfTsKKwor ICAgIHN0YXRpYyBHdGtXaWRnZXQqIHZpZXdDcmVhdGVDYWxsYmFjayhXZWJLaXRXZWJWaWV3KiB3 ZWJWaWV3LCBVSUNsaWVudE11bHRpcHJvY2Vzc1Rlc3QqIHRlc3QpCisgICAgeworICAgICAgICBy ZXR1cm4gdGVzdC0+dmlld0NyZWF0ZSh3ZWJWaWV3KTsKKyAgICB9CisKKyAgICBzdGF0aWMgdm9p ZCB2aWV3UmVhZHlUb1Nob3dDYWxsYmFjayhXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBVSUNsaWVu dE11bHRpcHJvY2Vzc1Rlc3QqIHRlc3QpCisgICAgeworICAgICAgICB0ZXN0LT52aWV3UmVhZHlU b1Nob3cod2ViVmlldyk7CisgICAgfQorCisgICAgc3RhdGljIHZvaWQgdmlld0Nsb3NlQ2FsbGJh Y2soV2ViS2l0V2ViVmlldyogd2ViVmlldywgVUlDbGllbnRNdWx0aXByb2Nlc3NUZXN0KiB0ZXN0 KQorICAgIHsKKyAgICAgICAgdGVzdC0+dmlld0Nsb3NlKHdlYlZpZXcpOworICAgIH0KKworICAg IFVJQ2xpZW50TXVsdGlwcm9jZXNzVGVzdCgpCisgICAgeworICAgICAgICB3ZWJraXRfc2V0dGlu Z3Nfc2V0X2phdmFzY3JpcHRfY2FuX29wZW5fd2luZG93c19hdXRvbWF0aWNhbGx5KHdlYmtpdF93 ZWJfdmlld19nZXRfc2V0dGluZ3MobV93ZWJWaWV3KSwgVFJVRSk7CisgICAgICAgIGdfc2lnbmFs X2Nvbm5lY3QobV93ZWJWaWV3LCAiY3JlYXRlIiwgR19DQUxMQkFDSyh2aWV3Q3JlYXRlQ2FsbGJh Y2spLCB0aGlzKTsKKyAgICB9CisKKyAgICB+VUlDbGllbnRNdWx0aXByb2Nlc3NUZXN0KCkKKyAg ICB7CisgICAgICAgIGdfc2lnbmFsX2hhbmRsZXJzX2Rpc2Nvbm5lY3RfbWF0Y2hlZChtX3dlYlZp ZXcsIEdfU0lHTkFMX01BVENIX0RBVEEsIDAsIDAsIDAsIDAsIHRoaXMpOworICAgIH0KKworICAg IEd0a1dpZGdldCogdmlld0NyZWF0ZShXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KQorICAgIHsKKyAg ICAgICAgZ19hc3NlcnQod2ViVmlldyA9PSBtX3dlYlZpZXcpOworCisgICAgICAgIEd0a1dpZGdl dCogbmV3V2ViVmlldyA9IHdlYmtpdF93ZWJfdmlld19uZXdfd2l0aF9yZWxhdGVkX3ZpZXcod2Vi Vmlldyk7CisgICAgICAgIGdfb2JqZWN0X3JlZl9zaW5rKG5ld1dlYlZpZXcpOworICAgICAgICBh c3NlcnRPYmplY3RJc0RlbGV0ZWRXaGVuVGVzdEZpbmlzaGVzKEdfT0JKRUNUKG5ld1dlYlZpZXcp KTsKKyAgICAgICAgbV93ZWJWaWV3RXZlbnRzLmFwcGVuZChDcmVhdGUpOworCisgICAgICAgIGdf c2lnbmFsX2Nvbm5lY3QobmV3V2ViVmlldywgInJlYWR5LXRvLXNob3ciLCBHX0NBTExCQUNLKHZp ZXdSZWFkeVRvU2hvd0NhbGxiYWNrKSwgdGhpcyk7CisgICAgICAgIGdfc2lnbmFsX2Nvbm5lY3Qo bmV3V2ViVmlldywgImNsb3NlIiwgR19DQUxMQkFDSyh2aWV3Q2xvc2VDYWxsYmFjayksIHRoaXMp OworCisgICAgICAgIHJldHVybiBuZXdXZWJWaWV3OworICAgIH0KKworICAgIHZvaWQgdmlld1Jl YWR5VG9TaG93KFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpCisgICAgeworICAgICAgICBnX2Fzc2Vy dChtX3dlYlZpZXcgIT0gd2ViVmlldyk7CisgICAgICAgIG1fd2ViVmlld0V2ZW50cy5hcHBlbmQo UmVhZHlUb1Nob3cpOworICAgIH0KKworICAgIHZvaWQgdmlld0Nsb3NlKFdlYktpdFdlYlZpZXcq IHdlYlZpZXcpCisgICAgeworICAgICAgICBnX2Fzc2VydChtX3dlYlZpZXcgIT0gd2ViVmlldyk7 CisKKyAgICAgICAgbV93ZWJWaWV3RXZlbnRzLmFwcGVuZChDbG9zZSk7CisgICAgICAgIGdfb2Jq ZWN0X3VucmVmKHdlYlZpZXcpOworICAgICAgICBnX21haW5fbG9vcF9xdWl0KG1fbWFpbkxvb3Ap OworICAgIH0KKworICAgIHZvaWQgd2FpdFVudGlsTmV3V2ViVmlld0Nsb3NlKCkKKyAgICB7Cisg ICAgICAgIGdfbWFpbl9sb29wX3J1bihtX21haW5Mb29wKTsKKyAgICB9CisKKyAgICBWZWN0b3I8 V2ViVmlld0V2ZW50cz4gbV93ZWJWaWV3RXZlbnRzOworfTsKKworc3RhdGljIHZvaWQgdGVzdE11 bHRpcHJvY2Vzc1dlYlZpZXdDcmVhdGVSZWFkeUNsb3NlKFVJQ2xpZW50TXVsdGlwcm9jZXNzVGVz dCogdGVzdCwgZ2NvbnN0cG9pbnRlcikKK3sKKyAgICAvLyBBdCB0aGlzIHBvaW50IHRoZSB3ZWIg cHJvY2VzcyBvZiB0aGUgY3VycmVudCB2aWV3IGhhcyBhbHJlYWR5IGJlZW4gY3JlYXRlZC4KKyAg ICAvLyBXZSBzYXZlIGl0IGhlcmUgdG8gY2hlY2sgdGhhdCBhZnRlciB3aW5kb3cub3BlbigpIHRo ZSBudW1iZXIgb2YgcHJvY2Vzc2VzCisgICAgLy8gaXMgdGhlIHNhbWUuCisgICAgZ3VpbnQzMiBw cm9jZXNzQ291bnRCZWZvcmUgPSBuZXh0SW5pdGlhbGl6YXRpb25JZCAtIDE7CisgICAgdGVzdC0+ bG9hZEh0bWwoIjxodG1sPjxib2R5IG9uTG9hZD1cIndpbmRvdy5vcGVuKCkuY2xvc2UoKTtcIj48 L2h0bWw+IiwgbnVsbHB0cik7CisgICAgdGVzdC0+d2FpdFVudGlsTmV3V2ViVmlld0Nsb3NlKCk7 CisKKyAgICBWZWN0b3I8VUlDbGllbnRNdWx0aXByb2Nlc3NUZXN0OjpXZWJWaWV3RXZlbnRzPiYg ZXZlbnRzID0gdGVzdC0+bV93ZWJWaWV3RXZlbnRzOworICAgIGdfYXNzZXJ0X2NtcGludChldmVu dHMuc2l6ZSgpLCA9PSwgMyk7CisgICAgZ19hc3NlcnRfY21waW50KGV2ZW50c1swXSwgPT0sIFVJ Q2xpZW50TXVsdGlwcm9jZXNzVGVzdDo6Q3JlYXRlKTsKKyAgICBnX2Fzc2VydF9jbXBpbnQoZXZl bnRzWzFdLCA9PSwgVUlDbGllbnRNdWx0aXByb2Nlc3NUZXN0OjpSZWFkeVRvU2hvdyk7CisgICAg Z19hc3NlcnRfY21waW50KGV2ZW50c1syXSwgPT0sIFVJQ2xpZW50TXVsdGlwcm9jZXNzVGVzdDo6 Q2xvc2UpOworCisgICAgZ3VpbnQzMiBwcm9jZXNzZXNDb3VudEFmdGVyID0gIG5leHRJbml0aWFs aXphdGlvbklkIC0gMTsKKyAgICBnX2Fzc2VydF9jbXB1aW50KHByb2Nlc3Nlc0NvdW50QWZ0ZXIs ID09LCBwcm9jZXNzQ291bnRCZWZvcmUpOworfQorCiBzdGF0aWMgdm9pZCBpbml0aWFsaXplV2Vi RXh0ZW5zaW9ucyhXZWJLaXRXZWJDb250ZXh0KiBjb250ZXh0LCBncG9pbnRlcikKIHsKICAgICBp bml0aWFsaXplV2ViRXh0ZW5zaW9uc1NpZ25hbENvdW50Kys7CkBAIC0xMzMsNiArMjI3LDcgQEAg dm9pZCBiZWZvcmVBbGwoKQogICAgICAgICByZXR1cm47CiAKICAgICBNdWx0aXByb2Nlc3NUZXN0 OjphZGQoIldlYktpdFdlYkNvbnRleHQiLCAicHJvY2Vzcy1wZXItd2ViLXZpZXciLCB0ZXN0UHJv Y2Vzc1BlcldlYlZpZXcpOworICAgIFVJQ2xpZW50TXVsdGlwcm9jZXNzVGVzdDo6YWRkKCJXZWJL aXRXZWJWaWV3IiwgIm11bHRpcHJvY2Vzcy1jcmVhdGUtcmVhZHktY2xvc2UiLCB0ZXN0TXVsdGlw cm9jZXNzV2ViVmlld0NyZWF0ZVJlYWR5Q2xvc2UpOwogfQogCiB2b2lkIGFmdGVyQWxsKCkK