76879 2012-01-23 16:36:20 -0800 [chromium] Add <(SHARED_INTERMEDIATE_DIR)/webkit to include path of targets that depend on WebKit API so they pick up the copied headers in an onion build 2012-01-23 17:09:41 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jamesr jamesr oldest_to_newest 540961 0 jamesr 2012-01-23 16:36:20 -0800 [chromium] Add <(SHARED_INTERMEDIATE_DIR)/webkit to include path of targets that depend on WebKit API so they pick up the copied headers in an onion build 540962 1 123655 jamesr 2012-01-23 16:36:50 -0800 Created attachment 123655 Patch 540969 2 jamesr 2012-01-23 16:41:12 -0800 The particular problem this solves is that this target: http://src.chromium.org/viewvc/chrome/trunk/src/ppapi/ppapi_shared.gypi?view=markup has a dependency directly on <(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit and files with includes that look like #include "third_party/WebKit/Source/WebKit/...". In a chromium-inside-WebKit checkout we resolve includes by this by generating copies of headers into <(SHARED_INTERMEDIATE_DIR)/webkit/third_party/WebKit/... via the setup_third_party.py script in webkit_support. Most (all?) targets in webkit/*/ add this include_dir in other ways, so this only impacts chromium code that directly depends on third_party/WebKit/... which is probably why we haven't seen it in other places. 540972 3 123655 dpranke 2012-01-23 16:47:12 -0800 Comment on attachment 123655 Patch please wrap this in a inside_chromium_build==0 block. 540980 4 123661 jamesr 2012-01-23 16:51:16 -0800 Created attachment 123661 Patch 540998 5 jamesr 2012-01-23 17:09:41 -0800 Committed r105662: <http://trac.webkit.org/changeset/105662> 123655 2012-01-23 16:36:50 -0800 2012-01-23 16:51:14 -0800 Patch bug-76879-20120123163649.patch text/plain 1707 jamesr U3VidmVyc2lvbiBSZXZpc2lvbjogMTA1NTY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDAyNTM5YWQxNmFkYTYzOWE0MzUxNTE2YTM2YzRlZGJhZTI2ODQ0M2QuLjE2ZmExZTZjOTc0OTc0 MjQ0MGQ1OGZjOWJiMGIzMjk5ZWY0YTdjM2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTIgQEAKKzIwMTItMDEtMjMgIEphbWVzIFJvYmluc29uICA8amFtZXNyQGNocm9t aXVtLm9yZz4KKworICAgICAgICBbY2hyb21pdW1dIEFkZCA8KFNIQVJFRF9JTlRFUk1FRElBVEVf RElSKS93ZWJraXQgdG8gaW5jbHVkZSBwYXRoIG9mIHRhcmdldHMgdGhhdCBkZXBlbmQgb24gV2Vi S2l0IEFQSSBzbyB0aGV5IHBpY2sgdXAgdGhlIGNvcGllZCBoZWFkZXJzIGluIGFuIG9uaW9uIGJ1 aWxkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03Njg3 OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2Vi S2l0Lmd5cDoKKwogMjAxMi0wMS0yMCAgQWxleGFuZHJlIEVsaWFzICA8YWVsaWFzQGdvb2dsZS5j b20+CiAKICAgICAgICAgW2Nocm9taXVtXSBXcml0ZSB1bml0IHRlc3RzIGZvciBjb21wb3NpdG9y LXRocmVhZCB6b29taW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL1dlYktp dC5neXAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL1dlYktpdC5neXAKaW5kZXggZWJlMThhYjA4 YmZlODBhNTFmYTVlMjdmY2QyZGZiM2MyNDJjYmQyZS4uNDdlZjVhMzFlYTk1YjU1ZjY0YWY5MTE5 MzdkMTFiMTk1YTEwOTIzNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9XZWJL aXQuZ3lwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vV2ViS2l0Lmd5cApAQCAtNzUsNiAr NzUsMTEgQEAKICAgICAgICAgICAgICAgICAnPChjaHJvbWl1bV9zcmNfZGlyKS90aGlyZF9wYXJ0 eS9hbmdsZS9zcmMvYnVpbGRfYW5nbGUuZ3lwOnRyYW5zbGF0b3JfZ2xzbCcsCiAgICAgICAgICAg ICAgICAgJzwoY2hyb21pdW1fc3JjX2RpcikvdjgvdG9vbHMvZ3lwL3Y4Lmd5cDp2OCcsCiAgICAg ICAgICAgICBdLAorICAgICAgICAgICAgJ2RpcmVjdF9kZXBlbmRlbnRfc2V0dGluZ3MnOiB7Cisg ICAgICAgICAgICAgICAgJ2luY2x1ZGVfZGlycyc6IFsKKyAgICAgICAgICAgICAgICAgICAgJzwo U0hBUkVEX0lOVEVSTUVESUFURV9ESVIpL3dlYmtpdCcsICMgaW4gYSBjaHJvbWl1bS1pbnNpZGUt V2ViS2l0IGJ1aWxkLCBoZWFkZXJzIGluIHRoZSBwdWJsaWMgV2ViS2l0IEFQSSBhcmUgY29waWVk IGJlbmVhdGggdGhpcyBkaXJlY3Rvcnkgc28gaW5jbHVkZXMgcmVmZXJlbmNpbmcgdGhpcmRfcGFy dHkvV2ViS2l0IHdvcmsuCisgICAgICAgICAgICAgICAgXSwKKyAgICAgICAgICAgIH0sCiAgICAg ICAgICAgICAnZXhwb3J0X2RlcGVuZGVudF9zZXR0aW5ncyc6IFsKICAgICAgICAgICAgICAgICAn PChjaHJvbWl1bV9zcmNfZGlyKS9za2lhL3NraWEuZ3lwOnNraWEnLAogICAgICAgICAgICAgICAg ICc8KGNocm9taXVtX3NyY19kaXIpL3RoaXJkX3BhcnR5L2ljdS9pY3UuZ3lwOmljdXVjJywK 123661 2012-01-23 16:51:16 -0800 2012-01-23 17:04:49 -0800 Patch bug-76879-20120123165115.patch text/plain 1639 jamesr U3VidmVyc2lvbiBSZXZpc2lvbjogMTA1NTY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDAyNTM5YWQxNmFkYTYzOWE0MzUxNTE2YTM2YzRlZGJhZTI2ODQ0M2QuLjE2ZmExZTZjOTc0OTc0 MjQ0MGQ1OGZjOWJiMGIzMjk5ZWY0YTdjM2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTIgQEAKKzIwMTItMDEtMjMgIEphbWVzIFJvYmluc29uICA8amFtZXNyQGNocm9t aXVtLm9yZz4KKworICAgICAgICBbY2hyb21pdW1dIEFkZCA8KFNIQVJFRF9JTlRFUk1FRElBVEVf RElSKS93ZWJraXQgdG8gaW5jbHVkZSBwYXRoIG9mIHRhcmdldHMgdGhhdCBkZXBlbmQgb24gV2Vi S2l0IEFQSSBzbyB0aGV5IHBpY2sgdXAgdGhlIGNvcGllZCBoZWFkZXJzIGluIGFuIG9uaW9uIGJ1 aWxkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03Njg3 OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2Vi S2l0Lmd5cDoKKwogMjAxMi0wMS0yMCAgQWxleGFuZHJlIEVsaWFzICA8YWVsaWFzQGdvb2dsZS5j b20+CiAKICAgICAgICAgW2Nocm9taXVtXSBXcml0ZSB1bml0IHRlc3RzIGZvciBjb21wb3NpdG9y LXRocmVhZCB6b29taW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL1dlYktp dC5neXAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL1dlYktpdC5neXAKaW5kZXggZWJlMThhYjA4 YmZlODBhNTFmYTVlMjdmY2QyZGZiM2MyNDJjYmQyZS4uMDA3OWM5NDQzOGRmMDNhNGYzNGMzM2Q3 ZDMwMGMxZmQ2NmY0MjdlYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9XZWJL aXQuZ3lwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vV2ViS2l0Lmd5cApAQCAtNzY1LDYg Kzc2NSwxMiBAQAogICAgICAgICAgICAgICAgICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICAg ICAgICAgICAgICB9XSwKICAgICAgICAgICAgICAgICAgICAgXSwKKyAgICAgICAgICAgICAgICB9 LCB7ICMgZWxzZTogaW5zaWRlX2Nocm9taXVtX2J1aWxkPT0wCisgICAgICAgICAgICAgICAgICAg ICdkaXJlY3RfZGVwZW5kZW50X3NldHRpbmdzJzogeworICAgICAgICAgICAgICAgICAgICAgICAg J2luY2x1ZGVfZGlycyc6IFsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAnPChTSEFSRURf SU5URVJNRURJQVRFX0RJUikvd2Via2l0JywgIyBpbiBhIGNocm9taXVtLWluc2lkZS1XZWJLaXQg YnVpbGQsIGhlYWRlcnMgaW4gdGhlIHB1YmxpYyBXZWJLaXQgQVBJIGFyZSBjb3BpZWQgYmVuZWF0 aCB0aGlzIGRpcmVjdG9yeSBzbyBpbmNsdWRlcyByZWZlcmVuY2luZyB0aGlyZF9wYXJ0eS9XZWJL aXQgd29yay4KKyAgICAgICAgICAgICAgICAgICAgICAgIF0sCisgICAgICAgICAgICAgICAgICAg IH0sCiAgICAgICAgICAgICAgICAgfV0sCiAgICAgICAgICAgICAgICAgWyd1c2VfeDExID09IDEn LCB7CiAgICAgICAgICAgICAgICAgICAgICdkZXBlbmRlbmNpZXMnOiBbCg==