31543 2009-11-16 04:08:49 -0800 Move more patch-landing code into WebKitLandingScripts in preparation for land-attachment 2009-11-16 04:12:15 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 eric webkit-unassigned abarth ddkilzer levin oldest_to_newest 163933 0 eric 2009-11-16 04:08:49 -0800 Move more patch-landing code into WebKitLandingScripts in preparation for land-attachment 163934 1 eric 2009-11-16 04:09:20 -0800 All the "hard" work of simplifying this code was already done in previous patches. Just moving it here. The next patch will add LandAttachment. 163935 2 43290 eric 2009-11-16 04:10:32 -0800 Created attachment 43290 Patch 163936 3 eric 2009-11-16 04:12:15 -0800 Committed r51029: <http://trac.webkit.org/changeset/51029> 43290 2009-11-16 04:10:32 -0800 2009-11-16 04:11:03 -0800 Patch bug-31543-20091116041030.patch text/plain 6554 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA2MzI0MmRmLi4yYzE1MDNiIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTYgQEAKIDIwMDktMTEt MTYgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vdmUgbW9yZSBwYXRjaC1sYW5kaW5nIGNvZGUg aW50byBXZWJLaXRMYW5kaW5nU2NyaXB0cyBpbiBwcmVwYXJhdGlvbiBmb3IgbGFuZC1hdHRhY2ht ZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMTU0 MworCisgICAgICAgIEp1c3QgbW92aW5nIGNvZGUgYW5kIHVwZGF0aW5nIHRoZSBvbmUgY2FsbGVy IHRvIHVzZSBXZWJLaXRMYW5kaW5nU2NyaXB0cyBpbnN0ZWFkIG9mICdzZWxmJy4KKworICAgICAg ICAqIFNjcmlwdHMvYnVnemlsbGEtdG9vbDoKKworMjAwOS0xMS0xNiAgRXJpYyBTZWlkZWwgIDxl cmljQHdlYmtpdC5vcmc+CisKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KIAogICAg ICAgICBEaXNhYmxlIHRoZSBzdHlsZSBxdWV1ZSBmcm9tIHBvc3RpbmcgdG8gdGhlIGNvbW1pdCBx dWV1ZSBzdGF0dXMgcGFnZS4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvYnVnemls bGEtdG9vbCBiL1dlYktpdFRvb2xzL1NjcmlwdHMvYnVnemlsbGEtdG9vbAppbmRleCA3NjdkZWM2 Li4wMGM3M2IwIDEwMDc1NQotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL2J1Z3ppbGxhLXRvb2wK KysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9idWd6aWxsYS10b29sCkBAIC0zMTQsNiArMzE0LDQ2 IEBAIGNsYXNzIFdlYktpdExhbmRpbmdTY3JpcHRzOgogICAgICAgICBjb21taXRfbG9nID0gc2Nt LmNvbW1pdF93aXRoX21lc3NhZ2UoY29tbWl0X21lc3NhZ2UubWVzc2FnZSgpKQogICAgICAgICBy ZXR1cm4gYnVnX2NvbW1lbnRfZnJvbV9jb21taXRfdGV4dChzY20sIGNvbW1pdF9sb2cpCiAKKyAg ICBAY2xhc3NtZXRob2QKKyAgICBkZWYgX2Nsb3NlX2J1Z19pZl9ub19hY3RpdmVfcGF0Y2hlcyhj bHMsIGJ1Z3MsIGJ1Z19pZCk6CisgICAgICAgICMgQ2hlY2sgdG8gbWFrZSBzdXJlIHRoZXJlIGFy ZSBubyByPyBvciByKyBwYXRjaGVzIG9uIHRoZSBidWcgYmVmb3JlIGNsb3NpbmcuCisgICAgICAg ICMgQXNzdW1lIHRoYXQgci0gcGF0Y2hlcyBhcmUganVzdCBwcmV2aW91cyBwYXRjaGVzIHNvbWVv bmUgZm9yZ290IHRvIG9ic29sZXRlLgorICAgICAgICBwYXRjaGVzID0gYnVncy5mZXRjaF9wYXRj aGVzX2Zyb21fYnVnKGJ1Z19pZCkKKyAgICAgICAgZm9yIHBhdGNoIGluIHBhdGNoZXM6CisgICAg ICAgICAgICByZXZpZXdfZmxhZyA9IHBhdGNoLmdldCgncmV2aWV3JykKKyAgICAgICAgICAgIGlm IHJldmlld19mbGFnID09ICc/JyBvciByZXZpZXdfZmxhZyA9PSAnKyc6CisgICAgICAgICAgICAg ICAgbG9nKCJOb3QgY2xvc2luZyBidWcgJXMgYXMgYXR0YWNobWVudCAlcyBoYXMgcmV2aWV3PSVz LiAgQXNzdW1pbmcgdGhlcmUgYXJlIG1vcmUgcGF0Y2hlcyB0byBsYW5kIGZyb20gdGhpcyBidWcu IiAlIChwYXRjaFsnYnVnX2lkJ10sIHBhdGNoWydpZCddLCByZXZpZXdfZmxhZykpCisgICAgICAg ICAgICAgICAgcmV0dXJuCisgICAgICAgIGJ1Z3MuY2xvc2VfYnVnX2FzX2ZpeGVkKGJ1Z19pZCwg IkFsbCByZXZpZXdlZCBwYXRjaGVzIGhhdmUgYmVlbiBsYW5kZWQuICBDbG9zaW5nIGJ1Zy4iKQor CisgICAgQGNsYXNzbWV0aG9kCisgICAgZGVmIF9sYW5kX3BhdGNoKGNscywgcGF0Y2gsIG9wdGlv bnMsIHRvb2wpOgorICAgICAgICB0b29sLnNjbSgpLnVwZGF0ZV93ZWJraXQoKSAjIFVwZGF0ZSBi ZWZvcmUgZXZlcnkgcGF0Y2ggaW4gY2FzZSB0aGUgdHJlZSBoYXMgY2hhbmdlZAorICAgICAgICBs b2coIkFwcGx5aW5nICVzIGZyb20gYnVnICVzLiIgJSAocGF0Y2hbJ2lkJ10sIHBhdGNoWydidWdf aWQnXSkpCisgICAgICAgIHRvb2wuc2NtKCkuYXBwbHlfcGF0Y2gocGF0Y2gsIGZvcmNlPW9wdGlv bnMuY29tbWl0X3F1ZXVlKQorCisgICAgICAgICMgTWFrZSBzdXJlIHRoZSB0cmVlIGlzIHN0aWxs IGdyZWVuIGFmdGVyIHVwZGF0aW5nLCBiZWZvcmUgYnVpbGRpbmcgdGhpcyBwYXRjaC4KKyAgICAg ICAgIyBUaGUgZmlyc3QgcGF0Y2ggZW5kcyB1cCBjaGVja2luZyB0cmVlIHN0YXR1cyB0d2ljZSwg YnV0IHRoYXQncyBPSy4KKyAgICAgICAgV2ViS2l0TGFuZGluZ1NjcmlwdHMuZW5zdXJlX2J1aWxk ZXJzX2FyZV9ncmVlbih0b29sLmJ1aWxkYm90LCBvcHRpb25zKQorICAgICAgICBjb21tZW50X3Rl eHQgPSBXZWJLaXRMYW5kaW5nU2NyaXB0cy5idWlsZF9hbmRfY29tbWl0KHRvb2wuc2NtKCksIG9w dGlvbnMpCisgICAgICAgIHRvb2wuYnVncy5jbGVhcl9hdHRhY2htZW50X2ZsYWdzKHBhdGNoWydp ZCddLCBjb21tZW50X3RleHQpCisKKyAgICBAY2xhc3NtZXRob2QKKyAgICBkZWYgbGFuZF9wYXRj aGVzKGNscywgcGF0Y2hlcywgb3B0aW9ucywgdG9vbCk6CisgICAgICAgIHRyeToKKyAgICAgICAg ICAgIGZvciBwYXRjaCBpbiBwYXRjaGVzOgorICAgICAgICAgICAgICAgIGNscy5fbGFuZF9wYXRj aChwYXRjaCwgb3B0aW9ucywgdG9vbCkKKyAgICAgICAgICAgIGlmIG9wdGlvbnMuY2xvc2VfYnVn IGFuZCBwYXRjaGVzOgorICAgICAgICAgICAgICAgIGNscy5fY2xvc2VfYnVnX2lmX25vX2FjdGl2 ZV9wYXRjaGVzKHRvb2wuYnVncywgcGF0Y2hlc1swXVsnYnVnX2lkJ10pCisgICAgICAgIGV4Y2Vw dCBDaGVja291dE5lZWRzVXBkYXRlLCBlOgorICAgICAgICAgICAgbG9nKCJDb21taXQgZmFpbGVk IGJlY2F1c2UgdGhlIGNoZWNrb3V0IGlzIG91dCBvZiBkYXRlLiAgUGxlYXNlIHVwZGF0ZSBhbmQg dHJ5IGFnYWluLiIpCisgICAgICAgICAgICBsb2coIllvdSBjYW4gcGFzcyAtLW5vLWJ1aWxkIHRv IHNraXAgYnVpbGRpbmcvdGVzdGluZyBhZnRlciB1cGRhdGUgaWYgeW91IGJlbGlldmUgdGhlIG5l dyBjb21taXRzIGRpZCBub3QgYWZmZWN0IHRoZSByZXN1bHRzLiIpCisgICAgICAgICAgICBXb3Jr UXVldWUuZXhpdF9hZnRlcl9oYW5kbGVkX2Vycm9yKGUpCisgICAgICAgIGV4Y2VwdCBTY3JpcHRF cnJvciwgZToKKyAgICAgICAgICAgICMgTWFyayB0aGUgcGF0Y2ggYXMgY29tbWl0LXF1ZXVlLSBh bmQgY29tbWVudCBpbiB0aGUgYnVnLgorICAgICAgICAgICAgdG9vbC5idWdzLnJlamVjdF9wYXRj aF9mcm9tX2NvbW1pdF9xdWV1ZShwYXRjaFsnaWQnXSwgZS5tZXNzYWdlX3dpdGhfb3V0cHV0KCkp CisgICAgICAgICAgICBXb3JrUXVldWUuZXhpdF9hZnRlcl9oYW5kbGVkX2Vycm9yKGUpCisKIAog Y2xhc3MgTGFuZEFuZFVwZGF0ZUJ1ZyhDb21tYW5kKToKICAgICBkZWYgX19pbml0X18oc2VsZik6 CkBAIC0zNzUsNDYgKzQxNSw2IEBAIGNsYXNzIExhbmRQYXRjaGVzRnJvbUJ1Z3MoQ29tbWFuZCk6 CiAgICAgICAgIG9wdGlvbnMgKz0gV2ViS2l0TGFuZGluZ1NjcmlwdHMubGFuZF9vcHRpb25zKCkK ICAgICAgICAgQ29tbWFuZC5fX2luaXRfXyhzZWxmLCAnTGFuZHMgYWxsIHBhdGNoZXMgb24gYSBi dWcgb3B0aW9uYWxseSB0ZXN0aW5nIHRoZW0gZmlyc3QnLCAnQlVHSUQnLCBvcHRpb25zPW9wdGlv bnMpCiAKLSAgICBAY2xhc3NtZXRob2QKLSAgICBkZWYgX2Nsb3NlX2J1Z19pZl9ub19hY3RpdmVf cGF0Y2hlcyhjbHMsIGJ1Z3MsIGJ1Z19pZCk6Ci0gICAgICAgICMgQ2hlY2sgdG8gbWFrZSBzdXJl IHRoZXJlIGFyZSBubyByPyBvciByKyBwYXRjaGVzIG9uIHRoZSBidWcgYmVmb3JlIGNsb3Npbmcu Ci0gICAgICAgICMgQXNzdW1lIHRoYXQgci0gcGF0Y2hlcyBhcmUganVzdCBwcmV2aW91cyBwYXRj aGVzIHNvbWVvbmUgZm9yZ290IHRvIG9ic29sZXRlLgotICAgICAgICBwYXRjaGVzID0gYnVncy5m ZXRjaF9wYXRjaGVzX2Zyb21fYnVnKGJ1Z19pZCkKLSAgICAgICAgZm9yIHBhdGNoIGluIHBhdGNo ZXM6Ci0gICAgICAgICAgICByZXZpZXdfZmxhZyA9IHBhdGNoLmdldCgncmV2aWV3JykKLSAgICAg ICAgICAgIGlmIHJldmlld19mbGFnID09ICc/JyBvciByZXZpZXdfZmxhZyA9PSAnKyc6Ci0gICAg ICAgICAgICAgICAgbG9nKCJOb3QgY2xvc2luZyBidWcgJXMgYXMgYXR0YWNobWVudCAlcyBoYXMg cmV2aWV3PSVzLiAgQXNzdW1pbmcgdGhlcmUgYXJlIG1vcmUgcGF0Y2hlcyB0byBsYW5kIGZyb20g dGhpcyBidWcuIiAlIChwYXRjaFsnYnVnX2lkJ10sIHBhdGNoWydpZCddLCByZXZpZXdfZmxhZykp Ci0gICAgICAgICAgICAgICAgcmV0dXJuCi0gICAgICAgIGJ1Z3MuY2xvc2VfYnVnX2FzX2ZpeGVk KGJ1Z19pZCwgIkFsbCByZXZpZXdlZCBwYXRjaGVzIGhhdmUgYmVlbiBsYW5kZWQuICBDbG9zaW5n IGJ1Zy4iKQotCi0gICAgQGNsYXNzbWV0aG9kCi0gICAgZGVmIF9sYW5kX3BhdGNoKGNscywgcGF0 Y2gsIG9wdGlvbnMsIHRvb2wpOgotICAgICAgICB0b29sLnNjbSgpLnVwZGF0ZV93ZWJraXQoKSAj IFVwZGF0ZSBiZWZvcmUgZXZlcnkgcGF0Y2ggaW4gY2FzZSB0aGUgdHJlZSBoYXMgY2hhbmdlZAot ICAgICAgICBsb2coIkFwcGx5aW5nICVzIGZyb20gYnVnICVzLiIgJSAocGF0Y2hbJ2lkJ10sIHBh dGNoWydidWdfaWQnXSkpCi0gICAgICAgIHRvb2wuc2NtKCkuYXBwbHlfcGF0Y2gocGF0Y2gsIGZv cmNlPW9wdGlvbnMuY29tbWl0X3F1ZXVlKQotCi0gICAgICAgICMgTWFrZSBzdXJlIHRoZSB0cmVl IGlzIHN0aWxsIGdyZWVuIGFmdGVyIHVwZGF0aW5nLCBiZWZvcmUgYnVpbGRpbmcgdGhpcyBwYXRj aC4KLSAgICAgICAgIyBUaGUgZmlyc3QgcGF0Y2ggZW5kcyB1cCBjaGVja2luZyB0cmVlIHN0YXR1 cyB0d2ljZSwgYnV0IHRoYXQncyBPSy4KLSAgICAgICAgV2ViS2l0TGFuZGluZ1NjcmlwdHMuZW5z dXJlX2J1aWxkZXJzX2FyZV9ncmVlbih0b29sLmJ1aWxkYm90LCBvcHRpb25zKQotICAgICAgICBj b21tZW50X3RleHQgPSBXZWJLaXRMYW5kaW5nU2NyaXB0cy5idWlsZF9hbmRfY29tbWl0KHRvb2wu c2NtKCksIG9wdGlvbnMpCi0gICAgICAgIHRvb2wuYnVncy5jbGVhcl9hdHRhY2htZW50X2ZsYWdz KHBhdGNoWydpZCddLCBjb21tZW50X3RleHQpCi0KLSAgICBAY2xhc3NtZXRob2QKLSAgICBkZWYg bGFuZF9wYXRjaGVzKGNscywgcGF0Y2hlcywgb3B0aW9ucywgdG9vbCk6Ci0gICAgICAgIHRyeToK LSAgICAgICAgICAgIGZvciBwYXRjaCBpbiBwYXRjaGVzOgotICAgICAgICAgICAgICAgIGNscy5f bGFuZF9wYXRjaChwYXRjaCwgb3B0aW9ucywgdG9vbCkKLSAgICAgICAgICAgIGlmIG9wdGlvbnMu Y2xvc2VfYnVnIGFuZCBwYXRjaGVzOgotICAgICAgICAgICAgICAgIGNscy5fY2xvc2VfYnVnX2lm X25vX2FjdGl2ZV9wYXRjaGVzKHRvb2wuYnVncywgcGF0Y2hlc1swXVsnYnVnX2lkJ10pCi0gICAg ICAgIGV4Y2VwdCBDaGVja291dE5lZWRzVXBkYXRlLCBlOgotICAgICAgICAgICAgbG9nKCJDb21t aXQgZmFpbGVkIGJlY2F1c2UgdGhlIGNoZWNrb3V0IGlzIG91dCBvZiBkYXRlLiAgUGxlYXNlIHVw ZGF0ZSBhbmQgdHJ5IGFnYWluLiIpCi0gICAgICAgICAgICBsb2coIllvdSBjYW4gcGFzcyAtLW5v LWJ1aWxkIHRvIHNraXAgYnVpbGRpbmcvdGVzdGluZyBhZnRlciB1cGRhdGUgaWYgeW91IGJlbGll dmUgdGhlIG5ldyBjb21taXRzIGRpZCBub3QgYWZmZWN0IHRoZSByZXN1bHRzLiIpCi0gICAgICAg ICAgICBXb3JrUXVldWUuZXhpdF9hZnRlcl9oYW5kbGVkX2Vycm9yKGUpCi0gICAgICAgIGV4Y2Vw dCBTY3JpcHRFcnJvciwgZToKLSAgICAgICAgICAgICMgTWFyayB0aGUgcGF0Y2ggYXMgY29tbWl0 LXF1ZXVlLSBhbmQgY29tbWVudCBpbiB0aGUgYnVnLgotICAgICAgICAgICAgdG9vbC5idWdzLnJl amVjdF9wYXRjaF9mcm9tX2NvbW1pdF9xdWV1ZShwYXRjaFsnaWQnXSwgZS5tZXNzYWdlX3dpdGhf b3V0cHV0KCkpCi0gICAgICAgICAgICBXb3JrUXVldWUuZXhpdF9hZnRlcl9oYW5kbGVkX2Vycm9y KGUpCi0KICAgICBAc3RhdGljbWV0aG9kCiAgICAgZGVmIF9mZXRjaF9saXN0X29mX3BhdGNoZXNf dG9fbGFuZChvcHRpb25zLCBhcmdzLCB0b29sKToKICAgICAgICAgYnVnc190b19wYXRjaGVzID0g e30KQEAgLTQ0Niw3ICs0NDYsNyBAQCBjbGFzcyBMYW5kUGF0Y2hlc0Zyb21CdWdzKENvbW1hbmQp OgogCiAgICAgICAgIFdlYktpdExhbmRpbmdTY3JpcHRzLnByZXBhcmVfY2xlYW5fd29ya2luZ19k aXJlY3RvcnkodG9vbC5zY20oKSwgb3B0aW9ucykKICAgICAgICAgZm9yIGJ1Z19pZCBpbiBidWdz X3RvX3BhdGNoZXMua2V5cygpOgotICAgICAgICAgICAgc2VsZi5sYW5kX3BhdGNoZXMoYnVnc190 b19wYXRjaGVzW2J1Z19pZF0sIG9wdGlvbnMsIHRvb2wpCisgICAgICAgICAgICBXZWJLaXRMYW5k aW5nU2NyaXB0cy5sYW5kX3BhdGNoZXMoYnVnc190b19wYXRjaGVzW2J1Z19pZF0sIG9wdGlvbnMs IHRvb2wpCiAKIAogY2xhc3MgQ29tbWl0TWVzc2FnZUZvckN1cnJlbnREaWZmKENvbW1hbmQpOgo=