65387 2011-07-29 13:40:38 -0700 Fix an error in macro collapsing, refactor code to be pretty. 2011-07-29 14:05:07 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 64385 1 dglazkov dglazkov abarth oldest_to_newest 444076 0 dglazkov 2011-07-29 13:40:38 -0700 Fix an error in macro collapsing, refactor code to be pretty. 444078 1 102391 dglazkov 2011-07-29 13:42:02 -0700 Created attachment 102391 Patch 444083 2 102391 dglazkov 2011-07-29 14:05:03 -0700 Comment on attachment 102391 Patch Clearing flags on attachment: 102391 Committed r92006: <http://trac.webkit.org/changeset/92006> 444085 3 dglazkov 2011-07-29 14:05:07 -0700 All reviewed patches have been landed. Closing bug. 102391 2011-07-29 13:42:02 -0700 2011-07-29 14:05:03 -0700 Patch bug-65387-20110729134201.patch text/plain 4591 dglazkov U3VidmVyc2lvbiBSZXZpc2lvbjogOTIwMDEKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCBmZmZjMzQ1NDgyZTQwY2VhOTk1ZWYwOGRjNzljM2RlY2Q5 MGE0NGQyLi43NDM0ZWZjYzVkMzhlMjI3ODMyNGE2ODAwYmRjOGFlNmQ1OWQ1Njc0IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUg QEAKKzIwMTEtMDctMjkgIERpbWl0cmkgR2xhemtvdiAgPGRnbGF6a292QGNocm9taXVtLm9yZz4K KworICAgICAgICBGaXggYW4gZXJyb3IgaW4gbWFjcm8gY29sbGFwc2luZywgcmVmYWN0b3IgY29k ZSB0byBiZSBwcmV0dHkuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD02NTM4NworCisgICAgICAgIE15IHNldCBtYXRoIHdhcyB3cm9uZy4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X2NvbmZpZ3VyYXRpb24ucHk6IE1vdmVkIGNvbGxh cHNpbmcgaW50byBhIGNsYXNzbWV0aG9kLCBmaXhlZCB0aGUgbWF0aCB0byBiZSBjb3JyZWN0Lgor ICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X2NvbmZp Z3VyYXRpb25fdW5pdHRlc3QucHk6IEFkZGVkIHVuaXQgdGVzdHMuCisKIDIwMTEtMDctMjcgIFJ5 dWFuIENob2kgIDxyeXVhbi5jaG9pQHNhbXN1bmcuY29tPgogCiAgICAgICAgIFN0eWxlIGJvdCBj b21wbGFpbnMgYWJvdXQgRUZMLXNwZWNpZmljIGZvcndhcmQgZGVjbGFyYXRpb24gbmFtaW5nLgpk aWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rl c3RfY29uZmlndXJhdGlvbi5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L21vZGVscy90ZXN0X2NvbmZpZ3VyYXRpb24ucHkKaW5kZXggYjBhNDljYzljMjQ5ODE5OTQ4NWVk NmM4ODU1ODIyNjdkMWVhNWI2Yy4uNDc5M2JjZmE4NGE0ZTA2MWE2ZGU3OGE2YWE0MGI5MDc3ZGQ4 ZDg4MCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9k ZWxzL3Rlc3RfY29uZmlndXJhdGlvbi5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9tb2RlbHMvdGVzdF9jb25maWd1cmF0aW9uLnB5CkBAIC0xMjEsNiArMTIxLDE1 IEBAIGNsYXNzIFRlc3RDb25maWd1cmF0aW9uQ29udmVydGVyOgogCiAgICAgICAgIHJldHVybiBy ZWR1Y2Uoc2V0LmludGVyc2VjdGlvbiwgbWF0Y2hpbmdfc2V0cy52YWx1ZXMoKSkKIAorICAgIEBj bGFzc21ldGhvZAorICAgIGRlZiBjb2xsYXBzZV9tYWNyb3MoY2xzLCBtYWNyb3NfZGljdCwgc3Bl Y2lmaWVyc19saXN0KToKKyAgICAgICAgZm9yIGkgaW4gcmFuZ2UobGVuKHNwZWNpZmllcnNfbGlz dCkpOgorICAgICAgICAgICAgZm9yIG1hY3JvX3NwZWNpZmllciwgbWFjcm8gaW4gbWFjcm9zX2Rp Y3QuaXRlbXMoKToKKyAgICAgICAgICAgICAgICBzcGVjaWZpZXJzX3NldCA9IHNldChzcGVjaWZp ZXJzX2xpc3RbaV0pCisgICAgICAgICAgICAgICAgbWFjcm9fc2V0ID0gc2V0KG1hY3JvKQorICAg ICAgICAgICAgICAgIGlmIHNwZWNpZmllcnNfc2V0ID49IG1hY3JvX3NldDoKKyAgICAgICAgICAg ICAgICAgICAgc3BlY2lmaWVyc19saXN0W2ldID0gZnJvemVuc2V0KChzcGVjaWZpZXJzX3NldCAt IG1hY3JvX3NldCkgfCBzZXQoW21hY3JvX3NwZWNpZmllcl0pKQorCiAgICAgZGVmIHRvX3NwZWNp ZmllcnNfbGlzdChzZWxmLCB0ZXN0X2NvbmZpZ3VyYXRpb25fc2V0KToKICAgICAgICAgIiIiQ29u dmVydCBhIHNldCBvZiBUZXN0Q29uZmlndXJhdGlvbiBpbnN0YW5jZXMgaW50byBvbmUgb3IgbW9y ZSBsaXN0IG9mIHNwZWNpZmllcnMuIiIiCiAKQEAgLTIwMSwxMCArMjEwLDYgQEAgY2xhc3MgVGVz dENvbmZpZ3VyYXRpb25Db252ZXJ0ZXI6CiAKICAgICAgICAgIyA0KSBTdWJzdGl0dXRlIHNwZWNp ZmllciBzdWJzZXRzIHRoYXQgbWF0Y2ggbWFjcm9zIHdpdGluIGVhY2ggc2V0OgogICAgICAgICAj ICAgKHhwLCB2aXN0YSwgd2luNywgcmVsZWFzZSkgLT4gKHdpbiwgcmVsZWFzZSkKLSAgICAgICAg Zm9yIGkgaW4gcmFuZ2UobGVuKHNwZWNpZmllcnNfbGlzdCkpOgotICAgICAgICAgICAgZm9yIG1h Y3JvX3NwZWNpZmllciwgbWFjcm8gaW4gc2VsZi5fY29uZmlndXJhdGlvbl9tYWNyb3MuaXRlbXMo KToKLSAgICAgICAgICAgICAgICBkaWZmID0gc2V0KHNwZWNpZmllcnNfbGlzdFtpXSkgLSBzZXQo bWFjcm8pCi0gICAgICAgICAgICAgICAgaWYgc3BlY2lmaWVyc19saXN0W2ldICE9IGRpZmY6Ci0g ICAgICAgICAgICAgICAgICAgIHNwZWNpZmllcnNfbGlzdFtpXSA9IGZyb3plbnNldChkaWZmIHwg c2V0KFttYWNyb19zcGVjaWZpZXJdKSkKKyAgICAgICAgc2VsZi5jb2xsYXBzZV9tYWNyb3Moc2Vs Zi5fY29uZmlndXJhdGlvbl9tYWNyb3MsIHNwZWNpZmllcnNfbGlzdCkKIAogICAgICAgICByZXR1 cm4gc3BlY2lmaWVyc19saXN0CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9tb2RlbHMvdGVzdF9jb25maWd1cmF0aW9uX3VuaXR0ZXN0LnB5IGIvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfY29uZmlndXJhdGlvbl91 bml0dGVzdC5weQppbmRleCAwZWQwYTc0MmJiMzk4MzgwOTc5MDIzNjk1MzJiOGY0YTM3NzBkYjdm Li4zNjVhNTg1NTlmODYxOGZkMjdkMzMyMWNlZWUxZWEyYzUxZjJjMGVhIDEwMDY0NAotLS0gYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9jb25maWd1cmF0 aW9uX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L21vZGVscy90ZXN0X2NvbmZpZ3VyYXRpb25fdW5pdHRlc3QucHkKQEAgLTI2NCw2ICsyNjQsMjUg QEAgY2xhc3MgVGVzdENvbmZpZ3VyYXRpb25Db252ZXJ0ZXJUZXN0KHVuaXR0ZXN0LlRlc3RDYXNl KToKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoY29udmVydGVyLnRvX3NwZWNpZmllcnNfbGlz dChjb25maWdzX3RvX21hdGNoKSwgW3NldChbJ3JlbGVhc2UnLCAnZ3B1JywgJ2x1Y2lkJywgJ3g4 NiddKSwgc2V0KFsnZ3B1JywgJ3dpbjcnXSksIHNldChbJ3JlbGVhc2UnLCAnZ3B1JywgJ3hwJywg J3Nub3dsZW9wYXJkJ10pXSkKIAogICAgIGRlZiB0ZXN0X21hY3JvX2NvbGxhcHNpbmcoc2VsZik6 CisgICAgICAgIG1hY3JvcyA9IHsnZm9vJzogWydiYXInLCAnYmF6J10sICdwZW9wbGUnOiBbJ2Jv YicsICdhbGljZScsICdqb2huJ119CisKKyAgICAgICAgc3BlY2lmaWVyc19saXN0ID0gW3NldChb J2pvaG4nLCAnZ29kemlsbGEnLCAnYm9iJywgJ2FsaWNlJ10pXQorICAgICAgICBUZXN0Q29uZmln dXJhdGlvbkNvbnZlcnRlci5jb2xsYXBzZV9tYWNyb3MobWFjcm9zLCBzcGVjaWZpZXJzX2xpc3Qp CisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHNwZWNpZmllcnNfbGlzdCwgW3NldChbJ3Blb3Bs ZScsICdnb2R6aWxsYSddKV0pCisKKyAgICAgICAgc3BlY2lmaWVyc19saXN0ID0gW3NldChbJ2pv aG4nLCAnZ29kemlsbGEnLCAnYWxpY2UnXSldCisgICAgICAgIFRlc3RDb25maWd1cmF0aW9uQ29u dmVydGVyLmNvbGxhcHNlX21hY3JvcyhtYWNyb3MsIHNwZWNpZmllcnNfbGlzdCkKKyAgICAgICAg c2VsZi5hc3NlcnRFcXVhbHMoc3BlY2lmaWVyc19saXN0LCBbc2V0KFsnam9obicsICdnb2R6aWxs YScsICdhbGljZScsICdnb2R6aWxsYSddKV0pCisKKyAgICAgICAgc3BlY2lmaWVyc19saXN0ID0g W3NldChbJ2JhcicsICdnb2R6aWxsYScsICdiYXonLCAnYm9iJywgJ2FsaWNlJywgJ2pvaG4nXSld CisgICAgICAgIFRlc3RDb25maWd1cmF0aW9uQ29udmVydGVyLmNvbGxhcHNlX21hY3JvcyhtYWNy b3MsIHNwZWNpZmllcnNfbGlzdCkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoc3BlY2lmaWVy c19saXN0LCBbc2V0KFsnZm9vJywgJ2dvZHppbGxhJywgJ3Blb3BsZSddKV0pCisKKyAgICAgICAg c3BlY2lmaWVyc19saXN0ID0gW3NldChbJ2JhcicsICdnb2R6aWxsYScsICdiYXonLCAnYm9iJ10p LCBzZXQoWydiYXInLCAnYmF6J10pLCBzZXQoWydwZW9wbGUnLCAnYWxpY2UnLCAnYm9iJywgJ2pv aG4nXSldCisgICAgICAgIFRlc3RDb25maWd1cmF0aW9uQ29udmVydGVyLmNvbGxhcHNlX21hY3Jv cyhtYWNyb3MsIHNwZWNpZmllcnNfbGlzdCkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoc3Bl Y2lmaWVyc19saXN0LCBbc2V0KFsnYm9iJywgJ2ZvbycsICdnb2R6aWxsYSddKSwgc2V0KFsnZm9v J10pLCBzZXQoWydwZW9wbGUnXSldKQorCisgICAgZGVmIHRlc3RfY29udmVydGVyX21hY3JvX2Nv bGxhcHNpbmcoc2VsZik6CiAgICAgICAgIGNvbnZlcnRlciA9IFRlc3RDb25maWd1cmF0aW9uQ29u dmVydGVyKHNlbGYuX2FsbF90ZXN0X2NvbmZpZ3VyYXRpb25zLCBzZWxmLl9tYWNyb3MpCiAKICAg ICAgICAgY29uZmlnc190b19tYXRjaCA9IHNldChbCg==