38939 2010-05-11 15:21:12 -0700 [Qt] Implement a detachCurrentPage method for QGraphicsWebView and QWebView 2010-05-12 08:08:37 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) PC All RESOLVED FIXED Qt, QtTriaged P2 Normal --- 1 tonikitoo tonikitoo hausmann jesus kenneth oldest_to_newest 224185 0 tonikitoo 2010-05-11 15:21:12 -0700 This detachPage method extands the current unsetPageIfExists implementation, by being responsible of unseting the view and client of the |page| -- it was done in QWebView and QGraphicsWebView destructor routines previously. work is basically a code clean up and was idealized by kenneth originally. patch coming... 224188 1 55764 tonikitoo 2010-05-11 15:30:38 -0700 Created attachment 55764 patch v1 224192 2 jesus 2010-05-11 15:36:22 -0700 (In reply to comment #1) > Created an attachment (id=55764) [details] > patch v1 LGTM, but from our earlier chat I thought that "if (page->d->client && page->d->client->isQWidgetClient())" was going to be removed from QGraphicsWebViewPrivate::unsetPageIfExists() . Did you miss that or am I just wrong?! 224331 3 tonikitoo 2010-05-11 19:08:24 -0700 (In reply to comment #2) > (In reply to comment #1) > > Created an attachment (id=55764) [details] [details] > > patch v1 > > > LGTM, but from our earlier chat I thought that "if (page->d->client && page->d->client->isQWidgetClient())" was going to be removed from QGraphicsWebViewPrivate::unsetPageIfExists() . > > Did you miss that or am I just wrong?! Thank you, Jesus. The other patch is coming next to this, in a separated pAtch 224595 4 55764 kenneth 2010-05-12 07:27:36 -0700 Comment on attachment 55764 patch v1 Maybe use detachCurrentPage? I would also like an autotest actually testing the fix you did for always clearing the view when setting a new page, but it can be a separate patch. 224615 5 tonikitoo 2010-05-12 08:08:37 -0700 Committed r59233: <http://trac.webkit.org/changeset/59233> 55764 2010-05-11 15:30:38 -0700 2010-05-12 07:27:36 -0700 patch v1 0001-Qt-Implement-a-detachPage-method-for-QGraphicsWebVie.patch text/plain 9287 tonikitoo RnJvbSBjYzVhM2Y0OWJmYjI3MzVmODY2YjdhODgyNTcwOTgxOGRiYmQ1MDBmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnRvbmlvIEdvbWVzIDx0b25pa2l0b29Ad2Via2l0Lm9yZz4K RGF0ZTogVHVlLCAxMSBNYXkgMjAxMCAxODoyOToyNyAtMDQwMApTdWJqZWN0OiBbUEFUQ0hdIFtR dF0gSW1wbGVtZW50IGEgZGV0YWNoUGFnZSBtZXRob2QgZm9yIFFHcmFwaGljc1dlYlZpZXcgYW5k IFFXZWJWaWV3CiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mzg5MzkK ClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgpQYXRjaCBieSBBbnRvbmlvIEdvbWVzIDx0b25p a2l0b29Ad2Via2l0Lm9yZz4KCnVuc2V0UGFnZUlmRXhpc3RzIG1ldGhvZCB3YXMgcmVuYW1lZCB0 byBkZXRhY2hQYWdlIG1ldGhvZCBhbmQgaXMgbm93IHJlc3BvbnNpYmxlCmZvciBkb2luZyBhbGwg dGhlIHVuc2V0IGxvZ2ljIG9mIHBhZ2UgYW5kIHBhZ2VDbGllbnQgcmVmZXJlbmNlcyBwcmV2aW91 c2x5IGRvbmUgYnkKdGhlIFF7R3JhcGhpY3N9V2ViVmlldyBkZXN0cnVjdG9yKHMpLgoKSXQgaXMg YSBjb2RlIGNsZWFuIHVwLCBubyBiZWhhdmlvdXIgY2hhbmdlLgoKKiBBcGkvcWdyYXBoaWNzd2Vi dmlldy5jcHA6CihRR3JhcGhpY3NXZWJWaWV3UHJpdmF0ZTo6flFHcmFwaGljc1dlYlZpZXdQcml2 YXRlKToKKFFHcmFwaGljc1dlYlZpZXc6On5RR3JhcGhpY3NXZWJWaWV3KToKKFFHcmFwaGljc1dl YlZpZXdQcml2YXRlOjpkZXRhY2hQYWdlKToKKFFHcmFwaGljc1dlYlZpZXc6OnNldFBhZ2UpOgoq IEFwaS9xd2Vidmlldy5jcHA6CihRV2ViVmlld1ByaXZhdGU6On5RV2ViVmlld1ByaXZhdGUpOgoo UVdlYlZpZXc6On5RV2ViVmlldyk6CihRV2ViVmlld1ByaXZhdGU6OmRldGFjaFBhZ2UpOgooUVdl YlZpZXc6OnNldFBhZ2UpOgotLS0KIFdlYktpdC9xdC9BcGkvcWdyYXBoaWNzd2Vidmlldy5jcHAg fCAgIDMzICsrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLQogV2ViS2l0L3F0L0FwaS9x d2Vidmlldy5jcHAgICAgICAgICB8ICAgMzUgKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0t LS0tLS0KIFdlYktpdC9xdC9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgfCAgIDI0ICsrKysrKysr KysrKysrKysrKysrKysrKwogMyBmaWxlcyBjaGFuZ2VkLCA2MSBpbnNlcnRpb25zKCspLCAzMSBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQXBpL3FncmFwaGljc3dlYnZpZXcu Y3BwIGIvV2ViS2l0L3F0L0FwaS9xZ3JhcGhpY3N3ZWJ2aWV3LmNwcAppbmRleCBkNDI1YWI1Li5m ODU1ODgyIDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQXBpL3FncmFwaGljc3dlYnZpZXcuY3BwCisr KyBiL1dlYktpdC9xdC9BcGkvcWdyYXBoaWNzd2Vidmlldy5jcHAKQEAgLTUwLDQyICs1MCw0NyBA QCB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAogY2xhc3MgUUdyYXBoaWNzV2ViVmlld1ByaXZh dGUgewogcHVibGljOgogICAgIFFHcmFwaGljc1dlYlZpZXdQcml2YXRlKFFHcmFwaGljc1dlYlZp ZXcqIHBhcmVudCkKICAgICAgICAgOiBxKHBhcmVudCkKICAgICAgICAgLCBwYWdlKDApCiAgICAg ICAgICwgcmVzaXplc1RvQ29udGVudHMoZmFsc2UpIHt9CiAKLSAgICB2aXJ0dWFsIH5RR3JhcGhp Y3NXZWJWaWV3UHJpdmF0ZSgpIHt9OworICAgIHZpcnR1YWwgflFHcmFwaGljc1dlYlZpZXdQcml2 YXRlKCk7CiAKICNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCiAgICAgdm9pZCBzeW5j TGF5ZXJzKCk7CiAjZW5kaWYKIAogICAgIHZvaWQgdXBkYXRlUmVzaXplc1RvQ29udGVudHNGb3JQ YWdlKCk7CiAgICAgUVJlY3RGIGdyYXBoaWNzSXRlbVZpc2libGVSZWN0KCkgY29uc3Q7CiAKLSAg ICB2b2lkIHVuc2V0UGFnZUlmRXhpc3RzKCk7CisgICAgdm9pZCBkZXRhY2hQYWdlKCk7CiAKICAg ICB2b2lkIF9xX2RvTG9hZEZpbmlzaGVkKGJvb2wgc3VjY2Vzcyk7CiAgICAgdm9pZCBfcV9jb250 ZW50c1NpemVDaGFuZ2VkKGNvbnN0IFFTaXplJik7CiAgICAgdm9pZCBfcV9zY2FsZUNoYW5nZWQo KTsKIAogICAgIHZvaWQgX3FfdXBkYXRlTWljcm9Gb2N1cygpOwogICAgIHZvaWQgX3FfcGFnZURl c3Ryb3llZCgpOwogCiAgICAgUUdyYXBoaWNzV2ViVmlldyogcTsKICAgICBRV2ViUGFnZSogcGFn ZTsKICAgICBib29sIHJlc2l6ZXNUb0NvbnRlbnRzOwogCiAgICAgLy8gSnVzdCBhIGNvbnZlbmll bmNlIHRvIGF2b2lkIHVzaW5nIHBhZ2UtPmNsaWVudC0+b3ZlcmxheSBhbHdheXMKICAgICBRU2hh cmVkUG9pbnRlcjxRR3JhcGhpY3NJdGVtT3ZlcmxheT4gb3ZlcmxheTsKIH07CiAKK1FHcmFwaGlj c1dlYlZpZXdQcml2YXRlOjp+UUdyYXBoaWNzV2ViVmlld1ByaXZhdGUoKQoreworICAgIGRldGFj aFBhZ2UoKTsKK30KKwogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKIHZvaWQgUUdy YXBoaWNzV2ViVmlld1ByaXZhdGU6OnN5bmNMYXllcnMoKQogewogICAgIHN0YXRpY19jYXN0PFBh Z2VDbGllbnRRR3JhcGhpY3NXaWRnZXQqPihwYWdlLT5kLT5jbGllbnQpLT5zeW5jTGF5ZXJzKCk7 CiB9CiAjZW5kaWYKIAogdm9pZCBRR3JhcGhpY3NXZWJWaWV3UHJpdmF0ZTo6X3FfZG9Mb2FkRmlu aXNoZWQoYm9vbCBzdWNjZXNzKQpAQCAtMjcwLDI4ICsyNzUsMTYgQEAgUUdyYXBoaWNzV2ViVmll dzo6UUdyYXBoaWNzV2ViVmlldyhRR3JhcGhpY3NJdGVtKiBwYXJlbnQpCiAjZW5kaWYKIH0KIAog LyohCiAgICAgRGVzdHJveXMgdGhlIGl0ZW0uCiAqLwogUUdyYXBoaWNzV2ViVmlldzo6flFHcmFw aGljc1dlYlZpZXcoKQogewotICAgIGlmIChkLT5wYWdlKSB7Ci0jaWYgUVRfVkVSU0lPTiA+PSAw eDA0MDYwMAotICAgICAgICBkLT5wYWdlLT5kLT52aWV3LmNsZWFyKCk7Ci0jZWxzZQotICAgICAg ICBkLT5wYWdlLT5kLT52aWV3ID0gMDsKLSNlbmRpZgotICAgICAgICBkLT5wYWdlLT5kLT5jbGll bnQgPSAwOyAvLyB1bnNldCB0aGUgcGFnZSBjbGllbnQKLSAgICB9Ci0KLSAgICBpZiAoZC0+cGFn ZSAmJiBkLT5wYWdlLT5wYXJlbnQoKSA9PSB0aGlzKQotICAgICAgICBkZWxldGUgZC0+cGFnZTsK LQogICAgIGRlbGV0ZSBkOwogfQogCiAvKiEKICAgICBSZXR1cm5zIGEgcG9pbnRlciB0byB0aGUg dW5kZXJseWluZyB3ZWIgcGFnZS4KIAogICAgIFxzYSBzZXRQYWdlKCkKICovCkBAIC00MzcsNTQg KzQzMCw2MiBAQCBib29sIFFHcmFwaGljc1dlYlZpZXc6OmV2ZW50KFFFdmVudCogZXZlbnQpCiAg ICAgICAgICAgICAgICAgICAgIGQtPnBhZ2UtPmQtPmNsaWVudC0+cmVzZXRDdXJzb3IoKTsKICAg ICAgICAgICAgIH0KICNlbmRpZgogICAgICAgICB9CiAgICAgfQogICAgIHJldHVybiBRR3JhcGhp Y3NXaWRnZXQ6OmV2ZW50KGV2ZW50KTsKIH0KIAotdm9pZCBRR3JhcGhpY3NXZWJWaWV3UHJpdmF0 ZTo6dW5zZXRQYWdlSWZFeGlzdHMoKQordm9pZCBRR3JhcGhpY3NXZWJWaWV3UHJpdmF0ZTo6ZGV0 YWNoUGFnZSgpCiB7CiAgICAgaWYgKCFwYWdlKQogICAgICAgICByZXR1cm47CiAKKyNpZiBRVF9W RVJTSU9OID49IDB4MDQwNjAwCisgICAgcGFnZS0+ZC0+dmlldy5jbGVhcigpOworI2Vsc2UKKyAg ICBwYWdlLT5kLT52aWV3ID0gMDsKKyNlbmRpZgorCiAgICAgLy8gaWYgdGhlIHBhZ2UgY2xpZW50 IGlzIHRoZSBzcGVjaWFsIGNsaWVudCBjb25zdHJ1Y3RlZCBmb3IKICAgICAvLyBkZWxlZ2F0aW5n IHRoZSByZXNwb25zaWJpbGl0aWVzIHRvIGEgUVdpZGdldCwgd2UgbmVlZAogICAgIC8vIHRvIGRl c3Ryb3kgaXQuCiAKICAgICBpZiAocGFnZS0+ZC0+Y2xpZW50ICYmIHBhZ2UtPmQtPmNsaWVudC0+ aXNRV2lkZ2V0Q2xpZW50KCkpCiAgICAgICAgIGRlbGV0ZSBwYWdlLT5kLT5jbGllbnQ7CiAKICAg ICBwYWdlLT5kLT5jbGllbnQgPSAwOwogCiAgICAgLy8gaWYgdGhlIHBhZ2Ugd2FzIGNyZWF0ZWQg YnkgdXMsIHdlIG93biBpdCBhbmQgbmVlZCB0bwogICAgIC8vIGRlc3Ryb3kgaXQgYXMgd2VsbC4K IAogICAgIGlmIChwYWdlLT5wYXJlbnQoKSA9PSBxKQogICAgICAgICBkZWxldGUgcGFnZTsKICAg ICBlbHNlCiAgICAgICAgIHBhZ2UtPmRpc2Nvbm5lY3QocSk7CisKKyAgICBwYWdlID0gMDsKIH0K IAogLyohCiAgICAgTWFrZXMgXGEgcGFnZSB0aGUgbmV3IHdlYiBwYWdlIG9mIHRoZSB3ZWIgZ3Jh cGhpY3NpdGVtLgogCiAgICAgVGhlIHBhcmVudCBRT2JqZWN0IG9mIHRoZSBwcm92aWRlZCBwYWdl IHJlbWFpbnMgdGhlIG93bmVyCiAgICAgb2YgdGhlIG9iamVjdC4gSWYgdGhlIGN1cnJlbnQgZG9j dW1lbnQgaXMgYSBjaGlsZCBvZiB0aGUgd2ViCiAgICAgdmlldywgaXQgd2lsbCBiZSBkZWxldGVk LgogCiAgICAgXHNhIHBhZ2UoKQogKi8KIHZvaWQgUUdyYXBoaWNzV2ViVmlldzo6c2V0UGFnZShR V2ViUGFnZSogcGFnZSkKIHsKICAgICBpZiAoZC0+cGFnZSA9PSBwYWdlKQogICAgICAgICByZXR1 cm47CiAKLSAgICBkLT51bnNldFBhZ2VJZkV4aXN0cygpOworICAgIGQtPmRldGFjaFBhZ2UoKTsK ICAgICBkLT5wYWdlID0gcGFnZTsKIAogICAgIGlmICghZC0+cGFnZSkKICAgICAgICAgcmV0dXJu OwogCiAgICAgZC0+cGFnZS0+ZC0+Y2xpZW50ID0gbmV3IFBhZ2VDbGllbnRRR3JhcGhpY3NXaWRn ZXQodGhpcywgcGFnZSk7IC8vIHNldCB0aGUgcGFnZSBjbGllbnQKICAgICBkLT5vdmVybGF5ID0g c3RhdGljX2Nhc3Q8UGFnZUNsaWVudFFHcmFwaGljc1dpZGdldCo+KGQtPnBhZ2UtPmQtPmNsaWVu dCktPm92ZXJsYXk7CiAKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcXdlYnZpZXcuY3BwIGIv V2ViS2l0L3F0L0FwaS9xd2Vidmlldy5jcHAKaW5kZXggM2JhMTY3OC4uZjk3ZWZiNCAxMDA2NDQK LS0tIGEvV2ViS2l0L3F0L0FwaS9xd2Vidmlldy5jcHAKKysrIGIvV2ViS2l0L3F0L0FwaS9xd2Vi dmlldy5jcHAKQEAgLTM5LDI1ICszOSwzMiBAQCBwdWJsaWM6CiAgICAgUVdlYlZpZXdQcml2YXRl KFFXZWJWaWV3ICp2aWV3KQogICAgICAgICA6IHZpZXcodmlldykKICAgICAgICAgLCBwYWdlKDAp CiAgICAgICAgICwgcmVuZGVySGludHMoUVBhaW50ZXI6OlRleHRBbnRpYWxpYXNpbmcpCiAgICAg ewogICAgICAgICBRX0FTU0VSVCh2aWV3KTsKICAgICB9CiAKKyAgICB2aXJ0dWFsIH5RV2ViVmll d1ByaXZhdGUoKTsKKwogICAgIHZvaWQgX3FfcGFnZURlc3Ryb3llZCgpOwotICAgIHZvaWQgdW5z ZXRQYWdlSWZFeGlzdHMoKTsKKyAgICB2b2lkIGRldGFjaFBhZ2UoKTsKIAogICAgIFFXZWJWaWV3 ICp2aWV3OwogICAgIFFXZWJQYWdlICpwYWdlOwogCiAgICAgUVBhaW50ZXI6OlJlbmRlckhpbnRz IHJlbmRlckhpbnRzOwogfTsKIAorUVdlYlZpZXdQcml2YXRlOjp+UVdlYlZpZXdQcml2YXRlKCkK K3sKKyAgICBkZXRhY2hQYWdlKCk7Cit9CisKIHZvaWQgUVdlYlZpZXdQcml2YXRlOjpfcV9wYWdl RGVzdHJveWVkKCkKIHsKICAgICBwYWdlID0gMDsKICAgICB2aWV3LT5zZXRQYWdlKDApOwogfQog CiAjaWZkZWYgUV9XU19NQUVNT181CiAjaW5jbHVkZSAicWFic3RyYWN0a2luZXRpY3Njcm9sbGVy LmgiCkBAIC0zMTQsMjggKzMyMSwxNiBAQCBRV2ViVmlldzo6UVdlYlZpZXcoUVdpZGdldCAqcGFy ZW50KQogICAgIHNldEZvY3VzUG9saWN5KFF0OjpXaGVlbEZvY3VzKTsKIH0KIAogLyohCiAgICAg RGVzdHJveXMgdGhlIHdlYiB2aWV3LgogKi8KIFFXZWJWaWV3Ojp+UVdlYlZpZXcoKQogewotICAg IGlmIChkLT5wYWdlKSB7Ci0jaWYgUVRfVkVSU0lPTiA+PSAweDA0MDYwMAotICAgICAgICBkLT5w YWdlLT5kLT52aWV3LmNsZWFyKCk7Ci0jZWxzZQotICAgICAgICBkLT5wYWdlLT5kLT52aWV3ID0g MDsKLSNlbmRpZgotICAgICAgICBkZWxldGUgZC0+cGFnZS0+ZC0+Y2xpZW50OwotICAgICAgICBk LT5wYWdlLT5kLT5jbGllbnQgPSAwOwotICAgIH0KLQotICAgIGlmIChkLT5wYWdlICYmIGQtPnBh Z2UtPnBhcmVudCgpID09IHRoaXMpCi0gICAgICAgIGRlbGV0ZSBkLT5wYWdlOwogICAgIGRlbGV0 ZSBkOwogfQogCiAvKiEKICAgICBSZXR1cm5zIGEgcG9pbnRlciB0byB0aGUgdW5kZXJseWluZyB3 ZWIgcGFnZS4KIAogICAgIFxzYSBzZXRQYWdlKCkKICovCkBAIC0zNDMsNTQgKzMzOCw2NCBAQCBR V2ViUGFnZSAqUVdlYlZpZXc6OnBhZ2UoKSBjb25zdAogewogICAgIGlmICghZC0+cGFnZSkgewog ICAgICAgICBRV2ViVmlldyAqdGhhdCA9IGNvbnN0X2Nhc3Q8UVdlYlZpZXcgKj4odGhpcyk7CiAg ICAgICAgIHRoYXQtPnNldFBhZ2UobmV3IFFXZWJQYWdlKHRoYXQpKTsKICAgICB9CiAgICAgcmV0 dXJuIGQtPnBhZ2U7CiB9CiAKLXZvaWQgUVdlYlZpZXdQcml2YXRlOjp1bnNldFBhZ2VJZkV4aXN0 cygpCit2b2lkIFFXZWJWaWV3UHJpdmF0ZTo6ZGV0YWNoUGFnZSgpCiB7CiAgICAgaWYgKCFwYWdl KQogICAgICAgICByZXR1cm47CiAKKyAgICBpZiAocGFnZSkgeworI2lmIFFUX1ZFUlNJT04gPj0g MHgwNDA2MDAKKyAgICAgICAgcGFnZS0+ZC0+dmlldy5jbGVhcigpOworI2Vsc2UKKyAgICAgICAg cGFnZS0+ZC0+dmlldyA9IDA7CisjZW5kaWYKKyAgICB9CisKICAgICAvLyBpZiB0aGUgcGFnZSBj bGllbnQgaXMgdGhlIHNwZWNpYWwgY2xpZW50IGNvbnN0cnVjdGVkIGZvcgogICAgIC8vIGRlbGVn YXRpbmcgdGhlIHJlc3BvbnNpYmlsaXRpZXMgdG8gYSBRV2lkZ2V0LCB3ZSBuZWVkCiAgICAgLy8g dG8gZGVzdHJveSBpdC4KIAogICAgIGlmIChwYWdlLT5kLT5jbGllbnQgJiYgcGFnZS0+ZC0+Y2xp ZW50LT5pc1FXaWRnZXRDbGllbnQoKSkKICAgICAgICAgZGVsZXRlIHBhZ2UtPmQtPmNsaWVudDsK IAogICAgIHBhZ2UtPmQtPmNsaWVudCA9IDA7CiAKICAgICAvLyBpZiB0aGUgcGFnZSB3YXMgY3Jl YXRlZCBieSB1cywgd2Ugb3duIGl0IGFuZCBuZWVkIHRvCiAgICAgLy8gZGVzdHJveSBpdCBhcyB3 ZWxsLgogCiAgICAgaWYgKHBhZ2UtPnBhcmVudCgpID09IHZpZXcpCiAgICAgICAgIGRlbGV0ZSBw YWdlOwogICAgIGVsc2UKICAgICAgICAgcGFnZS0+ZGlzY29ubmVjdCh2aWV3KTsKKworICAgIHBh Z2UgPSAwOwogfQogCiAvKiEKICAgICBNYWtlcyBcYSBwYWdlIHRoZSBuZXcgd2ViIHBhZ2Ugb2Yg dGhlIHdlYiB2aWV3LgogCiAgICAgVGhlIHBhcmVudCBRT2JqZWN0IG9mIHRoZSBwcm92aWRlZCBw YWdlIHJlbWFpbnMgdGhlIG93bmVyCiAgICAgb2YgdGhlIG9iamVjdC4gSWYgdGhlIGN1cnJlbnQg ZG9jdW1lbnQgaXMgYSBjaGlsZCBvZiB0aGUgd2ViCiAgICAgdmlldywgaXQgd2lsbCBiZSBkZWxl dGVkLgogCiAgICAgXHNhIHBhZ2UoKQogKi8KIHZvaWQgUVdlYlZpZXc6OnNldFBhZ2UoUVdlYlBh Z2UqIHBhZ2UpCiB7CiAgICAgaWYgKGQtPnBhZ2UgPT0gcGFnZSkKICAgICAgICAgcmV0dXJuOwog Ci0gICAgZC0+dW5zZXRQYWdlSWZFeGlzdHMoKTsKKyAgICBkLT5kZXRhY2hQYWdlKCk7CiAgICAg ZC0+cGFnZSA9IHBhZ2U7CiAKICAgICBpZiAoZC0+cGFnZSkgewogICAgICAgICBkLT5wYWdlLT5z ZXRWaWV3KHRoaXMpOwogICAgICAgICBkLT5wYWdlLT5zZXRQYWxldHRlKHBhbGV0dGUoKSk7CiAg ICAgICAgIC8vICMjIyMgY29ubmVjdCBzaWduYWxzCiAgICAgICAgIFFXZWJGcmFtZSAqbWFpbkZy YW1lID0gZC0+cGFnZS0+bWFpbkZyYW1lKCk7CiAgICAgICAgIGNvbm5lY3QobWFpbkZyYW1lLCBT SUdOQUwodGl0bGVDaGFuZ2VkKFFTdHJpbmcpKSwKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9DaGFu Z2VMb2cgYi9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IGNmYWE1MTAuLmU4NjdlOGQgMTAwNjQ0 Ci0tLSBhL1dlYktpdC9xdC9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAt MSwxMCArMSwzNCBAQAogMjAxMC0wNS0xMSAgQW50b25pbyBHb21lcyAgPHRvbmlraXRvb0B3ZWJr aXQub3JnPgogCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFtRdF0gSW1wbGVtZW50IGEgZGV0YWNoUGFnZSBtZXRob2QgZm9yIFFHcmFwaGljc1dlYlZpZXcg YW5kIFFXZWJWaWV3CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0zODkzOQorCisgICAgICAgIHVuc2V0UGFnZUlmRXhpc3RzIG1ldGhvZCB3YXMgcmVuYW1l ZCB0byBkZXRhY2hQYWdlIG1ldGhvZCBhbmQgaXMgbm93IHJlc3BvbnNpYmxlCisgICAgICAgIGZv ciBkb2luZyBhbGwgdGhlIHVuc2V0IGxvZ2ljIG9mIHBhZ2UgYW5kIHBhZ2VDbGllbnQgcmVmZXJl bmNlcyBwcmV2aW91c2x5IGRvbmUgYnkKKyAgICAgICAgdGhlIFF7R3JhcGhpY3N9V2ViVmlldyBk ZXN0cnVjdG9yKHMpLgorCisgICAgICAgIEl0IGlzIGEgY29kZSBjbGVhbiB1cCwgbm8gYmVoYXZp b3VyIGNoYW5nZS4KKworICAgICAgICAqIEFwaS9xZ3JhcGhpY3N3ZWJ2aWV3LmNwcDoKKyAgICAg ICAgKFFHcmFwaGljc1dlYlZpZXdQcml2YXRlOjp+UUdyYXBoaWNzV2ViVmlld1ByaXZhdGUpOgor ICAgICAgICAoUUdyYXBoaWNzV2ViVmlldzo6flFHcmFwaGljc1dlYlZpZXcpOgorICAgICAgICAo UUdyYXBoaWNzV2ViVmlld1ByaXZhdGU6OmRldGFjaFBhZ2UpOgorICAgICAgICAoUUdyYXBoaWNz V2ViVmlldzo6c2V0UGFnZSk6CisgICAgICAgICogQXBpL3F3ZWJ2aWV3LmNwcDoKKyAgICAgICAg KFFXZWJWaWV3UHJpdmF0ZTo6flFXZWJWaWV3UHJpdmF0ZSk6CisgICAgICAgIChRV2ViVmlldzo6 flFXZWJWaWV3KToKKyAgICAgICAgKFFXZWJWaWV3UHJpdmF0ZTo6ZGV0YWNoUGFnZSk6CisgICAg ICAgIChRV2ViVmlldzo6c2V0UGFnZSk6CisKKzIwMTAtMDUtMTEgIEFudG9uaW8gR29tZXMgIDx0 b25pa2l0b29Ad2Via2l0Lm9yZz4KKwogICAgICAgICBSZXZpZXdlZCBieSBLZW5uZXRoIENocmlz dGlhbnNlbi4KIAogICAgICAgICBbUXRdIGVtaXQgaW5pdGlhbExheW91dENvbXBsZXRlZCBzaWdu YWwgZnJvbSBGcmFtZUxvYWRlckNsaWVudFF0OjpkaXNwYXRjaERpZEZpcnN0VmlzdWFsbHlOb25F bXB0eUxheW91dAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9Mzg5MjEKIAogICAgICAgICBFbWl0IGluaXRpYWxMYXlvdXRDb21wbGV0ZWQgc2lnbmFsIGZy b20gRnJhbWVMb2FkZXJDbGllbnRRdDo6ZGlzcGF0Y2hEaWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlM YXlvdXQKICAgICAgICAgaW5zdGVhZCBvZiBGcmFtZUxvYWRlckNsaWVudFF0OjpkaXNwYXRjaERp ZEZpcnN0TGF5b3V0ICwgYmVjYXVzZSB0aGUgZm9ybWVyIGVuc3VyZXMgdGhhdCBhCiAgICAgICAg IHZpc3VhbCBjb250ZW50IGxheWVkIG91dCBvbiB0aGUgZnJhbWUuCi0tIAoxLjYuMy4zCgo=