Changeset 223947 in webkit

Timestamp:

Oct 24, 2017 6:35:45 PM (7 years ago)

Author:

rniwa@webkit.org

Message:

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

Reviewed by Simon Fraser.

Source/WebCore:

Fixed the bug that checkIntersection and checkEnclosure no longer updates the layout after r223882.

Test: svg/custom/check-intersection-basic.svg

• svg/SVGSVGElement.cpp:

(WebCore::SVGSVGElement::collectIntersectionOrEnclosureList):
(WebCore::SVGSVGElement::checkIntersection):
(WebCore::SVGSVGElement::checkEnclosure):

• svg/SVGSVGElement.h:

LayoutTests:

Added the support for SVG documents to js-test.js, and added a basic test for checkIntersection
and checkEnclosure using it.

• resources/js-test.js:

(ensureRootElement): Added. Creates a foreignObject element inside a SVG document.
(moveForeignObjectToTopIfNeeded): Added. In SVG, z-index order is determined by the element order.
In order to make the results visible, we move the foreignObject to the top by appending to the end
of the document element.
(getOrCreate):
(debug): Run innerHTML before appendChild as setting namespaceURI before running innerHTML would
result in span's being parsed as SVG elements.
(insertStyleSheet):
(finishJSTest):

• svg/custom/check-intersection-basic-expected.txt: Added.
• svg/custom/check-intersection-basic.svg: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/resources/js-test.js (modified) (5 diffs)
• LayoutTests/svg/custom/check-intersection-basic-expected.txt (added)
• LayoutTests/svg/custom/check-intersection-basic.svg (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/svg/SVGSVGElement.cpp (modified) (2 diffs)
• Source/WebCore/svg/SVGSVGElement.h (modified) (2 diffs)

trunk/LayoutTests/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 Simon Fraser.
+
+        Added the support for SVG documents to js-test.js, and added a basic test for checkIntersection
+        and checkEnclosure using it.
+
+        * resources/js-test.js:
+        (ensureRootElement): Added. Creates a foreignObject element inside a SVG document.
+        (moveForeignObjectToTopIfNeeded): Added. In SVG, z-index order is determined by the element order.
+        In order to make the results visible, we move the foreignObject to the top by appending to the end
+        of the document element.
+        (getOrCreate):
+        (debug): Run innerHTML before appendChild as setting namespaceURI before running innerHTML would
+        result in span's being parsed as SVG elements.
+        (insertStyleSheet):
+        (finishJSTest):
+        * svg/custom/check-intersection-basic-expected.txt: Added.
+        * svg/custom/check-intersection-basic.svg: Added.
+
 2017-10-24  Andy Estes  <aestes@apple.com>
 

trunk/LayoutTests/resources/js-test.js

@@ -32 +32 @@
     }
 
+    var rootElement = null;
+    function ensureRootElement()
+    {
+        if (!rootElement || !rootElement.isConnected) {
+            rootElement = document.body || document.documentElement;
+            if (document.documentElement.namespaceURI == 'http://www.w3.org/2000/svg') {
+                // FIXME: Make the test harness use SVG elements naively.
+                var foreignObject = document.createElementNS('http://www.w3.org/2000/svg', 'foreignObject');
+                foreignObject.setAttribute('x', '0px');
+                foreignObject.setAttribute('y', '0px');
+                foreignObject.setAttribute('width', '100%');
+                foreignObject.setAttribute('height', '100%');
+                foreignObject.setAttribute('style', 'padding: 10px; background-color: rgba(255, 255, 255, 0.5)');
+                document.documentElement.appendChild(foreignObject);
+                rootElement = foreignObject;
+            }
+        }
+        return rootElement;
+    }
+
+    moveForeignObjectToTopIfNeeded = function () {
+        if (rootElement && rootElement.localName == 'foreignObject')
+            document.documentElement.appendChild(rootElement);
+    }
+
     function getOrCreate(id, tagName)
     {
@@ -41 +66 @@
         element.id = id;
         var refNode;
-        var parent = document.body || document.documentElement;
+        var parent = ensureRootElement();
+
         if (id == "description")
             refNode = getOrCreate("console", "div");
@@ -70 +96 @@
     {
         var span = createHTMLElement("span");
-        getOrCreate("console", "div").appendChild(span); // insert it first so XHTML knows the namespace
         span.innerHTML = msg + '<br />';
+        getOrCreate("console", "div").appendChild(span);
     };
 
@@ -92 +118 @@
         var styleElement = createHTMLElement("style");
         styleElement.textContent = css;
-        (document.head || document.documentElement).appendChild(styleElement);
+        (document.head || ensureRootElement()).appendChild(styleElement);
     }
 
