69926 2011-10-12 07:40:35 -0700 [Qt][WK2] Fix build after QSGItem API changes 2011-10-14 03:17:02 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 hausmann hausmann cmarcelo kbalazs ossy oldest_to_newest 482401 0 hausmann 2011-10-12 07:40:35 -0700 [Qt][WK2] Fix build after QSGItem API changes 482405 1 110684 hausmann 2011-10-12 07:46:56 -0700 Created attachment 110684 Patch 482406 2 110684 hausmann 2011-10-12 07:47:51 -0700 Comment on attachment 110684 Patch cq-. Landing needs to be synchronized with the wk2 bot 482407 3 110684 kenneth 2011-10-12 07:52:39 -0700 Comment on attachment 110684 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=110684&action=review > Source/WebKit2/ChangeLog:14 > + This patch adapts the desktop webview as well as the page proxy to handle these > + kind of events. Nice :-) 483302 4 hausmann 2011-10-13 10:49:37 -0700 *** Bug 70038 has been marked as a duplicate of this bug. *** 483886 5 hausmann 2011-10-14 03:17:02 -0700 Committed r97457: <http://trac.webkit.org/changeset/97457> 110684 2011-10-12 07:46:56 -0700 2011-10-12 07:52:39 -0700 Patch bug-69926-20111012164643.patch text/plain 9288 hausmann U3VidmVyc2lvbiBSZXZpc2lvbjogOTcyNTEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCA5OTE2NTFiZjZmODk1ODE3 ZDUwMmMyMTQ0N2ZkZTM2NzQzOGE5ZTViLi4wYTY4NWU2NmRmNzIwMmI4ZDg1ZDA3NjY0MjZlZjI2 MjRjZTM5MDg2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIgQEAKKzIwMTEtMTAtMTIgIFNpbW9u IEhhdXNtYW5uICA8c2ltb24uaGF1c21hbm5Abm9raWEuY29tPgorCisgICAgICAgIFtRdF1bV0sy XSBGaXggYnVpbGQgYWZ0ZXIgUVNHSXRlbSBBUEkgY2hhbmdlcworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Njk5MjYKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDb21taXQgYzgyNTg2NWNkZDg4NDQ1YWExZGI5 NGNkZjBkYTg5NDI2OTE5YWNkYiBpbiBxdGRlY2xhcmF0aXZlIGNoYW5nZWQgdGhlCisgICAgICAg IHNpZ25hdHVyZXMgb2YgdGhlIERyYWcgJiBEcm9wIGV2ZW50IGhhbmRsZXJzIGluIFFTR0l0ZW0u IFRoZSBTRyBzcGVjaWZpYyBldmVudHMKKyAgICAgICAgd2VyZSByZXBsYWNlZCB3aXRoIHRoZSBw bGFpbiBRRHJhZyogZXZlbnRzLCB3aGljaCBhcmUgbm93IHVzZWQgZm9yIHdpZGdldHMgYXMgd2Vs bAorICAgICAgICBhcyB0aGUgUXQgc2NlbmUgZ3JhcGguCisKKyAgICAgICAgVGhpcyBwYXRjaCBh ZGFwdHMgdGhlIGRlc2t0b3Agd2VidmlldyBhcyB3ZWxsIGFzIHRoZSBwYWdlIHByb3h5IHRvIGhh bmRsZSB0aGVzZQorICAgICAgICBraW5kIG9mIGV2ZW50cy4KKworICAgICAgICAqIFVJUHJvY2Vz cy9BUEkvcXQvcWRlc2t0b3B3ZWJ2aWV3LmNwcDoKKyAgICAgICAgKFFEZXNrdG9wV2ViVmlldzo6 ZHJhZ01vdmVFdmVudCk6CisgICAgICAgIChRRGVza3RvcFdlYlZpZXc6OmRyYWdFbnRlckV2ZW50 KToKKyAgICAgICAgKFFEZXNrdG9wV2ViVmlldzo6ZHJhZ0xlYXZlRXZlbnQpOgorICAgICAgICAo UURlc2t0b3BXZWJWaWV3Ojpkcm9wRXZlbnQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQv cWRlc2t0b3B3ZWJ2aWV3Lmg6CisgICAgICAgICogVUlQcm9jZXNzL3F0L3FkZXNrdG9wd2VicGFn ZXByb3h5LmNwcDoKKyAgICAgICAgKFFEZXNrdG9wV2ViUGFnZVByb3h5OjpoYW5kbGVFdmVudCk6 CisgICAgICAgIChRRGVza3RvcFdlYlBhZ2VQcm94eTo6aGFuZGxlRHJhZ0VudGVyRXZlbnQpOgor ICAgICAgICAoUURlc2t0b3BXZWJQYWdlUHJveHk6OmhhbmRsZURyYWdMZWF2ZUV2ZW50KToKKyAg ICAgICAgKFFEZXNrdG9wV2ViUGFnZVByb3h5OjpoYW5kbGVEcmFnTW92ZUV2ZW50KToKKyAgICAg ICAgKFFEZXNrdG9wV2ViUGFnZVByb3h5OjpoYW5kbGVEcm9wRXZlbnQpOgorICAgICAgICAqIFVJ UHJvY2Vzcy9xdC9xZGVza3RvcHdlYnBhZ2Vwcm94eS5oOgorCiAyMDExLTEwLTExICBTaW1vbiBG cmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIE1ha2UgY3VzdG9tIHNj cm9sbGJhciB0aGVtZSBmb3IgdXNlIGluIERSVCwgdG8gcmVkdWNlIHBpeGVsIGRpZmZzIGJldHdl ZW4gcGxhdGZvcm1zCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0 L3FkZXNrdG9wd2Vidmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3Fk ZXNrdG9wd2Vidmlldy5jcHAKaW5kZXggYzY3MGM0MGU2OTA1YzhkYzY3ZjA5ZWUwYzNhMGVhYzc2 NGUxNDQxYS4uMjk2N2I1M2ZiNjdhNzMyMzcxY2M2OTQwMTcxMWMzODAwZmU1YzAwNSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xZGVza3RvcHdlYnZpZXcuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcWRlc2t0b3B3ZWJ2aWV3LmNw cApAQCAtMzAsNyArMzAsNiBAQAogI2luY2x1ZGUgPFFTdHlsZU9wdGlvbkdyYXBoaWNzSXRlbT4K ICNpbmNsdWRlIDxRdERlY2xhcmF0aXZlL3FkZWNsYXJhdGl2ZWVuZ2luZS5oPgogI2luY2x1ZGUg PFF0RGVjbGFyYXRpdmUvcXNnY2FudmFzLmg+Ci0jaW5jbHVkZSA8UXREZWNsYXJhdGl2ZS9xc2dl dmVudC5oPgogI2luY2x1ZGUgPFF0RGVjbGFyYXRpdmUvcXNnaXRlbS5oPgogI2luY2x1ZGUgPFF0 RGVjbGFyYXRpdmUvcXNndmlldy5oPgogI2luY2x1ZGUgPFF0R3VpL1FDdXJzb3I+CkBAIC0zNzAs MjIgKzM2OSwyMiBAQCB2b2lkIFFEZXNrdG9wV2ViVmlldzo6aG92ZXJMZWF2ZUV2ZW50KFFIb3Zl ckV2ZW50KiBldmVudCkKICAgICB0aGlzLT5ldmVudChldmVudCk7CiB9CiAKLXZvaWQgUURlc2t0 b3BXZWJWaWV3OjpkcmFnTW92ZUV2ZW50KFFTR0RyYWdFdmVudCogZXZlbnQpCit2b2lkIFFEZXNr dG9wV2ViVmlldzo6ZHJhZ01vdmVFdmVudChRRHJhZ01vdmVFdmVudCogZXZlbnQpCiB7CiAgICAg dGhpcy0+ZXZlbnQoZXZlbnQpOwogfQogCi12b2lkIFFEZXNrdG9wV2ViVmlldzo6ZHJhZ0VudGVy RXZlbnQoUVNHRHJhZ0V2ZW50KiBldmVudCkKK3ZvaWQgUURlc2t0b3BXZWJWaWV3OjpkcmFnRW50 ZXJFdmVudChRRHJhZ0VudGVyRXZlbnQqIGV2ZW50KQogewogICAgIHRoaXMtPmV2ZW50KGV2ZW50 KTsKIH0KIAotdm9pZCBRRGVza3RvcFdlYlZpZXc6OmRyYWdFeGl0RXZlbnQoUVNHRHJhZ0V2ZW50 KiBldmVudCkKK3ZvaWQgUURlc2t0b3BXZWJWaWV3OjpkcmFnTGVhdmVFdmVudChRRHJhZ0xlYXZl RXZlbnQqIGV2ZW50KQogewogICAgIHRoaXMtPmV2ZW50KGV2ZW50KTsKIH0KIAotdm9pZCBRRGVz a3RvcFdlYlZpZXc6OmRyYWdEcm9wRXZlbnQoUVNHRHJhZ0V2ZW50KiBldmVudCkKK3ZvaWQgUURl c2t0b3BXZWJWaWV3Ojpkcm9wRXZlbnQoUURyb3BFdmVudCogZXZlbnQpCiB7CiAgICAgdGhpcy0+ ZXZlbnQoZXZlbnQpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9xdC9xZGVza3RvcHdlYnZpZXcuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQv cWRlc2t0b3B3ZWJ2aWV3LmgKaW5kZXggYjI1ZGRlZjQ3NDdkZTVhOTdkMjhiZDc5NjQwZjk0ZmEy Y2ZhYzJiYS4uYTNhZjMyODEyYjFhYzNmODQ5NzEzNjM5OGI0OWUwMTIyNzQzMWM5OCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xZGVza3RvcHdlYnZpZXcuaAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FkZXNrdG9wd2Vidmlldy5oCkBA IC0zOCw3ICszOCwxMCBAQCBjbGFzcyBRSW5wdXRNZXRob2RFdmVudDsKIGNsYXNzIFFLZXlFdmVu dDsKIGNsYXNzIFFQYWludGVyOwogY2xhc3MgUVJlY3RGOwotY2xhc3MgUVNHRHJhZ0V2ZW50Owor Y2xhc3MgUURyYWdFbnRlckV2ZW50OworY2xhc3MgUURyYWdNb3ZlRXZlbnQ7CitjbGFzcyBRRHJh Z0xlYXZlRXZlbnQ7CitjbGFzcyBRRHJvcEV2ZW50OwogY2xhc3MgUVRvdWNoRXZlbnQ7CiBjbGFz cyBRV2hlZWxFdmVudDsKIFFUX0VORF9OQU1FU1BBQ0UKQEAgLTEwNSwxMCArMTA4LDEwIEBAIHBy b3RlY3RlZDoKICAgICB2aXJ0dWFsIHZvaWQgaG92ZXJFbnRlckV2ZW50KFFIb3ZlckV2ZW50Kik7 CiAgICAgdmlydHVhbCB2b2lkIGhvdmVyTW92ZUV2ZW50KFFIb3ZlckV2ZW50Kik7CiAgICAgdmly dHVhbCB2b2lkIGhvdmVyTGVhdmVFdmVudChRSG92ZXJFdmVudCopOwotICAgIHZpcnR1YWwgdm9p ZCBkcmFnTW92ZUV2ZW50KFFTR0RyYWdFdmVudCopOwotICAgIHZpcnR1YWwgdm9pZCBkcmFnRW50 ZXJFdmVudChRU0dEcmFnRXZlbnQqKTsKLSAgICB2aXJ0dWFsIHZvaWQgZHJhZ0V4aXRFdmVudChR U0dEcmFnRXZlbnQqKTsKLSAgICB2aXJ0dWFsIHZvaWQgZHJhZ0Ryb3BFdmVudChRU0dEcmFnRXZl bnQqKTsKKyAgICB2aXJ0dWFsIHZvaWQgZHJhZ01vdmVFdmVudChRRHJhZ01vdmVFdmVudCopOwor ICAgIHZpcnR1YWwgdm9pZCBkcmFnRW50ZXJFdmVudChRRHJhZ0VudGVyRXZlbnQqKTsKKyAgICB2 aXJ0dWFsIHZvaWQgZHJhZ0xlYXZlRXZlbnQoUURyYWdMZWF2ZUV2ZW50Kik7CisgICAgdmlydHVh bCB2b2lkIGRyb3BFdmVudChRRHJvcEV2ZW50Kik7CiAKICAgICB2aXJ0dWFsIHZvaWQgZ2VvbWV0 cnlDaGFuZ2VkKGNvbnN0IFFSZWN0RiYsIGNvbnN0IFFSZWN0RiYpOwogICAgIHZvaWQgcGFpbnQo UVBhaW50ZXIqKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9xZGVz a3RvcHdlYnBhZ2Vwcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvcWRlc2t0 b3B3ZWJwYWdlcHJveHkuY3BwCmluZGV4IDUyM2Q3NzdkYTAwNjNhMTNmYTBiODNjMWMwN2Q5NmE1 NWE3NzYxMDUuLmExNDJkZDRjMjMzNjc0NmFmNjhkZjQyNDE4OTA2ZGY1MzBjMWJiYzIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9xZGVza3RvcHdlYnBhZ2Vwcm94eS5j cHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L3FkZXNrdG9wd2VicGFnZXByb3h5 LmNwcApAQCAtMTAyLDE0ICsxMDIsMTQgQEAgYm9vbCBRRGVza3RvcFdlYlBhZ2VQcm94eTo6aGFu ZGxlRXZlbnQoUUV2ZW50KiBldikKICAgICAgICAgcmV0dXJuIGhhbmRsZVdoZWVsRXZlbnQocmVp bnRlcnByZXRfY2FzdDxRV2hlZWxFdmVudCo+KGV2KSk7CiAgICAgY2FzZSBRRXZlbnQ6OkhvdmVy TW92ZToKICAgICAgICAgcmV0dXJuIGhhbmRsZUhvdmVyTW92ZUV2ZW50KHJlaW50ZXJwcmV0X2Nh c3Q8UUhvdmVyRXZlbnQqPihldikpOwotICAgIGNhc2UgUUV2ZW50OjpHcmFwaGljc1NjZW5lRHJh Z0VudGVyOgotICAgICAgICByZXR1cm4gaGFuZGxlRHJhZ0VudGVyRXZlbnQocmVpbnRlcnByZXRf Y2FzdDxRR3JhcGhpY3NTY2VuZURyYWdEcm9wRXZlbnQqPihldikpOwotICAgIGNhc2UgUUV2ZW50 OjpHcmFwaGljc1NjZW5lRHJhZ0xlYXZlOgotICAgICAgICByZXR1cm4gaGFuZGxlRHJhZ0xlYXZl RXZlbnQocmVpbnRlcnByZXRfY2FzdDxRR3JhcGhpY3NTY2VuZURyYWdEcm9wRXZlbnQqPihldikp OwotICAgIGNhc2UgUUV2ZW50OjpHcmFwaGljc1NjZW5lRHJhZ01vdmU6Ci0gICAgICAgIHJldHVy biBoYW5kbGVEcmFnTW92ZUV2ZW50KHJlaW50ZXJwcmV0X2Nhc3Q8UUdyYXBoaWNzU2NlbmVEcmFn RHJvcEV2ZW50Kj4oZXYpKTsKLSAgICBjYXNlIFFFdmVudDo6R3JhcGhpY3NTY2VuZURyb3A6Ci0g ICAgICAgIHJldHVybiBoYW5kbGVEcm9wRXZlbnQocmVpbnRlcnByZXRfY2FzdDxRR3JhcGhpY3NT Y2VuZURyYWdEcm9wRXZlbnQqPihldikpOworICAgIGNhc2UgUUV2ZW50OjpEcmFnRW50ZXI6Cisg ICAgICAgIHJldHVybiBoYW5kbGVEcmFnRW50ZXJFdmVudChyZWludGVycHJldF9jYXN0PFFEcmFn RW50ZXJFdmVudCo+KGV2KSk7CisgICAgY2FzZSBRRXZlbnQ6OkRyYWdMZWF2ZToKKyAgICAgICAg cmV0dXJuIGhhbmRsZURyYWdMZWF2ZUV2ZW50KHJlaW50ZXJwcmV0X2Nhc3Q8UURyYWdMZWF2ZUV2 ZW50Kj4oZXYpKTsKKyAgICBjYXNlIFFFdmVudDo6RHJhZ01vdmU6CisgICAgICAgIHJldHVybiBo YW5kbGVEcmFnTW92ZUV2ZW50KHJlaW50ZXJwcmV0X2Nhc3Q8UURyYWdNb3ZlRXZlbnQqPihldikp OworICAgIGNhc2UgUUV2ZW50OjpEcm9wOgorICAgICAgICByZXR1cm4gaGFuZGxlRHJvcEV2ZW50 KHJlaW50ZXJwcmV0X2Nhc3Q8UURyb3BFdmVudCo+KGV2KSk7CiAgICAgfQogICAgIHJldHVybiBR dFdlYlBhZ2VQcm94eTo6aGFuZGxlRXZlbnQoZXYpOwogfQpAQCAtMTcxLDE3ICsxNzEsMTcgQEAg Ym9vbCBRRGVza3RvcFdlYlBhZ2VQcm94eTo6aGFuZGxlSG92ZXJNb3ZlRXZlbnQoUUhvdmVyRXZl bnQqIGV2KQogICAgIHJldHVybiBoYW5kbGVNb3VzZU1vdmVFdmVudCgmbWUpOwogfQogCi1ib29s IFFEZXNrdG9wV2ViUGFnZVByb3h5OjpoYW5kbGVEcmFnRW50ZXJFdmVudChRR3JhcGhpY3NTY2Vu ZURyYWdEcm9wRXZlbnQqIGV2KQorYm9vbCBRRGVza3RvcFdlYlBhZ2VQcm94eTo6aGFuZGxlRHJh Z0VudGVyRXZlbnQoUURyYWdFbnRlckV2ZW50KiBldikKIHsKICAgICBtX3dlYlBhZ2VQcm94eS0+ cmVzZXREcmFnT3BlcmF0aW9uKCk7CiAgICAgLy8gRklYTUU6IFNob3VsZCBub3QgdXNlIFFDdXJz b3I6OnBvcygpCi0gICAgRHJhZ0RhdGEgZHJhZ0RhdGEoZXYtPm1pbWVEYXRhKCksIGV2LT5wb3Mo KS50b1BvaW50KCksIFFDdXJzb3I6OnBvcygpLCBkcm9wQWN0aW9uVG9EcmFnT3BlcmF0aW9uKGV2 LT5wb3NzaWJsZUFjdGlvbnMoKSkpOworICAgIERyYWdEYXRhIGRyYWdEYXRhKGV2LT5taW1lRGF0 YSgpLCBldi0+cG9zKCksIFFDdXJzb3I6OnBvcygpLCBkcm9wQWN0aW9uVG9EcmFnT3BlcmF0aW9u KGV2LT5wb3NzaWJsZUFjdGlvbnMoKSkpOwogICAgIG1fd2ViUGFnZVByb3h5LT5kcmFnRW50ZXJl ZCgmZHJhZ0RhdGEpOwogICAgIGV2LT5hY2NlcHRQcm9wb3NlZEFjdGlvbigpOwogICAgIHJldHVy biB0cnVlOwogfQogCi1ib29sIFFEZXNrdG9wV2ViUGFnZVByb3h5OjpoYW5kbGVEcmFnTGVhdmVF dmVudChRR3JhcGhpY3NTY2VuZURyYWdEcm9wRXZlbnQqIGV2KQorYm9vbCBRRGVza3RvcFdlYlBh Z2VQcm94eTo6aGFuZGxlRHJhZ0xlYXZlRXZlbnQoUURyYWdMZWF2ZUV2ZW50KiBldikKIHsKICAg ICBib29sIGFjY2VwdGVkID0gZXYtPmlzQWNjZXB0ZWQoKTsKIApAQCAtMTk0LDEyICsxOTQsMTIg QEAgYm9vbCBRRGVza3RvcFdlYlBhZ2VQcm94eTo6aGFuZGxlRHJhZ0xlYXZlRXZlbnQoUUdyYXBo aWNzU2NlbmVEcmFnRHJvcEV2ZW50KiBldikKICAgICByZXR1cm4gYWNjZXB0ZWQ7CiB9CiAKLWJv b2wgUURlc2t0b3BXZWJQYWdlUHJveHk6OmhhbmRsZURyYWdNb3ZlRXZlbnQoUUdyYXBoaWNzU2Nl bmVEcmFnRHJvcEV2ZW50KiBldikKK2Jvb2wgUURlc2t0b3BXZWJQYWdlUHJveHk6OmhhbmRsZURy YWdNb3ZlRXZlbnQoUURyYWdNb3ZlRXZlbnQqIGV2KQogewogICAgIGJvb2wgYWNjZXB0ZWQgPSBl di0+aXNBY2NlcHRlZCgpOwogCiAgICAgLy8gRklYTUU6IFNob3VsZCBub3QgdXNlIFFDdXJzb3I6 OnBvcygpCi0gICAgRHJhZ0RhdGEgZHJhZ0RhdGEoZXYtPm1pbWVEYXRhKCksIGV2LT5wb3MoKS50 b1BvaW50KCksIFFDdXJzb3I6OnBvcygpLCBkcm9wQWN0aW9uVG9EcmFnT3BlcmF0aW9uKGV2LT5w b3NzaWJsZUFjdGlvbnMoKSkpOworICAgIERyYWdEYXRhIGRyYWdEYXRhKGV2LT5taW1lRGF0YSgp LCBldi0+cG9zKCksIFFDdXJzb3I6OnBvcygpLCBkcm9wQWN0aW9uVG9EcmFnT3BlcmF0aW9uKGV2 LT5wb3NzaWJsZUFjdGlvbnMoKSkpOwogICAgIG1fd2ViUGFnZVByb3h5LT5kcmFnVXBkYXRlZCgm ZHJhZ0RhdGEpOwogICAgIGV2LT5zZXREcm9wQWN0aW9uKGRyYWdPcGVyYXRpb25Ub0Ryb3BBY3Rp b24obV93ZWJQYWdlUHJveHktPmRyYWdPcGVyYXRpb24oKSkpOwogICAgIGlmIChtX3dlYlBhZ2VQ cm94eS0+ZHJhZ09wZXJhdGlvbigpICE9IERyYWdPcGVyYXRpb25Ob25lKQpAQCAtMjA5LDEyICsy MDksMTIgQEAgYm9vbCBRRGVza3RvcFdlYlBhZ2VQcm94eTo6aGFuZGxlRHJhZ01vdmVFdmVudChR R3JhcGhpY3NTY2VuZURyYWdEcm9wRXZlbnQqIGV2KQogICAgIHJldHVybiBhY2NlcHRlZDsKIH0K IAotYm9vbCBRRGVza3RvcFdlYlBhZ2VQcm94eTo6aGFuZGxlRHJvcEV2ZW50KFFHcmFwaGljc1Nj ZW5lRHJhZ0Ryb3BFdmVudCogZXYpCitib29sIFFEZXNrdG9wV2ViUGFnZVByb3h5OjpoYW5kbGVE cm9wRXZlbnQoUURyb3BFdmVudCogZXYpCiB7CiAgICAgYm9vbCBhY2NlcHRlZCA9IGV2LT5pc0Fj Y2VwdGVkKCk7CiAKICAgICAvLyBGSVhNRTogU2hvdWxkIG5vdCB1c2UgUUN1cnNvcjo6cG9zKCkK LSAgICBEcmFnRGF0YSBkcmFnRGF0YShldi0+bWltZURhdGEoKSwgZXYtPnBvcygpLnRvUG9pbnQo KSwgUUN1cnNvcjo6cG9zKCksIGRyb3BBY3Rpb25Ub0RyYWdPcGVyYXRpb24oZXYtPnBvc3NpYmxl QWN0aW9ucygpKSk7CisgICAgRHJhZ0RhdGEgZHJhZ0RhdGEoZXYtPm1pbWVEYXRhKCksIGV2LT5w b3MoKSwgUUN1cnNvcjo6cG9zKCksIGRyb3BBY3Rpb25Ub0RyYWdPcGVyYXRpb24oZXYtPnBvc3Np YmxlQWN0aW9ucygpKSk7CiAgICAgU2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlIGhhbmRsZTsKICAg ICBtX3dlYlBhZ2VQcm94eS0+cGVyZm9ybURyYWcoJmRyYWdEYXRhLCBTdHJpbmcoKSwgaGFuZGxl KTsKICAgICBldi0+c2V0RHJvcEFjdGlvbihkcmFnT3BlcmF0aW9uVG9Ecm9wQWN0aW9uKG1fd2Vi UGFnZVByb3h5LT5kcmFnT3BlcmF0aW9uKCkpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9xdC9xZGVza3RvcHdlYnBhZ2Vwcm94eS5oIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL3F0L3FkZXNrdG9wd2VicGFnZXByb3h5LmgKaW5kZXggODEwMzFmNDlhYzBjY2I4MGRj NjdiZmJlNDFkYmIzY2VhZGRjMjY2Yy4uNjFkNTY4MjJmZTZkNDBhYmMyNzBlZjNlZDFlNDdlYmUz YTA2MGUwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L3FkZXNrdG9w d2VicGFnZXByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L3FkZXNrdG9w d2VicGFnZXByb3h5LmgKQEAgLTU3LDEwICs1NywxMCBAQCBwcml2YXRlOgogICAgIGJvb2wgaGFu ZGxlTW91c2VEb3VibGVDbGlja0V2ZW50KFFNb3VzZUV2ZW50Kik7CiAgICAgYm9vbCBoYW5kbGVX aGVlbEV2ZW50KFFXaGVlbEV2ZW50Kik7CiAgICAgYm9vbCBoYW5kbGVIb3Zlck1vdmVFdmVudChR SG92ZXJFdmVudCopOwotICAgIGJvb2wgaGFuZGxlRHJhZ0VudGVyRXZlbnQoUUdyYXBoaWNzU2Nl bmVEcmFnRHJvcEV2ZW50Kik7Ci0gICAgYm9vbCBoYW5kbGVEcmFnTGVhdmVFdmVudChRR3JhcGhp Y3NTY2VuZURyYWdEcm9wRXZlbnQqKTsKLSAgICBib29sIGhhbmRsZURyYWdNb3ZlRXZlbnQoUUdy YXBoaWNzU2NlbmVEcmFnRHJvcEV2ZW50Kik7Ci0gICAgYm9vbCBoYW5kbGVEcm9wRXZlbnQoUUdy YXBoaWNzU2NlbmVEcmFnRHJvcEV2ZW50Kik7CisgICAgYm9vbCBoYW5kbGVEcmFnRW50ZXJFdmVu dChRRHJhZ0VudGVyRXZlbnQqKTsKKyAgICBib29sIGhhbmRsZURyYWdMZWF2ZUV2ZW50KFFEcmFn TGVhdmVFdmVudCopOworICAgIGJvb2wgaGFuZGxlRHJhZ01vdmVFdmVudChRRHJhZ01vdmVFdmVu dCopOworICAgIGJvb2wgaGFuZGxlRHJvcEV2ZW50KFFEcm9wRXZlbnQqKTsKIAogICAgIFFQb2lu dCBtX3RyaXBsZUNsaWNrOwogICAgIFFCYXNpY1RpbWVyIG1fdHJpcGxlQ2xpY2tUaW1lcjsK