Changeset 21925 in webkit

Timestamp:

May 31, 2007 6:52:31 PM (17 years ago)

Author:

weinig

Message:

Reviewed by Darin.

​http://bugs.webkit.org/show_bug.cgi?id=11272
Implement currentScale(), setCurrentScale() and currentTranslate() in SVGSVGElement

Allow zooming and panning, thereby implementing the above methods.

• ksvg2/svg/SVGDocument.cpp: (WebCore::SVGDocument::zoomEnabled): (WebCore::SVGDocument::startPan): (WebCore::SVGDocument::updatePan):
• ksvg2/svg/SVGDocument.h:
• ksvg2/svg/SVGSVGElement.cpp: (WebCore::SVGSVGElement::currentScale): (WebCore::SVGSVGElement::setCurrentScale): (WebCore::SVGSVGElement::currentTranslate): (WebCore::SVGSVGElement::setCurrentTranslate):
• ksvg2/svg/SVGSVGElement.h:
• page/EventHandler.cpp: (WebCore::EventHandler::EventHandler): (WebCore::EventHandler::handleMousePressEvent): (WebCore::EventHandler::handleMouseMoveEvent): (WebCore::EventHandler::handleMouseReleaseEvent):
• page/EventHandler.h:
• page/Frame.cpp: (WebCore::Frame::setZoomFactor):
• rendering/RenderSVGContainer.cpp: (WebCore::RenderSVGContainer::layout): (WebCore::RenderSVGContainer::paint): (WebCore::RenderSVGContainer::absoluteTransform):
• rendering/RenderSVGContainer.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• ksvg2/svg/SVGDocument.cpp (modified) (3 diffs)
• ksvg2/svg/SVGDocument.h (modified) (3 diffs)
• ksvg2/svg/SVGSVGElement.cpp (modified) (2 diffs)
• ksvg2/svg/SVGSVGElement.h (modified) (4 diffs)
• page/EventHandler.cpp (modified) (5 diffs)
• page/EventHandler.h (modified) (1 diff)
• page/Frame.cpp (modified) (1 diff)
• rendering/RenderSVGContainer.cpp (modified) (4 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-05-31  Rob Buis  <buis@kde.org>
+
+        Reviewed by Darin.
+
+        http://bugs.webkit.org/show_bug.cgi?id=11272
+        Implement currentScale(), setCurrentScale() and currentTranslate() in SVGSVGElement
+
+        Allow zooming and panning, thereby implementing the above methods.
+
+        * ksvg2/svg/SVGDocument.cpp:
+        (WebCore::SVGDocument::zoomEnabled):
+        (WebCore::SVGDocument::startPan):
+        (WebCore::SVGDocument::updatePan):
+        * ksvg2/svg/SVGDocument.h:
+        * ksvg2/svg/SVGSVGElement.cpp:
+        (WebCore::SVGSVGElement::currentScale):
+        (WebCore::SVGSVGElement::setCurrentScale):
+        (WebCore::SVGSVGElement::currentTranslate):
+        (WebCore::SVGSVGElement::setCurrentTranslate):
+        * ksvg2/svg/SVGSVGElement.h:
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::EventHandler):
+        (WebCore::EventHandler::handleMousePressEvent):
+        (WebCore::EventHandler::handleMouseMoveEvent):
+        (WebCore::EventHandler::handleMouseReleaseEvent):
+        * page/EventHandler.h:
+        * page/Frame.cpp:
+        (WebCore::Frame::setZoomFactor):
+        * rendering/RenderSVGContainer.cpp:
+        (WebCore::RenderSVGContainer::layout):
+        (WebCore::RenderSVGContainer::paint):
+        (WebCore::RenderSVGContainer::absoluteTransform):
+        * rendering/RenderSVGContainer.h:
+
 2007-05-31  Eric Seidel  <eric@webkit.org>
 

trunk/WebCore/ksvg2/svg/SVGDocument.cpp

