49570 2010-11-15 16:22:06 -0800 Put italics specialization check back in CSSFontSelector 2010-11-15 20:45:17 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 hyatt hyatt oldest_to_newest 309500 0 hyatt 2010-11-15 16:22:06 -0800 Put italics specialization check back in CSSFontSelector. I had to back it out, since it broke a layout test, and the issue was that local font fallback fonts should not be considered by the specialization check (since you never want to pick a fallback over an actual @font-face rule if the @font-face rule can handle it). 309519 1 73946 hyatt 2010-11-15 17:03:09 -0800 Created attachment 73946 Patch 309560 2 hyatt 2010-11-15 20:45:17 -0800 Fixed in r72056. 73946 2010-11-15 17:03:09 -0800 2010-11-15 17:17:05 -0800 Patch patch.txt text/plain 5214 hyatt SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA3MjA0NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjIgQEAKKzIwMTAtMTEtMTUgIERhdmUgSHlhdHQgIDxoeWF0dEBhcHBsZS5jb20+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ5NTcwCisgICAgICAgIAorICAgICAg ICBQdXQgaXRhbGljcyBzcGVjaWFsaXphdGlvbiBjaGVjayBiYWNrIGluIENTU0ZvbnRTZWxlY3Rv ci4gIEkgaGFkIHRvIGJhY2sgaXQgb3V0LCBzaW5jZSBpdCBicm9rZQorICAgICAgICBhIGxheW91 dCB0ZXN0LCBhbmQgdGhlIGlzc3VlIHdhcyB0aGF0IGxvY2FsIGZvbnQgZmFsbGJhY2sgZm9udHMg c2hvdWxkIG5vdCBiZSBjb25zaWRlcmVkIGJ5IHRoZQorICAgICAgICBzcGVjaWFsaXphdGlvbiBj aGVjayAoc2luY2UgeW91IG5ldmVyIHdhbnQgdG8gcGljayBhIGZhbGxiYWNrIG92ZXIgYW4gYWN0 dWFsIEBmb250LWZhY2UgcnVsZSBpZgorICAgICAgICB0aGUgQGZvbnQtZmFjZSBydWxlIGNhbiBo YW5kbGUgaXQpLgorIAorICAgICAgICAqIGNzcy9DU1NGb250RmFjZS5oOgorICAgICAgICAoV2Vi Q29yZTo6Q1NTRm9udEZhY2U6OmNyZWF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpDU1NGb250RmFj ZTo6aXNMb2NhbEZhbGxiYWNrKToKKyAgICAgICAgKFdlYkNvcmU6OkNTU0ZvbnRGYWNlOjpDU1NG b250RmFjZSk6CisgICAgICAgICogY3NzL0NTU0ZvbnRTZWxlY3Rvci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpDU1NGb250U2VsZWN0b3I6OmFkZEZvbnRGYWNlUnVsZSk6CisgICAgICAgIChXZWJD b3JlOjpjb21wYXJlRm9udEZhY2VzKToKKwogMjAxMC0xMS0xNSAgQmV0aCBEYWtpbiAgPGJkYWtp bkBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCkluZGV4OiBX ZWJDb3JlL2Nzcy9DU1NGb250RmFjZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvY3NzL0NTU0Zv bnRGYWNlLmgJKHJldmlzaW9uIDcyMDQwKQorKysgV2ViQ29yZS9jc3MvQ1NTRm9udEZhY2UuaAko d29ya2luZyBjb3B5KQpAQCAtNDIsNyArNDIsNyBAQCBjbGFzcyBTaW1wbGVGb250RGF0YTsKIAog Y2xhc3MgQ1NTRm9udEZhY2UgOiBwdWJsaWMgUmVmQ291bnRlZDxDU1NGb250RmFjZT4gewogcHVi bGljOgotICAgIHN0YXRpYyBQYXNzUmVmUHRyPENTU0ZvbnRGYWNlPiBjcmVhdGUoRm9udFRyYWl0 c01hc2sgdHJhaXRzTWFzaykgeyByZXR1cm4gYWRvcHRSZWYobmV3IENTU0ZvbnRGYWNlKHRyYWl0 c01hc2spKTsgfQorICAgIHN0YXRpYyBQYXNzUmVmUHRyPENTU0ZvbnRGYWNlPiBjcmVhdGUoRm9u dFRyYWl0c01hc2sgdHJhaXRzTWFzaywgYm9vbCBpc0xvY2FsRmFsbGJhY2sgPSBmYWxzZSkgeyBy ZXR1cm4gYWRvcHRSZWYobmV3IENTU0ZvbnRGYWNlKHRyYWl0c01hc2ssIGlzTG9jYWxGYWxsYmFj aykpOyB9CiAgICAgfkNTU0ZvbnRGYWNlKCk7CiAKICAgICBGb250VHJhaXRzTWFzayB0cmFpdHNN YXNrKCkgY29uc3QgeyByZXR1cm4gbV90cmFpdHNNYXNrOyB9CkBAIC01OCw2ICs1OCw4IEBAIHB1 YmxpYzoKICAgICBib29sIGlzTG9hZGVkKCkgY29uc3Q7CiAgICAgYm9vbCBpc1ZhbGlkKCkgY29u c3Q7CiAKKyAgICBib29sIGlzTG9jYWxGYWxsYmFjaygpIGNvbnN0IHsgcmV0dXJuIG1faXNMb2Nh bEZhbGxiYWNrOyB9CisKICAgICB2b2lkIGFkZFNvdXJjZShDU1NGb250RmFjZVNvdXJjZSopOwog CiAgICAgdm9pZCBmb250TG9hZGVkKENTU0ZvbnRGYWNlU291cmNlKik7CkBAIC04NCw5ICs4Niwx MCBAQCBwdWJsaWM6CiAjZW5kaWYKIAogcHJpdmF0ZToKLSAgICBDU1NGb250RmFjZShGb250VHJh aXRzTWFzayB0cmFpdHNNYXNrKQorICAgIENTU0ZvbnRGYWNlKEZvbnRUcmFpdHNNYXNrIHRyYWl0 c01hc2ssIGJvb2wgaXNMb2NhbEZhbGxiYWNrKQogICAgICAgICA6IG1fdHJhaXRzTWFzayh0cmFp dHNNYXNrKQogICAgICAgICAsIG1fYWN0aXZlU291cmNlKDApCisgICAgICAgICwgbV9pc0xvY2Fs RmFsbGJhY2soaXNMb2NhbEZhbGxiYWNrKQogICAgIHsKICAgICB9CiAKQEAgLTk1LDYgKzk4LDcg QEAgcHJpdmF0ZToKICAgICBIYXNoU2V0PENTU1NlZ21lbnRlZEZvbnRGYWNlKj4gbV9zZWdtZW50 ZWRGb250RmFjZXM7CiAgICAgVmVjdG9yPENTU0ZvbnRGYWNlU291cmNlKj4gbV9zb3VyY2VzOwog ICAgIENTU0ZvbnRGYWNlU291cmNlKiBtX2FjdGl2ZVNvdXJjZTsKKyAgICBib29sIG1faXNMb2Nh bEZhbGxiYWNrOwogfTsKIAogfQpJbmRleDogV2ViQ29yZS9jc3MvQ1NTRm9udFNlbGVjdG9yLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2Nzcy9DU1NGb250U2VsZWN0b3IuY3BwCShyZXZpc2lv biA3MjA0MCkKKysrIFdlYkNvcmUvY3NzL0NTU0ZvbnRTZWxlY3Rvci5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTMzMyw3ICszMzMsNyBAQCB2b2lkIENTU0ZvbnRTZWxlY3Rvcjo6YWRkRm9udEZhY2VS dWxlKGNvCiAgICAgICAgICAgICAgICAgbV9sb2NhbGx5SW5zdGFsbGVkRm9udEZhY2VzLnNldChm YW1pbHlOYW1lLCBmYW1pbHlMb2NhbGx5SW5zdGFsbGVkRmFjZXMpOwogCiAgICAgICAgICAgICAg ICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IG51bUxvY2FsbHlJbnN0YWxsZWRGYWNlczsgKytp KSB7Ci0gICAgICAgICAgICAgICAgICAgIFJlZlB0cjxDU1NGb250RmFjZT4gbG9jYWxseUluc3Rh bGxlZEZvbnRGYWNlID0gQ1NTRm9udEZhY2U6OmNyZWF0ZShzdGF0aWNfY2FzdDxGb250VHJhaXRz TWFzaz4obG9jYWxseUluc3RhbGxlZEZvbnRzVHJhaXRzTWFza3NbaV0pKTsKKyAgICAgICAgICAg ICAgICAgICAgUmVmUHRyPENTU0ZvbnRGYWNlPiBsb2NhbGx5SW5zdGFsbGVkRm9udEZhY2UgPSBD U1NGb250RmFjZTo6Y3JlYXRlKHN0YXRpY19jYXN0PEZvbnRUcmFpdHNNYXNrPihsb2NhbGx5SW5z dGFsbGVkRm9udHNUcmFpdHNNYXNrc1tpXSwgdHJ1ZSkpOwogICAgICAgICAgICAgICAgICAgICBs b2NhbGx5SW5zdGFsbGVkRm9udEZhY2UtPmFkZFNvdXJjZShuZXcgQ1NTRm9udEZhY2VTb3VyY2Uo ZmFtaWx5TmFtZSkpOwogICAgICAgICAgICAgICAgICAgICBBU1NFUlQobG9jYWxseUluc3RhbGxl ZEZvbnRGYWNlLT5pc1ZhbGlkKCkpOwogICAgICAgICAgICAgICAgICAgICBmYW1pbHlMb2NhbGx5 SW5zdGFsbGVkRmFjZXMtPmFwcGVuZChsb2NhbGx5SW5zdGFsbGVkRm9udEZhY2UpOwpAQCAtNDAx LDcgKzQwMSw3IEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBjb21wYXJlRm9udEZhY2VzKENTU0YKICAg ICBpZiAoZmlyc3RIYXNEZXNpcmVkVmFyaWFudCAhPSBzZWNvbmRIYXNEZXNpcmVkVmFyaWFudCkK ICAgICAgICAgcmV0dXJuIGZpcnN0SGFzRGVzaXJlZFZhcmlhbnQ7CiAKLSAgICBpZiAoZGVzaXJl ZFRyYWl0c01hc2tGb3JDb21wYXJpc29uICYgRm9udFZhcmlhbnRTbWFsbENhcHNNYXNrKSB7Cisg ICAgaWYgKGRlc2lyZWRUcmFpdHNNYXNrRm9yQ29tcGFyaXNvbiAmIEZvbnRWYXJpYW50U21hbGxD YXBzTWFzayAmJiAhZmlyc3QtPmlzTG9jYWxGYWxsYmFjaygpICYmICFzZWNvbmQtPmlzTG9jYWxG YWxsYmFjaygpKSB7CiAgICAgICAgIC8vIFByZWZlciBhIGZvbnQgdGhhdCBoYXMgaW5kaWNhdGVk IHRoYXQgaXQgY2FuIG9ubHkgc3VwcG9ydCBzbWFsbC1jYXBzIHRvIGEgZm9udCB0aGF0IGNsYWlt cyB0byBzdXBwb3J0CiAgICAgICAgIC8vIGFsbCB2YXJpYW50cy4gIFRoZSBzcGVjaWFsaXplZCBm b250IGlzIG1vcmUgbGlrZWx5IHRvIGJlIHRydWUgc21hbGwtY2FwcyBhbmQgbm90IHJlcXVpcmUg c3ludGhlc2lzLgogICAgICAgICBib29sIGZpcnN0UmVxdWlyZXNTbWFsbENhcHMgPSAoZmlyc3RU cmFpdHNNYXNrICYgRm9udFZhcmlhbnRTbWFsbENhcHNNYXNrKSAmJiAhKGZpcnN0VHJhaXRzTWFz ayAmIEZvbnRWYXJpYW50Tm9ybWFsTWFzayk7CkBAIC00MTYsNiArNDE2LDE1IEBAIHN0YXRpYyBp bmxpbmUgYm9vbCBjb21wYXJlRm9udEZhY2VzKENTU0YKICAgICBpZiAoZmlyc3RIYXNEZXNpcmVk U3R5bGUgIT0gc2Vjb25kSGFzRGVzaXJlZFN0eWxlKQogICAgICAgICByZXR1cm4gZmlyc3RIYXNE ZXNpcmVkU3R5bGU7CiAKKyAgICBpZiAoZGVzaXJlZFRyYWl0c01hc2tGb3JDb21wYXJpc29uICYg Rm9udFN0eWxlSXRhbGljTWFzayAmJiAhZmlyc3QtPmlzTG9jYWxGYWxsYmFjaygpICYmICFzZWNv bmQtPmlzTG9jYWxGYWxsYmFjaygpKSB7CisgICAgICAgIC8vIFByZWZlciBhIGZvbnQgdGhhdCBo YXMgaW5kaWNhdGVkIHRoYXQgaXQgY2FuIG9ubHkgc3VwcG9ydCBpdGFsaWNzIHRvIGEgZm9udCB0 aGF0IGNsYWltcyB0byBzdXBwb3J0CisgICAgICAgIC8vIGFsbCBzdHlsZXMuICBUaGUgc3BlY2lh bGl6ZWQgZm9udCBpcyBtb3JlIGxpa2VseSB0byBiZSB0aGUgb25lIHRoZSBhdXRob3Igd2FudHMg dXNlZC4KKyAgICAgICAgYm9vbCBmaXJzdFJlcXVpcmVzSXRhbGljcyA9IChmaXJzdFRyYWl0c01h c2sgJiBGb250U3R5bGVJdGFsaWNNYXNrKSAmJiAhKGZpcnN0VHJhaXRzTWFzayAmIEZvbnRTdHls ZU5vcm1hbE1hc2spOworICAgICAgICBib29sIHNlY29uZFJlcXVpcmVzSXRhbGljcyA9IChzZWNv bmRUcmFpdHNNYXNrICYgRm9udFN0eWxlSXRhbGljTWFzaykgJiYgIShzZWNvbmRUcmFpdHNNYXNr ICYgRm9udFN0eWxlTm9ybWFsTWFzayk7CisgICAgICAgIGlmIChmaXJzdFJlcXVpcmVzSXRhbGlj cyAhPSBzZWNvbmRSZXF1aXJlc0l0YWxpY3MpCisgICAgICAgICAgICByZXR1cm4gZmlyc3RSZXF1 aXJlc0l0YWxpY3M7CisgICAgfQorCiAgICAgaWYgKHNlY29uZFRyYWl0c01hc2sgJiBkZXNpcmVk VHJhaXRzTWFza0ZvckNvbXBhcmlzb24gJiBGb250V2VpZ2h0TWFzaykKICAgICAgICAgcmV0dXJu IGZhbHNlOwogICAgIGlmIChmaXJzdFRyYWl0c01hc2sgJiBkZXNpcmVkVHJhaXRzTWFza0ZvckNv bXBhcmlzb24gJiBGb250V2VpZ2h0TWFzaykK