Changeset 15490 in webkit

Timestamp:

Jul 17, 2006 3:18:27 PM (18 years ago)

Author:

hyatt

Message:

Back out the fix for 5564, since it turns out font:x-small; is a pretty
prominent IE-specific CSS hack. Because Web sites rely on IE's incorrect
font parsing as a means of also correcting IE's incorrect font size rules.

This fixes Yahoo.com.

Reviewed by darin

• css/cssparser.cpp: (WebCore::CSSParser::parseFont):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/cssparser.cpp (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-07-17  David Hyatt  <hyatt@apple.com>
+
+        Back out the fix for 5564, since it turns out font:x-small; is a pretty
+        prominent IE-specific CSS hack.  Because Web sites rely on IE's incorrect
+        font parsing as a means of also correcting IE's incorrect font size rules.
+
+        This fixes Yahoo.com.
+
+        Reviewed by darin
+
+        * css/cssparser.cpp:
+        (WebCore::CSSParser::parseFont):
+
 2006-07-17  Justin Garcia  <justin.garcia@apple.com>
 

trunk/WebCore/css/cssparser.cpp

@@ -2031 +2031 @@
             if (id == CSS_VAL_NORMAL) {
                 // do nothing, it's the inital value for all three
-            }
-            /*
-              else if (id == CSS_VAL_INHERIT) {
-              // set all non set ones to inherit
-              // This is not that simple as the inherit could also apply to the following font-size.
-              // very ahrd to tell without looking ahead.
-              inherit = true;
-                } */
-            else if (id == CSS_VAL_ITALIC || id == CSS_VAL_OBLIQUE) {
+            } else if (id == CSS_VAL_ITALIC || id == CSS_VAL_OBLIQUE) {
                 if (font->style)
                     goto invalid;
@@ -2105 +2097 @@
         font->size = new CSSPrimitiveValue(value->fValue, (CSSPrimitiveValue::UnitTypes) value->unit);
     value = valueList->next();
-    if (!font->size || (strict && !value))
+    if (!font->size || !value)
         goto invalid;
 
-    if (value && value->unit == Value::Operator && value->iValue == '/') {
+    if (value->unit == Value::Operator && value->iValue == '/') {
         // line-height
         value = valueList->next();
@@ -2130 +2122 @@
     font->family = parseFontFamily();
 
-    if (!strict && !font->family)
-        font->family = new CSSValueList;
-    else if (valueList->current() || !font->family)
+    if (valueList->current() || !font->family)
         goto invalid;