76340 2012-01-14 12:48:25 -0800 [Qt] Fix QT_VERSION related warnings when building on Mac OS X 2012-01-20 07:01:02 -0800 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) Unspecified OS X 10.7 RESOLVED FIXED P2 Normal --- 76341 1 ahf zeno noam vestbo webkit.review.bot zeno zoltan oldest_to_newest 536208 0 ahf 2012-01-14 12:48:25 -0800 wtf/Platform.h uses QT_VERSION when build on darwin, but does not include the QtGlobals header. This is required to be fixed before we can enable -Werror on the Mac platform. Patch coming up. 536212 1 122556 ahf 2012-01-14 13:01:43 -0800 Created attachment 122556 Patch 536213 2 ahf 2012-01-14 13:02:42 -0800 Adding Tor Arne for review. 536245 3 noam 2012-01-14 20:35:03 -0800 It looked pretty trivial to me, but if torarne wants to have a look it might be good because those builds tend to get fudged 536246 4 ahf 2012-01-14 20:36:13 -0800 (In reply to comment #3) > It looked pretty trivial to me, but if torarne wants to have a look it might be good because those builds tend to get fudged Aye, I am just holding on with the CQ? until monday where other people are around too :-) 536476 5 122556 ahf 2012-01-16 04:08:26 -0800 Comment on attachment 122556 Patch CQ? 536575 6 zeno 2012-01-16 08:29:25 -0800 This bug was caused by r104826. We should revert r104826 and solve the problem as described here: see also: https://bugs.webkit.org/show_bug.cgi?id=57239 536588 7 vestbo 2012-01-16 08:54:07 -0800 (In reply to comment #6) > This bug was caused by r104826. > > We should revert r104826 and solve the problem as described here: > see also: https://bugs.webkit.org/show_bug.cgi?id=57239 Sounds good! 536603 8 122650 zeno 2012-01-16 09:03:44 -0800 Created attachment 122650 patch for review. 536647 9 zeno 2012-01-16 10:17:53 -0800 Committed r105074: <http://trac.webkit.org/changeset/105074> 539474 10 zeno 2012-01-20 07:01:02 -0800 *** Bug 76175 has been marked as a duplicate of this bug. *** 122556 2012-01-14 13:01:43 -0800 2012-01-16 09:03:44 -0800 Patch bug-76340-20120114220140.patch text/plain 1294 ahf U3VidmVyc2lvbiBSZXZpc2lvbjogMTA1MDIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAx MjQ1YTdhNjc4MDg0M2RiOTBhYjJjZGYyZGI1ZTk0NDdiOWMzNGVmLi5jM2VkMzllZGFhYzdjYmU3 Y2JlNmMzODYzNjkwNTU0Y2I4ZTBkZjdmIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNCBAQAorMjAxMi0wMS0xNCAgQWxleGFuZGVyIEbDpnLDuHkgIDxhbGV4YW5kZXIuZmFl cm95QG5va2lhLmNvbT4KKworICAgICAgICBbUXRdIEZpeCBRVF9WRVJTSU9OIHJlbGF0ZWQgd2Fy bmluZ3Mgd2hlbiBidWlsZGluZyBvbiBNYWMgT1MgWAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzYzNDAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBJbmNsdWRlIHRoZSBRdEdsb2JhbHMgaGVhZGVyIHdoZW4g YnVpbHQgb24gTWFjIE9TIFguCisKKyAgICAgICAgKiB3dGYvUGxhdGZvcm0uaDoKKwogMjAxMi0w MS0xMyAgRGF2aWQgTGV2aW4gIDxsZXZpbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgY2hlY2st d2Via2l0LXN0eWxlOiBzaG91bGQgZW5jb3VyYWdlIHRoZSB1c2Ugb2YgT3duKiBjbGFzc2VzIGZv ciBXaW5kb3dzIERDLgpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3d0Zi9QbGF0 Zm9ybS5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3d0Zi9QbGF0Zm9ybS5oCmluZGV4IGQ0ZTQ4 YjcxZTY4ZDJjMmRiMjJiNjU5NzBjNTVjMzkwYWM1YjJhMDcuLjYzZGI3Y2I1YzJkNmRhMTViNWQ4 NjkzYjFiZTA5NmU5NDUwYWJlOTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93 dGYvUGxhdGZvcm0uaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd3RmL1BsYXRmb3JtLmgK QEAgLTU2MSw2ICs1NjEsNyBAQAogI2lmIFBMQVRGT1JNKFFUKSAmJiBPUyhEQVJXSU4pCiAjZGVm aW5lIFdURl9VU0VfQ0YgMQogI2RlZmluZSBIQVZFX0RJU1BBVENIX0ggMQorI2luY2x1ZGUgPFF0 R2xvYmFsPgogI2lmIFFUX1ZFUlNJT04gPj0gMHgwNTAwMDAKIC8qIEZJWE1FOiBUaGlzIGlzIGEg aGFjayB0byB3b3JrIGFyb3VuZCBhIGNvbmZsaWN0IG9mIE1hY1R5cGVzLmggZGVmaW5pbmcgYSBG aXhlZCB0eXBlLiAqLwogI2RlZmluZSBDRl9PUEVOX1NPVVJDRSAxCg== 122650 2012-01-16 09:03:44 -0800 2012-01-16 09:05:34 -0800 patch for review. 57239_20120116-180233.patch text/plain 12947 zeno ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDY0YmMxZTIuLjZlNDEzZmYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTAxLTE2ICBaZW5vIEFsYmlzc2Vy ICA8emVub0B3ZWJraXQub3JnPgorCisgICAgICAgIFtRdF0gRml4IFFUX1ZFUlNJT04gcmVsYXRl ZCB3YXJuaW5ncyB3aGVuIGJ1aWxkaW5nIG9uIE1hYyBPUyBYCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NjM0MAorCisgICAgICAgIFRoaXMgYnVnIHdh cyBjYXVzZWQgYnkgcjEwNDgyNi4KKyAgICAgICAgQXMgYWxyZWFkeSBtZW50aW9uZWQgZm9yIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NzIzOQorICAgICAgICB3ZSBz aG91bGQgbm90IHVzZSAidXNpbmcgbmFtZXNwYWNlIFdlYkNvcmUiIGluIGhlYWRlciBmaWxlcywK KyAgICAgICAgYmVjYXVzZSBpdCBtaWdodCBjYXVzZSBhbWJpZ3VvdXMgcmVmZXJlbmNlcy4KKyAg ICAgICAgVGhpcyBwYXRjaCByZXZlcnRzIHRoZSBjaGFuZ2VzIGZyb20gcjEwNDgyNiBhbmQgcjEw NDk4MQorICAgICAgICBhbmQgcmVtb3ZlcyB0aGUgInVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlIiBz dGF0ZW1lbnQgZnJvbQorICAgICAgICB0d28gaGVhZGVyIGZpbGVzLgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogd3RmL1BsYXRmb3JtLmg6CisKIDIw MTItMDEtMTYgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAg ICAgICAgIFVucmV2aWV3ZWQuIEZpeCBtYWtlIGRpc3RjaGVjay4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS93dGYvUGxhdGZvcm0uaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93 dGYvUGxhdGZvcm0uaAppbmRleCAxNzBkOGMwLi40ZTI2YzNhIDEwMDY0NAotLS0gYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvd3RmL1BsYXRmb3JtLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3Jl L3d0Zi9QbGF0Zm9ybS5oCkBAIC01NjMsMTAgKzU2Myw2IEBACiAjaWYgUExBVEZPUk0oUVQpICYm IE9TKERBUldJTikKICNkZWZpbmUgV1RGX1VTRV9DRiAxCiAjZGVmaW5lIEhBVkVfRElTUEFUQ0hf SCAxCi0jaWYgUVRfVkVSU0lPTiA+PSAweDA1MDAwMAotLyogRklYTUU6IFRoaXMgaXMgYSBoYWNr IHRvIHdvcmsgYXJvdW5kIGEgY29uZmxpY3Qgb2YgTWFjVHlwZXMuaCBkZWZpbmluZyBhIEZpeGVk IHR5cGUuICovCi0jZGVmaW5lIENGX09QRU5fU09VUkNFIDEKLSNlbmRpZgogI2VuZGlmCiAKICNp ZiBPUyhEQVJXSU4pICYmICFQTEFURk9STShHVEspICYmICFQTEFURk9STShRVCkKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpp bmRleCA3ZGU0OTFjLi4yNzZmZjBlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VM b2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMTIt MDEtMTYgIFplbm8gQWxiaXNzZXIgIDx6ZW5vQHdlYmtpdC5vcmc+CisKKyAgICAgICAgW1F0XSBG aXggUVRfVkVSU0lPTiByZWxhdGVkIHdhcm5pbmdzIHdoZW4gYnVpbGRpbmcgb24gTWFjIE9TIFgK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc2MzQwCisK KyAgICAgICAgVGhpcyBidWcgd2FzIGNhdXNlZCBieSByMTA0ODI2LgorICAgICAgICBBcyB3YXMg YWxyZWFkeSBtZW50aW9uZWQgZm9yIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD01NzIzOQorICAgICAgICB3ZSBzaG91bGQgbm90IHVzZSAidXNpbmcgbmFtZXNwYWNlIFdl YkNvcmUiIGluIGhlYWRlciBmaWxlcywKKyAgICAgICAgYmVjYXVzZSBpdCBtaWdodCBjYXVzZSBh bWJpZ3VvdXMgcmVmZXJlbmNlcy4KKyAgICAgICAgVGhpcyBwYXRjaCByZXZlcnRzIHRoZSBjaGFu Z2VzIGZyb20gcjEwNDgyNiBhbmQgcjEwNDk4MQorICAgICAgICBhbmQgcmVtb3ZlcyB0aGUgInVz aW5nIG5hbWVzcGFjZSBXZWJDb3JlIiBzdGF0ZW1lbnQgZnJvbQorICAgICAgICB0d28gaGVhZGVy IGZpbGVzLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogU2hhcmVkL1dlYkxheWVyVHJlZUluZm8uaDoKKyAgICAgICAgKFdlYktpdDo6V2ViTGF5ZXJV cGRhdGVJbmZvOjpXZWJMYXllclVwZGF0ZUluZm8pOgorICAgICAgICAoV2ViS2l0OjpXZWJMYXll ckFuaW1hdGlvbjo6V2ViTGF5ZXJBbmltYXRpb24pOgorICAgICAgICAqIFVJUHJvY2Vzcy9MYXll clRyZWVIb3N0UHJveHkuaDoKKyAgICAgICAgKFdlYktpdDo6TGF5ZXJUcmVlSG9zdFByb3h5Ojps YXllckJ5SUQpOgorICAgICAgICAoV2ViS2l0OjpMYXllclRyZWVIb3N0UHJveHk6OnJvb3RMYXll cik6CisgICAgICAgIChXZWJLaXQ6OkxheWVyVHJlZUhvc3RQcm94eTo6bm90aWZ5QW5pbWF0aW9u U3RhcnRlZCk6CisgICAgICAgIChXZWJLaXQ6OkxheWVyVHJlZUhvc3RQcm94eTo6bm90aWZ5U3lu Y1JlcXVpcmVkKToKKyAgICAgICAgKiBVSVByb2Nlc3MvcXQvTGF5ZXJUcmVlSG9zdFByb3h5UXQu Y3BwOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViR3JhcGhpY3NMYXll ci5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9xdC9MYXllclRyZWVIb3N0UXQuaDoK KwogMjAxMi0wMS0xNCAgRGFuIEJlcm5zdGVpbiAgPG1pdHpAYXBwbGUuY29tPgogCiAgICAgICAg IDxyZGFyOi8vcHJvYmxlbS8xMDY5NjI5NT4gQ3Jhc2ggaW4gV2ViUHJvY2VzcyBhdCBjb20uYXBw bGUuQ0ZOZXR3b3JrOiBVUkxDcmVkZW50aWFsU3RvcmFnZTo6Q3JlYXRlQ3VycmVudFBlcnNpc3Rl bnRDcmVkZW50aWFscyArIDI5OApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL1dl YkxheWVyVHJlZUluZm8uaCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJMYXllclRyZWVJbmZv LmgKaW5kZXggYWFlMGVmMC4uY2I3YzlkNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hh cmVkL1dlYkxheWVyVHJlZUluZm8uaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViTGF5 ZXJUcmVlSW5mby5oCkBAIC0yOSw4ICsyOSw2IEBACiAjaW5jbHVkZSAiR3JhcGhpY3NMYXllci5o IgogI2luY2x1ZGUgIlNoYXJlYWJsZUJpdG1hcC5oIgogCi11c2luZyBuYW1lc3BhY2UgV2ViQ29y ZTsKLQogbmFtZXNwYWNlIFdlYktpdCB7CiAKIHR5cGVkZWYgdWludDMyX3QgV2ViTGF5ZXJJRDsK QEAgLTM4LDEyICszNiwxMiBAQCBlbnVtIHsgSW52YWxpZFdlYkxheWVySUQgPSAwIH07CiAKIHN0 cnVjdCBXZWJMYXllclVwZGF0ZUluZm8gewogICAgIFdlYkxheWVyVXBkYXRlSW5mbygpIHsgfQot ICAgIFdlYkxheWVyVXBkYXRlSW5mbyhjb25zdCBJbnRSZWN0JiByKQorICAgIFdlYkxheWVyVXBk YXRlSW5mbyhjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiByKQogICAgICAgICA6IGxheWVySUQoSW52 YWxpZFdlYkxheWVySUQpCiAgICAgICAgICwgcmVjdChyKSB7IH0KIAogICAgIFdlYkxheWVySUQg bGF5ZXJJRDsKLSAgICBJbnRSZWN0IHJlY3Q7CisgICAgV2ViQ29yZTo6SW50UmVjdCByZWN0Owog ICAgIFNoYXJlYWJsZUJpdG1hcDo6SGFuZGxlIGJpdG1hcEhhbmRsZTsKIAogICAgIHZvaWQgZW5j b2RlKENvcmVJUEM6OkFyZ3VtZW50RW5jb2RlciopIGNvbnN0OwpAQCAtNTMsOSArNTEsOSBAQCBz dHJ1Y3QgV2ViTGF5ZXJVcGRhdGVJbmZvIHsKIHN0cnVjdCBXZWJMYXllckFuaW1hdGlvbiB7CiAg ICAgV2ViTGF5ZXJBbmltYXRpb24oKQogICAgICAgICA6IG9wZXJhdGlvbihJbnZhbGlkQW5pbWF0 aW9uKQotICAgICAgICAsIGtleWZyYW1lTGlzdChBbmltYXRlZFByb3BlcnR5SW52YWxpZCkKKyAg ICAgICAgLCBrZXlmcmFtZUxpc3QoV2ViQ29yZTo6QW5pbWF0ZWRQcm9wZXJ0eUludmFsaWQpCiAg ICAgICAgICwgc3RhcnRUaW1lKDApIHsgfQotICAgIFdlYkxheWVyQW5pbWF0aW9uKGNvbnN0IEtl eWZyYW1lVmFsdWVMaXN0JiB2YWx1ZUxpc3QpIAorICAgIFdlYkxheWVyQW5pbWF0aW9uKGNvbnN0 IFdlYkNvcmU6OktleWZyYW1lVmFsdWVMaXN0JiB2YWx1ZUxpc3QpIAogICAgICAgICA6IG9wZXJh dGlvbihJbnZhbGlkQW5pbWF0aW9uKQogICAgICAgICAsIGtleWZyYW1lTGlzdCh2YWx1ZUxpc3Qp CiAgICAgICAgICwgc3RhcnRUaW1lKDApIHsgfQpAQCAtNjcsOSArNjUsOSBAQCBzdHJ1Y3QgV2Vi TGF5ZXJBbmltYXRpb24gewogICAgICAgICBQYXVzZUFuaW1hdGlvbiwKICAgICAgICAgSW52YWxp ZEFuaW1hdGlvbgogICAgIH0gb3BlcmF0aW9uOwotICAgIEludFNpemUgYm94U2l6ZTsKLSAgICBS ZWZQdHI8QW5pbWF0aW9uPiBhbmltYXRpb247Ci0gICAgS2V5ZnJhbWVWYWx1ZUxpc3Qga2V5ZnJh bWVMaXN0OworICAgIFdlYkNvcmU6OkludFNpemUgYm94U2l6ZTsKKyAgICBSZWZQdHI8V2ViQ29y ZTo6QW5pbWF0aW9uPiBhbmltYXRpb247CisgICAgV2ViQ29yZTo6S2V5ZnJhbWVWYWx1ZUxpc3Qg a2V5ZnJhbWVMaXN0OwogICAgIGRvdWJsZSBzdGFydFRpbWU7CiAKICAgICB2b2lkIGVuY29kZShD b3JlSVBDOjpBcmd1bWVudEVuY29kZXIqKSBjb25zdDsKQEAgLTkzLDEyICs5MSwxMiBAQCBzdHJ1 Y3QgV2ViTGF5ZXJJbmZvIHsKICAgICBXZWJMYXllcklEIG1hc2s7CiAgICAgaW50NjRfdCBpbWFn ZUJhY2tpbmdTdG9yZUlEOwogCi0gICAgRmxvYXRQb2ludCBwb3M7Ci0gICAgRmxvYXRQb2ludDNE IGFuY2hvclBvaW50OwotICAgIEZsb2F0U2l6ZSBzaXplOwotICAgIFRyYW5zZm9ybWF0aW9uTWF0 cml4IHRyYW5zZm9ybTsKLSAgICBUcmFuc2Zvcm1hdGlvbk1hdHJpeCBjaGlsZHJlblRyYW5zZm9y bTsKLSAgICBJbnRSZWN0IGNvbnRlbnRzUmVjdDsKKyAgICBXZWJDb3JlOjpGbG9hdFBvaW50IHBv czsKKyAgICBXZWJDb3JlOjpGbG9hdFBvaW50M0QgYW5jaG9yUG9pbnQ7CisgICAgV2ViQ29yZTo6 RmxvYXRTaXplIHNpemU7CisgICAgV2ViQ29yZTo6VHJhbnNmb3JtYXRpb25NYXRyaXggdHJhbnNm b3JtOworICAgIFdlYkNvcmU6OlRyYW5zZm9ybWF0aW9uTWF0cml4IGNoaWxkcmVuVHJhbnNmb3Jt OworICAgIFdlYkNvcmU6OkludFJlY3QgY29udGVudHNSZWN0OwogICAgIGZsb2F0IG9wYWNpdHk7 CiAKICAgICB1bmlvbiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTGF5 ZXJUcmVlSG9zdFByb3h5LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTGF5ZXJUcmVlSG9z dFByb3h5LmgKaW5kZXggODcxZTNiZi4uZDUyODFkMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0xheWVyVHJlZUhvc3RQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9MYXllclRyZWVIb3N0UHJveHkuaApAQCAtNDIsMTEgKzQyLDkgQEAgbmFtZXNwYWNl IFdlYktpdCB7CiBjbGFzcyBXZWJMYXllckluZm87CiBjbGFzcyBXZWJMYXllclVwZGF0ZUluZm87 CiAKLXVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwotCiBjbGFzcyBMYXllclRyZWVNZXNzYWdlVG9S ZW5kZXJlcjsKIAotY2xhc3MgTGF5ZXJUcmVlSG9zdFByb3h5IDogcHVibGljIEdyYXBoaWNzTGF5 ZXJDbGllbnQgeworY2xhc3MgTGF5ZXJUcmVlSG9zdFByb3h5IDogcHVibGljIFdlYkNvcmU6Okdy YXBoaWNzTGF5ZXJDbGllbnQgewogcHVibGljOgogICAgIExheWVyVHJlZUhvc3RQcm94eShEcmF3 aW5nQXJlYVByb3h5Kik7CiAgICAgdmlydHVhbCB+TGF5ZXJUcmVlSG9zdFByb3h5KCk7CkBAIC01 NCwxMCArNTIsMTAgQEAgcHVibGljOgogICAgIHZvaWQgZGVsZXRlQ29tcG9zaXRpbmdMYXllcihX ZWJMYXllcklEKTsKICAgICB2b2lkIHNldFJvb3RDb21wb3NpdGluZ0xheWVyKFdlYkxheWVySUQp OwogICAgIHZvaWQgZGlkUmVjZWl2ZU1lc3NhZ2UoQ29yZUlQQzo6Q29ubmVjdGlvbiosIENvcmVJ UEM6Ok1lc3NhZ2VJRCwgQ29yZUlQQzo6QXJndW1lbnREZWNvZGVyKik7Ci0gICAgdm9pZCBwYWlu dFRvQ3VycmVudEdMQ29udGV4dChjb25zdCBUcmFuc2Zvcm1hdGlvbk1hdHJpeCYsIGZsb2F0KTsK KyAgICB2b2lkIHBhaW50VG9DdXJyZW50R0xDb250ZXh0KGNvbnN0IFdlYkNvcmU6OlRyYW5zZm9y bWF0aW9uTWF0cml4JiwgZmxvYXQpOwogICAgIHZvaWQgcHVyZ2VHTFJlc291cmNlcygpOwotICAg IHZvaWQgc2V0VmlzaWJsZUNvbnRlbnRzUmVjdEFuZFNjYWxlKGNvbnN0IEludFJlY3QmLCBmbG9h dCk7Ci0gICAgdm9pZCBzZXRWaXNpYmxlQ29udGVudFJlY3RUcmFqZWN0b3J5VmVjdG9yKGNvbnN0 IEZsb2F0UG9pbnQmKTsKKyAgICB2b2lkIHNldFZpc2libGVDb250ZW50c1JlY3RBbmRTY2FsZShj b25zdCBXZWJDb3JlOjpJbnRSZWN0JiwgZmxvYXQpOworICAgIHZvaWQgc2V0VmlzaWJsZUNvbnRl bnRSZWN0VHJhamVjdG9yeVZlY3Rvcihjb25zdCBXZWJDb3JlOjpGbG9hdFBvaW50Jik7CiAjaWYg VVNFKFRJTEVEX0JBQ0tJTkdfU1RPUkUpCiAgICAgdm9pZCBzeW5jUmVtb3RlQ29udGVudCgpOwog ICAgIHZvaWQgc3dhcENvbnRlbnRCdWZmZXJzKCk7CkBAIC02OCwxOSArNjYsMTkgQEAgcHVibGlj OgogICAgIHZvaWQgY3JlYXRlRGlyZWN0bHlDb21wb3NpdGVkSW1hZ2UoaW50NjRfdCwgY29uc3Qg V2ViS2l0OjpTaGFyZWFibGVCaXRtYXA6OkhhbmRsZSYpOwogICAgIHZvaWQgZGVzdHJveURpcmVj dGx5Q29tcG9zaXRlZEltYWdlKGludDY0X3QpOwogICAgIHZvaWQgZGlkUmVjZWl2ZUxheWVyVHJl ZUhvc3RQcm94eU1lc3NhZ2UoQ29yZUlQQzo6Q29ubmVjdGlvbiosIENvcmVJUEM6Ok1lc3NhZ2VJ RCwgQ29yZUlQQzo6QXJndW1lbnREZWNvZGVyKik7Ci0gICAgdm9pZCBzZXRWaXNpYmxlQ29udGVu dHNSZWN0Rm9yTGF5ZXIoV2ViTGF5ZXJJRCwgY29uc3QgSW50UmVjdCYpOworICAgIHZvaWQgc2V0 VmlzaWJsZUNvbnRlbnRzUmVjdEZvckxheWVyKFdlYkxheWVySUQsIGNvbnN0IFdlYkNvcmU6Oklu dFJlY3QmKTsKICAgICB2b2lkIHVwZGF0ZVZpZXdwb3J0KCk7CiAjZW5kaWYKIAogcHJvdGVjdGVk OgotICAgIFBhc3NPd25QdHI8R3JhcGhpY3NMYXllcj4gY3JlYXRlTGF5ZXIoV2ViTGF5ZXJJRCk7 CisgICAgUGFzc093blB0cjxXZWJDb3JlOjpHcmFwaGljc0xheWVyPiBjcmVhdGVMYXllcihXZWJM YXllcklEKTsKIAotICAgIEdyYXBoaWNzTGF5ZXIqIGxheWVyQnlJRChXZWJMYXllcklEIGlkKSB7 IHJldHVybiAoaWQgPT0gSW52YWxpZFdlYkxheWVySUQpID8gMCA6IG1fbGF5ZXJzLmdldChpZCk7 IH0KLSAgICBHcmFwaGljc0xheWVyKiByb290TGF5ZXIoKSB7IHJldHVybiBtX3Jvb3RMYXllci5n ZXQoKTsgfQorICAgIFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXIqIGxheWVyQnlJRChXZWJMYXllcklE IGlkKSB7IHJldHVybiAoaWQgPT0gSW52YWxpZFdlYkxheWVySUQpID8gMCA6IG1fbGF5ZXJzLmdl dChpZCk7IH0KKyAgICBXZWJDb3JlOjpHcmFwaGljc0xheWVyKiByb290TGF5ZXIoKSB7IHJldHVy biBtX3Jvb3RMYXllci5nZXQoKTsgfQogCiAgICAgLy8gUmVpbXBsZW1lbnRhdGlvbnMgZnJvbSBX ZWJDb3JlOjpHcmFwaGljc0xheWVyQ2xpZW50LgotICAgIHZpcnR1YWwgdm9pZCBub3RpZnlBbmlt YXRpb25TdGFydGVkKGNvbnN0IEdyYXBoaWNzTGF5ZXIqLCBkb3VibGUpIHsgfQotICAgIHZpcnR1 YWwgdm9pZCBub3RpZnlTeW5jUmVxdWlyZWQoY29uc3QgR3JhcGhpY3NMYXllciopIHsgfQorICAg IHZpcnR1YWwgdm9pZCBub3RpZnlBbmltYXRpb25TdGFydGVkKGNvbnN0IFdlYkNvcmU6OkdyYXBo aWNzTGF5ZXIqLCBkb3VibGUpIHsgfQorICAgIHZpcnR1YWwgdm9pZCBub3RpZnlTeW5jUmVxdWly ZWQoY29uc3QgV2ViQ29yZTo6R3JhcGhpY3NMYXllciopIHsgfQogICAgIHZpcnR1YWwgYm9vbCBz aG93RGVidWdCb3JkZXJzKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KICAgICB2aXJ0dWFsIGJv b2wgc2hvd1JlcGFpbnRDb3VudGVyKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KICAgICB2b2lk IHBhaW50Q29udGVudHMoY29uc3QgV2ViQ29yZTo6R3JhcGhpY3NMYXllciosIFdlYkNvcmU6Okdy YXBoaWNzQ29udGV4dCYsIFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJQYWludGluZ1BoYXNlLCBjb25z dCBXZWJDb3JlOjpJbnRSZWN0JikgeyB9CkBAIC04OSwxOSArODcsMTkgQEAgcHJvdGVjdGVkOgog ICAgIERyYXdpbmdBcmVhUHJveHkqIG1fZHJhd2luZ0FyZWFQcm94eTsKIAogICAgIHR5cGVkZWYg SGFzaE1hcDxXZWJMYXllcklELCBXZWJDb3JlOjpHcmFwaGljc0xheWVyKj4gTGF5ZXJNYXA7Ci0g ICAgSW50UmVjdCBtX3Zpc2libGVDb250ZW50c1JlY3Q7CisgICAgV2ViQ29yZTo6SW50UmVjdCBt X3Zpc2libGVDb250ZW50c1JlY3Q7CiAgICAgZmxvYXQgbV9jb250ZW50c1NjYWxlOwogCiAgICAg TWVzc2FnZVF1ZXVlPExheWVyVHJlZU1lc3NhZ2VUb1JlbmRlcmVyPiBtX21lc3NhZ2VzVG9SZW5k ZXJlcjsKICAgICB2b2lkIHB1c2hVcGRhdGVUb1F1ZXVlKFBhc3NPd25QdHI8TGF5ZXJUcmVlTWVz c2FnZVRvUmVuZGVyZXI+KTsKIAogI2lmIFVTRShURVhUVVJFX01BUFBFUikKLSAgICBPd25QdHI8 VGV4dHVyZU1hcHBlcj4gbV90ZXh0dXJlTWFwcGVyOworICAgIE93blB0cjxXZWJDb3JlOjpUZXh0 dXJlTWFwcGVyPiBtX3RleHR1cmVNYXBwZXI7CiAjZW5kaWYKIAogI2lmIFBMQVRGT1JNKFFUKQot ICAgIHR5cGVkZWYgSGFzaE1hcDxJbnRQb2ludCwgUmVmUHRyPEJpdG1hcFRleHR1cmU+ID4gVGls ZWRJbWFnZTsKLSAgICBUZXh0dXJlTWFwcGVyTm9kZTo6Tm9kZVJlY3RNYXAgbV9ub2RlVmlzdWFs Q29udGVudHNSZWN0TWFwOworICAgIHR5cGVkZWYgSGFzaE1hcDxXZWJDb3JlOjpJbnRQb2ludCwg UmVmUHRyPFdlYkNvcmU6OkJpdG1hcFRleHR1cmU+ID4gVGlsZWRJbWFnZTsKKyAgICBXZWJDb3Jl OjpUZXh0dXJlTWFwcGVyTm9kZTo6Tm9kZVJlY3RNYXAgbV9ub2RlVmlzdWFsQ29udGVudHNSZWN0 TWFwOwogICAgIEhhc2hNYXA8aW50LCBpbnQ+IG1fdGlsZVRvTm9kZVRpbGU7CiAgICAgaW50IHJl bW90ZVRpbGVJRFRvTm9kZVRpbGVJRChpbnQgdGlsZUlEKSBjb25zdDsKICAgICBIYXNoTWFwPGlu dDY0X3QsIFRpbGVkSW1hZ2U+IG1fZGlyZWN0bHlDb21wb3NpdGVkSW1hZ2VzOwpAQCAtMTEzLDcg KzExMSw3IEBAIHByb3RlY3RlZDoKICAgICB2b2lkIHN5bmNMYXllclBhcmFtZXRlcnMoY29uc3Qg V2ViTGF5ZXJJbmZvJik7CiAgICAgdm9pZCBjcmVhdGVUaWxlKFdlYkxheWVySUQsIGludCwgZmxv YXQgc2NhbGUpOwogICAgIHZvaWQgcmVtb3ZlVGlsZShXZWJMYXllcklELCBpbnQpOwotICAgIHZv aWQgdXBkYXRlVGlsZShXZWJMYXllcklELCBpbnQsIGNvbnN0IEludFJlY3QmLCBjb25zdCBJbnRS ZWN0JiwgY29uc3QgUUltYWdlJik7CisgICAgdm9pZCB1cGRhdGVUaWxlKFdlYkxheWVySUQsIGlu dCwgY29uc3QgV2ViQ29yZTo6SW50UmVjdCYsIGNvbnN0IFdlYkNvcmU6OkludFJlY3QmLCBjb25z dCBRSW1hZ2UmKTsKICAgICB2b2lkIGNyZWF0ZUltYWdlKGludDY0X3QsIGNvbnN0IFFJbWFnZSYp OwogICAgIHZvaWQgZGVzdHJveUltYWdlKGludDY0X3QpOwogICAgIHZvaWQgYXNzaWduSW1hZ2VU b0xheWVyKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXIqLCBpbnQ2NF90IGltYWdlSUQpOwpAQCAtMTIz LDEyICsxMjEsMTIgQEAgcHJvdGVjdGVkOgogCiAjZW5kaWYKIAotICAgIE93blB0cjxHcmFwaGlj c0xheWVyPiBtX3Jvb3RMYXllcjsKKyAgICBPd25QdHI8V2ViQ29yZTo6R3JhcGhpY3NMYXllcj4g bV9yb290TGF5ZXI7CiAgICAgVmVjdG9yPFdlYkxheWVySUQ+IG1fbGF5ZXJzVG9EZWxldGU7CiAK ICNpZiBQTEFURk9STShRVCkKLSAgICB2b2lkIGRpZEZpcmVWaWV3cG9ydFVwZGF0ZVRpbWVyKFRp bWVyPExheWVyVHJlZUhvc3RQcm94eT4qKTsKLSAgICBUaW1lcjxMYXllclRyZWVIb3N0UHJveHk+ IG1fdmlld3BvcnRVcGRhdGVUaW1lcjsKKyAgICB2b2lkIGRpZEZpcmVWaWV3cG9ydFVwZGF0ZVRp bWVyKFdlYkNvcmU6OlRpbWVyPExheWVyVHJlZUhvc3RQcm94eT4qKTsKKyAgICBXZWJDb3JlOjpU aW1lcjxMYXllclRyZWVIb3N0UHJveHk+IG1fdmlld3BvcnRVcGRhdGVUaW1lcjsKICNlbmRpZgog CiAgICAgTGF5ZXJNYXAgbV9sYXllcnM7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvcXQvTGF5ZXJUcmVlSG9zdFByb3h5UXQuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL3F0L0xheWVyVHJlZUhvc3RQcm94eVF0LmNwcAppbmRleCBjMjY0ZWE3Li44NjUwNjk4IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvTGF5ZXJUcmVlSG9zdFByb3h5 UXQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9MYXllclRyZWVIb3N0UHJv eHlRdC5jcHAKQEAgLTU3LDYgKzU3LDggQEAgcHVibGljOgogICAgIHZpcnR1YWwgVHlwZSB0eXBl KCkgY29uc3QgPSAwOwogfTsKIAordXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CisKIHRlbXBsYXRl PGNsYXNzIE1lc3NhZ2VEYXRhLCBMYXllclRyZWVNZXNzYWdlVG9SZW5kZXJlcjo6VHlwZSBtZXNz YWdlVHlwZT4KIGNsYXNzIExheWVyVHJlZU1lc3NhZ2VUb1JlbmRlcmVyV2l0aERhdGEgOiBwdWJs aWMgTGF5ZXJUcmVlTWVzc2FnZVRvUmVuZGVyZXIgewogcHVibGljOgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJHcmFwaGljc0xheWVyLmgg Yi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkdyYXBoaWNzTGF5 ZXIuaAppbmRleCAyZjhjYjlhLi5iNzUwOWIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkdyYXBoaWNzTGF5ZXIuaAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkdyYXBoaWNzTGF5ZXIuaApAQCAt NDYsNyArNDYsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHVwZGF0ZVRpbGUoV2ViTGF5 ZXJJRCwgaW50IHRpbGVJRCwgY29uc3QgVXBkYXRlSW5mbyYpID0gMDsKICAgICB2aXJ0dWFsIHZv aWQgcmVtb3ZlVGlsZShXZWJMYXllcklELCBpbnQgdGlsZUlEKSA9IDA7CiAgICAgdmlydHVhbCBi b29sIGxheWVyVHJlZVRpbGVVcGRhdGVzQWxsb3dlZCgpIGNvbnN0ID0gMDsKLSAgICB2aXJ0dWFs IGludDY0X3QgYWRvcHRJbWFnZUJhY2tpbmdTdG9yZShJbWFnZSopID0gMDsKKyAgICB2aXJ0dWFs IGludDY0X3QgYWRvcHRJbWFnZUJhY2tpbmdTdG9yZShXZWJDb3JlOjpJbWFnZSopID0gMDsKICAg ICB2aXJ0dWFsIHZvaWQgcmVsZWFzZUltYWdlQmFja2luZ1N0b3JlKGludDY0X3QpID0gMDsKICAg ICB2aXJ0dWFsIHZvaWQgZGlkU3luY0NvbXBvc2l0aW5nU3RhdGVGb3JMYXllcihjb25zdCBXZWJM YXllckluZm8mKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIGRpZERlbGV0ZUxheWVyKFdlYkxheWVy SUQpID0gMDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9x dC9MYXllclRyZWVIb3N0UXQuaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9x dC9MYXllclRyZWVIb3N0UXQuaAppbmRleCA4NTI3YzUyLi5hOTFjNTJiIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvcXQvTGF5ZXJUcmVlSG9zdFF0LmgKKysr IGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL3F0L0xheWVyVHJlZUhvc3RRdC5o CkBAIC02Miw3ICs2Miw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgcGF1c2VSZW5kZXJp bmcoKSB7IG1faXNTdXNwZW5kZWQgPSB0cnVlOyB9CiAgICAgdmlydHVhbCB2b2lkIHJlc3VtZVJl bmRlcmluZygpIHsgbV9pc1N1c3BlbmRlZCA9IGZhbHNlOyBzY2hlZHVsZUxheWVyRmx1c2goKTsg fQogICAgIHZpcnR1YWwgdm9pZCBkZXZpY2VTY2FsZUZhY3RvckRpZENoYW5nZSgpIHsgfQotICAg IHZpcnR1YWwgaW50NjRfdCBhZG9wdEltYWdlQmFja2luZ1N0b3JlKEltYWdlKik7CisgICAgdmly dHVhbCBpbnQ2NF90IGFkb3B0SW1hZ2VCYWNraW5nU3RvcmUoV2ViQ29yZTo6SW1hZ2UqKTsKICAg ICB2aXJ0dWFsIHZvaWQgcmVsZWFzZUltYWdlQmFja2luZ1N0b3JlKGludDY0X3QpOwogCiAjaWYg VVNFKFRJTEVEX0JBQ0tJTkdfU1RPUkUpCkBAIC03Myw4ICs3Myw4IEBAIHB1YmxpYzoKICAgICB2 aXJ0dWFsIHZvaWQgcmVuZGVyTmV4dEZyYW1lKCk7CiAgICAgdmlydHVhbCB2b2lkIHB1cmdlQmFj a2luZ1N0b3JlcygpOwogICAgIHZpcnR1YWwgYm9vbCBsYXllclRyZWVUaWxlVXBkYXRlc0FsbG93 ZWQoKSBjb25zdDsKLSAgICB2aXJ0dWFsIHZvaWQgc2V0VmlzaWJsZUNvbnRlbnRSZWN0QW5kU2Nh bGUoY29uc3QgSW50UmVjdCYsIGZsb2F0IHNjYWxlKTsKLSAgICB2aXJ0dWFsIHZvaWQgc2V0Vmlz aWJsZUNvbnRlbnRSZWN0VHJhamVjdG9yeVZlY3Rvcihjb25zdCBGbG9hdFBvaW50Jik7CisgICAg dmlydHVhbCB2b2lkIHNldFZpc2libGVDb250ZW50UmVjdEFuZFNjYWxlKGNvbnN0IFdlYkNvcmU6 OkludFJlY3QmLCBmbG9hdCBzY2FsZSk7CisgICAgdmlydHVhbCB2b2lkIHNldFZpc2libGVDb250 ZW50UmVjdFRyYWplY3RvcnlWZWN0b3IoY29uc3QgV2ViQ29yZTo6RmxvYXRQb2ludCYpOwogICAg IHZpcnR1YWwgdm9pZCBkaWRTeW5jQ29tcG9zaXRpbmdTdGF0ZUZvckxheWVyKGNvbnN0IFdlYkxh eWVySW5mbyYpOwogICAgIHZpcnR1YWwgdm9pZCBkaWREZWxldGVMYXllcihXZWJMYXllcklEKTsK ICNlbmRpZgo=