Title: [124527] branches/safari-536.26-branch

Diff

Modified: branches/safari-536.26-branch/LayoutTests/ChangeLog (124526 => 124527)


--- branches/safari-536.26-branch/LayoutTests/ChangeLog	2012-08-02 23:18:08 UTC (rev 124526)
+++ branches/safari-536.26-branch/LayoutTests/ChangeLog	2012-08-02 23:21:33 UTC (rev 124527)
@@ -1,5 +1,19 @@
 2012-08-02  Lucas Forschler  <[email protected]>
 
+    Merge 120731
+
+    2012-06-19  Abhishek Arya  <[email protected]>
+
+            Crash in WebCore::RenderSVGModelObject::checkIntersection
+            https://bugs.webkit.org/show_bug.cgi?id=89059
+
+            Reviewed by Rob Buis.
+
+            * svg/custom/intersection-list-crash-expected.txt: Added.
+            * svg/custom/intersection-list-crash.svg: Added.
+
+2012-08-02  Lucas Forschler  <[email protected]>
+
     Merge 120559
 
     2012-06-17  Philip Rogers  <[email protected]>

Copied: branches/safari-536.26-branch/LayoutTests/svg/custom/intersection-list-crash-expected.txt (from rev 120731, trunk/LayoutTests/svg/custom/intersection-list-crash-expected.txt) (0 => 124527)


--- branches/safari-536.26-branch/LayoutTests/svg/custom/intersection-list-crash-expected.txt	                        (rev 0)
+++ branches/safari-536.26-branch/LayoutTests/svg/custom/intersection-list-crash-expected.txt	2012-08-02 23:21:33 UTC (rev 124527)
@@ -0,0 +1 @@
+PASS. WebKit didn't crash.

Copied: branches/safari-536.26-branch/LayoutTests/svg/custom/intersection-list-crash.svg (from rev 120731, trunk/LayoutTests/svg/custom/intersection-list-crash.svg) (0 => 124527)


--- branches/safari-536.26-branch/LayoutTests/svg/custom/intersection-list-crash.svg	                        (rev 0)
+++ branches/safari-536.26-branch/LayoutTests/svg/custom/intersection-list-crash.svg	2012-08-02 23:21:33 UTC (rev 124527)
@@ -0,0 +1,26 @@
+<svg _onload_="runTest()" xmlns="http://www.w3.org/2000/svg" id="askedForIntersection">
+<style>
+.c1:nth-last-of-type(1n) { }
+</style>
+<script>
+if (window.layoutTestController)
+    layoutTestController.dumpAsText();
+
+function runTest()
+{
+    docElement = document.documentElement;
+    textarea = document.createElementNS("http://www.w3.org/1999/xhtml", "textarea");
+    textarea.setAttribute("class", "c1");
+    docElement.appendChild(textarea);
+    object = document.createElementNS("http://www.w3.org/1999/xhtml", "object");
+    object.setAttribute("usemap", "#DivLogo-map");
+    iframe = document.createElementNS("http://www.w3.org/1999/xhtml", "iframe");
+    docElement.appendChild(iframe);
+    var svg = document.getElementById('askedForIntersection');
+    var rect = svg.createSVGRect();
+    svg.getIntersectionList(rect, svg);
+}
+</script>
+<rect style='content: counters(c, ".", decimal)'></rect>
+<text x="10" y="50">PASS. WebKit didn't crash.</text>
+</svg>

Modified: branches/safari-536.26-branch/Source/WebCore/ChangeLog (124526 => 124527)


--- branches/safari-536.26-branch/Source/WebCore/ChangeLog	2012-08-02 23:18:08 UTC (rev 124526)
+++ branches/safari-536.26-branch/Source/WebCore/ChangeLog	2012-08-02 23:21:33 UTC (rev 124527)
@@ -1,5 +1,26 @@
 2012-08-02  Lucas Forschler  <[email protected]>
 
+    Merge 120731
+
+    2012-06-19  Abhishek Arya  <[email protected]>
+
+            Crash in WebCore::RenderSVGModelObject::checkIntersection
+            https://bugs.webkit.org/show_bug.cgi?id=89059
+
+            Reviewed by Rob Buis.
+
+            getElementCTM updates layout causing the renderer to be destroyed. We get
+            the new renderer by storing the element pointer and later accessing it using
+            the element pointer.
+
+            Test: svg/custom/intersection-list-crash.svg
+
+            * rendering/svg/RenderSVGModelObject.cpp:
+            (WebCore::RenderSVGModelObject::checkIntersection):
+            (WebCore::RenderSVGModelObject::checkEnclosure):
+
+2012-08-02  Lucas Forschler  <[email protected]>
+
     Merge 120559
 
     2012-06-17  Philip Rogers  <[email protected]>

Modified: branches/safari-536.26-branch/Source/WebCore/rendering/svg/RenderSVGModelObject.cpp (124526 => 124527)


--- branches/safari-536.26-branch/Source/WebCore/rendering/svg/RenderSVGModelObject.cpp	2012-08-02 23:18:08 UTC (rev 124526)
+++ branches/safari-536.26-branch/Source/WebCore/rendering/svg/RenderSVGModelObject.cpp	2012-08-02 23:21:33 UTC (rev 124527)
@@ -172,8 +172,10 @@
     if (!isGraphicsElement(renderer))
         return false;
     AffineTransform ctm;
-    getElementCTM(static_cast<SVGElement*>(renderer->node()), ctm);
-    return intersectsAllowingEmpty(rect, ctm.mapRect(renderer->repaintRectInLocalCoordinates()));
+    SVGElement* svgElement = static_cast<SVGElement*>(renderer->node());
+    getElementCTM(svgElement, ctm);
+    ASSERT(svgElement->renderer());
+    return intersectsAllowingEmpty(rect, ctm.mapRect(svgElement->renderer()->repaintRectInLocalCoordinates()));
 }
 
 bool RenderSVGModelObject::checkEnclosure(RenderObject* renderer, const FloatRect& rect)
@@ -183,8 +185,10 @@
     if (!isGraphicsElement(renderer))
         return false;
     AffineTransform ctm;
-    getElementCTM(static_cast<SVGElement*>(renderer->node()), ctm);
-    return rect.contains(ctm.mapRect(renderer->repaintRectInLocalCoordinates()));
+    SVGElement* svgElement = static_cast<SVGElement*>(renderer->node());
+    getElementCTM(svgElement, ctm);
+    ASSERT(svgElement->renderer());
+    return rect.contains(ctm.mapRect(svgElement->renderer()->repaintRectInLocalCoordinates()));
 }
 
 } // namespace WebCore
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to