Changeset 31915 in webkit

Timestamp:

Apr 15, 2008 12:21:38 PM (16 years ago)

Author:

hyatt@apple.com

Message:

2008-04-15 David Hyatt <​hyatt@apple.com>

​https://bugs.webkit.org/show_bug.cgi?id=18467

Make sure to ignore zoom:0. That is not supposed to actually do anything. It's a hack in IE
to cause an element to set "hasLayout."

Reviewed by Anders

Added fast/css/zoom-property-parsing.html

• css/CSSParser.cpp: (WebCore::CSSParser::parseValue):
• css/CSSStyleSelector.cpp: (WebCore::CSSStyleSelector::applyProperty):

Location:

trunk

Files:

• LayoutTests/fast/css/zoom-property-parsing.html (added)
• LayoutTests/platform/mac/fast/css/zoom-property-parsing-expected.checksum (added)
• LayoutTests/platform/mac/fast/css/zoom-property-parsing-expected.png (added)
• LayoutTests/platform/mac/fast/css/zoom-property-parsing-expected.txt (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/css/CSSParser.cpp (modified) (1 diff)
• WebCore/css/CSSStyleSelector.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-04-15  David Hyatt  <hyatt@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=18467
+
+        Make sure to ignore zoom:0.  That is not supposed to actually do anything.  It's a hack in IE
+        to cause an element to set "hasLayout."
+
+        Reviewed by Anders
+
+        Added fast/css/zoom-property-parsing.html
+
+        * css/CSSParser.cpp:
+        (WebCore::CSSParser::parseValue):
+        * css/CSSStyleSelector.cpp:
+        (WebCore::CSSStyleSelector::applyProperty):
+
 2008-04-15  Anders Carlsson  <andersca@apple.com>
 

trunk/WebCore/css/CSSParser.cpp

@@ -1081 +1081 @@
             valid_primitive = true;
         else
-            valid_primitive = (!id && validUnit(value, FNumber | FPercent, true));
+            valid_primitive = (!id && validUnit(value, FNumber | FPercent | FNonNeg, true));
         break;
         

trunk/WebCore/css/CSSStyleSelector.cpp

@@ -3576 +3576 @@
             m_style->setEffectiveZoom(RenderStyle::initialZoom());
             m_style->setZoom(RenderStyle::initialZoom());
-        } else if (type == CSSPrimitiveValue::CSS_PERCENTAGE)
-            m_style->setZoom(primitiveValue->getFloatValue() / 100.0f);
-        else if (type == CSSPrimitiveValue::CSS_NUMBER)
-            m_style->setZoom(primitiveValue->getFloatValue());
+        } else if (type == CSSPrimitiveValue::CSS_PERCENTAGE) {
+            if (primitiveValue->getFloatValue())
+                m_style->setZoom(primitiveValue->getFloatValue() / 100.0f);
+        } else if (type == CSSPrimitiveValue::CSS_NUMBER) {
+            if (primitiveValue->getFloatValue())
+                m_style->setZoom(primitiveValue->getFloatValue());
+        }
         return;
     }