51961 2011-01-05 15:09:36 -0800 assorted cleanups to prepare for side-by-side diffing 2011-01-05 18:50:32 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 ojan ojan abarth commit-queue eric oldest_to_newest 329816 0 ojan 2011-01-05 15:09:36 -0800 assorted cleanups to prepare for side-by-side diffing 329817 1 78052 ojan 2011-01-05 15:10:27 -0800 Created attachment 78052 Patch 329973 2 78052 commit-queue 2011-01-05 18:50:27 -0800 Comment on attachment 78052 Patch Clearing flags on attachment: 78052 Committed r75130: <http://trac.webkit.org/changeset/75130> 329974 3 commit-queue 2011-01-05 18:50:32 -0800 All reviewed patches have been landed. Closing bug. 78052 2011-01-05 15:10:27 -0800 2011-01-05 18:50:27 -0800 Patch bug-51961-20110105151026.patch text/plain 3468 ojan ZGlmZiAtLWdpdCBhL1dlYnNpdGVzL2J1Z3Mud2Via2l0Lm9yZy9DaGFuZ2VMb2cgYi9XZWJzaXRl cy9idWdzLndlYmtpdC5vcmcvQ2hhbmdlTG9nCmluZGV4IDQ2OTI3YzRmM2NlMGE5Y2E1NDVlNTZk NWVjNzE5ODEzN2NjNWYxM2EuLmIwODg4ZmI3ZGZlNjA1NWUxMTI3M2QxOWRiOTQ1YWIzMTNlYzVk MTMgMTAwNjQ0Ci0tLSBhL1dlYnNpdGVzL2J1Z3Mud2Via2l0Lm9yZy9DaGFuZ2VMb2cKKysrIGIv V2Vic2l0ZXMvYnVncy53ZWJraXQub3JnL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDEx LTAxLTA1ICBPamFuIFZhZmFpICA8b2phbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgYXNzb3J0ZWQgY2xlYW51cHMgdG8gcHJl cGFyZSBmb3Igc2lkZS1ieS1zaWRlIGRpZmZpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTUxOTYxCisKKyAgICAgICAgTW9zdGx5LCB1c2Ugc2VsZWN0 b3IgcXVlcmllcyBpbnN0ZWFkIG9mIGFzc3VtaW5nIGNvbW1lbnRzIGFyZSBuZXh0IHNpYmxpbmdz LgorCisgICAgICAgICogY29kZS1yZXZpZXcuanM6CisKIDIwMTEtMDEtMDQgIE9qYW4gVmFmYWkg IDxvamFuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBJbmNyZW1lbnQgdmVyc2lvbiBudW1iZXIg dG8gYXZvaWQgZ2V0dGluZyB0aGUgY2FjaGVkIEpTIGZpbGUuCmRpZmYgLS1naXQgYS9XZWJzaXRl cy9idWdzLndlYmtpdC5vcmcvY29kZS1yZXZpZXcuanMgYi9XZWJzaXRlcy9idWdzLndlYmtpdC5v cmcvY29kZS1yZXZpZXcuanMKaW5kZXggZGFhOTllNzg3MTBiMjlhYTg1NTQ1MTdmM2I0MzM2MTc5 MDQ2NWRlNi4uYzQ5NzUzMGQ0ODAwYWFjZDZlN2Q5Yzk0ODM4NmEyYThmOGJiOTBjOCAxMDA2NDQK LS0tIGEvV2Vic2l0ZXMvYnVncy53ZWJraXQub3JnL2NvZGUtcmV2aWV3LmpzCisrKyBiL1dlYnNp dGVzL2J1Z3Mud2Via2l0Lm9yZy9jb2RlLXJldmlldy5qcwpAQCAtOTIsMjEgKzkyLDIxIEBACiAg ICAgfSk7CiAgIH0KIAorICBmdW5jdGlvbiBkaWZmU2VjdGlvbkZyb20obGluZSkgeworICAgIHJl dHVybiBsaW5lLnBhcmVudHMoJy5GaWxlRGlmZicpOworICB9CisKICAgZnVuY3Rpb24gcHJldmlv dXNDb21tZW50c0ZvcihsaW5lKSB7Ci0gICAgdmFyIGNvbW1lbnRzID0gW107Ci0gICAgdmFyIHBv c2l0aW9uID0gbGluZTsKLSAgICB3aGlsZSAocG9zaXRpb24ubmV4dCgpICYmIHBvc2l0aW9uLm5l eHQoKS5oYXNDbGFzcygncHJldmlvdXNDb21tZW50JykpIHsKLSAgICAgIHBvc2l0aW9uID0gcG9z aXRpb24ubmV4dCgpOwotICAgICAgY29tbWVudHMucHVzaChwb3NpdGlvbi5nZXQoKSk7Ci0gICAg fQotICAgIHJldHVybiAkKGNvbW1lbnRzKTsKKyAgICAvLyBTY29wZSB0byB0aGUgZGlmZlNlY3Rp b24gYXMgYSBwZXJmb3JtYW5jZSBpbXByb3ZlbWVudC4KKyAgICByZXR1cm4gJCgnZGl2W2RhdGEt Y29tbWVudC1mb3J+PSInICsgbGluZVswXS5pZCArICciXS5wcmV2aW91c0NvbW1lbnQnLCBkaWZm U2VjdGlvbkZyb20obGluZSkpOwogICB9CiAKICAgZnVuY3Rpb24gZmluZENvbW1lbnRQb3NpdGlv bkZvcihsaW5lKSB7Ci0gICAgdmFyIHBvc2l0aW9uID0gbGluZTsKLSAgICB3aGlsZSAocG9zaXRp b24ubmV4dCgpICYmIHBvc2l0aW9uLm5leHQoKS5oYXNDbGFzcygncHJldmlvdXNDb21tZW50Jykp Ci0gICAgICBwb3NpdGlvbiA9IHBvc2l0aW9uLm5leHQoKTsKLSAgICByZXR1cm4gcG9zaXRpb247 CisgICAgdmFyIHByZXZpb3VzX2NvbW1lbnRzID0gcHJldmlvdXNDb21tZW50c0ZvcihsaW5lKTsK KyAgICB2YXIgbnVtX3ByZXZpb3VzX2NvbW1lbnRzID0gcHJldmlvdXNfY29tbWVudHMuc2l6ZSgp OworICAgIGlmIChudW1fcHJldmlvdXNfY29tbWVudHMpCisgICAgICByZXR1cm4gJChwcmV2aW91 c19jb21tZW50c1tudW1fcHJldmlvdXNfY29tbWVudHMgLSAxXSkKKyAgICByZXR1cm4gbGluZTsK ICAgfQogCiAgIGZ1bmN0aW9uIGZpbmRDb21tZW50QmxvY2tGb3IobGluZSkgewpAQCAtMTk0LDYg KzE5NCw3IEBACiAgICAgICAgIGNvbnRpbnVlOwogICAgICAgdmFyIHF1b3RlX21hcmtlcnMgPSBw YXJ0c1sxXTsKICAgICAgIHZhciBmaWxlX25hbWUgPSBwYXJ0c1syXTsKKyAgICAgIC8vIEZJWE1F OiBTdG9yZSBtdWx0aXBsZSBsaW5lcyBmb3IgbXVsdGlsaW5lIGNvbW1lbnRzIGFuZCBjb3JyZWN0 bHkgaW1wb3J0IHRoZW0gaGVyZS4KICAgICAgIHZhciBsaW5lX251bWJlciA9IHBhcnRzWzNdOwog ICAgICAgaWYgKCFmaWxlX25hbWUgaW4gZmlsZXMpCiAgICAgICAgIGNvbnRpbnVlOwpAQCAtMzYx LDE5ICszNjIsMjQgQEAKICAgICAgICAgKGFtb3VudCA/IGFtb3VudCArICIgIiA6ICIiKSArIGRp cmVjdGlvbiArICI8L2E+IjsKICAgfQogCi0gICQod2luZG93KS5iaW5kKCdjbGljaycsIGZ1bmN0 aW9uIChlKSB7Ci0gICAgdmFyIHRhcmdldCA9IGUudGFyZ2V0OwotICAgIGlmICh0YXJnZXQuY2xh c3NOYW1lICE9ICdFeHBhbmRMaW5rJykKLSAgICAgIHJldHVybjsKLQotICAgIC8vIENhbid0IHVz ZSAkIGhlcmUgYmVjYXVzZSBzb21ldGhpbmcgaW4gdGhlIHdpbmRvdydzIHNjb3BlIHNldHMgJCB0 byBzb21ldGhpbmcgb3RoZXIgdGhhbiBqUXVlcnkuCi0gICAgdmFyIGV4cGFuZF9iYXIgPSBqUXVl cnkodGFyZ2V0KS5wYXJlbnRzKCcuRXhwYW5kQmFyJyk7CisgIGZ1bmN0aW9uIGhhbmRsZUV4cGFu ZExpbmtDbGljayh0YXJnZXQpIHsKKyAgICB2YXIgZXhwYW5kX2JhciA9ICQodGFyZ2V0KS5wYXJl bnRzKCcuRXhwYW5kQmFyJyk7CiAgICAgdmFyIGZpbGVfbmFtZSA9IGV4cGFuZF9iYXIucGFyZW50 cygnLkZpbGVEaWZmJykuY2hpbGRyZW4oJ2gxJylbMF0udGV4dENvbnRlbnQ7CiAgICAgdmFyIGV4 cGFuZF9mdW5jdGlvbiA9IHBhcnRpYWwoZXhwYW5kLCBleHBhbmRfYmFyWzBdLCBmaWxlX25hbWUs IHRhcmdldC5nZXRBdHRyaWJ1dGUoJ2RhdGEtZGlyZWN0aW9uJyksIE51bWJlcih0YXJnZXQuZ2V0 QXR0cmlidXRlKCdkYXRhLWFtb3VudCcpKSk7CiAgICAgaWYgKGZpbGVfbmFtZSBpbiBvcmlnaW5h bF9maWxlX2NvbnRlbnRzKQogICAgICAgZXhwYW5kX2Z1bmN0aW9uKCk7CiAgICAgZWxzZQogICAg ICAgZ2V0V2ViS2l0U291cmNlRmlsZShmaWxlX25hbWUsIGV4cGFuZF9mdW5jdGlvbiwgZXhwYW5k X2Jhcik7CisgIH07CisKKyAgJCh3aW5kb3cpLmJpbmQoJ2NsaWNrJywgZnVuY3Rpb24gKGUpIHsK KyAgICB2YXIgdGFyZ2V0ID0gZS50YXJnZXQ7CisKKyAgICBzd2l0Y2godGFyZ2V0LmNsYXNzTmFt ZSkgeworICAgIGNhc2UgJ0V4cGFuZExpbmsnOgorICAgICAgaGFuZGxlRXhwYW5kTGlua0NsaWNr KHRhcmdldCk7CisgICAgICBicmVhazsKKyAgICB9CiAgIH0pOwogCiAgIGZ1bmN0aW9uIGdldFdl YktpdFNvdXJjZUZpbGUoZmlsZV9uYW1lLCBvbkxvYWQsIGV4cGFuZF9iYXIpIHsK