31955 2009-11-28 15:48:41 -0800 postMessage should serialize File objects 2009-11-29 20:23:25 -0800 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 oliver webkit-unassigned oldest_to_newest 167054 0 oliver 2009-11-28 15:48:41 -0800 the internal structured cloning algorithm indicates that we should clone File objects 167061 1 43986 oliver 2009-11-28 17:00:27 -0800 Created attachment 43986 Patch 167067 2 43986 sam 2009-11-28 19:03:25 -0800 Comment on attachment 43986 Patch > SerializedType type() const { return m_type; } > @@ -77,6 +79,8 @@ namespace WebCore { > , m_string(string.crossThreadString()) // FIXME: Should be able to just share the Rep > { > } > + > + explicit SerializedScriptValueData(const File* file); The parameter name is not necessary here. r=me 167187 3 oliver 2009-11-29 20:23:25 -0800 Committed r51480 43986 2009-11-28 17:00:27 -0800 2009-11-28 19:03:24 -0800 Patch bug-31955-20091128170020.patch text/plain 7421 oliver ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBjOGEzYmVjLi45MjEyZmQ4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMDktMTEt MjggIE9saXZlciBIdW50ICA8b2xpdmVyQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBwb3N0TWVzc2FnZSBzaG91bGQgc2VyaWFsaXpl IEZpbGUgb2JqZWN0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MzE5NTUKKworICAgICAgICBBZGQgdGVzdCBmb3IgcG9zdE1lc3NhZ2Ugc2VyaWFsaXph dGlvbiBvZiBGaWxlIG9iamVjdHMuCisKKyAgICAgICAgKiBmYXN0L2RvbS9XaW5kb3cvd2luZG93 LXBvc3RtZXNzYWdlLWNsb25lLWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBmYXN0L2RvbS9XaW5k b3cvd2luZG93LXBvc3RtZXNzYWdlLWNsb25lLmh0bWw6CisKIDIwMDktMTEtMjggIEFkYW0gQmFy dGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEaW1pdHJpIEds YXprb3YuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2RvbS9XaW5kb3cvd2luZG93LXBv c3RtZXNzYWdlLWNsb25lLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvZG9tL1dpbmRv dy93aW5kb3ctcG9zdG1lc3NhZ2UtY2xvbmUtZXhwZWN0ZWQudHh0CmluZGV4IDQ5NWVhN2MuLjIz NTNmMTkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3QvZG9tL1dpbmRvdy93aW5kb3ctcG9z dG1lc3NhZ2UtY2xvbmUtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZG9tL1dp bmRvdy93aW5kb3ctcG9zdG1lc3NhZ2UtY2xvbmUtZXhwZWN0ZWQudHh0CkBAIC0xNiw1ICsxNiw2 IEBAIFBBU1M6IGV2ZW50RGF0YSBpcyAsLDEgb2YgdHlwZSBvYmplY3QKIFBBU1M6IGV2ZW50RGF0 YSBpcyBudWxsIG9mIHR5cGUgb2JqZWN0CiBQQVNTOiBldmVudERhdGEgaXMgMjAwOS0wMi0xM1Qy MzozMTozMC4wMDBaIG9mIHR5cGUgb2JqZWN0CiBQQVNTOiBldmVudERhdGEgaXMgW29iamVjdCBB cnJheV0oZGVmYXVsdCB0b1N0cmluZyB0aHJldyBSYW5nZUVycm9yOiBNYXhpbXVtIGNhbGwgc3Rh Y2sgc2l6ZSBleGNlZWRlZC4pIG9mIHR5cGUgb2JqZWN0CitQQVNTOiBldmVudERhdGEgaXMgW29i amVjdCBGaWxlXSBvZiB0eXBlIG9iamVjdAogUEFTUzogZXZlbnREYXRhIGlzIGRvbmUgb2YgdHlw ZSBzdHJpbmcKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9kb20vV2luZG93L3dpbmRv dy1wb3N0bWVzc2FnZS1jbG9uZS5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9kb20vV2luZG93L3dp bmRvdy1wb3N0bWVzc2FnZS1jbG9uZS5odG1sCmluZGV4IDY4ZTY2YzYuLjMxZjljOWEgMTAwNjQ0 Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3QvZG9tL1dpbmRvdy93aW5kb3ctcG9zdG1lc3NhZ2UtY2xv bmUuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2RvbS9XaW5kb3cvd2luZG93LXBvc3RtZXNz YWdlLWNsb25lLmh0bWwKQEAgLTMsNiArMyw3IEBACiA8Ym9keT4KIDxkaXYgaWQ9ImRlc2NyaXB0 aW9uIj48L2Rpdj4KIDxkaXYgaWQ9ImNvbnNvbGUiPjwvZGl2PgorPGlucHV0IHR5cGU9ImZpbGUi IGlkPSJmaWxlSW5wdXQiPjwvaW5wdXQ+CiA8c2NyaXB0PgogaWYgKHdpbmRvdy5sYXlvdXRUZXN0 Q29udHJvbGxlcikgewogICAgIGxheW91dFRlc3RDb250cm9sbGVyLmR1bXBBc1RleHQoKTsKQEAg LTEyMyw2ICsxMjQsMTYgQEAgZm9yICh2YXIgaSA9IDA7IGkgPCAxMDAwMDA7IGkrKykKIHRyeVBv c3RNZXNzYWdlKCdyZWFsbHlEZWVwQXJyYXknLCB0cnVlKTsKIHRyeVBvc3RNZXNzYWdlKCd3aW5k b3cnLCB0cnVlKTsKIAordmFyIGZpbGVJbnB1dCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJm aWxlSW5wdXQiKTsKK3ZhciBmaWxlUmVjdCA9IGZpbGVJbnB1dC5nZXRDbGllbnRSZWN0cygpWzBd OwordmFyIHRhcmdldFggPSBmaWxlUmVjdC5sZWZ0ICsgZmlsZVJlY3Qud2lkdGggLyAyOwordmFy IHRhcmdldFkgPSBmaWxlUmVjdC50b3AgKyBmaWxlUmVjdC5oZWlnaHQgLyAyOworZXZlbnRTZW5k ZXIuYmVnaW5EcmFnV2l0aEZpbGVzKFsnZ2V0LWZpbGUtdXBsb2FkLmh0bWwnXSk7CitldmVudFNl bmRlci5tb3VzZU1vdmVUbyh0YXJnZXRYLCB0YXJnZXRZKTsKK2V2ZW50U2VuZGVyLm1vdXNlVXAo KTsKKwordHJ5UG9zdE1lc3NhZ2UoJ2ZpbGVJbnB1dC5maWxlc1swXScsIGZhbHNlLCBmaWxlSW5w dXQuZmlsZXNbMF0pOworCiB0cnlQb3N0TWVzc2FnZSgnImRvbmUiJyk7CiA8L3NjcmlwdD4KIDwv Ym9keT4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cK aW5kZXggOGI1N2FiYS4uZjY5NmZjMiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysr IGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAwOS0xMS0yOCAgT2xpdmVy IEh1bnQgIDxvbGl2ZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIHBvc3RNZXNzYWdlIHNob3VsZCBzZXJpYWxpemUgRmlsZSBvYmpl Y3RzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMTk1 NQorCisgICAgICAgIFVwZGF0ZSBTZXJpYWxpemVkU2NyaXB0VmFsdWUgdG8gaW5jbHVkZSBzdXBw b3J0IGZvcgorICAgICAgICBGaWxlIG9iamVjdHMgaW4gdGhlIHNlcmlhbGl6ZWQgb2JqZWN0IGdy YXBoLgorCisgICAgICAgICogYmluZGluZ3MvanMvU2VyaWFsaXplZFNjcmlwdFZhbHVlLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlNlcmlhbGl6ZWRTY3JpcHRWYWx1ZURhdGE6OlNlcmlhbGl6ZWRT Y3JpcHRWYWx1ZURhdGEpOgorICAgICAgICAoV2ViQ29yZTo6U2VyaWFsaXppbmdUcmVlV2Fsa2Vy Ojpjb252ZXJ0SWZUZXJtaW5hbCk6CisgICAgICAgIChXZWJDb3JlOjpEZXNlcmlhbGl6aW5nVHJl ZVdhbGtlcjo6Y29udmVydElmVGVybWluYWwpOgorICAgICAgICAqIGJpbmRpbmdzL2pzL1Nlcmlh bGl6ZWRTY3JpcHRWYWx1ZS5oOgorICAgICAgICAoV2ViQ29yZTo6U2VyaWFsaXplZFNjcmlwdFZh bHVlRGF0YTo6KToKKyAgICAgICAgKFdlYkNvcmU6OlNlcmlhbGl6ZWRTY3JpcHRWYWx1ZURhdGE6 OmFzU3RyaW5nKToKKwogMjAwOS0xMS0yOCAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3Jn PgogCiAgICAgICAgIFJldmlld2VkIGJ5IERpbWl0cmkgR2xhemtvdi4KZGlmZiAtLWdpdCBhL1dl YkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qIGIvV2ViQ29yZS9XZWJDb3Jl Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKaW5kZXggOTgxYjM1Yi4uMjY0ZTlmMCAxMDA2NDQK LS0tIGEvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKKysrIGIvV2Vi Q29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKQEAgLTEwMTkyLDcgKzEwMTky LDcgQEAKIAkJCQkxOEM1RkNBMzEwQTM5OTFGMDA0ODQzOEQgLyogV2ViS2l0U2hhcmVkU2NyaXB0 UmVwb3NpdG9yeS5jcHAgKi8sCiAJCQkJMThDNUZDQTQxMEEzOTkxRjAwNDg0MzhEIC8qIFdlYktp dFNoYXJlZFNjcmlwdFJlcG9zaXRvcnkuaCAqLywKIAkJCSk7Ci0JCQlwYXRoID0gIlNoYXJlZFNj cmlwdCI7CisJCQlwYXRoID0gU2hhcmVkU2NyaXB0OwogCQkJc291cmNlVHJlZSA9ICI8Z3JvdXA+ IjsKIAkJfTsKIAkJMUEyRTZFNTYwQ0M1NTFFMDAwNEEyMDYyIC8qIHNxbCAqLyA9IHsKZGlmZiAt LWdpdCBhL1dlYkNvcmUvYmluZGluZ3MvanMvU2VyaWFsaXplZFNjcmlwdFZhbHVlLmNwcCBiL1dl YkNvcmUvYmluZGluZ3MvanMvU2VyaWFsaXplZFNjcmlwdFZhbHVlLmNwcAppbmRleCAyZTE3YzE5 Li43YTJkNjQ1IDEwMDY0NAotLS0gYS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NlcmlhbGl6ZWRTY3Jp cHRWYWx1ZS5jcHAKKysrIGIvV2ViQ29yZS9iaW5kaW5ncy9qcy9TZXJpYWxpemVkU2NyaXB0VmFs dWUuY3BwCkBAIC0yNyw2ICsyNywxMCBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUg IlNlcmlhbGl6ZWRTY3JpcHRWYWx1ZS5oIgogCisjaW5jbHVkZSAiRmlsZS5oIgorI2luY2x1ZGUg IkpTRE9NR2xvYmFsT2JqZWN0LmgiCisjaW5jbHVkZSAiSlNGaWxlLmgiCisjaW5jbHVkZSAiSlNG aWxlTGlzdC5oIgogI2luY2x1ZGUgPEphdmFTY3JpcHRDb3JlL0FQSUNhc3QuaD4KICNpbmNsdWRl IDxydW50aW1lL0RhdGVJbnN0YW5jZS5oPgogI2luY2x1ZGUgPHJ1bnRpbWUvRXhjZXB0aW9uSGVs cGVycy5oPgpAQCAtMTQ5LDYgKzE1MywxMiBAQCBTZXJpYWxpemVkU2NyaXB0VmFsdWVEYXRhOjpT ZXJpYWxpemVkU2NyaXB0VmFsdWVEYXRhKFJlZlB0cjxTZXJpYWxpemVkQXJyYXk+IGRhdAogewog fQogCitTZXJpYWxpemVkU2NyaXB0VmFsdWVEYXRhOjpTZXJpYWxpemVkU2NyaXB0VmFsdWVEYXRh KGNvbnN0IEZpbGUqIGZpbGUpCisgICAgOiBtX3R5cGUoRmlsZVR5cGUpCisgICAgLCBtX3N0cmlu ZyhmaWxlLT5wYXRoKCkuY3Jvc3NUaHJlYWRTdHJpbmcoKSkKK3sKK30KKwogU2VyaWFsaXplZEFy cmF5KiBTaGFyZWRTZXJpYWxpemVkRGF0YTo6YXNBcnJheSgpCiB7CiAgICAgcmV0dXJuIHN0YXRp Y19jYXN0PFNlcmlhbGl6ZWRBcnJheSo+KHRoaXMpOwpAQCAtNDgyLDEwICs0OTIsMTUgQEAgc3Ry dWN0IFNlcmlhbGl6aW5nVHJlZVdhbGtlciA6IHB1YmxpYyBCYXNlV2Fsa2VyIHsKICAgICAgICAg aWYgKGlzQXJyYXkodmFsdWUpKQogICAgICAgICAgICAgcmV0dXJuIFNlcmlhbGl6ZWRTY3JpcHRW YWx1ZURhdGEoKTsKIAotICAgICAgICBDYWxsRGF0YSB1bnVzZWREYXRhOwotICAgICAgICBpZiAo dmFsdWUuaXNPYmplY3QoKSAmJiB2YWx1ZS5nZXRDYWxsRGF0YSh1bnVzZWREYXRhKSA9PSBDYWxs VHlwZU5vbmUpCi0gICAgICAgICAgICByZXR1cm4gU2VyaWFsaXplZFNjcmlwdFZhbHVlRGF0YSgp OwotCisgICAgICAgIGlmICh2YWx1ZS5pc09iamVjdCgpKSB7CisgICAgICAgICAgICBKU09iamVj dCogb2JqID0gYXNPYmplY3QodmFsdWUpOworICAgICAgICAgICAgaWYgKG9iai0+aW5oZXJpdHMo JkpTRmlsZTo6c19pbmZvKSkKKyAgICAgICAgICAgICAgICByZXR1cm4gU2VyaWFsaXplZFNjcmlw dFZhbHVlRGF0YSh0b0ZpbGUob2JqKSk7CisgICAgICAgICAgICAgICAgCisgICAgICAgICAgICBD YWxsRGF0YSB1bnVzZWREYXRhOworICAgICAgICAgICAgaWYgKHZhbHVlLmdldENhbGxEYXRhKHVu dXNlZERhdGEpID09IENhbGxUeXBlTm9uZSkKKyAgICAgICAgICAgICAgICByZXR1cm4gU2VyaWFs aXplZFNjcmlwdFZhbHVlRGF0YSgpOworICAgICAgICB9CiAgICAgICAgIC8vIEFueSBvdGhlciB0 eXBlcyBhcmUgZXhwZWN0ZWQgdG8gc2VyaWFsaXplIGFzIG51bGwuCiAgICAgICAgIHJldHVybiBT ZXJpYWxpemVkU2NyaXB0VmFsdWVEYXRhKGpzTnVsbCgpKTsKICAgICB9CkBAIC02NDEsNiArNjU2 LDggQEAgc3RydWN0IERlc2VyaWFsaXppbmdUcmVlV2Fsa2VyIDogcHVibGljIEJhc2VXYWxrZXIg ewogICAgICAgICAgICAgICAgIHJldHVybiBqc051bWJlcihtX2V4ZWMsIHZhbHVlLmFzRG91Ymxl KCkpOwogICAgICAgICAgICAgY2FzZSBTZXJpYWxpemVkU2NyaXB0VmFsdWVEYXRhOjpEYXRlVHlw ZToKICAgICAgICAgICAgICAgICByZXR1cm4gbmV3IChtX2V4ZWMpIERhdGVJbnN0YW5jZShtX2V4 ZWMsIHZhbHVlLmFzRG91YmxlKCkpOworICAgICAgICAgICAgY2FzZSBTZXJpYWxpemVkU2NyaXB0 VmFsdWVEYXRhOjpGaWxlVHlwZToKKyAgICAgICAgICAgICAgICByZXR1cm4gdG9KUyhtX2V4ZWMs IHN0YXRpY19jYXN0PEpTRE9NR2xvYmFsT2JqZWN0Kj4obV9leGVjLT5sZXhpY2FsR2xvYmFsT2Jq ZWN0KCkpLCBGaWxlOjpjcmVhdGUodmFsdWUuYXNTdHJpbmcoKS5jcm9zc1RocmVhZFN0cmluZygp KSk7CiAgICAgICAgICAgICBkZWZhdWx0OgogICAgICAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVB Q0hFRCgpOwogICAgICAgICAgICAgICAgIHJldHVybiBKU1ZhbHVlKCk7CmRpZmYgLS1naXQgYS9X ZWJDb3JlL2JpbmRpbmdzL2pzL1NlcmlhbGl6ZWRTY3JpcHRWYWx1ZS5oIGIvV2ViQ29yZS9iaW5k aW5ncy9qcy9TZXJpYWxpemVkU2NyaXB0VmFsdWUuaAppbmRleCAzZWIzN2VkLi4wNGRjMzU1IDEw MDY0NAotLS0gYS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NlcmlhbGl6ZWRTY3JpcHRWYWx1ZS5oCisr KyBiL1dlYkNvcmUvYmluZGluZ3MvanMvU2VyaWFsaXplZFNjcmlwdFZhbHVlLmgKQEAgLTMzLDYg KzMzLDcgQEAgdHlwZWRlZiBjb25zdCBzdHJ1Y3QgT3BhcXVlSlNDb250ZXh0KiBKU0NvbnRleHRS ZWY7CiB0eXBlZGVmIGNvbnN0IHN0cnVjdCBPcGFxdWVKU1ZhbHVlKiBKU1ZhbHVlUmVmOwogCiBu YW1lc3BhY2UgV2ViQ29yZSB7CisgICAgY2xhc3MgRmlsZTsKICAgICBjbGFzcyBTZXJpYWxpemVk T2JqZWN0OwogICAgIGNsYXNzIFNlcmlhbGl6ZWRBcnJheTsKIApAQCAtNTQsNyArNTUsOCBAQCBu YW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgICAgICBJbW1lZGlhdGVUeXBlLAogICAgICAgICAg ICAgT2JqZWN0VHlwZSwKICAgICAgICAgICAgIEFycmF5VHlwZSwKLSAgICAgICAgICAgIFN0cmlu Z1R5cGUKKyAgICAgICAgICAgIFN0cmluZ1R5cGUsCisgICAgICAgICAgICBGaWxlVHlwZQogICAg ICAgICB9OwogCiAgICAgICAgIFNlcmlhbGl6ZWRUeXBlIHR5cGUoKSBjb25zdCB7IHJldHVybiBt X3R5cGU7IH0KQEAgLTc3LDYgKzc5LDggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICAg ICAgLCBtX3N0cmluZyhzdHJpbmcuY3Jvc3NUaHJlYWRTdHJpbmcoKSkgLy8gRklYTUU6IFNob3Vs ZCBiZSBhYmxlIHRvIGp1c3Qgc2hhcmUgdGhlIFJlcAogICAgICAgICB7CiAgICAgICAgIH0KKyAg ICAgICAgCisgICAgICAgIGV4cGxpY2l0IFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZURhdGEoY29uc3Qg RmlsZSogZmlsZSk7CiAKICAgICAgICAgZXhwbGljaXQgU2VyaWFsaXplZFNjcmlwdFZhbHVlRGF0 YShKU0M6OkpTVmFsdWUgdmFsdWUpCiAgICAgICAgICAgICA6IG1fdHlwZShJbW1lZGlhdGVUeXBl KQpAQCAtMTA4LDcgKzExMiw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAgICAgICBTdHJp bmcgYXNTdHJpbmcoKSBjb25zdAogICAgICAgICB7Ci0gICAgICAgICAgICBBU1NFUlQobV90eXBl ID09IFN0cmluZ1R5cGUpOworICAgICAgICAgICAgQVNTRVJUKG1fdHlwZSA9PSBTdHJpbmdUeXBl IHx8IG1fdHlwZSA9PSBGaWxlVHlwZSk7CiAgICAgICAgICAgICByZXR1cm4gbV9zdHJpbmc7CiAg ICAgICAgIH0KIAo=