47195 2010-10-05 10:34:16 -0700 [Qt] Duplicated code in QWebPagePrivate 2010-10-06 11:53:54 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) Other Linux RESOLVED FIXED P2 Normal --- 0 ragner.magalhaes webkit-unassigned commit-queue kling tonikitoo oldest_to_newest 289728 0 ragner.magalhaes 2010-10-05 10:34:16 -0700 In QWebPagePrivate class has some duplicated methods for mouse events from QGraphicsView and QWidget. 289773 1 69817 ragner.magalhaes 2010-10-05 11:35:21 -0700 Created attachment 69817 Patch 01 289777 2 69817 tonikitoo 2010-10-05 11:38:26 -0700 Comment on attachment 69817 Patch 01 This is a great thing! r=me, but please wait kling, simon or kenneth to look at it, and set cq+ 289781 3 ragner.magalhaes 2010-10-05 11:41:30 -0700 (In reply to comment #2) > (From update of attachment 69817 [details]) > This is a great thing! r=me, but please wait kling, simon or kenneth to look at it, and set cq+ Ok, waiting :P 289784 4 kling 2010-10-05 11:42:41 -0700 I like it. 290494 5 69817 commit-queue 2010-10-06 11:53:49 -0700 Comment on attachment 69817 Patch 01 Clearing flags on attachment: 69817 Committed r69217: <http://trac.webkit.org/changeset/69217> 290495 6 commit-queue 2010-10-06 11:53:54 -0700 All reviewed patches have been landed. Closing bug. 69817 2010-10-05 11:35:21 -0700 2010-10-06 11:53:49 -0700 Patch 01 0001-Qt-Duplicated-code-in-QWebPagePrivate.patch text/plain 14159 ragner.magalhaes RnJvbSBhNzA2Y2I3NjIyNjgzOGZhNDQ2ODA3Y2YwZWFmZDM5MmEyYWU4YTMzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSYWduZXIgTWFnYWxoYWVzIDxyYWduZXIubWFnYWxoYWVzQG9w ZW5ib3NzYS5vcmc+CkRhdGU6IFR1ZSwgNSBPY3QgMjAxMCAxNDoyODoxNCAtMDQwMApTdWJqZWN0 OiBbUEFUQ0hdIFtRdF0gRHVwbGljYXRlZCBjb2RlIGluIFFXZWJQYWdlUHJpdmF0ZQogaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ3MTk1CgpSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KClJlbW92ZSBkdXBsaWNhdGVkIGNvZGUgZnJvbSBRV2ViUGFnZVByaXZhdGUg Y2xhc3MgZm9yIFFHcmFwaGljc1ZpZXcgYW5kIFFXaWRnZXQgbW91c2UncyBldmVudHMuCgoqIEFw aS9xd2VicGFnZS5jcHA6CihRV2ViUGFnZVByaXZhdGU6Om1vdXNlTW92ZUV2ZW50KToKKFFXZWJQ YWdlUHJpdmF0ZTo6bW91c2VQcmVzc0V2ZW50KToKKFFXZWJQYWdlUHJpdmF0ZTo6bW91c2VEb3Vi bGVDbGlja0V2ZW50KToKKFFXZWJQYWdlUHJpdmF0ZTo6bW91c2VUcmlwbGVDbGlja0V2ZW50KToK KFFXZWJQYWdlUHJpdmF0ZTo6bW91c2VSZWxlYXNlRXZlbnQpOgooUVdlYlBhZ2VQcml2YXRlOjp3 aGVlbEV2ZW50KToKKFFXZWJQYWdlUHJpdmF0ZTo6ZHJhZ0VudGVyRXZlbnQpOgooUVdlYlBhZ2VQ cml2YXRlOjpkcmFnTGVhdmVFdmVudCk6CihRV2ViUGFnZVByaXZhdGU6OmRyYWdNb3ZlRXZlbnQp OgooUVdlYlBhZ2VQcml2YXRlOjpkcm9wRXZlbnQpOgoqIEFwaS9xd2VicGFnZV9wLmg6Ci0tLQog V2ViS2l0L3F0L0FwaS9xd2VicGFnZS5jcHAgfCAgMTg5ICsrKysrKy0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tCiBXZWJLaXQvcXQvQXBpL3F3ZWJwYWdlX3AuaCB8ICAgMzAg KysrLS0tLS0KIFdlYktpdC9xdC9DaGFuZ2VMb2cgICAgICAgIHwgICAyMiArKysrKwogMyBmaWxl cyBjaGFuZ2VkLCA1NiBpbnNlcnRpb25zKCspLCAxODUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5jcHAgYi9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNw cAppbmRleCA5ZGVkMzdiLi42YmNkNWZhIDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQXBpL3F3ZWJw YWdlLmNwcAorKysgYi9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcApAQCAtNjEzLDcgKzYxMyw4 IEBAIHZvaWQgUVdlYlBhZ2VQcml2YXRlOjp0aW1lckV2ZW50KFFUaW1lckV2ZW50ICpldikKICAg ICAgICAgcS0+dGltZXJFdmVudChldik7CiB9CiAKLXZvaWQgUVdlYlBhZ2VQcml2YXRlOjptb3Vz ZU1vdmVFdmVudChRR3JhcGhpY3NTY2VuZU1vdXNlRXZlbnQqIGV2KQordGVtcGxhdGU8Y2xhc3Mg VD4KK3ZvaWQgUVdlYlBhZ2VQcml2YXRlOjptb3VzZU1vdmVFdmVudChUKiBldikKIHsKICAgICBX ZWJDb3JlOjpGcmFtZSogZnJhbWUgPSBRV2ViRnJhbWVQcml2YXRlOjpjb3JlKG1haW5GcmFtZSk7 CiAgICAgaWYgKCFmcmFtZS0+dmlldygpKQpAQCAtNjIzLDUxICs2MjQsOCBAQCB2b2lkIFFXZWJQ YWdlUHJpdmF0ZTo6bW91c2VNb3ZlRXZlbnQoUUdyYXBoaWNzU2NlbmVNb3VzZUV2ZW50KiBldikK ICAgICBldi0+c2V0QWNjZXB0ZWQoYWNjZXB0ZWQpOwogfQogCi12b2lkIFFXZWJQYWdlUHJpdmF0 ZTo6bW91c2VNb3ZlRXZlbnQoUU1vdXNlRXZlbnQgKmV2KQotewotICAgIFdlYkNvcmU6OkZyYW1l KiBmcmFtZSA9IFFXZWJGcmFtZVByaXZhdGU6OmNvcmUobWFpbkZyYW1lKTsKLSAgICBpZiAoIWZy YW1lLT52aWV3KCkpCi0gICAgICAgIHJldHVybjsKLQotICAgIGJvb2wgYWNjZXB0ZWQgPSBmcmFt ZS0+ZXZlbnRIYW5kbGVyKCktPm1vdXNlTW92ZWQoUGxhdGZvcm1Nb3VzZUV2ZW50KGV2LCAwKSk7 Ci0gICAgZXYtPnNldEFjY2VwdGVkKGFjY2VwdGVkKTsKLX0KLQotdm9pZCBRV2ViUGFnZVByaXZh dGU6Om1vdXNlUHJlc3NFdmVudChRR3JhcGhpY3NTY2VuZU1vdXNlRXZlbnQqIGV2KQotewotICAg IFdlYkNvcmU6OkZyYW1lKiBmcmFtZSA9IFFXZWJGcmFtZVByaXZhdGU6OmNvcmUobWFpbkZyYW1l KTsKLSAgICBpZiAoIWZyYW1lLT52aWV3KCkpCi0gICAgICAgIHJldHVybjsKLQotICAgIFJlZlB0 cjxXZWJDb3JlOjpOb2RlPiBvbGROb2RlOwotICAgIEZyYW1lKiBmb2N1c2VkRnJhbWUgPSBwYWdl LT5mb2N1c0NvbnRyb2xsZXIoKS0+Zm9jdXNlZEZyYW1lKCk7Ci0gICAgaWYgKERvY3VtZW50KiBm b2N1c2VkRG9jdW1lbnQgPSBmb2N1c2VkRnJhbWUgPyBmb2N1c2VkRnJhbWUtPmRvY3VtZW50KCkg OiAwKQotICAgICAgICBvbGROb2RlID0gZm9jdXNlZERvY3VtZW50LT5mb2N1c2VkTm9kZSgpOwot Ci0gICAgaWYgKHRyaXBsZUNsaWNrVGltZXIuaXNBY3RpdmUoKQotICAgICAgICAgICAgJiYgKGV2 LT5wb3MoKS50b1BvaW50KCkgLSB0cmlwbGVDbGljaykubWFuaGF0dGFuTGVuZ3RoKCkKLSAgICAg ICAgICAgICAgICA8IFFBcHBsaWNhdGlvbjo6c3RhcnREcmFnRGlzdGFuY2UoKSkgewotICAgICAg ICBtb3VzZVRyaXBsZUNsaWNrRXZlbnQoZXYpOwotICAgICAgICByZXR1cm47Ci0gICAgfQotCi0g ICAgYm9vbCBhY2NlcHRlZCA9IGZhbHNlOwotICAgIFBsYXRmb3JtTW91c2VFdmVudCBtZXYoZXYs IDEpOwotICAgIC8vIGlnbm9yZSB0aGUgZXZlbnQgaWYgd2UgY2FuJ3QgbWFwIFF0J3MgbW91c2Ug YnV0dG9ucyB0byBXZWJDb3JlOjpNb3VzZUJ1dHRvbgotICAgIGlmIChtZXYuYnV0dG9uKCkgIT0g Tm9CdXR0b24pCi0gICAgICAgIGFjY2VwdGVkID0gZnJhbWUtPmV2ZW50SGFuZGxlcigpLT5oYW5k bGVNb3VzZVByZXNzRXZlbnQobWV2KTsKLSAgICBldi0+c2V0QWNjZXB0ZWQoYWNjZXB0ZWQpOwot Ci0gICAgUmVmUHRyPFdlYkNvcmU6Ok5vZGU+IG5ld05vZGU7Ci0gICAgZm9jdXNlZEZyYW1lID0g cGFnZS0+Zm9jdXNDb250cm9sbGVyKCktPmZvY3VzZWRGcmFtZSgpOwotICAgIGlmIChEb2N1bWVu dCogZm9jdXNlZERvY3VtZW50ID0gZm9jdXNlZEZyYW1lID8gZm9jdXNlZEZyYW1lLT5kb2N1bWVu dCgpIDogMCkKLSAgICAgICAgbmV3Tm9kZSA9IGZvY3VzZWREb2N1bWVudC0+Zm9jdXNlZE5vZGUo KTsKLQotICAgIGlmIChuZXdOb2RlICYmIG9sZE5vZGUgIT0gbmV3Tm9kZSkKLSAgICAgICAgY2xp Y2tDYXVzZWRGb2N1cyA9IHRydWU7Ci19Ci0KLXZvaWQgUVdlYlBhZ2VQcml2YXRlOjptb3VzZVBy ZXNzRXZlbnQoUU1vdXNlRXZlbnQgKmV2KQordGVtcGxhdGU8Y2xhc3MgVD4KK3ZvaWQgUVdlYlBh Z2VQcml2YXRlOjptb3VzZVByZXNzRXZlbnQoVCogZXYpCiB7CiAgICAgV2ViQ29yZTo6RnJhbWUq IGZyYW1lID0gUVdlYkZyYW1lUHJpdmF0ZTo6Y29yZShtYWluRnJhbWUpOwogICAgIGlmICghZnJh bWUtPnZpZXcoKSkKQEAgLTcwMSw3ICs2NTksOCBAQCB2b2lkIFFXZWJQYWdlUHJpdmF0ZTo6bW91 c2VQcmVzc0V2ZW50KFFNb3VzZUV2ZW50ICpldikKICAgICAgICAgY2xpY2tDYXVzZWRGb2N1cyA9 IHRydWU7CiB9CiAKLXZvaWQgUVdlYlBhZ2VQcml2YXRlOjptb3VzZURvdWJsZUNsaWNrRXZlbnQo UUdyYXBoaWNzU2NlbmVNb3VzZUV2ZW50ICpldikKK3RlbXBsYXRlPGNsYXNzIFQ+Cit2b2lkIFFX ZWJQYWdlUHJpdmF0ZTo6bW91c2VEb3VibGVDbGlja0V2ZW50KFQgKmV2KQogewogICAgIFdlYkNv cmU6OkZyYW1lKiBmcmFtZSA9IFFXZWJGcmFtZVByaXZhdGU6OmNvcmUobWFpbkZyYW1lKTsKICAg ICBpZiAoIWZyYW1lLT52aWV3KCkpCkBAIC03MTUsNDEgKzY3NCwxMSBAQCB2b2lkIFFXZWJQYWdl UHJpdmF0ZTo6bW91c2VEb3VibGVDbGlja0V2ZW50KFFHcmFwaGljc1NjZW5lTW91c2VFdmVudCAq ZXYpCiAgICAgZXYtPnNldEFjY2VwdGVkKGFjY2VwdGVkKTsKIAogICAgIHRyaXBsZUNsaWNrVGlt ZXIuc3RhcnQoUUFwcGxpY2F0aW9uOjpkb3VibGVDbGlja0ludGVydmFsKCksIHEpOwotICAgIHRy aXBsZUNsaWNrID0gZXYtPnBvcygpLnRvUG9pbnQoKTsKLX0KLQotdm9pZCBRV2ViUGFnZVByaXZh dGU6Om1vdXNlRG91YmxlQ2xpY2tFdmVudChRTW91c2VFdmVudCAqZXYpCi17Ci0gICAgV2ViQ29y ZTo6RnJhbWUqIGZyYW1lID0gUVdlYkZyYW1lUHJpdmF0ZTo6Y29yZShtYWluRnJhbWUpOwotICAg IGlmICghZnJhbWUtPnZpZXcoKSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgYm9vbCBhY2NlcHRl ZCA9IGZhbHNlOwotICAgIFBsYXRmb3JtTW91c2VFdmVudCBtZXYoZXYsIDIpOwotICAgIC8vIGln bm9yZSB0aGUgZXZlbnQgaWYgd2UgY2FuJ3QgbWFwIFF0J3MgbW91c2UgYnV0dG9ucyB0byBXZWJD b3JlOjpNb3VzZUJ1dHRvbgotICAgIGlmIChtZXYuYnV0dG9uKCkgIT0gTm9CdXR0b24pCi0gICAg ICAgIGFjY2VwdGVkID0gZnJhbWUtPmV2ZW50SGFuZGxlcigpLT5oYW5kbGVNb3VzZVByZXNzRXZl bnQobWV2KTsKLSAgICBldi0+c2V0QWNjZXB0ZWQoYWNjZXB0ZWQpOwotCi0gICAgdHJpcGxlQ2xp Y2tUaW1lci5zdGFydChRQXBwbGljYXRpb246OmRvdWJsZUNsaWNrSW50ZXJ2YWwoKSwgcSk7Ci0g ICAgdHJpcGxlQ2xpY2sgPSBldi0+cG9zKCk7Ci19Ci0KLXZvaWQgUVdlYlBhZ2VQcml2YXRlOjpt b3VzZVRyaXBsZUNsaWNrRXZlbnQoUUdyYXBoaWNzU2NlbmVNb3VzZUV2ZW50ICpldikKLXsKLSAg ICBXZWJDb3JlOjpGcmFtZSogZnJhbWUgPSBRV2ViRnJhbWVQcml2YXRlOjpjb3JlKG1haW5GcmFt ZSk7Ci0gICAgaWYgKCFmcmFtZS0+dmlldygpKQotICAgICAgICByZXR1cm47Ci0KLSAgICBib29s IGFjY2VwdGVkID0gZmFsc2U7Ci0gICAgUGxhdGZvcm1Nb3VzZUV2ZW50IG1ldihldiwgMyk7Ci0g ICAgLy8gaWdub3JlIHRoZSBldmVudCBpZiB3ZSBjYW4ndCBtYXAgUXQncyBtb3VzZSBidXR0b25z IHRvIFdlYkNvcmU6Ok1vdXNlQnV0dG9uCi0gICAgaWYgKG1ldi5idXR0b24oKSAhPSBOb0J1dHRv bikKLSAgICAgICAgYWNjZXB0ZWQgPSBmcmFtZS0+ZXZlbnRIYW5kbGVyKCktPmhhbmRsZU1vdXNl UHJlc3NFdmVudChtZXYpOwotICAgIGV2LT5zZXRBY2NlcHRlZChhY2NlcHRlZCk7CisgICAgdHJp cGxlQ2xpY2sgPSBRUG9pbnRGKGV2LT5wb3MoKSkudG9Qb2ludCgpOwogfQogCi12b2lkIFFXZWJQ YWdlUHJpdmF0ZTo6bW91c2VUcmlwbGVDbGlja0V2ZW50KFFNb3VzZUV2ZW50ICpldikKK3RlbXBs YXRlPGNsYXNzIFQ+Cit2b2lkIFFXZWJQYWdlUHJpdmF0ZTo6bW91c2VUcmlwbGVDbGlja0V2ZW50 KFQgKmV2KQogewogICAgIFdlYkNvcmU6OkZyYW1lKiBmcmFtZSA9IFFXZWJGcmFtZVByaXZhdGU6 OmNvcmUobWFpbkZyYW1lKTsKICAgICBpZiAoIWZyYW1lLT52aWV3KCkpCkBAIC03ODYsNyArNzE1 LDggQEAgdm9pZCBRV2ViUGFnZVByaXZhdGU6OmhhbmRsZUNsaXBib2FyZChRRXZlbnQqIGV2LCBR dDo6TW91c2VCdXR0b24gYnV0dG9uKQogI2VuZGlmCiB9CiAKLXZvaWQgUVdlYlBhZ2VQcml2YXRl Ojptb3VzZVJlbGVhc2VFdmVudChRR3JhcGhpY3NTY2VuZU1vdXNlRXZlbnQqIGV2KQordGVtcGxh dGU8Y2xhc3MgVD4KK3ZvaWQgUVdlYlBhZ2VQcml2YXRlOjptb3VzZVJlbGVhc2VFdmVudChUICpl dikKIHsKICAgICBXZWJDb3JlOjpGcmFtZSogZnJhbWUgPSBRV2ViRnJhbWVQcml2YXRlOjpjb3Jl KG1haW5GcmFtZSk7CiAgICAgaWYgKCFmcmFtZS0+dmlldygpKQpAQCAtODIzLDIzICs3NTMsNiBA QCB2b2lkIFFXZWJQYWdlUHJpdmF0ZTo6aGFuZGxlU29mdHdhcmVJbnB1dFBhbmVsKFF0OjpNb3Vz ZUJ1dHRvbiBidXR0b24pCiAgICAgY2xpY2tDYXVzZWRGb2N1cyA9IGZhbHNlOwogfQogCi12b2lk IFFXZWJQYWdlUHJpdmF0ZTo6bW91c2VSZWxlYXNlRXZlbnQoUU1vdXNlRXZlbnQgKmV2KQotewot ICAgIFdlYkNvcmU6OkZyYW1lKiBmcmFtZSA9IFFXZWJGcmFtZVByaXZhdGU6OmNvcmUobWFpbkZy YW1lKTsKLSAgICBpZiAoIWZyYW1lLT52aWV3KCkpCi0gICAgICAgIHJldHVybjsKLQotICAgIGJv b2wgYWNjZXB0ZWQgPSBmYWxzZTsKLSAgICBQbGF0Zm9ybU1vdXNlRXZlbnQgbWV2KGV2LCAwKTsK LSAgICAvLyBpZ25vcmUgdGhlIGV2ZW50IGlmIHdlIGNhbid0IG1hcCBRdCdzIG1vdXNlIGJ1dHRv bnMgdG8gV2ViQ29yZTo6TW91c2VCdXR0b24KLSAgICBpZiAobWV2LmJ1dHRvbigpICE9IE5vQnV0 dG9uKQotICAgICAgICBhY2NlcHRlZCA9IGZyYW1lLT5ldmVudEhhbmRsZXIoKS0+aGFuZGxlTW91 c2VSZWxlYXNlRXZlbnQobWV2KTsKLSAgICBldi0+c2V0QWNjZXB0ZWQoYWNjZXB0ZWQpOwotCi0g ICAgaGFuZGxlQ2xpcGJvYXJkKGV2LCBldi0+YnV0dG9uKCkpOwotICAgIGhhbmRsZVNvZnR3YXJl SW5wdXRQYW5lbChldi0+YnV0dG9uKCkpOwotfQotCiAjaWZuZGVmIFFUX05PX0NPTlRFWFRNRU5V CiB2b2lkIFFXZWJQYWdlUHJpdmF0ZTo6Y29udGV4dE1lbnVFdmVudChjb25zdCBRUG9pbnQmIGds b2JhbFBvcykKIHsKQEAgLTg3MCwxOCArNzgzLDggQEAgUU1lbnUgKlFXZWJQYWdlOjpjcmVhdGVT dGFuZGFyZENvbnRleHRNZW51KCkKIH0KIAogI2lmbmRlZiBRVF9OT19XSEVFTEVWRU5UCi12b2lk IFFXZWJQYWdlUHJpdmF0ZTo6d2hlZWxFdmVudChRR3JhcGhpY3NTY2VuZVdoZWVsRXZlbnQqIGV2 KQotewotICAgIFdlYkNvcmU6OkZyYW1lKiBmcmFtZSA9IFFXZWJGcmFtZVByaXZhdGU6OmNvcmUo bWFpbkZyYW1lKTsKLSAgICBpZiAoIWZyYW1lLT52aWV3KCkpCi0gICAgICAgIHJldHVybjsKLQot ICAgIFdlYkNvcmU6OlBsYXRmb3JtV2hlZWxFdmVudCBwZXYoZXYpOwotICAgIGJvb2wgYWNjZXB0 ZWQgPSBmcmFtZS0+ZXZlbnRIYW5kbGVyKCktPmhhbmRsZVdoZWVsRXZlbnQocGV2KTsKLSAgICBl di0+c2V0QWNjZXB0ZWQoYWNjZXB0ZWQpOwotfQotCi12b2lkIFFXZWJQYWdlUHJpdmF0ZTo6d2hl ZWxFdmVudChRV2hlZWxFdmVudCAqZXYpCit0ZW1wbGF0ZTxjbGFzcyBUPgordm9pZCBRV2ViUGFn ZVByaXZhdGU6OndoZWVsRXZlbnQoVCAqZXYpCiB7CiAgICAgV2ViQ29yZTo6RnJhbWUqIGZyYW1l ID0gUVdlYkZyYW1lUHJpdmF0ZTo6Y29yZShtYWluRnJhbWUpOwogICAgIGlmICghZnJhbWUtPnZp ZXcoKSkKQEAgLTEwMTgsMTAgKzkyMSwxMSBAQCB2b2lkIFFXZWJQYWdlUHJpdmF0ZTo6Zm9jdXNP dXRFdmVudChRRm9jdXNFdmVudCopCiAgICAgZm9jdXNDb250cm9sbGVyLT5zZXRBY3RpdmUoZmFs c2UpOwogfQogCi12b2lkIFFXZWJQYWdlUHJpdmF0ZTo6ZHJhZ0VudGVyRXZlbnQoUUdyYXBoaWNz U2NlbmVEcmFnRHJvcEV2ZW50KiBldikKK3RlbXBsYXRlPGNsYXNzIFQ+Cit2b2lkIFFXZWJQYWdl UHJpdmF0ZTo6ZHJhZ0VudGVyRXZlbnQoVCogZXYpCiB7CiAjaWZuZGVmIFFUX05PX0RSQUdBTkRE Uk9QCi0gICAgRHJhZ0RhdGEgZHJhZ0RhdGEoZXYtPm1pbWVEYXRhKCksIGV2LT5wb3MoKS50b1Bv aW50KCksCisgICAgRHJhZ0RhdGEgZHJhZ0RhdGEoZXYtPm1pbWVEYXRhKCksIFFQb2ludEYoZXYt PnBvcygpKS50b1BvaW50KCksCiAgICAgICAgICAgICBRQ3Vyc29yOjpwb3MoKSwgZHJvcEFjdGlv blRvRHJhZ09wKGV2LT5wb3NzaWJsZUFjdGlvbnMoKSkpOwogICAgIFF0OjpEcm9wQWN0aW9uIGFj dGlvbiA9IGRyYWdPcFRvRHJvcEFjdGlvbihwYWdlLT5kcmFnQ29udHJvbGxlcigpLT5kcmFnRW50 ZXJlZCgmZHJhZ0RhdGEpKTsKICAgICBldi0+c2V0RHJvcEFjdGlvbihhY3Rpb24pOwpAQCAtMTAz MCwyMCArOTM0LDggQEAgdm9pZCBRV2ViUGFnZVByaXZhdGU6OmRyYWdFbnRlckV2ZW50KFFHcmFw aGljc1NjZW5lRHJhZ0Ryb3BFdmVudCogZXYpCiAjZW5kaWYKIH0KIAotdm9pZCBRV2ViUGFnZVBy aXZhdGU6OmRyYWdFbnRlckV2ZW50KFFEcmFnRW50ZXJFdmVudCogZXYpCi17Ci0jaWZuZGVmIFFU X05PX0RSQUdBTkREUk9QCi0gICAgRHJhZ0RhdGEgZHJhZ0RhdGEoZXYtPm1pbWVEYXRhKCksIGV2 LT5wb3MoKSwgUUN1cnNvcjo6cG9zKCksCi0gICAgICAgICAgICAgICAgICAgICAgZHJvcEFjdGlv blRvRHJhZ09wKGV2LT5wb3NzaWJsZUFjdGlvbnMoKSkpOwotICAgIFF0OjpEcm9wQWN0aW9uIGFj dGlvbiA9IGRyYWdPcFRvRHJvcEFjdGlvbihwYWdlLT5kcmFnQ29udHJvbGxlcigpLT5kcmFnRW50 ZXJlZCgmZHJhZ0RhdGEpKTsKLSAgICBldi0+c2V0RHJvcEFjdGlvbihhY3Rpb24pOwotICAgIC8v IFdlIG11c3QgYWNjZXB0IHRoaXMgZXZlbnQgaW4gb3JkZXIgdG8gcmVjZWl2ZSB0aGUgZHJhZyBt b3ZlIGV2ZW50cyB0aGF0IGFyZSBzZW50Ci0gICAgLy8gd2hpbGUgdGhlIGRyYWcgYW5kIGRyb3Ag YWN0aW9uIGlzIGluIHByb2dyZXNzLgotICAgIGV2LT5hY2NlcHRQcm9wb3NlZEFjdGlvbigpOwot I2VuZGlmCi19Ci0KLXZvaWQgUVdlYlBhZ2VQcml2YXRlOjpkcmFnTGVhdmVFdmVudChRR3JhcGhp Y3NTY2VuZURyYWdEcm9wRXZlbnQqIGV2KQordGVtcGxhdGU8Y2xhc3MgVD4KK3ZvaWQgUVdlYlBh Z2VQcml2YXRlOjpkcmFnTGVhdmVFdmVudChUICpldikKIHsKICNpZm5kZWYgUVRfTk9fRFJBR0FO RERST1AKICAgICBEcmFnRGF0YSBkcmFnRGF0YSgwLCBJbnRQb2ludCgpLCBRQ3Vyc29yOjpwb3Mo KSwgRHJhZ09wZXJhdGlvbk5vbmUpOwpAQCAtMTA1MiwxOSArOTQ0LDExIEBAIHZvaWQgUVdlYlBh Z2VQcml2YXRlOjpkcmFnTGVhdmVFdmVudChRR3JhcGhpY3NTY2VuZURyYWdEcm9wRXZlbnQqIGV2 KQogI2VuZGlmCiB9CiAKLXZvaWQgUVdlYlBhZ2VQcml2YXRlOjpkcmFnTGVhdmVFdmVudChRRHJh Z0xlYXZlRXZlbnQqIGV2KQordGVtcGxhdGU8Y2xhc3MgVD4KK3ZvaWQgUVdlYlBhZ2VQcml2YXRl OjpkcmFnTW92ZUV2ZW50KFQgKmV2KQogewogI2lmbmRlZiBRVF9OT19EUkFHQU5ERFJPUAotICAg IERyYWdEYXRhIGRyYWdEYXRhKDAsIEludFBvaW50KCksIFFDdXJzb3I6OnBvcygpLCBEcmFnT3Bl cmF0aW9uTm9uZSk7Ci0gICAgcGFnZS0+ZHJhZ0NvbnRyb2xsZXIoKS0+ZHJhZ0V4aXRlZCgmZHJh Z0RhdGEpOwotICAgIGV2LT5hY2NlcHQoKTsKLSNlbmRpZgotfQotCi12b2lkIFFXZWJQYWdlUHJp dmF0ZTo6ZHJhZ01vdmVFdmVudChRR3JhcGhpY3NTY2VuZURyYWdEcm9wRXZlbnQqIGV2KQotewot I2lmbmRlZiBRVF9OT19EUkFHQU5ERFJPUAotICAgIERyYWdEYXRhIGRyYWdEYXRhKGV2LT5taW1l RGF0YSgpLCBldi0+cG9zKCkudG9Qb2ludCgpLAorICAgIERyYWdEYXRhIGRyYWdEYXRhKGV2LT5t aW1lRGF0YSgpLCBRUG9pbnRGKGV2LT5wb3MoKSkudG9Qb2ludCgpLAogICAgICAgICAgICAgUUN1 cnNvcjo6cG9zKCksIGRyb3BBY3Rpb25Ub0RyYWdPcChldi0+cG9zc2libGVBY3Rpb25zKCkpKTsK ICAgICBRdDo6RHJvcEFjdGlvbiBhY3Rpb24gPSBkcmFnT3BUb0Ryb3BBY3Rpb24ocGFnZS0+ZHJh Z0NvbnRyb2xsZXIoKS0+ZHJhZ1VwZGF0ZWQoJmRyYWdEYXRhKSk7CiAgICAgZXYtPnNldERyb3BB Y3Rpb24oYWN0aW9uKTsKQEAgLTEwNzMsNDIgKzk1NywxNyBAQCB2b2lkIFFXZWJQYWdlUHJpdmF0 ZTo6ZHJhZ01vdmVFdmVudChRR3JhcGhpY3NTY2VuZURyYWdEcm9wRXZlbnQqIGV2KQogI2VuZGlm CiB9CiAKLXZvaWQgUVdlYlBhZ2VQcml2YXRlOjpkcmFnTW92ZUV2ZW50KFFEcmFnTW92ZUV2ZW50 KiBldikKLXsKLSNpZm5kZWYgUVRfTk9fRFJBR0FORERST1AKLSAgICBEcmFnRGF0YSBkcmFnRGF0 YShldi0+bWltZURhdGEoKSwgZXYtPnBvcygpLCBRQ3Vyc29yOjpwb3MoKSwKLSAgICAgICAgICAg ICAgICAgICAgICBkcm9wQWN0aW9uVG9EcmFnT3AoZXYtPnBvc3NpYmxlQWN0aW9ucygpKSk7Ci0g ICAgUXQ6OkRyb3BBY3Rpb24gYWN0aW9uID0gZHJhZ09wVG9Ecm9wQWN0aW9uKHBhZ2UtPmRyYWdD b250cm9sbGVyKCktPmRyYWdVcGRhdGVkKCZkcmFnRGF0YSkpOwotICAgIG1fbGFzdERyb3BBY3Rp b24gPSBhY3Rpb247Ci0gICAgZXYtPnNldERyb3BBY3Rpb24oYWN0aW9uKTsKLSAgICAvLyBXZSBt dXN0IGFjY2VwdCB0aGlzIGV2ZW50IGluIG9yZGVyIHRvIHJlY2VpdmUgdGhlIGRyYWcgbW92ZSBl dmVudHMgdGhhdCBhcmUgc2VudAotICAgIC8vIHdoaWxlIHRoZSBkcmFnIGFuZCBkcm9wIGFjdGlv biBpcyBpbiBwcm9ncmVzcy4KLSAgICBldi0+YWNjZXB0UHJvcG9zZWRBY3Rpb24oKTsKLSNlbmRp ZgotfQotCi12b2lkIFFXZWJQYWdlUHJpdmF0ZTo6ZHJvcEV2ZW50KFFHcmFwaGljc1NjZW5lRHJh Z0Ryb3BFdmVudCogZXYpCit0ZW1wbGF0ZTxjbGFzcyBUPgordm9pZCBRV2ViUGFnZVByaXZhdGU6 OmRyb3BFdmVudChUICpldikKIHsKICNpZm5kZWYgUVRfTk9fRFJBR0FORERST1AKLSAgICBEcmFn RGF0YSBkcmFnRGF0YShldi0+bWltZURhdGEoKSwgZXYtPnBvcygpLnRvUG9pbnQoKSwKKyAgICBE cmFnRGF0YSBkcmFnRGF0YShldi0+bWltZURhdGEoKSwgUVBvaW50Rihldi0+cG9zKCkpLnRvUG9p bnQoKSwKICAgICAgICAgICAgIFFDdXJzb3I6OnBvcygpLCBkcm9wQWN0aW9uVG9EcmFnT3AoZXYt PnBvc3NpYmxlQWN0aW9ucygpKSk7CiAgICAgaWYgKHBhZ2UtPmRyYWdDb250cm9sbGVyKCktPnBl cmZvcm1EcmFnKCZkcmFnRGF0YSkpCiAgICAgICAgIGV2LT5hY2NlcHRQcm9wb3NlZEFjdGlvbigp OwogI2VuZGlmCiB9CiAKLXZvaWQgUVdlYlBhZ2VQcml2YXRlOjpkcm9wRXZlbnQoUURyb3BFdmVu dCogZXYpCi17Ci0jaWZuZGVmIFFUX05PX0RSQUdBTkREUk9QCi0gICAgLy8gT3ZlcndyaXRlIHRo ZSBkZWZhdWx0cyBzZXQgYnkgUURyYWdNYW5hZ2VyOjpkZWZhdWx0QWN0aW9uKCkKLSAgICBldi0+ c2V0RHJvcEFjdGlvbihtX2xhc3REcm9wQWN0aW9uKTsKLSAgICBEcmFnRGF0YSBkcmFnRGF0YShl di0+bWltZURhdGEoKSwgZXYtPnBvcygpLCBRQ3Vyc29yOjpwb3MoKSwKLSAgICAgICAgICAgICAg ICAgICAgICBkcm9wQWN0aW9uVG9EcmFnT3AoUXQ6OkRyb3BBY3Rpb24oZXYtPmRyb3BBY3Rpb24o KSkpKTsKLSAgICBpZiAocGFnZS0+ZHJhZ0NvbnRyb2xsZXIoKS0+cGVyZm9ybURyYWcoJmRyYWdE YXRhKSkKLSAgICAgICAgZXYtPmFjY2VwdFByb3Bvc2VkQWN0aW9uKCk7Ci0jZW5kaWYKLX0KLQog dm9pZCBRV2ViUGFnZVByaXZhdGU6OmxlYXZlRXZlbnQoUUV2ZW50KikKIHsKICAgICAvLyBGYWtl IGEgbW91c2UgbW92ZSBldmVudCBqdXN0IG91dHNpZGUgb2YgdGhlIHdpZGdldCwgc2luY2UgYWxs CmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlX3AuaCBiL1dlYktpdC9xdC9BcGkv cXdlYnBhZ2VfcC5oCmluZGV4IDFlOGRhM2UuLmQyYTcxZDIgMTAwNjQ0Ci0tLSBhL1dlYktpdC9x dC9BcGkvcXdlYnBhZ2VfcC5oCisrKyBiL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2VfcC5oCkBAIC05 MCwzNiArOTAsMjYgQEAgcHVibGljOgogCiAgICAgdm9pZCB0aW1lckV2ZW50KFFUaW1lckV2ZW50 Kik7CiAKLSAgICB2b2lkIG1vdXNlTW92ZUV2ZW50KFFNb3VzZUV2ZW50Kik7Ci0gICAgdm9pZCBt b3VzZU1vdmVFdmVudChRR3JhcGhpY3NTY2VuZU1vdXNlRXZlbnQqKTsKLSAgICB2b2lkIG1vdXNl UHJlc3NFdmVudChRTW91c2VFdmVudCopOwotICAgIHZvaWQgbW91c2VQcmVzc0V2ZW50KFFHcmFw aGljc1NjZW5lTW91c2VFdmVudCopOwotICAgIHZvaWQgbW91c2VEb3VibGVDbGlja0V2ZW50KFFN b3VzZUV2ZW50Kik7Ci0gICAgdm9pZCBtb3VzZURvdWJsZUNsaWNrRXZlbnQoUUdyYXBoaWNzU2Nl bmVNb3VzZUV2ZW50Kik7Ci0gICAgdm9pZCBtb3VzZVRyaXBsZUNsaWNrRXZlbnQoUU1vdXNlRXZl bnQqKTsKLSAgICB2b2lkIG1vdXNlVHJpcGxlQ2xpY2tFdmVudChRR3JhcGhpY3NTY2VuZU1vdXNl RXZlbnQqKTsKLSAgICB2b2lkIG1vdXNlUmVsZWFzZUV2ZW50KFFNb3VzZUV2ZW50Kik7Ci0gICAg dm9pZCBtb3VzZVJlbGVhc2VFdmVudChRR3JhcGhpY3NTY2VuZU1vdXNlRXZlbnQqKTsKKyAgICB0 ZW1wbGF0ZTxjbGFzcyBUPiB2b2lkIG1vdXNlTW92ZUV2ZW50KFQqKTsKKyAgICB0ZW1wbGF0ZTxj bGFzcyBUPiB2b2lkIG1vdXNlUHJlc3NFdmVudChUKik7CisgICAgdGVtcGxhdGU8Y2xhc3MgVD4g dm9pZCBtb3VzZURvdWJsZUNsaWNrRXZlbnQoVCopOworICAgIHRlbXBsYXRlPGNsYXNzIFQ+IHZv aWQgbW91c2VUcmlwbGVDbGlja0V2ZW50KFQqKTsKKyAgICB0ZW1wbGF0ZTxjbGFzcyBUPiB2b2lk IG1vdXNlUmVsZWFzZUV2ZW50KFQqKTsKICNpZm5kZWYgUVRfTk9fQ09OVEVYVE1FTlUKICAgICB2 b2lkIGNvbnRleHRNZW51RXZlbnQoY29uc3QgUVBvaW50JiBnbG9iYWxQb3MpOwogI2VuZGlmCiAj aWZuZGVmIFFUX05PX1dIRUVMRVZFTlQKLSAgICB2b2lkIHdoZWVsRXZlbnQoUVdoZWVsRXZlbnQq KTsKLSAgICB2b2lkIHdoZWVsRXZlbnQoUUdyYXBoaWNzU2NlbmVXaGVlbEV2ZW50Kik7CisgICAg dGVtcGxhdGU8Y2xhc3MgVD4gdm9pZCB3aGVlbEV2ZW50KFQqKTsKICNlbmRpZgogICAgIHZvaWQg a2V5UHJlc3NFdmVudChRS2V5RXZlbnQqKTsKICAgICB2b2lkIGtleVJlbGVhc2VFdmVudChRS2V5 RXZlbnQqKTsKICAgICB2b2lkIGZvY3VzSW5FdmVudChRRm9jdXNFdmVudCopOwogICAgIHZvaWQg Zm9jdXNPdXRFdmVudChRRm9jdXNFdmVudCopOwogCi0gICAgdm9pZCBkcmFnRW50ZXJFdmVudChR RHJhZ0VudGVyRXZlbnQqKTsKLSAgICB2b2lkIGRyYWdFbnRlckV2ZW50KFFHcmFwaGljc1NjZW5l RHJhZ0Ryb3BFdmVudCopOwotICAgIHZvaWQgZHJhZ0xlYXZlRXZlbnQoUURyYWdMZWF2ZUV2ZW50 Kik7Ci0gICAgdm9pZCBkcmFnTGVhdmVFdmVudChRR3JhcGhpY3NTY2VuZURyYWdEcm9wRXZlbnQq KTsKLSAgICB2b2lkIGRyYWdNb3ZlRXZlbnQoUURyYWdNb3ZlRXZlbnQqKTsKLSAgICB2b2lkIGRy YWdNb3ZlRXZlbnQoUUdyYXBoaWNzU2NlbmVEcmFnRHJvcEV2ZW50Kik7Ci0gICAgdm9pZCBkcm9w RXZlbnQoUURyb3BFdmVudCopOwotICAgIHZvaWQgZHJvcEV2ZW50KFFHcmFwaGljc1NjZW5lRHJh Z0Ryb3BFdmVudCopOworICAgIHRlbXBsYXRlPGNsYXNzIFQ+IHZvaWQgZHJhZ0VudGVyRXZlbnQo VCopOworICAgIHRlbXBsYXRlPGNsYXNzIFQ+IHZvaWQgZHJhZ0xlYXZlRXZlbnQoVCopOworICAg IHRlbXBsYXRlPGNsYXNzIFQ+IHZvaWQgZHJhZ01vdmVFdmVudChUKik7CisgICAgdGVtcGxhdGU8 Y2xhc3MgVD4gdm9pZCBkcm9wRXZlbnQoVCopOwogCiAgICAgdm9pZCBpbnB1dE1ldGhvZEV2ZW50 KFFJbnB1dE1ldGhvZEV2ZW50Kik7CiAKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9DaGFuZ2VMb2cg Yi9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IDQxYWFkMzMuLmQwNDk5MjMgMTAwNjQ0Ci0tLSBh L1dlYktpdC9xdC9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsx LDI1IEBACisyMDEwLTEwLTA1ICBSYWduZXIgTWFnYWxoYWVzICA8cmFnbmVyLm1hZ2FsaGFlc0Bv cGVuYm9zc2Eub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFtRdF0gRHVwbGljYXRlZCBjb2RlIGluIFFXZWJQYWdlUHJpdmF0ZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDcxOTUKKworICAgICAgICBS ZW1vdmUgZHVwbGljYXRlZCBjb2RlIGZyb20gUVdlYlBhZ2VQcml2YXRlIGNsYXNzIGZvciBRR3Jh cGhpY3NWaWV3IGFuZCBRV2lkZ2V0J3MgbW91c2UgZXZlbnRzLgorCisgICAgICAgICogQXBpL3F3 ZWJwYWdlLmNwcDoKKyAgICAgICAgKFFXZWJQYWdlUHJpdmF0ZTo6bW91c2VNb3ZlRXZlbnQpOgor ICAgICAgICAoUVdlYlBhZ2VQcml2YXRlOjptb3VzZVByZXNzRXZlbnQpOgorICAgICAgICAoUVdl YlBhZ2VQcml2YXRlOjptb3VzZURvdWJsZUNsaWNrRXZlbnQpOgorICAgICAgICAoUVdlYlBhZ2VQ cml2YXRlOjptb3VzZVRyaXBsZUNsaWNrRXZlbnQpOgorICAgICAgICAoUVdlYlBhZ2VQcml2YXRl Ojptb3VzZVJlbGVhc2VFdmVudCk6CisgICAgICAgIChRV2ViUGFnZVByaXZhdGU6OndoZWVsRXZl bnQpOgorICAgICAgICAoUVdlYlBhZ2VQcml2YXRlOjpkcmFnRW50ZXJFdmVudCk6CisgICAgICAg IChRV2ViUGFnZVByaXZhdGU6OmRyYWdMZWF2ZUV2ZW50KToKKyAgICAgICAgKFFXZWJQYWdlUHJp dmF0ZTo6ZHJhZ01vdmVFdmVudCk6CisgICAgICAgIChRV2ViUGFnZVByaXZhdGU6OmRyb3BFdmVu dCk6CisgICAgICAgICogQXBpL3F3ZWJwYWdlX3AuaDoKKwogMjAxMC0xMC0wNSAgSmFrb2IgUGV0 c292aXRzICA8anBldHNvdml0c0ByaW0uY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFuZHJl YXMgS2xpbmcuCi0tIAoxLjYuMy4zCgo=