Changeset 54932 in webkit

Timestamp:

Feb 17, 2010 10:44:48 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-02-17 Tony Chang <​tony@chromium.org>

Reviewed by Eric Seidel.

​https://bugs.webkit.org/show_bug.cgi?id=34914
When pasting absolute font sizes into a content editable area with
page zoom, adjust the font sizes to be the same after page zoom is
applied.

• editing/pasteboard/page-zoom-expected.txt: Added.
• editing/pasteboard/page-zoom.html: Added.

2010-02-17 Tony Chang <​tony@chromium.org>

Reviewed by Eric Seidel.

​https://bugs.webkit.org/show_bug.cgi?id=34914
When pasting absolute font sizes into a content editable area with
page zoom, adjust the font sizes to be the same after page zoom is
applied.

Test: editing/pasteboard/page-zoom.html

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

Location:

trunk

Files:

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

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-02-17  Tony Chang  <tony@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        https://bugs.webkit.org/show_bug.cgi?id=34914
+        When pasting absolute font sizes into a content editable area with
+        page zoom, adjust the font sizes to be the same after page zoom is
+        applied.
+
+        * editing/pasteboard/page-zoom-expected.txt: Added.
+        * editing/pasteboard/page-zoom.html: Added.
+
 2010-02-17  Tony Chang  <tony@chromium.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-02-17  Tony Chang  <tony@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        https://bugs.webkit.org/show_bug.cgi?id=34914
+        When pasting absolute font sizes into a content editable area with
+        page zoom, adjust the font sizes to be the same after page zoom is
+        applied.
+
+        Test: editing/pasteboard/page-zoom.html
+
+        * editing/ReplaceSelectionCommand.cpp:
+        (WebCore::ReplaceSelectionCommand::negateStyleRulesThatAffectAppearance):
+
 2010-02-17  Tony Chang  <tony@chromium.org>
 

trunk/WebCore/editing/ReplaceSelectionCommand.cpp

@@ -469 +469 @@
             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)