40152 2010-06-03 18:23:56 -0700 WebKit2: Need to remove WebView from WindowMessageBroadcaster's listeners list after the WebView is destroyed 2010-06-04 11:25:49 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) PC Windows 7 RESOLVED FIXED P2 Normal --- 1 adachan adachan webkit.review.bot oldest_to_newest 234022 0 adachan 2010-06-03 18:23:56 -0700 Whenever a new WebView is created, WebView::windowAncestryDidChange() is called so that the WebView is added as a WindowMessageListener in the WindowMessageBroadcaster for its top level window. However, we don't remove it from the listener list when the WebView is destroyed. That will leave a stale WebView in the listener list of WindowMessageBroadcaster and can result in a crash later. We should do what we did in the original WebKit: have a WebView::setHostWindow() that calls WebView::windowAncestryDidChange(), and have WebView call setHostWindow(0) when it's destroyed. 234040 1 57843 adachan 2010-06-03 21:01:33 -0700 Created attachment 57843 Patch Call setHostWindow(0) when the WebView is destroyed, which will call windowAncestryDidChange() and remove this WebView from the WindowMessageBroadcaster's listeners list. 234043 2 webkit.review.bot 2010-06-03 21:04:47 -0700 Attachment 57843 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style', '--no-squash']" exit_code: 1 WebKit2/UIProcess/win/WebView.cpp:79: A case label should not be indented, but line up with its switch statement. [whitespace/indent] [4] Total errors found: 1 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 234045 3 57844 adachan 2010-06-03 21:11:03 -0700 Created attachment 57844 Patch - fix the switch case indentation 234054 4 57843 aroben 2010-06-03 22:08:17 -0700 Comment on attachment 57843 Patch > +void WebView::setHostWindow(HWND hostWindow) > +{ > + if (m_window) { > + if (hostWindow) > + SetParent(m_window, hostWindow); > + else if (!isBeingDestroyed()) { > + // Turn the WebView into a message-only window so it will no longer be a child of the > + // old host window and will be hidden from screen. We only do this when > + // isBeingDestroyed() is false because doing this while handling WM_DESTROY can leave > + // m_viewWindow in a weird state (see <http://webkit.org/b/29337>). > + SetParent(m_window, HWND_MESSAGE); > + } The comment should be updated to say m_window, not m_viewWindow. Let's just bail out early if GetParent(m_window) == hostWindow. (I know WebView doesn't do that, but it seems like a good idea.) I don't think the private set/isBeginDestroyed functions are all that helpful. r=me 234055 5 57844 aroben 2010-06-03 22:09:37 -0700 Comment on attachment 57844 Patch - fix the switch case indentation Actually, I think it's better to check in your first patch (since it matches the local style). 234304 6 adachan 2010-06-04 11:25:49 -0700 Fixed in http://trac.webkit.org/changeset/60691 57843 2010-06-03 21:01:33 -0700 2010-06-03 22:09:47 -0700 Patch 40152.patch.txt text/plain 5449 adachan SW5kZXg6IFdlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MDY1MSkKKysrIFdlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjUgQEAKKzIwMTAtMDYtMDMgIEFkYSBDaGFuICA8YWRhY2hhbkBhcHBsZS5jb20+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQwMTUyCisgICAgICAgIAorICAgICAg ICBOZWVkIHRvIHJlbW92ZSB0aGUgV2ViVmlldyBmcm9tIFdpbmRvd01lc3NhZ2VCcm9hZGNhc3Rl cidzIGxpc3RlbmVycyBsaXN0IHdoZW4gdGhlIFdlYlZpZXcgaXMgZGVzdHJveWVkLgorCisgICAg ICAgICogVUlQcm9jZXNzL0FQSS93aW4vV0tWaWV3LmNwcDoKKyAgICAgICAgKFdLVmlld1NldEhv c3RXaW5kb3cpOiBFeHBvc2UgQVBJIHRvIGNoYW5nZSB0aGUgaG9zdCB3aW5kb3cgb2YgYSBXS1Zp ZXcuCisgICAgICAgIChXS1ZpZXdXaW5kb3dBbmNlc3RyeURpZENoYW5nZSk6IEV4cG9zZSBBUEkg dG8gYWxsb3cgY2xpZW50cyB0byBub3RpZnkgV2ViS2l0IHdoZW4gYSBXS1ZpZXcncyB3aW5kb3cg YW5jZXN0cnkgaGFzIGNoYW5nZWQuCisgICAgICAgICogVUlQcm9jZXNzL0FQSS93aW4vV0tWaWV3 Lmg6CisgICAgICAgICogVUlQcm9jZXNzL3dpbi9XZWJWaWV3LmNwcDoKKyAgICAgICAgKFdlYktp dDo6V2ViVmlldzo6d25kUHJvYyk6IFNldCB0aGUgV2ViVmlldydzIGhvc3Qgd2luZG93IHRvIDAg d2hlbiBpdCdzIGRlc3Ryb3llZC4gIHNldEhvc3RXaW5kb3coKSB3aWxsIGNhbGwgCisgICAgICAg IHdpbmRvd0FuY2VzdHJ5RGlkQ2hhbmdlKCksIHdoaWNoIHdpbGwgcmVtb3ZlIHRoaXMgV2ViVmll dyBmcm9tIHRoZSBXaW5kb3dNZXNzYWdlQnJvYWRjYXN0ZXIncyBsaXN0ZW5lcnMgbGlzdC4KKyAg ICAgICAgKFdlYktpdDo6V2ViVmlldzo6V2ViVmlldyk6IEluaXRpYWxpemUgbV9pc0JlaW5nRGVz dHJveWVkLgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3OjpzZXRIb3N0V2luZG93KTogVXBkYXRl IHRoZSB3aW5kb3cncyBwYXJlbnQgd2luZG93IGFuZCBjYWxsIHdpbmRvd0FuY2VzdHJ5RGlkQ2hh bmdlKCkuCisgICAgICAgIChXZWJLaXQ6OldlYlZpZXc6OmNsb3NlKTogU2V0IHRoZSBob3N0IHdp bmRvdyB0byAwLgorICAgICAgICAqIFVJUHJvY2Vzcy93aW4vV2ViVmlldy5oOgorICAgICAgICAo V2ViS2l0OjpXZWJWaWV3OjpzZXRJc0JlaW5nRGVzdHJveWVkKToKKyAgICAgICAgKFdlYktpdDo6 V2ViVmlldzo6aXNCZWluZ0Rlc3Ryb3llZCk6CisKIDIwMTAtMDYtMDMgIEFkYSBDaGFuICA8YWRh Y2hhbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQW5kZXJzIENhcmxzc29uLgpJ bmRleDogV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3dpbi9XS1ZpZXcuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYktpdDIvVUlQcm9jZXNzL0FQSS93aW4vV0tWaWV3LmNwcAkocmV2aXNpb24gNjA2NTEpCisr KyBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkvd2luL1dLVmlldy5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTYxLDMgKzYxLDEzIEBAIHZvaWQgV0tWaWV3UmVsZWFzZShXS1ZpZXdSZWYgdmlld1JlZikKIHsK ICAgICB0b1dLKHZpZXdSZWYpLT5kZXJlZigpOwogfQorCit2b2lkIFdLVmlld1NldEhvc3RXaW5k b3coV0tWaWV3UmVmIHZpZXdSZWYsIEhXTkQgaG9zdFdpbmRvdykKK3sKKyAgICB0b1dLKHZpZXdS ZWYpLT5zZXRIb3N0V2luZG93KGhvc3RXaW5kb3cpOworfQorCit2b2lkIFdLVmlld1dpbmRvd0Fu Y2VzdHJ5RGlkQ2hhbmdlKFdLVmlld1JlZiB2aWV3UmVmKQoreworICAgIHRvV0sodmlld1JlZikt PndpbmRvd0FuY2VzdHJ5RGlkQ2hhbmdlKCk7Cit9CkluZGV4OiBXZWJLaXQyL1VJUHJvY2Vzcy9B UEkvd2luL1dLVmlldy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvVUlQcm9jZXNzL0FQSS93aW4v V0tWaWV3LmgJKHJldmlzaW9uIDYwNjUxKQorKysgV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3dpbi9X S1ZpZXcuaAkod29ya2luZyBjb3B5KQpAQCAtNDMsNiArNDMsOSBAQCBXS19FWFBPUlQgV0tQYWdl UmVmIFdLVmlld0dldFBhZ2UoV0tWaWV3CiBXS19FWFBPUlQgV0tWaWV3UmVmIFdLVmlld1JldGFp bihXS1ZpZXdSZWYgdmlldyk7CiBXS19FWFBPUlQgdm9pZCBXS1ZpZXdSZWxlYXNlKFdLVmlld1Jl ZiB2aWV3KTsKIAorV0tfRVhQT1JUIHZvaWQgV0tWaWV3U2V0SG9zdFdpbmRvdyhXS1ZpZXdSZWYg dmlldywgSFdORCBob3N0V2luZG93KTsKK1dLX0VYUE9SVCB2b2lkIFdLVmlld1dpbmRvd0FuY2Vz dHJ5RGlkQ2hhbmdlKFdLVmlld1JlZiB2aWV3KTsKKwogI2lmZGVmIF9fY3BsdXNwbHVzCiB9CiAj ZW5kaWYKSW5kZXg6IFdlYktpdDIvVUlQcm9jZXNzL3dpbi9XZWJWaWV3LmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJLaXQyL1VJUHJvY2Vzcy93aW4vV2ViVmlldy5jcHAJKHJldmlzaW9uIDYwNjUxKQor KysgV2ViS2l0Mi9VSVByb2Nlc3Mvd2luL1dlYlZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03 Niw2ICs3NiwxMCBAQCBMUkVTVUxUIFdlYlZpZXc6OnduZFByb2MoSFdORCBoV25kLCBVSU5UCiAg ICAgYm9vbCBoYW5kbGVkID0gdHJ1ZTsKIAogICAgIHN3aXRjaCAobWVzc2FnZSkgeworICAgICAg ICBjYXNlIFdNX0RFU1RST1k6CisgICAgICAgICAgICBzZXRJc0JlaW5nRGVzdHJveWVkKCk7Cisg ICAgICAgICAgICBjbG9zZSgpOworICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgV01f RVJBU0VCS0dORDoKICAgICAgICAgICAgIGxSZXN1bHQgPSAxOwogICAgICAgICAgICAgYnJlYWs7 CkBAIC0xNjcsNiArMTcxLDcgQEAgV2ViVmlldzo6V2ViVmlldyhSRUNUIHJlY3QsIFdlYlBhZ2VO YW1lcwogICAgICwgbV90b3BMZXZlbFBhcmVudFdpbmRvdygwKQogICAgICwgbV90b29sVGlwV2lu ZG93KDApCiAgICAgLCBtX3RyYWNraW5nTW91c2VMZWF2ZShmYWxzZSkKKyAgICAsIG1faXNCZWlu Z0Rlc3Ryb3llZChmYWxzZSkKIHsKICAgICByZWdpc3RlcldlYlZpZXdXaW5kb3dDbGFzcygpOwog CkBAIC0xOTUsNiArMjAwLDI1IEBAIFdlYlZpZXc6On5XZWJWaWV3KCkKICAgICAgICAgOjpEZXN0 cm95V2luZG93KG1fdG9vbFRpcFdpbmRvdyk7CiB9CiAKK3ZvaWQgV2ViVmlldzo6c2V0SG9zdFdp bmRvdyhIV05EIGhvc3RXaW5kb3cpCit7CisgICAgaWYgKG1fd2luZG93KSB7CisgICAgICAgIGlm IChob3N0V2luZG93KQorICAgICAgICAgICAgU2V0UGFyZW50KG1fd2luZG93LCBob3N0V2luZG93 KTsKKyAgICAgICAgZWxzZSBpZiAoIWlzQmVpbmdEZXN0cm95ZWQoKSkgeworICAgICAgICAgICAg Ly8gVHVybiB0aGUgV2ViVmlldyBpbnRvIGEgbWVzc2FnZS1vbmx5IHdpbmRvdyBzbyBpdCB3aWxs IG5vIGxvbmdlciBiZSBhIGNoaWxkIG9mIHRoZQorICAgICAgICAgICAgLy8gb2xkIGhvc3Qgd2lu ZG93IGFuZCB3aWxsIGJlIGhpZGRlbiBmcm9tIHNjcmVlbi4gV2Ugb25seSBkbyB0aGlzIHdoZW4K KyAgICAgICAgICAgIC8vIGlzQmVpbmdEZXN0cm95ZWQoKSBpcyBmYWxzZSBiZWNhdXNlIGRvaW5n IHRoaXMgd2hpbGUgaGFuZGxpbmcgV01fREVTVFJPWSBjYW4gbGVhdmUKKyAgICAgICAgICAgIC8v IG1fdmlld1dpbmRvdyBpbiBhIHdlaXJkIHN0YXRlIChzZWUgPGh0dHA6Ly93ZWJraXQub3JnL2Iv MjkzMzc+KS4KKyAgICAgICAgICAgIFNldFBhcmVudChtX3dpbmRvdywgSFdORF9NRVNTQUdFKTsK KyAgICAgICAgfQorICAgIH0KKworICAgIG1faG9zdFdpbmRvdyA9IGhvc3RXaW5kb3c7CisgICAg CisgICAgd2luZG93QW5jZXN0cnlEaWRDaGFuZ2UoKTsKK30KKwogc3RhdGljIEhXTkQgZmluZFRv cExldmVsUGFyZW50V2luZG93KEhXTkQgd2luZG93KQogewogICAgIGlmICghd2luZG93KQpAQCAt NDY2LDYgKzQ5MCwxMSBAQCB2b2lkIFdlYlZpZXc6OnN0b3BUcmFja2luZ01vdXNlTGVhdmUoKQog ICAgIDo6VHJhY2tNb3VzZUV2ZW50KCZ0cmFja01vdXNlRXZlbnQpOwogfQogCit2b2lkIFdlYlZp ZXc6OmNsb3NlKCkKK3sKKyAgICBzZXRIb3N0V2luZG93KDApOworfQorCiAvLyBQYWdlQ2xpZW50 CiAKIHZvaWQgV2ViVmlldzo6cHJvY2Vzc0RpZEV4aXQoKQpJbmRleDogV2ViS2l0Mi9VSVByb2Nl c3Mvd2luL1dlYlZpZXcuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1VJUHJvY2Vzcy93aW4vV2Vi Vmlldy5oCShyZXZpc2lvbiA2MDY1MSkKKysrIFdlYktpdDIvVUlQcm9jZXNzL3dpbi9XZWJWaWV3 LmgJKHdvcmtpbmcgY29weSkKQEAgLTU0LDkgKzU0LDcgQEAgcHVibGljOgogCiAgICAgSFdORCB3 aW5kb3coKSBjb25zdCB7IHJldHVybiBtX3dpbmRvdzsgfQogICAgIEhXTkQgaG9zdFdpbmRvdygp IGNvbnN0IHsgcmV0dXJuIG1faG9zdFdpbmRvdzsgfQotCi0gICAgLy8gRklYTUU6IFRoaXMgbmVl ZHMgdG8gYmUgZXhwb3NlZCBhcyBBUEkgaW4gV0tWaWV3IGFsb25nIHdpdGggYSB3YXkKLSAgICAv LyB0byBjaGFuZ2UgdGhlIGhvc3RXaW5kb3cuCisgICAgdm9pZCBzZXRIb3N0V2luZG93KEhXTkQp OwogICAgIHZvaWQgd2luZG93QW5jZXN0cnlEaWRDaGFuZ2UoKTsKIAogICAgIFdlYlBhZ2VQcm94 eSogcGFnZSgpIGNvbnN0IHsgcmV0dXJuIG1fcGFnZS5nZXQoKTsgfQpAQCAtODgsNiArODYsMTAg QEAgcHJpdmF0ZToKICAgICB2b2lkIHN0YXJ0VHJhY2tpbmdNb3VzZUxlYXZlKCk7CiAgICAgdm9p ZCBzdG9wVHJhY2tpbmdNb3VzZUxlYXZlKCk7CiAKKyAgICB2b2lkIHNldElzQmVpbmdEZXN0cm95 ZWQoKSB7IG1faXNCZWluZ0Rlc3Ryb3llZCA9IHRydWU7IH0KKyAgICBib29sIGlzQmVpbmdEZXN0 cm95ZWQoKSBjb25zdCB7IHJldHVybiBtX2lzQmVpbmdEZXN0cm95ZWQ7IH0KKyAgICB2b2lkIGNs b3NlKCk7CisKICAgICAvLyBQYWdlQ2xpZW50CiAgICAgdmlydHVhbCB2b2lkIHByb2Nlc3NEaWRF eGl0KCk7CiAgICAgdmlydHVhbCB2b2lkIHByb2Nlc3NEaWRSZXZpdmUoKTsKQEAgLTEwNCw2ICsx MDYsNyBAQCBwcml2YXRlOgogICAgIEhXTkQgbV90b29sVGlwV2luZG93OwogCiAgICAgYm9vbCBt X3RyYWNraW5nTW91c2VMZWF2ZTsKKyAgICBib29sIG1faXNCZWluZ0Rlc3Ryb3llZDsKIAogICAg IFJlZlB0cjxXZWJQYWdlUHJveHk+IG1fcGFnZTsKIH07Cg== 57844 2010-06-03 21:11:03 -0700 2010-06-03 22:09:36 -0700 Patch - fix the switch case indentation 40152.patch.txt text/plain 5433 adachan SW5kZXg6IFdlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MDY1MSkKKysrIFdlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjUgQEAKKzIwMTAtMDYtMDMgIEFkYSBDaGFuICA8YWRhY2hhbkBhcHBsZS5jb20+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQwMTUyCisgICAgICAgIAorICAgICAg ICBOZWVkIHRvIHJlbW92ZSB0aGUgV2ViVmlldyBmcm9tIFdpbmRvd01lc3NhZ2VCcm9hZGNhc3Rl cidzIGxpc3RlbmVycyBsaXN0IHdoZW4gdGhlIFdlYlZpZXcgaXMgZGVzdHJveWVkLgorCisgICAg ICAgICogVUlQcm9jZXNzL0FQSS93aW4vV0tWaWV3LmNwcDoKKyAgICAgICAgKFdLVmlld1NldEhv c3RXaW5kb3cpOiBFeHBvc2UgQVBJIHRvIGNoYW5nZSB0aGUgaG9zdCB3aW5kb3cgb2YgYSBXS1Zp ZXcuCisgICAgICAgIChXS1ZpZXdXaW5kb3dBbmNlc3RyeURpZENoYW5nZSk6IEV4cG9zZSBBUEkg dG8gYWxsb3cgY2xpZW50cyB0byBub3RpZnkgV2ViS2l0IHdoZW4gYSBXS1ZpZXcncyB3aW5kb3cg YW5jZXN0cnkgaGFzIGNoYW5nZWQuCisgICAgICAgICogVUlQcm9jZXNzL0FQSS93aW4vV0tWaWV3 Lmg6CisgICAgICAgICogVUlQcm9jZXNzL3dpbi9XZWJWaWV3LmNwcDoKKyAgICAgICAgKFdlYktp dDo6V2ViVmlldzo6d25kUHJvYyk6IFNldCB0aGUgV2ViVmlldydzIGhvc3Qgd2luZG93IHRvIDAg d2hlbiBpdCdzIGRlc3Ryb3llZC4gIHNldEhvc3RXaW5kb3coKSB3aWxsIGNhbGwgCisgICAgICAg IHdpbmRvd0FuY2VzdHJ5RGlkQ2hhbmdlKCksIHdoaWNoIHdpbGwgcmVtb3ZlIHRoaXMgV2ViVmll dyBmcm9tIHRoZSBXaW5kb3dNZXNzYWdlQnJvYWRjYXN0ZXIncyBsaXN0ZW5lcnMgbGlzdC4KKyAg ICAgICAgKFdlYktpdDo6V2ViVmlldzo6V2ViVmlldyk6IEluaXRpYWxpemUgbV9pc0JlaW5nRGVz dHJveWVkLgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3OjpzZXRIb3N0V2luZG93KTogVXBkYXRl IHRoZSB3aW5kb3cncyBwYXJlbnQgd2luZG93IGFuZCBjYWxsIHdpbmRvd0FuY2VzdHJ5RGlkQ2hh bmdlKCkuCisgICAgICAgIChXZWJLaXQ6OldlYlZpZXc6OmNsb3NlKTogU2V0IHRoZSBob3N0IHdp bmRvdyB0byAwLgorICAgICAgICAqIFVJUHJvY2Vzcy93aW4vV2ViVmlldy5oOgorICAgICAgICAo V2ViS2l0OjpXZWJWaWV3OjpzZXRJc0JlaW5nRGVzdHJveWVkKToKKyAgICAgICAgKFdlYktpdDo6 V2ViVmlldzo6aXNCZWluZ0Rlc3Ryb3llZCk6CisKIDIwMTAtMDYtMDMgIEFkYSBDaGFuICA8YWRh Y2hhbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQW5kZXJzIENhcmxzc29uLgpJ bmRleDogV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3dpbi9XS1ZpZXcuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYktpdDIvVUlQcm9jZXNzL0FQSS93aW4vV0tWaWV3LmNwcAkocmV2aXNpb24gNjA2NTEpCisr KyBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkvd2luL1dLVmlldy5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTYxLDMgKzYxLDEzIEBAIHZvaWQgV0tWaWV3UmVsZWFzZShXS1ZpZXdSZWYgdmlld1JlZikKIHsK ICAgICB0b1dLKHZpZXdSZWYpLT5kZXJlZigpOwogfQorCit2b2lkIFdLVmlld1NldEhvc3RXaW5k b3coV0tWaWV3UmVmIHZpZXdSZWYsIEhXTkQgaG9zdFdpbmRvdykKK3sKKyAgICB0b1dLKHZpZXdS ZWYpLT5zZXRIb3N0V2luZG93KGhvc3RXaW5kb3cpOworfQorCit2b2lkIFdLVmlld1dpbmRvd0Fu Y2VzdHJ5RGlkQ2hhbmdlKFdLVmlld1JlZiB2aWV3UmVmKQoreworICAgIHRvV0sodmlld1JlZikt PndpbmRvd0FuY2VzdHJ5RGlkQ2hhbmdlKCk7Cit9CkluZGV4OiBXZWJLaXQyL1VJUHJvY2Vzcy9B UEkvd2luL1dLVmlldy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvVUlQcm9jZXNzL0FQSS93aW4v V0tWaWV3LmgJKHJldmlzaW9uIDYwNjUxKQorKysgV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3dpbi9X S1ZpZXcuaAkod29ya2luZyBjb3B5KQpAQCAtNDMsNiArNDMsOSBAQCBXS19FWFBPUlQgV0tQYWdl UmVmIFdLVmlld0dldFBhZ2UoV0tWaWV3CiBXS19FWFBPUlQgV0tWaWV3UmVmIFdLVmlld1JldGFp bihXS1ZpZXdSZWYgdmlldyk7CiBXS19FWFBPUlQgdm9pZCBXS1ZpZXdSZWxlYXNlKFdLVmlld1Jl ZiB2aWV3KTsKIAorV0tfRVhQT1JUIHZvaWQgV0tWaWV3U2V0SG9zdFdpbmRvdyhXS1ZpZXdSZWYg dmlldywgSFdORCBob3N0V2luZG93KTsKK1dLX0VYUE9SVCB2b2lkIFdLVmlld1dpbmRvd0FuY2Vz dHJ5RGlkQ2hhbmdlKFdLVmlld1JlZiB2aWV3KTsKKwogI2lmZGVmIF9fY3BsdXNwbHVzCiB9CiAj ZW5kaWYKSW5kZXg6IFdlYktpdDIvVUlQcm9jZXNzL3dpbi9XZWJWaWV3LmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJLaXQyL1VJUHJvY2Vzcy93aW4vV2ViVmlldy5jcHAJKHJldmlzaW9uIDYwNjUxKQor KysgV2ViS2l0Mi9VSVByb2Nlc3Mvd2luL1dlYlZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03 Niw2ICs3NiwxMCBAQCBMUkVTVUxUIFdlYlZpZXc6OnduZFByb2MoSFdORCBoV25kLCBVSU5UCiAg ICAgYm9vbCBoYW5kbGVkID0gdHJ1ZTsKIAogICAgIHN3aXRjaCAobWVzc2FnZSkgeworICAgIGNh c2UgV01fREVTVFJPWToKKyAgICAgICAgc2V0SXNCZWluZ0Rlc3Ryb3llZCgpOworICAgICAgICBj bG9zZSgpOworICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBXTV9FUkFTRUJLR05EOgogICAg ICAgICAgICAgbFJlc3VsdCA9IDE7CiAgICAgICAgICAgICBicmVhazsKQEAgLTE2Nyw2ICsxNzEs NyBAQCBXZWJWaWV3OjpXZWJWaWV3KFJFQ1QgcmVjdCwgV2ViUGFnZU5hbWVzCiAgICAgLCBtX3Rv cExldmVsUGFyZW50V2luZG93KDApCiAgICAgLCBtX3Rvb2xUaXBXaW5kb3coMCkKICAgICAsIG1f dHJhY2tpbmdNb3VzZUxlYXZlKGZhbHNlKQorICAgICwgbV9pc0JlaW5nRGVzdHJveWVkKGZhbHNl KQogewogICAgIHJlZ2lzdGVyV2ViVmlld1dpbmRvd0NsYXNzKCk7CiAKQEAgLTE5NSw2ICsyMDAs MjUgQEAgV2ViVmlldzo6fldlYlZpZXcoKQogICAgICAgICA6OkRlc3Ryb3lXaW5kb3cobV90b29s VGlwV2luZG93KTsKIH0KIAordm9pZCBXZWJWaWV3OjpzZXRIb3N0V2luZG93KEhXTkQgaG9zdFdp bmRvdykKK3sKKyAgICBpZiAobV93aW5kb3cpIHsKKyAgICAgICAgaWYgKGhvc3RXaW5kb3cpCisg ICAgICAgICAgICBTZXRQYXJlbnQobV93aW5kb3csIGhvc3RXaW5kb3cpOworICAgICAgICBlbHNl IGlmICghaXNCZWluZ0Rlc3Ryb3llZCgpKSB7CisgICAgICAgICAgICAvLyBUdXJuIHRoZSBXZWJW aWV3IGludG8gYSBtZXNzYWdlLW9ubHkgd2luZG93IHNvIGl0IHdpbGwgbm8gbG9uZ2VyIGJlIGEg Y2hpbGQgb2YgdGhlCisgICAgICAgICAgICAvLyBvbGQgaG9zdCB3aW5kb3cgYW5kIHdpbGwgYmUg aGlkZGVuIGZyb20gc2NyZWVuLiBXZSBvbmx5IGRvIHRoaXMgd2hlbgorICAgICAgICAgICAgLy8g aXNCZWluZ0Rlc3Ryb3llZCgpIGlzIGZhbHNlIGJlY2F1c2UgZG9pbmcgdGhpcyB3aGlsZSBoYW5k bGluZyBXTV9ERVNUUk9ZIGNhbiBsZWF2ZQorICAgICAgICAgICAgLy8gbV92aWV3V2luZG93IGlu IGEgd2VpcmQgc3RhdGUgKHNlZSA8aHR0cDovL3dlYmtpdC5vcmcvYi8yOTMzNz4pLgorICAgICAg ICAgICAgU2V0UGFyZW50KG1fd2luZG93LCBIV05EX01FU1NBR0UpOworICAgICAgICB9CisgICAg fQorCisgICAgbV9ob3N0V2luZG93ID0gaG9zdFdpbmRvdzsKKyAgICAKKyAgICB3aW5kb3dBbmNl c3RyeURpZENoYW5nZSgpOworfQorCiBzdGF0aWMgSFdORCBmaW5kVG9wTGV2ZWxQYXJlbnRXaW5k b3coSFdORCB3aW5kb3cpCiB7CiAgICAgaWYgKCF3aW5kb3cpCkBAIC00NjYsNiArNDkwLDExIEBA IHZvaWQgV2ViVmlldzo6c3RvcFRyYWNraW5nTW91c2VMZWF2ZSgpCiAgICAgOjpUcmFja01vdXNl RXZlbnQoJnRyYWNrTW91c2VFdmVudCk7CiB9CiAKK3ZvaWQgV2ViVmlldzo6Y2xvc2UoKQorewor ICAgIHNldEhvc3RXaW5kb3coMCk7Cit9CisKIC8vIFBhZ2VDbGllbnQKIAogdm9pZCBXZWJWaWV3 Ojpwcm9jZXNzRGlkRXhpdCgpCkluZGV4OiBXZWJLaXQyL1VJUHJvY2Vzcy93aW4vV2ViVmlldy5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYktpdDIvVUlQcm9jZXNzL3dpbi9XZWJWaWV3LmgJKHJldmlzaW9u IDYwNjUxKQorKysgV2ViS2l0Mi9VSVByb2Nlc3Mvd2luL1dlYlZpZXcuaAkod29ya2luZyBjb3B5 KQpAQCAtNTQsOSArNTQsNyBAQCBwdWJsaWM6CiAKICAgICBIV05EIHdpbmRvdygpIGNvbnN0IHsg cmV0dXJuIG1fd2luZG93OyB9CiAgICAgSFdORCBob3N0V2luZG93KCkgY29uc3QgeyByZXR1cm4g bV9ob3N0V2luZG93OyB9Ci0KLSAgICAvLyBGSVhNRTogVGhpcyBuZWVkcyB0byBiZSBleHBvc2Vk IGFzIEFQSSBpbiBXS1ZpZXcgYWxvbmcgd2l0aCBhIHdheQotICAgIC8vIHRvIGNoYW5nZSB0aGUg aG9zdFdpbmRvdy4KKyAgICB2b2lkIHNldEhvc3RXaW5kb3coSFdORCk7CiAgICAgdm9pZCB3aW5k b3dBbmNlc3RyeURpZENoYW5nZSgpOwogCiAgICAgV2ViUGFnZVByb3h5KiBwYWdlKCkgY29uc3Qg eyByZXR1cm4gbV9wYWdlLmdldCgpOyB9CkBAIC04OCw2ICs4NiwxMCBAQCBwcml2YXRlOgogICAg IHZvaWQgc3RhcnRUcmFja2luZ01vdXNlTGVhdmUoKTsKICAgICB2b2lkIHN0b3BUcmFja2luZ01v dXNlTGVhdmUoKTsKIAorICAgIHZvaWQgc2V0SXNCZWluZ0Rlc3Ryb3llZCgpIHsgbV9pc0JlaW5n RGVzdHJveWVkID0gdHJ1ZTsgfQorICAgIGJvb2wgaXNCZWluZ0Rlc3Ryb3llZCgpIGNvbnN0IHsg cmV0dXJuIG1faXNCZWluZ0Rlc3Ryb3llZDsgfQorICAgIHZvaWQgY2xvc2UoKTsKKwogICAgIC8v IFBhZ2VDbGllbnQKICAgICB2aXJ0dWFsIHZvaWQgcHJvY2Vzc0RpZEV4aXQoKTsKICAgICB2aXJ0 dWFsIHZvaWQgcHJvY2Vzc0RpZFJldml2ZSgpOwpAQCAtMTA0LDYgKzEwNiw3IEBAIHByaXZhdGU6 CiAgICAgSFdORCBtX3Rvb2xUaXBXaW5kb3c7CiAKICAgICBib29sIG1fdHJhY2tpbmdNb3VzZUxl YXZlOworICAgIGJvb2wgbV9pc0JlaW5nRGVzdHJveWVkOwogCiAgICAgUmVmUHRyPFdlYlBhZ2VQ cm94eT4gbV9wYWdlOwogfTsK