150426 2015-10-21 17:16:58 -0700 Remove dead MHTML code 2015-10-21 17:47:13 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca commit-queue japhet oldest_to_newest 1135477 0 andersca 2015-10-21 17:16:58 -0700 Remove dead MHTML code 1135479 1 263768 andersca 2015-10-21 17:17:23 -0700 Created attachment 263768 Patch 1135493 2 andersca 2015-10-21 17:47:13 -0700 Committed r191420: <http://trac.webkit.org/changeset/191420> 263768 2015-10-21 17:17:23 -0700 2015-10-21 17:45:09 -0700 Patch bug-150426-20151021171641.patch text/plain 6360 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTkxNDA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjdiY2I0ZmFjYjNjMjU2 ZWY2NzBjMGJiOWI1YjIzMzM3NWU0YWI2OS4uNGFmYjZhNjdlOWI5MGNiYTEyZTQyMGYzZDVkMTY1 MTZmNzQ2NTVkMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE1LTEwLTIxICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIGRlYWQg TUhUTUwgY29kZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTUwNDI2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBsb2FkZXIvYXJjaGl2ZS9taHRtbC9NSFRNTEFyY2hpdmUuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6TUhUTUxBcmNoaXZlOjpnZW5lcmF0ZU1IVE1MRGF0YSk6CisgICAgICAgIChXZWJDb3Jl OjpNSFRNTEFyY2hpdmU6OmdlbmVyYXRlTUhUTUxEYXRhVXNpbmdCaW5hcnlFbmNvZGluZyk6IERl bGV0ZWQuCisgICAgICAgICogbG9hZGVyL2FyY2hpdmUvbWh0bWwvTUhUTUxBcmNoaXZlLmg6CisK IDIwMTUtMTAtMjEgIERlYW4gSmFja3NvbiAgPGRpbm9AYXBwbGUuY29tPgogCiAgICAgICAgIE51 bGwgZGVyZWZlcmVuY2UgbG9hZGluZyBCbGluayBsYXlvdXQgdGVzdCBzdmcvZmlsdGVycy9kaXNw bGF5LW5vbmUtZmlsdGVyLXByaW1pdGl2ZS5odG1sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvYXJjaGl2ZS9taHRtbC9NSFRNTEFyY2hpdmUuY3BwIGIvU291cmNlL1dlYkNvcmUv bG9hZGVyL2FyY2hpdmUvbWh0bWwvTUhUTUxBcmNoaXZlLmNwcAppbmRleCA0NDg1YzJiY2Y0N2Qx Njc2ZThhOTc4ZDMyNjlhOWVkNTMyN2UxNDhiLi5jM2FmNTYyNjI1YTk1N2ZlNWZkODM3YTQ3YjY1 OGRiNDdiODExMjFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvYXJjaGl2ZS9t aHRtbC9NSFRNTEFyY2hpdmUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9hcmNoaXZl L21odG1sL01IVE1MQXJjaGl2ZS5jcHAKQEAgLTU5LDcgKzU5LDYgQEAgbmFtZXNwYWNlIFdlYkNv cmUgewogCiBjb25zdCBjaGFyKiBjb25zdCBxdW90ZWRQcmludGFibGUgPSAicXVvdGVkLXByaW50 YWJsZSI7CiBjb25zdCBjaGFyKiBjb25zdCBiYXNlNjQgPSAiYmFzZTY0IjsKLWNvbnN0IGNoYXIq IGNvbnN0IGJpbmFyeSA9ICJiaW5hcnkiOwogCiBzdGF0aWMgU3RyaW5nIGdlbmVyYXRlUmFuZG9t Qm91bmRhcnkoKQogewpAQCAtMTMzLDE2ICsxMzIsNiBAQCBQYXNzUmVmUHRyPE1IVE1MQXJjaGl2 ZT4gTUhUTUxBcmNoaXZlOjpjcmVhdGUoY29uc3QgVVJMJiB1cmwsIFNoYXJlZEJ1ZmZlciogZGF0 YQogCiBQYXNzUmVmUHRyPFNoYXJlZEJ1ZmZlcj4gTUhUTUxBcmNoaXZlOjpnZW5lcmF0ZU1IVE1M RGF0YShQYWdlKiBwYWdlKQogewotICAgIHJldHVybiBnZW5lcmF0ZU1IVE1MRGF0YShwYWdlLCBm YWxzZSk7Ci19Ci0KLVBhc3NSZWZQdHI8U2hhcmVkQnVmZmVyPiBNSFRNTEFyY2hpdmU6OmdlbmVy YXRlTUhUTUxEYXRhVXNpbmdCaW5hcnlFbmNvZGluZyhQYWdlKiBwYWdlKQotewotICAgIHJldHVy biBnZW5lcmF0ZU1IVE1MRGF0YShwYWdlLCB0cnVlKTsKLX0KLQotUGFzc1JlZlB0cjxTaGFyZWRC dWZmZXI+IE1IVE1MQXJjaGl2ZTo6Z2VuZXJhdGVNSFRNTERhdGEoUGFnZSogcGFnZSwgYm9vbCB1 c2VCaW5hcnlFbmNvZGluZykKLXsKICAgICBWZWN0b3I8UGFnZVNlcmlhbGl6ZXI6OlJlc291cmNl PiByZXNvdXJjZXM7CiAgICAgUGFnZVNlcmlhbGl6ZXIgcGFnZVNlcmlhbGl6ZXIoJnJlc291cmNl cyk7CiAgICAgcGFnZVNlcmlhbGl6ZXIuc2VyaWFsaXplKHBhZ2UpOwpAQCAtMTgzLDkgKzE3Miw3 IEBAIFBhc3NSZWZQdHI8U2hhcmVkQnVmZmVyPiBNSFRNTEFyY2hpdmU6OmdlbmVyYXRlTUhUTUxE YXRhKFBhZ2UqIHBhZ2UsIGJvb2wgdXNlQmluCiAgICAgICAgIHN0cmluZ0J1aWxkZXIuYXBwZW5k KHJlc291cmNlLm1pbWVUeXBlKTsKIAogICAgICAgICBjb25zdCBjaGFyKiBjb250ZW50RW5jb2Rp bmcgPSBudWxscHRyOwotICAgICAgICBpZiAodXNlQmluYXJ5RW5jb2RpbmcpCi0gICAgICAgICAg ICBjb250ZW50RW5jb2RpbmcgPSBiaW5hcnk7Ci0gICAgICAgIGVsc2UgaWYgKE1JTUVUeXBlUmVn aXN0cnk6OmlzU3VwcG9ydGVkSmF2YVNjcmlwdE1JTUVUeXBlKHJlc291cmNlLm1pbWVUeXBlKSB8 fCBNSU1FVHlwZVJlZ2lzdHJ5Ojppc1N1cHBvcnRlZE5vbkltYWdlTUlNRVR5cGUocmVzb3VyY2Uu bWltZVR5cGUpKQorICAgICAgICBpZiAoTUlNRVR5cGVSZWdpc3RyeTo6aXNTdXBwb3J0ZWRKYXZh U2NyaXB0TUlNRVR5cGUocmVzb3VyY2UubWltZVR5cGUpIHx8IE1JTUVUeXBlUmVnaXN0cnk6Omlz U3VwcG9ydGVkTm9uSW1hZ2VNSU1FVHlwZShyZXNvdXJjZS5taW1lVHlwZSkpCiAgICAgICAgICAg ICBjb250ZW50RW5jb2RpbmcgPSBxdW90ZWRQcmludGFibGU7CiAgICAgICAgIGVsc2UKICAgICAg ICAgICAgIGNvbnRlbnRFbmNvZGluZyA9IGJhc2U2NDsKQEAgLTE5OSwzNiArMTg2LDI3IEBAIFBh c3NSZWZQdHI8U2hhcmVkQnVmZmVyPiBNSFRNTEFyY2hpdmU6OmdlbmVyYXRlTUhUTUxEYXRhKFBh Z2UqIHBhZ2UsIGJvb2wgdXNlQmluCiAgICAgICAgIGFzY2lpU3RyaW5nID0gc3RyaW5nQnVpbGRl ci50b1N0cmluZygpLnV0ZjgoKTsKICAgICAgICAgbWh0bWxEYXRhLT5hcHBlbmQoYXNjaWlTdHJp bmcuZGF0YSgpLCBhc2NpaVN0cmluZy5sZW5ndGgoKSk7CiAKLSAgICAgICAgaWYgKCFzdHJjbXAo Y29udGVudEVuY29kaW5nLCBiaW5hcnkpKSB7Ci0gICAgICAgICAgICBjb25zdCBjaGFyKiBkYXRh OwotICAgICAgICAgICAgc2l6ZV90IHBvc2l0aW9uID0gMDsKLSAgICAgICAgICAgIHdoaWxlIChz aXplX3QgbGVuZ3RoID0gcmVzb3VyY2UuZGF0YS0+Z2V0U29tZURhdGEoZGF0YSwgcG9zaXRpb24p KSB7Ci0gICAgICAgICAgICAgICAgbWh0bWxEYXRhLT5hcHBlbmQoZGF0YSwgbGVuZ3RoKTsKLSAg ICAgICAgICAgICAgICBwb3NpdGlvbiArPSBsZW5ndGg7Ci0gICAgICAgICAgICB9CisgICAgICAg IC8vIEZJWE1FOiBpZGVhbGx5IHdlIHdvdWxkIGVuY29kZSB0aGUgY29udGVudCBhcyBhIHN0cmVh bSB3aXRob3V0IGhhdmluZyB0byBmZXRjaCBpdCBhbGwuCisgICAgICAgIGNvbnN0IGNoYXIqIGRh dGEgPSByZXNvdXJjZS5kYXRhLT5kYXRhKCk7CisgICAgICAgIHNpemVfdCBkYXRhTGVuZ3RoID0g cmVzb3VyY2UuZGF0YS0+c2l6ZSgpOworICAgICAgICBWZWN0b3I8Y2hhcj4gZW5jb2RlZERhdGE7 CisgICAgICAgIGlmICghc3RyY21wKGNvbnRlbnRFbmNvZGluZywgcXVvdGVkUHJpbnRhYmxlKSkg eworICAgICAgICAgICAgcXVvdGVkUHJpbnRhYmxlRW5jb2RlKGRhdGEsIGRhdGFMZW5ndGgsIGVu Y29kZWREYXRhKTsKKyAgICAgICAgICAgIG1odG1sRGF0YS0+YXBwZW5kKGVuY29kZWREYXRhLmRh dGEoKSwgZW5jb2RlZERhdGEuc2l6ZSgpKTsKKyAgICAgICAgICAgIG1odG1sRGF0YS0+YXBwZW5k KCJcclxuIiwgMik7CiAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAvLyBGSVhNRTogaWRl YWxseSB3ZSB3b3VsZCBlbmNvZGUgdGhlIGNvbnRlbnQgYXMgYSBzdHJlYW0gd2l0aG91dCBoYXZp bmcgdG8gZmV0Y2ggaXQgYWxsLgotICAgICAgICAgICAgY29uc3QgY2hhciogZGF0YSA9IHJlc291 cmNlLmRhdGEtPmRhdGEoKTsKLSAgICAgICAgICAgIHNpemVfdCBkYXRhTGVuZ3RoID0gcmVzb3Vy Y2UuZGF0YS0+c2l6ZSgpOwotICAgICAgICAgICAgVmVjdG9yPGNoYXI+IGVuY29kZWREYXRhOwot ICAgICAgICAgICAgaWYgKCFzdHJjbXAoY29udGVudEVuY29kaW5nLCBxdW90ZWRQcmludGFibGUp KSB7Ci0gICAgICAgICAgICAgICAgcXVvdGVkUHJpbnRhYmxlRW5jb2RlKGRhdGEsIGRhdGFMZW5n dGgsIGVuY29kZWREYXRhKTsKLSAgICAgICAgICAgICAgICBtaHRtbERhdGEtPmFwcGVuZChlbmNv ZGVkRGF0YS5kYXRhKCksIGVuY29kZWREYXRhLnNpemUoKSk7CisgICAgICAgICAgICBBU1NFUlQo IXN0cmNtcChjb250ZW50RW5jb2RpbmcsIGJhc2U2NCkpOworICAgICAgICAgICAgLy8gV2UgYXJl IG5vdCBzcGVjaWZ5aW5nIGluc2VydExGcyA9IHRydWUgYmVsb3cgYXMgaXQgd291bGQgY3V0IHRo ZSBsaW5lcyB3aXRoIExGcyBhbmQgTUhUTUwgcmVxdWlyZXMgQ1JMRnMuCisgICAgICAgICAgICBi YXNlNjRFbmNvZGUoZGF0YSwgZGF0YUxlbmd0aCwgZW5jb2RlZERhdGEpOworICAgICAgICAgICAg Y29uc3Qgc2l6ZV90IG1heGltdW1MaW5lTGVuZ3RoID0gNzY7CisgICAgICAgICAgICBzaXplX3Qg aW5kZXggPSAwOworICAgICAgICAgICAgc2l6ZV90IGVuY29kZWREYXRhTGVuZ3RoID0gZW5jb2Rl ZERhdGEuc2l6ZSgpOworICAgICAgICAgICAgZG8geworICAgICAgICAgICAgICAgIHNpemVfdCBs aW5lTGVuZ3RoID0gc3RkOjptaW4oZW5jb2RlZERhdGFMZW5ndGggLSBpbmRleCwgbWF4aW11bUxp bmVMZW5ndGgpOworICAgICAgICAgICAgICAgIG1odG1sRGF0YS0+YXBwZW5kKGVuY29kZWREYXRh LmRhdGEoKSArIGluZGV4LCBsaW5lTGVuZ3RoKTsKICAgICAgICAgICAgICAgICBtaHRtbERhdGEt PmFwcGVuZCgiXHJcbiIsIDIpOwotICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgICAg ICBBU1NFUlQoIXN0cmNtcChjb250ZW50RW5jb2RpbmcsIGJhc2U2NCkpOwotICAgICAgICAgICAg ICAgIC8vIFdlIGFyZSBub3Qgc3BlY2lmeWluZyBpbnNlcnRMRnMgPSB0cnVlIGJlbG93IGFzIGl0 IHdvdWxkIGN1dCB0aGUgbGluZXMgd2l0aCBMRnMgYW5kIE1IVE1MIHJlcXVpcmVzIENSTEZzLgot ICAgICAgICAgICAgICAgIGJhc2U2NEVuY29kZShkYXRhLCBkYXRhTGVuZ3RoLCBlbmNvZGVkRGF0 YSk7Ci0gICAgICAgICAgICAgICAgY29uc3Qgc2l6ZV90IG1heGltdW1MaW5lTGVuZ3RoID0gNzY7 Ci0gICAgICAgICAgICAgICAgc2l6ZV90IGluZGV4ID0gMDsKLSAgICAgICAgICAgICAgICBzaXpl X3QgZW5jb2RlZERhdGFMZW5ndGggPSBlbmNvZGVkRGF0YS5zaXplKCk7Ci0gICAgICAgICAgICAg ICAgZG8gewotICAgICAgICAgICAgICAgICAgICBzaXplX3QgbGluZUxlbmd0aCA9IHN0ZDo6bWlu KGVuY29kZWREYXRhTGVuZ3RoIC0gaW5kZXgsIG1heGltdW1MaW5lTGVuZ3RoKTsKLSAgICAgICAg ICAgICAgICAgICAgbWh0bWxEYXRhLT5hcHBlbmQoZW5jb2RlZERhdGEuZGF0YSgpICsgaW5kZXgs IGxpbmVMZW5ndGgpOwotICAgICAgICAgICAgICAgICAgICBtaHRtbERhdGEtPmFwcGVuZCgiXHJc biIsIDIpOwotICAgICAgICAgICAgICAgICAgICBpbmRleCArPSBtYXhpbXVtTGluZUxlbmd0aDsK LSAgICAgICAgICAgICAgICB9IHdoaWxlIChpbmRleCA8IGVuY29kZWREYXRhTGVuZ3RoKTsKLSAg ICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICBpbmRleCArPSBtYXhpbXVtTGluZUxlbmd0aDsK KyAgICAgICAgICAgIH0gd2hpbGUgKGluZGV4IDwgZW5jb2RlZERhdGFMZW5ndGgpOwogICAgICAg ICB9CiAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvYXJjaGl2ZS9t aHRtbC9NSFRNTEFyY2hpdmUuaCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9hcmNoaXZlL21odG1s L01IVE1MQXJjaGl2ZS5oCmluZGV4IDE0Y2Q4NzU3MjM1YjM2NWI1NWM0NTgwNDM1NmRhOThhZGI0 MTExYjkuLjZkZWNkNGE5OWM4YjhmOTgyOTM5ZjUwNjIyN2YyYTFmMWY1YWZhNTAgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9hcmNoaXZlL21odG1sL01IVE1MQXJjaGl2ZS5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9hcmNoaXZlL21odG1sL01IVE1MQXJjaGl2ZS5oCkBA IC00OSw4ICs0OSw2IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgUGFzc1JlZlB0cjxNSFRNTEFyY2hp dmU+IGNyZWF0ZShjb25zdCBVUkwmLCBTaGFyZWRCdWZmZXIqKTsKIAogICAgIHN0YXRpYyBQYXNz UmVmUHRyPFNoYXJlZEJ1ZmZlcj4gZ2VuZXJhdGVNSFRNTERhdGEoUGFnZSopOwotICAgIC8vIEJp bmFyeSBlbmNvZGluZyByZXN1bHRzIGluIHNtYWxsZXIgTUhUTUwgZmlsZXMgYnV0IHRoZXkgbWln aHQgbm90IHdvcmsgaW4gb3RoZXIgYnJvd3NlcnMuCi0gICAgc3RhdGljIFBhc3NSZWZQdHI8U2hh cmVkQnVmZmVyPiBnZW5lcmF0ZU1IVE1MRGF0YVVzaW5nQmluYXJ5RW5jb2RpbmcoUGFnZSopOwog CiAgICAgdmlydHVhbCB+TUhUTUxBcmNoaXZlKCk7CiAK