144884 2015-05-11 15:23:44 -0700 Simplify shim path computation 2015-05-11 18:11:19 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1093908 0 andersca 2015-05-11 15:23:44 -0700 Simplify shim path computation 1093909 1 252896 andersca 2015-05-11 15:25:51 -0700 Created attachment 252896 Patch 1093911 2 andersca 2015-05-11 15:33:03 -0700 Committed r184125: <http://trac.webkit.org/changeset/184125> 1093985 3 252896 darin 2015-05-11 18:11:19 -0700 Comment on attachment 252896 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=252896&action=review > Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm:97 > +static RetainPtr<NSString> computeProcessShimPath(const ProcessLauncher::LaunchOptions& launchOptions, NSBundle *webKitBundle) Why to just NSString * for the return value? Seems like all the code paths return something autoreleased. 252896 2015-05-11 15:25:51 -0700 2015-05-11 15:28:24 -0700 Patch bug-144884-20150511152430.patch text/plain 6630 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTg0MTIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZjRkYTJkNWQyMGMxMjY5 YmQzYmYwMTU4MzUzZGZjM2ZhZDIwMDY0MC4uZWJlNGE4YzMxOTllOTIyZTA2ZGUxODQxYjYyYmNh NzMxZmY4MjlmZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE1LTA1LTExICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgU2ltcGxpZnkgc2hp bSBwYXRoIGNvbXB1dGF0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNDQ4ODQKKyAgICAgICAgUGFydCBvZiByZGFyOi8vcHJvYmxlbS8xOTcwODU3 OS4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGYWN0 b3IgdGhlIGNvZGUgdGhhdCBjb21wdXRlcyB0aGUgc2hpbSBwYXRoIG91dCBpbnRvIGEgc2VwYXJh dGUgZnVuY3Rpb24uIEFsc28gbWFrZSB0aGlzIG1hYyBvbmx5CisgICAgICAgIHNpbmNlIHdlIGRv bid0IGhhdmUgYW55IHNoaW1zIG9uIGlPUy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9MYXVuY2hl ci9tYWMvUHJvY2Vzc0xhdW5jaGVyTWFjLm1tOgorICAgICAgICAoV2ViS2l0Ojpjb21wdXRlUHJv Y2Vzc1NoaW1QYXRoKToKKyAgICAgICAgKFdlYktpdDo6YWRkRFlMREVudmlyb25tZW50QWRkaXRp b25zKToKKwogMjAxNS0wNS0xMSAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUu Y29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQgYnVpbGQgZml4CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvTGF1bmNoZXIvbWFjL1Byb2Nlc3NMYXVuY2hlck1hYy5tbSBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9MYXVuY2hlci9tYWMvUHJvY2Vzc0xhdW5jaGVyTWFjLm1t CmluZGV4IGQ4ZTA1NjY0ZjNlODFmMWM0NmIyNzQxZTYwNjhjMjBlNzgyMGQ0MTkuLmFjZTk1YzUz MzdkMjBiMjc4N2ZmNjA5NDJjNDYwZGJjMWU5OWE5OWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9MYXVuY2hlci9tYWMvUHJvY2Vzc0xhdW5jaGVyTWFjLm1tCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9MYXVuY2hlci9tYWMvUHJvY2Vzc0xhdW5jaGVyTWFjLm1t CkBAIC05Myw0NCArOTMsNTIgQEAgc3RhdGljIGNvbnN0IGNoYXIqIGNvcHlBU2FuRHluYW1pY0xp YnJhcnlQYXRoKCkKIH0KICNlbmRpZgogCi1zdGF0aWMgdm9pZCBhZGREWUxERW52aXJvbm1lbnRB ZGRpdGlvbnMoY29uc3QgUHJvY2Vzc0xhdW5jaGVyOjpMYXVuY2hPcHRpb25zJiBsYXVuY2hPcHRp b25zLCBib29sIGlzV2ViS2l0RGV2ZWxvcG1lbnRCdWlsZCwgRW52aXJvbm1lbnRWYXJpYWJsZXMm IGVudmlyb25tZW50VmFyaWFibGVzKQorI2lmIFBMQVRGT1JNKE1BQykKK3N0YXRpYyBSZXRhaW5Q dHI8TlNTdHJpbmc+IGNvbXB1dGVQcm9jZXNzU2hpbVBhdGgoY29uc3QgUHJvY2Vzc0xhdW5jaGVy OjpMYXVuY2hPcHRpb25zJiBsYXVuY2hPcHRpb25zLCBOU0J1bmRsZSAqd2ViS2l0QnVuZGxlKQog ewotICAgIER5bmFtaWNMaW5rZXJFbnZpcm9ubWVudEV4dHJhY3RvciBlbnZpcm9ubWVudEV4dHJh Y3RvcihbW05TQnVuZGxlIG1haW5CdW5kbGVdIGV4ZWN1dGFibGVQYXRoXSwgX05TR2V0TWFjaEV4 ZWN1dGVIZWFkZXIoKS0+Y3B1dHlwZSk7Ci0gICAgZW52aXJvbm1lbnRFeHRyYWN0b3IuZ2V0RXh0 cmFjdGVkRW52aXJvbm1lbnRWYXJpYWJsZXMoZW52aXJvbm1lbnRWYXJpYWJsZXMpOwotCi0gICAg TlNCdW5kbGUgKndlYktpdEJ1bmRsZSA9IFtOU0J1bmRsZSBidW5kbGVXaXRoSWRlbnRpZmllcjpA ImNvbS5hcHBsZS5XZWJLaXQiXTsKLSAgICBOU1N0cmluZyAqZnJhbWV3b3Jrc1BhdGggPSBbW3dl YktpdEJ1bmRsZSBidW5kbGVQYXRoXSBzdHJpbmdCeURlbGV0aW5nTGFzdFBhdGhDb21wb25lbnRd OwotCi0gICAgLy8gVG8gbWFrZSBlbmdpbmVlcmluZyBidWlsZHMgd29yaywgaWYgdGhlIHBhdGgg aXMgb3V0c2lkZSBvZiAvU3lzdGVtIHNldCB1cAotICAgIC8vIERZTERfRlJBTUVXT1JLX1BBVEgg dG8gcGljayB1cCBvdGhlciBmcmFtZXdvcmtzLCBidXQgZG9uJ3QgZG8gaXQgZm9yIHRoZQotICAg IC8vIHByb2R1Y3Rpb24gY29uZmlndXJhdGlvbiBiZWNhdXNlIGl0IGludm9sdmVzIGV4dHJhIGZp bGUgc3lzdGVtIGFjY2Vzcy4KLSAgICBpZiAoaXNXZWJLaXREZXZlbG9wbWVudEJ1aWxkKQotICAg ICAgICBlbnZpcm9ubWVudFZhcmlhYmxlcy5hcHBlbmRWYWx1ZSgiRFlMRF9GUkFNRVdPUktfUEFU SCIsIFtmcmFtZXdvcmtzUGF0aCBmaWxlU3lzdGVtUmVwcmVzZW50YXRpb25dLCAnOicpOwotCi0g ICAgTlNTdHJpbmcgKnByb2Nlc3NTaGltUGF0aE5TU3RyaW5nID0gbmlsOwogI2lmIEVOQUJMRShO RVRTQ0FQRV9QTFVHSU5fQVBJKQogICAgIGlmIChsYXVuY2hPcHRpb25zLnByb2Nlc3NUeXBlID09 IFByb2Nlc3NMYXVuY2hlcjo6UGx1Z2luUHJvY2VzcykgewogICAgICAgICBOU1N0cmluZyAqcHJv Y2Vzc1BhdGggPSBbd2ViS2l0QnVuZGxlIHBhdGhGb3JBdXhpbGlhcnlFeGVjdXRhYmxlOkAiUGx1 Z2luUHJvY2Vzcy5hcHAiXTsKICAgICAgICAgTlNTdHJpbmcgKnByb2Nlc3NBcHBFeGVjdXRhYmxl UGF0aCA9IFtbTlNCdW5kbGUgYnVuZGxlV2l0aFBhdGg6cHJvY2Vzc1BhdGhdIGV4ZWN1dGFibGVQ YXRoXTsKIAotICAgICAgICBwcm9jZXNzU2hpbVBhdGhOU1N0cmluZyA9IFtbcHJvY2Vzc0FwcEV4 ZWN1dGFibGVQYXRoIHN0cmluZ0J5RGVsZXRpbmdMYXN0UGF0aENvbXBvbmVudF0gc3RyaW5nQnlB cHBlbmRpbmdQYXRoQ29tcG9uZW50OkAiUGx1Z2luUHJvY2Vzc1NoaW0uZHlsaWIiXTsKLSAgICB9 IGVsc2UKLSNlbmRpZiAvLyBFTkFCTEUoTkVUU0NBUEVfUExVR0lOX0FQSSkKKyAgICAgICAgcmV0 dXJuIFtbcHJvY2Vzc0FwcEV4ZWN1dGFibGVQYXRoIHN0cmluZ0J5RGVsZXRpbmdMYXN0UGF0aENv bXBvbmVudF0gc3RyaW5nQnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50OkAiUGx1Z2luUHJvY2Vzc1No aW0uZHlsaWIiXTsKKyAgICB9CisjZW5kaWYKKwogI2lmIEVOQUJMRShORVRXT1JLX1BST0NFU1Mp CiAgICAgaWYgKGxhdW5jaE9wdGlvbnMucHJvY2Vzc1R5cGUgPT0gUHJvY2Vzc0xhdW5jaGVyOjpO ZXR3b3JrUHJvY2VzcykgewogICAgICAgICBOU1N0cmluZyAqcHJvY2Vzc1BhdGggPSBbd2ViS2l0 QnVuZGxlIHBhdGhGb3JBdXhpbGlhcnlFeGVjdXRhYmxlOkAiTmV0d29ya1Byb2Nlc3MuYXBwIl07 CiAgICAgICAgIE5TU3RyaW5nICpwcm9jZXNzQXBwRXhlY3V0YWJsZVBhdGggPSBbW05TQnVuZGxl IGJ1bmRsZVdpdGhQYXRoOnByb2Nlc3NQYXRoXSBleGVjdXRhYmxlUGF0aF07CiAKLSAgICAgICAg cHJvY2Vzc1NoaW1QYXRoTlNTdHJpbmcgPSBbW3Byb2Nlc3NBcHBFeGVjdXRhYmxlUGF0aCBzdHJp bmdCeURlbGV0aW5nTGFzdFBhdGhDb21wb25lbnRdIHN0cmluZ0J5QXBwZW5kaW5nUGF0aENvbXBv bmVudDpAIlNlY0l0ZW1TaGltLmR5bGliIl07Ci0gICAgfSBlbHNlCi0jZW5kaWYgLy8gRU5BQkxF KE5FVFdPUktfUFJPQ0VTUykKKyAgICAgICAgcmV0dXJuIFtbcHJvY2Vzc0FwcEV4ZWN1dGFibGVQ YXRoIHN0cmluZ0J5RGVsZXRpbmdMYXN0UGF0aENvbXBvbmVudF0gc3RyaW5nQnlBcHBlbmRpbmdQ YXRoQ29tcG9uZW50OkAiU2VjSXRlbVNoaW0uZHlsaWIiXTsKKyAgICB9CisjZW5kaWYKKwogICAg IGlmIChsYXVuY2hPcHRpb25zLnByb2Nlc3NUeXBlID09IFByb2Nlc3NMYXVuY2hlcjo6V2ViUHJv Y2VzcykgewogICAgICAgICBOU1N0cmluZyAqcHJvY2Vzc1BhdGggPSBbd2ViS2l0QnVuZGxlIHBh dGhGb3JBdXhpbGlhcnlFeGVjdXRhYmxlOkAiV2ViUHJvY2Vzcy5hcHAiXTsKICAgICAgICAgTlNT dHJpbmcgKnByb2Nlc3NBcHBFeGVjdXRhYmxlUGF0aCA9IFtbTlNCdW5kbGUgYnVuZGxlV2l0aFBh dGg6cHJvY2Vzc1BhdGhdIGV4ZWN1dGFibGVQYXRoXTsKIAotICAgICAgICBwcm9jZXNzU2hpbVBh dGhOU1N0cmluZyA9IFtbcHJvY2Vzc0FwcEV4ZWN1dGFibGVQYXRoIHN0cmluZ0J5RGVsZXRpbmdM YXN0UGF0aENvbXBvbmVudF0gc3RyaW5nQnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50OkAiV2ViUHJv Y2Vzc1NoaW0uZHlsaWIiXTsKKyAgICAgICAgcmV0dXJuIFtbcHJvY2Vzc0FwcEV4ZWN1dGFibGVQ YXRoIHN0cmluZ0J5RGVsZXRpbmdMYXN0UGF0aENvbXBvbmVudF0gc3RyaW5nQnlBcHBlbmRpbmdQ YXRoQ29tcG9uZW50OkAiV2ViUHJvY2Vzc1NoaW0uZHlsaWIiXTsKICAgICB9CiAKKyAgICByZXR1 cm4gbmlsOworfQorI2VuZGlmCisKK3N0YXRpYyB2b2lkIGFkZERZTERFbnZpcm9ubWVudEFkZGl0 aW9ucyhjb25zdCBQcm9jZXNzTGF1bmNoZXI6OkxhdW5jaE9wdGlvbnMmIGxhdW5jaE9wdGlvbnMs IGJvb2wgaXNXZWJLaXREZXZlbG9wbWVudEJ1aWxkLCBFbnZpcm9ubWVudFZhcmlhYmxlcyYgZW52 aXJvbm1lbnRWYXJpYWJsZXMpCit7CisgICAgRHluYW1pY0xpbmtlckVudmlyb25tZW50RXh0cmFj dG9yIGVudmlyb25tZW50RXh0cmFjdG9yKFtbTlNCdW5kbGUgbWFpbkJ1bmRsZV0gZXhlY3V0YWJs ZVBhdGhdLCBfTlNHZXRNYWNoRXhlY3V0ZUhlYWRlcigpLT5jcHV0eXBlKTsKKyAgICBlbnZpcm9u bWVudEV4dHJhY3Rvci5nZXRFeHRyYWN0ZWRFbnZpcm9ubWVudFZhcmlhYmxlcyhlbnZpcm9ubWVu dFZhcmlhYmxlcyk7CisKKyAgICBOU0J1bmRsZSAqd2ViS2l0QnVuZGxlID0gW05TQnVuZGxlIGJ1 bmRsZVdpdGhJZGVudGlmaWVyOkAiY29tLmFwcGxlLldlYktpdCJdOworICAgIE5TU3RyaW5nICpm cmFtZXdvcmtzUGF0aCA9IFtbd2ViS2l0QnVuZGxlIGJ1bmRsZVBhdGhdIHN0cmluZ0J5RGVsZXRp bmdMYXN0UGF0aENvbXBvbmVudF07CisKKyAgICAvLyBUbyBtYWtlIGVuZ2luZWVyaW5nIGJ1aWxk cyB3b3JrLCBpZiB0aGUgcGF0aCBpcyBvdXRzaWRlIG9mIC9TeXN0ZW0gc2V0IHVwCisgICAgLy8g RFlMRF9GUkFNRVdPUktfUEFUSCB0byBwaWNrIHVwIG90aGVyIGZyYW1ld29ya3MsIGJ1dCBkb24n dCBkbyBpdCBmb3IgdGhlCisgICAgLy8gcHJvZHVjdGlvbiBjb25maWd1cmF0aW9uIGJlY2F1c2Ug aXQgaW52b2x2ZXMgZXh0cmEgZmlsZSBzeXN0ZW0gYWNjZXNzLgorICAgIGlmIChpc1dlYktpdERl dmVsb3BtZW50QnVpbGQpCisgICAgICAgIGVudmlyb25tZW50VmFyaWFibGVzLmFwcGVuZFZhbHVl KCJEWUxEX0ZSQU1FV09SS19QQVRIIiwgW2ZyYW1ld29ya3NQYXRoIGZpbGVTeXN0ZW1SZXByZXNl bnRhdGlvbl0sICc6Jyk7CisKICNpZiBBU0FOX0VOQUJMRUQKICAgICBzdGF0aWMgY29uc3QgY2hh ciogYXNhbkxpYnJhcnlQYXRoID0gY29weUFTYW5EeW5hbWljTGlicmFyeVBhdGgoKTsKICAgICBB U1NFUlQoYXNhbkxpYnJhcnlQYXRoKTsgLy8gQVNhbiBydW50aW1lIGxpYnJhcnkgd2FzIG5vdCBm b3VuZCBpbiB0aGUgY3VycmVudCBwcm9jZXNzLiBUaGlzIGNvZGUgbWF5IG5lZWQgdG8gYmUgdXBk YXRlZCBpZiB0aGUgbGlicmFyeSBuYW1lIGhhcyBjaGFuZ2VkLgpAQCAtMTM5LDE0ICsxNDcsMTUg QEAgc3RhdGljIHZvaWQgYWRkRFlMREVudmlyb25tZW50QWRkaXRpb25zKGNvbnN0IFByb2Nlc3NM YXVuY2hlcjo6TGF1bmNoT3B0aW9ucyYgbGEKICAgICAgICAgZW52aXJvbm1lbnRWYXJpYWJsZXMu YXBwZW5kVmFsdWUoIkRZTERfSU5TRVJUX0xJQlJBUklFUyIsIGFzYW5MaWJyYXJ5UGF0aCwgJzon KTsKICNlbmRpZgogCi0gICAgLy8gTWFrZSBzdXJlIHRoYXQgdGhlIHNoaW0gbGlicmFyeSBmaWxl IGV4aXN0cyBhbmQgaW5zZXJ0IGl0LgotICAgIGlmIChwcm9jZXNzU2hpbVBhdGhOU1N0cmluZykg ewotICAgICAgICBjb25zdCBjaGFyKiBwcm9jZXNzU2hpbVBhdGggPSBbcHJvY2Vzc1NoaW1QYXRo TlNTdHJpbmcgZmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uXTsKKyNpZiBQTEFURk9STShNQUMpCisg ICAgaWYgKGF1dG8gc2hpbVBhdGggPSBjb21wdXRlUHJvY2Vzc1NoaW1QYXRoKGxhdW5jaE9wdGlv bnMsIHdlYktpdEJ1bmRsZSkpIHsKKyAgICAgICAgLy8gTWFrZSBzdXJlIHRoYXQgdGhlIHNoaW0g bGlicmFyeSBmaWxlIGV4aXN0cyBhbmQgaW5zZXJ0IGl0LgorICAgICAgICBjb25zdCBjaGFyKiBw cm9jZXNzU2hpbVBhdGggPSBbc2hpbVBhdGggZmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uXTsKICAg ICAgICAgc3RydWN0IHN0YXQgc3RhdEJ1ZjsKICAgICAgICAgaWYgKHN0YXQocHJvY2Vzc1NoaW1Q YXRoLCAmc3RhdEJ1ZikgPT0gMCAmJiAoc3RhdEJ1Zi5zdF9tb2RlICYgU19JRk1UKSA9PSBTX0lG UkVHKQogICAgICAgICAgICAgZW52aXJvbm1lbnRWYXJpYWJsZXMuYXBwZW5kVmFsdWUoIkRZTERf SU5TRVJUX0xJQlJBUklFUyIsIHByb2Nlc3NTaGltUGF0aCwgJzonKTsKICAgICB9Ci0KKyNlbmRp ZgogfQogCiB0eXBlZGVmIHZvaWQgKFByb2Nlc3NMYXVuY2hlcjo6KkRpZEZpbmlzaExhdW5jaGlu Z1Byb2Nlc3NGdW5jdGlvbikoUGxhdGZvcm1Qcm9jZXNzSWRlbnRpZmllciwgSVBDOjpDb25uZWN0 aW9uOjpJZGVudGlmaWVyKTsK