Changeset 51422 in webkit

Timestamp:

Nov 26, 2009 1:22:37 PM (14 years ago)

Author:

yurys@chromium.org

Message:

2009-11-26 Yury Semikhatsky <​yurys@chromium.org>

Not reviewed. Build fix: revert r51421.

• inspector/InspectorController.cpp: (WebCore::InspectorController::willSendRequest): (WebCore::InspectorController::didReceiveResponse): (WebCore::InspectorController::didReceiveContentLength): (WebCore::InspectorController::didFinishLoading): (WebCore::InspectorController::didFailLoading):
• inspector/InspectorController.h:
• inspector/InspectorResource.cpp: (WebCore::InspectorResource::addLength):
• loader/ResourceLoadNotifier.cpp: (WebCore::ResourceLoadNotifier::didFailToLoad): (WebCore::ResourceLoadNotifier::dispatchWillSendRequest): (WebCore::ResourceLoadNotifier::dispatchDidReceiveResponse): (WebCore::ResourceLoadNotifier::dispatchDidReceiveContentLength): (WebCore::ResourceLoadNotifier::dispatchDidFinishLoading):

2009-11-26 Yury Semikhatsky <​yurys@chromium.org>

Not reviewed. Build fix: revert r51421.

• public/WebDevToolsAgent.h:
• public/WebView.h:
• src/WebViewImpl.cpp:
• src/WebViewImpl.h:

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/inspector/InspectorController.cpp (modified) (5 diffs)
• WebCore/inspector/InspectorController.h (modified) (1 diff)
• WebCore/inspector/InspectorResource.cpp (modified) (1 diff)
• WebCore/loader/ResourceLoadNotifier.cpp (modified) (5 diffs)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/public/WebDevToolsAgent.h (modified) (2 diffs)
• WebKit/chromium/public/WebView.h (modified) (1 diff)
• WebKit/chromium/src/WebViewImpl.cpp (modified) (2 diffs)
• WebKit/chromium/src/WebViewImpl.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-11-26  Yury Semikhatsky  <yurys@chromium.org>
+
+        Not reviewed. Build fix: revert r51421.
+
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::willSendRequest):
+        (WebCore::InspectorController::didReceiveResponse):
+        (WebCore::InspectorController::didReceiveContentLength):
+        (WebCore::InspectorController::didFinishLoading):
+        (WebCore::InspectorController::didFailLoading):
+        * inspector/InspectorController.h:
+        * inspector/InspectorResource.cpp:
+        (WebCore::InspectorResource::addLength):
+        * loader/ResourceLoadNotifier.cpp:
+        (WebCore::ResourceLoadNotifier::didFailToLoad):
+        (WebCore::ResourceLoadNotifier::dispatchWillSendRequest):
+        (WebCore::ResourceLoadNotifier::dispatchDidReceiveResponse):
+        (WebCore::ResourceLoadNotifier::dispatchDidReceiveContentLength):
+        (WebCore::ResourceLoadNotifier::dispatchDidFinishLoading):
+
 2009-11-26  Yury Semikhatsky  <yurys@chromium.org>
 

trunk/WebCore/inspector/InspectorController.cpp

@@ -940 +940 @@
 }
 
-void InspectorController::willSendRequest(unsigned long identifier, const ResourceRequest& request, const ResourceResponse& redirectResponse)
-{
-    bool isMainResource = (m_mainResource && m_mainResource->identifier() == identifier);
+void InspectorController::willSendRequest(DocumentLoader* loader, unsigned long identifier, ResourceRequest& request, const ResourceResponse& redirectResponse)
+{
     if (m_timelineAgent)
-        m_timelineAgent->willSendResourceRequest(identifier, isMainResource, request);
+        m_timelineAgent->willSendResourceRequest(identifier, isMainResourceLoader(loader, request.url()), request);
 
     RefPtr<InspectorResource> resource = getTrackedResource(identifier);
@@ -961 +960 @@
 }
 
-void InspectorController::didReceiveResponse(unsigned long identifier, const ResourceResponse& response)
+void InspectorController::didReceiveResponse(DocumentLoader*, unsigned long identifier, const ResourceResponse& response)
 {
     if (m_timelineAgent)
@@ -977 +976 @@
 }
 
-void InspectorController::didReceiveContentLength(unsigned long identifier, int lengthReceived)
+void InspectorController::didReceiveContentLength(DocumentLoader*, unsigned long identifier, int lengthReceived)
 {
     RefPtr<InspectorResource> resource = getTrackedResource(identifier);
@@ -989 +988 @@
 }
 
-void InspectorController::didFinishLoading(unsigned long identifier)
+void InspectorController::didFinishLoading(DocumentLoader*, unsigned long identifier)
 {
     if (m_timelineAgent)
@@ -1008 +1007 @@
 }
 
-void InspectorController::didFailLoading(unsigned long identifier, const ResourceError& /*error*/)
+void InspectorController::didFailLoading(DocumentLoader*, unsigned long identifier, const ResourceError& /*error*/)
 {
     if (m_timelineAgent)

trunk/WebCore/inspector/InspectorController.h

@@ -217 +217 @@
 
     void identifierForInitialRequest(unsigned long identifier, DocumentLoader*, const ResourceRequest&);
-    void willSendRequest(unsigned long identifier, const ResourceRequest&, const ResourceResponse& redirectResponse);
-    void didReceiveResponse(unsigned long identifier, const ResourceResponse&);
-    void didReceiveContentLength(unsigned long identifier, int lengthReceived);
-    void didFinishLoading(unsigned long identifier);
-    void didFailLoading(unsigned long identifier, const ResourceError&);
+    void willSendRequest(DocumentLoader*, unsigned long identifier, ResourceRequest&, const ResourceResponse& redirectResponse);
+    void didReceiveResponse(DocumentLoader*, unsigned long identifier, const ResourceResponse&);
+    void didReceiveContentLength(DocumentLoader*, unsigned long identifier, int lengthReceived);
+    void didFinishLoading(DocumentLoader*, unsigned long identifier);
+    void didFailLoading(DocumentLoader*, unsigned long identifier, const ResourceError&);
     void resourceRetrievedByXMLHttpRequest(unsigned long identifier, const ScriptString& sourceString);
     void scriptImported(unsigned long identifier, const String& sourceString);

trunk/WebCore/inspector/InspectorResource.cpp

@@ -382 +382 @@
     m_length += lengthReceived;
     m_changes.set(LengthChange);
-
-    // Update load time, otherwise the resource will
-    // have start time == end time and  0 load duration
-    // until its loading is completed.
-    m_endTime = currentTime();
-    m_changes.set(TimingChange);
 }
 

trunk/WebCore/loader/ResourceLoadNotifier.cpp

@@ -97 +97 @@
     if (!error.isNull())
         m_frame->loader()->client()->dispatchDidFailLoading(loader->documentLoader(), loader->identifier(), error);
-
-#if ENABLE(INSPECTOR)
-    if (Page* page = m_frame->page())
-        page->inspectorController()->didFailLoading(loader->identifier(), error);
-#endif
 }
 
