projects / profile / ivi / webkit-efl.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 71a9abe)
Web Inspector: clear resource agent resource cache upon resource agent's disable.
authorvsevik@chromium.org <vsevik@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 21 Sep 2011 18:01:32 +0000 (18:01 +0000)
committervsevik@chromium.org <vsevik@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 21 Sep 2011 18:01:32 +0000 (18:01 +0000)
https://bugs.webkit.org/show_bug.cgi?id=67995

Reviewed by Pavel Feldman.

Source/WebCore:

Test: http/tests/inspector/network/network-disabling-check-no-memory-leak.html

* inspector/InspectorResourceAgent.cpp:
(WebCore::InspectorResourceAgent::disable):

LayoutTests:

* http/tests/inspector/network/network-disabling-check-no-memory-leak-expected.txt: Added.
* http/tests/inspector/network/network-disabling-check-no-memory-leak.html: Added.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@95649 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog patch | blob | history
LayoutTests/http/tests/inspector/network/network-disabling-check-no-memory-leak-expected.txt [new file with mode: 0644] patch | blob
LayoutTests/http/tests/inspector/network/network-disabling-check-no-memory-leak.html [new file with mode: 0644] patch | blob
Source/WebCore/ChangeLog patch | blob | history
Source/WebCore/inspector/InspectorResourceAgent.cpp patch | blob | history

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index c4b8043..6de0674 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2011-09-21  Vsevolod Vlasov  <vsevik@chromium.org>
+
+        Web Inspector: clear resource agent resource cache upon resource agent's disable.
+        https://bugs.webkit.org/show_bug.cgi?id=67995
+
+        Reviewed by Pavel Feldman.
+
+        * http/tests/inspector/network/network-disabling-check-no-memory-leak-expected.txt: Added.
+        * http/tests/inspector/network/network-disabling-check-no-memory-leak.html: Added.
+
 2011-09-21  David Hyatt  <hyatt@apple.com>
 
         https://bugs.webkit.org/show_bug.cgi?id=68543
diff --git a/LayoutTests/http/tests/inspector/network/network-disabling-check-no-memory-leak-expected.txt b/LayoutTests/http/tests/inspector/network/network-disabling-check-no-memory-leak-expected.txt
new file mode 100644 (file)
index 0000000..21b063e
--- /dev/null
+++ b/LayoutTests/http/tests/inspector/network/network-disabling-check-no-memory-leak-expected.txt
@@ -0,0 +1,5 @@
+CONSOLE MESSAGE: line 13: Done.
+Tests that after disabling network domain, content saved on backend is removed. Bug 67995
+
+resource.content after disabling network domain: null
+
diff --git a/LayoutTests/http/tests/inspector/network/network-disabling-check-no-memory-leak.html b/LayoutTests/http/tests/inspector/network/network-disabling-check-no-memory-leak.html
new file mode 100644 (file)
index 0000000..7881efc
--- /dev/null
+++ b/LayoutTests/http/tests/inspector/network/network-disabling-check-no-memory-leak.html
@@ -0,0 +1,59 @@
+<html>
+<head>
+<script src="../inspector-test.js"></script>
+<script src="../network-test.js"></script>
+<script>
+function loadData()
+{
+    doXHR("GET", "resources/resource.php", true, resourceLoaded);
+}
+
+function resourceLoaded()
+{
+    console.log("Done.");
+}
+
+function test()
+{
+    // Since this test could be run together with other inspector backend cache
+    // tests, we need to reset size limits to default ones.
+    InspectorTest.resetInspectorResourcesData(step1);
+
+    function step1()
+    {
+        InspectorTest.addConsoleSniffer(step2);
+        InspectorTest.evaluateInPage("loadData()");
+    }
+
+    function step2()
+    {
+        NetworkAgent.disable(step3);
+    }
+
+    function step3()
+    {
+        var resource1 = WebInspector.panels.network.resources[WebInspector.panels.network.resources.length - 1];
+        resource1.requestContent(step4);
+    }
+
+    function step4()
+    {
+        var resource1 = WebInspector.panels.network.resources[WebInspector.panels.network.resources.length - 1];
+        InspectorTest.addResult("resource.content after disabling network domain: " + resource1.content);
+        NetworkAgent.enable(step5);
+    }
+
+    function step5()
+    {
+        InspectorTest.completeTest();
+    }
+}
+</script>
+</head>
+<body onload="runTest()">
+ <p>
+ Tests that after disabling network domain, content saved on backend is removed.
+<a href="https://bugs.webkit.org/show_bug.cgi?id=67995">Bug 67995</a>
+</p>
+</body>
+</html>
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index ce3b4d0..e65d57e 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2011-09-21  Vsevolod Vlasov  <vsevik@chromium.org>
+
+        Web Inspector: clear resource agent resource cache upon resource agent's disable.
+        https://bugs.webkit.org/show_bug.cgi?id=67995
+
+        Reviewed by Pavel Feldman.
+
+        Test: http/tests/inspector/network/network-disabling-check-no-memory-leak.html
+
+        * inspector/InspectorResourceAgent.cpp:
+        (WebCore::InspectorResourceAgent::disable):
+
 2011-09-21  David Hyatt  <hyatt@apple.com>
 
         https://bugs.webkit.org/show_bug.cgi?id=68543
diff --git a/Source/WebCore/inspector/InspectorResourceAgent.cpp b/Source/WebCore/inspector/InspectorResourceAgent.cpp
index d3823e6..f678006 100644 (file)
--- a/Source/WebCore/inspector/InspectorResourceAgent.cpp
+++ b/Source/WebCore/inspector/InspectorResourceAgent.cpp
@@ -463,6 +463,7 @@ void InspectorResourceAgent::disable(ErrorString*)
 {
     m_state->setBoolean(ResourceAgentState::resourceAgentEnabled, false);
     m_instrumentingAgents->setInspectorResourceAgent(0);
+    m_resourcesData->clear();
 }
 
 void InspectorResourceAgent::setUserAgentOverride(ErrorString*, const String& userAgent)
Domain: Web Framework / Uncategorized;