Title: [216397] releases/WebKitGTK/webkit-2.16
Revision
216397
Author
carlo...@webkit.org
Date
2017-05-08 05:53:24 -0700 (Mon, 08 May 2017)

Log Message

Merge r216023 - Do not dispatch SVG load event in frameless documents
https://bugs.webkit.org/show_bug.cgi?id=171505
<rdar://problem/31799776>

Reviewed by Andreas Kling.

Source/WebCore:

We should not dispatch SVG load events in frameless documents. <https://trac.webkit.org/changeset/173028/webkit>
took care of most load events but forgot the SVG load event.

Test: fast/dom/domparser-parsefromstring-svg-load-event.html

* dom/Document.cpp:
(WebCore::Document::implicitClose):

LayoutTests:

Add layout test coverage. I have verified that this test passes on both Firefox and Chrome.

* fast/dom/domparser-parsefromstring-svg-load-event-expected.txt: Added.
* fast/dom/domparser-parsefromstring-svg-load-event.html: Added.

Modified Paths

Added Paths

Diff

Modified: releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog (216396 => 216397)


--- releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog	2017-05-08 12:45:23 UTC (rev 216396)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog	2017-05-08 12:53:24 UTC (rev 216397)
@@ -1,3 +1,16 @@
+2017-05-01  Chris Dumez  <cdu...@apple.com>
+
+        Do not dispatch SVG load event in frameless documents
+        https://bugs.webkit.org/show_bug.cgi?id=171505
+        <rdar://problem/31799776>
+
+        Reviewed by Andreas Kling.
+
+        Add layout test coverage. I have verified that this test passes on both Firefox and Chrome.
+
+        * fast/dom/domparser-parsefromstring-svg-load-event-expected.txt: Added.
+        * fast/dom/domparser-parsefromstring-svg-load-event.html: Added.
+
 2017-04-28  Zalan Bujtas  <za...@apple.com>
 
         iBooks text can overlap, sometimes columns are shifted splitting words.

Added: releases/WebKitGTK/webkit-2.16/LayoutTests/fast/dom/domparser-parsefromstring-svg-load-event-expected.txt (0 => 216397)


--- releases/WebKitGTK/webkit-2.16/LayoutTests/fast/dom/domparser-parsefromstring-svg-load-event-expected.txt	                        (rev 0)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/fast/dom/domparser-parsefromstring-svg-load-event-expected.txt	2017-05-08 12:53:24 UTC (rev 216397)
@@ -0,0 +1,9 @@
+Tests that SVG load events are not fired in frameless documents. This test passes if you do not see a FAIL alert message.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+

Added: releases/WebKitGTK/webkit-2.16/LayoutTests/fast/dom/domparser-parsefromstring-svg-load-event.html (0 => 216397)


--- releases/WebKitGTK/webkit-2.16/LayoutTests/fast/dom/domparser-parsefromstring-svg-load-event.html	                        (rev 0)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/fast/dom/domparser-parsefromstring-svg-load-event.html	2017-05-08 12:53:24 UTC (rev 216397)
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+<body>
+<script src=""
+<script>
+description("Tests that SVG load events are not fired in frameless documents. This test passes if you do not see a FAIL alert message.");
+jsTestIsAsync = true;
+
+new DOMParser().parseFromString('<svg _onload_=alert("FAIL")>', 'text/html');
+
+setTimeout(finishJSTest, 0);
+</script>
+<script src=""
+</body>
+</html>

Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog (216396 => 216397)


--- releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog	2017-05-08 12:45:23 UTC (rev 216396)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog	2017-05-08 12:53:24 UTC (rev 216397)
@@ -1,3 +1,19 @@
+2017-05-01  Chris Dumez  <cdu...@apple.com>
+
+        Do not dispatch SVG load event in frameless documents
+        https://bugs.webkit.org/show_bug.cgi?id=171505
+        <rdar://problem/31799776>
+
+        Reviewed by Andreas Kling.
+
+        We should not dispatch SVG load events in frameless documents. <https://trac.webkit.org/changeset/173028/webkit>
+        took care of most load events but forgot the SVG load event.
+
+        Test: fast/dom/domparser-parsefromstring-svg-load-event.html
+
+        * dom/Document.cpp:
+        (WebCore::Document::implicitClose):
+
 2017-04-28  Zalan Bujtas  <za...@apple.com>
 
         iBooks text can overlap, sometimes columns are shifted splitting words.

Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/dom/Document.cpp (216396 => 216397)


--- releases/WebKitGTK/webkit-2.16/Source/WebCore/dom/Document.cpp	2017-05-08 12:45:23 UTC (rev 216396)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/dom/Document.cpp	2017-05-08 12:53:24 UTC (rev 216397)
@@ -2684,14 +2684,14 @@
         ImageLoader::dispatchPendingErrorEvents();
         HTMLLinkElement::dispatchPendingLoadEvents();
         HTMLStyleElement::dispatchPendingLoadEvents();
+
+        // To align the HTML load event and the SVGLoad event for the outermost <svg> element, fire it from
+        // here, instead of doing it from SVGElement::finishedParsingChildren (if externalResourcesRequired="false",
+        // which is the default, for ='' its fired at a later time, once all external resources finished loading).
+        if (svgExtensions())
+            accessSVGExtensions().dispatchSVGLoadEventToOutermostSVGElements();
     }
 
-    // To align the HTML load event and the SVGLoad event for the outermost <svg> element, fire it from
-    // here, instead of doing it from SVGElement::finishedParsingChildren (if externalResourcesRequired="false",
-    // which is the default, for ='' its fired at a later time, once all external resources finished loading).
-    if (svgExtensions())
-        accessSVGExtensions().dispatchSVGLoadEventToOutermostSVGElements();
-
     dispatchWindowLoadEvent();
     dispatchPageshowEvent(PageshowEventNotPersisted);
     if (m_pendingStateObject)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to