Changeset 52169 in webkit

Timestamp:

Dec 15, 2009 1:44:52 PM (14 years ago)

Author:

pfeldman@chromium.org

Message:

2009-12-15 Pavel Feldman <​pfeldman@chromium.org>

Reviewed by Timothy Hatcher.

Web Inspector: Display request headers for main resource
having redirects.

​https://bugs.webkit.org/show_bug.cgi?id=32577

• inspector/InspectorController.cpp: (WebCore::InspectorController::identifierForInitialRequest): (WebCore::InspectorController::willSendRequest):
• inspector/InspectorResource.cpp: (WebCore::InspectorResource::InspectorResource): (WebCore::InspectorResource::appendRedirect): (WebCore::InspectorResource::createCached): (WebCore::InspectorResource::updateRequest):
• inspector/InspectorResource.h: (WebCore::InspectorResource::create):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InspectorController.cpp (modified) (3 diffs)
• inspector/InspectorResource.cpp (modified) (5 diffs)
• inspector/InspectorResource.h (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-12-15  Pavel Feldman  <pfeldman@chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
+        Web Inspector: Display request headers for main resource
+        having redirects.
+
+        https://bugs.webkit.org/show_bug.cgi?id=32577
+
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::identifierForInitialRequest):
+        (WebCore::InspectorController::willSendRequest):
+        * inspector/InspectorResource.cpp:
+        (WebCore::InspectorResource::InspectorResource):
+        (WebCore::InspectorResource::appendRedirect):
+        (WebCore::InspectorResource::createCached):
+        (WebCore::InspectorResource::updateRequest):
+        * inspector/InspectorResource.h:
+        (WebCore::InspectorResource::create):
+
 2009-12-15  Brian Weinstein  <bweinstein@apple.com>
 

trunk/WebCore/inspector/InspectorController.cpp

@@ -878 +878 @@
         return;
 
-    RefPtr<InspectorResource> resource = InspectorResource::create(identifier, loader);
-
-    resource->updateRequest(request);
+    RefPtr<InspectorResource> resource = InspectorResource::create(identifier, loader, request.url());
 
     if (isMainResource) {
@@ -933 +931 @@
 
     if (!redirectResponse.isNull()) {
+        resource->markResponseReceivedTime();
+        resource->endTiming();
+        resource->updateResponse(redirectResponse);
+
         // We always store last redirect by the original id key. Rest of the redirects are stored within the last one.
         unsigned long id = m_inspectedPage->progress()->createUniqueIdentifier();
-        RefPtr<InspectorResource> withRedirect = resource->appendRedirect(id, request, redirectResponse);
+        RefPtr<InspectorResource> withRedirect = resource->appendRedirect(id, request.url());
         removeResource(resource.get());
         addResource(withRedirect.get());
@@ -946 +948 @@
 
     resource->startTiming();
+    resource->updateRequest(request);
+
     if (resource != m_mainResource && windowVisible())
         resource->updateScriptObject(m_frontend.get());

trunk/WebCore/inspector/InspectorResource.cpp

@@ -47 +47 @@
 namespace WebCore {
 
-InspectorResource::InspectorResource(unsigned long identifier, DocumentLoader* loader)
+InspectorResource::InspectorResource(unsigned long identifier, DocumentLoader* loader, const KURL& requestURL)
     : m_identifier(identifier)
     , m_loader(loader)
     , m_frame(loader->frame())
+    , m_requestURL(requestURL)
     , m_expectedContentLength(0)
     , m_cached(false)
@@ -70 +71 @@
 }
 
-PassRefPtr<InspectorResource> InspectorResource::appendRedirect(unsigned long identifier, const ResourceRequest& request, const ResourceResponse& redirectResponse)
+PassRefPtr<InspectorResource> InspectorResource::appendRedirect(unsigned long identifier, const KURL& redirectURL)
 {
     // Last redirect is always a container of all previous ones. Pass this container here.
-    RefPtr<InspectorResource> redirect = InspectorResource::create(m_identifier, m_loader.get());
+    RefPtr<InspectorResource> redirect = InspectorResource::create(m_identifier, m_loader.get(), redirectURL);
     redirect->m_redirects = m_redirects;
     redirect->m_redirects.append(this);
     redirect->m_changes.set(RedirectsChange);
-    redirect->updateRequest(request);
 
     m_identifier = identifier;
     m_redirects.clear();
-    updateResponse(redirectResponse);
-    markResponseReceivedTime();
-    endTiming();
     return redirect;
 }
@@ -89 +86 @@
 PassRefPtr<InspectorResource> InspectorResource::createCached(unsigned long identifier, DocumentLoader* loader, const CachedResource* cachedResource)
 {
-    PassRefPtr<InspectorResource> resource = create(identifier, loader);
+    PassRefPtr<InspectorResource> resource = create(identifier, loader, KURL(ParsedURLString, cachedResource->url()));
 
     resource->m_finished = true;
 
-    resource->m_requestURL = KURL(ParsedURLString, cachedResource->url());
     resource->updateResponse(cachedResource->response());
 
@@ -110 +106 @@
 {
     m_requestHeaderFields = request.httpHeaderFields();
-    m_requestURL = request.url();
     m_requestMethod = request.httpMethod();
     if (request.httpBody() && !request.httpBody()->isEmpty())
@@ -221 +216 @@
     m_changes.setAll();
 
+    for (size_t i = 0; i < m_redirects.size(); ++i)
+        m_redirects[i]->releaseScriptObject(frontend, callRemoveResource);
+
     if (!callRemoveResource)
         return;
 
     frontend->removeResource(m_identifier);
-
-    for (size_t i = 0; i < m_redirects.size(); ++i)
-        m_redirects[i]->releaseScriptObject(frontend, callRemoveResource);
 }
 

trunk/WebCore/inspector/InspectorResource.h

@@ -69 +69 @@
         };
 
-        static PassRefPtr<InspectorResource> create(unsigned long identifier, DocumentLoader* loader)
+        static PassRefPtr<InspectorResource> create(unsigned long identifier, DocumentLoader* loader, const KURL& requestURL)
         {
-            return adoptRef(new InspectorResource(identifier, loader));
+            return adoptRef(new InspectorResource(identifier, loader, requestURL));
         }
 
@@ -78 +78 @@
         ~InspectorResource();
 
-        PassRefPtr<InspectorResource> appendRedirect(unsigned long identifier, const ResourceRequest&, const ResourceResponse& redirectResponse);
+        PassRefPtr<InspectorResource> appendRedirect(unsigned long identifier, const KURL& redirectURL);
         void updateScriptObject(InspectorFrontend* frontend);
         void releaseScriptObject(InspectorFrontend* frontend, bool callRemoveResource);
@@ -147 +147 @@
         };
 
-        InspectorResource(unsigned long identifier, DocumentLoader*);
+        InspectorResource(unsigned long identifier, DocumentLoader*, const KURL& requestURL);
         Type type() const;