Changeset 223882 in webkit

Timestamp:

Oct 24, 2017 12:41:39 AM (6 years ago)

Author:

rniwa@webkit.org

Message:

RenderSVGModelObject::checkIntersection triggers layout
​https://bugs.webkit.org/show_bug.cgi?id=178710

Reviewed by Antti Koivisto.

Don't trigger a layout inside getElementCTM. Update the layout upfront in getEnclosureList.

• rendering/svg/RenderSVGModelObject.cpp:

(WebCore::getElementCTM):

• svg/SVGSVGElement.cpp:

(WebCore::SVGSVGElement::getEnclosureList):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/svg/RenderSVGModelObject.cpp (modified) (1 diff)
• svg/SVGSVGElement.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-10-24  Ryosuke Niwa  <rniwa@webkit.org>
+
+        RenderSVGModelObject::checkIntersection triggers layout
+        https://bugs.webkit.org/show_bug.cgi?id=178710
+
+        Reviewed by Antti Koivisto.
+
+        Don't trigger a layout inside getElementCTM. Update the layout upfront in getEnclosureList.
+
+        * rendering/svg/RenderSVGModelObject.cpp:
+        (WebCore::getElementCTM):
+        * svg/SVGSVGElement.cpp:
+        (WebCore::SVGSVGElement::getEnclosureList):
+
 2017-10-24  Nan Wang  <n_wang@apple.com>
 

trunk/Source/WebCore/rendering/svg/RenderSVGModelObject.cpp

@@ -116 +116 @@
 {
     ASSERT(element);
-    element->document().updateLayoutIgnorePendingStylesheets();
 
     SVGElement* stopAtElement = SVGLocatable::nearestViewportElement(element);

trunk/Source/WebCore/svg/SVGSVGElement.cpp

@@ -342 +342 @@
 Ref<NodeList> SVGSVGElement::getEnclosureList(SVGRect& rect, SVGElement* referenceElement)
 {
+    document().updateLayoutIgnorePendingStylesheets();
     return collectIntersectionOrEnclosureList(rect, referenceElement, checkEnclosure);
 }