109738 2013-02-13 13:02:24 -0800 Clean up some style nits in HTMLPreloadScanner 2013-02-13 14:05:28 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 106127 1 abarth abarth eric ojan.autocc tonyg webkit.review.bot oldest_to_newest 832234 0 abarth 2013-02-13 13:02:24 -0800 Clean up some style nits in HTMLPreloadScanner 832235 1 188157 abarth 2013-02-13 13:03:16 -0800 Created attachment 188157 Patch 832264 2 188157 eric 2013-02-13 13:26:09 -0800 Comment on attachment 188157 Patch LGTM. 832324 3 188157 webkit.review.bot 2013-02-13 14:05:24 -0800 Comment on attachment 188157 Patch Clearing flags on attachment: 188157 Committed r142796: <http://trac.webkit.org/changeset/142796> 832325 4 webkit.review.bot 2013-02-13 14:05:28 -0800 All reviewed patches have been landed. Closing bug. 188157 2013-02-13 13:03:16 -0800 2013-02-13 14:05:23 -0800 Patch bug-109738-20130213125945.patch text/plain 6331 abarth U3VidmVyc2lvbiBSZXZpc2lvbjogMTQyNzc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODMzNGRiNjk0YjU2M2Yy ZDYyMWQzODRjMGFlOGJjNThjMjA2YzQyNC4uMDQxOTVmYzNmMmQzMTkzOGY2ZjdhNjQ1OWI4NzMw NGRkODg4Y2IwYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEzLTAyLTEzICBBZGFt IEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQ2xlYW4gdXAgc29tZSBzdHls ZSBuaXRzIGluIEhUTUxQcmVsb2FkU2Nhbm5lcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA5NzM4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBqdXN0IGZpeGVzIGEgZmV3IHN0eWxlIG5p dHMgSSBub3RpY2VkIHdoZW4gcmVhZGluZyB0aHJvdWdoCisgICAgICAgIHRoZSBjb2RlLgorCisg ICAgICAgICogaHRtbC9wYXJzZXIvSFRNTFByZWxvYWRTY2FubmVyLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlN0YXJ0VGFnU2Nhbm5lcjo6U3RhcnRUYWdTY2FubmVyKToKKyAgICAgICAgKFdlYkNv cmU6OkhUTUxQcmVsb2FkU2Nhbm5lcjo6cHJvY2Vzc1Bvc3NpYmxlU3R5bGVUYWcpOgorICAgICAg ICAoV2ViQ29yZTo6SFRNTFByZWxvYWRTY2FubmVyOjpwcm9jZXNzUG9zc2libGVCYXNlVGFnKToK KyAgICAgICAgKiBodG1sL3BhcnNlci9IVE1MUmVzb3VyY2VQcmVsb2FkZXIuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UHJlbG9hZFJlcXVlc3Q6OmlzU2FmZVRvU2VuZFRvQW5vdGhlclRocmVhZCk6 CisgICAgICAgICogaHRtbC9wYXJzZXIvSFRNTFJlc291cmNlUHJlbG9hZGVyLmg6CisgICAgICAg IChQcmVsb2FkUmVxdWVzdCk6CisgICAgICAgIChXZWJDb3JlOjpQcmVsb2FkUmVxdWVzdDo6UHJl bG9hZFJlcXVlc3QpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFJlc291cmNlUHJlbG9hZGVyOjpI VE1MUmVzb3VyY2VQcmVsb2FkZXIpOgorCiAyMDEzLTAyLTEzICBEZWFuIEphY2tzb24gIDxkaW5v QGFwcGxlLmNvbT4KIAogICAgICAgICBTbWFsbCB1cGRhdGUgdG8gc3BlZWNoIGJ1YmJsZSBmb3Ig Y2FwdGlvbnMgbWVudSBbTWFjXQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJz ZXIvSFRNTFByZWxvYWRTY2FubmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hU TUxQcmVsb2FkU2Nhbm5lci5jcHAKaW5kZXggY2Y5YWYyZjA0OTNhNTZmNDJmZjljM2Y1Njc1MGJl OGEzNTIwOGRiNC4uZjMwYTViMmRlOTI0NDkzZDM4Mjk2YTE2NTQ3ZTE0ZjlhMzkzOTI3ZSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFByZWxvYWRTY2FubmVyLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MUHJlbG9hZFNjYW5uZXIuY3Bw CkBAIC01NSw3ICs1NSw3IEBAIHN0YXRpYyBib29sIGlzU3RhcnRPckVuZFRhZyhjb25zdCBIVE1M VG9rZW4mIHRva2VuKQogCiBjbGFzcyBTdGFydFRhZ1NjYW5uZXIgewogcHVibGljOgotICAgIGV4 cGxpY2l0IFN0YXJ0VGFnU2Nhbm5lcihjb25zdCBBdG9taWNTdHJpbmcmIHRhZ05hbWUsIGNvbnN0 IEhUTUxUb2tlbjo6QXR0cmlidXRlTGlzdCYgYXR0cmlidXRlcykKKyAgICBTdGFydFRhZ1NjYW5u ZXIoY29uc3QgQXRvbWljU3RyaW5nJiB0YWdOYW1lLCBjb25zdCBIVE1MVG9rZW46OkF0dHJpYnV0 ZUxpc3QmIGF0dHJpYnV0ZXMpCiAgICAgICAgIDogbV90YWdOYW1lKHRhZ05hbWUpCiAgICAgICAg ICwgbV9saW5rSXNTdHlsZVNoZWV0KGZhbHNlKQogICAgICAgICAsIG1fbGlua01lZGlhQXR0cmli dXRlSXNTY3JlZW4odHJ1ZSkKQEAgLTI0NSwzNCArMjQ1LDM2IEBAIGJvb2wgSFRNTFByZWxvYWRT Y2FubmVyOjpwcm9jZXNzUG9zc2libGVUZW1wbGF0ZVRhZyhjb25zdCBBdG9taWNTdHJpbmcmIHRh Z05hbWUsCiBib29sIEhUTUxQcmVsb2FkU2Nhbm5lcjo6cHJvY2Vzc1Bvc3NpYmxlU3R5bGVUYWco Y29uc3QgQXRvbWljU3RyaW5nJiB0YWdOYW1lLCBjb25zdCBIVE1MVG9rZW4mIHRva2VuKQogewog ICAgIEFTU0VSVChpc1N0YXJ0T3JFbmRUYWcodG9rZW4pKTsKLSAgICBpZiAodGFnTmFtZSA9PSBz dHlsZVRhZykgewotICAgICAgICBtX2luU3R5bGUgPSBpc1N0YXJ0VGFnKHRva2VuKTsKLSAgICAg ICAgaWYgKCFtX2luU3R5bGUpCi0gICAgICAgICAgICBtX2Nzc1NjYW5uZXIucmVzZXQoKTsKLSAg ICAgICAgcmV0dXJuIHRydWU7Ci0gICAgfQotICAgIHJldHVybiBmYWxzZTsKKyAgICBpZiAodGFn TmFtZSAhPSBzdHlsZVRhZykKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgbV9pblN0eWxl ID0gaXNTdGFydFRhZyh0b2tlbik7CisKKyAgICBpZiAoIW1faW5TdHlsZSkKKyAgICAgICAgbV9j c3NTY2FubmVyLnJlc2V0KCk7CisKKyAgICByZXR1cm4gdHJ1ZTsKIH0KIAogYm9vbCBIVE1MUHJl bG9hZFNjYW5uZXI6OnByb2Nlc3NQb3NzaWJsZUJhc2VUYWcoY29uc3QgQXRvbWljU3RyaW5nJiB0 YWdOYW1lLCBjb25zdCBIVE1MVG9rZW4mIHRva2VuKQogewogICAgIEFTU0VSVChpc1N0YXJ0VGFn KHRva2VuKSk7Ci0gICAgaWYgKHRhZ05hbWUgPT0gYmFzZVRhZykgewotICAgICAgICAvLyBUaGUg Zmlyc3QgPGJhc2U+IGVsZW1lbnQgaXMgdGhlIG9uZSB0aGF0IHdpbnMuCi0gICAgICAgIGlmICgh bV9wcmVkaWN0ZWRCYXNlRWxlbWVudFVSTC5pc0VtcHR5KCkpCi0gICAgICAgICAgICByZXR1cm4g dHJ1ZTsKKyAgICBpZiAodGFnTmFtZSAhPSBiYXNlVGFnKQorICAgICAgICByZXR1cm4gZmFsc2U7 CiAKLSAgICAgICAgZm9yIChIVE1MVG9rZW46OkF0dHJpYnV0ZUxpc3Q6OmNvbnN0X2l0ZXJhdG9y IGl0ZXIgPSB0b2tlbi5hdHRyaWJ1dGVzKCkuYmVnaW4oKTsgaXRlciAhPSB0b2tlbi5hdHRyaWJ1 dGVzKCkuZW5kKCk7ICsraXRlcikgewotICAgICAgICAgICAgQXRvbWljU3RyaW5nIGF0dHJpYnV0 ZU5hbWUoaXRlci0+bmFtZSk7Ci0gICAgICAgICAgICBpZiAoYXR0cmlidXRlTmFtZSA9PSBocmVm QXR0cikgewotICAgICAgICAgICAgICAgIFN0cmluZyBocmVmVmFsdWUgPSBTdHJpbmdJbXBsOjpj cmVhdGU4Qml0SWZQb3NzaWJsZShpdGVyLT52YWx1ZSk7Ci0gICAgICAgICAgICAgICAgbV9wcmVk aWN0ZWRCYXNlRWxlbWVudFVSTCA9IEtVUkwobV9kb2N1bWVudFVSTCwgc3RyaXBMZWFkaW5nQW5k VHJhaWxpbmdIVE1MU3BhY2VzKGhyZWZWYWx1ZSkpOwotICAgICAgICAgICAgICAgIGJyZWFrOwot ICAgICAgICAgICAgfQotICAgICAgICB9CisgICAgLy8gVGhlIGZpcnN0IDxiYXNlPiBlbGVtZW50 IGlzIHRoZSBvbmUgdGhhdCB3aW5zLgorICAgIGlmICghbV9wcmVkaWN0ZWRCYXNlRWxlbWVudFVS TC5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVybiB0cnVlOworCisgICAgZm9yIChIVE1MVG9rZW46 OkF0dHJpYnV0ZUxpc3Q6OmNvbnN0X2l0ZXJhdG9yIGl0ZXIgPSB0b2tlbi5hdHRyaWJ1dGVzKCku YmVnaW4oKTsgaXRlciAhPSB0b2tlbi5hdHRyaWJ1dGVzKCkuZW5kKCk7ICsraXRlcikgeworICAg ICAgICBBdG9taWNTdHJpbmcgYXR0cmlidXRlTmFtZShpdGVyLT5uYW1lKTsKKyAgICAgICAgaWYg KGF0dHJpYnV0ZU5hbWUgPT0gaHJlZkF0dHIpIHsKKyAgICAgICAgICAgIFN0cmluZyBocmVmVmFs dWUgPSBTdHJpbmdJbXBsOjpjcmVhdGU4Qml0SWZQb3NzaWJsZShpdGVyLT52YWx1ZSk7CisgICAg ICAgICAgICBtX3ByZWRpY3RlZEJhc2VFbGVtZW50VVJMID0gS1VSTChtX2RvY3VtZW50VVJMLCBz dHJpcExlYWRpbmdBbmRUcmFpbGluZ0hUTUxTcGFjZXMoaHJlZlZhbHVlKSk7CisgICAgICAgICAg ICBicmVhazsKKyAgICAgICAgfQogICAgIH0KLSAgICByZXR1cm4gZmFsc2U7CisgICAgcmV0dXJu IHRydWU7CiB9CiAKIHZvaWQgSFRNTFByZWxvYWRTY2FubmVyOjpwcm9jZXNzVG9rZW4oY29uc3Qg SFRNTFRva2VuJiB0b2tlbiwgVmVjdG9yPE93blB0cjxQcmVsb2FkUmVxdWVzdD4gPiYgcmVxdWVz dHMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MUmVzb3VyY2VQ cmVsb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFJlc291cmNlUHJl bG9hZGVyLmNwcAppbmRleCAxNTE5ZDIwZDkxMjY0ODE5Y2IyMWQ0YTcxYmUzMzUwZGJmMWQ5OGI1 Li43NzBmZjBlMzlmZmY2NjlkNzc3ZGY1Mzk3ZjkwZmY3MWFmYzAzYzk1IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MUmVzb3VyY2VQcmVsb2FkZXIuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxSZXNvdXJjZVByZWxvYWRlci5jcHAKQEAg LTMxLDI0ICszMSwxMiBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLXN0YXRpYyBib29sIGlz U3RyaW5nU2FmZVRvU2VuZFRvQW5vdGhlclRocmVhZChjb25zdCBTdHJpbmcmIHN0cmluZykKLXsK LSAgICBTdHJpbmdJbXBsKiBpbXBsID0gc3RyaW5nLmltcGwoKTsKLSAgICBpZiAoIWltcGwpCi0g ICAgICAgIHJldHVybiB0cnVlOwotICAgIGlmIChpbXBsLT5oYXNPbmVSZWYoKSkKLSAgICAgICAg cmV0dXJuIHRydWU7Ci0gICAgaWYgKHN0cmluZy5pc0VtcHR5KCkpCi0gICAgICAgIHJldHVybiB0 cnVlOwotICAgIHJldHVybiBmYWxzZTsKLX0KLQogYm9vbCBQcmVsb2FkUmVxdWVzdDo6aXNTYWZl VG9TZW5kVG9Bbm90aGVyVGhyZWFkKCkgY29uc3QKIHsKLSAgICByZXR1cm4gaXNTdHJpbmdTYWZl VG9TZW5kVG9Bbm90aGVyVGhyZWFkKG1faW5pdGlhdG9yKQotICAgICAgICAmJiBpc1N0cmluZ1Nh ZmVUb1NlbmRUb0Fub3RoZXJUaHJlYWQobV9jaGFyc2V0KQotICAgICAgICAmJiBpc1N0cmluZ1Nh ZmVUb1NlbmRUb0Fub3RoZXJUaHJlYWQobV9yZXNvdXJjZVVSTCkKLSAgICAgICAgJiYgaXNTdHJp bmdTYWZlVG9TZW5kVG9Bbm90aGVyVGhyZWFkKG1fYmFzZVVSTC5zdHJpbmcoKSk7CisgICAgcmV0 dXJuIG1faW5pdGlhdG9yLmlzU2FmZVRvU2VuZFRvQW5vdGhlclRocmVhZCgpCisgICAgICAgICYm IG1fY2hhcnNldC5pc1NhZmVUb1NlbmRUb0Fub3RoZXJUaHJlYWQoKQorICAgICAgICAmJiBtX3Jl c291cmNlVVJMLmlzU2FmZVRvU2VuZFRvQW5vdGhlclRocmVhZCgpCisgICAgICAgICYmIG1fYmFz ZVVSTC5pc1NhZmVUb1NlbmRUb0Fub3RoZXJUaHJlYWQoKTsKIH0KIAogS1VSTCBQcmVsb2FkUmVx dWVzdDo6Y29tcGxldGVVUkwoRG9jdW1lbnQqIGRvY3VtZW50KQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFJlc291cmNlUHJlbG9hZGVyLmggYi9Tb3VyY2UvV2Vi Q29yZS9odG1sL3BhcnNlci9IVE1MUmVzb3VyY2VQcmVsb2FkZXIuaAppbmRleCBjMDJhMjUwOTRk MWIzYTAwZjE0MWYzZjcwMDkwOTYxNzg5OGE5Y2MyLi5kZDQ1MjNlY2JkZjA0N2U4MTgxYThlNGM5 MmVlZDc4ZDNjNTQ3NDI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9I VE1MUmVzb3VyY2VQcmVsb2FkZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9I VE1MUmVzb3VyY2VQcmVsb2FkZXIuaApAQCAtMzcsNiArMzcsNyBAQCBwdWJsaWM6CiAgICAgewog ICAgICAgICByZXR1cm4gYWRvcHRQdHIobmV3IFByZWxvYWRSZXF1ZXN0KGluaXRpYXRvciwgcmVz b3VyY2VVUkwsIGJhc2VVUkwsIHJlc291cmNlVHlwZSkpOwogICAgIH0KKwogICAgIGJvb2wgaXNT YWZlVG9TZW5kVG9Bbm90aGVyVGhyZWFkKCkgY29uc3Q7CiAKICAgICBDYWNoZWRSZXNvdXJjZVJl cXVlc3QgcmVzb3VyY2VSZXF1ZXN0KERvY3VtZW50Kik7CkBAIC01Myw3ICs1NCw4IEBAIHByaXZh dGU6CiAgICAgICAgICwgbV9iYXNlVVJMKGJhc2VVUkwpCiAgICAgICAgICwgbV9yZXNvdXJjZVR5 cGUocmVzb3VyY2VUeXBlKQogICAgICAgICAsIG1fY3Jvc3NPcmlnaW5Nb2RlQWxsb3dzQ29va2ll cyhmYWxzZSkKLSAgICB7IH0KKyAgICB7CisgICAgfQogCiAgICAgS1VSTCBjb21wbGV0ZVVSTChE b2N1bWVudCopOwogCkBAIC03MSw3ICs3Myw4IEBAIHB1YmxpYzoKICAgICBleHBsaWNpdCBIVE1M UmVzb3VyY2VQcmVsb2FkZXIoRG9jdW1lbnQqIGRvY3VtZW50KQogICAgICAgICA6IG1fZG9jdW1l bnQoZG9jdW1lbnQpCiAgICAgICAgICwgbV93ZWFrRmFjdG9yeSh0aGlzKQotICAgIHsgfQorICAg IHsKKyAgICB9CiAKICAgICB2b2lkIHByZWxvYWQoUGFzc093blB0cjxQcmVsb2FkUmVxdWVzdD4p OwogCg==