144845 2015-05-10 12:12:16 -0700 [CMake] Some macros need to be defined/undefined, rather than ON/OFF 2015-05-10 20:04:37 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Unspecified OS X 10.10 RESOLVED FIXED P2 Major --- 126492 1 philip.chimento webkit-unassigned commit-queue mcatanzaro mrobinson oldest_to_newest 1093547 0 philip.chimento 2015-05-10 12:12:16 -0700 I ran into these three errors while compiling the 2.9.1 GTK port with no X11, with MiniBrowser turned on but developer mode off: In file included from /Users/fliep/gtk/source/webkitgtk-2.9.1/Source/WebCore/bindings/js/ScriptController.cpp:39: In file included from /Users/fliep/gtk/source/webkitgtk-2.9.1/Source/WebCore/bridge/NP_jsobject.h:31: In file included from /Users/fliep/gtk/source/webkitgtk-2.9.1/Source/WebCore/bridge/npruntime_internal.h:28: /Users/fliep/gtk/source/webkitgtk-2.9.1/Source/WebCore/plugins/npapi.h:89:10: fatal error: 'X11/Xlib.h' file not found #include <X11/Xlib.h> ^ ------------- /Users/fliep/gtk/source/webkitgtk-2.9.1/Source/WebKit2/PluginProcess/unix/PluginProcessMainUnix.cpp:60:25: error: unknown type name 'Display'; did you mean 'WebCore::EDisplay'? static int webkitXError(Display* xdisplay, XErrorEvent* error) ^~~~~~~ WebCore::EDisplay /Users/fliep/gtk/source/webkitgtk-2.9.1/Source/WebCore/rendering/style/RenderStyleConstants.h:536:6: note: 'WebCore::EDisplay' declared here enum EDisplay { ^ /Users/fliep/gtk/source/webkitgtk-2.9.1/Source/WebKit2/PluginProcess/unix/PluginProcessMainUnix.cpp:60:44: error: unknown type name 'XErrorEvent' static int webkitXError(Display* xdisplay, XErrorEvent* error) ^ --------------- /Users/fliep/gtk/source/webkitgtk-2.9.1/Tools/MiniBrowser/gtk/main.c:260:45: error: use of undeclared identifier 'WEBKIT_INJECTED_BUNDLE_PATH' g_setenv("WEBKIT_INJECTED_BUNDLE_PATH", WEBKIT_INJECTED_BUNDLE_PATH, FALSE); ^ This is because of the preprocessor variables MOZ_X11, XP_UNIX, and DEVELOPMENT_BUILD, respectively, being set to the values ON or OFF by the CMake build system, whereas the code expects them to be either defined or undefined. In the common case where they were ON, they were naturally also defined, and so the problem was not immediately apparent. 1093549 1 philip.chimento 2015-05-10 12:16:16 -0700 The latter failure (DEVELOPMENT_BUILD) has already been changed on master but Tools/MiniBrowser/gtk/main.c:260 may still need to read #if ENABLE(DEVELOPER_MODE) instead of #if ENABLE_DEVELOPER_MODE - I'm not exactly sure how that WTF mechanism works. 1093551 2 252822 philip.chimento 2015-05-10 12:23:04 -0700 Created attachment 252822 Patch 1093585 3 mcatanzaro 2015-05-10 14:37:26 -0700 Thanks for your patches. I'd like to change the code to be more robust to this, checking values rather than definitions. But I don't see value in fighting that fight in npapi.h, so this is probably the best approach. Let's see what Martin thinks. There should for sure be a warning comment, though, or someone will revert this patch in passing as a cleanup. (In reply to comment #1) > The latter failure (DEVELOPMENT_BUILD) has already been changed on master > but Tools/MiniBrowser/gtk/main.c:260 may still need to read #if > ENABLE(DEVELOPER_MODE) instead of #if ENABLE_DEVELOPER_MODE - I'm not > exactly sure how that WTF mechanism works. ENABLE(DEVELOPER_MODE) is true if ENABLE_DEVELOPER_MODE is defined and its value is not 0, and false otherwise. Since MiniBrowser uses the WebKitGTK+ public API and not WTF internals, ENABLE(DEVELOPER_MODE) is unavailable to it, so it just checks ENABLE_DEVELOPER_MODE directly. 1093598 4 252827 philip.chimento 2015-05-10 15:02:33 -0700 Created attachment 252827 Patch 1093599 5 philip.chimento 2015-05-10 15:04:17 -0700 (In reply to comment #3) > Thanks for your patches. I'd like to change the code to be more robust to > this, checking values rather than definitions. But I don't see value in > fighting that fight in npapi.h, so this is probably the best approach. Let's > see what Martin thinks. There should for sure be a warning comment, though, > or someone will revert this patch in passing as a cleanup. Sure thing. I did kind of assume that npapi.h was off limits. I've added a warning comment. 1093627 6 252827 mrobinson 2015-05-10 18:01:14 -0700 Comment on attachment 252827 Patch Thank you for fixing this. 1093632 7 philip.chimento 2015-05-10 19:04:57 -0700 You're welcome. Thanks for the reviews. 1093639 8 252827 commit-queue 2015-05-10 20:04:33 -0700 Comment on attachment 252827 Patch Clearing flags on attachment: 252827 Committed r184062: <http://trac.webkit.org/changeset/184062> 1093640 9 commit-queue 2015-05-10 20:04:37 -0700 All reviewed patches have been landed. Closing bug. 252822 2015-05-10 12:23:04 -0700 2015-05-10 15:02:22 -0700 Patch bug-144845-20150510122145.patch text/plain 1513 philip.chimento U3VidmVyc2lvbiBSZXZpc2lvbjogMTg0MDQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvT3B0 aW9uc0dUSy5jbWFrZSBiL1NvdXJjZS9jbWFrZS9PcHRpb25zR1RLLmNtYWtlCmluZGV4IDRkMGU5 ZDgzMWQ3Y2VhOTljZTE1ZWNjYzZjNWE1OGQ5NTZiNDIwNjMuLjIyMjgwZTgxN2QzNDI5MmU2MWJk YmY3Zjc0ZmMwMjI4YmNhNzhkMjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9jbWFrZS9PcHRpb25zR1RL LmNtYWtlCisrKyBiL1NvdXJjZS9jbWFrZS9PcHRpb25zR1RLLmNtYWtlCkBAIC0xODgsOCArMTg4 LDEyIEBAIFdFQktJVF9PUFRJT05fREVGQVVMVF9QT1JUX1ZBTFVFKEVOQUJMRV9USFJFQURFRF9D T01QT1NJVE9SIFBSSVZBVEUgT0ZGKQogV0VCS0lUX09QVElPTl9FTkQoKQogCiBTRVRfQU5EX0VY UE9TRV9UT19CVUlMRChXVEZfUExBVEZPUk1fWDExICR7RU5BQkxFX1gxMV9UQVJHRVR9KQotU0VU X0FORF9FWFBPU0VfVE9fQlVJTEQoTU9aX1gxMSAke0VOQUJMRV9YMTFfVEFSR0VUfSkKLVNFVF9B TkRfRVhQT1NFX1RPX0JVSUxEKFhQX1VOSVggJHtXVEZfT1NfVU5JWH0pCitpZiAoJHtFTkFCTEVf WDExX1RBUkdFVH0pCisgICAgU0VUX0FORF9FWFBPU0VfVE9fQlVJTEQoTU9aX1gxMSAxKQorZW5k aWYgKCkKK2lmICgke1dURl9PU19VTklYfSkKKyAgICBTRVRfQU5EX0VYUE9TRV9UT19CVUlMRChY UF9VTklYIDEpCitlbmRpZiAoKQogU0VUX0FORF9FWFBPU0VfVE9fQlVJTEQoV1RGX1BMQVRGT1JN X1dBWUxBTkQgJHtFTkFCTEVfV0FZTEFORF9UQVJHRVR9KQogCiBzZXQoVVNFX1VESVM4NiBPTikK ZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCA0Njg1MGNiZTM4YzdmNTQ4 N2RjZWM0ZTdiMmY1ZmQwMWI2MmMzNDQ2Li43Y2Q0YmM0NWU3ZDc5N2JiNjM4YTI1ZDUxMTlmOWNk MzM2ZmM0MTY3IDEwMDY0NAotLS0gYS9DaGFuZ2VMb2cKKysrIGIvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMTQgQEAKKzIwMTUtMDUtMTAgIFBoaWxpcCBDaGltZW50byAgPHBoaWxpcC5jaGltZW50b0Bn bWFpbC5jb20+CisKKyAgICAgICAgW0NNYWtlXSBTb21lIG1hY3JvcyBuZWVkIHRvIGJlIGRlZmlu ZWQvdW5kZWZpbmVkLCByYXRoZXIgdGhhbiBPTi9PRkYKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NDg0NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogU291cmNlL2NtYWtlL09wdGlvbnNHVEsuY21ha2U6 IE9ubHkgZGVmaW5lIE1PWl9YMTEgYW5kIFhQX1VOSVgKKyAgICAgICAgaWYgdGhlaXIgY29ycmVz cG9uZGluZyBFTkFCTEUgb3B0aW9ucyBhcmUgT04uIFRoZSBjb2RlIHJlbGllcyBvbgorICAgICAg ICB0aGVzZSBiZWluZyB1bmRlZmluZWQgaWYgdGhleSBhcmUgdG8gYmUgc3dpdGNoZWQgb2ZmLgor CiAyMDE1LTA1LTA5ICBZb2F2IFdlaXNzICA8eW9hdkB5b2F2LndzPgogCiAgICAgICAgIFJlbW92 ZSB0aGUgUElDVFVSRV9TSVpFUyBidWlsZCBmbGFnCg== 252827 2015-05-10 15:02:33 -0700 2015-05-10 20:04:33 -0700 Patch bug-144845-20150510150113.patch text/plain 1724 philip.chimento U3VidmVyc2lvbiBSZXZpc2lvbjogMTg0MDQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvT3B0 aW9uc0dUSy5jbWFrZSBiL1NvdXJjZS9jbWFrZS9PcHRpb25zR1RLLmNtYWtlCmluZGV4IDRkMGU5 ZDgzMWQ3Y2VhOTljZTE1ZWNjYzZjNWE1OGQ5NTZiNDIwNjMuLmMxNjU0ZWZkMWIwMGEwMzQxOWI0 YWIxNWUzNGY1ZGJiYzM3Yjk2YzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9jbWFrZS9PcHRpb25zR1RL LmNtYWtlCisrKyBiL1NvdXJjZS9jbWFrZS9PcHRpb25zR1RLLmNtYWtlCkBAIC0xODgsMTAgKzE4 OCwxNyBAQCBXRUJLSVRfT1BUSU9OX0RFRkFVTFRfUE9SVF9WQUxVRShFTkFCTEVfVEhSRUFERURf Q09NUE9TSVRPUiBQUklWQVRFIE9GRikKIFdFQktJVF9PUFRJT05fRU5EKCkKIAogU0VUX0FORF9F WFBPU0VfVE9fQlVJTEQoV1RGX1BMQVRGT1JNX1gxMSAke0VOQUJMRV9YMTFfVEFSR0VUfSkKLVNF VF9BTkRfRVhQT1NFX1RPX0JVSUxEKE1PWl9YMTEgJHtFTkFCTEVfWDExX1RBUkdFVH0pCi1TRVRf QU5EX0VYUE9TRV9UT19CVUlMRChYUF9VTklYICR7V1RGX09TX1VOSVh9KQogU0VUX0FORF9FWFBP U0VfVE9fQlVJTEQoV1RGX1BMQVRGT1JNX1dBWUxBTkQgJHtFTkFCTEVfV0FZTEFORF9UQVJHRVR9 KQogCisjIE1PWl9YMTEgYW5kIFhQX1VOSVggYXJlIHJlcXVpcmVkIGJ5IG5wYXBpLmguIFRoZWly IHZhbHVlIGlzIG5vdCBjaGVja2VkOworIyBvbmx5IHRoZWlyIGRlZmluZWRuZXNzIGlzLiBUaGV5 IHNob3VsZCBvbmx5IGJlIGRlZmluZWQgaW4gdGhlIHRydWUgY2FzZS4KK2lmICgke0VOQUJMRV9Y MTFfVEFSR0VUfSkKKyAgICBTRVRfQU5EX0VYUE9TRV9UT19CVUlMRChNT1pfWDExIDEpCitlbmRp ZiAoKQoraWYgKCR7V1RGX09TX1VOSVh9KQorICAgIFNFVF9BTkRfRVhQT1NFX1RPX0JVSUxEKFhQ X1VOSVggMSkKK2VuZGlmICgpCisKIHNldChVU0VfVURJUzg2IE9OKQogc2V0KEVOQUJMRV9XRUJL SVQgT0ZGKQogc2V0KEVOQUJMRV9XRUJLSVQyIE9OKQpkaWZmIC0tZ2l0IGEvQ2hhbmdlTG9nIGIv Q2hhbmdlTG9nCmluZGV4IDQ2ODUwY2JlMzhjN2Y1NDg3ZGNlYzRlN2IyZjVmZDAxYjYyYzM0NDYu LmYzNWM5MmNkZDdkZTIwMWYyMWQwMmEzMDg0MGY3NDY1NTgxNTJiNmUgMTAwNjQ0Ci0tLSBhL0No YW5nZUxvZworKysgYi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxNS0wNS0xMCAgUGhp bGlwIENoaW1lbnRvICA8cGhpbGlwLmNoaW1lbnRvQGdtYWlsLmNvbT4KKworICAgICAgICBbQ01h a2VdIFNvbWUgbWFjcm9zIG5lZWQgdG8gYmUgZGVmaW5lZC91bmRlZmluZWQsIHJhdGhlciB0aGFu IE9OL09GRgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTQ0ODQ1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBTb3VyY2UvY21ha2UvT3B0aW9uc0dUSy5jbWFrZTogT25seSBkZWZpbmUgTU9aX1gxMSBhbmQg WFBfVU5JWAorICAgICAgICBpZiB0aGVpciBjb3JyZXNwb25kaW5nIFdURiBvcHRpb25zIGFyZSBP Ti4gVGhlIGNvZGUgaW4gbnBhcGkuaAorICAgICAgICByZWxpZXMgb24gdGhlc2UgYmVpbmcgdW5k ZWZpbmVkIGlmIHRoZXkgYXJlIHRvIGJlIHN3aXRjaGVkIG9mZi4KKwogMjAxNS0wNS0wOSAgWW9h diBXZWlzcyAgPHlvYXZAeW9hdi53cz4KIAogICAgICAgICBSZW1vdmUgdGhlIFBJQ1RVUkVfU0la RVMgYnVpbGQgZmxhZwo=