Changeset 71252 in webkit

Timestamp:

Nov 3, 2010 11:29:56 AM (13 years ago)

Author:

tony@chromium.org

Message:

2010-11-03 Tony Chang <​tony@chromium.org>

Reviewed by Ojan Vafai.

Undo r54932 which inappropriately adjusts font sizes on zoomed pages
​https://bugs.webkit.org/show_bug.cgi?id=48890

When copying zoomed text, we used to write to the clipboard the zoomed
font size. r54932 worked around this at paste time by scaling the
font size based on the zoom.

In r67568, Erik fixed getComputedStyle to return the original value
rather than the zoomed font size. This makes the work around added
by r54932 unnecessary.

The code in r54932 was busted in the first place since it only worked
when in quirks mode since it didn't add units to the font size.

• editing/inserting/page-zoom-font-size-expected.txt: Added.
• editing/inserting/page-zoom-font-size.html: Added.

2010-11-03 Tony Chang <​tony@chromium.org>

Reviewed by Ojan Vafai.

Undo r54932 which inappropriately adjusts font sizes on zoomed pages
​https://bugs.webkit.org/show_bug.cgi?id=48890

Test: editing/inserting/page-zoom-font-size.html

• editing/ReplaceSelectionCommand.cpp: (WebCore::ReplaceSelectionCommand::negateStyleRulesThatAffectAppearance):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/inserting/page-zoom-font-size-expected.txt (added)
• LayoutTests/editing/inserting/page-zoom-font-size.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/editing/ReplaceSelectionCommand.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-11-03  Tony Chang  <tony@chromium.org>
+
+        Reviewed by Ojan Vafai.
+
+        Undo r54932 which inappropriately adjusts font sizes on zoomed pages
+        https://bugs.webkit.org/show_bug.cgi?id=48890
+
+        When copying zoomed text, we used to write to the clipboard the zoomed
+        font size.  r54932 worked around this at paste time by scaling the
+        font size based on the zoom.
+
+        In r67568, Erik fixed getComputedStyle to return the original value
+        rather than the zoomed font size.  This makes the work around added
+        by r54932 unnecessary.
+
+        The code in r54932 was busted in the first place since it only worked
+        when in quirks mode since it didn't add units to the font size.
+
+        * editing/inserting/page-zoom-font-size-expected.txt: Added.
+        * editing/inserting/page-zoom-font-size.html: Added.
+
 2010-11-03  Adam Roben  <aroben@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-11-03  Tony Chang  <tony@chromium.org>
+
+        Reviewed by Ojan Vafai.
+
+        Undo r54932 which inappropriately adjusts font sizes on zoomed pages
+        https://bugs.webkit.org/show_bug.cgi?id=48890
+
+        Test: editing/inserting/page-zoom-font-size.html
+
+        * editing/ReplaceSelectionCommand.cpp:
+        (WebCore::ReplaceSelectionCommand::negateStyleRulesThatAffectAppearance):
+
 2010-11-03  Dan Bernstein  <mitz@apple.com>
 

trunk/WebCore/editing/ReplaceSelectionCommand.cpp

@@ -485 +485 @@
             if (e->renderer() && e->renderer()->style()->floating() != FNONE)
                 e->getInlineStyleDecl()->setProperty(CSSPropertyFloat, CSSValueNone);
-
-            // Undo the effects of page zoom if we have an absolute font size.  When we copy, we
-            // compute the new font size as an absolute size so pasting will cause the zoom to be
-            // applied twice.
-            if (e->renderer() && e->renderer()->style() && e->renderer()->style()->effectiveZoom() != 1.0
-                && e->renderer()->style()->fontDescription().isAbsoluteSize()) {
-                float newSize = e->renderer()->style()->fontDescription().specifiedSize() / e->renderer()->style()->effectiveZoom();
-                ExceptionCode ec = 0;
-                e->style()->setProperty(CSSPropertyFontSize, String::number(newSize), false, ec);
-                ASSERT(!ec);
-            }
         }
         if (node == m_lastLeafInserted)