Changeset 31920 in webkit

Timestamp:

Apr 15, 2008 2:31:11 PM (16 years ago)

Author:

hyatt@apple.com

Message:

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

Fix the zoom property so that it works properly with font-size.

Reviewed by John Sullivan

Added fast/css/zoom-font-size.html

• css/CSSStyleSelector.cpp: (WebCore::CSSStyleSelector::updateFont): (WebCore::CSSStyleSelector::applyProperty): (WebCore::CSSStyleSelector::checkForZoomChange):
• css/CSSStyleSelector.h:

Location:

trunk

Files:

• LayoutTests/fast/css/zoom-font-size.html (added)
• LayoutTests/platform/mac/fast/css/zoom-font-size-expected.checksum (added)
• LayoutTests/platform/mac/fast/css/zoom-font-size-expected.png (added)
• LayoutTests/platform/mac/fast/css/zoom-font-size-expected.txt (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/css/CSSStyleSelector.cpp (modified) (3 diffs)
• WebCore/css/CSSStyleSelector.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-04-15  David Hyatt  <hyatt@apple.com>
+
+        Fix the zoom property so that it works properly with font-size.
+
+        Reviewed by John Sullivan
+
+        Added fast/css/zoom-font-size.html
+
+        * css/CSSStyleSelector.cpp:
+        (WebCore::CSSStyleSelector::updateFont):
+        (WebCore::CSSStyleSelector::applyProperty):
+        (WebCore::CSSStyleSelector::checkForZoomChange):
+        * css/CSSStyleSelector.h:
+
 2008-04-15  Timothy Hatcher  <timothy@apple.com>
 

trunk/WebCore/css/CSSStyleSelector.cpp

@@ -1197 +1197 @@
     checkForTextSizeAdjust();
     checkForGenericFamilyChange(m_style, m_parentStyle);
+    checkForZoomChange(m_style, m_parentStyle);
     m_style->font().update(m_fontSelector);
     m_fontDirty = false;
@@ -3583 +3584 @@
                 m_style->setZoom(primitiveValue->getFloatValue());
         }
+        
+        m_fontDirty = true;
         return;
     }
@@ -4878 +4881 @@
 }
 
+void CSSStyleSelector::checkForZoomChange(RenderStyle* style, RenderStyle* parentStyle)
+{
+    if (style->effectiveZoom() == parentStyle->effectiveZoom())
+        return;
+    
+    const FontDescription& childFont = style->fontDescription();
+    FontDescription newFontDescription(childFont);
+    setFontSize(newFontDescription, childFont.specifiedSize());
+    style->setFontDescription(newFontDescription);
+}
+
 void CSSStyleSelector::checkForGenericFamilyChange(RenderStyle* style, RenderStyle* parentStyle)
 {

trunk/WebCore/css/CSSStyleSelector.h

@@ -139 +139 @@
         // This function fixes up the default font size if it detects that the current generic font family has changed. -dwh
         void checkForGenericFamilyChange(RenderStyle*, RenderStyle* parentStyle);
+        void checkForZoomChange(RenderStyle*, RenderStyle* parentStyle);
         void checkForTextSizeAdjust();