@@ -1 +1 @@
 /*
     Copyright (C) 2004, 2005 Nikolas Zimmermann <wildfox@kde.org>
-                  2004, 2005, 2006 Rob Buis <buis@kde.org>
+                  2004, 2005, 2006, 2007 Rob Buis <buis@kde.org>
 
     This file is part of the KDE project
@@ -27 +27 @@
 #include "EventNames.h"
 #include "ExceptionCode.h"
+#include "FrameView.h"
+#include "RenderView.h"
 #include "SVGElement.h"
 #include "SVGNames.h"
 #include "SVGSVGElement.h"
 #include "SVGZoomEvent.h"
+#include "SVGZoomAndPan.h"
 
 namespace WebCore {
@@ -75 +78 @@
 }
 
+bool SVGDocument::zoomAndPanEnabled() const
+{
+    if (rootElement())
+        return rootElement()->zoomAndPan() == SVGZoomAndPan::SVG_ZOOMANDPAN_MAGNIFY;
+
+    return false;
+}
+
+void SVGDocument::startPan(const FloatPoint& start)
+{
+    if (rootElement())
+        m_translate = FloatPoint(start.x() - rootElement()->currentTranslate().x(), rootElement()->currentTranslate().y() + start.y());
+}
+
+void SVGDocument::updatePan(const FloatPoint& pos) const
+{
+    if (rootElement()) {
+        rootElement()->setCurrentTranslate(FloatPoint(pos.x() - m_translate.x(), m_translate.y() - pos.y()));
+        if (renderer())
+            renderer()->repaint();
+    }
+}
+
 }
 

trunk/WebCore/ksvg2/svg/SVGDocument.h

@@ -1 +1 @@
 /*
     Copyright (C) 2004, 2005 Nikolas Zimmermann <wildfox@kde.org>
-                  2004, 2005, 2006 Rob Buis <buis@kde.org>
+                  2004, 2005, 2006, 2007 Rob Buis <buis@kde.org>
 
     This file is part of the KDE project
@@ -26 +26 @@
 
 #include "Document.h"
+#include "FloatPoint.h"
 
 namespace WebCore {
 
+    class DOMImplementation;
     class SVGElement;
     class SVGSVGElement;
-    class DOMImplementation;
 
     class SVGDocument : public Document {
@@ -46 +47 @@
         void dispatchZoomEvent(float prevScale, float newScale);
         void dispatchScrollEvent();
+
+        virtual bool zoomAndPanEnabled() const;
+
+        void startPan(const FloatPoint& start);
+        void updatePan(const FloatPoint& pos) const;
+
+    private:
+        FloatPoint m_translate;
     };
 

trunk/WebCore/ksvg2/svg/SVGSVGElement.cpp

@@ -159 +159 @@
 float SVGSVGElement::currentScale() const
 {
-    // FIXME: Return the current zoom/scale value (see bug 11272)
-    return 1.;
+    if (document() && document()->frame())
+        return document()->frame()->zoomFactor() / 100.0f;
+    return 1.0f;
 }
 
 void SVGSVGElement::setCurrentScale(float scale)
 {
-    // FIXME: Set the current zoom/scale value (see bug 11272)
+    if (document() && document()->frame())
+        document()->frame()->setZoomFactor(scale / 100.0f);
 }
 
 FloatPoint SVGSVGElement::currentTranslate() const
 {
-    // FIXME: Return the current pan/translate value (see bug 11272)
-    return FloatPoint();
+    return m_translation;
+}
+
+void SVGSVGElement::setCurrentTranslate(const FloatPoint &translation)
+{
+    m_translation = translation;
 }
 
@@ -399 +405 @@
 }
 
-void SVGSVGElement::setZoomAndPan(unsigned short zoomAndPan)
-{
-    SVGZoomAndPan::setZoomAndPan(zoomAndPan);
-    //canvasView()->enableZoomAndPan(zoomAndPan == SVG_ZOOMANDPAN_MAGNIFY);
-}
-
 void SVGSVGElement::pauseAnimations()
 {

trunk/WebCore/ksvg2/svg/SVGSVGElement.h

@@ -1 +1 @@
 /*
     Copyright (C) 2004, 2005, 2006 Nikolas Zimmermann <zimmermann@kde.org>
-                  2004, 2005, 2006 Rob Buis <buis@kde.org>
+                  2004, 2005, 2006, 2007 Rob Buis <buis@kde.org>
 
     This file is part of the KDE project
@@ -78 +78 @@
 
         FloatPoint currentTranslate() const;
+        void setCurrentTranslate(const FloatPoint&);
         
         TimeScheduler* timeScheduler() { return m_timeScheduler; }
@@ -120 +121 @@
         virtual void removedFromDocument();
 
-        // 'virtual SVGZoomAndPan functions
-        virtual void setZoomAndPan(unsigned short zoomAndPan);
-
         virtual void attributeChanged(Attribute*, bool preserveDecls = false);
 
@@ -145 +143 @@
         bool m_useCurrentView;
         TimeScheduler* m_timeScheduler;
+        FloatPoint m_translation;
     };
 

trunk/WebCore/page/EventHandler.cpp

@@ -62 +62 @@
 #if ENABLE(SVG)
 #include "SVGCursorElement.h"
+#include "SVGDocument.h"
 #include "SVGLength.h"
 #include "SVGNames.h"
@@ -100 +101 @@
     , m_mouseDownMayStartAutoscroll(false)
     , m_mouseDownWasInSubframe(false)
+#if ENABLE(SVG)
+    , m_svgPan(false)
+#endif
     , m_resizeLayer(0)
     , m_capturingMouseEventsNode(0)
@@ -276 +280 @@
     if (passWidgetMouseDownEventToWidget(event))
         return true;
+
+#if ENABLE(SVG)
+    if (m_frame->document()->isSVGDocument() &&
+       static_cast<SVGDocument*>(m_frame->document())->zoomAndPanEnabled()) {
+        if (event.event().shiftKey() && singleClick) {
+            m_svgPan = true;
+            static_cast<SVGDocument*>(m_frame->document())->startPan(event.event().pos());
+            return true;
+        }
+    }
+#endif
 
     // We don't do this at the start of mouse down handling,
@@ -893 +908 @@
         m_hoverTimer.stop();
 
+#if ENABLE(SVG)
+    if (m_svgPan) {
+        static_cast<SVGDocument*>(m_frame->document())->updatePan(m_currentMousePosition);
+        return true;
+    }
+#endif
     if (m_frameSetBeingResized)
         return dispatchMouseEvent(mousemoveEvent, m_frameSetBeingResized.get(), false, 0, mouseEvent, false);
@@ -972 +993 @@
     m_mousePressed = false;
     m_currentMousePosition = mouseEvent.pos();
+
+#if ENABLE(SVG)
+    if (m_svgPan) {
+        m_svgPan = false;
+        return true;
+    }
+#endif
 
     if (m_frameSetBeingResized)

trunk/WebCore/page/EventHandler.h

@@ -269 +269 @@
     bool m_mouseDownMayStartAutoscroll;
     bool m_mouseDownWasInSubframe;
+#if ENABLE(SVG)
+    bool m_svgPan;
+#endif
 
     RenderLayer* m_resizeLayer;

trunk/WebCore/page/Frame.cpp

@@ -642 +642 @@
 
   d->m_zoomFactor = percent;
-
-  if (d->m_doc)
+  if (d->m_doc) {
+#if ENABLE(SVG)
+    if (d->m_doc->isSVGDocument()) {
+         if (d->m_doc->renderer())
+             d->m_doc->renderer()->repaint();
+         return;
+    }
+#endif
       d->m_doc->recalcStyle(Node::Force);
+  }
 
   for (Frame* child = tree()->firstChild(); child; child = child->tree()->nextSibling())

trunk/WebCore/rendering/RenderSVGContainer.cpp

@@ -118 +118 @@
 
     m_absoluteBounds = absoluteClippedOverflowRect();
+    if (!parent()->isSVGContainer()) {
+        SVGSVGElement* svg = static_cast<SVGSVGElement*>(element());
+        m_width = float(m_width) * svg->currentScale();
+        m_height = float(m_height) * svg->currentScale();
+    }
 
     if (selfNeedsLayout() && checkForRepaint)
@@ -169 +174 @@
         }
         parentX = parentY = 0;
+        SVGSVGElement* svg = static_cast<SVGSVGElement*>(element());
+        paintInfo.context->concatCTM(AffineTransform().scale(svg->currentScale()));
     } else {
         // Only the root <svg> element should need any translations using the HTML/CSS system
@@ -184 +191 @@
         paintInfo.context->concatCTM(AffineTransform().translate(viewport().x(), viewport().y()));
     }
-
     if (!localTransform().isIdentity())
         paintInfo.context->concatCTM(localTransform());
+    if (!parent()->isSVGContainer()) {
+        SVGSVGElement* svg = static_cast<SVGSVGElement*>(element());
+        paintInfo.context->concatCTM(AffineTransform().translate(svg->currentTranslate().x(), svg->currentTranslate().y()));
+    }
 
     FloatRect strokeBBox = relativeBBox(true);
@@ -342 +352 @@
 {
     AffineTransform ctm = RenderContainer::absoluteTransform();
+    if (!parent()->isSVGContainer()) {
+        SVGSVGElement* svg = static_cast<SVGSVGElement*>(element());
+        ctm.scale(svg->currentScale());
+        ctm.translate(svg->currentTranslate().x(), svg->currentTranslate().y());
+    }
     ctm.translate(viewport().x(), viewport().y());
     return viewportTransform() * ctm;