34157 2010-01-26 01:17:22 -0800 REGRESSION(r53835): Fix editing/pasteboard/paste-noscript-xhtml.xhtml 2010-02-12 06:30:27 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 hausmann hausmann eric oldest_to_newest 184521 0 hausmann 2010-01-26 01:17:22 -0800 REGRESSION(r53835): Fix editing/pasteboard/paste-noscript-xhtml.xhtml 184522 1 47392 hausmann 2010-01-26 01:20:16 -0800 Created attachment 47392 Patch 184525 2 47392 zecke 2010-01-26 01:32:47 -0800 Comment on attachment 47392 Patch Looks fine. 186657 3 eric 2010-02-01 16:13:08 -0800 Attachment 47392 was posted by a committer and has review+, assigning to Simon Hausmann for commit. 190033 4 hausmann 2010-02-12 06:30:27 -0800 Landed in r53845 47392 2010-01-26 01:20:16 -0800 2010-01-26 02:03:12 -0800 Patch bug-34157-20100126102013.patch text/plain 6213 hausmann ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAwZThiMTI0Li42OGQ4NjExIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTAtMDEt MjYgIFNpbW9uIEhhdXNtYW5uICA8c2ltb24uaGF1c21hbm5Abm9raWEuY29tPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJFR1JFU1NJT04ocjUzODM1 KTogRml4IGVkaXRpbmcvcGFzdGVib2FyZC9wYXN0ZS1ub3NjcmlwdC14aHRtbC54aHRtbAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzQxNTcKKworICAg ICAgICBBZGQgUXQgc3BlY2lmaWMgcmVzdWx0IGZvciB0aGlzIHRlc3QgdGhhdCBkaWZmZXJzIGZy b20gdGhlIGNyb3NzLXBsYXRmb3JtCisgICAgICAgIHJlc3VsdCBpbiBvbmx5IG9uZSBjaGFyYWN0 ZXI6IEluIGh0bWxjb250ZW50Lmh0bWwgdGhlIGhyZWYgYXR0cmlidXRlIHZhbHVlCisgICAgICAg IGlzIGh0dHA6Ly93d3cuY25uLmNvbSwgd2hpY2ggc29tZWhvdyBiZWNvbWVzIGh0dHA6Ly93d3cu Y25uLmNvbS8gaW4gdGhlIGNyb3NzCisgICAgICAgIHBsYXRmb3JtIHJlc3VsdC4gV2l0aCB0aGUg UXQgeG1sIHBhcnNlciB0aGF0IGF0dHJpYnV0ZSBpcyBzb21laG93IHByZXNlcnZlZAorICAgICAg ICBhbmQgc28gb3VyIHJlc3VsdCBkb2VzIG5vdCBoYXZlIHRoZSB0cmFpbGluZyBzbGFzaC4KKwor ICAgICAgICAqIHBsYXRmb3JtL3F0L2VkaXRpbmcvcGFzdGVib2FyZC9wYXN0ZS1ub3NjcmlwdC14 aHRtbC1leHBlY3RlZC50eHQ6IEFkZGVkLgorCiAyMDEwLTAxLTIyICBKZXJlbXkgT3Jsb3cgIDxq b3Jsb3dAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvZWRpdGluZy9wYXN0ZWJvYXJkL3Bh c3RlLW5vc2NyaXB0LXhodG1sLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0 L2VkaXRpbmcvcGFzdGVib2FyZC9wYXN0ZS1ub3NjcmlwdC14aHRtbC1leHBlY3RlZC50eHQKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZDc1NmFjMQotLS0gL2Rldi9udWxsCisr KyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0L2VkaXRpbmcvcGFzdGVib2FyZC9wYXN0ZS1ub3Nj cmlwdC14aHRtbC1leHBlY3RlZC50eHQKQEAgLTAsMCArMSw3IEBACitBTEVSVDogaGVsbG8KK0NP TlNPTEUgTUVTU0FHRTogbGluZSAxOiBSZWZlcmVuY2VFcnJvcjogQ2FuJ3QgZmluZCB2YXJpYWJs ZTogc2F5SGVsbG8KK1RoaXMgdGVzdCBjb3BpZXMgdGhlIGNvbnRlbnQgb2YgYW4gaWZyYW1lIGFu ZCBwYXN0ZXMgaXQgaW4gYW4gZWRpdGFibGUgYXJlYSBpbiBhbiB4aHRtbCBkb2N1bWVudCBhbmQg dmVyaWZpZXMgdGhhdCBubyBzY3JpcHQsIGhhbmRsZXJzIG9yIGphdmFzY3JpcHQgdXJscyBhcmUg Y29waWVkLgorCitIZWxsb0NOTkhlbGxvCitUaGlzIGlzIGEgZm9ybQorPGJ1dHRvbiB4bWxucz0i aHR0cDovL3d3dy53My5vcmcvMTk5OS94aHRtbCIgaWQ9ImJ1dHRvbjEiIHN0eWxlPSJ3aWR0aDog MTAwcHg7ICI+SGVsbG88L2J1dHRvbj48YSB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94 aHRtbCIgaWQ9ImFuY2hvcjEiIGhyZWY9Imh0dHA6Ly93d3cuY25uLmNvbSI+Q05OPC9hPjxhIHht bG5zPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hodG1sIiBpZD0iYW5jaG9yMiI+SGVsbG88L2E+ PGlmcmFtZSB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94aHRtbCIgaWQ9ImlmcmFtZTEi IHN0eWxlPSJ3aWR0aDogMjAwcHg7IGhlaWdodDogMTAwcHg7IGJhY2tncm91bmQtY29sb3I6IHJn YigyMDQsIDIzOCwgMjM4KTsgIj48L2lmcmFtZT48Zm9ybSB4bWxucz0iaHR0cDovL3d3dy53My5v cmcvMTk5OS94aHRtbCIgaWQ9ImZvcm0xIiBzdHlsZT0id2lkdGg6IDIwMHB4OyBoZWlnaHQ6IDE1 MHB4OyBiYWNrZ3JvdW5kLWNvbG9yOiByZ2IoMjA0LCAyMzgsIDIzOCk7ICI+VGhpcyBpcyBhIGZv cm08L2Zvcm0+CmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdl TG9nCmluZGV4IDQ3YzBkNmUuLjMyNGFmMGYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9n CisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTAtMDEtMjYgIFNp bW9uIEhhdXNtYW5uICA8c2ltb24uaGF1c21hbm5Abm9raWEuY29tPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJFR1JFU1NJT04ocjUzODM1KTogRml4 IGVkaXRpbmcvcGFzdGVib2FyZC9wYXN0ZS1ub3NjcmlwdC14aHRtbC54aHRtbAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzQxNTcKKworICAgICAgICBQ YXNzIHRoZSBGcmFnbWVudFNjcmlwdGluZ1Blcm1pc3Npb24gY29ycmVjdGx5IHRocm91Z2ggdG8g dGhlIERPTQorICAgICAgICBhbmQgZGlzYWxsb3cgc2NyaXB0aW5nIGVsZW1lbnRzIGluIHBhcnNl RW5kRWxlbWVudCgpLCBzaW1pbGFyIHRvCisgICAgICAgIHRoZSBsaWJ4bWwgdG9rZW5pemVyIGNo YW5nZSBpbiByNTM4MzUuCisKKyAgICAgICAgKiBkb20vWE1MVG9rZW5pemVyUXQuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6aGFuZGxlRWxlbWVudE5hbWVzcGFjZXMpOgorICAgICAgICAoV2ViQ29y ZTo6aGFuZGxlRWxlbWVudEF0dHJpYnV0ZXMpOgorICAgICAgICAoV2ViQ29yZTo6WE1MVG9rZW5p emVyOjpwYXJzZVN0YXJ0RWxlbWVudCk6CisgICAgICAgIChXZWJDb3JlOjpYTUxUb2tlbml6ZXI6 OnBhcnNlRW5kRWxlbWVudCk6CisKIDIwMTAtMDEtMjYgIEFuZHJhcyBCZWNzaSAgPGFiZWNzaUBp bmYudS1zemVnZWQuaHU+CiAKICAgICAgICAgVW5yZXZpZXdlZCBidWlsZCBmaXguCmRpZmYgLS1n aXQgYS9XZWJDb3JlL2RvbS9YTUxUb2tlbml6ZXJRdC5jcHAgYi9XZWJDb3JlL2RvbS9YTUxUb2tl bml6ZXJRdC5jcHAKaW5kZXggMDU2NDhmOC4uNTMzNWIwNyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9k b20vWE1MVG9rZW5pemVyUXQuY3BwCisrKyBiL1dlYkNvcmUvZG9tL1hNTFRva2VuaXplclF0LmNw cApAQCAtMzI0LDE5ICszMjQsMjAgQEAgc3RhdGljIGlubGluZSBTdHJpbmcgcHJlZml4RnJvbVFO YW1lKGNvbnN0IFFTdHJpbmcmIHFOYW1lKQogfQogCiBzdGF0aWMgaW5saW5lIHZvaWQgaGFuZGxl RWxlbWVudE5hbWVzcGFjZXMoRWxlbWVudCogbmV3RWxlbWVudCwgY29uc3QgUVhtbFN0cmVhbU5h bWVzcGFjZURlY2xhcmF0aW9ucyAmbnMsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgRXhjZXB0aW9uQ29kZSYgZWMpCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgRXhjZXB0aW9uQ29kZSYgZWMsIEZyYWdtZW50U2NyaXB0aW5nUGVy bWlzc2lvbiBzY3JpcHRpbmdQZXJtaXNzaW9uKQogewogICAgIGZvciAoaW50IGkgPSAwOyBpIDwg bnMuY291bnQoKTsgKytpKSB7CiAgICAgICAgIGNvbnN0IFFYbWxTdHJlYW1OYW1lc3BhY2VEZWNs YXJhdGlvbiAmZGVjbCA9IG5zW2ldOwogICAgICAgICBTdHJpbmcgbmFtZXNwYWNlVVJJID0gZGVj bC5uYW1lc3BhY2VVcmkoKTsKICAgICAgICAgU3RyaW5nIG5hbWVzcGFjZVFOYW1lID0gZGVjbC5w cmVmaXgoKS5pc0VtcHR5KCkgPyBTdHJpbmcoInhtbG5zIikgOiBTdHJpbmcoInhtbG5zOiIpICsg ZGVjbC5wcmVmaXgoKTsKLSAgICAgICAgbmV3RWxlbWVudC0+c2V0QXR0cmlidXRlTlMoImh0dHA6 Ly93d3cudzMub3JnLzIwMDAveG1sbnMvIiwgbmFtZXNwYWNlUU5hbWUsIG5hbWVzcGFjZVVSSSwg ZWMpOworICAgICAgICBuZXdFbGVtZW50LT5zZXRBdHRyaWJ1dGVOUygiaHR0cDovL3d3dy53My5v cmcvMjAwMC94bWxucy8iLCBuYW1lc3BhY2VRTmFtZSwgbmFtZXNwYWNlVVJJLCBlYywgc2NyaXB0 aW5nUGVybWlzc2lvbik7CiAgICAgICAgIGlmIChlYykgLy8gZXhjZXB0aW9uIHNldHRpbmcgYXR0 cmlidXRlcwogICAgICAgICAgICAgcmV0dXJuOwogICAgIH0KIH0KIAotc3RhdGljIGlubGluZSB2 b2lkIGhhbmRsZUVsZW1lbnRBdHRyaWJ1dGVzKEVsZW1lbnQqIG5ld0VsZW1lbnQsIGNvbnN0IFFY bWxTdHJlYW1BdHRyaWJ1dGVzICZhdHRycywgRXhjZXB0aW9uQ29kZSYgZWMpCitzdGF0aWMgaW5s aW5lIHZvaWQgaGFuZGxlRWxlbWVudEF0dHJpYnV0ZXMoRWxlbWVudCogbmV3RWxlbWVudCwgY29u c3QgUVhtbFN0cmVhbUF0dHJpYnV0ZXMgJmF0dHJzLCBFeGNlcHRpb25Db2RlJiBlYywKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBGcmFnbWVudFNjcmlwdGluZ1Bl cm1pc3Npb24gc2NyaXB0aW5nUGVybWlzc2lvbikKIHsKICAgICBmb3IgKGludCBpID0gMDsgaSA8 IGF0dHJzLmNvdW50KCk7ICsraSkgewogICAgICAgICBjb25zdCBRWG1sU3RyZWFtQXR0cmlidXRl ICZhdHRyID0gYXR0cnNbaV07CkBAIC0zNDQsNyArMzQ1LDcgQEAgc3RhdGljIGlubGluZSB2b2lk IGhhbmRsZUVsZW1lbnRBdHRyaWJ1dGVzKEVsZW1lbnQqIG5ld0VsZW1lbnQsIGNvbnN0IFFYbWxT dHJlYW0KICAgICAgICAgU3RyaW5nIGF0dHJWYWx1ZSAgICAgPSBhdHRyLnZhbHVlKCk7CiAgICAg ICAgIFN0cmluZyBhdHRyVVJJICAgICAgID0gYXR0ci5uYW1lc3BhY2VVcmkoKS5pc0VtcHR5KCkg PyBTdHJpbmcoKSA6IFN0cmluZyhhdHRyLm5hbWVzcGFjZVVyaSgpKTsKICAgICAgICAgU3RyaW5n IGF0dHJRTmFtZSAgICAgPSBhdHRyLnF1YWxpZmllZE5hbWUoKTsKLSAgICAgICAgbmV3RWxlbWVu dC0+c2V0QXR0cmlidXRlTlMoYXR0clVSSSwgYXR0clFOYW1lLCBhdHRyVmFsdWUsIGVjKTsKKyAg ICAgICAgbmV3RWxlbWVudC0+c2V0QXR0cmlidXRlTlMoYXR0clVSSSwgYXR0clFOYW1lLCBhdHRy VmFsdWUsIGVjLCBzY3JpcHRpbmdQZXJtaXNzaW9uKTsKICAgICAgICAgaWYgKGVjKSAvLyBleGNl cHRpb24gc2V0dGluZyBhdHRyaWJ1dGVzCiAgICAgICAgICAgICByZXR1cm47CiAgICAgfQpAQCAt NTA0LDEzICs1MDUsMTMgQEAgdm9pZCBYTUxUb2tlbml6ZXI6OnBhcnNlU3RhcnRFbGVtZW50KCkK ICAgICBtX3Nhd0ZpcnN0RWxlbWVudCA9IHRydWU7CiAKICAgICBFeGNlcHRpb25Db2RlIGVjID0g MDsKLSAgICBoYW5kbGVFbGVtZW50TmFtZXNwYWNlcyhuZXdFbGVtZW50LmdldCgpLCBtX3N0cmVh bS5uYW1lc3BhY2VEZWNsYXJhdGlvbnMoKSwgZWMpOworICAgIGhhbmRsZUVsZW1lbnROYW1lc3Bh Y2VzKG5ld0VsZW1lbnQuZ2V0KCksIG1fc3RyZWFtLm5hbWVzcGFjZURlY2xhcmF0aW9ucygpLCBl YywgbV9zY3JpcHRpbmdQZXJtaXNzaW9uKTsKICAgICBpZiAoZWMpIHsKICAgICAgICAgc3RvcFBh cnNpbmcoKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIGhhbmRsZUVsZW1lbnRBdHRy aWJ1dGVzKG5ld0VsZW1lbnQuZ2V0KCksIG1fc3RyZWFtLmF0dHJpYnV0ZXMoKSwgZWMpOworICAg IGhhbmRsZUVsZW1lbnRBdHRyaWJ1dGVzKG5ld0VsZW1lbnQuZ2V0KCksIG1fc3RyZWFtLmF0dHJp YnV0ZXMoKSwgZWMsIG1fc2NyaXB0aW5nUGVybWlzc2lvbik7CiAgICAgaWYgKGVjKSB7CiAgICAg ICAgIHN0b3BQYXJzaW5nKCk7CiAgICAgICAgIHJldHVybjsKQEAgLTU0MCw2ICs1NDEsMTMgQEAg dm9pZCBYTUxUb2tlbml6ZXI6OnBhcnNlRW5kRWxlbWVudCgpCiAgICAgTm9kZSogbiA9IG1fY3Vy cmVudE5vZGU7CiAgICAgbi0+ZmluaXNoUGFyc2luZ0NoaWxkcmVuKCk7CiAKKyAgICBpZiAobV9z Y3JpcHRpbmdQZXJtaXNzaW9uID09IEZyYWdtZW50U2NyaXB0aW5nTm90QWxsb3dlZCAmJiBuLT5p c0VsZW1lbnROb2RlKCkgJiYgdG9TY3JpcHRFbGVtZW50KHN0YXRpY19jYXN0PEVsZW1lbnQqPihu KSkpIHsKKyAgICAgICAgcG9wQ3VycmVudE5vZGUoKTsKKyAgICAgICAgRXhjZXB0aW9uQ29kZSBl YzsKKyAgICAgICAgbi0+cmVtb3ZlKGVjKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKwogICAg IGlmICghbi0+aXNFbGVtZW50Tm9kZSgpIHx8ICFtX3ZpZXcpIHsKICAgICAgICAgaWYgKCFtX2N1 cnJlbnROb2RlU3RhY2suaXNFbXB0eSgpKQogICAgICAgICAgICAgcG9wQ3VycmVudE5vZGUoKTsK