22262 2008-11-14 07:45:05 -0800 Clicking close ("X") button in docked Web Inspector clears Web Inspector but doesn't close it 2009-01-07 07:58:41 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) PC Windows XP RESOLVED FIXED InRadar, PlatformOnly P2 Normal --- 1 aroben aroben timothy oldest_to_newest 98775 0 aroben 2008-11-14 07:45:05 -0800 To reproduce: 1. Go to any page (e.g., <http://webkit.org/>) 2. Open the Inspector 3. Dock the Inspector into the WebView 4. Click the close ("X") button in the upper-left of the Inspector The Inspector's contents get cleared (i.e., the DOM tree disappears), but the Inspector doesn't close. Note that bug 14270 introduced the close button in order to give a way to close the docked Inspector, but clearly not everything needed for that bug fix is implemented yet on Windows. 98776 1 aroben 2008-11-14 07:45:39 -0800 <rdar://problem/6371873> 104678 2 26482 aroben 2009-01-06 17:38:46 -0800 Created attachment 26482 Patch + ChangeLog 104685 3 26482 darin 2009-01-06 21:53:15 -0800 Comment on attachment 26482 Patch + ChangeLog r=me Hard for me to swallow those C style casts thought. 104717 4 aroben 2009-01-07 07:40:53 -0800 (In reply to comment #3) > (From update of attachment 26482 [review]) > r=me > > Hard for me to swallow those C style casts thought. OK, I'll change them to reinterpret_casts (and simplify them a bit) before landing. Thanks for the review! 104718 5 aroben 2009-01-07 07:58:41 -0800 Committed in r39682 <http://trac.webkit.org/changeset/39682> 26482 2009-01-06 17:38:46 -0800 2009-01-06 21:53:15 -0800 Patch + ChangeLog 0001--Fix-Bug-22262-Clicking-close-X-button-i.patch text/plain 9136 aroben RnJvbSAyOTI1OTE4ZmI0YTA2MGUzODk5YmRkODdkZDI1MjEwMmU3NGU2YjkwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBZGFtIFJvYmVuIDxhcm9iZW5AYXBwbGUuY29tPgpEYXRlOiBU dWUsIDYgSmFuIDIwMDkgMjA6Mzg6MDcgLTA1MDAKU3ViamVjdDogW1BGUl0gICAgICAgICBGaXgg QnVnIDIyMjYyOiBDbGlja2luZyBjbG9zZSAoIlgiKSBidXR0b24gaW4gZG9ja2VkIFdlYiBJbnNw ZWN0b3IgY2xlYXJzIFdlYiBJbnNwZWN0b3IgYnV0IGRvZXNuJ3QgY2xvc2UgaXQKCiAgICAgICAg PGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjI2Mj4KICAgICAgICA8 cmRhcjovL3Byb2JsZW0vNjM3MTg3Mz4KCiAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCgogICAgICAgICogV2ViQ29yZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50LmNwcDoKICAg ICAgICAoV2ViSW5zcGVjdG9yQ2xpZW50OjpXZWJJbnNwZWN0b3JDbGllbnQpOiBJbml0aWFsaXpl IG5ldyBtZW1iZXIuCiAgICAgICAgKFdlYkluc3BlY3RvckNsaWVudDo6c2hvd1dpbmRvdyk6IE1v dmVkIGNvZGUgZnJvbSBoZXJlIHRvCiAgICAgICAgc2hvd1dpbmRvd1dpdGhvdXROb3RpZmljYXRp b25zLgogICAgICAgIChXZWJJbnNwZWN0b3JDbGllbnQ6OmNsb3NlV2luZG93KTogTW92ZWQgY29k ZSBmcm9tIGhlcmUgdG8KICAgICAgICBjbG9zZVdpbmRvd1dpdGhvdXROb3RpZmljYXRpb25zLgoK ICAgICAgICAoV2ViSW5zcGVjdG9yQ2xpZW50OjphdHRhY2hXaW5kb3cpOgogICAgICAgIChXZWJJ bnNwZWN0b3JDbGllbnQ6OmRldGFjaFdpbmRvdyk6CiAgICAgICAgUmVjb3JkIHdoZXRoZXIgb3Ig bm90IHdlIHNob3VsZCBiZSBhdHRhY2hlZCwgdGhlbiBjbG9zZSBhbmQgcmVvcGVuIHRoZQogICAg ICAgIHdpbmRvdyB3aXRob3V0IG5vdGlmeWluZyB0aGUgSW5zcGVjdG9yQ29udHJvbGxlci4gQ29k ZSB0aGF0IHdhcyBpbgogICAgICAgIHRoZXNlIGZ1bmN0aW9ucyBtb3ZlZCB0byBzaG93V2luZG93 V2l0aG91dE5vdGlmaWNhdGlvbnMgYW5kCiAgICAgICAgY2xvc2VXaW5kb3dXaXRob3V0Tm90aWZp Y2F0aW9ucywgcmVzcGVjdGl2ZWx5LgoKICAgICAgICAoV2ViSW5zcGVjdG9yQ2xpZW50OjpjbG9z ZVdpbmRvd1dpdGhvdXROb3RpZmljYXRpb25zKTogQWRkZWQuIENvZGUKICAgICAgICBjYW1lIGZy b20gY2xvc2VXaW5kb3cgYW5kIGRldGFjaFdpbmRvdy4KICAgICAgICAoV2ViSW5zcGVjdG9yQ2xp ZW50OjpzaG93V2luZG93V2l0aG91dE5vdGlmaWNhdGlvbnMpOiBBZGRlZC4gQ29kZSBjYW1lCiAg ICAgICAgZnJvbSBzaG93V2luZG93IGFuZCBhdHRhY2hXaW5kb3cuCgogICAgICAgICogV2ViQ29y ZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50Lmg6IEFkZGVkCiAgICAgICAge2Nsb3NlLHNob3d9 V2luZG93V2l0aG91dE5vdGlmaWNhdGlvbnMgYW5kIG1fc2hvdWxkQXR0YWNoV2hlblNob3duLgot LS0KIFdlYktpdC93aW4vQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAg MzIgKysrKysrCiBXZWJLaXQvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkluc3BlY3RvckNsaWVudC5j cHAgfCAgMTE2ICsrKysrKysrKysrKysrLS0tLS0tLQogV2ViS2l0L3dpbi9XZWJDb3JlU3VwcG9y dC9XZWJJbnNwZWN0b3JDbGllbnQuaCAgIHwgICAgNCArCiAzIGZpbGVzIGNoYW5nZWQsIDExMyBp bnNlcnRpb25zKCspLCAzOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9XZWJLaXQvd2luL0No YW5nZUxvZyBiL1dlYktpdC93aW4vQ2hhbmdlTG9nCmluZGV4IDE1OWFiOTAuLjNkZDg0NjYgMTAw NjQ0Ci0tLSBhL1dlYktpdC93aW4vQ2hhbmdlTG9nCisrKyBiL1dlYktpdC93aW4vQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMzUgQEAKKzIwMDktMDEtMDYgIEFkYW0gUm9iZW4gIDxhcm9iZW5AYXBwbGUu Y29tPgorCisgICAgICAgIEZpeCBCdWcgMjIyNjI6IENsaWNraW5nIGNsb3NlICgiWCIpIGJ1dHRv biBpbiBkb2NrZWQgV2ViIEluc3BlY3RvcgorICAgICAgICBjbGVhcnMgV2ViIEluc3BlY3RvciBi dXQgZG9lc24ndCBjbG9zZSBpdAorCisgICAgICAgIDxodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjIyNjI+CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82MzcxODczPgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViQ29y ZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50LmNwcDoKKyAgICAgICAgKFdlYkluc3BlY3RvckNs aWVudDo6V2ViSW5zcGVjdG9yQ2xpZW50KTogSW5pdGlhbGl6ZSBuZXcgbWVtYmVyLgorICAgICAg ICAoV2ViSW5zcGVjdG9yQ2xpZW50OjpzaG93V2luZG93KTogTW92ZWQgY29kZSBmcm9tIGhlcmUg dG8KKyAgICAgICAgc2hvd1dpbmRvd1dpdGhvdXROb3RpZmljYXRpb25zLgorICAgICAgICAoV2Vi SW5zcGVjdG9yQ2xpZW50OjpjbG9zZVdpbmRvdyk6IE1vdmVkIGNvZGUgZnJvbSBoZXJlIHRvCisg ICAgICAgIGNsb3NlV2luZG93V2l0aG91dE5vdGlmaWNhdGlvbnMuCisKKyAgICAgICAgKFdlYklu c3BlY3RvckNsaWVudDo6YXR0YWNoV2luZG93KToKKyAgICAgICAgKFdlYkluc3BlY3RvckNsaWVu dDo6ZGV0YWNoV2luZG93KToKKyAgICAgICAgUmVjb3JkIHdoZXRoZXIgb3Igbm90IHdlIHNob3Vs ZCBiZSBhdHRhY2hlZCwgdGhlbiBjbG9zZSBhbmQgcmVvcGVuIHRoZQorICAgICAgICB3aW5kb3cg d2l0aG91dCBub3RpZnlpbmcgdGhlIEluc3BlY3RvckNvbnRyb2xsZXIuIENvZGUgdGhhdCB3YXMg aW4KKyAgICAgICAgdGhlc2UgZnVuY3Rpb25zIG1vdmVkIHRvIHNob3dXaW5kb3dXaXRob3V0Tm90 aWZpY2F0aW9ucyBhbmQKKyAgICAgICAgY2xvc2VXaW5kb3dXaXRob3V0Tm90aWZpY2F0aW9ucywg cmVzcGVjdGl2ZWx5LgorCisgICAgICAgIChXZWJJbnNwZWN0b3JDbGllbnQ6OmNsb3NlV2luZG93 V2l0aG91dE5vdGlmaWNhdGlvbnMpOiBBZGRlZC4gQ29kZQorICAgICAgICBjYW1lIGZyb20gY2xv c2VXaW5kb3cgYW5kIGRldGFjaFdpbmRvdy4KKyAgICAgICAgKFdlYkluc3BlY3RvckNsaWVudDo6 c2hvd1dpbmRvd1dpdGhvdXROb3RpZmljYXRpb25zKTogQWRkZWQuIENvZGUgY2FtZQorICAgICAg ICBmcm9tIHNob3dXaW5kb3cgYW5kIGF0dGFjaFdpbmRvdy4KKworICAgICAgICAqIFdlYkNvcmVT dXBwb3J0L1dlYkluc3BlY3RvckNsaWVudC5oOiBBZGRlZAorICAgICAgICB7Y2xvc2Usc2hvd31X aW5kb3dXaXRob3V0Tm90aWZpY2F0aW9ucyBhbmQgbV9zaG91bGRBdHRhY2hXaGVuU2hvd24uCisK IDIwMDktMDEtMDYgIERhdmlkIEtpbHplciAgPGRka2lsemVyQGFwcGxlLmNvbT4KIAogICAgICAg ICBCVUlMRCBGSVggKHIzOTY0MSk6IFRyeSB0byBmaXggV2ViSWNvbkRhdGFiYXNlIGJ1aWxkIGVy cm9ycyAjNApkaWZmIC0tZ2l0IGEvV2ViS2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0 b3JDbGllbnQuY3BwIGIvV2ViS2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGll bnQuY3BwCmluZGV4IGJmYmY4NTguLmViZjUxMjEgMTAwNjQ0Ci0tLSBhL1dlYktpdC93aW4vV2Vi Q29yZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50LmNwcAorKysgYi9XZWJLaXQvd2luL1dlYkNv cmVTdXBwb3J0L1dlYkluc3BlY3RvckNsaWVudC5jcHAKQEAgLTcyLDYgKzcyLDcgQEAgV2ViSW5z cGVjdG9yQ2xpZW50OjpXZWJJbnNwZWN0b3JDbGllbnQoV2ViVmlldyogd2ViVmlldykKICAgICA6 IG1faW5zcGVjdGVkV2ViVmlldyh3ZWJWaWV3KQogICAgICwgbV9od25kKDApCiAgICAgLCBtX3dl YlZpZXdId25kKDApCisgICAgLCBtX3Nob3VsZEF0dGFjaFdoZW5TaG93bihmYWxzZSkKICAgICAs IG1fYXR0YWNoZWQoZmFsc2UpCiB7CiAgICAgQVNTRVJUKG1faW5zcGVjdGVkV2ViVmlldyk7CkBA IC0yMDIsMjAgKzIwMywxMyBAQCBTdHJpbmcgV2ViSW5zcGVjdG9yQ2xpZW50Ojpsb2NhbGl6ZWRT dHJpbmdzVVJMKCkKIAogdm9pZCBXZWJJbnNwZWN0b3JDbGllbnQ6OnNob3dXaW5kb3coKQogewot ICAgIGlmICghbV9od25kKQotICAgICAgICByZXR1cm47Ci0KLSAgICB1cGRhdGVXaW5kb3dUaXRs ZSgpOwotICAgIDo6U2V0V2luZG93UG9zKG1faHduZCwgSFdORF9UT1AsIDAsIDAsIDAsIDAsIFNX UF9TSE9XV0lORE9XIHwgU1dQX05PTU9WRSB8IFNXUF9OT1NJWkUpOworICAgIHNob3dXaW5kb3dX aXRob3V0Tm90aWZpY2F0aW9ucygpOwogICAgIG1faW5zcGVjdGVkV2ViVmlldy0+cGFnZSgpLT5p bnNwZWN0b3JDb250cm9sbGVyKCktPnNldFdpbmRvd1Zpc2libGUodHJ1ZSk7CiB9CiAKIHZvaWQg V2ViSW5zcGVjdG9yQ2xpZW50OjpjbG9zZVdpbmRvdygpCiB7Ci0gICAgaWYgKCFtX3dlYlZpZXcp Ci0gICAgICAgIHJldHVybjsKLQotICAgIDo6U2hvd1dpbmRvdyhtX2h3bmQsIFNXX0hJREUpOwor ICAgIGNsb3NlV2luZG93V2l0aG91dE5vdGlmaWNhdGlvbnMoKTsKICAgICBtX2luc3BlY3RlZFdl YlZpZXctPnBhZ2UoKS0+aW5zcGVjdG9yQ29udHJvbGxlcigpLT5zZXRXaW5kb3dWaXNpYmxlKGZh bHNlKTsKIH0KIApAQCAtMjI2LDI3ICsyMjAsMTMgQEAgYm9vbCBXZWJJbnNwZWN0b3JDbGllbnQ6 OndpbmRvd1Zpc2libGUoKQogCiB2b2lkIFdlYkluc3BlY3RvckNsaWVudDo6YXR0YWNoV2luZG93 KCkKIHsKLSAgICBBU1NFUlQobV9od25kKTsKLSAgICBBU1NFUlQobV93ZWJWaWV3KTsKLSAgICBB U1NFUlQobV9pbnNwZWN0ZWRXZWJWaWV3SHduZCk7Ci0KICAgICBpZiAobV9hdHRhY2hlZCkKICAg ICAgICAgcmV0dXJuOwogCi0gICAgV2luZG93TWVzc2FnZUJyb2FkY2FzdGVyOjphZGRMaXN0ZW5l cihtX2luc3BlY3RlZFdlYlZpZXdId25kLCB0aGlzKTsKLQotICAgIEhXTkQgaG9zdFdpbmRvdzsK LSAgICBpZiAoRkFJTEVEKG1faW5zcGVjdGVkV2ViVmlldy0+aG9zdFdpbmRvdygoT0xFX0hBTkRM RSopJmhvc3RXaW5kb3cpKSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgbV93ZWJWaWV3LT5zZXRI b3N0V2luZG93KChPTEVfSEFORExFKShVTE9ORzY0KWhvc3RXaW5kb3cpOwotICAgIDo6U2hvd1dp bmRvdyhtX2h3bmQsIFNXX0hJREUpOwotICAgIG1fYXR0YWNoZWQgPSB0cnVlOworICAgIG1fc2hv dWxkQXR0YWNoV2hlblNob3duID0gdHJ1ZTsKIAotICAgIDo6U2VuZE1lc3NhZ2UoaG9zdFdpbmRv dywgV01fU0laRSwgMCwgMCk7Ci0KLSAgICBpZiAobV9oaWdobGlnaHQgJiYgbV9oaWdobGlnaHQt PmlzU2hvd2luZygpKQotICAgICAgICBtX2hpZ2hsaWdodC0+dXBkYXRlKCk7CisgICAgY2xvc2VX aW5kb3dXaXRob3V0Tm90aWZpY2F0aW9ucygpOworICAgIHNob3dXaW5kb3dXaXRob3V0Tm90aWZp Y2F0aW9ucygpOwogfQogCiB2b2lkIFdlYkluc3BlY3RvckNsaWVudDo6ZGV0YWNoV2luZG93KCkK QEAgLTI1NCwyMCArMjM0LDEwIEBAIHZvaWQgV2ViSW5zcGVjdG9yQ2xpZW50OjpkZXRhY2hXaW5k b3coKQogICAgIGlmICghbV9hdHRhY2hlZCkKICAgICAgICAgcmV0dXJuOwogCi0gICAgV2luZG93 TWVzc2FnZUJyb2FkY2FzdGVyOjpyZW1vdmVMaXN0ZW5lcihtX2luc3BlY3RlZFdlYlZpZXdId25k LCB0aGlzKTsKLQotICAgIG1fYXR0YWNoZWQgPSBmYWxzZTsKLQotICAgIG1fd2ViVmlldy0+c2V0 SG9zdFdpbmRvdygoT0xFX0hBTkRMRSkoVUxPTkc2NCltX2h3bmQpOwotICAgIDo6U2hvd1dpbmRv dyhtX2h3bmQsIFNXX1NIT1cpOwotICAgIDo6U2VuZE1lc3NhZ2UobV9od25kLCBXTV9TSVpFLCAw LCAwKTsKKyAgICBtX3Nob3VsZEF0dGFjaFdoZW5TaG93biA9IGZhbHNlOwogCi0gICAgSFdORCBo b3N0V2luZG93OwotICAgIGlmIChTVUNDRUVERUQobV9pbnNwZWN0ZWRXZWJWaWV3LT5ob3N0V2lu ZG93KChPTEVfSEFORExFKikmaG9zdFdpbmRvdykpKQotICAgICAgICA6OlNlbmRNZXNzYWdlKGhv c3RXaW5kb3csIFdNX1NJWkUsIDAsIDApOwotCi0gICAgaWYgKG1faGlnaGxpZ2h0ICYmIG1faGln aGxpZ2h0LT5pc1Nob3dpbmcoKSkKLSAgICAgICAgbV9oaWdobGlnaHQtPnVwZGF0ZSgpOworICAg IGNsb3NlV2luZG93V2l0aG91dE5vdGlmaWNhdGlvbnMoKTsKKyAgICBzaG93V2luZG93V2l0aG91 dE5vdGlmaWNhdGlvbnMoKTsKIH0KIAogdm9pZCBXZWJJbnNwZWN0b3JDbGllbnQ6OnNldEF0dGFj aGVkV2luZG93SGVpZ2h0KHVuc2lnbmVkIGhlaWdodCkKQEAgLTMwMyw2ICsyNzMsNzQgQEAgdm9p ZCBXZWJJbnNwZWN0b3JDbGllbnQ6Omluc3BlY3RlZFVSTENoYW5nZWQoY29uc3QgU3RyaW5nJiBu ZXdVUkwpCiAgICAgdXBkYXRlV2luZG93VGl0bGUoKTsKIH0KIAordm9pZCBXZWJJbnNwZWN0b3JD bGllbnQ6OmNsb3NlV2luZG93V2l0aG91dE5vdGlmaWNhdGlvbnMoKQoreworICAgIGlmICghbV9o d25kKQorICAgICAgICByZXR1cm47CisKKyAgICBpZiAoIW1fYXR0YWNoZWQpIHsKKyAgICAgICAg OjpTaG93V2luZG93KG1faHduZCwgU1dfSElERSk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisK KyAgICBBU1NFUlQobV93ZWJWaWV3KTsKKyAgICBBU1NFUlQobV9pbnNwZWN0ZWRXZWJWaWV3SHdu ZCk7CisgICAgQVNTRVJUKCFJc1dpbmRvd1Zpc2libGUobV9od25kKSk7CisKKyAgICAvLyBSZW1v dmUgdGhlIEluc3BlY3RvcidzIFdlYlZpZXcgZnJvbSB0aGUgaW5zcGVjdGVkIFdlYlZpZXcncyBw YXJlbnQgd2luZG93LgorICAgIFdpbmRvd01lc3NhZ2VCcm9hZGNhc3Rlcjo6cmVtb3ZlTGlzdGVu ZXIobV9pbnNwZWN0ZWRXZWJWaWV3SHduZCwgdGhpcyk7CisKKyAgICBtX2F0dGFjaGVkID0gZmFs c2U7CisKKyAgICBtX3dlYlZpZXctPnNldEhvc3RXaW5kb3coKE9MRV9IQU5ETEUpKFVMT05HNjQp bV9od25kKTsKKworICAgIC8vIE1ha2Ugc3VyZSBldmVyeXRoaW5nIGhhcyB0aGUgcmlnaHQgc2l6 ZS9wb3NpdGlvbi4KKyAgICBIV05EIGhvc3RXaW5kb3c7CisgICAgaWYgKFNVQ0NFRURFRChtX2lu c3BlY3RlZFdlYlZpZXctPmhvc3RXaW5kb3coKE9MRV9IQU5ETEUqKSZob3N0V2luZG93KSkpCisg ICAgICAgIDo6U2VuZE1lc3NhZ2UoaG9zdFdpbmRvdywgV01fU0laRSwgMCwgMCk7CisKKyAgICBp ZiAobV9oaWdobGlnaHQgJiYgbV9oaWdobGlnaHQtPmlzU2hvd2luZygpKQorICAgICAgICBtX2hp Z2hsaWdodC0+dXBkYXRlKCk7Cit9CisKK3ZvaWQgV2ViSW5zcGVjdG9yQ2xpZW50OjpzaG93V2lu ZG93V2l0aG91dE5vdGlmaWNhdGlvbnMoKQoreworICAgIGlmICghbV9od25kKQorICAgICAgICBy ZXR1cm47CisKKyAgICBBU1NFUlQobV93ZWJWaWV3KTsKKyAgICBBU1NFUlQobV9pbnNwZWN0ZWRX ZWJWaWV3SHduZCk7CisKKyAgICBpZiAoIW1fc2hvdWxkQXR0YWNoV2hlblNob3duKSB7CisgICAg ICAgIC8vIFB1dCB0aGUgSW5zcGVjdG9yJ3MgV2ViVmlldyBpbnNpZGUgb3VyIHdpbmRvdyBhbmQg c2hvdyBpdC4KKyAgICAgICAgbV93ZWJWaWV3LT5zZXRIb3N0V2luZG93KChPTEVfSEFORExFKShV TE9ORzY0KW1faHduZCk7CisgICAgICAgIDo6U2VuZE1lc3NhZ2UobV9od25kLCBXTV9TSVpFLCAw LCAwKTsKKyAgICAgICAgdXBkYXRlV2luZG93VGl0bGUoKTsKKworICAgICAgICA6OlNldFdpbmRv d1BvcyhtX2h3bmQsIEhXTkRfVE9QLCAwLCAwLCAwLCAwLCBTV1BfU0hPV1dJTkRPVyB8IFNXUF9O T01PVkUgfCBTV1BfTk9TSVpFKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIC8vIFB1 dCB0aGUgSW5zcGVjdG9yJ3MgV2ViVmlldyBpbnNpZGUgdGhlIGluc3BlY3RlZCBXZWJWaWV3J3Mg cGFyZW50IHdpbmRvdy4KKyAgICBXaW5kb3dNZXNzYWdlQnJvYWRjYXN0ZXI6OmFkZExpc3RlbmVy KG1faW5zcGVjdGVkV2ViVmlld0h3bmQsIHRoaXMpOworCisgICAgSFdORCBob3N0V2luZG93Owor ICAgIGlmIChGQUlMRUQobV9pbnNwZWN0ZWRXZWJWaWV3LT5ob3N0V2luZG93KChPTEVfSEFORExF KikmaG9zdFdpbmRvdykpKQorICAgICAgICByZXR1cm47CisKKyAgICBtX3dlYlZpZXctPnNldEhv c3RXaW5kb3coKE9MRV9IQU5ETEUpKFVMT05HNjQpaG9zdFdpbmRvdyk7CisKKyAgICAvLyBUaGVu IGhpZGUgb3VyIG93biB3aW5kb3cuCisgICAgOjpTaG93V2luZG93KG1faHduZCwgU1dfSElERSk7 CisKKyAgICBtX2F0dGFjaGVkID0gdHJ1ZTsKKworICAgIC8vIE1ha2Ugc3VyZSBldmVyeXRoaW5n IGhhcyB0aGUgcmlnaHQgc2l6ZS9wb3NpdGlvbi4KKyAgICA6OlNlbmRNZXNzYWdlKGhvc3RXaW5k b3csIFdNX1NJWkUsIDAsIDApOworICAgIGlmIChtX2hpZ2hsaWdodCAmJiBtX2hpZ2hsaWdodC0+ aXNTaG93aW5nKCkpCisgICAgICAgIG1faGlnaGxpZ2h0LT51cGRhdGUoKTsKK30KKwogdm9pZCBX ZWJJbnNwZWN0b3JDbGllbnQ6OnVwZGF0ZVdpbmRvd1RpdGxlKCkKIHsKICAgICAvLyBGSVhNRTog VGhlIHNlcmllcyBvZiBhcHBlbmRzIHNob3VsZCBiZSByZXBsYWNlZCB3aXRoIGEgY2FsbCB0byBT dHJpbmc6OmZvcm1hdCgpCmRpZmYgLS1naXQgYS9XZWJLaXQvd2luL1dlYkNvcmVTdXBwb3J0L1dl Ykluc3BlY3RvckNsaWVudC5oIGIvV2ViS2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0 b3JDbGllbnQuaAppbmRleCBhMjg1MDdhLi44NjMxN2Y2IDEwMDY0NAotLS0gYS9XZWJLaXQvd2lu L1dlYkNvcmVTdXBwb3J0L1dlYkluc3BlY3RvckNsaWVudC5oCisrKyBiL1dlYktpdC93aW4vV2Vi Q29yZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50LmgKQEAgLTcxLDYgKzcxLDkgQEAgcHVibGlj OgogcHJpdmF0ZToKICAgICB+V2ViSW5zcGVjdG9yQ2xpZW50KCk7CiAKKyAgICB2b2lkIGNsb3Nl V2luZG93V2l0aG91dE5vdGlmaWNhdGlvbnMoKTsKKyAgICB2b2lkIHNob3dXaW5kb3dXaXRob3V0 Tm90aWZpY2F0aW9ucygpOworCiAgICAgdm9pZCB1cGRhdGVXaW5kb3dUaXRsZSgpOwogCiAgICAg TFJFU1VMVCBvbkdldE1pbk1heEluZm8oV1BBUkFNLCBMUEFSQU0pOwpAQCAtODgsNiArOTEsNyBA QCBwcml2YXRlOgogICAgIENPTVB0cjxXZWJWaWV3PiBtX3dlYlZpZXc7CiAgICAgSFdORCBtX3dl YlZpZXdId25kOwogCisgICAgYm9vbCBtX3Nob3VsZEF0dGFjaFdoZW5TaG93bjsKICAgICBib29s IG1fYXR0YWNoZWQ7CiAKICAgICBPd25QdHI8V2ViTm9kZUhpZ2hsaWdodD4gbV9oaWdobGlnaHQ7 Ci0tIAoxLjYuMS5yYzEKCg==