38792 2010-05-07 22:25:23 -0700 Clean up baseline_search_path to use map to reduce copy/paste code 2010-06-12 21:02:19 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 eric webkit-unassigned oldest_to_newest 222800 0 eric 2010-05-07 22:25:23 -0700 Clean up baseline_search_path to use map to reduce copy/paste code 222801 1 55460 eric 2010-05-07 22:27:15 -0700 Created attachment 55460 Patch 222802 2 55460 dbates 2010-05-07 22:29:49 -0700 Comment on attachment 55460 Patch I like this clean up! r=me. 222803 3 eric 2010-05-07 22:35:47 -0700 Committed r58996: <http://trac.webkit.org/changeset/58996> 55460 2010-05-07 22:27:15 -0700 2010-06-12 21:02:19 -0700 Patch bug-38792-20100507222713.patch text/plain 6213 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA5OGVkMWRjNjY0NjlmOGNkYjdjZWFhMWY1ZDcxMTllNzVhMTIyMTMzLi5mMjdiNzYx ZWRhMjRlMGNmZmMxNzA3MTI5MmI3NjRmZWQyYzQwYjQ3IDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjAgQEAK IDIwMTAtMDUtMDcgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENsZWFuIHVwIGJhc2VsaW5lX3Nl YXJjaF9wYXRoIHRvIHVzZSBtYXAgdG8gcmVkdWNlIGNvcHkvcGFzdGUgY29kZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mzg3OTIKKworICAgICAgICBS ZWFkaW5nIHdoaWNoIHBvcnRuYW1lcyBhIHBvcnQgZmFsbHMgYmFjayB0byBpcyBlYXNpZXIgaWYK KyAgICAgICAgd2UgY29udmVydCBwb3J0IG5hbWVzIHRvIHBhdGhzIHdpdGggbWFwIGluc3RlYWQg b2YgdXNpbmcgY29weS9wYXN0ZSBjb2RlLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9saW51eC5weToKKyAgICAgICAgKiBTY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX21hYy5weToKKyAgICAgICAgKiBTY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX3dpbi5weToKKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21hYy5weToKKworMjAxMC0wNS0w NyAgRXJpYyBTZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+CisKICAgICAgICAgUmV2aWV3ZWQgYnkg RGFuaWVsIEJhdGVzLgogCiAgICAgICAgIHJvbGxvdXQgY29tbWFuZHMgZmFpbCB3aGVuIGNvbW1p dCBpcyBtaXNzaW5nIGJ1ZyBudW1iZXIKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fbGludXgucHkgYi9XZWJLaXRUb29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2xpbnV4LnB5Cmlu ZGV4IGEwMWJkMTRmMGU1ZjNhNmZiMzE0YmFhZDE5ZTdlYzhkNzRmN2I1MzYuLjk3OWUyMjVkYmIw MjhmN2Y0YThhMDEzM2Q1YjcyMWZkZDFiMzY2ODggMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fbGludXgucHkKKysrIGIv V2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9s aW51eC5weQpAQCAtNDksMTEgKzQ5LDggQEAgY2xhc3MgQ2hyb21pdW1MaW51eFBvcnQoY2hyb21p dW0uQ2hyb21pdW1Qb3J0KToKICAgICAgICAgY2hyb21pdW0uQ2hyb21pdW1Qb3J0Ll9faW5pdF9f KHNlbGYsIHBvcnRfbmFtZSwgb3B0aW9ucykKIAogICAgIGRlZiBiYXNlbGluZV9zZWFyY2hfcGF0 aChzZWxmKToKLSAgICAgICAgcmV0dXJuIFtzZWxmLl93ZWJraXRfYmFzZWxpbmVfcGF0aCgnY2hy b21pdW0tbGludXgnKSwKLSAgICAgICAgICAgICAgICBzZWxmLl93ZWJraXRfYmFzZWxpbmVfcGF0 aCgnY2hyb21pdW0td2luJyksCi0gICAgICAgICAgICAgICAgc2VsZi5fd2Via2l0X2Jhc2VsaW5l X3BhdGgoJ2Nocm9taXVtJyksCi0gICAgICAgICAgICAgICAgc2VsZi5fd2Via2l0X2Jhc2VsaW5l X3BhdGgoJ3dpbicpLAotICAgICAgICAgICAgICAgIHNlbGYuX3dlYmtpdF9iYXNlbGluZV9wYXRo KCdtYWMnKV0KKyAgICAgICAgcG9ydF9uYW1lcyA9IFsiY2hyb21pdW0tbGludXgiLCAiY2hyb21p dW0td2luIiwgImNocm9taXVtIiwgIndpbiIsICJtYWMiXQorICAgICAgICByZXR1cm4gbWFwKHNl bGYuX3dlYmtpdF9iYXNlbGluZV9wYXRoLCBwb3J0X25hbWVzKQogCiAgICAgZGVmIGNoZWNrX2J1 aWxkKHNlbGYsIG5lZWRzX2h0dHApOgogICAgICAgICByZXN1bHQgPSBjaHJvbWl1bS5DaHJvbWl1 bVBvcnQuY2hlY2tfYnVpbGQoc2VsZiwgbmVlZHNfaHR0cCkKZGlmZiAtLWdpdCBhL1dlYktpdFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fbWFjLnB5IGIv V2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9t YWMucHkKaW5kZXggNGVhZDI2ZmMzMDMyYzMyZmI2Zjk0NGNjZWFiY2IxM2I4NDY5YTUyZC4uYmE2 N2EzZWFlMjVlZjE0ZjkxYjY3Nzg5N2I0MTIyMjk2NTllNzgyZCAxMDA2NDQKLS0tIGEvV2ViS2l0 VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9tYWMucHkK KysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJv bWl1bV9tYWMucHkKQEAgLTUyLDEwICs1Miw4IEBAIGNsYXNzIENocm9taXVtTWFjUG9ydChjaHJv bWl1bS5DaHJvbWl1bVBvcnQpOgogICAgICAgICBjaHJvbWl1bS5DaHJvbWl1bVBvcnQuX19pbml0 X18oc2VsZiwgcG9ydF9uYW1lLCBvcHRpb25zKQogCiAgICAgZGVmIGJhc2VsaW5lX3NlYXJjaF9w YXRoKHNlbGYpOgotICAgICAgICByZXR1cm4gW3NlbGYuX3dlYmtpdF9iYXNlbGluZV9wYXRoKCdj aHJvbWl1bS1tYWMnKSwKLSAgICAgICAgICAgICAgICBzZWxmLl93ZWJraXRfYmFzZWxpbmVfcGF0 aCgnY2hyb21pdW0nKSwKLSAgICAgICAgICAgICAgICBzZWxmLl93ZWJraXRfYmFzZWxpbmVfcGF0 aCgnbWFjJyArIHNlbGYudmVyc2lvbigpKSwKLSAgICAgICAgICAgICAgICBzZWxmLl93ZWJraXRf YmFzZWxpbmVfcGF0aCgnbWFjJyldCisgICAgICAgIHBvcnRfbmFtZXMgPSBbImNocm9taXVtLW1h YyIsICJjaHJvbWl1bSIsICJtYWMiICsgc2VsZi52ZXJzaW9uKCksICJtYWMiXQorICAgICAgICBy ZXR1cm4gbWFwKHNlbGYuX3dlYmtpdF9iYXNlbGluZV9wYXRoLCBwb3J0X25hbWVzKQogCiAgICAg ZGVmIGNoZWNrX2J1aWxkKHNlbGYsIG5lZWRzX2h0dHApOgogICAgICAgICByZXN1bHQgPSBjaHJv bWl1bS5DaHJvbWl1bVBvcnQuY2hlY2tfYnVpbGQoc2VsZiwgbmVlZHNfaHR0cCkKQEAgLTg3LDYg Kzg1LDcgQEAgY2xhc3MgQ2hyb21pdW1NYWNQb3J0KGNocm9taXVtLkNocm9taXVtUG9ydCk6CiAg ICAgICAgIHJldHVybiAnbWFjJwogCiAgICAgZGVmIHZlcnNpb24oc2VsZik6CisgICAgICAgICMg RklYTUU6IEl0J3Mgc3RyYW5nZSB0aGF0IHRoaXMgc3RyaW5nIGlzIC12ZXJzaW9uLCBub3QganVz dCB2ZXJzaW9uLgogICAgICAgICBvc192ZXJzaW9uX3N0cmluZyA9IHBsYXRmb3JtLm1hY192ZXIo KVswXSAgIyBlLmcuICIxMC41LjYiCiAgICAgICAgIGlmIG5vdCBvc192ZXJzaW9uX3N0cmluZzoK ICAgICAgICAgICAgIHJldHVybiAnLWxlb3BhcmQnCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX3dpbi5weSBiL1dlYktp dFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fd2luLnB5 CmluZGV4IDMwMmFmODZiODE2NWFmM2YwMWI3MzBlMDEwZWJjZGQ4ZTkyZTI0ZmEuLmQyMGY0ZGRl NDExN2NkZGU4NzcxMGJiNDYwNjIyMjEzMjdkZWM0MjEgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fd2luLnB5CisrKyBi L1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1f d2luLnB5CkBAIC00OSwxNiArNDksMTMgQEAgY2xhc3MgQ2hyb21pdW1XaW5Qb3J0KGNocm9taXVt LkNocm9taXVtUG9ydCk6CiAgICAgICAgIGNocm9taXVtLkNocm9taXVtUG9ydC5fX2luaXRfXyhz ZWxmLCBwb3J0X25hbWUsIG9wdGlvbnMpCiAKICAgICBkZWYgYmFzZWxpbmVfc2VhcmNoX3BhdGgo c2VsZik6Ci0gICAgICAgIGRpcnMgPSBbXQorICAgICAgICBwb3J0X25hbWVzID0gW10KICAgICAg ICAgaWYgc2VsZi5fbmFtZSA9PSAnY2hyb21pdW0td2luLXhwJzoKLSAgICAgICAgICAgIGRpcnMu YXBwZW5kKHNlbGYuX3dlYmtpdF9iYXNlbGluZV9wYXRoKCdjaHJvbWl1bS13aW4teHAnKSkKKyAg ICAgICAgICAgIHBvcnRfbmFtZXMuYXBwZW5kKCJjaHJvbWl1bS13aW4teHAiKQogICAgICAgICBp ZiBzZWxmLl9uYW1lIGluICgnY2hyb21pdW0td2luLXhwJywgJ2Nocm9taXVtLXdpbi12aXN0YScp OgotICAgICAgICAgICAgZGlycy5hcHBlbmQoc2VsZi5fd2Via2l0X2Jhc2VsaW5lX3BhdGgoJ2No cm9taXVtLXdpbi12aXN0YScpKQotICAgICAgICBkaXJzLmFwcGVuZChzZWxmLl93ZWJraXRfYmFz ZWxpbmVfcGF0aCgnY2hyb21pdW0td2luJykpCi0gICAgICAgIGRpcnMuYXBwZW5kKHNlbGYuX3dl YmtpdF9iYXNlbGluZV9wYXRoKCdjaHJvbWl1bScpKQotICAgICAgICBkaXJzLmFwcGVuZChzZWxm Ll93ZWJraXRfYmFzZWxpbmVfcGF0aCgnd2luJykpCi0gICAgICAgIGRpcnMuYXBwZW5kKHNlbGYu X3dlYmtpdF9iYXNlbGluZV9wYXRoKCdtYWMnKSkKLSAgICAgICAgcmV0dXJuIGRpcnMKKyAgICAg ICAgICAgIHBvcnRfbmFtZXMuYXBwZW5kKCJjaHJvbWl1bS13aW4tdmlzdGEiKQorICAgICAgICBw b3J0X25hbWVzLmV4dGVuZChbImNocm9taXVtLXdpbiIsICJjaHJvbWl1bSIsICJ3aW4iLCAibWFj Il0pCisgICAgICAgIHJldHVybiBtYXAoc2VsZi5fd2Via2l0X2Jhc2VsaW5lX3BhdGgsIHBvcnRf bmFtZXMpCiAKICAgICBkZWYgY2hlY2tfYnVpbGQoc2VsZiwgbmVlZHNfaHR0cCk6CiAgICAgICAg IHJlc3VsdCA9IGNocm9taXVtLkNocm9taXVtUG9ydC5jaGVja19idWlsZChzZWxmLCBuZWVkc19o dHRwKQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcG9ydC9tYWMucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9wb3J0L21hYy5weQppbmRleCAzNTBiMDg4NTExYmIwMTNiOWM2MGU0NGE0N2FiMWIwYWRlZWFj YWE0Li40MTNiNWYyYzM1ZDg5YmIxZjdjN2Y1NzljMDJmNzI1NzRlZTYwOThmIDEwMDY0NAotLS0g YS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21hYy5weQor KysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21hYy5w eQpAQCAtNTgsMTUgKzU4LDE1IEBAIGNsYXNzIE1hY1BvcnQoV2ViS2l0UG9ydCk6CiAgICAgICAg IHJldHVybiBjaGlsZF9wcm9jZXNzZXMKIAogICAgIGRlZiBiYXNlbGluZV9zZWFyY2hfcGF0aChz ZWxmKToKLSAgICAgICAgZGlycyA9IFtdCisgICAgICAgIHBvcnRfbmFtZXMgPSBbXQogICAgICAg ICBpZiBzZWxmLl9uYW1lID09ICdtYWMtdGlnZXInOgotICAgICAgICAgICAgZGlycy5hcHBlbmQo c2VsZi5fd2Via2l0X2Jhc2VsaW5lX3BhdGgoc2VsZi5fbmFtZSkpCisgICAgICAgICAgICBwb3J0 X25hbWVzLmFwcGVuZCgibWFjLXRpZ2VyIikKICAgICAgICAgaWYgc2VsZi5fbmFtZSBpbiAoJ21h Yy10aWdlcicsICdtYWMtbGVvcGFyZCcpOgotICAgICAgICAgICAgZGlycy5hcHBlbmQoc2VsZi5f d2Via2l0X2Jhc2VsaW5lX3BhdGgoJ21hYy1sZW9wYXJkJykpCisgICAgICAgICAgICBwb3J0X25h bWVzLmFwcGVuZCgibWFjLWxlb3BhcmQiKQogICAgICAgICBpZiBzZWxmLl9uYW1lIGluICgnbWFj LXRpZ2VyJywgJ21hYy1sZW9wYXJkJywgJ21hYy1zbm93bGVvcGFyZCcpOgotICAgICAgICAgICAg ZGlycy5hcHBlbmQoc2VsZi5fd2Via2l0X2Jhc2VsaW5lX3BhdGgoJ21hYy1zbm93bGVvcGFyZCcp KQotICAgICAgICBkaXJzLmFwcGVuZChzZWxmLl93ZWJraXRfYmFzZWxpbmVfcGF0aCgnbWFjJykp Ci0gICAgICAgIHJldHVybiBkaXJzCisgICAgICAgICAgICBwb3J0X25hbWVzLmFwcGVuZCgibWFj LXNub3dsZW9wYXJkIikKKyAgICAgICAgcG9ydF9uYW1lcy5hcHBlbmQoIm1hYyIpCisgICAgICAg IHJldHVybiBtYXAoc2VsZi5fd2Via2l0X2Jhc2VsaW5lX3BhdGgsIHBvcnRfbmFtZXMpCiAKICAg ICBkZWYgcGF0aF90b190ZXN0X2V4cGVjdGF0aW9uc19maWxlKHNlbGYpOgogICAgICAgICByZXR1 cm4gc2VsZi5wYXRoX2Zyb21fd2Via2l0X2Jhc2UoJ0xheW91dFRlc3RzJywgJ3BsYXRmb3JtJywK