Title: [197780] trunk
Revision
197780
Author
[email protected]
Date
2016-03-08 10:19:51 -0800 (Tue, 08 Mar 2016)

Log Message

Unreviewed, rolling out r197765.
https://bugs.webkit.org/show_bug.cgi?id=155172

The test added with this change is failing on all platforms.
(Requested by ryanhaddad on #webkit).

Reverted changeset:

"ImageDocuments leak their world."
https://bugs.webkit.org/show_bug.cgi?id=155167
http://trac.webkit.org/changeset/197765

Patch by Commit Queue <[email protected]> on 2016-03-08

Modified Paths

Removed Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (197779 => 197780)


--- trunk/LayoutTests/ChangeLog	2016-03-08 18:11:17 UTC (rev 197779)
+++ trunk/LayoutTests/ChangeLog	2016-03-08 18:19:51 UTC (rev 197780)
@@ -1,3 +1,17 @@
+2016-03-08  Commit Queue  <[email protected]>
+
+        Unreviewed, rolling out r197765.
+        https://bugs.webkit.org/show_bug.cgi?id=155172
+
+        The test added with this change is failing on all platforms.
+        (Requested by ryanhaddad on #webkit).
+
+        Reverted changeset:
+
+        "ImageDocuments leak their world."
+        https://bugs.webkit.org/show_bug.cgi?id=155167
+        http://trac.webkit.org/changeset/197765
+
 2016-03-08  Ryan Haddad  <[email protected]>
 
         Rebaseline WPT reflection tests for ios-simulator after r197726

Deleted: trunk/LayoutTests/fast/dom/ImageDocument-world-leak-expected.txt (197779 => 197780)


--- trunk/LayoutTests/fast/dom/ImageDocument-world-leak-expected.txt	2016-03-08 18:11:17 UTC (rev 197779)
+++ trunk/LayoutTests/fast/dom/ImageDocument-world-leak-expected.txt	2016-03-08 18:19:51 UTC (rev 197780)
@@ -1,4 +0,0 @@
-Test that ImageDocuments don't leak their world.
-
-Number of live documents: 2 (was 2)
-

Deleted: trunk/LayoutTests/fast/dom/ImageDocument-world-leak.html (197779 => 197780)


--- trunk/LayoutTests/fast/dom/ImageDocument-world-leak.html	2016-03-08 18:11:17 UTC (rev 197779)
+++ trunk/LayoutTests/fast/dom/ImageDocument-world-leak.html	2016-03-08 18:19:51 UTC (rev 197780)
@@ -1,51 +0,0 @@
-<head>
-<script>
-function gc() {
-    if (window.GCController)
-        GCController.collect();
-}
-
-function numberOfLiveDocuments() {
-    if (window.internals)
-        return window.internals.numberOfLiveDocuments();
-    return 1;
-}
-
-gc();
-
-iterations = 10;
-if (window.testRunner) {
-    testRunner.dumpAsText();
-    testRunner.waitUntilDone();
-}
-
-function test() {
-    var f = document.getElementById("frame");
-    f._onload_ = function() {
-        f.contentDocument.open();
-        f.contentDocument.close();
-        --iterations;
-        if (iterations)
-            setTimeout("test()", 0);
-        else {
-            gc();
-            var out = document.getElementById("out");
-            out.innerText += "Number of live documents: " + numberOfLiveDocuments() + " (was " + numberOfLiveDocumentsAtStart + ")";
-            if (window.testRunner)
-                testRunner.notifyDone();
-        }
-    }
-    f.setAttribute("src", "resources/apple.gif");
-}
-
-function begin() {
-    numberOfLiveDocumentsAtStart = numberOfLiveDocuments();
-    test();
-}
-</script>
-</head>
-<body _onload_="begin()">
-    <p>Test that ImageDocuments don't leak their world. </p>
-    <pre id="out"></pre>
-    <iframe id="frame"></iframe>
-</body>

Modified: trunk/Source/WebCore/ChangeLog (197779 => 197780)


--- trunk/Source/WebCore/ChangeLog	2016-03-08 18:11:17 UTC (rev 197779)
+++ trunk/Source/WebCore/ChangeLog	2016-03-08 18:19:51 UTC (rev 197780)
@@ -1,3 +1,17 @@
+2016-03-08  Commit Queue  <[email protected]>
+
+        Unreviewed, rolling out r197765.
+        https://bugs.webkit.org/show_bug.cgi?id=155172
+
+        The test added with this change is failing on all platforms.
+        (Requested by ryanhaddad on #webkit).
+
+        Reverted changeset:
+
+        "ImageDocuments leak their world."
+        https://bugs.webkit.org/show_bug.cgi?id=155167
+        http://trac.webkit.org/changeset/197765
+
 2016-03-08  Antti Koivisto  <[email protected]>
 
         Make Element const in ElementRuleCollector

Modified: trunk/Source/WebCore/loader/ImageLoader.cpp (197779 => 197780)


--- trunk/Source/WebCore/loader/ImageLoader.cpp	2016-03-08 18:11:17 UTC (rev 197779)
+++ trunk/Source/WebCore/loader/ImageLoader.cpp	2016-03-08 18:19:51 UTC (rev 197780)
@@ -188,7 +188,6 @@
             bool autoLoadOtherImages = document.cachedResourceLoader().autoLoadImages();
             document.cachedResourceLoader().setAutoLoadImages(false);
             newImage = new CachedImage(request.resourceRequest(), m_element.document().page()->sessionID());
-            newImage->setStatus(CachedResource::Pending);
             newImage->setLoading(true);
             newImage->setOwningCachedResourceLoader(&document.cachedResourceLoader());
             document.cachedResourceLoader().m_documentResources.set(newImage->url(), newImage.get());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to