2008-12-16 David Hyatt <hyatt@apple.com>

David Hyatt · David Hyatt · commit 80334b6c1b12 · 2009-01-07T20:24:45.000Z
Make Safari RSS behave nicely with full page zoom. Need to add a new value to enable resetting of zoom back to the document-level default. Reviewed by Darin Adler * css/CSSParser.cpp: (WebCore::CSSParser::parseValue): * css/CSSStyleSelector.cpp: (WebCore::CSSStyleSelector::applyProperty): * css/CSSValueKeywords.in: Canonical link: https://commits.webkit.org/31882@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@39683 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2008-12-16  David Hyatt  <hyatt@apple.com>
+
+        Make Safari RSS behave nicely with full page zoom.  Need to add a new value to enable resetting of zoom
+        back to the document-level default.
+
+        Reviewed by Darin Adler
+
+        * css/CSSParser.cpp:
+        (WebCore::CSSParser::parseValue):
+        * css/CSSStyleSelector.cpp:
+        (WebCore::CSSStyleSelector::applyProperty):
+        * css/CSSValueKeywords.in:
+
 2009-01-07  Darin Adler  <darin@apple.com>
 
         Reviewed by Oliver Hunt.
diff --git a/WebCore/css/CSSParser.cpp b/WebCore/css/CSSParser.cpp
@@ -1079,8 +1079,8 @@ bool CSSParser::parseValue(int propId, bool important)
         }
         break;
 
-    case CSSPropertyZoom:          // normal | reset | <number> | <percentage> | inherit
-        if (id == CSSValueNormal || id == CSSValueReset)
+    case CSSPropertyZoom:          // normal | reset | document | <number> | <percentage> | inherit
+        if (id == CSSValueNormal || id == CSSValueReset || id == CSSValueDocument)
             valid_primitive = true;
         else
             valid_primitive = (!id && validUnit(value, FNumber | FPercent | FNonNeg, true));
diff --git a/WebCore/css/CSSStyleSelector.cpp b/WebCore/css/CSSStyleSelector.cpp
@@ -4117,6 +4117,10 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
         else if (primitiveValue->getIdent() == CSSValueReset) {
             m_style->setEffectiveZoom(RenderStyle::initialZoom());
             m_style->setZoom(RenderStyle::initialZoom());
+        } else if (primitiveValue->getIdent() == CSSValueDocument) {
+            float docZoom = m_checker.m_document->renderer()->style()->zoom();
+            m_style->setEffectiveZoom(docZoom);
+            m_style->setZoom(docZoom);
         } else if (type == CSSPrimitiveValue::CSS_PERCENTAGE) {
             if (primitiveValue->getFloatValue())
                 m_style->setZoom(primitiveValue->getFloatValue() / 100.0f);
diff --git a/WebCore/css/CSSValueKeywords.in b/WebCore/css/CSSValueKeywords.in
@@ -584,6 +584,7 @@ ease-in-out
 #
 # CSS_PROP_ZOOM
 #
+document
 reset
 
 #

Original file line number	Diff line number	Diff line change
`@@ -584,6 +584,7 @@ ease-in-out`
`584`	`584`	`#`
`585`	`585`	`# CSS_PROP_ZOOM`
`586`	`586`	`#`
	`587`	`+document`
`587`	`588`	`reset`
`588`	`589`
`589`	`590`	`#`