[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[pfeldman at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit 7267ee415e0f2353d328c8867c994ad21d7d5628
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 22 16:21:05 2009 +0000

    2009-12-21  Pavel Feldman  <pfeldman at chromium.org>
    
            Reviewed by Timothy Hatcher.
    
            Web Inspector: Do not lose original request for non-main resource redirects.
    
            https://bugs.webkit.org/show_bug.cgi?id=32678
    
            * inspector/InspectorResource.cpp:
            (WebCore::InspectorResource::appendRedirect):
            * inspector/front-end/Resource.js:
            (WebInspector.Resource):
            * inspector/front-end/inspector.js:
            (WebInspector.updateResource):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52487 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e23ab29..6221b6d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2009-12-21  Pavel Feldman  <pfeldman at chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
+        Web Inspector: Do not lose original request for non-main resource redirects.
+
+        https://bugs.webkit.org/show_bug.cgi?id=32678
+
+        * inspector/InspectorResource.cpp:
+        (WebCore::InspectorResource::appendRedirect):
+        * inspector/front-end/Resource.js:
+        (WebInspector.Resource):
+        * inspector/front-end/inspector.js:
+        (WebInspector.updateResource):
+
 2009-12-21  Kwang Yul Seo  <skyul at company100.net>
 
         Reviewed by Eric Seidel.
diff --git a/WebCore/inspector/InspectorResource.cpp b/WebCore/inspector/InspectorResource.cpp
index 1e4fc92..191d271 100644
--- a/WebCore/inspector/InspectorResource.cpp
+++ b/WebCore/inspector/InspectorResource.cpp
@@ -79,6 +79,8 @@ PassRefPtr<InspectorResource> InspectorResource::appendRedirect(unsigned long id
     redirect->m_changes.set(RedirectsChange);
 
     m_identifier = identifier;
+    // Re-send request info with new id.
+    m_changes.set(RequestChange);
     m_redirects.clear();
     return redirect;
 }
diff --git a/WebCore/inspector/front-end/Resource.js b/WebCore/inspector/front-end/Resource.js
index ce1ef95..d292e19 100644
--- a/WebCore/inspector/front-end/Resource.js
+++ b/WebCore/inspector/front-end/Resource.js
@@ -26,27 +26,17 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-WebInspector.Resource = function(requestHeaders, url, documentURL, domain, path, lastPathComponent, identifier, mainResource, cached, requestMethod, requestFormData)
+WebInspector.Resource = function(identifier, url)
 {
     this.identifier = identifier;
-
-    this.startTime = -1;
-    this.endTime = -1;
-    this.mainResource = mainResource;
-    this.requestHeaders = requestHeaders;
-    this.url = url;
-    this.documentURL = documentURL;
-    this.domain = domain;
-    this.path = path;
-    this.lastPathComponent = lastPathComponent;
-    this.cached = cached;
-    this.requestMethod = requestMethod || "";
-    this.requestFormData = requestFormData || "";
-
-    this.category = WebInspector.resourceCategories.other;
+    this._url = url;
+    this._startTime = -1;
+    this._endTime = -1;
+    this._requestMethod = "";
+    this._requestFormData = "";
+    this._category = WebInspector.resourceCategories.other;
 }
 
-
 WebInspector.Resource.StatusText = {
     100: "Continue",
     101: "Switching Protocols",
diff --git a/WebCore/inspector/front-end/inspector.js b/WebCore/inspector/front-end/inspector.js
index d75affd..fbf4701 100644
--- a/WebCore/inspector/front-end/inspector.js
+++ b/WebCore/inspector/front-end/inspector.js
@@ -971,36 +971,6 @@ WebInspector.showConsolePanel = function()
     this.currentPanel = this.panels.console;
 }
 
-WebInspector._addResource = function(identifier, payload)
-{
-    var resource = new WebInspector.Resource(
-        payload.requestHeaders,
-        payload.url,
-        payload.documentURL,
-        payload.host,
-        payload.path,
-        payload.lastPathComponent,
-        identifier,
-        payload.mainResource,
-        payload.cached,
-        payload.requestMethod,
-        payload.requestFormData);
-    this.resources[identifier] = resource;
-    this.resourceURLMap[resource.url] = resource;
-
-    if (resource.mainResource)
-        this.mainResource = resource;
-
-    if (this.panels.resources)
-        this.panels.resources.addResource(resource);
-
-    var match = payload.documentURL.match(/^(http[s]?|file):\/\/([\/]*[^\/]+)/i);
-    if (match)
-        this.addCookieDomain(match[1].toLowerCase() === "file" ? "" : match[2]);
-
-    return resource;
-}
-
 WebInspector.clearConsoleMessages = function()
 {
     WebInspector.console.clearMessages(false);
@@ -1022,13 +992,14 @@ WebInspector.updateResource = function(identifier, payload)
 {
     var resource = this.resources[identifier];
     if (!resource) {
-        resource = this._addResource(identifier, payload);
-        // Request info is already populated in constructor.
-        payload.didRequestChange = false;
+        resource = new WebInspector.Resource(identifier, payload.url);
+        this.resources[identifier] = resource;
+        this.resourceURLMap[resource.url] = resource;
+        if (this.panels.resources)
+            this.panels.resources.addResource(resource);
     }
 
     if (payload.didRequestChange) {
-        resource.url = payload.url;
         resource.host = payload.domain;
         resource.path = payload.path;
         resource.lastPathComponent = payload.lastPathComponent;
@@ -1036,6 +1007,15 @@ WebInspector.updateResource = function(identifier, payload)
         resource.mainResource = payload.mainResource;
         resource.requestMethod = payload.requestMethod;
         resource.requestFormData = payload.requestFormData;
+        resource.cached = payload.cached;
+        resource.documentURL = payload.documentURL;
+
+        if (resource.mainResource)
+            this.mainResource = resource;
+
+        var match = payload.documentURL.match(/^(http[s]?|file):\/\/([\/]*[^\/]+)/i);
+        if (match)
+            this.addCookieDomain(match[1].toLowerCase() === "file" ? "" : match[2]);
     }
 
     if (payload.didResponseChange) {

-- 
WebKit Debian packaging