@@ -749 +775 @@
         return;
     isSuccessfullyParsed();
+    moveForeignObjectToTopIfNeeded();
     if (self.jsTestIsAsync && self.testRunner)
         testRunner.notifyDone();

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 Simon Fraser.
+
+        Fixed the bug that checkIntersection and checkEnclosure no longer updates the layout after r223882.
+
+        Test: svg/custom/check-intersection-basic.svg
+
+        * svg/SVGSVGElement.cpp:
+        (WebCore::SVGSVGElement::collectIntersectionOrEnclosureList):
+        (WebCore::SVGSVGElement::checkIntersection):
+        (WebCore::SVGSVGElement::checkEnclosure):
+        * svg/SVGSVGElement.h:
+
 2017-10-24  Andy Estes  <aestes@apple.com>
 

trunk/Source/WebCore/svg/SVGSVGElement.cpp

@@ -324 +324 @@
 }
 
-Ref<NodeList> SVGSVGElement::collectIntersectionOrEnclosureList(SVGRect& rect, SVGElement* referenceElement, bool (*checkFunction)(const SVGElement*, SVGRect&))
+Ref<NodeList> SVGSVGElement::collectIntersectionOrEnclosureList(SVGRect& rect, SVGElement* referenceElement, bool (*checkFunction)(RefPtr<SVGElement>&&, SVGRect&))
 {
     Vector<Ref<Element>> elements;
@@ -346 +346 @@
 }
 
-bool SVGSVGElement::checkIntersection(const SVGElement* element, SVGRect& rect)
-{
-    return element && RenderSVGModelObject::checkIntersection(element->renderer(), rect.propertyReference());
-}
-
-bool SVGSVGElement::checkEnclosure(const SVGElement* element, SVGRect& rect)
-{
-    return element && RenderSVGModelObject::checkEnclosure(element->renderer(), rect.propertyReference());
+bool SVGSVGElement::checkIntersection(RefPtr<SVGElement>&& element, SVGRect& rect)
+{
+    if (!element)
+        return false;
+    element->document().updateLayoutIgnorePendingStylesheets();
+    return RenderSVGModelObject::checkIntersection(element->renderer(), rect.propertyReference());
+}
+
+bool SVGSVGElement::checkEnclosure(RefPtr<SVGElement>&& element, SVGRect& rect)
+{
+    if (!element)
+        return false;
+    element->document().updateLayoutIgnorePendingStylesheets();
+    return RenderSVGModelObject::checkEnclosure(element->renderer(), rect.propertyReference());
 }
 

trunk/Source/WebCore/svg/SVGSVGElement.h

@@ -93 +93 @@
     Ref<NodeList> getIntersectionList(SVGRect&, SVGElement* referenceElement);
     Ref<NodeList> getEnclosureList(SVGRect&, SVGElement* referenceElement);
-    static bool checkIntersection(const SVGElement*, SVGRect&);
-    static bool checkEnclosure(const SVGElement*, SVGRect&);
+    static bool checkIntersection(RefPtr<SVGElement>&&, SVGRect&);
+    static bool checkEnclosure(RefPtr<SVGElement>&&, SVGRect&);
     void deselectAll();
 
@@ -154 +154 @@
     Frame* frameForCurrentScale() const;
     void inheritViewAttributes(const SVGViewElement&);
-    Ref<NodeList> collectIntersectionOrEnclosureList(SVGRect&, SVGElement*, bool (*checkFunction)(const SVGElement*, SVGRect&));
+    Ref<NodeList> collectIntersectionOrEnclosureList(SVGRect&, SVGElement*, bool (*checkFunction)(RefPtr<SVGElement>&&, SVGRect&));
 
     bool m_useCurrentView { false };