Merge r184874 - 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.
WebKit · Jul 6, 2015 · 9ca3d62 · 9ca3d62
1 parent fcc6a55
commit 9ca3d62
Show file tree

Hide file tree

Showing 5 changed files with 70 additions and 3 deletions.
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+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-21  Said Abou-Hallawa  <sabouhallawa@apple.com>
 
         SVG as image uses very tiny default font-size

diff --git a/LayoutTests/svg/css/svg-resource-fragment-identifier-order-expected.html b/LayoutTests/svg/css/svg-resource-fragment-identifier-order-expected.html
@@ -0,0 +1,19 @@
+<html>
+<head>
+<style>
+  div {
+    width: 100px;
+    height: 100px;
+    display: inline-block;
+  }
+</style>
+</head>
+<body>
+  <div style="background-color: red"></div>
+  <div style="background-color: red"></div>
+  <div style="background-color: green"></div>
+  <div style="background-color: green"></div>
+  <div style="background-color: blue"></div>
+  <div style="background-color: blue"></div>
+</body>
+</html>
diff --git a/LayoutTests/svg/css/svg-resource-fragment-identifier-order.html b/LayoutTests/svg/css/svg-resource-fragment-identifier-order.html
@@ -0,0 +1,18 @@
+<html>
+<head>
+<style>
+  img {
+    width: 100px;
+    height: 100px;
+  }
+</style>
+</head>
+<body>
+  <img src="resources/fragment-identifiers.svg#red">
+  <img src="resources/fragment-identifiers.svg#red">
+  <img src="resources/fragment-identifiers.svg#green">
+  <img src="resources/fragment-identifiers.svg#green">
+  <img src="resources/fragment-identifiers.svg#blue">
+  <img src="resources/fragment-identifiers.svg#blue">
+</body>
+</html>
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,21 @@
+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  Csaba Osztrogonác  <ossy@webkit.org>
 
         [ARM] Build SVGPathElement.cpp with -O2 due to a GCC bug

diff --git a/Source/WebCore/svg/graphics/SVGImage.cpp b/Source/WebCore/svg/graphics/SVGImage.cpp
@@ -249,6 +249,9 @@ void SVGImage::draw(GraphicsContext* context, const FloatRect& dstRect, const Fl
 
     view->resize(containerSize());
 
+    if (!m_url.isEmpty())
+        view->scrollToFragment(m_url);
+
     if (view->needsLayout())
         view->layout();
 
@@ -259,9 +262,6 @@ void SVGImage::draw(GraphicsContext* context, const FloatRect& dstRect, const Fl
 
     stateSaver.restore();
 
-    if (!m_url.isEmpty())
-        view->scrollToFragment(m_url);
-
     if (imageObserver())
         imageObserver()->didDraw(this);
 }