78692 2012-02-15 03:55:48 -0800 [Qt] Move Qt platform specific GL Context/Surface creation out of WebCore into WebKit 2012-02-15 07:36:11 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 78690 78109 78694 1 hausmann hausmann gustavo noam webkit.review.bot xan.lopez oldest_to_newest 557132 0 hausmann 2012-02-15 03:55:48 -0800 [Qt] Move Qt platform specific GL Context/Surface creation out of WebCore into WebKit 557156 1 127160 hausmann 2012-02-15 04:36:27 -0800 Created attachment 127160 [Qt] Move Qt platform specific GL Context/Surface creation out of WebCore into WebKit 557173 2 webkit.review.bot 2012-02-15 05:02:51 -0800 Attachment 127160 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebKit/qt/WebCoreSupport/PageClientQt.h:101: The parameter name "context" adds no information, so it should be removed. [readability/parameter_name] [5] Source/WebKit/qt/WebCoreSupport/PageClientQt.h:102: The parameter name "surface" adds no information, so it should be removed. [readability/parameter_name] [5] Source/WebKit/qt/WebCoreSupport/PageClientQt.h:207: The parameter name "context" adds no information, so it should be removed. [readability/parameter_name] [5] Source/WebKit/qt/WebCoreSupport/PageClientQt.h:208: The parameter name "surface" adds no information, so it should be removed. [readability/parameter_name] [5] Source/WebCore/platform/qt/QWebPageClient.h:103: The parameter name "context" adds no information, so it should be removed. [readability/parameter_name] [5] Source/WebCore/platform/qt/QWebPageClient.h:104: The parameter name "surface" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 6 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style. 557209 3 127160 gustavo 2012-02-15 06:07:31 -0800 Comment on attachment 127160 [Qt] Move Qt platform specific GL Context/Surface creation out of WebCore into WebKit Attachment 127160 did not pass gtk-ews (gtk): Output: http://queues.webkit.org/results/11522732 557266 4 hausmann 2012-02-15 07:36:11 -0800 Landed with style issues fixed Committed r107815: <http://trac.webkit.org/changeset/107815> 127160 2012-02-15 04:36:27 -0800 2012-02-15 06:07:31 -0800 [Qt] Move Qt platform specific GL Context/Surface creation out of WebCore into WebKit bug-78692-20120215133625.patch text/plain 12416 hausmann U3VidmVyc2lvbiBSZXZpc2lvbjogMTA3ODAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmU4MzZhYzExNjAyMDFl NjM3YWRjMmM0NGMyN2EyZGRjYTYzMTA5Yy4uMjQ1M2IyMDczNDQ1MThmZTAwZjEwNDk4YTA5NTI0 MjVkZGIxZWRmNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI4IEBACiAyMDEyLTAyLTE1ICBTaW1v biBIYXVzbWFubiAgPHNpbW9uLmhhdXNtYW5uQG5va2lhLmNvbT4KIAorICAgICAgICBbUXRdIE1v dmUgUXQgcGxhdGZvcm0gc3BlY2lmaWMgR0wgQ29udGV4dC9TdXJmYWNlIGNyZWF0aW9uIG91dCBv ZiBXZWJDb3JlIGludG8gV2ViS2l0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD03ODY5MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFJlcGxhY2UgdGhlICJnbFdpZGdldCIgdGVybSBpbiB0aGUgR3JhcGhpY3ND b250ZXh0IHdpdGggInN1cmZhY2UiIGFuZCBkZWxlZ2F0ZQorICAgICAgICB0aGUgY29udGV4dCBh bmQgc3VyZmFjZSBjcmVhdGlvbiB0byB0aGUgcGFnZSBjbGllbnQuCisKKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQzRC5oOgorICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL3F0L0dyYXBoaWNzQ29udGV4dDNEUXQuY3BwOgorICAgICAgICAoR3JhcGhpY3NDb250 ZXh0M0RQcml2YXRlKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDNEUHJpdmF0 ZTo6R3JhcGhpY3NDb250ZXh0M0RQcml2YXRlKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNz Q29udGV4dDNEUHJpdmF0ZTo6fkdyYXBoaWNzQ29udGV4dDNEUHJpdmF0ZSk6CisgICAgICAgIChX ZWJDb3JlOjpHcmFwaGljc0NvbnRleHQzRFByaXZhdGU6OmJsaXRNdWx0aXNhbXBsZUZyYW1lYnVm ZmVyQW5kUmVzdG9yZUNvbnRleHQpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0 M0RQcml2YXRlOjptYWtlQ3VycmVudElmTmVlZGVkKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBo aWNzQ29udGV4dDNEOjpHcmFwaGljc0NvbnRleHQzRCk6CisgICAgICAgIChXZWJDb3JlOjpHcmFw aGljc0NvbnRleHQzRDo6fkdyYXBoaWNzQ29udGV4dDNEKToKKyAgICAgICAgKFdlYkNvcmU6Okdy YXBoaWNzQ29udGV4dDNEOjpwbGF0Zm9ybUdyYXBoaWNzQ29udGV4dDNEKToKKyAgICAgICAgKiBw bGF0Zm9ybS9xdC9RV2ViUGFnZUNsaWVudC5oOgorICAgICAgICAoUVdlYlBhZ2VDbGllbnQpOgor CisyMDEyLTAyLTE1ICBTaW1vbiBIYXVzbWFubiAgPHNpbW9uLmhhdXNtYW5uQG5va2lhLmNvbT4K KwogICAgICAgICBbUXRdIENsZWFuIHVwIGZhbGxiYWNrIHJlbmRlcmluZyBvZiBHcmFwaGljc0Nv bnRleHQzRCB0byBDYW52YXMKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTc4NjkwCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9n IGIvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKaW5kZXggMmY4ZDgxY2QwOWI0M2M2NjhhMzdi MzYwNTliMzNjNzA0ZjFkZTcwMy4uNGMyMDMxMDM0YmYyZGRhYzMzZDU0NzRiNzhjMDQ5NjA2Yjg2 M2U0NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKKysrIGIvU291cmNl L1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMi0wMi0xNSAgU2ltb24g SGF1c21hbm4gIDxzaW1vbi5oYXVzbWFubkBub2tpYS5jb20+CisKKyAgICAgICAgW1F0XSBNb3Zl IFF0IHBsYXRmb3JtIHNwZWNpZmljIEdMIENvbnRleHQvU3VyZmFjZSBjcmVhdGlvbiBvdXQgb2Yg V2ViQ29yZSBpbnRvIFdlYktpdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9Nzg2OTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBJbXBsZW1lbnQgR0xXaWRnZXQgYW5kIEdMQ29udGV4dCBjcmVhdGlvbiBmcm9t IHRoZSBwYWdlIGNsaWVudCBpbnRlcmZhY2UuCisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9Q YWdlQ2xpZW50UXQuY3BwOgorICAgICAgICAoY3JlYXRlUGxhdGZvcm1HcmFwaGljc0NvbnRleHQz REZyb21XaWRnZXQpOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3JlOjpQYWdl Q2xpZW50UVdpZGdldDo6Y3JlYXRlUGxhdGZvcm1HcmFwaGljc0NvbnRleHQzRCk6CisgICAgICAg IChXZWJDb3JlOjpQYWdlQ2xpZW50UUdyYXBoaWNzV2lkZ2V0OjpjcmVhdGVQbGF0Zm9ybUdyYXBo aWNzQ29udGV4dDNEKToKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9QYWdlQ2xpZW50UXQuaDoK KyAgICAgICAgKFBhZ2VDbGllbnRRV2lkZ2V0KToKKyAgICAgICAgKFBhZ2VDbGllbnRRR3JhcGhp Y3NXaWRnZXQpOgorCiAyMDEyLTAyLTE1ICBObydhbSBSb3NlbnRoYWwgIDxub2FtLnJvc2VudGhh bEBub2tpYS5jb20+CiAKICAgICAgICAgW1RleG1hcF0gRGl2aWRlIFRleHR1cmVNYXBwZXJOb2Rl LmNwcCB0byAzIGZpbGVzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvR3JhcGhpY3NDb250ZXh0M0QuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL0dyYXBoaWNzQ29udGV4dDNELmgKaW5kZXggODk3NmVjNTYyMWY2ZDRmZTg5MTcyZjU1OTFl YzE0NDQ3ODIzZDY3Zi4uYzgwOWI3OTVmNmEzZGI4YjUwM2RkNGM0YmYzYWUwODdiZDA4YjcxMyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250 ZXh0M0QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0Nv bnRleHQzRC5oCkBAIC01NSw2ICs1NSw4IEBAIE9CSkNfQ0xBU1MgV2ViR0xMYXllcjsKIFFUX0JF R0lOX05BTUVTUEFDRQogY2xhc3MgUVBhaW50ZXI7CiBjbGFzcyBRUmVjdDsKK2NsYXNzIFFHTFdp ZGdldDsKK2NsYXNzIFFHTENvbnRleHQ7CiBRVF9FTkRfTkFNRVNQQUNFCiAjZWxpZiBQTEFURk9S TShHVEspIHx8IFBMQVRGT1JNKEVGTCkKIHR5cGVkZWYgdW5zaWduZWQgaW50IEdMdWludDsKQEAg LTYyLDYgKzY0LDkgQEAgdHlwZWRlZiB1bnNpZ25lZCBpbnQgR0x1aW50OwogCiAjaWYgUExBVEZP Uk0oTUFDKQogdHlwZWRlZiBDR0xDb250ZXh0T2JqIFBsYXRmb3JtR3JhcGhpY3NDb250ZXh0M0Q7 CisjZWxpZiBQTEFURk9STShRVCkKK3R5cGVkZWYgUUdMQ29udGV4dCogUGxhdGZvcm1HcmFwaGlj c0NvbnRleHQzRDsKK3R5cGVkZWYgUUdMV2lkZ2V0KiBQbGF0Zm9ybUdyYXBoaWNzU3VyZmFjZTNE OwogI2Vsc2UKIHR5cGVkZWYgdm9pZCogUGxhdGZvcm1HcmFwaGljc0NvbnRleHQzRDsKICNlbmRp ZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhp Y3NDb250ZXh0M0RRdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9H cmFwaGljc0NvbnRleHQzRFF0LmNwcAppbmRleCA5ODdkNGI0NjdjYzdkN2I5NjJkZGM2YWMxYzk4 YjZjNGMyNzM1NGUwLi5lN2FhYzYwOGQyNGI3Njk0ZjMzMDZlM2YwYjU0OWYxYmFhZjFkMTZiIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0Nv bnRleHQzRFF0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9H cmFwaGljc0NvbnRleHQzRFF0LmNwcApAQCAtNzEsNyArNzEsNiBAQCBwdWJsaWM6CiAgICAgR3Jh cGhpY3NDb250ZXh0M0RQcml2YXRlKEdyYXBoaWNzQ29udGV4dDNEKiwgSG9zdFdpbmRvdyopOwog ICAgIH5HcmFwaGljc0NvbnRleHQzRFByaXZhdGUoKTsKIAotICAgIFFHTFdpZGdldCogZ2V0Vmll d3BvcnRHTFdpZGdldCgpOwogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykgJiYgVVNF KFRFWFRVUkVfTUFQUEVSKQogICAgIHZpcnR1YWwgdm9pZCBwYWludFRvVGV4dHVyZU1hcHBlcihU ZXh0dXJlTWFwcGVyKiwgY29uc3QgRmxvYXRSZWN0JiB0YXJnZXQsIGNvbnN0IFRyYW5zZm9ybWF0 aW9uTWF0cml4JiwgZmxvYXQgb3BhY2l0eSwgQml0bWFwVGV4dHVyZSogbWFzayk7CiAjZW5kaWYK QEAgLTgzLDggKzgyLDggQEAgcHVibGljOgogCiAgICAgR3JhcGhpY3NDb250ZXh0M0QqIG1fY29u dGV4dDsKICAgICBIb3N0V2luZG93KiBtX2hvc3RXaW5kb3c7Ci0gICAgUUdMV2lkZ2V0KiBtX2ds V2lkZ2V0OwotICAgIFFHTFdpZGdldCogbV92aWV3cG9ydEdMV2lkZ2V0OworICAgIFBsYXRmb3Jt R3JhcGhpY3NTdXJmYWNlM0QgbV9zdXJmYWNlOworICAgIFBsYXRmb3JtR3JhcGhpY3NDb250ZXh0 M0QgbV9wbGF0Zm9ybUNvbnRleHQ7CiB9OwogCiBib29sIEdyYXBoaWNzQ29udGV4dDNEOjppc0dM RVMyQ29tcGxpYW50KCkgY29uc3QKQEAgLTk5LDM5ICs5OCwyNCBAQCBib29sIEdyYXBoaWNzQ29u dGV4dDNEOjppc0dMRVMyQ29tcGxpYW50KCkgY29uc3QKIEdyYXBoaWNzQ29udGV4dDNEUHJpdmF0 ZTo6R3JhcGhpY3NDb250ZXh0M0RQcml2YXRlKEdyYXBoaWNzQ29udGV4dDNEKiBjb250ZXh0LCBI b3N0V2luZG93KiBob3N0V2luZG93KQogICAgIDogbV9jb250ZXh0KGNvbnRleHQpCiAgICAgLCBt X2hvc3RXaW5kb3coaG9zdFdpbmRvdykKLSAgICAsIG1fZ2xXaWRnZXQoMCkKLSAgICAsIG1fdmll d3BvcnRHTFdpZGdldCgwKQorICAgICwgbV9zdXJmYWNlKDApCisgICAgLCBtX3BsYXRmb3JtQ29u dGV4dCgwKQogewotICAgIG1fdmlld3BvcnRHTFdpZGdldCA9IGdldFZpZXdwb3J0R0xXaWRnZXQo KTsKLQotICAgIGlmIChtX3ZpZXdwb3J0R0xXaWRnZXQpCi0gICAgICAgIG1fZ2xXaWRnZXQgPSBu ZXcgUUdMV2lkZ2V0KDAsIG1fdmlld3BvcnRHTFdpZGdldCk7Ci0gICAgZWxzZQotICAgICAgICBt X2dsV2lkZ2V0ID0gbmV3IFFHTFdpZGdldCgpOwotCi0gICAgLy8gR2VvbWV0cnkgY2FuIGJlIHNl dCB0byB6ZXJvIGJlY2F1c2UgbV9nbFdpZGdldCBpcyB1c2VkIG9ubHkgZm9yIGl0cyBRR0xDb250 ZXh0LgotICAgIG1fZ2xXaWRnZXQtPnNldEdlb21ldHJ5KDAsIDAsIDAsIDApOwotCisgICAgUVdl YlBhZ2VDbGllbnQqIHdlYlBhZ2VDbGllbnQgPSBtX2hvc3RXaW5kb3ctPnBsYXRmb3JtUGFnZUNs aWVudCgpOworICAgIGlmICghd2ViUGFnZUNsaWVudCkKKyAgICAgICAgcmV0dXJuOworICAgIHdl YlBhZ2VDbGllbnQtPmNyZWF0ZVBsYXRmb3JtR3JhcGhpY3NDb250ZXh0M0QoJm1fcGxhdGZvcm1D b250ZXh0LCAmbV9zdXJmYWNlKTsKKyAgICBpZiAoIW1fc3VyZmFjZSkKKyAgICAgICAgcmV0dXJu OwogICAgIG1ha2VDdXJyZW50SWZOZWVkZWQoKTsKIH0KIAogR3JhcGhpY3NDb250ZXh0M0RQcml2 YXRlOjp+R3JhcGhpY3NDb250ZXh0M0RQcml2YXRlKCkKIHsKLSAgICBkZWxldGUgbV9nbFdpZGdl dDsKLSAgICBtX2dsV2lkZ2V0ID0gMDsKLX0KLQotUUdMV2lkZ2V0KiBHcmFwaGljc0NvbnRleHQz RFByaXZhdGU6OmdldFZpZXdwb3J0R0xXaWRnZXQoKQotewotICAgIFFXZWJQYWdlQ2xpZW50KiB3 ZWJQYWdlQ2xpZW50ID0gbV9ob3N0V2luZG93LT5wbGF0Zm9ybVBhZ2VDbGllbnQoKTsKLSAgICBp ZiAoIXdlYlBhZ2VDbGllbnQpCi0gICAgICAgIHJldHVybiAwOwotCi0gICAgUUFic3RyYWN0U2Ny b2xsQXJlYSogc2Nyb2xsQXJlYSA9IHFvYmplY3RfY2FzdDxRQWJzdHJhY3RTY3JvbGxBcmVhKj4o d2ViUGFnZUNsaWVudC0+b3duZXJXaWRnZXQoKSk7Ci0gICAgaWYgKHNjcm9sbEFyZWEpCi0gICAg ICAgIHJldHVybiBxb2JqZWN0X2Nhc3Q8UUdMV2lkZ2V0Kj4oc2Nyb2xsQXJlYS0+dmlld3BvcnQo KSk7Ci0KLSAgICByZXR1cm4gMDsKKyAgICBkZWxldGUgbV9zdXJmYWNlOworICAgIG1fc3VyZmFj ZSA9IDA7CisgICAgLy8gIyMjIERlbGV0ZSBjb250ZXh0PworICAgIG1fcGxhdGZvcm1Db250ZXh0 ID0gMDsKIH0KIAogc3RhdGljIGlubGluZSBxdWludDMyIHN3YXBCZ3JUb1JnYihxdWludDMyIHBp eGVsKQpAQCAtMjE2LDIzICsyMDAsMjMgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQzRFByaXZhdGU6 OmJsaXRNdWx0aXNhbXBsZUZyYW1lYnVmZmVyQW5kUmVzdG9yZUNvbnRleHQoKSBjb24KICAgICAg ICAgcmV0dXJuOwogCiAgICAgY29uc3QgUUdMQ29udGV4dCogY3VycmVudENvbnRleHQgPSBRR0xD b250ZXh0OjpjdXJyZW50Q29udGV4dCgpOwotICAgIGNvbnN0IFFHTENvbnRleHQqIHdpZGdldENv bnRleHQgPSBtX2dsV2lkZ2V0LT5jb250ZXh0KCk7CisgICAgY29uc3QgUUdMQ29udGV4dCogd2lk Z2V0Q29udGV4dCA9IG1fc3VyZmFjZS0+Y29udGV4dCgpOwogICAgIGlmIChjdXJyZW50Q29udGV4 dCAhPSB3aWRnZXRDb250ZXh0KQotICAgICAgICBtX2dsV2lkZ2V0LT5tYWtlQ3VycmVudCgpOwor ICAgICAgICBtX3N1cmZhY2UtPm1ha2VDdXJyZW50KCk7CiAgICAgYmxpdE11bHRpc2FtcGxlRnJh bWVidWZmZXIoKTsKICAgICBpZiAoY3VycmVudENvbnRleHQpIHsKICAgICAgICAgaWYgKGN1cnJl bnRDb250ZXh0ICE9IHdpZGdldENvbnRleHQpCiAgICAgICAgICAgICBjb25zdF9jYXN0PFFHTENv bnRleHQqPihjdXJyZW50Q29udGV4dCktPm1ha2VDdXJyZW50KCk7CiAgICAgfSBlbHNlCi0gICAg ICAgIG1fZ2xXaWRnZXQtPmRvbmVDdXJyZW50KCk7CisgICAgICAgIG1fc3VyZmFjZS0+ZG9uZUN1 cnJlbnQoKTsKIH0KIAogYm9vbCBHcmFwaGljc0NvbnRleHQzRFByaXZhdGU6Om1ha2VDdXJyZW50 SWZOZWVkZWQoKSBjb25zdAogewogICAgIGNvbnN0IFFHTENvbnRleHQqIGN1cnJlbnRDb250ZXh0 ID0gUUdMQ29udGV4dDo6Y3VycmVudENvbnRleHQoKTsKLSAgICBjb25zdCBRR0xDb250ZXh0KiB3 aWRnZXRDb250ZXh0ID0gbV9nbFdpZGdldC0+Y29udGV4dCgpOworICAgIGNvbnN0IFFHTENvbnRl eHQqIHdpZGdldENvbnRleHQgPSBtX3N1cmZhY2UtPmNvbnRleHQoKTsKICAgICBpZiAoY3VycmVu dENvbnRleHQgIT0gd2lkZ2V0Q29udGV4dCkKLSAgICAgICAgbV9nbFdpZGdldC0+bWFrZUN1cnJl bnQoKTsKKyAgICAgICAgbV9zdXJmYWNlLT5tYWtlQ3VycmVudCgpOwogCiAgICAgcmV0dXJuIFFH TENvbnRleHQ6OmN1cnJlbnRDb250ZXh0KCkgPT0gd2lkZ2V0Q29udGV4dDsKIH0KQEAgLTI3Myw3 ICsyNTcsNyBAQCBHcmFwaGljc0NvbnRleHQzRDo6R3JhcGhpY3NDb250ZXh0M0QoR3JhcGhpY3ND b250ZXh0M0Q6OkF0dHJpYnV0ZXMgYXR0cnMsIEhvc3RXaQogICAgIHZhbGlkYXRlQXR0cmlidXRl cygpOwogI2VuZGlmCiAKLSAgICBpZiAoIW1fcHJpdmF0ZS0+bV9nbFdpZGdldC0+aXNWYWxpZCgp KSB7CisgICAgaWYgKCFtX3ByaXZhdGUtPm1fc3VyZmFjZSkgewogICAgICAgICBMT0dfRVJST1Io IkdyYXBoaWNzQ29udGV4dDNEOiBRR0xXaWRnZXQgaW5pdGlhbGl6YXRpb24gZmFpbGVkLiIpOwog ICAgICAgICBtX3ByaXZhdGUgPSBudWxscHRyOwogICAgICAgICByZXR1cm47CkBAIC0zNTEsNyAr MzM1LDcgQEAgR3JhcGhpY3NDb250ZXh0M0Q6OkdyYXBoaWNzQ29udGV4dDNEKEdyYXBoaWNzQ29u dGV4dDNEOjpBdHRyaWJ1dGVzIGF0dHJzLCBIb3N0V2kKIEdyYXBoaWNzQ29udGV4dDNEOjp+R3Jh cGhpY3NDb250ZXh0M0QoKQogewogICAgIG1ha2VDb250ZXh0Q3VycmVudCgpOwotICAgIGlmICgh bV9wcml2YXRlLT5tX2dsV2lkZ2V0LT5pc1ZhbGlkKCkpCisgICAgaWYgKCFtX3ByaXZhdGUtPm1f c3VyZmFjZS0+aXNWYWxpZCgpKQogICAgICAgICByZXR1cm47CiAgICAgZ2xEZWxldGVUZXh0dXJl cygxLCAmbV90ZXh0dXJlKTsKICAgICBnbERlbGV0ZUZyYW1lYnVmZmVycygxLCAmbV9mYm8pOwpA QCAtMzc0LDcgKzM1OCw3IEBAIEdyYXBoaWNzQ29udGV4dDNEOjp+R3JhcGhpY3NDb250ZXh0M0Qo KQogCiBQbGF0Zm9ybUdyYXBoaWNzQ29udGV4dDNEIEdyYXBoaWNzQ29udGV4dDNEOjpwbGF0Zm9y bUdyYXBoaWNzQ29udGV4dDNEKCkKIHsKLSAgICByZXR1cm4gbV9wcml2YXRlLT5tX2dsV2lkZ2V0 OworICAgIHJldHVybiBtX3ByaXZhdGUtPm1fcGxhdGZvcm1Db250ZXh0OwogfQogCiBQbGF0Zm9y bTNET2JqZWN0IEdyYXBoaWNzQ29udGV4dDNEOjpwbGF0Zm9ybVRleHR1cmUoKSBjb25zdApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vcXQvUVdlYlBhZ2VDbGllbnQuaCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL3F0L1FXZWJQYWdlQ2xpZW50LmgKaW5kZXggODM5NmNhY2E1 ZTVhNWQ2ZTRkOGQ3NWI0NWY0M2U1M2U1ZTk2Mzk3My4uM2YyZjU1OTIyZWQyNDc2MTMxYTkxZGNh MDUyNmYxYzAwOGYwZDUzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vcXQv UVdlYlBhZ2VDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9xdC9RV2ViUGFn ZUNsaWVudC5oCkBAIC0zNCw2ICszNCwxMCBAQAogI2luY2x1ZGUgPEdyYXBoaWNzTGF5ZXIuaD4K ICNlbmRpZgogCisjaWYgRU5BQkxFKFdFQkdMKQorI2luY2x1ZGUgPEdyYXBoaWNzQ29udGV4dDNE Lmg+CisjZW5kaWYKKwogI2luY2x1ZGUgPFFQYWxldHRlPgogI2luY2x1ZGUgPFFSZWN0PgogCkBA IC05NSw2ICs5OSwxMSBAQCBwdWJsaWM6CiAKICAgICB2aXJ0dWFsIFFSZWN0RiB3aW5kb3dSZWN0 KCkgY29uc3QgPSAwOwogCisjaWYgRU5BQkxFKFdFQkdMKQorICAgIHZpcnR1YWwgdm9pZCBjcmVh dGVQbGF0Zm9ybUdyYXBoaWNzQ29udGV4dDNEKFBsYXRmb3JtR3JhcGhpY3NDb250ZXh0M0QqIGNv bnRleHQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg UGxhdGZvcm1HcmFwaGljc1N1cmZhY2UzRCogc3VyZmFjZSkgPSAwOworI2VuZGlmCisKIHByb3Rl Y3RlZDoKICNpZm5kZWYgUVRfTk9fQ1VSU09SCiAgICAgdmlydHVhbCBRQ3Vyc29yIGN1cnNvcigp IGNvbnN0ID0gMDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQv UGFnZUNsaWVudFF0LmNwcCBiL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvUGFnZUNs aWVudFF0LmNwcAppbmRleCBmM2EyN2I0M2Q2OGQ4ODMwYjNkMDMzOWM1MjdmYWU3NTc1NGFmYmY2 Li45ZTk4NDMxNzU1NTJmNTRhNTg4MjBjZWM3YTNkNzkyNmFmMmI2MTYwIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L1BhZ2VDbGllbnRRdC5jcHAKKysrIGIvU291 cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9QYWdlQ2xpZW50UXQuY3BwCkBAIC0yNyw2ICsy NywzNCBAQAogI2luY2x1ZGUgPFFYMTFJbmZvPgogI2VuZGlmCiAKKyNpZiBFTkFCTEUoV0VCR0wp CisjaW5jbHVkZSA8UUdMV2lkZ2V0PgorCitzdGF0aWMgdm9pZCBjcmVhdGVQbGF0Zm9ybUdyYXBo aWNzQ29udGV4dDNERnJvbVdpZGdldChRV2lkZ2V0KiB3aWRnZXQsIFBsYXRmb3JtR3JhcGhpY3ND b250ZXh0M0QqIGNvbnRleHQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBQbGF0Zm9ybUdyYXBoaWNzU3VyZmFjZTNEKiBzdXJmYWNlKQorewor ICAgICpjb250ZXh0ID0gMDsKKyAgICAqc3VyZmFjZSA9IDA7CisgICAgUUFic3RyYWN0U2Nyb2xs QXJlYSogc2Nyb2xsQXJlYSA9IHFvYmplY3RfY2FzdDxRQWJzdHJhY3RTY3JvbGxBcmVhKj4od2lk Z2V0KTsKKyAgICBpZiAoIXNjcm9sbEFyZWEpCisgICAgICAgIHJldHVybjsKKworICAgIFFHTFdp ZGdldCogZ2xWaWV3cG9ydCA9IHFvYmplY3RfY2FzdDxRR0xXaWRnZXQqPihzY3JvbGxBcmVhLT52 aWV3cG9ydCgpKTsKKyAgICBpZiAoIWdsVmlld3BvcnQpCisgICAgICAgIHJldHVybjsKKyAgICBR R0xXaWRnZXQqIGdsV2lkZ2V0ID0gbmV3IFFHTFdpZGdldCgwLCBnbFZpZXdwb3J0KTsKKyAgICBp ZiAoZ2xXaWRnZXQtPmlzVmFsaWQoKSkgeworICAgICAgICAvLyBHZW9tZXRyeSBjYW4gYmUgc2V0 IHRvIHplcm8gYmVjYXVzZSBtX2dsV2lkZ2V0IGlzIHVzZWQgb25seSBmb3IgaXRzIFFHTENvbnRl eHQuCisgICAgICAgIGdsV2lkZ2V0LT5zZXRHZW9tZXRyeSgwLCAwLCAwLCAwKTsKKyAgICAgICAg KnN1cmZhY2UgPSBnbFdpZGdldDsKKyAgICAgICAgKmNvbnRleHQgPSBjb25zdF9jYXN0PFFHTENv bnRleHQqPihnbFdpZGdldC0+Y29udGV4dCgpKTsKKyAgICB9IGVsc2UgeworICAgICAgICBkZWxl dGUgZ2xXaWRnZXQ7CisgICAgICAgIGdsV2lkZ2V0ID0gMDsKKyAgICB9Cit9CisjZW5kaWYKKwog I2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykgJiYgVVNFKFRFWFRVUkVfTUFQUEVSKQog I2luY2x1ZGUgIlRleHR1cmVNYXBwZXIuaCIKICNpbmNsdWRlICJ0ZXhtYXAvVGV4dHVyZU1hcHBl ckxheWVyLmgiCkBAIC0xNzgsNiArMjA2LDE0IEBAIFFSZWN0RiBQYWdlQ2xpZW50UVdpZGdldDo6 d2luZG93UmVjdCgpIGNvbnN0CiAgICAgcmV0dXJuIFFSZWN0Rih2aWV3LT53aW5kb3coKS0+Z2Vv bWV0cnkoKSk7CiB9CiAKKyNpZiBFTkFCTEUoV0VCR0wpCit2b2lkIFBhZ2VDbGllbnRRV2lkZ2V0 OjpjcmVhdGVQbGF0Zm9ybUdyYXBoaWNzQ29udGV4dDNEKFBsYXRmb3JtR3JhcGhpY3NDb250ZXh0 M0QqIGNvbnRleHQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIFBsYXRmb3JtR3JhcGhpY3NTdXJmYWNlM0QqIHN1cmZhY2UpCit7CisgICAg Y3JlYXRlUGxhdGZvcm1HcmFwaGljc0NvbnRleHQzREZyb21XaWRnZXQodmlldywgY29udGV4dCwg c3VyZmFjZSk7Cit9CisjZW5kaWYKKwogI2lmICFkZWZpbmVkKFFUX05PX0dSQVBISUNTVklFVykK IFBhZ2VDbGllbnRRR3JhcGhpY3NXaWRnZXQ6On5QYWdlQ2xpZW50UUdyYXBoaWNzV2lkZ2V0KCkK IHsKQEAgLTQxNSw0ICs0NTEsMTIgQEAgUVJlY3RGIFBhZ2VDbGllbnRRR3JhcGhpY3NXaWRnZXQ6 OndpbmRvd1JlY3QoKSBjb25zdAogfQogI2VuZGlmIC8vIFFUX05PX0dSQVBISUNTVklFVwogCisj aWYgRU5BQkxFKFdFQkdMKQordm9pZCBQYWdlQ2xpZW50UUdyYXBoaWNzV2lkZ2V0OjpjcmVhdGVQ bGF0Zm9ybUdyYXBoaWNzQ29udGV4dDNEKFBsYXRmb3JtR3JhcGhpY3NDb250ZXh0M0QqIGNvbnRl eHQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgUGxhdGZvcm1HcmFwaGljc1N1cmZhY2UzRCogc3VyZmFjZSkKK3sKKyAgICBj cmVhdGVQbGF0Zm9ybUdyYXBoaWNzQ29udGV4dDNERnJvbVdpZGdldChvd25lcldpZGdldCgpLCBj b250ZXh0LCBzdXJmYWNlKTsKK30KKyNlbmRpZgorCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L1BhZ2VDbGllbnRRdC5o IGIvU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9QYWdlQ2xpZW50UXQuaAppbmRleCAw Mzg4YzIwMjNjZDU4YjY0Y2Y5Y2ZhYWZkMTYwOWI1ZmFhM2VlZmY4Li40NTYwZTc2NDBmNzUxMjU2 ZGRjMTM2Yjk2OGE2ZmEwYzkzOTZhNmY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L1dl YkNvcmVTdXBwb3J0L1BhZ2VDbGllbnRRdC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29y ZVN1cHBvcnQvUGFnZUNsaWVudFF0LmgKQEAgLTk3LDYgKzk3LDExIEBAIHB1YmxpYzoKIAogICAg IHZpcnR1YWwgUVJlY3RGIHdpbmRvd1JlY3QoKSBjb25zdDsKIAorI2lmIEVOQUJMRShXRUJHTCkK KyAgICB2aXJ0dWFsIHZvaWQgY3JlYXRlUGxhdGZvcm1HcmFwaGljc0NvbnRleHQzRChQbGF0Zm9y bUdyYXBoaWNzQ29udGV4dDNEKiBjb250ZXh0LAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIFBsYXRmb3JtR3JhcGhpY3NTdXJmYWNlM0QqIHN1cmZhY2Up OworI2VuZGlmCisKICAgICBRV2lkZ2V0KiB2aWV3OwogICAgIFFXZWJQYWdlKiBwYWdlOwogCkBA IC0xOTgsNiArMjAzLDExIEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgYm9vbCB2aWV3UmVzaXpl c1RvQ29udGVudHNFbmFibGVkKCkgY29uc3QgeyByZXR1cm4gdmlld1Jlc2l6ZXNUb0NvbnRlbnRz OyB9CiAKKyNpZiBFTkFCTEUoV0VCR0wpCisgICAgdmlydHVhbCB2b2lkIGNyZWF0ZVBsYXRmb3Jt R3JhcGhpY3NDb250ZXh0M0QoUGxhdGZvcm1HcmFwaGljc0NvbnRleHQzRCogY29udGV4dCwKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBQbGF0Zm9ybUdy YXBoaWNzU3VyZmFjZTNEKiBzdXJmYWNlKTsKKyNlbmRpZgorCiAgICAgdm9pZCBjcmVhdGVPckRl bGV0ZU92ZXJsYXkoKTsKIAogI2lmIFVTRShUSUxFRF9CQUNLSU5HX1NUT1JFKQo=