Changeset 23544 in webkit

Timestamp:

Jun 14, 2007 6:41:48 PM (17 years ago)

Author:

rwlbuis

Message:

Reviewed by Eric.

​http://bugs.webkit.org/show_bug.cgi?id=14051
<svg:image> fails to position correctly when <svg> is inside an inline <div>

Leave parent translation to the containers.

Location:

branches/feature-branch

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/svg/custom/image-parent-translation-expected.checksum (added)
• LayoutTests/svg/custom/image-parent-translation-expected.png (added)
• LayoutTests/svg/custom/image-parent-translation-expected.txt (added)
• LayoutTests/svg/custom/image-parent-translation.xhtml (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderSVGImage.cpp (modified) (3 diffs)

branches/feature-branch/LayoutTests/ChangeLog

@@ +1 @@
+2007-06-15  Rob Buis  <buis@kde.org>
+
+        Reviewed by Eric.
+
+        Testcase for:
+        http://bugs.webkit.org/show_bug.cgi?id=14051
+        <svg:image> fails to position correctly when <svg> is inside an inline <div>
+
+        * svg/custom/image-parent-translation-expected.checksum: Added.
+        * svg/custom/image-parent-translation-expected.png: Added.
+        * svg/custom/image-parent-translation-expected.txt: Added.
+        * svg/custom/image-parent-translation.xhtml: Added.
+
 2007-06-14  Rob Buis  <buis@kde.org>
 

branches/feature-branch/WebCore/ChangeLog

@@ +1 @@
+2007-06-15  Rob Buis  <buis@kde.org>
+
+        Reviewed by Eric.
+
+        http://bugs.webkit.org/show_bug.cgi?id=14051
+        <svg:image> fails to position correctly when <svg> is inside an inline <div>
+
+        Leave parent translation to the containers.
+
+        * rendering/RenderSVGImage.cpp:
+        (WebCore::RenderSVGImage::paint):
+
 2007-06-15  Nikolas Zimmermann  <zimmermann@kde.org>
 

branches/feature-branch/WebCore/rendering/RenderSVGImage.cpp

@@ -124 +124 @@
 }
 
-void RenderSVGImage::paint(PaintInfo& paintInfo, int parentX, int parentY)
+void RenderSVGImage::paint(PaintInfo& paintInfo, int, int)
 {
     if (paintInfo.context->paintingDisabled() || style()->visibility() == HIDDEN)
@@ -130 +130 @@
     
     paintInfo.context->save();
-    paintInfo.context->concatCTM(AffineTransform().translate(parentX, parentY));
     paintInfo.context->concatCTM(localTransform());
     paintInfo.context->concatCTM(translationForAttributes());
@@ -172 +171 @@
     
     if ((paintInfo.phase == PaintPhaseOutline || paintInfo.phase == PaintPhaseSelfOutline) && style()->outlineWidth())
-        paintOutline(paintInfo.context, parentX, parentY, width(), height(), style());
+        paintOutline(paintInfo.context, 0, 0, width(), height(), style());
 
     paintInfo.context->restore();