Changeset 184874 in webkit

Timestamp:

May 26, 2015 2:24:05 PM (9 years ago)

Author:

commit-queue@webkit.org

Message:

SVG fragment identifier rendering issue
​https://bugs.webkit.org/show_bug.cgi?id=137328

Patch by Said Abou-Hallawa <​sabouhallawa@apple.com> on 2015-05-26
Reviewed by Darin Adler.

Source/WebCore:

This is a follow up for ​http://trac.webkit.org/changeset/164983. In this
changeset, scrolling to the fragment should have been added before the
the paint to guarantee setting the proper display position for the SVG
fragment.

Test: svg/css/svg-resource-fragment-identifier-order.html

• svg/graphics/SVGImage.cpp:

(WebCore::SVGImage::draw): Move view->scrollToFragment() before calling
view->paint().

LayoutTests:

• svg/css/svg-resource-fragment-identifier-order-expected.html: Added.
• svg/css/svg-resource-fragment-identifier-order.html: Added.

Ensure the SVG fragment is drawn correctly when the same SVG image is
referenced multiple times.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/svg/css/svg-resource-fragment-identifier-order-expected.html (added)
• LayoutTests/svg/css/svg-resource-fragment-identifier-order.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/svg/graphics/SVGImage.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-05-26  Said Abou-Hallawa  <sabouhallawa@apple.com>
+
+        SVG fragment identifier rendering issue
+        https://bugs.webkit.org/show_bug.cgi?id=137328
+
+        Reviewed by Darin Adler.
+
+        * svg/css/svg-resource-fragment-identifier-order-expected.html: Added.
+        * svg/css/svg-resource-fragment-identifier-order.html: Added.
+        Ensure the SVG fragment is drawn correctly when the same SVG image is
+        referenced multiple times.
+
 2015-05-26  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-05-26  Said Abou-Hallawa  <sabouhallawa@apple.com>
+
+        SVG fragment identifier rendering issue
+        https://bugs.webkit.org/show_bug.cgi?id=137328
+
+        Reviewed by Darin Adler.
+
+        This is a follow up for http://trac.webkit.org/changeset/164983. In this
+        changeset, scrolling to the fragment should have been added before the
+        the paint to guarantee setting the proper display position for the SVG
+        fragment.
+
+        Test: svg/css/svg-resource-fragment-identifier-order.html
+
+        * svg/graphics/SVGImage.cpp:
+        (WebCore::SVGImage::draw): Move view->scrollToFragment() before calling 
+        view->paint().
+
 2015-05-26  Youenn Fablet  <youenn.fablet@crf.canon.fr>
 

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

@@ -250 +250 @@
     view->resize(containerSize());
 
+    if (!m_url.isEmpty())
+        view->scrollToFragment(m_url);
+    
     if (view->needsLayout())
         view->layout();
@@ -259 +262 @@
 
     stateSaver.restore();
-
-    if (!m_url.isEmpty())
-        view->scrollToFragment(m_url);
 
     if (imageObserver())