82371 2012-03-27 12:49:29 -0700 WebKit fails to load a staged framework when soft linking 2012-03-28 23:54:21 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 timothy timothy ap bweinstein joepeck mitz mrowe timothy webkit.review.bot oldest_to_newest 589168 0 timothy 2012-03-27 12:49:29 -0700 The Web Inspector framework is failing to load when the framework does not exist at the system install path. 589181 1 timothy 2012-03-27 12:58:02 -0700 <rdar://problem/11125989> 589182 2 134118 timothy 2012-03-27 13:00:53 -0700 Created attachment 134118 Proposed Change 589188 3 webkit.review.bot 2012-03-27 13:04:29 -0700 Attachment 134118 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/WebCore/platform/mac/SoftLinking.h:58: Missing space before { [whitespace/braces] [5] Total errors found: 1 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style. 589231 4 134118 webkit.review.bot 2012-03-27 13:44:36 -0700 Comment on attachment 134118 Proposed Change Clearing flags on attachment: 134118 Committed r112312: <http://trac.webkit.org/changeset/112312> 589233 5 webkit.review.bot 2012-03-27 13:44:40 -0700 All reviewed patches have been landed. Closing bug. 590881 6 134118 ap 2012-03-28 23:43:23 -0700 Comment on attachment 134118 Proposed Change View in context: https://bugs.webkit.org/attachment.cgi?id=134118&action=review Is it correct to try unstaged location first, and then staged location? It seems like it should be the opposite order. > Source/WebCore/platform/mac/SoftLinking.h:55 > -#define SOFT_LINK_PRIVATE_FRAMEWORK_OPTIONAL(framework) \ > +#define SOFT_LINK_STAGED_FRAMEWORK_OPTIONAL(framework, unstagedLocation) \ The new name doesn't appear to correctly describe the behavior - the macro loads either installed or staged framework. Also, shouldn't all soft link macros support staged frameworks, making the clarification redundant? 590886 7 mrowe 2012-03-28 23:54:21 -0700 (In reply to comment #6) > (From update of attachment 134118 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=134118&action=review > > Is it correct to try unstaged location first, and then staged location? It seems like it should be the opposite order. It's counter-intuitive, but looking in the normal location first is the right behavior as dlopen will still respect any dyld environment variables that influence the search path. > > Source/WebCore/platform/mac/SoftLinking.h:55 > > -#define SOFT_LINK_PRIVATE_FRAMEWORK_OPTIONAL(framework) \ > > +#define SOFT_LINK_STAGED_FRAMEWORK_OPTIONAL(framework, unstagedLocation) \ > > The new name doesn't appear to correctly describe the behavior - the macro loads either installed or staged framework. > > Also, shouldn't all soft link macros support staged frameworks, making the clarification redundant? Given the limited application of staged frameworks there wouldn't be much benefit to doing this. 134118 2012-03-27 13:00:53 -0700 2012-03-28 23:43:22 -0700 Proposed Change 0001-Make-WebKit-properly-load-a-staged-framework-when-so.patch text/plain 6090 timothy RnJvbSAwNWEzNzFjNTRiNzNkOWU4ZDczNzU1NWE2N2JiMGQ0MjdkYTFhZmJkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUaW1vdGh5IEhhdGNoZXIgPHRpbW90aHlAYXBwbGUuY29tPgpE YXRlOiBUdWUsIDI3IE1hciAyMDEyIDEyOjU2OjQ1IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gTWFr ZSBXZWJLaXQgcHJvcGVybHkgbG9hZCBhIHN0YWdlZCBmcmFtZXdvcmsgd2hlbiBzb2Z0CiBsaW5r aW5nLgoKaHR0cHM6Ly93ZWJraXQub3JnL2IvODIzNzEKcmRhcjovL3Byb2JsZW0vMTExMjU5ODkK ClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKU291cmNlL1dlYkNvcmU6CgoqIHBsYXRmb3Jt L21hYy9Tb2Z0TGlua2luZy5oOiBSZXBsYWNlZCBTT0ZUX0xJTktfUFJJVkFURV9GUkFNRVdPUktf T1BUSU9OQUwgd2l0aApTT0ZUX0xJTktfU1RBR0VEX0ZSQU1FV09SS19PUFRJT05BTCBhbmQgbWFk ZSBpdCB1c2UgdGhlIFN0YWdlZEZyYW1ld29ya3MgcGF0aAppZiB0aGUgZmlyc3QgZGxvcGVuIGZh aWxlZC4KClNvdXJjZS9XZWJLaXQvbWFjOgoKKiBXZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JD bGllbnQubW06IFVzZSBTT0ZUX0xJTktfU1RBR0VEX0ZSQU1FV09SS19PUFRJT05BTCB0byBwcm9w ZXJseQpsb2FkIHRoZSBXZWJJbnNwZWN0b3IgZnJhbWV3b3JrLgoKU291cmNlL1dlYktpdDI6Cgoq IFVJUHJvY2Vzcy9tYWMvV2ViSW5zcGVjdG9yUHJveHlNYWMubW06IFVzZSBTT0ZUX0xJTktfU1RB R0VEX0ZSQU1FV09SS19PUFRJT05BTCB0byBwcm9wZXJseQpsb2FkIHRoZSBXZWJJbnNwZWN0b3Ig ZnJhbWV3b3JrLgoqIFdlYlByb2Nlc3MvV2ViUGFnZS9tYWMvV2ViSW5zcGVjdG9yTWFjLm1tOiBE aXR0by4KLS0tCiBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAg ICAgICB8ICAgMTMgKysrKysrKysrKysrKwogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Nv ZnRMaW5raW5nLmggICAgICAgICAgfCAgICA5ICsrKysrKystLQogU291cmNlL1dlYktpdC9tYWMv Q2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDEyICsrKysrKysrKysrKwogLi4u L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGllbnQubW0gICAgICAgfCAgICAyICst CiBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAg MTMgKysrKysrKysrKysrKwogLi4uL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJJbnNwZWN0b3JQ cm94eU1hYy5tbSAgfCAgICAyICstCiAuLi4vV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9XZWJJbnNw ZWN0b3JNYWMubW0gICAgICB8ICAgIDIgKy0KIDcgZmlsZXMgY2hhbmdlZCwgNDggaW5zZXJ0aW9u cygrKSwgNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VM b2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDkxOTdiNC4uNjdkMWUxMCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEyLTAzLTI3ICBUaW1vdGh5IEhhdGNoZXIgIDx0 aW1vdGh5QGFwcGxlLmNvbT4KKworICAgICAgICBNYWtlIFdlYktpdCBwcm9wZXJseSBsb2FkIGEg c3RhZ2VkIGZyYW1ld29yayB3aGVuIHNvZnQgbGlua2luZy4KKworICAgICAgICBodHRwczovL3dl YmtpdC5vcmcvYi84MjM3MQorICAgICAgICByZGFyOi8vcHJvYmxlbS8xMTEyNTk4OQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vbWFj L1NvZnRMaW5raW5nLmg6IFJlcGxhY2VkIFNPRlRfTElOS19QUklWQVRFX0ZSQU1FV09SS19PUFRJ T05BTCB3aXRoCisgICAgICAgIFNPRlRfTElOS19TVEFHRURfRlJBTUVXT1JLX09QVElPTkFMIGFu ZCBtYWRlIGl0IHVzZSB0aGUgU3RhZ2VkRnJhbWV3b3JrcyBwYXRoCisgICAgICAgIGlmIHRoZSBm aXJzdCBkbG9wZW4gZmFpbGVkLgorCiAyMDEyLTAzLTIxICBCZXRoIERha2luICA8YmRha2luQGFw cGxlLmNvbT4KIAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9ODAzMjIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9Tb2Z0TGlu a2luZy5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1NvZnRMaW5raW5nLmgKaW5kZXgg ZTYxYmI3YS4uZTYzN2Y1YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFj L1NvZnRMaW5raW5nLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1NvZnRMaW5r aW5nLmgKQEAgLTUyLDEwICs1MiwxNSBAQAogICAgICAgICByZXR1cm4gZnJhbWV3b3JrTGlicmFy eTsgXAogICAgIH0KIAotI2RlZmluZSBTT0ZUX0xJTktfUFJJVkFURV9GUkFNRVdPUktfT1BUSU9O QUwoZnJhbWV3b3JrKSBcCisjZGVmaW5lIFNPRlRfTElOS19TVEFHRURfRlJBTUVXT1JLX09QVElP TkFMKGZyYW1ld29yaywgdW5zdGFnZWRMb2NhdGlvbikgXAogICAgIHN0YXRpYyB2b2lkKiBmcmFt ZXdvcmsjI0xpYnJhcnkoKSBcCiAgICAgeyBcCi0gICAgICAgIHN0YXRpYyB2b2lkKiBmcmFtZXdv cmtMaWJyYXJ5ID0gZGxvcGVuKCIvU3lzdGVtL0xpYnJhcnkvUHJpdmF0ZUZyYW1ld29ya3MvIiAj ZnJhbWV3b3JrICIuZnJhbWV3b3JrLyIgI2ZyYW1ld29yaywgUlRMRF9OT1cpOyBcCisgICAgICAg IHN0YXRpYyB2b2lkKiBmcmFtZXdvcmtMaWJyYXJ5ID0gXnsgXAorICAgICAgICAgICAgdm9pZCog cmVzdWx0ID0gZGxvcGVuKCIvU3lzdGVtL0xpYnJhcnkvIiAjdW5zdGFnZWRMb2NhdGlvbiAiLyIg I2ZyYW1ld29yayAiLmZyYW1ld29yay8iICNmcmFtZXdvcmssIFJUTERfTEFaWSk7IFwKKyAgICAg ICAgICAgIGlmICghcmVzdWx0KSBcCisgICAgICAgICAgICAgICAgcmVzdWx0ID0gZGxvcGVuKCIv U3lzdGVtL0xpYnJhcnkvU3RhZ2VkRnJhbWV3b3Jrcy9TYWZhcmkvIiAjZnJhbWV3b3JrICIuZnJh bWV3b3JrLyIgI2ZyYW1ld29yaywgUlRMRF9MQVpZKTsgXAorICAgICAgICAgICAgcmV0dXJuIHJl c3VsdDsgXAorICAgICAgICB9OyBcCiAgICAgICAgIHJldHVybiBmcmFtZXdvcmtMaWJyYXJ5OyBc CiAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cgYi9Tb3Vy Y2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKaW5kZXggN2I3NDEzOC4uZmVjYjIxNCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0No YW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTAzLTI3ICBUaW1vdGh5IEhhdGNoZXIgIDx0 aW1vdGh5QGFwcGxlLmNvbT4KKworICAgICAgICBNYWtlIFdlYktpdCBwcm9wZXJseSBsb2FkIGEg c3RhZ2VkIGZyYW1ld29yayB3aGVuIHNvZnQgbGlua2luZy4KKworICAgICAgICBodHRwczovL3dl YmtpdC5vcmcvYi84MjM3MQorICAgICAgICByZGFyOi8vcHJvYmxlbS8xMTEyNTk4OQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViQ29yZVN1cHBv cnQvV2ViSW5zcGVjdG9yQ2xpZW50Lm1tOiBVc2UgU09GVF9MSU5LX1NUQUdFRF9GUkFNRVdPUktf T1BUSU9OQUwgdG8gcHJvcGVybHkKKyAgICAgICAgbG9hZCB0aGUgV2ViSW5zcGVjdG9yIGZyYW1l d29yay4KKwogMjAxMi0wMy0yMSAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNv bT4KIAogICAgICAgICBNYWtlIHVzZSBvZiBDRyByb3VuZGVkLXJlY3QgcHJpbWl0aXZlcwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xp ZW50Lm1tIGIvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xp ZW50Lm1tCmluZGV4IGIyODhmOWYuLmM3ZjNmNGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv bWFjL1dlYkNvcmVTdXBwb3J0L1dlYkluc3BlY3RvckNsaWVudC5tbQorKysgYi9Tb3VyY2UvV2Vi S2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGllbnQubW0KQEAgLTQ2LDcgKzQ2 LDcgQEAKICNpbXBvcnQgPFdlYktpdFN5c3RlbUludGVyZmFjZS5oPgogI2ltcG9ydCA8d3RmL1Bh c3NPd25QdHIuaD4KIAotU09GVF9MSU5LX1BSSVZBVEVfRlJBTUVXT1JLX09QVElPTkFMKFdlYklu c3BlY3RvcikKK1NPRlRfTElOS19TVEFHRURfRlJBTUVXT1JLX09QVElPTkFMKFdlYkluc3BlY3Rv ciwgUHJpdmF0ZUZyYW1ld29ya3MpCiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VM b2cKaW5kZXggYThjOGIzZi4uNGRhZTk4NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hh bmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisy MDEyLTAzLTI3ICBUaW1vdGh5IEhhdGNoZXIgIDx0aW1vdGh5QGFwcGxlLmNvbT4KKworICAgICAg ICBNYWtlIFdlYktpdCBwcm9wZXJseSBsb2FkIGEgc3RhZ2VkIGZyYW1ld29yayB3aGVuIHNvZnQg bGlua2luZy4KKworICAgICAgICBodHRwczovL3dlYmtpdC5vcmcvYi84MjM3MQorICAgICAgICBy ZGFyOi8vcHJvYmxlbS8xMTEyNTk4OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL21hYy9XZWJJbnNwZWN0b3JQcm94eU1hYy5tbTog VXNlIFNPRlRfTElOS19TVEFHRURfRlJBTUVXT1JLX09QVElPTkFMIHRvIHByb3Blcmx5CisgICAg ICAgIGxvYWQgdGhlIFdlYkluc3BlY3RvciBmcmFtZXdvcmsuCisgICAgICAgICogV2ViUHJvY2Vz cy9XZWJQYWdlL21hYy9XZWJJbnNwZWN0b3JNYWMubW06IERpdHRvLgorCiAyMDEyLTAzLTIxICBU aW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAgICAgICAgIE1ha2UgdXNl IG9mIENHIHJvdW5kZWQtcmVjdCBwcmltaXRpdmVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvbWFjL1dlYkluc3BlY3RvclByb3h5TWFjLm1tIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL21hYy9XZWJJbnNwZWN0b3JQcm94eU1hYy5tbQppbmRleCAyNTk3ODRjLi42NzEx ZGUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYkluc3BlY3Rv clByb3h5TWFjLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2ViSW5zcGVj dG9yUHJveHlNYWMubW0KQEAgLTQyLDcgKzQyLDcgQEAKICNpbXBvcnQgPFdlYkNvcmUvU29mdExp bmtpbmcuaD4KICNpbXBvcnQgPHd0Zi90ZXh0L1dURlN0cmluZy5oPgogCi1TT0ZUX0xJTktfUFJJ VkFURV9GUkFNRVdPUktfT1BUSU9OQUwoV2ViSW5zcGVjdG9yKQorU09GVF9MSU5LX1NUQUdFRF9G UkFNRVdPUktfT1BUSU9OQUwoV2ViSW5zcGVjdG9yLCBQcml2YXRlRnJhbWV3b3JrcykKIAogdXNp bmcgbmFtZXNwYWNlIFdlYkNvcmU7CiB1c2luZyBuYW1lc3BhY2UgV2ViS2l0OwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9XZWJJbnNwZWN0b3JNYWMu bW0gYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1dlYkluc3BlY3Rvck1h Yy5tbQppbmRleCA1YTZhYzRlLi5lYWJhZGJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1dlYkluc3BlY3Rvck1hYy5tbQorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1dlYkluc3BlY3Rvck1hYy5tbQpAQCAtMjgsNyAr MjgsNyBAQAogCiAjaW1wb3J0IDxXZWJDb3JlL1NvZnRMaW5raW5nLmg+CiAKLVNPRlRfTElOS19Q UklWQVRFX0ZSQU1FV09SS19PUFRJT05BTChXZWJJbnNwZWN0b3IpCitTT0ZUX0xJTktfU1RBR0VE X0ZSQU1FV09SS19PUFRJT05BTChXZWJJbnNwZWN0b3IsIFByaXZhdGVGcmFtZXdvcmtzKQogCiBu YW1lc3BhY2UgV2ViS2l0IHsKIAotLSAKMS43LjcuNSAoQXBwbGUgR2l0LTI2KQoK