49500 2010-11-13 15:28:00 -0800 Buildfix for !ENABLE(INSPECTOR) 2010-11-15 08:55:24 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 paroga paroga commit-queue joepeck ossy pfeldman simon.fraser skyul webkittenghui oldest_to_newest 309014 0 paroga 2010-11-13 15:28:00 -0800 see patch 309015 1 73833 paroga 2010-11-13 15:36:34 -0800 Created attachment 73833 Patch 309023 2 skyul 2010-11-13 16:09:50 -0800 *** Bug 49229 has been marked as a duplicate of this bug. *** 309051 3 73833 yurys 2010-11-13 23:37:16 -0800 Comment on attachment 73833 Patch Thanks for fixing this. The problem must have appeared after http://trac.webkit.org/changeset/71515 where I reasoned that ENABLED(INSPECTOR) guards can be removed from the ConsoleMessage.cpp because the latter is only used by the inspector code itself. I confined my check to compilation of --minimal build which is usually enough to see if there are any issues related to ENABLED(INSPECTOR) macro. 309052 4 73833 commit-queue 2010-11-13 23:57:04 -0800 Comment on attachment 73833 Patch Clearing flags on attachment: 73833 Committed r71981: <http://trac.webkit.org/changeset/71981> 309053 5 commit-queue 2010-11-13 23:57:09 -0800 All reviewed patches have been landed. Closing bug. 309055 6 ossy 2010-11-14 02:18:04 -0800 (In reply to comment #3) > (From update of attachment 73833 [details]) > Thanks for fixing this. The problem must have appeared after http://trac.webkit.org/changeset/71515 where I reasoned that ENABLED(INSPECTOR) guards can be removed from the ConsoleMessage.cpp because the latter is only used by the inspector code itself. I confined my check to compilation of --minimal build which is usually enough to see if there are any issues related to ENABLED(INSPECTOR) macro. --minimal option disables features defined in @features in build-webkit script, but INSPECTOR isn't in it. Do we need to it to the build systems? I checked ENABLE_INSPECTOR guards and only PLATFORM(IOS) (in Platform.h) and PLATFORM(ANDROID) (in WebCore/config.h) disable it. To add/remove a feature is so complex task, because all build system have its own default value for all features. And there are platform specific default values in build-webkit script, Platform.h, JavascriptCore/config.h and WebCore/config.h . See http://trac.webkit.org/changeset/71754 for details and https://bugs.webkit.org/show_bug.cgi?id=48755 why is so complex to modify MSVC build files. 309088 7 kling 2010-11-14 11:02:37 -0800 *** Bug 49462 has been marked as a duplicate of this bug. *** 309294 8 joepeck 2010-11-15 08:42:49 -0800 Its a little weird having just the implementation of ScriptCallStack::buildInspectorObject being ifdef'd out, but not the signature in the .h. I think the entire file could have been guarded, but this works fine. Thanks for fixing this. 309295 9 paroga 2010-11-15 08:48:09 -0800 (In reply to comment #8) > Its a little weird having just the implementation of ScriptCallStack::buildInspectorObject being ifdef'd out, but not the signature in the .h. bug 49229#c2 says: > The approach so far has been to flag the dependencies only in the body so that the flag does not bleed over. I'd like to continue this approach. > I think the entire file could have been guarded, but this works fine. You can't ifdef the whole Script*.h files, because there are dependencies in Console.cpp. 309299 10 joepeck 2010-11-15 08:55:24 -0800 Good to know. Thanks! 73833 2010-11-13 15:36:34 -0800 2010-11-13 23:57:04 -0800 Patch bug-49500.patch text/plain 3741 paroga ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MDg3ZWNiZS4uM2Q5Nzk5OCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMC0xMS0xMyAgUGF0cmljayBHYW5z dGVyZXIgIDxwYXJvZ2FAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBCdWlsZGZpeCBmb3IgIUVOQUJMRShJTlNQRUNUT1IpCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00OTUwMAorCisgICAg ICAgIEFsc28gdW5pZnkgdGhlIHBvc2l0aW9uIG9mIHRoZSBjb25kaXRpb24gaW4gdGhlIGNwcCBm aWxlcy4KKworICAgICAgICAqIGluc3BlY3Rvci9Db25zb2xlTWVzc2FnZS5jcHA6CisgICAgICAg ICogaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQuY3BwOgorICAgICAgICAqIGluc3Bl Y3Rvci9JbnNwZWN0b3JTdGF0ZS5jcHA6CisgICAgICAgICogaW5zcGVjdG9yL1NjcmlwdENhbGxG cmFtZS5jcHA6CisgICAgICAgICogaW5zcGVjdG9yL1NjcmlwdENhbGxTdGFjay5jcHA6CisKIDIw MTAtMTEtMTMgIEFuZHJleSBLb3N5YWtvdiAgPGNhc2VxQGNocm9taXVtLm9yZz4KIAogICAgICAg ICBSZXZpZXdlZCBieSBQYXZlbCBGZWxkbWFuLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0 b3IvQ29uc29sZU1lc3NhZ2UuY3BwIGIvV2ViQ29yZS9pbnNwZWN0b3IvQ29uc29sZU1lc3NhZ2Uu Y3BwCmluZGV4IDAzMjgzYmYuLmE1ZTllYzYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9y L0NvbnNvbGVNZXNzYWdlLmNwcAorKysgYi9XZWJDb3JlL2luc3BlY3Rvci9Db25zb2xlTWVzc2Fn ZS5jcHAKQEAgLTMxLDYgKzMxLDggQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJD b25zb2xlTWVzc2FnZS5oIgogCisjaWYgRU5BQkxFKElOU1BFQ1RPUikKKwogI2luY2x1ZGUgIklu amVjdGVkU2NyaXB0LmgiCiAjaW5jbHVkZSAiSW5qZWN0ZWRTY3JpcHRIb3N0LmgiCiAjaW5jbHVk ZSAiSW5zcGVjdG9yRnJvbnRlbmQuaCIKQEAgLTEzNCwzICsxMzYsNSBAQCBib29sIENvbnNvbGVN ZXNzYWdlOjppc0VxdWFsKENvbnNvbGVNZXNzYWdlKiBtc2cpIGNvbnN0CiB9CiAKIH0gLy8gbmFt ZXNwYWNlIFdlYkNvcmUKKworI2VuZGlmIC8vIEVOQUJMRShJTlNQRUNUT1IpCmRpZmYgLS1naXQg YS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZUFnZW50LmNwcCBiL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQuY3BwCmluZGV4IDBlZDZjYmEuLmZjZGVi YmMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQu Y3BwCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQuY3BwCkBA IC0zMSw2ICszMSw4IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiSW5zcGVjdG9y UmVzb3VyY2VBZ2VudC5oIgogCisjaWYgRU5BQkxFKElOU1BFQ1RPUikKKwogI2luY2x1ZGUgIkJh c2U2NC5oIgogI2luY2x1ZGUgIk1lbW9yeUNhY2hlLmgiCiAjaW5jbHVkZSAiQ2FjaGVkUmVzb3Vy Y2UuaCIKQEAgLTYwLDggKzYyLDYgQEAKICNpbmNsdWRlIDx3dGYvUmVmUHRyLmg+CiAjaW5jbHVk ZSA8d3RmL3RleHQvU3RyaW5nQnVmZmVyLmg+CiAKLSNpZiBFTkFCTEUoSU5TUEVDVE9SKQotCiBu YW1lc3BhY2UgV2ViQ29yZSB7CiAKIGJvb2wgSW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6cmVzb3Vy Y2VDb250ZW50KEZyYW1lKiBmcmFtZSwgY29uc3QgS1VSTCYgdXJsLCBTdHJpbmcqIHJlc3VsdCkK ZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclN0YXRlLmNwcCBiL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3RvclN0YXRlLmNwcAppbmRleCBkZjkzOWJhLi5hYjkwMGU3IDEw MDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JTdGF0ZS5jcHAKKysrIGIvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yU3RhdGUuY3BwCkBAIC0yOSwxMSArMjksMTEgQEAKICNp bmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJJbnNwZWN0b3JTdGF0ZS5oIgogCisjaWYgRU5B QkxFKElOU1BFQ1RPUikKKwogI2luY2x1ZGUgIkluc3BlY3RvckNsaWVudC5oIgogI2luY2x1ZGUg Ikluc3BlY3RvckNvbnRyb2xsZXIuaCIKIAotI2lmIEVOQUJMRShJTlNQRUNUT1IpCi0KIG5hbWVz cGFjZSBXZWJDb3JlIHsKIAogSW5zcGVjdG9yU3RhdGU6Okluc3BlY3RvclN0YXRlKEluc3BlY3Rv ckNsaWVudCogY2xpZW50KQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvU2NyaXB0Q2Fs bEZyYW1lLmNwcCBiL1dlYkNvcmUvaW5zcGVjdG9yL1NjcmlwdENhbGxGcmFtZS5jcHAKaW5kZXgg NTQ1NWQyNS4uYzRkYWIzYyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvU2NyaXB0Q2Fs bEZyYW1lLmNwcAorKysgYi9XZWJDb3JlL2luc3BlY3Rvci9TY3JpcHRDYWxsRnJhbWUuY3BwCkBA IC01NCw2ICs1NCw3IEBAIGJvb2wgU2NyaXB0Q2FsbEZyYW1lOjppc0VxdWFsKGNvbnN0IFNjcmlw dENhbGxGcmFtZSYgbykgY29uc3QKICAgICAgICAgJiYgbV9saW5lTnVtYmVyID09IG8ubV9saW5l TnVtYmVyOwogfQogCisjaWYgRU5BQkxFKElOU1BFQ1RPUikKIFBhc3NSZWZQdHI8SW5zcGVjdG9y T2JqZWN0PiBTY3JpcHRDYWxsRnJhbWU6OmJ1aWxkSW5zcGVjdG9yT2JqZWN0KCkgY29uc3QKIHsK ICAgICBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBmcmFtZSA9IEluc3BlY3Rvck9iamVjdDo6Y3Jl YXRlKCk7CkBAIC02Miw1ICs2Myw2IEBAIFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBTY3Jp cHRDYWxsRnJhbWU6OmJ1aWxkSW5zcGVjdG9yT2JqZWN0KCkgY29uc3QKICAgICBmcmFtZS0+c2V0 TnVtYmVyKCJsaW5lTnVtYmVyIiwgbV9saW5lTnVtYmVyKTsKICAgICByZXR1cm4gZnJhbWU7CiB9 CisjZW5kaWYKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9p bnNwZWN0b3IvU2NyaXB0Q2FsbFN0YWNrLmNwcCBiL1dlYkNvcmUvaW5zcGVjdG9yL1NjcmlwdENh bGxTdGFjay5jcHAKaW5kZXggOGQwMTBiYi4uMzFlYzFjMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9p bnNwZWN0b3IvU2NyaXB0Q2FsbFN0YWNrLmNwcAorKysgYi9XZWJDb3JlL2luc3BlY3Rvci9TY3Jp cHRDYWxsU3RhY2suY3BwCkBAIC03Miw2ICs3Miw3IEBAIGJvb2wgU2NyaXB0Q2FsbFN0YWNrOjpp c0VxdWFsKFNjcmlwdENhbGxTdGFjayogbykgY29uc3QKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAor I2lmIEVOQUJMRShJTlNQRUNUT1IpCiBQYXNzUmVmUHRyPEluc3BlY3RvckFycmF5PiBTY3JpcHRD YWxsU3RhY2s6OmJ1aWxkSW5zcGVjdG9yT2JqZWN0KCkgY29uc3QKIHsKICAgICBSZWZQdHI8SW5z cGVjdG9yQXJyYXk+IGZyYW1lcyA9IEluc3BlY3RvckFycmF5OjpjcmVhdGUoKTsKQEAgLTc5LDUg KzgwLDYgQEAgUGFzc1JlZlB0cjxJbnNwZWN0b3JBcnJheT4gU2NyaXB0Q2FsbFN0YWNrOjpidWls ZEluc3BlY3Rvck9iamVjdCgpIGNvbnN0CiAgICAgICAgIGZyYW1lcy0+cHVzaE9iamVjdChtX2Zy YW1lcy5hdChpKS5idWlsZEluc3BlY3Rvck9iamVjdCgpKTsKICAgICByZXR1cm4gZnJhbWVzOwog fQorI2VuZGlmCiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK