Changeset 53684 in webkit

Timestamp:

Jan 22, 2010 12:20:22 AM (14 years ago)

Author:

mitz@apple.com

Message:

<rdar://problem/7568696> Zoom applied to embedded SVG incorrectly
​https://bugs.webkit.org/show_bug.cgi?id=33988

Reviewed by Darin Adler.

WebCore:

Test: svg/custom/text-zoom.xhtml

• svg/SVGSVGElement.cpp:

(WebCore::SVGSVGElement::SVGSVGElement): Initialize m_scale.
(WebCore::SVGSVGElement::currentScale): If this is the document element,
return the frame’s zoom factor. Otherwise, return m_scale.
(WebCore::SVGSVGElement::setCurrentScale): If this is the document element,
set the frame’s zoom factor. Otherwise, set m_scale and mark for layout.

• svg/SVGSVGElement.h: Added m_scale member.

LayoutTests:

• svg/custom/text-zoom-expected.checksum: Added.
• svg/custom/text-zoom-expected.png: Added.
• svg/custom/text-zoom-expected.txt: Added.
• svg/custom/text-zoom.xhtml: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/svg/custom/text-zoom-expected.checksum (added)
• LayoutTests/svg/custom/text-zoom-expected.png (added)
• LayoutTests/svg/custom/text-zoom-expected.txt (added)
• LayoutTests/svg/custom/text-zoom.xhtml (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/svg/SVGSVGElement.cpp (modified) (2 diffs)
• WebCore/svg/SVGSVGElement.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-01-22  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Darin Adler.
+
+        <rdar://problem/7568696> Zoom applied to embedded SVG incorrectly
+        https://bugs.webkit.org/show_bug.cgi?id=33988
+
+        * svg/custom/text-zoom-expected.checksum: Added.
+        * svg/custom/text-zoom-expected.png: Added.
+        * svg/custom/text-zoom-expected.txt: Added.
+        * svg/custom/text-zoom.xhtml: Added.
+
 2010-01-21  Tony Chang  <tony@chromium.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-01-22  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Darin Adler.
+
+        <rdar://problem/7568696> Zoom applied to embedded SVG incorrectly
+        https://bugs.webkit.org/show_bug.cgi?id=33988
+
+        Test: svg/custom/text-zoom.xhtml
+
+        * svg/SVGSVGElement.cpp:
+        (WebCore::SVGSVGElement::SVGSVGElement): Initialize m_scale.
+        (WebCore::SVGSVGElement::currentScale): If this is the document element,
+        return the frame’s zoom factor. Otherwise, return m_scale.
+        (WebCore::SVGSVGElement::setCurrentScale): If this is the document element,
+        set the frame’s zoom factor. Otherwise, set m_scale and mark for layout.
+        * svg/SVGSVGElement.h: Added m_scale member.
+
 2010-01-21  Adam Barth  <abarth@webkit.org>
 

trunk/WebCore/svg/SVGSVGElement.cpp

@@ -73 +73 @@
     , m_useCurrentView(false)
     , m_timeContainer(SMILTimeContainer::create(this))
+    , m_scale(1)
     , m_viewSpec(0)
     , m_containerSize(300, 150)
@@ -190 +191 @@
 float SVGSVGElement::currentScale() const
 {
-    if (document() && document()->frame())
-        return document()->frame()->zoomFactor();
-    return 1.0f;
+    if (document() && parentNode() == document())
+        return document()->frame() ? document()->frame()->zoomFactor() : 1;
+    return m_scale;
 }
 
 void SVGSVGElement::setCurrentScale(float scale)
 {
-    if (document() && document()->frame())
-        document()->frame()->setZoomFactor(scale, true);
+    if (document() && parentNode() == document()) {
+        if (document()->frame())
+            document()->frame()->setZoomFactor(scale, true);
+        return;
+    }
+
+    m_scale = scale;
+    if (renderer())
+        renderer()->setNeedsLayout(true);
 }
 

trunk/WebCore/svg/SVGSVGElement.h

@@ -155 +155 @@
         RefPtr<SMILTimeContainer> m_timeContainer;
         FloatPoint m_translation;
+        float m_scale;
         mutable OwnPtr<SVGViewSpec> m_viewSpec;
         IntSize m_containerSize;