@@ -132 +127 @@
 #if ENABLE(INSPECTOR)
     if (Page* page = m_frame->page())
-        page->inspectorController()->willSendRequest(identifier, request, redirectResponse);
+        page->inspectorController()->willSendRequest(loader, identifier, request, redirectResponse);
 #endif
 }
@@ -142 +137 @@
 #if ENABLE(INSPECTOR)
     if (Page* page = m_frame->page())
-        page->inspectorController()->didReceiveResponse(identifier, r);
+        page->inspectorController()->didReceiveResponse(loader, identifier, r);
 #endif
 }
@@ -152 +147 @@
 #if ENABLE(INSPECTOR)
     if (Page* page = m_frame->page())
-        page->inspectorController()->didReceiveContentLength(identifier, length);
+        page->inspectorController()->didReceiveContentLength(loader, identifier, length);
 #endif
 }
@@ -162 +157 @@
 #if ENABLE(INSPECTOR)
     if (Page* page = m_frame->page())
-        page->inspectorController()->didFinishLoading(identifier);
+        page->inspectorController()->didFinishLoading(loader, identifier);
 #endif
 }

trunk/WebKit/chromium/ChangeLog

@@ -1 +1 @@
 2009-11-26  Yury Semikhatsky  <yurys@chromium.org>
 
-        Reviewed by Pavel Feldman.
-
-        WebCore part of the fix that allows to view plugin
-        resources loaded by plugins. Methods that for resource
-        loading notifications are exposed through WebDevToolsAgent
-        interface to the glue code to allow Chromium's plugin
-        implementation to notify InspectorController about resource
-        loading in plugins.
-
-        https://bugs.webkit.org/show_bug.cgi?id=31832
+        Not reviewed. Build fix: revert r51421.
 
         * public/WebDevToolsAgent.h:
         * public/WebView.h:
         * src/WebViewImpl.cpp:
-        (WebKit::WebViewImpl::createUniqueIdentifierForRequest):
         * src/WebViewImpl.h:
 

trunk/WebKit/chromium/public/WebDevToolsAgent.h

@@ -36 +36 @@
 namespace WebKit {
 class WebDevToolsAgentClient;
-class WebFrame;
 class WebString;
-class WebURLRequest;
-class WebURLResponse;
 class WebView;
 struct WebPoint;
-struct WebURLError;
 
 class WebDevToolsAgent {
@@ -75 +71 @@
     // while on a breakpoint.
     WEBKIT_API static void setMessageLoopDispatchHandler(MessageLoopDispatchHandler);
-
-    virtual void identifierForInitialRequest(unsigned long resourceId, WebFrame*, const WebURLRequest&) = 0;
-    virtual void willSendRequest(unsigned long resourceId, const WebURLRequest&) = 0;
-    virtual void didReceiveData(unsigned long resourceId, int length) = 0;
-    virtual void didReceiveResponse(unsigned long resourceId, const WebURLResponse&) = 0;
-    virtual void didFinishLoading(unsigned long resourceId) = 0;
-    virtual void didFailLoading(unsigned long resourceId, const WebURLError&) = 0;
 };
 

trunk/WebKit/chromium/public/WebView.h

@@ -192 +192 @@
 
 
-    // Support for resource loading initiated by plugins -------------------
-
-    // Returns next unused request identifier which is unique within the
-    // parent Page.
-    virtual unsigned long createUniqueIdentifierForRequest() = 0;
-
-
     // Developer tools -----------------------------------------------------
 

trunk/WebKit/chromium/src/WebViewImpl.cpp

@@ -71 +71 @@
 #include "PopupMenuChromium.h"
 #include "PopupMenuClient.h"
-#include "ProgressTracker.h"
 #include "RenderView.h"
 #include "ResourceHandle.h"
@@ -1477 +1476 @@
 }
 
-unsigned long WebViewImpl::createUniqueIdentifierForRequest() {
-    if (m_page)
-        return m_page->progress()->createUniqueIdentifier();
-    return 0;
-}
-
 void WebViewImpl::inspectElementAt(const WebPoint& point)
 {

trunk/WebKit/chromium/src/WebViewImpl.h

@@ -144 +144 @@
     virtual int dragIdentity();
     virtual bool setDropEffect(bool accept);
-    virtual unsigned long createUniqueIdentifierForRequest();
     virtual void inspectElementAt(const WebPoint& point);
     virtual WebString inspectorSettings() const;