97330 2012-09-21 05:41:35 -0700 [GTK] Add WebKitWebView:is-loading property to WebKit2 GTK+ API 2012-09-21 06:51:20 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned gustavo gyuyoung.kim mrobinson rakuco webkit.review.bot xan.lopez oldest_to_newest 725442 0 cgarcia 2012-09-21 05:41:35 -0700 To monitor when the view is loading something without having to deal with load-changed signal and all the details about the load status. This also allows to know when a new load is started before it goes to STARTED status. 725445 1 165122 cgarcia 2012-09-21 05:48:58 -0700 Created attachment 165122 Patch 725452 2 webkit.review.bot 2012-09-21 05:53:14 -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 725460 3 165122 xan.lopez 2012-09-21 06:12:17 -0700 Comment on attachment 165122 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=165122&action=review > Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:1141 > + webkitWebViewUpdateURI(webView); Maybe it's worth mentioning in the doc that when notify::is-loading is fired you can already get the URI that will be loaded through the get_uri API, even if notify::uri has not happened (seems to me that will be a common thing to do). 725488 4 cgarcia 2012-09-21 06:51:20 -0700 Committed r129223: <http://trac.webkit.org/changeset/129223> 165122 2012-09-21 05:48:58 -0700 2012-09-21 06:12:17 -0700 Patch wk2-view-is-loading.diff text/plain 19508 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBjOGM4NWU2Li5iZjZmY2QwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDcg QEAKKzIwMTItMDktMjEgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIEFkZCBXZWJLaXRXZWJWaWV3OmlzLWxvYWRpbmcgcHJvcGVydHkg dG8gV2ViS2l0MiBHVEsrIEFQSQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9OTczMzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBXZWJLaXRXZWJWaWV3OmlzLWxvYWRpbmcgcHJvcGVydHkgYWxsb3dzIHRvIG1v bml0b3Igd2hlbiB0aGUgdmlldworICAgICAgICBpcyBsb2FkaW5nIHNvbWV0aGluZyB3aXRob3V0 IGhhdmluZyB0byBkZWFsIHdpdGggbG9hZC1jaGFuZ2VkCisgICAgICAgIHNpZ25hbCBhbmQgYWxs IHRoZSBkZXRhaWxzIG9mIHRoZSBsb2FkIHN0YXR1cy4gVGhpcyBhbHNvIGFsbG93cyB0bworICAg ICAgICBrbm93IHdoZW4gYSBuZXcgbG9hZCBpcyBzdGFydGVkIGJlZm9yZSBpdCBnb2VzIHRvIFNU QVJURUQgc3RhdHVzLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmll dy5jcHA6CisgICAgICAgICh3ZWJraXRXZWJWaWV3R2V0UHJvcGVydHkpOiBJbXBsZW1lbnQgZ2V0 dGVyIGZvciBpcy1sb2FkaW5nCisgICAgICAgIHByb3BlcnR5LgorICAgICAgICAod2Via2l0X3dl Yl92aWV3X2NsYXNzX2luaXQpOiBBZGQgaXMtbG9hZGluZyBwcm9wZXJ0eS4KKyAgICAgICAgKHdl YmtpdFdlYlZpZXdTZXRJc0xvYWRpbmcpOiBTZXQgd2hldGhlciB3ZWIgdmlldyBpcyBsb2FkaW5n IGEKKyAgICAgICAgcGFnZSBhbmQgZW1pdCBub3RpZnkgc2lnbmFsIGlmIHRoZSBpcy1sb2FkaW5n IHByb3BlcnR5IGhhcworICAgICAgICBjaGFuZ2VkLiBBbHNvIHVwZGF0ZSB0aGUgYWN0aXZlIFVS SSB3aGVuIGEgbmV3IGxvYWQgb3BlcmF0aW9uIGhhcworICAgICAgICBzdGFydGVkLgorICAgICAg ICAod2Via2l0V2ViVmlld0VtaXRMb2FkQ2hhbmdlZCk6IFNldCBpcy1sb2FkaW5nIHRvIEZBTFNF IHdoZW4gbG9hZAorICAgICAgICBmaW5pc2hlcy4KKyAgICAgICAgKHdlYmtpdFdlYlZpZXdMb2Fk RmFpbGVkKTogU2V0IGlzLWxvYWRpbmcgdG8gRkFMU0Ugd2hlbiBsb2FkIGZhaWxzLgorICAgICAg ICAod2Via2l0X3dlYl92aWV3X2xvYWRfdXJpKTogU2V0IGlzLWxvYWRpbmcgdG8gVFJVRS4KKyAg ICAgICAgKHdlYmtpdF93ZWJfdmlld19sb2FkX2h0bWwpOiBEaXR0by4KKyAgICAgICAgKHdlYmtp dF93ZWJfdmlld19sb2FkX2FsdGVybmF0ZV9odG1sKTogRGl0dG8uCisgICAgICAgICh3ZWJraXRf d2ViX3ZpZXdfbG9hZF9wbGFpbl90ZXh0KTogRGl0dG8uCisgICAgICAgICh3ZWJraXRfd2ViX3Zp ZXdfbG9hZF9yZXF1ZXN0KTogRGl0dG8uCisgICAgICAgICh3ZWJraXRfd2ViX3ZpZXdfcmVsb2Fk KTogRGl0dG8uCisgICAgICAgICh3ZWJraXRfd2ViX3ZpZXdfcmVsb2FkX2J5cGFzc19jYWNoZSk6 IERpdHRvLgorICAgICAgICAod2Via2l0X3dlYl92aWV3X2lzX2xvYWRpbmcpOiBSZXR1cm4gd2hl dGhlciB0aGUgdmlldyBpcyBsb2FkaW5nIGEKKyAgICAgICAgcGFnZS4KKyAgICAgICAgKHdlYmtp dF93ZWJfdmlld19nb19iYWNrKTogU2V0IGlzLWxvYWRpbmcgdG8gVFJVRS4KKyAgICAgICAgKHdl YmtpdF93ZWJfdmlld19nb19mb3J3YXJkKTogRGl0dG8uCisgICAgICAgICh3ZWJraXRfd2ViX3Zp ZXdfZ29fdG9fYmFja19mb3J3YXJkX2xpc3RfaXRlbSk6IERpdHRvLgorICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0 ay9kb2NzL3dlYmtpdDJndGstc2VjdGlvbnMudHh0OiBBZGQgbmV3IHN5bWJvbC4KKyAgICAgICAg KiBVSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9Mb2FkVHJhY2tpbmdUZXN0LmNwcDoKKyAgICAgICAg KGxvYWRDaGFuZ2VkQ2FsbGJhY2spOgorICAgICAgICAobG9hZEZhaWxlZENhbGxiYWNrKToKKyAg ICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0TG9hZGVyQ2xpZW50LmNwcDoKKyAg ICAgICAgKHRlc3RXZWJWaWV3SXNMb2FkaW5nKToKKyAgICAgICAgKGJlZm9yZUFsbCk6CisKIDIw MTItMDktMjAgIEV1bm1pIExlZSAgPGV1bm1pMTUubGVlQHNhbXN1bmcuY29tPgogCiAgICAgICAg IFtFRkxdW1dLMl0gQWRkIEFQSSB0byBmZWVkIHRvdWNoIGV2ZW50LgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5jcHAgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmNwcAppbmRleCAxZTZhYTdm Li45NjIyNjVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9X ZWJLaXRXZWJWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9X ZWJLaXRXZWJWaWV3LmNwcApAQCAtMTAzLDcgKzEwMyw4IEBAIGVudW0gewogICAgIFBST1BfVElU TEUsCiAgICAgUFJPUF9FU1RJTUFURURfTE9BRF9QUk9HUkVTUywKICAgICBQUk9QX1VSSSwKLSAg ICBQUk9QX1pPT01fTEVWRUwKKyAgICBQUk9QX1pPT01fTEVWRUwsCisgICAgUFJPUF9JU19MT0FE SU5HCiB9OwogCiB0eXBlZGVmIEhhc2hNYXA8dWludDY0X3QsIEdSZWZQdHI8V2ViS2l0V2ViUmVz b3VyY2U+ID4gTG9hZGluZ1Jlc291cmNlc01hcDsKQEAgLTExNSw2ICsxMTYsNyBAQCBzdHJ1Y3Qg X1dlYktpdFdlYlZpZXdQcml2YXRlIHsKICAgICBDU3RyaW5nIGN1c3RvbVRleHRFbmNvZGluZzsK ICAgICBkb3VibGUgZXN0aW1hdGVkTG9hZFByb2dyZXNzOwogICAgIENTdHJpbmcgYWN0aXZlVVJJ OworICAgIGJvb2wgaXNMb2FkaW5nOwogCiAgICAgYm9vbCB3YWl0aW5nRm9yTWFpblJlc291cmNl OwogICAgIGd1bG9uZyBtYWluUmVzb3VyY2VSZXNwb25zZUhhbmRsZXJJRDsKQEAgLTM4Niw2ICsz ODgsOSBAQCBzdGF0aWMgdm9pZCB3ZWJraXRXZWJWaWV3R2V0UHJvcGVydHkoR09iamVjdCogb2Jq ZWN0LCBndWludCBwcm9wSWQsIEdWYWx1ZSogdmFsdQogICAgIGNhc2UgUFJPUF9aT09NX0xFVkVM OgogICAgICAgICBnX3ZhbHVlX3NldF9kb3VibGUodmFsdWUsIHdlYmtpdF93ZWJfdmlld19nZXRf em9vbV9sZXZlbCh3ZWJWaWV3KSk7CiAgICAgICAgIGJyZWFrOworICAgIGNhc2UgUFJPUF9JU19M T0FESU5HOgorICAgICAgICBnX3ZhbHVlX3NldF9ib29sZWFuKHZhbHVlLCB3ZWJraXRfd2ViX3Zp ZXdfaXNfbG9hZGluZyh3ZWJWaWV3KSk7CisgICAgICAgIGJyZWFrOwogICAgIGRlZmF1bHQ6CiAg ICAgICAgIEdfT0JKRUNUX1dBUk5fSU5WQUxJRF9QUk9QRVJUWV9JRChvYmplY3QsIHByb3BJZCwg cGFyYW1TcGVjKTsKICAgICB9CkBAIC01MDYsNiArNTExLDM3IEBAIHN0YXRpYyB2b2lkIHdlYmtp dF93ZWJfdmlld19jbGFzc19pbml0KFdlYktpdFdlYlZpZXdDbGFzcyogd2ViVmlld0NsYXNzKQog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBX RUJLSVRfUEFSQU1fUkVBREFCTEUpKTsKIAogICAgIC8qKgorICAgICAqIFdlYktpdFdlYlZpZXc6 em9vbS1sZXZlbDoKKyAgICAgKgorICAgICAqIFRoZSB6b29tIGxldmVsIG9mIHRoZSAjV2ViS2l0 V2ViVmlldyBjb250ZW50LgorICAgICAqIFNlZSB3ZWJraXRfd2ViX3ZpZXdfc2V0X3pvb21fbGV2 ZWwoKSBmb3IgbW9yZSBkZXRhaWxzLgorICAgICAqLworICAgIGdfb2JqZWN0X2NsYXNzX2luc3Rh bGxfcHJvcGVydHkoZ09iamVjdENsYXNzLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgUFJPUF9aT09NX0xFVkVMLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgZ19wYXJhbV9zcGVjX2RvdWJsZSgiem9vbS1sZXZlbCIsCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJab29tIGxldmVsIiwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXygiVGhl IHpvb20gbGV2ZWwgb2YgdGhlIHZpZXcgY29udGVudCIpLAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAwLCBHX01BWERPVUJMRSwgMSwKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgV0VC S0lUX1BBUkFNX1JFQURXUklURSkpOworCisgICAgLyoqCisgICAgICogV2ViS2l0V2ViVmlldzpp cy1sb2FkaW5nOgorICAgICAqCisgICAgICogV2hldGhlciB0aGUgI1dlYktpdFdlYlZpZXcgaXMg Y3VycmVudGx5IGxvYWRpbmcgYSBwYWdlLiBUaGlzIHByb3BlcnR5IGJlY29tZXMKKyAgICAgKiAl VFJVRSBhcyBzb29uIGFzIGEgbmV3IGxvYWQgb3BlcmF0aW9uIGlzIHJlcXVlc3RlZCBhbmQgYmVm b3JlIHRoZQorICAgICAqICNXZWJLaXRXZWJWaWV3Ojpsb2FkLWNoYW5nZWQgc2lnbmFsIGlzIGVt aXR0ZWQgd2l0aCAlV0VCS0lUX0xPQURfU1RBUlRFRC4KKyAgICAgKiBXaGVuIHRoZSBsb2FkIG9w ZXJhdGlvbiBmaW5pc2hlcyB0aGUgcHJvcGVydHkgaXMgc2V0IHRvICVGQUxTRSBiZWZvcmUKKyAg ICAgKiAjV2ViS2l0V2ViVmlldzo6bG9hZC1jaGFuZ2VkIGlzIGVtaXR0ZWQgd2l0aCAlV0VCS0lU X0xPQURfRklOSVNIRUQuCisgICAgICovCisgICAgZ19vYmplY3RfY2xhc3NfaW5zdGFsbF9wcm9w ZXJ0eShnT2JqZWN0Q2xhc3MsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBQ Uk9QX0lTX0xPQURJTkcsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBnX3Bh cmFtX3NwZWNfYm9vbGVhbigiaXMtbG9hZGluZyIsCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiSXMgTG9hZGluZyIsCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBfKCJXaGV0aGVy IHRoZSB2aWV3IGlzIGxvYWRpbmcgYSBwYWdlIiksCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBGQUxTRSwKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFdFQktJVF9QQVJBTV9SRUFE QUJMRSkpOworCisgICAgLyoqCiAgICAgICogV2ViS2l0V2ViVmlldzo6bG9hZC1jaGFuZ2VkOgog ICAgICAqIEB3ZWJfdmlldzogdGhlICNXZWJLaXRXZWJWaWV3IG9uIHdoaWNoIHRoZSBzaWduYWwg aXMgZW1pdHRlZAogICAgICAqIEBsb2FkX2V2ZW50OiB0aGUgI1dlYktpdExvYWRFdmVudApAQCAt NTk5LDIwICs2MzUsNiBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3ZpZXdfY2xhc3NfaW5pdChX ZWJLaXRXZWJWaWV3Q2xhc3MqIHdlYlZpZXdDbGFzcykKICAgICAgICAgICAgICAgICAgICAgIEdf VFlQRV9QT0lOVEVSKTsKIAogICAgIC8qKgotICAgICAqIFdlYktpdFdlYlZpZXc6em9vbS1sZXZl bDoKLSAgICAgKgotICAgICAqIFRoZSB6b29tIGxldmVsIG9mIHRoZSAjV2ViS2l0V2ViVmlldyBj b250ZW50LgotICAgICAqIFNlZSB3ZWJraXRfd2ViX3ZpZXdfc2V0X3pvb21fbGV2ZWwoKSBmb3Ig bW9yZSBkZXRhaWxzLgotICAgICAqLwotICAgIGdfb2JqZWN0X2NsYXNzX2luc3RhbGxfcHJvcGVy dHkoZ09iamVjdENsYXNzLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgUFJP UF9aT09NX0xFVkVMLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZ19wYXJh bV9zcGVjX2RvdWJsZSgiem9vbS1sZXZlbCIsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICJab29tIGxldmVsIiwKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIlRoZSB6b29tIGxldmVs IG9mIHRoZSB2aWV3IGNvbnRlbnQiLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAwLCBHX01BWERPVUJMRSwgMSwKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgV0VCS0lUX1BBUkFNX1JF QURXUklURSkpOwotCi0gICAgLyoqCiAgICAgICogV2ViS2l0V2ViVmlldzo6Y3JlYXRlOgogICAg ICAqIEB3ZWJfdmlldzogdGhlICNXZWJLaXRXZWJWaWV3IG9uIHdoaWNoIHRoZSBzaWduYWwgaXMg ZW1pdHRlZAogICAgICAqCkBAIC0xMTA2LDYgKzExMjgsMTkgQEAgc3RhdGljIHZvaWQgd2Via2l0 X3dlYl92aWV3X2NsYXNzX2luaXQoV2ViS2l0V2ViVmlld0NsYXNzKiB3ZWJWaWV3Q2xhc3MpCiAg ICAgICAgICAgICAgICAgICAgICBXRUJLSVRfVFlQRV9GT1JNX1NVQk1JU1NJT05fUkVRVUVTVCk7 CiB9CiAKK3N0YXRpYyB2b2lkIHdlYmtpdFdlYlZpZXdTZXRJc0xvYWRpbmcoV2ViS2l0V2ViVmll dyogd2ViVmlldywgYm9vbCBpc0xvYWRpbmcpCit7CisgICAgaWYgKHdlYlZpZXctPnByaXYtPmlz TG9hZGluZyA9PSBpc0xvYWRpbmcpCisgICAgICAgIHJldHVybjsKKworICAgIHdlYlZpZXctPnBy aXYtPmlzTG9hZGluZyA9IGlzTG9hZGluZzsKKyAgICBnX29iamVjdF9ub3RpZnkoR19PQkpFQ1Qo d2ViVmlldyksICJpcy1sb2FkaW5nIik7CisKKyAgICAvLyBVcGRhdGUgdGhlIFVSSSBpZiBhIG5l dyBsb2FkIGhhcyBzdGFydGVkLgorICAgIGlmICh3ZWJWaWV3LT5wcml2LT5pc0xvYWRpbmcpCisg ICAgICAgIHdlYmtpdFdlYlZpZXdVcGRhdGVVUkkod2ViVmlldyk7Cit9CisKIHN0YXRpYyB2b2lk IHNldENlcnRpZmljYXRlVG9NYWluUmVzb3VyY2UoV2ViS2l0V2ViVmlldyogd2ViVmlldykKIHsK ICAgICBXZWJLaXRXZWJWaWV3UHJpdmF0ZSogcHJpdiA9IHdlYlZpZXctPnByaXY7CkBAIC0xMTE4 LDYgKzExNTMsNyBAQCBzdGF0aWMgdm9pZCBzZXRDZXJ0aWZpY2F0ZVRvTWFpblJlc291cmNlKFdl YktpdFdlYlZpZXcqIHdlYlZpZXcpCiBzdGF0aWMgdm9pZCB3ZWJraXRXZWJWaWV3RW1pdExvYWRD aGFuZ2VkKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcsIFdlYktpdExvYWRFdmVudCBsb2FkRXZlbnQp CiB7CiAgICAgaWYgKGxvYWRFdmVudCA9PSBXRUJLSVRfTE9BRF9GSU5JU0hFRCkgeworICAgICAg ICB3ZWJraXRXZWJWaWV3U2V0SXNMb2FkaW5nKHdlYlZpZXcsIGZhbHNlKTsKICAgICAgICAgd2Vi Vmlldy0+cHJpdi0+d2FpdGluZ0Zvck1haW5SZXNvdXJjZSA9IGZhbHNlOwogICAgICAgICB3ZWJr aXRXZWJWaWV3RGlzY29ubmVjdE1haW5SZXNvdXJjZVJlc3BvbnNlQ2hhbmdlZFNpZ25hbEhhbmRs ZXIod2ViVmlldyk7CiAgICAgfSBlbHNlCkBAIC0xMTY3LDYgKzEyMDMsNyBAQCB2b2lkIHdlYmtp dFdlYlZpZXdMb2FkQ2hhbmdlZChXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBXZWJLaXRMb2FkRXZl bnQgbG9hZEV2ZW50KQogCiB2b2lkIHdlYmtpdFdlYlZpZXdMb2FkRmFpbGVkKFdlYktpdFdlYlZp ZXcqIHdlYlZpZXcsIFdlYktpdExvYWRFdmVudCBsb2FkRXZlbnQsIGNvbnN0IGNoYXIqIGZhaWxp bmdVUkksIEdFcnJvciAqZXJyb3IpCiB7CisgICAgd2Via2l0V2ViVmlld1NldElzTG9hZGluZyh3 ZWJWaWV3LCBmYWxzZSk7CiAgICAgZ2Jvb2xlYW4gcmV0dXJuVmFsdWU7CiAgICAgZ19zaWduYWxf ZW1pdCh3ZWJWaWV3LCBzaWduYWxzW0xPQURfRkFJTEVEXSwgMCwgbG9hZEV2ZW50LCBmYWlsaW5n VVJJLCBlcnJvciwgJnJldHVyblZhbHVlKTsKICAgICBnX3NpZ25hbF9lbWl0KHdlYlZpZXcsIHNp Z25hbHNbTE9BRF9DSEFOR0VEXSwgMCwgV0VCS0lUX0xPQURfRklOSVNIRUQpOwpAQCAtMTUyMSw3 ICsxNTU4LDcgQEAgdm9pZCB3ZWJraXRfd2ViX3ZpZXdfbG9hZF91cmkoV2ViS2l0V2ViVmlldyog d2ViVmlldywgY29uc3QgZ2NoYXIqIHVyaSkKICAgICBXS1JldGFpblB0cjxXS1VSTFJlZj4gdXJs KEFkb3B0V0ssIFdLVVJMQ3JlYXRlV2l0aFVURjhDU3RyaW5nKHVyaSkpOwogICAgIFdlYlBhZ2VQ cm94eSogcGFnZSA9IHdlYmtpdFdlYlZpZXdCYXNlR2V0UGFnZShXRUJLSVRfV0VCX1ZJRVdfQkFT RSh3ZWJWaWV3KSk7CiAgICAgV0tQYWdlTG9hZFVSTCh0b0FQSShwYWdlKSwgdXJsLmdldCgpKTsK LSAgICB3ZWJraXRXZWJWaWV3VXBkYXRlVVJJKHdlYlZpZXcpOworICAgIHdlYmtpdFdlYlZpZXdT ZXRJc0xvYWRpbmcod2ViVmlldywgdHJ1ZSk7CiB9CiAKIC8qKgpAQCAtMTU0OSw2ICsxNTg2LDcg QEAgdm9pZCB3ZWJraXRfd2ViX3ZpZXdfbG9hZF9odG1sKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcs IGNvbnN0IGdjaGFyKiBjb250ZW50LCBjb24KICAgICBXS1JldGFpblB0cjxXS1N0cmluZ1JlZj4g Y29udGVudFJlZihBZG9wdFdLLCAgV0tTdHJpbmdDcmVhdGVXaXRoVVRGOENTdHJpbmcoY29udGVu dCkpOwogICAgIFdLUmV0YWluUHRyPFdLVVJMUmVmPiBiYXNlVVJJUmVmID0gYmFzZVVSSSA/IGFk b3B0V0soV0tVUkxDcmVhdGVXaXRoVVRGOENTdHJpbmcoYmFzZVVSSSkpIDogMDsKICAgICBXS1Bh Z2VMb2FkSFRNTFN0cmluZyh0b0FQSShwYWdlKSwgY29udGVudFJlZi5nZXQoKSwgYmFzZVVSSVJl Zi5nZXQoKSk7CisgICAgd2Via2l0V2ViVmlld1NldElzTG9hZGluZyh3ZWJWaWV3LCB0cnVlKTsK IH0KIAogLyoqCkBAIC0xNTc1LDcgKzE2MTMsNyBAQCB2b2lkIHdlYmtpdF93ZWJfdmlld19sb2Fk X2FsdGVybmF0ZV9odG1sKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcsIGNvbnN0IGdjaGFyKiBjbwog ICAgIFdLUmV0YWluUHRyPFdLVVJMUmVmPiBiYXNlVVJMID0gYmFzZVVSSSA/IGFkb3B0V0soV0tV UkxDcmVhdGVXaXRoVVRGOENTdHJpbmcoYmFzZVVSSSkpIDogMDsKICAgICBXZWJQYWdlUHJveHkq IHBhZ2UgPSB3ZWJraXRXZWJWaWV3QmFzZUdldFBhZ2UoV0VCS0lUX1dFQl9WSUVXX0JBU0Uod2Vi VmlldykpOwogICAgIFdLUGFnZUxvYWRBbHRlcm5hdGVIVE1MU3RyaW5nKHRvQVBJKHBhZ2UpLCBo dG1sU3RyaW5nLmdldCgpLCBiYXNlVVJMLmdldCgpLCBjb250ZW50VVJMLmdldCgpKTsKLSAgICB3 ZWJraXRXZWJWaWV3VXBkYXRlVVJJKHdlYlZpZXcpOworICAgIHdlYmtpdFdlYlZpZXdTZXRJc0xv YWRpbmcod2ViVmlldywgdHJ1ZSk7CiB9CiAKIC8qKgpAQCAtMTU5NSw2ICsxNjMzLDcgQEAgdm9p ZCB3ZWJraXRfd2ViX3ZpZXdfbG9hZF9wbGFpbl90ZXh0KFdlYktpdFdlYlZpZXcqIHdlYlZpZXcs IGNvbnN0IGdjaGFyKiBwbGFpblQKICAgICBXZWJQYWdlUHJveHkqIHBhZ2UgPSB3ZWJraXRXZWJW aWV3QmFzZUdldFBhZ2UoV0VCS0lUX1dFQl9WSUVXX0JBU0Uod2ViVmlldykpOwogICAgIFdLUmV0 YWluUHRyPFdLU3RyaW5nUmVmPiBwbGFpblRleHRSZWYoQWRvcHRXSywgV0tTdHJpbmdDcmVhdGVX aXRoVVRGOENTdHJpbmcocGxhaW5UZXh0KSk7CiAgICAgV0tQYWdlTG9hZFBsYWluVGV4dFN0cmlu Zyh0b0FQSShwYWdlKSwgcGxhaW5UZXh0UmVmLmdldCgpKTsKKyAgICB3ZWJraXRXZWJWaWV3U2V0 SXNMb2FkaW5nKHdlYlZpZXcsIHRydWUpOwogfQogCiAvKioKQEAgLTE2MTUsNyArMTY1NCw3IEBA IHZvaWQgd2Via2l0X3dlYl92aWV3X2xvYWRfcmVxdWVzdChXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3 LCBXZWJLaXRVUklSZXF1ZXN0KiByZXF1CiAgICAgV0tSZXRhaW5QdHI8V0tVUkxSZXF1ZXN0UmVm PiB3a1JlcXVlc3QoQWRvcHRXSywgV0tVUkxSZXF1ZXN0Q3JlYXRlV2l0aFdLVVJMKHdrVVJMLmdl dCgpKSk7CiAgICAgV2ViUGFnZVByb3h5KiBwYWdlID0gd2Via2l0V2ViVmlld0Jhc2VHZXRQYWdl KFdFQktJVF9XRUJfVklFV19CQVNFKHdlYlZpZXcpKTsKICAgICBXS1BhZ2VMb2FkVVJMUmVxdWVz dCh0b0FQSShwYWdlKSwgd2tSZXF1ZXN0LmdldCgpKTsKLSAgICB3ZWJraXRXZWJWaWV3VXBkYXRl VVJJKHdlYlZpZXcpOworICAgIHdlYmtpdFdlYlZpZXdTZXRJc0xvYWRpbmcod2ViVmlldywgdHJ1 ZSk7CiB9CiAKIC8qKgpAQCAtMTY0Nyw3ICsxNjg2LDcgQEAgdm9pZCB3ZWJraXRfd2ViX3ZpZXdf cmVsb2FkKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpCiAgICAgZ19yZXR1cm5faWZfZmFpbChXRUJL SVRfSVNfV0VCX1ZJRVcod2ViVmlldykpOwogCiAgICAgV0tQYWdlUmVsb2FkKHRvQVBJKHdlYmtp dFdlYlZpZXdCYXNlR2V0UGFnZShXRUJLSVRfV0VCX1ZJRVdfQkFTRSh3ZWJWaWV3KSkpKTsKLSAg ICB3ZWJraXRXZWJWaWV3VXBkYXRlVVJJKHdlYlZpZXcpOworICAgIHdlYmtpdFdlYlZpZXdTZXRJ c0xvYWRpbmcod2ViVmlldywgdHJ1ZSk7CiB9CiAKIC8qKgpAQCAtMTY2Miw3ICsxNzAxLDcgQEAg dm9pZCB3ZWJraXRfd2ViX3ZpZXdfcmVsb2FkX2J5cGFzc19jYWNoZShXZWJLaXRXZWJWaWV3KiB3 ZWJWaWV3KQogICAgIGdfcmV0dXJuX2lmX2ZhaWwoV0VCS0lUX0lTX1dFQl9WSUVXKHdlYlZpZXcp KTsKIAogICAgIFdLUGFnZVJlbG9hZEZyb21PcmlnaW4odG9BUEkod2Via2l0V2ViVmlld0Jhc2VH ZXRQYWdlKFdFQktJVF9XRUJfVklFV19CQVNFKHdlYlZpZXcpKSkpOwotICAgIHdlYmtpdFdlYlZp ZXdVcGRhdGVVUkkod2ViVmlldyk7CisgICAgd2Via2l0V2ViVmlld1NldElzTG9hZGluZyh3ZWJW aWV3LCB0cnVlKTsKIH0KIAogLyoqCkBAIC0xNjgzLDYgKzE3MjIsMjYgQEAgdm9pZCB3ZWJraXRf d2ViX3ZpZXdfc3RvcF9sb2FkaW5nKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpCiB9CiAKIC8qKgor ICogd2Via2l0X3dlYl92aWV3X2lzX2xvYWRpbmc6CisgKiBAd2ViX3ZpZXc6IGEgI1dlYktpdFdl YlZpZXcKKyAqCisgKiBHZXRzIHRoZSB2YWx1ZSBvZiB0aGUgI1dlYktpdFdlYlZpZXc6aXMtbG9h ZGluZyBwcm9wZXJ0eS4KKyAqIFlvdSBjYW4gbW9uaXRvciB3aGVuIGEgI1dlYktpdFdlYlZpZXcg aXMgbG9hZGluZyBhIHBhZ2UgYnkgY29ubmVjdGluZyB0bworICogbm90aWZ5Ojppcy1sb2FkaW5n IHNpZ25hbCBvZiBAd2ViX3ZpZXcuIFRoaXMgaXMgdXNlZnVsIHdoZW4geW91IGFyZQorICogaW50 ZXJlc3RpbmcgaW4ga25vd2luZyB3aGVuIHRoZSB2aWV3IGlzIGxvZGluZyBzb21ldGhpbmcgYnV0 IG5vdCBpbiB0aGUKKyAqIGRldGFpbHMgYWJvdXQgdGhlIHN0YXR1cyBvZiB0aGUgbG9hZCBvcGVy YXRpb24sIGZvciBleGFtcGxlIHRvIHN0YXJ0IGEgc3Bpbm5lcgorICogd2hlbiB0aGUgdmlldyBp cyBsb2FkaW5nIGEgcGFnZSBhbmQgc3RvcCBpdCB3aGVuIGl0IGZpbmlzaGVzLgorICoKKyAqIFJl dHVybnM6ICVUUlVFIGlmIEB3ZWJfdmlldyBpcyBsb2FkaW5nIGEgcGFnZSBvciAlRkFMU0Ugb3Ro ZXJ3aXNlLgorICovCitnYm9vbGVhbiB3ZWJraXRfd2ViX3ZpZXdfaXNfbG9hZGluZyhXZWJLaXRX ZWJWaWV3KiB3ZWJWaWV3KQoreworICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKFdFQktJVF9JU19X RUJfVklFVyh3ZWJWaWV3KSwgRkFMU0UpOworCisgICAgcmV0dXJuIHdlYlZpZXctPnByaXYtPmlz TG9hZGluZzsKK30KKworLyoqCiAgKiB3ZWJraXRfd2ViX3ZpZXdfZ29fYmFjazoKICAqIEB3ZWJf dmlldzogYSAjV2ViS2l0V2ViVmlldwogICoKQEAgLTE2OTUsNyArMTc1NCw3IEBAIHZvaWQgd2Vi a2l0X3dlYl92aWV3X2dvX2JhY2soV2ViS2l0V2ViVmlldyogd2ViVmlldykKICAgICBnX3JldHVy bl9pZl9mYWlsKFdFQktJVF9JU19XRUJfVklFVyh3ZWJWaWV3KSk7CiAKICAgICBXS1BhZ2VHb0Jh Y2sodG9BUEkod2Via2l0V2ViVmlld0Jhc2VHZXRQYWdlKFdFQktJVF9XRUJfVklFV19CQVNFKHdl YlZpZXcpKSkpOwotICAgIHdlYmtpdFdlYlZpZXdVcGRhdGVVUkkod2ViVmlldyk7CisgICAgd2Vi a2l0V2ViVmlld1NldElzTG9hZGluZyh3ZWJWaWV3LCB0cnVlKTsKIH0KIAogLyoqCkBAIC0xNzI2 LDcgKzE3ODUsNyBAQCB2b2lkIHdlYmtpdF93ZWJfdmlld19nb19mb3J3YXJkKFdlYktpdFdlYlZp ZXcqIHdlYlZpZXcpCiAgICAgZ19yZXR1cm5faWZfZmFpbChXRUJLSVRfSVNfV0VCX1ZJRVcod2Vi VmlldykpOwogCiAgICAgV0tQYWdlR29Gb3J3YXJkKHRvQVBJKHdlYmtpdFdlYlZpZXdCYXNlR2V0 UGFnZShXRUJLSVRfV0VCX1ZJRVdfQkFTRSh3ZWJWaWV3KSkpKTsKLSAgICB3ZWJraXRXZWJWaWV3 VXBkYXRlVVJJKHdlYlZpZXcpOworICAgIHdlYmtpdFdlYlZpZXdTZXRJc0xvYWRpbmcod2ViVmll dywgdHJ1ZSk7CiB9CiAKIC8qKgpAQCAtMTkwMCw3ICsxOTU5LDcgQEAgdm9pZCB3ZWJraXRfd2Vi X3ZpZXdfZ29fdG9fYmFja19mb3J3YXJkX2xpc3RfaXRlbShXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3 LCBXZWJLaXQKIAogICAgIFdLUGFnZUdvVG9CYWNrRm9yd2FyZExpc3RJdGVtKHRvQVBJKHdlYmtp dFdlYlZpZXdCYXNlR2V0UGFnZShXRUJLSVRfV0VCX1ZJRVdfQkFTRSh3ZWJWaWV3KSkpLAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHdlYmtpdEJhY2tGb3J3YXJkTGlzdEl0ZW1H ZXRXS0l0ZW0obGlzdEl0ZW0pKTsKLSAgICB3ZWJraXRXZWJWaWV3VXBkYXRlVVJJKHdlYlZpZXcp OworICAgIHdlYmtpdFdlYlZpZXdTZXRJc0xvYWRpbmcod2ViVmlldywgdHJ1ZSk7CiB9CiAKIC8q KgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2Vi Vmlldy5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5o CmluZGV4IDU0MDAxNGEuLjhhMzk3YjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmgKQEAgLTIyNiw2ICsyMjYsOSBAQCB3ZWJraXRfd2Vi X3ZpZXdfbG9hZF9yZXF1ZXN0ICAgICAgICAgICAgICAgICAgICAgICAoV2ViS2l0V2ViVmlldyAg ICAgICAgICAgICAqdwogV0VCS0lUX0FQSSB2b2lkCiB3ZWJraXRfd2ViX3ZpZXdfc3RvcF9sb2Fk aW5nICAgICAgICAgICAgICAgICAgICAgICAoV2ViS2l0V2ViVmlldyAgICAgICAgICAgICAqd2Vi X3ZpZXcpOwogCitXRUJLSVRfQVBJIGdib29sZWFuCit3ZWJraXRfd2ViX3ZpZXdfaXNfbG9hZGlu ZyAgICAgICAgICAgICAgICAgICAgICAgICAoV2ViS2l0V2ViVmlldyAgICAgICAgICAgICAqd2Vi X3ZpZXcpOworCiBXRUJLSVRfQVBJIGNvbnN0IGdjaGFyICoKIHdlYmtpdF93ZWJfdmlld19nZXRf dGl0bGUgICAgICAgICAgICAgICAgICAgICAgICAgIChXZWJLaXRXZWJWaWV3ICAgICAgICAgICAg ICp3ZWJfdmlldyk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv Z3RrL2RvY3Mvd2Via2l0Mmd0ay1zZWN0aW9ucy50eHQgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL2d0ay9kb2NzL3dlYmtpdDJndGstc2VjdGlvbnMudHh0CmluZGV4IDczZGVmZTQuLjRm NWIzNmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL2RvY3Mv d2Via2l0Mmd0ay1zZWN0aW9ucy50eHQKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9ndGsvZG9jcy93ZWJraXQyZ3RrLXNlY3Rpb25zLnR4dApAQCAtODgsNiArODgsNyBAQCB3ZWJr aXRfd2ViX3ZpZXdfZ2V0X3RpdGxlCiB3ZWJraXRfd2ViX3ZpZXdfcmVsb2FkCiB3ZWJraXRfd2Vi X3ZpZXdfcmVsb2FkX2J5cGFzc19jYWNoZQogd2Via2l0X3dlYl92aWV3X3N0b3BfbG9hZGluZwor d2Via2l0X3dlYl92aWV3X2lzX2xvYWRpbmcKIHdlYmtpdF93ZWJfdmlld19nZXRfZXN0aW1hdGVk X2xvYWRfcHJvZ3Jlc3MKIHdlYmtpdF93ZWJfdmlld19nZXRfY3VzdG9tX2NoYXJzZXQKIHdlYmtp dF93ZWJfdmlld19zZXRfY3VzdG9tX2NoYXJzZXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL0xvYWRUcmFja2luZ1Rlc3QuY3BwIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvTG9hZFRyYWNraW5nVGVzdC5jcHAKaW5kZXgg ZDM3MGRlOS4uYjkwNDExMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9ndGsvdGVzdHMvTG9hZFRyYWNraW5nVGVzdC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9ndGsvdGVzdHMvTG9hZFRyYWNraW5nVGVzdC5jcHAKQEAgLTI2LDE2ICsyNiwx OSBAQCBzdGF0aWMgdm9pZCBsb2FkQ2hhbmdlZENhbGxiYWNrKFdlYktpdFdlYlZpZXcqIHdlYlZp ZXcsIFdlYktpdExvYWRFdmVudCBsb2FkRXZlbgogewogICAgIHN3aXRjaCAobG9hZEV2ZW50KSB7 CiAgICAgY2FzZSBXRUJLSVRfTE9BRF9TVEFSVEVEOgorICAgICAgICBnX2Fzc2VydCh3ZWJraXRf d2ViX3ZpZXdfaXNfbG9hZGluZyh3ZWJWaWV3KSk7CiAgICAgICAgIGdfYXNzZXJ0X2NtcHN0cih0 ZXN0LT5tX2FjdGl2ZVVSSS5kYXRhKCksID09LCB3ZWJraXRfd2ViX3ZpZXdfZ2V0X3VyaSh3ZWJW aWV3KSk7CiAgICAgICAgIHRlc3QtPnByb3Zpc2lvbmFsTG9hZFN0YXJ0ZWQoKTsKICAgICAgICAg YnJlYWs7CiAgICAgY2FzZSBXRUJLSVRfTE9BRF9SRURJUkVDVEVEOgorICAgICAgICBnX2Fzc2Vy dCh3ZWJraXRfd2ViX3ZpZXdfaXNfbG9hZGluZyh3ZWJWaWV3KSk7CiAgICAgICAgIHRlc3QtPm1f YWN0aXZlVVJJID0gd2Via2l0X3dlYl92aWV3X2dldF91cmkod2ViVmlldyk7CiAgICAgICAgIGlm ICghdGVzdC0+bV9yZWRpcmVjdFVSSS5pc051bGwoKSkKICAgICAgICAgICAgIGdfYXNzZXJ0X2Nt cHN0cih0ZXN0LT5tX3JlZGlyZWN0VVJJLmRhdGEoKSwgPT0sIHRlc3QtPm1fYWN0aXZlVVJJLmRh dGEoKSk7CiAgICAgICAgIHRlc3QtPnByb3Zpc2lvbmFsTG9hZFJlY2VpdmVkU2VydmVyUmVkaXJl Y3QoKTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBXRUJLSVRfTE9BRF9DT01NSVRURUQ6IHsK KyAgICAgICAgZ19hc3NlcnQod2Via2l0X3dlYl92aWV3X2lzX2xvYWRpbmcod2ViVmlldykpOwog ICAgICAgICBnX2Fzc2VydF9jbXBzdHIodGVzdC0+bV9hY3RpdmVVUkkuZGF0YSgpLCA9PSwgd2Vi a2l0X3dlYl92aWV3X2dldF91cmkod2ViVmlldykpOwogCiAgICAgICAgIC8vIENoZWNrIHRoYXQg b24gY29tbWl0dGVkIHdlIGFsd2F5cyBoYXZlIGEgbWFpbiByZXNvdXJjZSB3aXRoIGEgcmVzcG9u c2UuCkBAIC00Nyw2ICs1MCw3IEBAIHN0YXRpYyB2b2lkIGxvYWRDaGFuZ2VkQ2FsbGJhY2soV2Vi S2l0V2ViVmlldyogd2ViVmlldywgV2ViS2l0TG9hZEV2ZW50IGxvYWRFdmVuCiAgICAgICAgIGJy ZWFrOwogICAgIH0KICAgICBjYXNlIFdFQktJVF9MT0FEX0ZJTklTSEVEOgorICAgICAgICBnX2Fz c2VydCghd2Via2l0X3dlYl92aWV3X2lzX2xvYWRpbmcod2ViVmlldykpOwogICAgICAgICBpZiAo IXRlc3QtPm1fbG9hZEZhaWxlZCkKICAgICAgICAgICAgIGdfYXNzZXJ0X2NtcHN0cih0ZXN0LT5t X2FjdGl2ZVVSSS5kYXRhKCksID09LCB3ZWJraXRfd2ViX3ZpZXdfZ2V0X3VyaSh3ZWJWaWV3KSk7 CiAgICAgICAgIHRlc3QtPmxvYWRGaW5pc2hlZCgpOwpAQCAtNjIsMTEgKzY2LDEzIEBAIHN0YXRp YyB2b2lkIGxvYWRGYWlsZWRDYWxsYmFjayhXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBXZWJLaXRM b2FkRXZlbnQgbG9hZEV2ZW50CiAKICAgICBzd2l0Y2ggKGxvYWRFdmVudCkgewogICAgIGNhc2Ug V0VCS0lUX0xPQURfU1RBUlRFRDoKKyAgICAgICAgZ19hc3NlcnQoIXdlYmtpdF93ZWJfdmlld19p c19sb2FkaW5nKHdlYlZpZXcpKTsKICAgICAgICAgZ19hc3NlcnRfY21wc3RyKHRlc3QtPm1fYWN0 aXZlVVJJLmRhdGEoKSwgPT0sIHdlYmtpdF93ZWJfdmlld19nZXRfdXJpKHdlYlZpZXcpKTsKICAg ICAgICAgZ19hc3NlcnQoZXJyb3IpOwogICAgICAgICB0ZXN0LT5wcm92aXNpb25hbExvYWRGYWls ZWQoZmFpbGluZ1VSSSwgZXJyb3IpOwogICAgICAgICBicmVhazsKICAgICBjYXNlIFdFQktJVF9M T0FEX0NPTU1JVFRFRDoKKyAgICAgICAgZ19hc3NlcnQoIXdlYmtpdF93ZWJfdmlld19pc19sb2Fk aW5nKHdlYlZpZXcpKTsKICAgICAgICAgZ19hc3NlcnRfY21wc3RyKHRlc3QtPm1fYWN0aXZlVVJJ LmRhdGEoKSwgPT0sIHdlYmtpdF93ZWJfdmlld19nZXRfdXJpKHdlYlZpZXcpKTsKICAgICAgICAg Z19hc3NlcnQoZXJyb3IpOwogICAgICAgICB0ZXN0LT5sb2FkRmFpbGVkKGZhaWxpbmdVUkksIGVy cm9yKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3Rz L1Rlc3RMb2FkZXJDbGllbnQuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsv dGVzdHMvVGVzdExvYWRlckNsaWVudC5jcHAKaW5kZXggZGFiZjA3Mi4uN2VmOTEyMiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVzdExvYWRlckNs aWVudC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVz dExvYWRlckNsaWVudC5jcHAKQEAgLTIyNiw2ICsyMjYsNzcgQEAgc3RhdGljIHZvaWQgdGVzdFdl YlZpZXdBY3RpdmVVUkkoVmlld1VSSVRyYWNraW5nVGVzdCogdGVzdCwgZ2NvbnN0cG9pbnRlcikK ICAgICB0ZXN0LT53YWl0VW50aWxMb2FkRmluaXNoZWQoKTsKIH0KIAorY2xhc3MgVmlld0lzTG9h ZGluZ1Rlc3Q6IHB1YmxpYyBMb2FkVHJhY2tpbmdUZXN0IHsKK3B1YmxpYzoKKyAgICBNQUtFX0dM SUJfVEVTVF9GSVhUVVJFKFZpZXdJc0xvYWRpbmdUZXN0KTsKKworICAgIHN0YXRpYyB2b2lkIGlz TG9hZGluZ0NoYW5nZWQoR09iamVjdCosIEdQYXJhbVNwZWMqLCBWaWV3SXNMb2FkaW5nVGVzdCog dGVzdCkKKyAgICB7CisgICAgICAgIGlmICh3ZWJraXRfd2ViX3ZpZXdfaXNfbG9hZGluZyh0ZXN0 LT5tX3dlYlZpZXcpKQorICAgICAgICAgICAgdGVzdC0+YmVnaW5Mb2FkKCk7CisgICAgICAgIGVs c2UKKyAgICAgICAgICAgIHRlc3QtPmVuZExvYWQoKTsKKyAgICB9CisKKyAgICBzdGF0aWMgdm9p ZCB1cmlDaGFuZ2VkKEdPYmplY3QqLCBHUGFyYW1TcGVjKiwgVmlld0lzTG9hZGluZ1Rlc3QqIHRl c3QpCisgICAgeworICAgICAgICB0ZXN0LT5tX2N1cnJlbnRVUkkgPSB3ZWJraXRfd2ViX3ZpZXdf Z2V0X3VyaSh0ZXN0LT5tX3dlYlZpZXcpOworICAgIH0KKworICAgIFZpZXdJc0xvYWRpbmdUZXN0 KCkKKyAgICB7CisgICAgICAgIGdfc2lnbmFsX2Nvbm5lY3QobV93ZWJWaWV3LCAibm90aWZ5Ojpp cy1sb2FkaW5nIiwgR19DQUxMQkFDSyhpc0xvYWRpbmdDaGFuZ2VkKSwgdGhpcyk7CisgICAgICAg IGdfc2lnbmFsX2Nvbm5lY3QobV93ZWJWaWV3LCAibm90aWZ5Ojp1cmkiLCBHX0NBTExCQUNLKHVy aUNoYW5nZWQpLCB0aGlzKTsKKyAgICB9CisKKyAgICB2b2lkIGJlZ2luTG9hZCgpCisgICAgewor ICAgICAgICAvLyBOZXcgbG9hZCwgbG9hZC1zdGFydGVkIGhhc24ndCBiZWVuIGVtaXR0ZWQgeWV0 LCBhbmQgdXJpIGNoYW5nZSBoYXNuJ3QgYmVlbiBub3RpZmllZC4KKyAgICAgICAgZ19hc3NlcnQo bV9sb2FkRXZlbnRzLmlzRW1wdHkoKSk7CisgICAgICAgIGdfYXNzZXJ0X2NtcHN0cihtX2N1cnJl bnRVUkkuZGF0YSgpLCAhPSwgbV9hY3RpdmVVUkkuZGF0YSgpKTsKKyAgICB9CisKKyAgICB2b2lk IGVuZExvYWQoKQorICAgIHsKKyAgICAgICAgLy8gTG9hZCBmaW5pc2gsIGxvYWQtZmluaXNoZWQg YW5kIGxvYWQtZmFpbGVkIGhhdmVuJ3QgYmVlbiBlbWl0dGVkIHlldC4KKyAgICAgICAgZ19hc3Nl cnQoIW1fbG9hZEV2ZW50cy5pc0VtcHR5KCkpOworICAgICAgICBnX2Fzc2VydCghbV9sb2FkRXZl bnRzLmNvbnRhaW5zKExvYWRUcmFja2luZ1Rlc3Q6OkxvYWRGaW5pc2hlZCkpOworICAgICAgICBn X2Fzc2VydCghbV9sb2FkRXZlbnRzLmNvbnRhaW5zKExvYWRUcmFja2luZ1Rlc3Q6OkxvYWRGYWls ZWQpKTsKKyAgICB9CisKKyAgICB2b2lkIHJlbG9hZCgpCisgICAgeworICAgICAgICAvLyBSZXNl dCB0aGUgY3VycmVudFVSSSBpbiBjYXNlIG9mIHJlbG9hZC4KKyAgICAgICAgbV9jdXJyZW50VVJJ ID0gQ1N0cmluZygpOworICAgICAgICBMb2FkVHJhY2tpbmdUZXN0OjpyZWxvYWQoKTsKKyAgICB9 CisKKyAgICBDU3RyaW5nIG1fY3VycmVudFVSSTsKK307CisKK3N0YXRpYyB2b2lkIHRlc3RXZWJW aWV3SXNMb2FkaW5nKFZpZXdJc0xvYWRpbmdUZXN0KiB0ZXN0LCBnY29uc3Rwb2ludGVyKQorewor ICAgIHRlc3QtPmxvYWRVUkkoa1NlcnZlci0+Z2V0VVJJRm9yUGF0aCgiL25vcm1hbCIpLmRhdGEo KSk7CisgICAgdGVzdC0+d2FpdFVudGlsTG9hZEZpbmlzaGVkKCk7CisKKyAgICB0ZXN0LT5yZWxv YWQoKTsKKyAgICB0ZXN0LT53YWl0VW50aWxMb2FkRmluaXNoZWQoKTsKKworICAgIHRlc3QtPmxv YWRVUkkoa1NlcnZlci0+Z2V0VVJJRm9yUGF0aCgiL2Vycm9yIikuZGF0YSgpKTsKKyAgICB0ZXN0 LT53YWl0VW50aWxMb2FkRmluaXNoZWQoKTsKKworICAgIHRlc3QtPmxvYWRVUkkoa1NlcnZlci0+ Z2V0VVJJRm9yUGF0aCgiL25vcm1hbCIpLmRhdGEoKSk7CisgICAgdGVzdC0+d2FpdFVudGlsTG9h ZEZpbmlzaGVkKCk7CisgICAgdGVzdC0+bG9hZFVSSShrU2VydmVyLT5nZXRVUklGb3JQYXRoKCIv bm9ybWFsMiIpLmRhdGEoKSk7CisgICAgdGVzdC0+d2FpdFVudGlsTG9hZEZpbmlzaGVkKCk7CisK KyAgICB0ZXN0LT5nb0JhY2soKTsKKyAgICB0ZXN0LT53YWl0VW50aWxMb2FkRmluaXNoZWQoKTsK KworICAgIHRlc3QtPmdvRm9yd2FyZCgpOworICAgIHRlc3QtPndhaXRVbnRpbExvYWRGaW5pc2hl ZCgpOworfQorCiBzdGF0aWMgdm9pZCBzZXJ2ZXJDYWxsYmFjayhTb3VwU2VydmVyKiBzZXJ2ZXIs IFNvdXBNZXNzYWdlKiBtZXNzYWdlLCBjb25zdCBjaGFyKiBwYXRoLCBHSGFzaFRhYmxlKiwgU291 cENsaWVudENvbnRleHQqLCBncG9pbnRlcikKIHsKICAgICBzdGF0aWMgY29uc3QgY2hhciogcmVz cG9uc2VTdHJpbmcgPSAiPGh0bWw+PGJvZHk+VGVzdGluZyFUZXN0aW5nIVRlc3RpbmchVGVzdGlu ZyFUZXN0aW5nIVRlc3RpbmchVGVzdGluZyEiCkBAIC0yODEsNiArMzUyLDggQEAgdm9pZCBiZWZv cmVBbGwoKQogICAgIC8vIFRoaXMgdGVzdCBjaGVja3MgdGhhdCB3ZWIgdmlldyBub3RpZnk6OnVy aSBzaWduYWwgaXMgY29ycmVjdGx5IGVtaXR0ZWQKICAgICAvLyBhbmQgdGhlIHVyaSBpcyBhbHJl YWR5IHVwZGF0ZWQgd2hlbiBsb2FkZXIgY2xpZW50IHNpZ25hbHMgYXJlIGVtaXR0ZWQuCiAgICAg Vmlld1VSSVRyYWNraW5nVGVzdDo6YWRkKCJXZWJLaXRXZWJWaWV3IiwgImFjdGl2ZS11cmkiLCB0 ZXN0V2ViVmlld0FjdGl2ZVVSSSk7CisKKyAgICBWaWV3SXNMb2FkaW5nVGVzdDo6YWRkKCJXZWJL aXRXZWJWaWV3IiwgImlzLWxvYWRpbmciLCB0ZXN0V2ViVmlld0lzTG9hZGluZyk7CiB9CiAKIHZv aWQgYWZ0ZXJBbGwoKQo=