62229 2011-06-07 14:19:57 -0700 Fix "branding" issue in features.gypi 2011-06-07 15:13:58 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 abarth abarth tony oldest_to_newest 416781 0 abarth 2011-06-07 14:19:57 -0700 Fix "branding" issue in features.gypi 416782 1 96295 abarth 2011-06-07 14:21:01 -0700 Created attachment 96295 Patch 416784 2 96295 tony 2011-06-07 14:22:24 -0700 Comment on attachment 96295 Patch Ah, I see, it was because of nesting. 416785 3 abarth 2011-06-07 14:25:13 -0700 I don't fully understanding the nesting stuff. I don't have a good mental model for what it does. 416789 4 96295 abarth 2011-06-07 14:31:30 -0700 Comment on attachment 96295 Patch Clearing flags on attachment: 96295 Committed r88268: <http://trac.webkit.org/changeset/88268> 416790 5 abarth 2011-06-07 14:31:34 -0700 All reviewed patches have been landed. Closing bug. 416813 6 tony 2011-06-07 15:04:14 -0700 (In reply to comment #3) > I don't fully understanding the nesting stuff. I don't have a good mental model for what it does. I don't know why there are so many levels of nesting in feature_overrides.gypi. It's probably not necessary. Normally, we use nesting for using a variable in a condition. For example, 'variables': { 'foo': 0, 'conditions': { # Can't use foo, not defined in this scope. } }, To work around this, you nest variables. 'variables': { 'variables': { 'foo': 0 }, 'conditions': [ # Can use foo. ] } In build/common.gypi, this is because we have variable values that depend on other variable values. Like: 'variables': { 'variables': { 'chromeos': 0 }, 'conditions': [ [ 'chromeos==1', { 'toolkit_views': 1, }, { 'toolkit_views': 0 }] ] } 416822 7 abarth 2011-06-07 15:13:58 -0700 I fail at changing this file. I'm going to back everything out and try again another day. 96295 2011-06-07 14:21:01 -0700 2011-06-07 14:31:30 -0700 Patch bug-62229-20110607142100.patch text/plain 4379 abarth SW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiA4ODI2NikKKysrIFNvdXJj ZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYg QEAKKzIwMTEtMDYtMDcgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGaXggImJyYW5kaW5nIiBp c3N1ZSBpbiBmZWF0dXJlcy5neXBpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD02MjIyOQorCisgICAgICAgIEFwcGFyZW50bHkgd2UgbmVlZCB0byBtb3Zl IHRoZSBjb25kaXRpb25hbCBibG9jayBmdXJ0aGVyIG91dCBvZiB0aGUKKyAgICAgICAgbmVzdGlu ZyBpbiBvcmRlciB0byBzZWUgdGhlIGJyYW5kaW5nIHZhcmlhYmxlLiAgVGhpcyBwYXRjaCBhbHNv IHJlbW92ZQorICAgICAgICB0aGUgZHVtbXkgYnJhbmRpbmcgdmFyaWFibGUgSSBhZGRlZCB0byBn ZXQgdGhlIGJ1aWxkYm90IGJ1aWxkaW5nIGFnYWluLgorCisgICAgICAgICogZmVhdHVyZXMuZ3lw aToKKwogMjAxMS0wNi0wNyAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgogCiAgICAg ICAgIEF0dGVtcHQgdG8gZml4IHRoZSBjci13aW4gYnVpbGQuCkluZGV4OiBTb3VyY2UvV2ViS2l0 L2Nocm9taXVtL2ZlYXR1cmVzLmd5cGkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9jaHJv bWl1bS9mZWF0dXJlcy5neXBpCShyZXZpc2lvbiA4ODI2MykKKysrIFNvdXJjZS9XZWJLaXQvY2hy b21pdW0vZmVhdHVyZXMuZ3lwaQkod29ya2luZyBjb3B5KQpAQCAtNDIsNyArNDIsNiBAQAogICAg ICAgICAndXNlX2FjY2VsZXJhdGVkX2NvbXBvc2l0aW5nJSc6IDEsCiAgICAgICAgICd1c2Vfc2tp YV9ncHUlJzogMCwKICAgICAgICAgJ3VzZV90aHJlYWRlZF9jb21wb3NpdGluZyUnOiAwLAotICAg ICAgICAnYnJhbmRpbmclJzogJ1dlYktpdCcsCiAgICAgICB9LAogCiAgICAgICAjIFdlIGhhdmUg dG8gbmVzdCB2YXJpYWJsZXMgaW5zaWRlIHZhcmlhYmxlcyBhcyBhIGhhY2sgZm9yIHZhcmlhYmxl cwpAQCAtMTI4LDQ3ICsxMjcsNyBAQAogICAgICAgJ3VzZV9hY2NlbGVyYXRlZF9jb21wb3NpdGlu ZyUnOiAnPCh1c2VfYWNjZWxlcmF0ZWRfY29tcG9zaXRpbmcpJywKICAgICAgICd1c2Vfc2tpYV9n cHUlJzogJzwodXNlX3NraWFfZ3B1KScsCiAgICAgICAndXNlX3RocmVhZGVkX2NvbXBvc2l0aW5n JSc6ICc8KHVzZV90aHJlYWRlZF9jb21wb3NpdGluZyknLAotICAgICAgJ2JyYW5kaW5nJSc6ICc8 KGJyYW5kaW5nKScsCiAKLSAgICAgICdjb25kaXRpb25zJzogWwotICAgICAgICBbJ3VzZV9hY2Nl bGVyYXRlZF9jb21wb3NpdGluZz09MScsIHsKLSAgICAgICAgICAnZmVhdHVyZV9kZWZpbmVzJzog WwotICAgICAgICAgICAgJ1dURl9VU0VfQUNDRUxFUkFURURfQ09NUE9TSVRJTkc9MScsCi0gICAg ICAgICAgICAnRU5BQkxFXzNEX1JFTkRFUklORz0xJywKLSAgICAgICAgICBdLAotICAgICAgICB9 XSwKLSAgICAgICAgWyd1c2VfYWNjZWxlcmF0ZWRfY29tcG9zaXRpbmc9PTEgYW5kIE9TIT0ibWFj IicsIHsKLSAgICAgICAgICAnZmVhdHVyZV9kZWZpbmVzJzogWwotICAgICAgICAgICAgJ0VOQUJM RV9BQ0NFTEVSQVRFRF8yRF9DQU5WQVM9MScsCi0gICAgICAgICAgXSwKLSAgICAgICAgfV0sCi0g ICAgICAgIFsndXNlX2FjY2VsZXJhdGVkX2NvbXBvc2l0aW5nPT0xIGFuZCB1c2VfdGhyZWFkZWRf Y29tcG9zaXRpbmc9PTEnLCB7Ci0gICAgICAgICAgJ2ZlYXR1cmVfZGVmaW5lcyc6IFsKLSAgICAg ICAgICAgICdXVEZfVVNFX1RIUkVBREVEX0NPTVBPU0lUSU5HPTEnLAotICAgICAgICAgIF0sCi0g ICAgICAgIH1dLAotICAgICAgICBbJ3RvdWNodWk9PTEnLCB7Ci0gICAgICAgICAgJ2VuYWJsZV90 b3VjaF9pY29uX2xvYWRpbmcnOiAxLAotICAgICAgICB9XSwKLSAgICAgICAgIyBGSVhNRTogRm9y IHRoZSBtb21lbnQgV2luZG93cyBpcyBvbmx5IGVuYWJsZWQgZm9yIEdvb2dsZS1icmFuZGVkCi0g ICAgICAgICMgYnVpbGQsIHNpbmNlIHRoZSBGRm1wZWcgRExMcyBuZWVkIHRvIGJlIHJlLWJ1aWx0 IGZvciBjaHJvbWl1bS4KLSAgICAgICAgWydPUz09Im1hYyIgb3IgT1M9PSJsaW51eCIgb3IgKE9T PT0id2luIiBhbmQgYnJhbmRpbmc9PSJDaHJvbWUiKScsIHsKLSAgICAgICAgICAnZmVhdHVyZV9k ZWZpbmVzJzogWwotICAgICAgICAgICAgJ0VOQUJMRV9XRUJfQVVESU89MScsCi0gICAgICAgICAg XSwKLSAgICAgICAgfV0sCi0gICAgICAgICMgTWFjIE9TIFggdXNlcyBBY2NlbGVyYXRlLmZyYW1l d29yayBGRlQgYnkgZGVmYXVsdCBpbnN0ZWFkIG9mIEZGbXBlZy4KLSAgICAgICAgWydPUyE9Im1h YyInLCB7Ci0gICAgICAgICAgJ2ZlYXR1cmVfZGVmaW5lcyc6IFsKLSAgICAgICAgICAgICdXVEZf VVNFX1dFQkFVRElPX0ZGTVBFRz0xJywKLSAgICAgICAgICBdLAotICAgICAgICB9XSwKLSAgICAg ICAgWydlbmFibGVfcmVnaXN0ZXJfcHJvdG9jb2xfaGFuZGxlcj09MScsIHsKLSAgICAgICAgICAn ZmVhdHVyZV9kZWZpbmVzJzogWwotICAgICAgICAgICAgJ0VOQUJMRV9SRUdJU1RFUl9QUk9UT0NP TF9IQU5ETEVSPTEnLAotICAgICAgICAgIF0sCi0gICAgICAgIH1dLAotICAgICAgXSwKICAgICB9 LAogCiAgICAgJ2ZlYXR1cmVfZGVmaW5lcyUnOiAnPChmZWF0dXJlX2RlZmluZXMpJywKQEAgLTE4 MCw1ICsxMzksNDUgQEAKICAgICAndXNlX2FjY2VsZXJhdGVkX2NvbXBvc2l0aW5nJSc6ICc8KHVz ZV9hY2NlbGVyYXRlZF9jb21wb3NpdGluZyknLAogICAgICd1c2Vfc2tpYV9ncHUlJzogJzwodXNl X3NraWFfZ3B1KScsCiAgICAgJ3VzZV90aHJlYWRlZF9jb21wb3NpdGluZyUnOiAnPCh1c2VfdGhy ZWFkZWRfY29tcG9zaXRpbmcpJywKKworICAgICdjb25kaXRpb25zJzogWworICAgICAgWyd1c2Vf YWNjZWxlcmF0ZWRfY29tcG9zaXRpbmc9PTEnLCB7CisgICAgICAgICdmZWF0dXJlX2RlZmluZXMn OiBbCisgICAgICAgICAgJ1dURl9VU0VfQUNDRUxFUkFURURfQ09NUE9TSVRJTkc9MScsCisgICAg ICAgICAgJ0VOQUJMRV8zRF9SRU5ERVJJTkc9MScsCisgICAgICAgIF0sCisgICAgICB9XSwKKyAg ICAgIFsndXNlX2FjY2VsZXJhdGVkX2NvbXBvc2l0aW5nPT0xIGFuZCBPUyE9Im1hYyInLCB7Cisg ICAgICAgICdmZWF0dXJlX2RlZmluZXMnOiBbCisgICAgICAgICAgJ0VOQUJMRV9BQ0NFTEVSQVRF RF8yRF9DQU5WQVM9MScsCisgICAgICAgIF0sCisgICAgICB9XSwKKyAgICAgIFsndXNlX2FjY2Vs ZXJhdGVkX2NvbXBvc2l0aW5nPT0xIGFuZCB1c2VfdGhyZWFkZWRfY29tcG9zaXRpbmc9PTEnLCB7 CisgICAgICAgICdmZWF0dXJlX2RlZmluZXMnOiBbCisgICAgICAgICAgJ1dURl9VU0VfVEhSRUFE RURfQ09NUE9TSVRJTkc9MScsCisgICAgICAgIF0sCisgICAgICB9XSwKKyAgICAgIFsndG91Y2h1 aT09MScsIHsKKyAgICAgICAgJ2VuYWJsZV90b3VjaF9pY29uX2xvYWRpbmcnOiAxLAorICAgICAg fV0sCisgICAgICAjIEZJWE1FOiBGb3IgdGhlIG1vbWVudCBXaW5kb3dzIGlzIG9ubHkgZW5hYmxl ZCBmb3IgR29vZ2xlLWJyYW5kZWQKKyAgICAgICMgYnVpbGQsIHNpbmNlIHRoZSBGRm1wZWcgRExM cyBuZWVkIHRvIGJlIHJlLWJ1aWx0IGZvciBjaHJvbWl1bS4KKyAgICAgIFsnT1M9PSJtYWMiIG9y IE9TPT0ibGludXgiIG9yIChPUz09IndpbiIgYW5kIGJyYW5kaW5nPT0iQ2hyb21lIiknLCB7Cisg ICAgICAgICdmZWF0dXJlX2RlZmluZXMnOiBbCisgICAgICAgICAgJ0VOQUJMRV9XRUJfQVVESU89 MScsCisgICAgICAgIF0sCisgICAgICB9XSwKKyAgICAgICMgTWFjIE9TIFggdXNlcyBBY2NlbGVy YXRlLmZyYW1ld29yayBGRlQgYnkgZGVmYXVsdCBpbnN0ZWFkIG9mIEZGbXBlZy4KKyAgICAgIFsn T1MhPSJtYWMiJywgeworICAgICAgICAnZmVhdHVyZV9kZWZpbmVzJzogWworICAgICAgICAgICdX VEZfVVNFX1dFQkFVRElPX0ZGTVBFRz0xJywKKyAgICAgICAgXSwKKyAgICAgIH1dLAorICAgICAg WydlbmFibGVfcmVnaXN0ZXJfcHJvdG9jb2xfaGFuZGxlcj09MScsIHsKKyAgICAgICAgJ2ZlYXR1 cmVfZGVmaW5lcyc6IFsKKyAgICAgICAgICAnRU5BQkxFX1JFR0lTVEVSX1BST1RPQ09MX0hBTkRM RVI9MScsCisgICAgICAgIF0sCisgICAgICB9XSwKKyAgICBdLAogICB9LAogfQo=