32445 2009-12-11 13:34:42 -0800 REGRESSION: http://www.mcafee.com/japan/ displays unstyled 2009-12-11 17:12:39 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Mac All RESOLVED FIXED InRadar, Regression P2 Normal --- 1 ap ap darin levin webkit.review.bot oldest_to_newest 170901 0 ap 2009-12-11 13:34:42 -0800 http://www.mcafee.com/japan/ stylesheets are served with two Content-Type headers, which confuses WebKit: $ curl -I http://www.mcafee.com/japan/css2009/masthead.css HTTP/1.1 200 OK Server: Microsoft-IIS/5.0 Content-Type: text/html; charset=Shift_jis X-Powered-By: ASP.NET Date: Mon, 20 Jul 2009 00:54:00 GMT Content-Type: text/css Accept-Ranges: bytes Last-Modified: Tue, 03 Mar 2009 05:54:10 GMT ETag: "1bb93179c49bc91:e79" Content-Length: 1079 WebKit sees Content-Type as "text/html; charset=Shift_jis, text/css", which is not a proper CSS MIME type, so the stylesheet gets ignored in strict mode. Handling of HTTP headers is performed by closed source Apple libraries, but we can work around the issue for now. 170902 1 44706 ap 2009-12-11 13:38:10 -0800 Created attachment 44706 proposed fix 170903 2 ap 2009-12-11 13:38:28 -0800 <rdar://problem/7068303> 170904 3 webkit.review.bot 2009-12-11 13:43:00 -0800 style-queue ran check-webkit-style on attachment 44706 without any errors. 170909 4 levin 2009-12-11 13:56:30 -0800 The brace on line 274 in WebCore/html/HTMLLinkElement.cpp should be inside the ifdef. 170910 5 44706 darin 2009-12-11 13:57:27 -0800 Comment on attachment 44706 proposed fix > + bool needsSiteSpecificQuirks = parent && parent->doc() && parent->doc()->settings() && parent->doc()->settings()->needsSiteSpecificQuirks(); The old code had the nice property that it would evaluate this only when strict mode was on. > + bool needsSiteSpecificQuirks = document()->page() && document()->page()->settings()->needsSiteSpecificQuirks(); Same here. Could we structure things so that is still true? r=me 170911 6 44706 darin 2009-12-11 13:58:01 -0800 Comment on attachment 44706 proposed fix > + if (url.contains("mcafee.com/japan/", false)) It's a little strange to do this as a substring check. But I can't think of anything better. 170925 7 ap 2009-12-11 14:12:30 -0800 > The old code had the nice property that it would evaluate this only when strict > mode was on. I noticed that it was lost, but couldn't come up with a better idea. One constraint was that I wanted the new code to be easily removable once it's no longer needed. Also, I doubt that this is such hot code. Not landing this right away, maybe a fresh look will help. (In reply to comment #4) > The brace on line 274 in WebCore/html/HTMLLinkElement.cpp should be inside the > ifdef. Oops, thanks! 170996 8 ap 2009-12-11 17:12:39 -0800 Committed <http://trac.webkit.org/changeset/52032> without re-arranging the code. I added a comment about the reason we use such a strange URL check to both places where we do now. 44706 2009-12-11 13:38:10 -0800 2009-12-11 13:58:01 -0800 proposed fix McAfee.com.txt text/plain 3918 ap SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MjAxOSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMDktMTItMTEgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBhcHBs ZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMyNDQ1CisgICAgICAgIFJF R1JFU1NJT046IGh0dHA6Ly93d3cubWNhZmVlLmNvbS9qYXBhbi8gZGlzcGxheXMgdW5zdHlsZWQK KworICAgICAgICAqIGNzcy9DU1NJbXBvcnRSdWxlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNT U0ltcG9ydFJ1bGU6OnNldENTU1N0eWxlU2hlZXQpOgorICAgICAgICAqIGh0bWwvSFRNTExpbmtF bGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxMaW5rRWxlbWVudDo6c2V0Q1NTU3R5 bGVTaGVldCk6CisgICAgICAgIEFkZCBhIHF1aXJrIGZvciBtY2FmZWUuY29tL2phcGFuIChodHRw IG9yIGh0dHBzLCB3aXRoIG9yIHdpdGhvdXQgd3d3KS4KKwogMjAwOS0xMi0xMSAgU2ltb24gRnJh c2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBCdWlsZCBmaXgsIG5vIHJl dmlldy4KSW5kZXg6IFdlYkNvcmUvY3NzL0NTU0ltcG9ydFJ1bGUuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYkNvcmUvY3NzL0NTU0ltcG9ydFJ1bGUuY3BwCShyZXZpc2lvbiA1MTk5NykKKysrIFdlYkNv cmUvY3NzL0NTU0ltcG9ydFJ1bGUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02MSwxMCArNjEsMjAg QEAgdm9pZCBDU1NJbXBvcnRSdWxlOjpzZXRDU1NTdHlsZVNoZWV0KGNvbgogCiAgICAgQ1NTU3R5 bGVTaGVldCogcGFyZW50ID0gcGFyZW50U3R5bGVTaGVldCgpOwogICAgIGJvb2wgc3RyaWN0ID0g IXBhcmVudCB8fCBwYXJlbnQtPnVzZVN0cmljdFBhcnNpbmcoKTsKLSAgICBTdHJpbmcgc2hlZXRU ZXh0ID0gc2hlZXQtPnNoZWV0VGV4dChzdHJpY3QpOworICAgIGJvb2wgZW5mb3JjZU1JTUVUeXBl ID0gc3RyaWN0OworICAgIGJvb2wgbmVlZHNTaXRlU3BlY2lmaWNRdWlya3MgPSBwYXJlbnQgJiYg cGFyZW50LT5kb2MoKSAmJiBwYXJlbnQtPmRvYygpLT5zZXR0aW5ncygpICYmIHBhcmVudC0+ZG9j KCktPnNldHRpbmdzKCktPm5lZWRzU2l0ZVNwZWNpZmljUXVpcmtzKCk7CisKKyNpZiBkZWZpbmVk KEJVSUxESU5HX09OX1RJR0VSKSB8fCBkZWZpbmVkKEJVSUxESU5HX09OX0xFT1BBUkQpCisgICAg aWYgKGVuZm9yY2VNSU1FVHlwZSAmJiBuZWVkc1NpdGVTcGVjaWZpY1F1aXJrcykgeworICAgICAg ICBpZiAodXJsLmNvbnRhaW5zKCJtY2FmZWUuY29tL2phcGFuLyIsIGZhbHNlKSkKKyAgICAgICAg ICAgIGVuZm9yY2VNSU1FVHlwZSA9IGZhbHNlOworICAgIH0KKyNlbmRpZgorCisgICAgU3RyaW5n IHNoZWV0VGV4dCA9IHNoZWV0LT5zaGVldFRleHQoZW5mb3JjZU1JTUVUeXBlKTsKICAgICBtX3N0 eWxlU2hlZXQtPnBhcnNlU3RyaW5nKHNoZWV0VGV4dCwgc3RyaWN0KTsKIAotICAgIGlmIChzdHJp Y3QgJiYgcGFyZW50ICYmIHBhcmVudC0+ZG9jKCkgJiYgcGFyZW50LT5kb2MoKS0+c2V0dGluZ3Mo KSAmJiBwYXJlbnQtPmRvYygpLT5zZXR0aW5ncygpLT5uZWVkc1NpdGVTcGVjaWZpY1F1aXJrcygp KSB7CisgICAgaWYgKHN0cmljdCAmJiBuZWVkc1NpdGVTcGVjaWZpY1F1aXJrcykgewogICAgICAg ICAvLyBXb3JrIGFyb3VuZCA8aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTI4MzUwPi4KICAgICAgICAgREVGSU5FX1NUQVRJQ19MT0NBTChjb25zdCBTdHJpbmcsIHNsYXNo S0hUTUxGaXhlc0RvdENzcywgKCIvS0hUTUxGaXhlcy5jc3MiKSk7CiAgICAgICAgIERFRklORV9T VEFUSUNfTE9DQUwoY29uc3QgU3RyaW5nLCBtZWRpYVdpa2lLSFRNTEZpeGVzU3R5bGVTaGVldCwg KCIvKiBLSFRNTCBmaXggc3R5bGVzaGVldCAqL1xuLyogd29yayBhcm91bmQgdGhlIGhvcml6b250 YWwgc2Nyb2xsYmFycyAqL1xuI2NvbHVtbi1jb250ZW50IHsgbWFyZ2luLWxlZnQ6IDA7IH1cblxu IikpOwpJbmRleDogV2ViQ29yZS9odG1sL0hUTUxMaW5rRWxlbWVudC5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9odG1sL0hUTUxMaW5rRWxlbWVudC5jcHAJKHJldmlzaW9uIDUxOTk3KQorKysg V2ViQ29yZS9odG1sL0hUTUxMaW5rRWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI1OSwx NiArMjU5LDI0IEBAIHZvaWQgSFRNTExpbmtFbGVtZW50OjpzZXRDU1NTdHlsZVNoZWV0KGMKIAog ICAgIGJvb2wgc3RyaWN0UGFyc2luZyA9ICFkb2N1bWVudCgpLT5pbkNvbXBhdE1vZGUoKTsKICAg ICBib29sIGVuZm9yY2VNSU1FVHlwZSA9IHN0cmljdFBhcnNpbmc7CisgICAgYm9vbCBuZWVkc1Np dGVTcGVjaWZpY1F1aXJrcyA9IGRvY3VtZW50KCktPnBhZ2UoKSAmJiBkb2N1bWVudCgpLT5wYWdl KCktPnNldHRpbmdzKCktPm5lZWRzU2l0ZVNwZWNpZmljUXVpcmtzKCk7CiAKICAgICAvLyBDaGVj ayB0byBzZWUgaWYgd2Ugc2hvdWxkIGVuZm9yY2UgdGhlIE1JTUUgdHlwZSBvZiB0aGUgQ1NTIHJl c291cmNlIGluIHN0cmljdCBtb2RlLgogICAgIC8vIFJ1bm5pbmcgaW4gaVdlYiAyIGlzIG9uZSBl eGFtcGxlIG9mIHdoZXJlIHdlIGRvbid0IHdhbnQgdG8gLSA8cmRhcjovL3Byb2JsZW0vNjA5OTc0 OD4KICAgICBpZiAoZW5mb3JjZU1JTUVUeXBlICYmIGRvY3VtZW50KCktPnBhZ2UoKSAmJiAhZG9j dW1lbnQoKS0+cGFnZSgpLT5zZXR0aW5ncygpLT5lbmZvcmNlQ1NTTUlNRVR5cGVJblN0cmljdE1v ZGUoKSkKICAgICAgICAgZW5mb3JjZU1JTUVUeXBlID0gZmFsc2U7CiAKKyNpZiBkZWZpbmVkKEJV SUxESU5HX09OX1RJR0VSKSB8fCBkZWZpbmVkKEJVSUxESU5HX09OX0xFT1BBUkQpCisgICAgaWYg KGVuZm9yY2VNSU1FVHlwZSAmJiBuZWVkc1NpdGVTcGVjaWZpY1F1aXJrcykgeworICAgICAgICBp ZiAodXJsLmNvbnRhaW5zKCJtY2FmZWUuY29tL2phcGFuLyIsIGZhbHNlKSkKKyAgICAgICAgICAg IGVuZm9yY2VNSU1FVHlwZSA9IGZhbHNlOworI2VuZGlmCisgICAgfQorCiAgICAgU3RyaW5nIHNo ZWV0VGV4dCA9IHNoZWV0LT5zaGVldFRleHQoZW5mb3JjZU1JTUVUeXBlKTsKICAgICBtX3NoZWV0 LT5wYXJzZVN0cmluZyhzaGVldFRleHQsIHN0cmljdFBhcnNpbmcpOwogCi0gICAgaWYgKHN0cmlj dFBhcnNpbmcgJiYgZG9jdW1lbnQoKS0+c2V0dGluZ3MoKSAmJiBkb2N1bWVudCgpLT5zZXR0aW5n cygpLT5uZWVkc1NpdGVTcGVjaWZpY1F1aXJrcygpKSB7CisgICAgaWYgKHN0cmljdFBhcnNpbmcg JiYgbmVlZHNTaXRlU3BlY2lmaWNRdWlya3MpIHsKICAgICAgICAgLy8gV29yayBhcm91bmQgPGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yODM1MD4uCiAgICAgICAgIERF RklORV9TVEFUSUNfTE9DQUwoY29uc3QgU3RyaW5nLCBzbGFzaEtIVE1MRml4ZXNEb3RDc3MsICgi L0tIVE1MRml4ZXMuY3NzIikpOwogICAgICAgICBERUZJTkVfU1RBVElDX0xPQ0FMKGNvbnN0IFN0 cmluZywgbWVkaWFXaWtpS0hUTUxGaXhlc1N0eWxlU2hlZXQsICgiLyogS0hUTUwgZml4IHN0eWxl c2hlZXQgKi9cbi8qIHdvcmsgYXJvdW5kIHRoZSBob3Jpem9udGFsIHNjcm9sbGJhcnMgKi9cbiNj b2x1bW4tY29udGVudCB7IG1hcmdpbi1sZWZ0OiAwOyB9XG5cbiIpKTsK