65410 2011-07-30 04:38:16 -0700 [Qt][WK2] Fix the build afer r92014 2011-07-30 10:40:03 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) All All RESOLVED FIXED Qt, QtTriaged P2 Normal --- 1 kbalazs kbalazs kling ossy oldest_to_newest 444271 0 kbalazs 2011-07-30 04:38:16 -0700 The bug is in Qt. qwindowdefs.h should not define a typedef for such a popular word as Region. The fix is indeed ugly and I hope it would be fixed in Qt soon. 444272 1 102432 kbalazs 2011-07-30 04:40:55 -0700 Created attachment 102432 Patch 444285 2 102432 noam 2011-07-30 08:53:30 -0700 Comment on attachment 102432 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=102432&action=review > Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp:38 > +// Fix for the intrusive typedef in qwindowdefs.h until it has been fixed in Qt. Was a bug filed with Qt? > Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp:40 > +#define Region WebCore::Region > +#endif Adding "using WebCore::Region" inside the "namespace WebKit" clause should do the trick as well. In either case, I believe this problem is confined to X11, so let's #ifdef it. #ifdef Q_WS_X11 using WebCore::Region; #endif seems a bit less intrusive than a new #define Region :) 444292 3 102437 kbalazs 2011-07-30 10:32:29 -0700 Created attachment 102437 Patch 444293 4 kbalazs 2011-07-30 10:37:08 -0700 (In reply to comment #2) > (From update of attachment 102432 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=102432&action=review > > > Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp:38 > > +// Fix for the intrusive typedef in qwindowdefs.h until it has been fixed in Qt. > > Was a bug filed with Qt? Not yet. > > > Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp:40 > > +#define Region WebCore::Region > > +#endif > > Adding "using WebCore::Region" inside the "namespace WebKit" clause should do the trick as well. Good point. > In either case, I believe this problem is confined to X11, so let's #ifdef it. > > #ifdef Q_WS_X11 > using WebCore::Region; > #endif > > seems a bit less intrusive than a new #define Region :) These suggestions had been incorporated into the new patch. 444295 5 102437 kbalazs 2011-07-30 10:39:54 -0700 Comment on attachment 102437 Patch Clearing flags on attachment: 102437 Committed r92052: <http://trac.webkit.org/changeset/92052> 444296 6 kbalazs 2011-07-30 10:40:03 -0700 All reviewed patches have been landed. Closing bug. 102432 2011-07-30 04:40:55 -0700 2011-07-30 10:32:22 -0700 Patch bug-65410-20110730134053.patch text/plain 2711 kbalazs U3VidmVyc2lvbiBSZXZpc2lvbjogOTIwNDkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCBlZDM3OWQwNjZhMjQ2NjQ1 NTAzZThmNzk1NjkxY2NiNWVmMzIwNDI5Li4xZjk3ZmM4NjU3ODY0YjIxY2IyYTk1ODhkOWU0NzQ5 ZGFhY2ZjMDI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDctMzAgIEJhbGF6 cyBLZWxlbWVuICA8a2JhbGF6c0B3ZWJraXQub3JnPgorCisgICAgICAgIFtRdF1bV0syXSBGaXgg dGhlIGJ1aWxkIGFmZXIgcjkyMDE0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD02NTQxMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHlJbXBsLmNwcDoKKyAgICAg ICAgKiBVSVByb2Nlc3MvcXQvcWRlc2t0b3B3ZWJwYWdlcHJveHkuY3BwOgorICAgICAgICAoUURl c2t0b3BXZWJQYWdlUHJveHk6OnBhaW50Q29udGVudCk6CisgICAgICAgICogV2ViUHJvY2Vzcy9X ZWJQYWdlL0RyYXdpbmdBcmVhSW1wbC5jcHA6CisKIDIwMTEtMDctMjkgIFNhbSBXZWluaWcgIDxz YW1Ad2Via2l0Lm9yZz4KIAogICAgICAgICBNb3ZlIFJlZ2lvbiBjb2RlIGZyb20gV2ViS2l0MiB0 byBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvRHJhd2luZ0Fy ZWFQcm94eUltcGwuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJv eHlJbXBsLmNwcAppbmRleCAzNTJmYjFkOTM1ZWE3NDdhZjNmYTlmNzY1NGEyMjViZjEyMTM2ZmE4 Li5hMTAzMDE1MTJmYjM4MmYzOWEwNmVlZDNkODZhZmU5MTA3N2Y1OTFlIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eUltcGwuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5SW1wbC5jcHAKQEAgLTM0LDYg KzM0LDExIEBACiAjaW5jbHVkZSAiV2ViUHJvY2Vzc1Byb3h5LmgiCiAjaW5jbHVkZSA8V2ViQ29y ZS9SZWdpb24uaD4KIAorI2lmIFBMQVRGT1JNKFFUKQorLy8gRml4IGZvciB0aGUgaW50cnVzaXZl IHR5cGVkZWYgaW4gcXdpbmRvd2RlZnMuaCB1bnRpbCBpdCBoYXMgYmVlbiBmaXhlZCBpbiBRdC4K KyNkZWZpbmUgUmVnaW9uIFdlYkNvcmU6OlJlZ2lvbgorI2VuZGlmCisKIHVzaW5nIG5hbWVzcGFj ZSBXZWJDb3JlOwogCiBuYW1lc3BhY2UgV2ViS2l0IHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9xdC9xZGVza3RvcHdlYnBhZ2Vwcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvcXQvcWRlc2t0b3B3ZWJwYWdlcHJveHkuY3BwCmluZGV4IDIyMzQ4MjBlNzAx NTViOTQ5MGViNTcwM2I5YTIyMzYyOWViMjdlNWIuLmI5NGQ5NWVhN2E1YTI5MzJkZmNiNjkzMDcw ZmU3NjI5NTgxMDgxMzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9x ZGVza3RvcHdlYnBhZ2Vwcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0 L3FkZXNrdG9wd2VicGFnZXByb3h5LmNwcApAQCAtNjEsNyArNjEsNyBAQCBQYXNzT3duUHRyPERy YXdpbmdBcmVhUHJveHk+IFFEZXNrdG9wV2ViUGFnZVByb3h5OjpjcmVhdGVEcmF3aW5nQXJlYVBy b3h5KCkKIHZvaWQgUURlc2t0b3BXZWJQYWdlUHJveHk6OnBhaW50Q29udGVudChRUGFpbnRlciog cGFpbnRlciwgY29uc3QgUVJlY3QmIGFyZWEpCiB7CiAgICAgLy8gRklYTUU6IERvIHNvbWV0aGlu ZyB3aXRoIHRoZSB1bnBhaW50ZWQgcmVnaW9uPwotICAgIFdlYktpdDo6UmVnaW9uIHVucGFpbnRl ZFJlZ2lvbjsKKyAgICBXZWJDb3JlOjpSZWdpb24gdW5wYWludGVkUmVnaW9uOwogICAgIHN0YXRp Y19jYXN0PERyYXdpbmdBcmVhUHJveHlJbXBsKj4obV93ZWJQYWdlUHJveHktPmRyYXdpbmdBcmVh KCkpLT5wYWludChwYWludGVyLCBhcmVhLCB1bnBhaW50ZWRSZWdpb24pOwogfQogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWFJbXBsLmNw cCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9EcmF3aW5nQXJlYUltcGwuY3Bw CmluZGV4IDczMWQ3YWViNmIxNTU3OGY2NTc3ZGE5ZTY5ZWJkYmFjYzFiYTA2YmUuLmNhOTdlZGVi NzNiYTZmNmZiN2NjOGRhNTI0YTc0MmYwNTZlYTc3YzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9EcmF3aW5nQXJlYUltcGwuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9EcmF3aW5nQXJlYUltcGwuY3BwCkBAIC0zNyw2ICsz NywxMSBAQAogI2luY2x1ZGUgPFdlYkNvcmUvUGFnZS5oPgogI2luY2x1ZGUgPFdlYkNvcmUvU2V0 dGluZ3MuaD4KIAorI2lmIFBMQVRGT1JNKFFUKQorLy8gRml4IGZvciB0aGUgaW50cnVzaXZlIHR5 cGVkZWYgaW4gcXdpbmRvd2RlZnMuaCB1bnRpbCBpdCBoYXMgYmVlbiBmaXhlZCBpbiBRdC4KKyNk ZWZpbmUgUmVnaW9uIFdlYkNvcmU6OlJlZ2lvbgorI2VuZGlmCisKIHVzaW5nIG5hbWVzcGFjZSBX ZWJDb3JlOwogdXNpbmcgbmFtZXNwYWNlIHN0ZDsKIAo= 102437 2011-07-30 10:32:29 -0700 2011-07-30 10:39:54 -0700 Patch bug-65410-20110730193227.patch text/plain 1995 kbalazs U3VidmVyc2lvbiBSZXZpc2lvbjogOTIwNTAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCBlZDM3OWQwNjZhMjQ2NjQ1 NTAzZThmNzk1NjkxY2NiNWVmMzIwNDI5Li5mNjQ4YmMwNGM5OGIwMTIwZjFlY2ZiZjBkNjJjMTNh MjMyOTJlNmQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMDctMzAgIEJhbGF6 cyBLZWxlbWVuICA8a2JhbGF6c0B3ZWJraXQub3JnPgorCisgICAgICAgIFtRdF1bV0syXSBGaXgg dGhlIGJ1aWxkIGFmZXIgcjkyMDE0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD02NTQxMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogU2hhcmVkL1NoYXJlYWJsZUJpdG1hcC5oOgorICAgICAgICAqIFVJUHJv Y2Vzcy9xdC9xZGVza3RvcHdlYnBhZ2Vwcm94eS5jcHA6CisgICAgICAgIChRRGVza3RvcFdlYlBh Z2VQcm94eTo6cGFpbnRDb250ZW50KToKKwogMjAxMS0wNy0yOSAgU2FtIFdlaW5pZyAgPHNhbUB3 ZWJraXQub3JnPgogCiAgICAgICAgIE1vdmUgUmVnaW9uIGNvZGUgZnJvbSBXZWJLaXQyIHRvIFdl YkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9TaGFyZWFibGVCaXRtYXAu aCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9TaGFyZWFibGVCaXRtYXAuaAppbmRleCBlMzZkZmRk NDYzNzI3YTQzOGNiODkzZjg4ZGNiNjBhNDU2Mjk5ZmNkLi4xMmNkN2FiNTVhNDhkODRkYjE0YTQ1 MDhmZGI2ODBlM2UwZGUwYjAzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvU2hh cmVhYmxlQml0bWFwLmgKKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL1NoYXJlYWJsZUJpdG1h cC5oCkBAIC00Myw2ICs0MywxMSBAQAogCiAjaWYgUExBVEZPUk0oUVQpCiAjaW5jbHVkZSA8UUlt YWdlPgorI2lmZGVmIFFfV1NfWDExCisvLyBBdm9pZCBhbWJpZ3VpdHkgY2F1c2VkIGJ5IHRoZSBS ZWdpb24gdHlwZWRlZiBmcm9tIHF3aW5kb3dkZWZzLmguCituYW1lc3BhY2UgV2ViQ29yZSB7IGNs YXNzIFJlZ2lvbjsgfQorbmFtZXNwYWNlIFdlYktpdCB7IHVzaW5nIFdlYkNvcmU6OlJlZ2lvbjsg fQorI2VuZGlmCiAjZW5kaWYKIAogbmFtZXNwYWNlIFdlYkNvcmUgewpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L3FkZXNrdG9wd2VicGFnZXByb3h5LmNwcCBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9xZGVza3RvcHdlYnBhZ2Vwcm94eS5jcHAKaW5kZXggMjIz NDgyMGU3MDE1NWI5NDkwZWI1NzAzYjlhMjIzNjI5ZWIyN2U1Yi4uYjk0ZDk1ZWE3YTVhMjkzMmRm Y2I2OTMwNzBmZTc2Mjk1ODEwODEzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL3F0L3FkZXNrdG9wd2VicGFnZXByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvcXQvcWRlc2t0b3B3ZWJwYWdlcHJveHkuY3BwCkBAIC02MSw3ICs2MSw3IEBAIFBhc3NP d25QdHI8RHJhd2luZ0FyZWFQcm94eT4gUURlc2t0b3BXZWJQYWdlUHJveHk6OmNyZWF0ZURyYXdp bmdBcmVhUHJveHkoKQogdm9pZCBRRGVza3RvcFdlYlBhZ2VQcm94eTo6cGFpbnRDb250ZW50KFFQ YWludGVyKiBwYWludGVyLCBjb25zdCBRUmVjdCYgYXJlYSkKIHsKICAgICAvLyBGSVhNRTogRG8g c29tZXRoaW5nIHdpdGggdGhlIHVucGFpbnRlZCByZWdpb24/Ci0gICAgV2ViS2l0OjpSZWdpb24g dW5wYWludGVkUmVnaW9uOworICAgIFdlYkNvcmU6OlJlZ2lvbiB1bnBhaW50ZWRSZWdpb247CiAg ICAgc3RhdGljX2Nhc3Q8RHJhd2luZ0FyZWFQcm94eUltcGwqPihtX3dlYlBhZ2VQcm94eS0+ZHJh d2luZ0FyZWEoKSktPnBhaW50KHBhaW50ZXIsIGFyZWEsIHVucGFpbnRlZFJlZ2lvbik7CiB9CiAK