2011-07-04 Sheriff Bot <webkit.review.bot@gmail.com>
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 4 Jul 2011 20:26:37 +0000 (20:26 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 4 Jul 2011 20:26:37 +0000 (20:26 +0000)
        Unreviewed, rolling out r90373.
        http://trac.webkit.org/changeset/90373
        https://bugs.webkit.org/show_bug.cgi?id=63917

        Breaks Qt Linux Release minimal (Requested by vsevik on
        #webkit).

        * Source/autotools/symbols.filter:
2011-07-04  Sheriff Bot  <webkit.review.bot@gmail.com>

        Unreviewed, rolling out r90373.
        http://trac.webkit.org/changeset/90373
        https://bugs.webkit.org/show_bug.cgi?id=63917

        Breaks Qt Linux Release minimal (Requested by vsevik on
        #webkit).

        * http/tests/inspector/network/network-content-replacement-embed-expected.txt: Removed.
        * http/tests/inspector/network/network-content-replacement-embed.html: Removed.
        * http/tests/inspector/network/network-content-replacement-xhr-expected.txt: Removed.
        * http/tests/inspector/network/network-content-replacement-xhr.html: Removed.
        * http/tests/inspector/network/network-embed-expected.txt: Removed.
        * http/tests/inspector/network/network-embed.html: Removed.
        * http/tests/inspector/network/network-xhr-async-expected.txt:
        * http/tests/inspector/network/network-xhr-async.html:
        * http/tests/inspector/network/network-xhr-sync-expected.txt:
        * http/tests/inspector/network/network-xhr-sync.html:
        * http/tests/inspector/network/resources/cp1251.xml: Removed.
        * http/tests/inspector/network/resources/plugin-data.php: Removed.
        * http/tests/inspector/network/resources/resource.php:
        * http/tests/inspector/network/resources/utf8.xml: Removed.
        * platform/chromium/test_expectations.txt:
2011-07-04  Sheriff Bot  <webkit.review.bot@gmail.com>

        Unreviewed, rolling out r90373.
        http://trac.webkit.org/changeset/90373
        https://bugs.webkit.org/show_bug.cgi?id=63917

        Breaks Qt Linux Release minimal (Requested by vsevik on
        #webkit).

        * WebCore.exp.in:
        * inspector/InspectorController.cpp:
        * inspector/InspectorController.h:
        * inspector/InspectorInstrumentation.cpp:
        (WebCore::InspectorInstrumentation::didReceiveContentLengthImpl):
        * inspector/InspectorInstrumentation.h:
        (WebCore::InspectorInstrumentation::didReceiveContentLength):
        * inspector/InspectorResourceAgent.cpp:
        (WebCore::InspectorResourceAgent::didReceiveResponse):
        (WebCore::InspectorResourceAgent::didReceiveContentLength):
        (WebCore::InspectorResourceAgent::didFinishLoading):
        (WebCore::InspectorResourceAgent::setInitialXHRContent):
        (WebCore::InspectorResourceAgent::getResourceContent):
        * inspector/InspectorResourceAgent.h:
        * inspector/NetworkResourcesData.cpp:
        (WebCore::NetworkResourcesData::ResourceData::ResourceData):
        (WebCore::NetworkResourcesData::ResourceData::content):
        (WebCore::NetworkResourcesData::ResourceData::appendContent):
        (WebCore::NetworkResourcesData::ResourceData::purgeContent):
        (WebCore::NetworkResourcesData::NetworkResourcesData):
        (WebCore::NetworkResourcesData::responseReceived):
        (WebCore::NetworkResourcesData::addResourceContent):
        (WebCore::NetworkResourcesData::data):
        (WebCore::NetworkResourcesData::clear):
        (WebCore::NetworkResourcesData::ensureNoDataForIdentifier):
        (WebCore::NetworkResourcesData::ensureFreeSpace):
        * inspector/NetworkResourcesData.h:
        (WebCore::NetworkResourcesData::ResourceData::hasContent):
        (WebCore::NetworkResourcesData::ResourceData::setIsContentPurged):
        (WebCore::NetworkResourcesData::ResourceData::textEncodingName):
        (WebCore::NetworkResourcesData::ResourceData::setTextEncodingName):
        * inspector/front-end/Resource.js:
        * inspector/front-end/ResourcePreviewView.js:
        (WebInspector.ResourcePreviewView.prototype.contentLoaded):
        (WebInspector.ResourcePreviewView.prototype._createInnerView):
        * inspector/front-end/ResourceView.js:
        (WebInspector.ResourceView.hasTextContent):
        * loader/DocumentThreadableLoader.cpp:
        (WebCore::DocumentThreadableLoader::didReceiveData):
        * loader/FrameLoader.cpp:
        (WebCore::FrameLoader::willLoadMediaElementURL):
        (WebCore::FrameLoader::commitProvisionalLoad):
        (WebCore::FrameLoader::loadResourceSynchronously):
        (WebCore::FrameLoader::loadedResourceFromMemoryCache):
        * loader/ResourceLoadNotifier.cpp:
        (WebCore::ResourceLoadNotifier::didReceiveData):
        (WebCore::ResourceLoadNotifier::dispatchDidReceiveContentLength):
        (WebCore::ResourceLoadNotifier::sendRemainingDelegateMessages):
        * loader/ResourceLoadNotifier.h:
        * loader/appcache/ApplicationCacheGroup.cpp:
        (WebCore::ApplicationCacheGroup::didReceiveData):
        * testing/Internals.cpp:
        * testing/Internals.h:
        * testing/Internals.idl:
2011-07-04  Sheriff Bot  <webkit.review.bot@gmail.com>

        Unreviewed, rolling out r90373.
        http://trac.webkit.org/changeset/90373
        https://bugs.webkit.org/show_bug.cgi?id=63917

        Breaks Qt Linux Release minimal (Requested by vsevik on
        #webkit).

        * win/WebKit2.def:
        * win/WebKit2CFLite.def:

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

42 files changed:
ChangeLog
LayoutTests/ChangeLog
LayoutTests/http/tests/inspector/network/network-content-replacement-embed-expected.txt [deleted file]
LayoutTests/http/tests/inspector/network/network-content-replacement-embed.html [deleted file]
LayoutTests/http/tests/inspector/network/network-content-replacement-xhr-expected.txt [deleted file]
LayoutTests/http/tests/inspector/network/network-content-replacement-xhr.html [deleted file]
LayoutTests/http/tests/inspector/network/network-embed-expected.txt [deleted file]
LayoutTests/http/tests/inspector/network/network-embed.html [deleted file]
LayoutTests/http/tests/inspector/network/network-xhr-async-expected.txt
LayoutTests/http/tests/inspector/network/network-xhr-async.html
LayoutTests/http/tests/inspector/network/network-xhr-sync-expected.txt
LayoutTests/http/tests/inspector/network/network-xhr-sync.html
LayoutTests/http/tests/inspector/network/resources/cp1251.xml [deleted file]
LayoutTests/http/tests/inspector/network/resources/plugin-data.php [deleted file]
LayoutTests/http/tests/inspector/network/resources/resource.php
LayoutTests/http/tests/inspector/network/resources/utf8.xml [deleted file]
LayoutTests/platform/chromium/test_expectations.txt
Source/WebCore/ChangeLog
Source/WebCore/WebCore.exp.in
Source/WebCore/inspector/InspectorController.cpp
Source/WebCore/inspector/InspectorController.h
Source/WebCore/inspector/InspectorInstrumentation.cpp
Source/WebCore/inspector/InspectorInstrumentation.h
Source/WebCore/inspector/InspectorResourceAgent.cpp
Source/WebCore/inspector/InspectorResourceAgent.h
Source/WebCore/inspector/NetworkResourcesData.cpp
Source/WebCore/inspector/NetworkResourcesData.h
Source/WebCore/inspector/front-end/Resource.js
Source/WebCore/inspector/front-end/ResourcePreviewView.js
Source/WebCore/inspector/front-end/ResourceView.js
Source/WebCore/loader/DocumentThreadableLoader.cpp
Source/WebCore/loader/FrameLoader.cpp
Source/WebCore/loader/ResourceLoadNotifier.cpp
Source/WebCore/loader/ResourceLoadNotifier.h
Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp
Source/WebCore/testing/Internals.cpp
Source/WebCore/testing/Internals.h
Source/WebCore/testing/Internals.idl
Source/WebKit2/ChangeLog
Source/WebKit2/win/WebKit2.def
Source/WebKit2/win/WebKit2CFLite.def
Source/autotools/symbols.filter

index 8a635b62e7c6639d547bf2a0883deff383ce2035..051888c86775cc02db09a8459e64341835873f1b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2011-07-04  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r90373.
+        http://trac.webkit.org/changeset/90373
+        https://bugs.webkit.org/show_bug.cgi?id=63917
+
+        Breaks Qt Linux Release minimal (Requested by vsevik on
+        #webkit).
+
+        * Source/autotools/symbols.filter:
+
 2011-07-04  Vsevolod Vlasov  <vsevik@chromium.org>
 
         Web Inspector: Show content for plugin requests in network panel.
index 7274ec4d691c977f46c8aea0aec6c4aa2d80165b..091bd1d4354d8f7cd534d0a2575e17272cf690dd 100644 (file)
@@ -1,3 +1,28 @@
+2011-07-04  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r90373.
+        http://trac.webkit.org/changeset/90373
+        https://bugs.webkit.org/show_bug.cgi?id=63917
+
+        Breaks Qt Linux Release minimal (Requested by vsevik on
+        #webkit).
+
+        * http/tests/inspector/network/network-content-replacement-embed-expected.txt: Removed.
+        * http/tests/inspector/network/network-content-replacement-embed.html: Removed.
+        * http/tests/inspector/network/network-content-replacement-xhr-expected.txt: Removed.
+        * http/tests/inspector/network/network-content-replacement-xhr.html: Removed.
+        * http/tests/inspector/network/network-embed-expected.txt: Removed.
+        * http/tests/inspector/network/network-embed.html: Removed.
+        * http/tests/inspector/network/network-xhr-async-expected.txt:
+        * http/tests/inspector/network/network-xhr-async.html:
+        * http/tests/inspector/network/network-xhr-sync-expected.txt:
+        * http/tests/inspector/network/network-xhr-sync.html:
+        * http/tests/inspector/network/resources/cp1251.xml: Removed.
+        * http/tests/inspector/network/resources/plugin-data.php: Removed.
+        * http/tests/inspector/network/resources/resource.php:
+        * http/tests/inspector/network/resources/utf8.xml: Removed.
+        * platform/chromium/test_expectations.txt:
+
 2011-07-04  Vsevolod Vlasov  <vsevik@chromium.org>
 
         Web Inspector: Show content for plugin requests in network panel.
diff --git a/LayoutTests/http/tests/inspector/network/network-content-replacement-embed-expected.txt b/LayoutTests/http/tests/inspector/network/network-content-replacement-embed-expected.txt
deleted file mode 100644 (file)
index 2911b2e..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-CONSOLE MESSAGE: line 60: Done.
-Tests NetworkResourcesData logic for embed content replacement.
-
-
-http://127.0.0.1:8000/inspector/network/resources/resource.php?size=200
-resource.content after requesting content: null
-http://127.0.0.1:8000/inspector/network/resources/resource.php?size=100
-resource.content after requesting content: ****************************************************************************************************
-http://127.0.0.1:8000/inspector/network/resources/resource.php?size=201
-resource.content after requesting content: null
-http://127.0.0.1:8000/inspector/network/resources/resource.php?size=100
-resource.content after requesting content: ****************************************************************************************************
-
diff --git a/LayoutTests/http/tests/inspector/network/network-content-replacement-embed.html b/LayoutTests/http/tests/inspector/network/network-content-replacement-embed.html
deleted file mode 100644 (file)
index 99ee3db..0000000
+++ /dev/null
@@ -1,119 +0,0 @@
-<html>
-<head>
-<script src="../inspector-test.js"></script>
-<script>
-
-var loadedFirstURL = false;
-function streamLoaded()
-{
-    if (loadedFirstURL)
-        return;
-
-    loadedFirstURL = true;
-    loadURLs();
-}
-
-var snifferInstalled = false;
-function onSnifferInstalled()
-{
-    snifferInstalled = true;
-    loadURLs();
-}
-
-function loadURLs()
-{
-    if (!snifferInstalled || !loadedFirstURL)
-        return;
-
-    if (!window.internals) {
-        console.log("This test can not be run as window.internals is not available.");
-        return;
-    }
-    // Each '*' symbol in original data will use two bytes in String object
-    // after decoding, hence multiplying by two.
-    internals.setInspectorResourcesDataSizeLimits(document, 2*300, 2*200);
-
-    // Here we test replacement logic. We save first two resources content,
-    // discard third resource content once we see its size exceeds limit,
-    // and finally replace first resource content with the last resource content.
-
-    plg.getURLNotify("resources/resource.php?size=200", null, "loadURL2");
-}
-
-function loadURL2()
-{
-    plg.getURLNotify("resources/resource.php?size=100", null, "loadURL3");
-}
-
-function loadURL3()
-{
-    plg.getURLNotify("resources/resource.php?size=201", null, "loadURL4");
-}
-
-function loadURL4()
-{
-    plg.getURLNotify("resources/resource.php?size=100", null, "allURLsLoaded");
-}
-
-function allURLsLoaded()
-{
-    console.log("Done.");
-}
-
-function test()
-{
-    InspectorTest.addSniffer(WebInspector.ConsoleView.prototype, "addMessage", step1);
-    InspectorTest.evaluateInPage("onSnifferInstalled()");
-
-    function dumpResource(resource, callback)
-    {
-        if (!resource)
-            return callback();
-        InspectorTest.addResult(resource.url);
-
-        function contentLoaded()
-        {
-            InspectorTest.addResult("resource.content after requesting content: " + resource.content);
-            callback();
-        }
-
-        resource.requestContent(contentLoaded);
-    }
-
-    function step1()
-    {
-        var resource = WebInspector.panels.network.resources[WebInspector.panels.network.resources.length - 4];
-        dumpResource(resource, step2);
-    }
-
-    function step2()
-    {
-        var resource = WebInspector.panels.network.resources[WebInspector.panels.network.resources.length - 3];
-        dumpResource(resource, step3);
-    }
-
-    function step3()
-    {
-        var resource = WebInspector.panels.network.resources[WebInspector.panels.network.resources.length - 2];
-        dumpResource(resource, step4);
-    }
-
-    function step4()
-    {
-        var resource = WebInspector.panels.network.resources[WebInspector.panels.network.resources.length - 1];
-        dumpResource(resource, step5);
-    }
-
-    function step5()
-    {
-        InspectorTest.completeTest();
-    }
-}
-</script>
-</head>
-<body onload="runTest()">
-    <p>Tests NetworkResourcesData logic for embed content replacement.</p>
-    <embed name="plg" type="application/x-webkit-test-netscape" src="resources/resource.php?type=image" onstreamload="streamLoaded()"></embed>
-</body>
-</html>
-
diff --git a/LayoutTests/http/tests/inspector/network/network-content-replacement-xhr-expected.txt b/LayoutTests/http/tests/inspector/network/network-content-replacement-xhr-expected.txt
deleted file mode 100644 (file)
index d1ef73f..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-CONSOLE MESSAGE: line 39: Done.
-Tests NetworkResourcesData logic for XHR content replacement.
-
-http://127.0.0.1:8000/inspector/network/resources/resource.php?size=200
-resource.content: null
-http://127.0.0.1:8000/inspector/network/resources/resource.php?size=100
-resource.content: ****************************************************************************************************
-http://127.0.0.1:8000/inspector/network/resources/resource.php?size=201
-resource.content: null
-http://127.0.0.1:8000/inspector/network/resources/resource.php?size=100
-resource.content: ****************************************************************************************************
-
diff --git a/LayoutTests/http/tests/inspector/network/network-content-replacement-xhr.html b/LayoutTests/http/tests/inspector/network/network-content-replacement-xhr.html
deleted file mode 100644 (file)
index 165cb1d..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-<html>
-<head>
-<script src="../inspector-test.js"></script>
-<script src="../network-test.js"></script>
-<script>
-function loadData()
-{
-    if (!window.internals) {
-        console.log("This test can not be run as window.internals is not available.");
-        return;
-    }
-    // Each '*' symbol will use two bytes in String object, hence multiplying by two.
-    internals.setInspectorResourcesDataSizeLimits(document, 2*300, 2*200);
-
-    // Here we test replacement logic. We save first two resources content,
-    // discard third resource content once we see its size exceeds limit,
-    // and finally replace first resource content with the last resource content.
-
-    doXHR("GET", "resources/resource.php?size=200", true, xhrLoaded1);
-}
-
-function xhrLoaded1()
-{
-    doXHR("GET", "resources/resource.php?size=100", true, xhrLoaded2);
-}
-
-function xhrLoaded2()
-{
-    doXHR("GET", "resources/resource.php?size=201", true, xhrLoaded3);
-}
-
-function xhrLoaded3()
-{
-    doXHR("GET", "resources/resource.php?size=100", true, allXHRsLoaded);
-}
-
-function allXHRsLoaded()
-{
-    console.log("Done.");
-}
-
-function test()
-{
-    InspectorTest.addSniffer(WebInspector.ConsoleView.prototype, "addMessage", step1);
-    InspectorTest.evaluateInPage("loadData()");
-
-    function dumpResource(resource, callback)
-    {
-        if (!resource)
-            return callback();
-        InspectorTest.addResult(resource.url);
-
-        function contentLoaded()
-        {
-            InspectorTest.addResult("resource.content: " + resource.content);
-            callback();
-        }
-
-        resource.requestContent(contentLoaded);
-    }
-
-    function step1()
-    {
-        var resource = WebInspector.panels.network.resources[WebInspector.panels.network.resources.length - 4];
-        dumpResource(resource, step2);
-    }
-
-    function step2()
-    {
-        var resource = WebInspector.panels.network.resources[WebInspector.panels.network.resources.length - 3];
-        dumpResource(resource, step3);
-    }
-
-    function step3()
-    {
-        var resource = WebInspector.panels.network.resources[WebInspector.panels.network.resources.length - 2];
-        dumpResource(resource, step4);
-    }
-
-    function step4()
-    {
-        var resource = WebInspector.panels.network.resources[WebInspector.panels.network.resources.length - 1];
-        dumpResource(resource, step5);
-    }
-
-    function step5()
-    {
-        InspectorTest.completeTest();
-    }
-}
-</script>
-</head>
-<body onload="runTest()">
-    <p> Tests NetworkResourcesData logic for XHR content replacement.</p>
-</body>
-</html>
-
diff --git a/LayoutTests/http/tests/inspector/network/network-embed-expected.txt b/LayoutTests/http/tests/inspector/network/network-embed-expected.txt
deleted file mode 100644 (file)
index bdbff0f..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-CONSOLE MESSAGE: line 66: Done.
-Tests that network panel shows content for embed objects.
-
-
-http://127.0.0.1:8000/inspector/network/resources/resource.php?type=image
-resource.type: 8
-resource.content before requesting content: undefined
-resource.content after requesting content: null
-http://127.0.0.1:8000/inspector/network/resources/plugin-data.php?filename=utf8.xml&mimetype=text/html&charset=utf8
-resource.type: 8
-resource.content before requesting content: undefined
-resource.content after requesting content: <?xml version='1.0' encoding='utf-8'?>
-<root>
-  <utf8>SUССЕSS - These 'CCE' are cyrillic letters.</utf8>
-</root>
-
-http://127.0.0.1:8000/inspector/network/resources/plugin-data.php?filename=cp1251.xml&mimetype=text/html&charset=cp1251
-resource.type: 8
-resource.content before requesting content: undefined
-resource.content after requesting content: <?xml version='1.0' encoding='cp1251'?>
-<root>
-  <cp1251>SUССЕSS - These 'CCE' are cyrillic letters.</cp1251>
-</root>
-
-http://127.0.0.1:8000/inspector/network/resources/plugin-data.php?filename=utf8.xml&mimetype=application/xml
-resource.type: 8
-resource.content before requesting content: undefined
-resource.content after requesting content: <?xml version='1.0' encoding='utf-8'?>
-<root>
-  <utf8>SUССЕSS - These 'CCE' are cyrillic letters.</utf8>
-</root>
-
-http://127.0.0.1:8000/inspector/network/resources/plugin-data.php?filename=cp1251.xml&mimetype=application/xml
-resource.type: 8
-resource.content before requesting content: undefined
-resource.content after requesting content: <?xml version='1.0' encoding='cp1251'?>
-<root>
-  <cp1251>SUССЕSS - These 'CCE' are cyrillic letters.</cp1251>
-</root>
-
-
diff --git a/LayoutTests/http/tests/inspector/network/network-embed.html b/LayoutTests/http/tests/inspector/network/network-embed.html
deleted file mode 100644 (file)
index 6155239..0000000
+++ /dev/null
@@ -1,133 +0,0 @@
-<html>
-<head>
-<script src="../inspector-test.js"></script>
-<script>
-
-var loadedFirstURL = false;
-function streamLoaded()
-{
-    if (loadedFirstURL)
-        return;
-
-    loadedFirstURL = true;
-    loadURLs();
-}
-
-var snifferInstalled = false;
-function onSnifferInstalled()
-{
-    snifferInstalled = true;
-    loadURLs();
-}
-
-function loadURLs()
-{
-    if (!snifferInstalled || !loadedFirstURL)
-        return;
-
-    if (!window.internals) {
-        console.log("This test can not be run as window.internals is not available.");
-        return;
-    }
-    // Since this test could be run together with other inspector backend cache
-    // tests, we need to reset size limits to default ones.
-    internals.setInspectorResourcesDataSizeLimits(document, 10 * 1000 * 1000, 1000 * 1000);
-
-    // Binary content should not be available.
-    plg.getURLNotify("resources/resource.php?type=image", null, "loadURL2");
-}
-
-function loadURL2()
-{
-    // This resource content should be correctly decoded.
-    plg.getURLNotify("resources/plugin-data.php?filename=utf8.xml&mimetype=text/html&charset=utf8", null, "loadURL3");
-}
-
-function loadURL3()
-{
-    // This resource content should be correctly decoded.
-    plg.getURLNotify("resources/plugin-data.php?filename=cp1251.xml&mimetype=text/html&charset=cp1251", null, "loadURL4");
-}
-
-function loadURL4()
-{
-    // This resource content should be correctly decoded.
-    plg.getURLNotify("resources/plugin-data.php?filename=utf8.xml&mimetype=application/xml", null, "loadURL5");
-}
-
-function loadURL5()
-{
-    // This resource content should be correctly decoded.
-    plg.getURLNotify("resources/plugin-data.php?filename=cp1251.xml&mimetype=application/xml", null, "allURLsLoaded");
-}
-
-function allURLsLoaded()
-{
-    console.log("Done.");
-}
-
-function test()
-{
-    InspectorTest.addSniffer(WebInspector.ConsoleView.prototype, "addMessage", step1);
-    InspectorTest.evaluateInPage("onSnifferInstalled()");
-
-    function dumpResource(resource, callback)
-    {
-        if (!resource)
-            return callback();
-        InspectorTest.addResult(resource.url);
-        InspectorTest.addResult("resource.type: " + resource.type);
-        InspectorTest.addResult("resource.content before requesting content: " + resource.content);
-
-        function contentLoaded()
-        {
-            InspectorTest.addResult("resource.content after requesting content: " + resource.content);
-            callback();
-        }
-
-        resource.requestContent(contentLoaded);
-    }
-
-    function step1()
-    {
-        var resource = WebInspector.panels.network.resources[WebInspector.panels.network.resources.length - 5];
-        dumpResource(resource, step2);
-    }
-
-    function step2()
-    {
-        var resource = WebInspector.panels.network.resources[WebInspector.panels.network.resources.length - 4];
-        dumpResource(resource, step3);
-    }
-
-    function step3()
-    {
-        var resource = WebInspector.panels.network.resources[WebInspector.panels.network.resources.length - 3];
-        dumpResource(resource, step4);
-    }
-
-    function step4()
-    {
-        var resource = WebInspector.panels.network.resources[WebInspector.panels.network.resources.length - 2];
-        dumpResource(resource, step5);
-    }
-
-    function step5()
-    {
-        var resource = WebInspector.panels.network.resources[WebInspector.panels.network.resources.length - 1];
-        dumpResource(resource, step6);
-    }
-
-    function step6()
-    {
-        InspectorTest.completeTest();
-    }
-}
-</script>
-</head>
-<body onload="runTest()">
-    <p>Tests that network panel shows content for embed objects.</p>
-    <embed name="plg" type="application/x-webkit-test-netscape" src="resources/resource.php?type=image" onstreamload="streamLoaded()"></embed>
-</body>
-</html>
-
index 565fd778597ca0e49396a30e35e99e1f02c1ae56..45e55513998eb1551f07f094ab52ae8ec092cf3b 100644 (file)
@@ -1,4 +1,4 @@
-CONSOLE MESSAGE: line 21: Done.
+CONSOLE MESSAGE: line 13: Done.
 Tests XHR network resource type and content for asynchronous requests. Bug 61205
 
 http://127.0.0.1:8000/inspector/network/resources/resource.php
index bd8b240810da17a8d03117295f4504cc2c4f8cd9..32621cb5168de67c76387326a542355ad590b046 100644 (file)
@@ -5,14 +5,6 @@
 <script>
 function loadData()
 {
-    if (!window.internals) {
-        console.log("This test can not be run as window.internals is not available.");
-        return;
-    }
-    // Since this test could be run together with other inspector backend cache
-    // tests, we need to reset size limits to default ones.
-    internals.setInspectorResourcesDataSizeLimits(document, 10 * 1000 * 1000, 1000 * 1000);
-
     doXHR("GET", "resources/resource.php", true, resourceLoaded);
 }
 
index be84f43931abf92d1ffbb393f52ad404dce8be0c..344347c0e51e821a5c6c386749a3ac13b3f5df72 100644 (file)
@@ -1,4 +1,4 @@
-CONSOLE MESSAGE: line 21: Done.
+CONSOLE MESSAGE: line 13: Done.
 Tests XHR network resource type and content for synchronous requests. Bug 61205
 
 http://127.0.0.1:8000/inspector/network/resources/resource.php
index 00d289ddafd7679d99bbdf62fc681171e90b90a5..8f2480e7b81bfb038ced6d8e089e1daab55d8913 100644 (file)
@@ -5,14 +5,6 @@
 <script>
 function loadData()
 {
-    if (!window.internals) {
-        console.log("This test can not be run as window.internals is not available.");
-        return;
-    }
-    // Since this test could be run together with other inspector backend cache
-    // tests, we need to reset size limits to default ones.
-    internals.setInspectorResourcesDataSizeLimits(document, 10 * 1000 * 1000, 1000 * 1000);
-
     doXHR("GET", "resources/resource.php", false, resourceLoaded);
 }
 
diff --git a/LayoutTests/http/tests/inspector/network/resources/cp1251.xml b/LayoutTests/http/tests/inspector/network/resources/cp1251.xml
deleted file mode 100644 (file)
index 32285f3..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='cp1251'?>
-<root>
-  <cp1251>SUÑÑÅSS - These 'CCE' are cyrillic letters.</cp1251>
-</root>
diff --git a/LayoutTests/http/tests/inspector/network/resources/plugin-data.php b/LayoutTests/http/tests/inspector/network/resources/plugin-data.php
deleted file mode 100644 (file)
index 321d9e8..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-    $mimetype = $_GET["mimetype"];
-    $filename = $_GET["filename"];
-    $charset = $_GET["charset"];
-
-    header("Expires: Thu, 01 Dec 2003 16:00:00 GMT");
-    header("Cache-Control: no-store, no-cache, must-revalidate");
-    header("Pragma: no-cache");
-    if ($charset)
-        header("Content-Type: " . $mimetype . "; charset=" . $charset);
-    else
-        header("Content-Type: " . $mimetype);
-
-    readfile($filename);
-?>
index 3e1f185e1fde268b2ebfefa1d0017dc093517edb..9e5607c182c865ee232bf918bb0f8888adf4cf17 100644 (file)
@@ -26,7 +26,7 @@
     else if ($type == "image")
         header("Content-Type: image/png");
     else
-        header("Content-Type: text/plain");
+        header("Content-Type: text/html");
 
     # Flush headers and sleep bofore sending response
     if ($send) {
diff --git a/LayoutTests/http/tests/inspector/network/resources/utf8.xml b/LayoutTests/http/tests/inspector/network/resources/utf8.xml
deleted file mode 100644 (file)
index 07ee481..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<root>
-  <utf8>SUССЕSS - These 'CCE' are cyrillic letters.</utf8>
-</root>
index f400523b91743071ea4284ff4ee2b9e8c8b95e14..fd0886b5e434d48b5200407ccdc5c123303ebd08 100644 (file)
@@ -656,10 +656,6 @@ WONTFIX SKIP : inspector/extensions = FAIL
 WONTFIX SKIP : http/tests/inspector/extensions-headers.html = FAIL
 WONTFIX SKIP : http/tests/inspector/extensions-resources-redirect.html = FAIL
 
-// There is no enough plugins support in DRT
-WONTFIX SKIP : http/tests/inspector/network/network-embed.html = FAIL
-WONTFIX SKIP : http/tests/inspector/network/network-content-replacement-embed.html = FAIL
-
 // Inspector tests in Debug build are very slow.
 BUG_DRT WIN LINUX DEBUG SLOW : inspector = PASS
 BUG_DRT WIN LINUX DEBUG SLOW : http/tests/inspector = PASS
index 44d22630f4e81903820acd5a5dc6792c6549e689..203dd7e96c06a68c067ee1a38a9d605c4799ce9d 100644 (file)
@@ -1,3 +1,67 @@
+2011-07-04  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r90373.
+        http://trac.webkit.org/changeset/90373
+        https://bugs.webkit.org/show_bug.cgi?id=63917
+
+        Breaks Qt Linux Release minimal (Requested by vsevik on
+        #webkit).
+
+        * WebCore.exp.in:
+        * inspector/InspectorController.cpp:
+        * inspector/InspectorController.h:
+        * inspector/InspectorInstrumentation.cpp:
+        (WebCore::InspectorInstrumentation::didReceiveContentLengthImpl):
+        * inspector/InspectorInstrumentation.h:
+        (WebCore::InspectorInstrumentation::didReceiveContentLength):
+        * inspector/InspectorResourceAgent.cpp:
+        (WebCore::InspectorResourceAgent::didReceiveResponse):
+        (WebCore::InspectorResourceAgent::didReceiveContentLength):
+        (WebCore::InspectorResourceAgent::didFinishLoading):
+        (WebCore::InspectorResourceAgent::setInitialXHRContent):
+        (WebCore::InspectorResourceAgent::getResourceContent):
+        * inspector/InspectorResourceAgent.h:
+        * inspector/NetworkResourcesData.cpp:
+        (WebCore::NetworkResourcesData::ResourceData::ResourceData):
+        (WebCore::NetworkResourcesData::ResourceData::content):
+        (WebCore::NetworkResourcesData::ResourceData::appendContent):
+        (WebCore::NetworkResourcesData::ResourceData::purgeContent):
+        (WebCore::NetworkResourcesData::NetworkResourcesData):
+        (WebCore::NetworkResourcesData::responseReceived):
+        (WebCore::NetworkResourcesData::addResourceContent):
+        (WebCore::NetworkResourcesData::data):
+        (WebCore::NetworkResourcesData::clear):
+        (WebCore::NetworkResourcesData::ensureNoDataForIdentifier):
+        (WebCore::NetworkResourcesData::ensureFreeSpace):
+        * inspector/NetworkResourcesData.h:
+        (WebCore::NetworkResourcesData::ResourceData::hasContent):
+        (WebCore::NetworkResourcesData::ResourceData::setIsContentPurged):
+        (WebCore::NetworkResourcesData::ResourceData::textEncodingName):
+        (WebCore::NetworkResourcesData::ResourceData::setTextEncodingName):
+        * inspector/front-end/Resource.js:
+        * inspector/front-end/ResourcePreviewView.js:
+        (WebInspector.ResourcePreviewView.prototype.contentLoaded):
+        (WebInspector.ResourcePreviewView.prototype._createInnerView):
+        * inspector/front-end/ResourceView.js:
+        (WebInspector.ResourceView.hasTextContent):
+        * loader/DocumentThreadableLoader.cpp:
+        (WebCore::DocumentThreadableLoader::didReceiveData):
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::willLoadMediaElementURL):
+        (WebCore::FrameLoader::commitProvisionalLoad):
+        (WebCore::FrameLoader::loadResourceSynchronously):
+        (WebCore::FrameLoader::loadedResourceFromMemoryCache):
+        * loader/ResourceLoadNotifier.cpp:
+        (WebCore::ResourceLoadNotifier::didReceiveData):
+        (WebCore::ResourceLoadNotifier::dispatchDidReceiveContentLength):
+        (WebCore::ResourceLoadNotifier::sendRemainingDelegateMessages):
+        * loader/ResourceLoadNotifier.h:
+        * loader/appcache/ApplicationCacheGroup.cpp:
+        (WebCore::ApplicationCacheGroup::didReceiveData):
+        * testing/Internals.cpp:
+        * testing/Internals.h:
+        * testing/Internals.idl:
+
 2011-07-04  Vsevolod Vlasov  <vsevik@chromium.org>
 
         Web Inspector: Show content for plugin requests in network panel.
index 519eeda77347c2599cc59d24221b32a8dde524af..4bf0255b652b3b9a903e6b143bb755c9901fdbd7 100644 (file)
@@ -1301,7 +1301,6 @@ __ZNK7WebCore8Document16dashboardRegionsEv
 __ZNK7WebCore8Document20cacheDocumentElementEv
 __ZNK7WebCore8Document31displayStringModifiedByEncodingERKN3WTF6StringE
 __ZNK7WebCore8Document4bodyEv
-__ZNK7WebCore8Document4pageEv
 __ZNK7WebCore8Document6domainEv
 __ZNK7WebCore8Document6loaderEv
 __ZNK7WebCore8IntPointcv7CGPointEv
@@ -1582,7 +1581,6 @@ __ZN7WebCore19InspectorController25evaluateForTestInFrontendElRKN3WTF6StringE
 __ZN7WebCore19InspectorController26setInspectorFrontendClientEN3WTF10PassOwnPtrINS_23InspectorFrontendClientEEE
 __ZN7WebCore19InspectorController26stopUserInitiatedProfilingEv
 __ZN7WebCore19InspectorController27startUserInitiatedProfilingEv
-__ZN7WebCore19InspectorController39setResourcesDataSizeLimitsFromInternalsEii
 __ZN7WebCore19InspectorController4showEv
 __ZN7WebCore19InspectorController5closeEv
 __ZN7WebCore28InspectorFrontendClientLocal12moveWindowByEff
index 4ab1271b5ef199bcd75e1b9ccb057c0051db2da8..bbc48ac8e33339fe0262646d2c4f12cfa566aa44 100644 (file)
@@ -489,11 +489,6 @@ void InspectorController::resume()
 
 #endif
 
-void InspectorController::setResourcesDataSizeLimitsFromInternals(int maximumResourcesContentSize, int maximumSingleResourceContentSize)
-{
-    m_resourceAgent->setResourcesDataSizeLimitsFromInternals(maximumResourcesContentSize, maximumSingleResourceContentSize);
-}
-
 } // namespace WebCore
 
 #endif // ENABLE(INSPECTOR)
index a68a13a7988474f4eee3181e0a33b03da9190c31..739b00bd4ca41d89aa9bf67e207c5b3e56154b46 100644 (file)
@@ -120,8 +120,6 @@ public:
     void resume();
 #endif
 
-    void setResourcesDataSizeLimitsFromInternals(int maximumResourcesContentSize, int maximumSingleResourceContentSize);
-
 private:
     friend class PostWorkerNotificationToFrontendTask;
 
index 2da167df209862d69d5ccb4b78ad6fd9d8ed0919..a9e2caa80bbd219cac99af7fc79eda75b2b08671 100644 (file)
@@ -492,10 +492,10 @@ void InspectorInstrumentation::continueWithPolicyIgnoreImpl(Frame* frame, Docume
     didReceiveResourceResponseButCanceledImpl(frame, loader, identifier, r);
 }
 
-void InspectorInstrumentation::didReceiveDataImpl(InstrumentingAgents* instrumentingAgents, unsigned long identifier, const char* data, int dataLength, int encodedDataLength)
+void InspectorInstrumentation::didReceiveContentLengthImpl(InstrumentingAgents* instrumentingAgents, unsigned long identifier, int dataLength, int encodedDataLength)
 {
     if (InspectorResourceAgent* resourceAgent = instrumentingAgents->inspectorResourceAgent())
-        resourceAgent->didReceiveData(identifier, data, dataLength, encodedDataLength);
+        resourceAgent->didReceiveContentLength(identifier, dataLength, encodedDataLength);
 }
 
 void InspectorInstrumentation::didFinishLoadingImpl(InstrumentingAgents* instrumentingAgents, unsigned long identifier, DocumentLoader* loader, double finishTime)
index e3e3274c8e1687c27c0cc54fd62940b3ddc42207..20b0eb82710487e9cc28ab7c76f52e145883e72c 100644 (file)
@@ -126,7 +126,7 @@ public:
     static void continueAfterXFrameOptionsDenied(Frame*, DocumentLoader*, unsigned long identifier, const ResourceResponse&);
     static void continueWithPolicyDownload(Frame*, DocumentLoader*, unsigned long identifier, const ResourceResponse&);
     static void continueWithPolicyIgnore(Frame*, DocumentLoader*, unsigned long identifier, const ResourceResponse&);
-    static void didReceiveData(Frame*, unsigned long identifier, const char* data, int dataLength, int encodedDataLength);
+    static void didReceiveContentLength(Frame*, unsigned long identifier, int dataLength, int encodedDataLength);
     static void didFinishLoading(Frame*, DocumentLoader*, unsigned long identifier, double finishTime);
     static void didFailLoading(Frame*, DocumentLoader*, unsigned long identifier, const ResourceError&);
     static void resourceRetrievedByXMLHttpRequest(ScriptExecutionContext*, unsigned long identifier, const String& sourceString, const String& url, const String& sendURL, unsigned sendLineNumber);
@@ -254,7 +254,7 @@ private:
     static void continueAfterXFrameOptionsDeniedImpl(Frame*, DocumentLoader*, unsigned long identifier, const ResourceResponse&);
     static void continueWithPolicyDownloadImpl(Frame*, DocumentLoader*, unsigned long identifier, const ResourceResponse&);
     static void continueWithPolicyIgnoreImpl(Frame*, DocumentLoader*, unsigned long identifier, const ResourceResponse&);
-    static void didReceiveDataImpl(InstrumentingAgents*, unsigned long identifier, const char* data, int dataLength, int encodedDataLength);
+    static void didReceiveContentLengthImpl(InstrumentingAgents*, unsigned long identifier, int dataLength, int encodedDataLength);
     static void didFinishLoadingImpl(InstrumentingAgents*, unsigned long identifier, DocumentLoader*, double finishTime);
     static void didFailLoadingImpl(InstrumentingAgents*, unsigned long identifier, DocumentLoader*, const ResourceError&);
     static void resourceRetrievedByXMLHttpRequestImpl(InstrumentingAgents*, unsigned long identifier, const String& sourceString, const String& url, const String& sendURL, unsigned sendLineNumber);
@@ -764,11 +764,11 @@ inline void InspectorInstrumentation::continueWithPolicyIgnore(Frame* frame, Doc
 #endif
 }
 
-inline void InspectorInstrumentation::didReceiveData(Frame* frame, unsigned long identifier, const char* data, int dataLength, int encodedDataLength)
+inline void InspectorInstrumentation::didReceiveContentLength(Frame* frame, unsigned long identifier, int dataLength, int encodedDataLength)
 {
 #if ENABLE(INSPECTOR)
     if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForFrame(frame))
-        didReceiveDataImpl(instrumentingAgents, identifier, data, dataLength, encodedDataLength);
+        didReceiveContentLengthImpl(instrumentingAgents, identifier, dataLength, encodedDataLength);
 #endif
 }
 
index cc53d1bf6d1f6ed351c781ff48a798b8adfb8712..169ed66c1f4cffc14057c78c4497c4d33ac390f4 100644 (file)
@@ -251,21 +251,18 @@ void InspectorResourceAgent::didReceiveResponse(unsigned long identifier, Docume
         else if (m_loadingXHRSynchronously || m_resourcesData->resourceType(identifier) == InspectorPageAgent::XHRResource)
             type = InspectorPageAgent::XHRResource;
 
-        m_resourcesData->responseReceived(identifier, m_pageAgent->frameId(loader->frame()), response);
+        m_resourcesData->responseReceived(identifier, m_pageAgent->frameId(loader->frame()), response.url());
     }
     m_resourcesData->setResourceType(identifier, type);
     m_frontend->responseReceived(static_cast<int>(identifier), currentTime(), InspectorPageAgent::resourceTypeString(type), resourceResponse);
     // If we revalidated the resource and got Not modified, send content length following didReceiveResponse
-    // as there will be no calls to didReceiveData from the network stack.
+    // as there will be no calls to didReceiveContentLength from the network stack.
     if (cachedResourceSize && response.httpStatusCode() == 304)
-        didReceiveData(identifier, 0, cachedResourceSize, 0);
+        didReceiveContentLength(identifier, cachedResourceSize, 0);
 }
 
-void InspectorResourceAgent::didReceiveData(unsigned long identifier, const char* data, int dataLength, int encodedDataLength)
+void InspectorResourceAgent::didReceiveContentLength(unsigned long identifier, int dataLength, int encodedDataLength)
 {
-    if (data && m_resourcesData->resourceType(identifier) == InspectorPageAgent::OtherResource)
-        m_resourcesData->maybeAddResourceData(identifier, data, dataLength);
-
     m_frontend->dataReceived(static_cast<int>(identifier), currentTime(), dataLength, encodedDataLength);
 }
 
@@ -274,8 +271,6 @@ void InspectorResourceAgent::didFinishLoading(unsigned long identifier, Document
     if (m_resourcesData->resourceType(identifier) == InspectorPageAgent::DocumentResource)
         m_resourcesData->addResourceSharedBuffer(identifier, loader->frameLoader()->documentLoader()->mainResourceData(), loader->frame()->document()->inputEncoding());
 
-    m_resourcesData->maybeDecodeDataToContent(identifier);
-
     if (!finishTime)
         finishTime = currentTime();
 
@@ -302,7 +297,7 @@ void InspectorResourceAgent::setInitialScriptContent(unsigned long identifier, c
 
 void InspectorResourceAgent::setInitialXHRContent(unsigned long identifier, const String& sourceString)
 {
-    m_resourcesData->setResourceContent(identifier, sourceString);
+    m_resourcesData->addResourceContent(identifier, sourceString);
 }
 
 void InspectorResourceAgent::didReceiveXHRResponse(unsigned long identifier)
@@ -403,12 +398,6 @@ void InspectorResourceAgent::setBackgroundEventsCollectionEnabled(ErrorString*,
     return m_state->setBoolean(ResourceAgentState::backgroundEventsCollectionEnabled, enabled);
 }
 
-// called from Internals for layout test purposes.
-void InspectorResourceAgent::setResourcesDataSizeLimitsFromInternals(int maximumResourcesContentSize, int maximumSingleResourceContentSize)
-{
-    m_resourcesData->setResourcesDataSizeLimits(maximumResourcesContentSize, maximumSingleResourceContentSize);
-}
-
 void InspectorResourceAgent::enable(ErrorString*)
 {
     enable();
@@ -448,7 +437,7 @@ void InspectorResourceAgent::initializeBackgroundCollection()
 
 void InspectorResourceAgent::getResourceContent(ErrorString* errorString, unsigned long identifier, String* content, bool* base64Encoded)
 {
-    NetworkResourcesData::ResourceData const* resourceData = m_resourcesData->data(identifier);
+    NetworkResourcesData::ResourceData* resourceData = m_resourcesData->data(identifier);
     if (!resourceData) {
         *errorString = "No resource with given identifier found";
         return;
index b802af43d6e49a1ee505543b9110ad4cb48ed9eb..b4410b375caf1d2e6fa62efe994caebb9ce19116 100644 (file)
@@ -90,7 +90,7 @@ public:
     void willSendRequest(unsigned long identifier, DocumentLoader*, ResourceRequest&, const ResourceResponse& redirectResponse);
     void markResourceAsCached(unsigned long identifier);
     void didReceiveResponse(unsigned long identifier, DocumentLoader* laoder, const ResourceResponse&);
-    void didReceiveData(unsigned long identifier, const char* data, int dataLength, int encodedDataLength);
+    void didReceiveContentLength(unsigned long identifier, int dataLength, int encodedDataLength);
     void didFinishLoading(unsigned long identifier, DocumentLoader*, double finishTime);
     void didFailLoading(unsigned long identifier, DocumentLoader*, const ResourceError&);
     void didLoadResourceFromMemoryCache(DocumentLoader*, const CachedResource*);
@@ -113,9 +113,6 @@ public:
     void isBackgroundEventsCollectionEnabled(ErrorString*, bool* enabled);
     void setBackgroundEventsCollectionEnabled(ErrorString*, bool enabled);
 
-    // called from Internals for layout test purposes.
-    void setResourcesDataSizeLimitsFromInternals(int maximumResourcesContentSize, int maximumSingleResourceContentSize);
-
     // Called from frontend
     void enable(ErrorString*);
     void disable(ErrorString*);
index 346b299fc169dcd1d0e5496fd57ac159ba27b686..588d1eb404f7e69f089d31297b720a69d02aef9c 100644 (file)
 #include "config.h"
 #include "NetworkResourcesData.h"
 
-#include "DOMImplementation.h"
-#include "SharedBuffer.h"
-#include "TextResourceDecoder.h"
-
 #if ENABLE(INSPECTOR)
 
 namespace {
 // 10MB
 static int maximumResourcesContentSize = 10 * 1000 * 1000;
-
-// 1MB
-static int maximumSingleResourceContentSize = 1000 * 1000;
 }
 
 namespace WebCore {
 
-
 // ResourceData
 NetworkResourcesData::ResourceData::ResourceData(unsigned long identifier, const String& loaderId)
     : m_identifier(identifier)
     , m_loaderId(loaderId)
+    , m_hasContent(false)
     , m_isContentPurged(false)
     , m_type(InspectorPageAgent::OtherResource)
 {
 }
 
-void NetworkResourcesData::ResourceData::setContent(const String& content)
-{
-    ASSERT(!hasData());
-    ASSERT(!hasContent());
-    m_content = content;
-}
-
-unsigned NetworkResourcesData::ResourceData::purgeContent()
-{
-    unsigned result = 0;
-    if (hasData()) {
-        ASSERT(!hasContent());
-        result = m_dataBuffer->size();
-        m_dataBuffer = nullptr;
-    }
-
-    if (hasContent()) {
-        ASSERT(!hasData());
-        result = 2 * m_content.length();
-        m_content = String();
-    }
-    m_isContentPurged = true;
-    return result;
-}
-
-void NetworkResourcesData::ResourceData::createDecoder(const String& mimeType, const String& textEncodingName)
-{
-    if (!textEncodingName.isEmpty())
-        m_decoder = TextResourceDecoder::create("text/plain", textEncodingName);
-    else if (mimeType == "text/plain")
-        m_decoder = TextResourceDecoder::create("text/plain", "ISO-8859-1");
-    else if (mimeType == "text/html")
-        m_decoder = TextResourceDecoder::create("text/html", "UTF-8");
-    else if (DOMImplementation::isXMLMIMEType(mimeType)) {
-        m_decoder = TextResourceDecoder::create("application/xml");
-        m_decoder->useLenientXMLDecoding();
-    }
-}
-
-int NetworkResourcesData::ResourceData::dataLength() const
+String NetworkResourcesData::ResourceData::content()
 {
-    return m_dataBuffer ? m_dataBuffer->size() : 0;
+    return m_hasContent ? m_contentBuilder.toString() : String();
 }
 
-void NetworkResourcesData::ResourceData::appendData(const char* data, int dataLength)
+void NetworkResourcesData::ResourceData::appendContent(const String& content)
 {
-    ASSERT(!hasContent());
-    if (!m_dataBuffer)
-        m_dataBuffer = SharedBuffer::create(data, dataLength);
-    else
-        m_dataBuffer->append(data, dataLength);
+    m_contentBuilder.append(content);
+    m_hasContent = true;
 }
 
-int NetworkResourcesData::ResourceData::decodeDataToContent()
+unsigned NetworkResourcesData::ResourceData::purgeContent()
 {
-    ASSERT(!hasContent());
-    int dataLength = m_dataBuffer->size();
-    m_content = m_decoder->decode(m_dataBuffer->data(), m_dataBuffer->size());
-    m_dataBuffer = nullptr;
-    return 2 * m_content.length() - dataLength;
+    unsigned length = m_contentBuilder.toStringPreserveCapacity().length();
+    m_contentBuilder.clear();
+    m_isContentPurged = true;
+    m_hasContent = false;
+    return length;
 }
 
 // NetworkResourcesData
 NetworkResourcesData::NetworkResourcesData()
     : m_contentSize(0)
-    , m_maximumResourcesContentSize(maximumResourcesContentSize)
-    , m_maximumSingleResourceContentSize(maximumSingleResourceContentSize)
 {
 }
 
@@ -136,14 +85,13 @@ void NetworkResourcesData::resourceCreated(unsigned long identifier, const Strin
     m_identifierToResourceDataMap.set(identifier, new ResourceData(identifier, loaderId));
 }
 
-void NetworkResourcesData::responseReceived(unsigned long identifier, const String& frameId, const ResourceResponse& response)
+void NetworkResourcesData::responseReceived(unsigned long identifier, const String& frameId, const String& url)
 {
     ResourceData* resourceData = m_identifierToResourceDataMap.get(identifier);
     if (!resourceData)
         return;
     resourceData->setFrameId(frameId);
-    resourceData->setUrl(response.url());
-    resourceData->createDecoder(response.mimeType(), response.textEncodingName());
+    resourceData->setUrl(url);
 }
 
 void NetworkResourcesData::setResourceType(unsigned long identifier, InspectorPageAgent::ResourceType type)
@@ -162,54 +110,21 @@ InspectorPageAgent::ResourceType NetworkResourcesData::resourceType(unsigned lon
     return resourceData->type();
 }
 
-void NetworkResourcesData::setResourceContent(unsigned long identifier, const String& content)
+void NetworkResourcesData::addResourceContent(unsigned long identifier, const String& content)
 {
     ResourceData* resourceData = m_identifierToResourceDataMap.get(identifier);
     if (!resourceData)
         return;
-    int dataLength = 2 * content.length();
-    if (dataLength > m_maximumSingleResourceContentSize)
-        return;
     if (resourceData->isContentPurged())
         return;
-    if (ensureFreeSpace(dataLength) && !resourceData->isContentPurged()) {
-        m_identifiersDeque.append(identifier);
-        resourceData->setContent(content);
-        m_contentSize += dataLength;
+    if (ensureFreeSpace(content.length()) && !resourceData->isContentPurged()) {
+        if (!resourceData->hasContent())
+            m_identifiersDeque.append(identifier);
+        resourceData->appendContent(content);
+        m_contentSize += content.length();
     }
 }
 
-void NetworkResourcesData::maybeAddResourceData(unsigned long identifier, const char* data, int dataLength)
-{
-    ResourceData* resourceData = m_identifierToResourceDataMap.get(identifier);
-    if (!resourceData)
-        return;
-    if (!resourceData->decoder())
-        return;
-    if (resourceData->dataLength() + dataLength > m_maximumSingleResourceContentSize)
-        m_contentSize -= resourceData->purgeContent();
-    if (resourceData->isContentPurged())
-        return;
-    if (ensureFreeSpace(dataLength) && !resourceData->isContentPurged()) {
-        m_identifiersDeque.append(identifier);
-        resourceData->appendData(data, dataLength);
-        m_contentSize += dataLength;
-    }
-}
-
-void NetworkResourcesData::maybeDecodeDataToContent(unsigned long identifier)
-{
-    ResourceData* resourceData = m_identifierToResourceDataMap.get(identifier);
-    if (!resourceData)
-        return;
-    if (!resourceData->hasData())
-        return;
-    m_contentSize += resourceData->decodeDataToContent();
-    int dataLength = 2 * resourceData->content().length();
-    if (dataLength > m_maximumSingleResourceContentSize)
-        m_contentSize -= resourceData->purgeContent();
-}
-
 void NetworkResourcesData::addCachedResource(unsigned long identifier, CachedResource* cachedResource)
 {
     if (!m_identifierToResourceDataMap.contains(identifier))
@@ -228,7 +143,7 @@ void NetworkResourcesData::addResourceSharedBuffer(unsigned long identifier, Pas
     resourceData->setTextEncodingName(textEncodingName);
 }
 
-NetworkResourcesData::ResourceData const* NetworkResourcesData::data(unsigned long identifier)
+NetworkResourcesData::ResourceData* NetworkResourcesData::data(unsigned long identifier)
 {
     return m_identifierToResourceDataMap.get(identifier);
 }
@@ -236,7 +151,6 @@ NetworkResourcesData::ResourceData const* NetworkResourcesData::data(unsigned lo
 void NetworkResourcesData::clear(const String& preservedLoaderId)
 {
     m_identifiersDeque.clear();
-    m_contentSize = 0;
 
     ResourceDataMap preservedMap;
 
@@ -252,19 +166,11 @@ void NetworkResourcesData::clear(const String& preservedLoaderId)
     m_identifierToResourceDataMap.swap(preservedMap);
 }
 
-void NetworkResourcesData::setResourcesDataSizeLimits(int maximumResourcesContentSize, int maximumSingleResourceContentSize)
-{
-    clear();
-    m_maximumResourcesContentSize = maximumResourcesContentSize;
-    m_maximumSingleResourceContentSize = maximumSingleResourceContentSize;
-}
-
-
 void NetworkResourcesData::ensureNoDataForIdentifier(unsigned long identifier)
 {
     ResourceData* resourceData = m_identifierToResourceDataMap.get(identifier);
     if (resourceData) {
-        if (resourceData->hasContent() || resourceData->hasData())
+        if (resourceData->hasContent())
             m_contentSize -= resourceData->purgeContent();
         delete resourceData;
         m_identifierToResourceDataMap.remove(identifier);
@@ -273,10 +179,10 @@ void NetworkResourcesData::ensureNoDataForIdentifier(unsigned long identifier)
 
 bool NetworkResourcesData::ensureFreeSpace(int size)
 {
-    if (size > m_maximumResourcesContentSize)
+    if (size > maximumResourcesContentSize)
         return false;
 
-    while (size > m_maximumResourcesContentSize - m_contentSize) {
+    while (size > maximumResourcesContentSize - m_contentSize) {
         unsigned long identifier = m_identifiersDeque.takeFirst();
         ResourceData* resourceData = m_identifierToResourceDataMap.get(identifier);
         if (resourceData)
index d547aa7911e69083de3894275b427ed83dd186d7..78cdbebfaa73f6818e802fa039baf9ec75c79a95 100644 (file)
@@ -31,6 +31,7 @@
 
 #include "CachedResourceHandle.h"
 #include "InspectorPageAgent.h"
+#include "SharedBuffer.h"
 
 #include <wtf/Deque.h>
 #include <wtf/HashMap.h>
 
 namespace WebCore {
 
-class CachedResource;
 class SharedBuffer;
-class TextResourceDecoder;
+class CachedResource;
 
 class NetworkResourcesData {
 public:
     class ResourceData {
-        friend class NetworkResourcesData;
     public:
         ResourceData(unsigned long identifier, const String& loaderId);
 
@@ -62,47 +61,38 @@ public:
         String url() const { return m_url; }
         void setUrl(const String& url) { m_url = url; }
 
-        bool hasContent() const { return !m_content.isNull(); }
-        String content() const { return m_content; }
-        void setContent(const String&);
+        bool hasContent() const { return m_hasContent; }
+        String content();
+        void appendContent(const String&);
 
         bool isContentPurged() const { return m_isContentPurged; }
+        void setIsContentPurged(bool isContentPurged) { m_isContentPurged = isContentPurged; }
         unsigned purgeContent();
 
         InspectorPageAgent::ResourceType type() const { return m_type; }
         void setType(InspectorPageAgent::ResourceType type) { m_type = type; }
 
-        String textEncodingName() const { return m_textEncodingName; }
-        void setTextEncodingName(const String& textEncodingName) { m_textEncodingName = textEncodingName; }
-
-        TextResourceDecoder* decoder() const { return m_decoder.get(); }
-        void createDecoder(const String& mimeType, const String& textEncodingName);
-
         PassRefPtr<SharedBuffer> buffer() const { return m_buffer; }
         void setBuffer(PassRefPtr<SharedBuffer> buffer) { m_buffer = buffer; }
 
+        String textEncodingName() const { return m_textEncodingName; }
+        void setTextEncodingName(const String& textEncodingName) { m_textEncodingName = textEncodingName; }
+
         CachedResource* cachedResource() const { return m_cachedResource.get(); }
         void setCachedResource(CachedResource* cachedResource) { m_cachedResource = cachedResource; }
 
     private:
-        bool hasData() const { return m_dataBuffer; }
-        int dataLength() const;
-        void appendData(const char* data, int dataLength);
-        int decodeDataToContent();
-
         unsigned long m_identifier;
         String m_loaderId;
         String m_frameId;
         String m_url;
-        String m_content;
-        RefPtr<SharedBuffer> m_dataBuffer;
+        bool m_hasContent;
+        StringBuilder m_contentBuilder;
         bool m_isContentPurged;
         InspectorPageAgent::ResourceType m_type;
 
-        String m_textEncodingName;
-        RefPtr<TextResourceDecoder> m_decoder;
-
         RefPtr<SharedBuffer> m_buffer;
+        String m_textEncodingName;
         CachedResourceHandle<CachedResource> m_cachedResource;
     };
 
@@ -111,19 +101,15 @@ public:
     ~NetworkResourcesData();
 
     void resourceCreated(unsigned long identifier, const String& loaderId);
-    void responseReceived(unsigned long identifier, const String& frameId, const ResourceResponse&);
+    void responseReceived(unsigned long identifier, const String& frameId, const String& url);
     void setResourceType(unsigned long identifier, InspectorPageAgent::ResourceType);
     InspectorPageAgent::ResourceType resourceType(unsigned long identifier);
-    void setResourceContent(unsigned long identifier, const String& content);
-    void maybeAddResourceData(unsigned long identifier, const char* data, int dataLength);
-    void maybeDecodeDataToContent(unsigned long identifier);
+    void addResourceContent(unsigned long identifier, const String& content);
     void addCachedResource(unsigned long identifier, CachedResource*);
     void addResourceSharedBuffer(unsigned long identifier, PassRefPtr<SharedBuffer>, const String& textEncodingName);
-    ResourceData const* data(unsigned long identifier);
+    ResourceData* data(unsigned long identifier);
     void clear(const String& preservedLoaderId = String());
 
-    void setResourcesDataSizeLimits(int maximumResourcesContentSize, int maximumSingleResourceContentSize);
-
 private:
     void ensureNoDataForIdentifier(unsigned long identifier);
     bool ensureFreeSpace(int size);
@@ -133,8 +119,6 @@ private:
     typedef HashMap<unsigned long, ResourceData*> ResourceDataMap;
     ResourceDataMap m_identifierToResourceDataMap;
     int m_contentSize;
-    int m_maximumResourcesContentSize;
-    int m_maximumSingleResourceContentSize;
 };
 
 } // namespace WebCore
index a104035aa9c451008d55ed46577af31fb48d3975..ec1d148d5ad0af3213ffff2673276f803aa8c673 100644 (file)
@@ -782,11 +782,6 @@ WebInspector.Resource.prototype = {
         return this._content;
     },
 
-    get contentEncoded()
-    {
-        return this._contentEncoded;
-    },
-
     get contentTimestamp()
     {
         return this._contentTimestamp;
index 58c617fb6d64907c67acc8a3d26ee6cec8ac4e74..3fbce479353176b61c62d7926f1022bde89f421b 100644 (file)
@@ -39,7 +39,7 @@ WebInspector.ResourcePreviewView.prototype = {
     {
         if (!this.resource.content) {
             if (!this._emptyView) {
-                this._emptyView = this._createEmptyView();
+                this._emptyView = new WebInspector.EmptyView(WebInspector.UIString("This request has no preview available."));
                 this._emptyView.show(this.element);
             }
         } else {
@@ -47,18 +47,13 @@ WebInspector.ResourcePreviewView.prototype = {
                 this._emptyView.detach();
                 delete this._emptyView;
             }
-            if (!this._previewView)
-                this._previewView = this._createPreviewView();
-            this._previewView.show(this.element);
+            if (!this._view)
+                this._view = this._createInnerView();
+            this._view.show(this.element);
         }
     },
 
-    _createEmptyView: function()
-    {
-        return new WebInspector.EmptyView(WebInspector.UIString("This request has no preview available."));
-    },
-    
-    _createPreviewView: function()
+    _createInnerView: function()
     {
         if (this.resource.hasErrorStatusCode() && this.resource.content)
             return new WebInspector.ResourceHTMLView(this.resource);
@@ -71,9 +66,6 @@ WebInspector.ResourcePreviewView.prototype = {
 
         if (this._responseView.sourceView)
             return this._responseView.sourceView;
-        
-        if (this.resource.category === WebInspector.resourceCategories.other)
-            return this._createEmptyView();
 
         return WebInspector.ResourceView.nonSourceViewForResource(this.resource);
     }
index 106e8b125399394909e86692e182fc0345ec81d5..7226f6732e33e06182f0702e4cec0b1436cb778f 100644 (file)
@@ -51,8 +51,6 @@ WebInspector.ResourceView.hasTextContent = function(resource)
     case WebInspector.resourceCategories.xhr:
     case WebInspector.resourceCategories.stylesheets:
         return true;
-    case WebInspector.resourceCategories.other:
-        return resource.content && !resource.contentEncoded;
     default:
         return false;
     }
index 4656d2c4aca1cb2edc9cc231bff2c79e364b1588..eff63996daa1fea8ac51c12d2a96eaed0692469b 100644 (file)
@@ -229,7 +229,7 @@ void DocumentThreadableLoader::didReceiveData(SubresourceLoader* loader, const c
 
 #if ENABLE(INSPECTOR)
     if (m_preflightRequestIdentifier)
-        InspectorInstrumentation::didReceiveData(m_document->frame(), m_preflightRequestIdentifier, 0, 0, dataLength);
+        InspectorInstrumentation::didReceiveContentLength(m_document->frame(), m_preflightRequestIdentifier, 0, dataLength);
 #endif
 
     // Preflight data should be invisible to clients.
index 960cafeff93c862e973ba6332610a8831b262f44..e2f283f27d87598fcbe859134b33ec51aa77a765 100644 (file)
@@ -1382,7 +1382,7 @@ bool FrameLoader::willLoadMediaElementURL(KURL& url)
     unsigned long identifier;
     ResourceError error;
     requestFromDelegate(request, identifier, error);
-    notifier()->sendRemainingDelegateMessages(m_documentLoader.get(), identifier, ResourceResponse(url, String(), -1, String(), String()), 0, -1, -1, error);
+    notifier()->sendRemainingDelegateMessages(m_documentLoader.get(), identifier, ResourceResponse(url, String(), -1, String(), String()), -1, -1, error);
 
     url = request.url();
 
@@ -1780,7 +1780,7 @@ void FrameLoader::commitProvisionalLoad()
             // FIXME: If we get a resource with more than 2B bytes, this code won't do the right thing.
             // However, with today's computers and networking speeds, this won't happen in practice.
             // Could be an issue with a giant local file.
-            notifier()->sendRemainingDelegateMessages(m_documentLoader.get(), identifier, response, 0, static_cast<int>(response.expectedContentLength()), 0, error);
+            notifier()->sendRemainingDelegateMessages(m_documentLoader.get(), identifier, response, static_cast<int>(response.expectedContentLength()), 0, error);
         }
         
         pageCache()->remove(history()->currentItem());
@@ -2590,7 +2590,7 @@ unsigned long FrameLoader::loadResourceSynchronously(const ResourceRequest& requ
 #endif
     }
     int encodedDataLength = response.resourceLoadInfo() ? static_cast<int>(response.resourceLoadInfo()->encodedDataLength) : -1;
-    notifier()->sendRemainingDelegateMessages(m_documentLoader.get(), identifier, response, data.data(), data.size(), encodedDataLength, error);
+    notifier()->sendRemainingDelegateMessages(m_documentLoader.get(), identifier, response, data.size(), encodedDataLength, error);
     return identifier;
 }
 
@@ -2883,7 +2883,7 @@ void FrameLoader::loadedResourceFromMemoryCache(const CachedResource* resource)
     ResourceError error;
     requestFromDelegate(request, identifier, error);
     InspectorInstrumentation::markResourceAsCached(page, identifier);
-    notifier()->sendRemainingDelegateMessages(m_documentLoader.get(), identifier, resource->response(), 0, resource->encodedSize(), 0, error);
+    notifier()->sendRemainingDelegateMessages(m_documentLoader.get(), identifier, resource->response(), resource->encodedSize(), 0, error);
 }
 
 void FrameLoader::applyUserAgent(ResourceRequest& request)
index f4513bb6c090cfd83c6242323261bb6f71276d9a..ac46a9447fe5c3628f47352e8c2cca22bde83a48 100644 (file)
@@ -79,7 +79,7 @@ void ResourceLoadNotifier::didReceiveData(ResourceLoader* loader, const char* da
     if (Page* page = m_frame->page())
         page->progress()->incrementProgress(loader->identifier(), data, dataLength);
 
-    dispatchDidReceiveData(loader->documentLoader(), loader->identifier(), data, dataLength, encodedDataLength);
+    dispatchDidReceiveContentLength(loader->documentLoader(), loader->identifier(), dataLength, encodedDataLength);
 }
 
 void ResourceLoadNotifier::didFinishLoad(ResourceLoader* loader, double finishTime)
@@ -130,11 +130,11 @@ void ResourceLoadNotifier::dispatchDidReceiveResponse(DocumentLoader* loader, un
     InspectorInstrumentation::didReceiveResourceResponse(cookie, identifier, loader, r);
 }
 
-void ResourceLoadNotifier::dispatchDidReceiveData(DocumentLoader* loader, unsigned long identifier, const char* data, int dataLength, int encodedDataLength)
+void ResourceLoadNotifier::dispatchDidReceiveContentLength(DocumentLoader* loader, unsigned long identifier, int dataLength, int encodedDataLength)
 {
     m_frame->loader()->client()->dispatchDidReceiveContentLength(loader, identifier, dataLength);
 
-    InspectorInstrumentation::didReceiveData(m_frame, identifier, data, dataLength, encodedDataLength);
+    InspectorInstrumentation::didReceiveContentLength(m_frame, identifier, dataLength, encodedDataLength);
 }
 
 void ResourceLoadNotifier::dispatchDidFinishLoading(DocumentLoader* loader, unsigned long identifier, double finishTime)
@@ -152,13 +152,13 @@ void ResourceLoadNotifier::dispatchTransferLoadingResourceFromPage(unsigned long
     oldPage->progress()->completeProgress(identifier);
 }
 
-void ResourceLoadNotifier::sendRemainingDelegateMessages(DocumentLoader* loader, unsigned long identifier, const ResourceResponse& response, const char* data, int dataLength, int encodedDataLength, const ResourceError& error)
+void ResourceLoadNotifier::sendRemainingDelegateMessages(DocumentLoader* loader, unsigned long identifier, const ResourceResponse& response, int dataLength, int encodedDataLength, const ResourceError& error)
 {
     if (!response.isNull())
         dispatchDidReceiveResponse(loader, identifier, response);
 
     if (dataLength > 0)
-        dispatchDidReceiveData(loader, identifier, data, dataLength, encodedDataLength);
+        dispatchDidReceiveContentLength(loader, identifier, dataLength, encodedDataLength);
 
     if (error.isNull())
         dispatchDidFinishLoading(loader, identifier, 0);
index 6a9296c312b58d2df77dea55bf6b1ba64bcadce4..dafd6194ccec83245e28a2cb8abb896a252bc035 100644 (file)
@@ -60,11 +60,11 @@ public:
     void assignIdentifierToInitialRequest(unsigned long identifier, DocumentLoader*, const ResourceRequest&);
     void dispatchWillSendRequest(DocumentLoader*, unsigned long identifier, ResourceRequest&, const ResourceResponse& redirectResponse);
     void dispatchDidReceiveResponse(DocumentLoader*, unsigned long identifier, const ResourceResponse&);
-    void dispatchDidReceiveData(DocumentLoader*, unsigned long identifier, const char* data, int dataLength, int encodedDataLength);
+    void dispatchDidReceiveContentLength(DocumentLoader*, unsigned long identifier, int dataLength, int encodedDataLength);
     void dispatchDidFinishLoading(DocumentLoader*, unsigned long identifier, double finishTime);
     void dispatchTransferLoadingResourceFromPage(unsigned long, DocumentLoader*, const ResourceRequest&, Page*);
 
-    void sendRemainingDelegateMessages(DocumentLoader*, unsigned long identifier, const ResourceResponse&, const char* data, int dataLength, int encodedDataLength, const ResourceError&);
+    void sendRemainingDelegateMessages(DocumentLoader*, unsigned long identifier, const ResourceResponse&, int dataLength, int encodedDataLength, const ResourceError&);
 
 private:
     Frame* m_frame;
index 64f7b685dd9c8fd762720cc2e7a2d65c9343f597..45b184cff997022a0a72e47fdb38d89ea9923442 100644 (file)
@@ -571,7 +571,7 @@ void ApplicationCacheGroup::didReceiveData(ResourceHandle* handle, const char* d
     UNUSED_PARAM(encodedDataLength);
 
 #if ENABLE(INSPECTOR)
-    InspectorInstrumentation::didReceiveData(m_frame, m_currentResourceIdentifier, 0, length, 0);
+    InspectorInstrumentation::didReceiveContentLength(m_frame, m_currentResourceIdentifier, length, 0);
 #endif
 
     if (handle == m_manifestHandle) {
index fb95e1b96e83ab3f5f165d0a1f69bc4fcf3d80a7..86cdcbeb90f0f2c36eb9c4d5edbf4bf32c9c8a1f 100644 (file)
@@ -30,8 +30,6 @@
 #include "Document.h"
 #include "Element.h"
 #include "ExceptionCode.h"
-#include "InspectorController.h"
-#include "Page.h"
 #include "RenderTreeAsText.h"
 #include "ShadowContentElement.h"
 #include "ShadowRoot.h"
@@ -125,15 +123,4 @@ String Internals::shadowPseudoId(Element* element, ExceptionCode& ec)
     return element->shadowPseudoId().string();
 }
 
-#if ENABLE(INSPECTOR)
-void Internals::setInspectorResourcesDataSizeLimits(Document* document, int maximumResourcesContentSize, int maximumSingleResourceContentSize, ExceptionCode& ec)
-{
-    if (!document || !document->page() || !document->page()->inspectorController()) {
-        ec = INVALID_ACCESS_ERR;
-        return;
-    }
-    document->page()->inspectorController()->setResourcesDataSizeLimitsFromInternals(maximumResourcesContentSize, maximumSingleResourceContentSize);
-}
-#endif
-
 }
index 150ab8ec4bf0891701be1d38e1d2bbb124213b55..e677e32f089dcca718b242bab70581d00f566be4 100644 (file)
@@ -53,10 +53,6 @@ public:
     String shadowPseudoId(Element*, ExceptionCode&);
     PassRefPtr<Element> createShadowContentElement(Document*, ExceptionCode&);
 
-#if ENABLE(INSPECTOR)
-    void setInspectorResourcesDataSizeLimits(Document*, int maximumResourcesContentSize, int maximumSingleResourceContentSize, ExceptionCode&);
-#endif
-
 private:
     Internals();
 };
index 6aba8039f8b1559acec971fffb8ce452d5386bb7..b82871e5242f4f4bc9ee7584dd5979d7e0da2346 100644 (file)
@@ -35,8 +35,6 @@ module window {
         void removeShadowRoot(in Element host) raises (DOMException);
         DOMString shadowPseudoId(in Element element) raises (DOMException);
         Element createShadowContentElement(in Document document) raises(DOMException);
-
-        void setInspectorResourcesDataSizeLimits(in Document document, in long maximumResourcesContentSize, in long maximumSingleResourceContentSize) raises(DOMException);
     };
 }
 
index 1eb11e21058045c9b2fd2334a1ea72051d312808..a30d21943111cd1e3ba8a5924f65ee695f8151c8 100644 (file)
@@ -1,3 +1,15 @@
+2011-07-04  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r90373.
+        http://trac.webkit.org/changeset/90373
+        https://bugs.webkit.org/show_bug.cgi?id=63917
+
+        Breaks Qt Linux Release minimal (Requested by vsevik on
+        #webkit).
+
+        * win/WebKit2.def:
+        * win/WebKit2CFLite.def:
+
 2011-07-04  Vsevolod Vlasov  <vsevik@chromium.org>
 
         Web Inspector: Show content for plugin requests in network panel.
index 1967fb0db3d53df0aa3db00dfaf3843f1d815ee9..668755d13d3fb282d23fc2ca4571fafec71e507f 100644 (file)
@@ -144,10 +144,8 @@ EXPORTS
         ?getCachedDOMStructure@WebCore@@YAPAVStructure@JSC@@PAVJSDOMGlobalObject@1@PBUClassInfo@3@@Z
         ?isPreloaded@CachedResourceLoader@WebCore@@QBE_NABVString@WTF@@@Z
         ?jsStringSlowCase@WebCore@@YA?AVJSValue@JSC@@PAVExecState@3@AAV?$HashMap@PAVStringImpl@WTF@@V?$Weak@VJSString@JSC@@@JSC@@UStringHash@2@U?$HashTraits@PAVStringImpl@WTF@@@2@U?$HashTraits@V?$Weak@VJSString@JSC@@@JSC@@@2@@WTF@@PAVStringImpl@6@@Z
-        ?page@Document@WebCore@@QBEPAVPage@2@XZ
         ?removeShadowRoot@Element@WebCore@@QAEXXZ
         ?setDOMException@WebCore@@YAXPAVExecState@JSC@@H@Z
-        ?setResourcesDataSizeLimitsFromInternals@InspectorController@WebCore@@QAEXHH@Z
         ?shadowRoot@Element@WebCore@@QBEPAVShadowRoot@2@XZ
         ?toDocument@WebCore@@YAPAVDocument@1@VJSValue@JSC@@@Z
         ?toElement@WebCore@@YAPAVElement@1@VJSValue@JSC@@@Z
index a1876dd77cb744f4803817219fe75cb9fbd5143d..1871ce72f32f1935422d58496a0b28425bd1b1f0 100644 (file)
@@ -137,10 +137,8 @@ EXPORTS
         ?getCachedDOMStructure@WebCore@@YAPAVStructure@JSC@@PAVJSDOMGlobalObject@1@PBUClassInfo@3@@Z
         ?isPreloaded@CachedResourceLoader@WebCore@@QBE_NABVString@WTF@@@Z
         ?jsStringSlowCase@WebCore@@YA?AVJSValue@JSC@@PAVExecState@3@AAV?$HashMap@PAVStringImpl@WTF@@V?$Weak@VJSString@JSC@@@JSC@@UStringHash@2@U?$HashTraits@PAVStringImpl@WTF@@@2@U?$HashTraits@V?$Weak@VJSString@JSC@@@JSC@@@2@@WTF@@PAVStringImpl@6@@Z
-        ?page@Document@WebCore@@QBEPAVPage@2@XZ
         ?removeShadowRoot@Element@WebCore@@QAEXXZ
         ?setDOMException@WebCore@@YAXPAVExecState@JSC@@H@Z
-        ?setResourcesDataSizeLimitsFromInternals@InspectorController@WebCore@@QAEXHH@Z
         ?shadowRoot@Element@WebCore@@QBEPAVShadowRoot@2@XZ
         ?toDocument@WebCore@@YAPAVDocument@1@VJSValue@JSC@@@Z
         ?toElement@WebCore@@YAPAVElement@1@VJSValue@JSC@@@Z
index bc920a9723d163d5400273a8d9be95cb2e7a4fbc..16842deea85bc4f9755e4a1841433147416f0876 100644 (file)
@@ -36,7 +36,6 @@ _ZN7WebCore13createWrapperEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_4NodeE;
 _ZN7WebCore15setDOMExceptionEPN3JSC9ExecStateEi;
 _ZN7WebCore16jsStringSlowCaseEPN3JSC9ExecStateERN3WTF7HashMapIPNS3_10StringImplENS0_4WeakINS0_8JSStringEEENS3_10StringHashENS3_10HashTraitsIS6_EENSB_IS9_EEEES6_;
 _ZN7WebCore17cacheDOMStructureEPNS_17JSDOMGlobalObjectEPN3JSC9StructureEPKNS2_9ClassInfoE;
-_ZN7WebCore19InspectorController39setResourcesDataSizeLimitsFromInternalsEii;
 _ZN7WebCore20ShadowContentElement6createEPNS_8DocumentE;
 _ZN7WebCore21getCachedDOMStructureEPNS_17JSDOMGlobalObjectEPKN3JSC9ClassInfoE;
 _ZN7WebCore22externalRepresentationEPNS_7ElementEj;
@@ -51,7 +50,6 @@ _ZN7WebCore9toElementEN3JSC7JSValueE;
 _ZNK7WebCore20CachedResourceLoader11isPreloadedERKN3WTF6StringE;
 _ZNK7WebCore6JSNode21pushEventHandlerScopeEPN3JSC9ExecStateEPNS1_14ScopeChainNodeE;
 _ZNK7WebCore7Element10shadowRootEv;
-_ZNK7WebCore8Document4pageEv;
 local:
 _Z*;
 cti*;