Changeset 164983 in webkit

Timestamp:

Mar 3, 2014, 3:57:30 AM (12 years ago)

Author:

graouts@webkit.org

Message:

Respect SVG fragment identifiers in <img> src attribute
​https://bugs.webkit.org/show_bug.cgi?id=129387

Reviewed by Dirk Schulze.

Following Dirk Schulze's suggestion, we set the URL on the SVGImage itself and handle the URL's
fragment identifier at draw time in the SVGImage itself, which will provide a sounder base for
handling of fragment identifier in SVG resource URLs in CSS properties, and should also deal
with the crasher reported in ​http://webkit.org/b/129498 since there is a guaranteed Frame at the
time we call SVGImage::draw().

• svg/graphics/SVGImage.cpp:

(WebCore::SVGImage::draw):

• svg/graphics/SVGImage.h:
• svg/graphics/SVGImageForContainer.cpp:
• svg/graphics/SVGImageForContainer.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• svg/graphics/SVGImage.cpp (modified) (2 diffs)
• svg/graphics/SVGImage.h (modified) (3 diffs)
• svg/graphics/SVGImageForContainer.cpp (modified) (2 diffs)
• svg/graphics/SVGImageForContainer.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-03-03  Antoine Quint  <graouts@webkit.org>
+
+        Respect SVG fragment identifiers in <img> src attribute
+        https://bugs.webkit.org/show_bug.cgi?id=129387
+
+        Reviewed by Dirk Schulze.
+
+        Following Dirk Schulze's suggestion, we set the URL on the SVGImage itself and handle the URL's
+        fragment identifier at draw time in the SVGImage itself, which will provide a sounder base for
+        handling of fragment identifier in SVG resource URLs in CSS properties, and should also deal
+        with the crasher reported in http://webkit.org/b/129498 since there is a guaranteed Frame at the
+        time we call SVGImage::draw().
+
+        * svg/graphics/SVGImage.cpp:
+        (WebCore::SVGImage::draw):
+        * svg/graphics/SVGImage.h:
+        * svg/graphics/SVGImageForContainer.cpp:
+        * svg/graphics/SVGImageForContainer.h:
+
 2014-03-03  Laszlo Vidacs  <lvidacs.u-szeged@partner.samsung.com>
 

trunk/Source/WebCore/svg/graphics/SVGImage.cpp

@@ -221 +221 @@
 
     FrameView* view = frameView();
+    ASSERT(view);
 
     GraphicsContextStateSaver stateSaver(*context);
@@ -252 +253 @@
 
     stateSaver.restore();
+
+    if (!m_url.isEmpty())
+        view->scrollToFragment(m_url);
 
     if (imageObserver())

trunk/Source/WebCore/svg/graphics/SVGImage.h

@@ -29 +29 @@
 
 #include "Image.h"
+#include "URL.h"
 
 namespace WebCore {
@@ -52 +53 @@
     virtual bool isSVGImage() const override { return true; }
     virtual IntSize size() const override { return m_intrinsicSize; }
+
+    void setURL(const URL& url) { m_url = url; }
 
     virtual bool hasSingleSecurityOrigin() const override;
@@ -96 +99 @@
     std::unique_ptr<Page> m_page;
     IntSize m_intrinsicSize;
+    URL m_url;
 };
 

trunk/Source/WebCore/svg/graphics/SVGImageForContainer.cpp

@@ -26 +26 @@
 #include "FrameView.h"
 #include "Image.h"
-#include "SVGImage.h"
 
 namespace WebCore {
@@ -55 +54 @@
 }
 
-void SVGImageForContainer::setURL(const URL& url)
-{ 
-    m_image->frameView()->scrollToFragment(url);
-}
-
 } // namespace WebCore

trunk/Source/WebCore/svg/graphics/SVGImageForContainer.h

@@ -47 +47 @@
     virtual IntSize size() const override;
 
-    void setURL(const URL&);
+    void setURL(const URL& url) { m_image->setURL(url); }
 
     virtual bool usesContainerSize() const override { return m_image->usesContainerSize(); }