Changeset 51421 in webkit
- Timestamp:
- Nov 26, 2009 12:59:33 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r51420 r51421 1 2009-11-26 Yury Semikhatsky <yurys@chromium.org> 2 3 Reviewed by Pavel Feldman. 4 5 This is a WebCore part of the fix that allows to view plugin 6 resources loaded by plugins. 7 8 https://bugs.webkit.org/show_bug.cgi?id=31832 9 10 * inspector/InspectorController.cpp: 11 (WebCore::InspectorController::willSendRequest): 12 (WebCore::InspectorController::didReceiveResponse): 13 (WebCore::InspectorController::didReceiveContentLength): 14 (WebCore::InspectorController::didFinishLoading): 15 (WebCore::InspectorController::didFailLoading): 16 * inspector/InspectorController.h: Remove unused DocumentLoader parameters from inspector methods. 17 * inspector/InspectorResource.cpp: 18 (WebCore::InspectorResource::addLength): Update loading end time when new data are received. 19 * loader/ResourceLoadNotifier.cpp: 20 (WebCore::ResourceLoadNotifier::didFailToLoad): Notify InspectorController about the failure. 21 (WebCore::ResourceLoadNotifier::dispatchWillSendRequest): 22 (WebCore::ResourceLoadNotifier::dispatchDidReceiveResponse): 23 (WebCore::ResourceLoadNotifier::dispatchDidReceiveContentLength): 24 (WebCore::ResourceLoadNotifier::dispatchDidFinishLoading): 25 1 26 2009-11-26 Daniel Bates <dbates@webkit.org> 2 27 -
trunk/WebCore/inspector/InspectorController.cpp
r51340 r51421 940 940 } 941 941 942 void InspectorController::willSendRequest(DocumentLoader* loader, unsigned long identifier, ResourceRequest& request, const ResourceResponse& redirectResponse) 943 { 942 void InspectorController::willSendRequest(unsigned long identifier, const ResourceRequest& request, const ResourceResponse& redirectResponse) 943 { 944 bool isMainResource = (m_mainResource && m_mainResource->identifier() == identifier); 944 945 if (m_timelineAgent) 945 m_timelineAgent->willSendResourceRequest(identifier, isMainResource Loader(loader, request.url()), request);946 m_timelineAgent->willSendResourceRequest(identifier, isMainResource, request); 946 947 947 948 RefPtr<InspectorResource> resource = getTrackedResource(identifier); … … 960 961 } 961 962 962 void InspectorController::didReceiveResponse( DocumentLoader*,unsigned long identifier, const ResourceResponse& response)963 void InspectorController::didReceiveResponse(unsigned long identifier, const ResourceResponse& response) 963 964 { 964 965 if (m_timelineAgent) … … 976 977 } 977 978 978 void InspectorController::didReceiveContentLength( DocumentLoader*,unsigned long identifier, int lengthReceived)979 void InspectorController::didReceiveContentLength(unsigned long identifier, int lengthReceived) 979 980 { 980 981 RefPtr<InspectorResource> resource = getTrackedResource(identifier); … … 988 989 } 989 990 990 void InspectorController::didFinishLoading( DocumentLoader*,unsigned long identifier)991 void InspectorController::didFinishLoading(unsigned long identifier) 991 992 { 992 993 if (m_timelineAgent) … … 1007 1008 } 1008 1009 1009 void InspectorController::didFailLoading( DocumentLoader*,unsigned long identifier, const ResourceError& /*error*/)1010 void InspectorController::didFailLoading(unsigned long identifier, const ResourceError& /*error*/) 1010 1011 { 1011 1012 if (m_timelineAgent) -
trunk/WebCore/inspector/InspectorController.h
r50625 r51421 217 217 218 218 void identifierForInitialRequest(unsigned long identifier, DocumentLoader*, const ResourceRequest&); 219 void willSendRequest( DocumentLoader*, unsigned long identifier,ResourceRequest&, const ResourceResponse& redirectResponse);220 void didReceiveResponse( DocumentLoader*,unsigned long identifier, const ResourceResponse&);221 void didReceiveContentLength( DocumentLoader*,unsigned long identifier, int lengthReceived);222 void didFinishLoading( DocumentLoader*,unsigned long identifier);223 void didFailLoading( DocumentLoader*,unsigned long identifier, const ResourceError&);219 void willSendRequest(unsigned long identifier, const ResourceRequest&, const ResourceResponse& redirectResponse); 220 void didReceiveResponse(unsigned long identifier, const ResourceResponse&); 221 void didReceiveContentLength(unsigned long identifier, int lengthReceived); 222 void didFinishLoading(unsigned long identifier); 223 void didFailLoading(unsigned long identifier, const ResourceError&); 224 224 void resourceRetrievedByXMLHttpRequest(unsigned long identifier, const ScriptString& sourceString); 225 225 void scriptImported(unsigned long identifier, const String& sourceString); -
trunk/WebCore/inspector/InspectorResource.cpp
r51385 r51421 382 382 m_length += lengthReceived; 383 383 m_changes.set(LengthChange); 384 385 // Update load time, otherwise the resource will 386 // have start time == end time and 0 load duration 387 // until its loading is completed. 388 m_endTime = currentTime(); 389 m_changes.set(TimingChange); 384 390 } 385 391 -
trunk/WebCore/loader/ResourceLoadNotifier.cpp
r49829 r51421 97 97 if (!error.isNull()) 98 98 m_frame->loader()->client()->dispatchDidFailLoading(loader->documentLoader(), loader->identifier(), error); 99 100 #if ENABLE(INSPECTOR) 101 if (Page* page = m_frame->page()) 102 page->inspectorController()->didFailLoading(loader->identifier(), error); 103 #endif 99 104 } 100 105 … … 127 132 #if ENABLE(INSPECTOR) 128 133 if (Page* page = m_frame->page()) 129 page->inspectorController()->willSendRequest( loader,identifier, request, redirectResponse);134 page->inspectorController()->willSendRequest(identifier, request, redirectResponse); 130 135 #endif 131 136 } … … 137 142 #if ENABLE(INSPECTOR) 138 143 if (Page* page = m_frame->page()) 139 page->inspectorController()->didReceiveResponse( loader,identifier, r);144 page->inspectorController()->didReceiveResponse(identifier, r); 140 145 #endif 141 146 } … … 147 152 #if ENABLE(INSPECTOR) 148 153 if (Page* page = m_frame->page()) 149 page->inspectorController()->didReceiveContentLength( loader,identifier, length);154 page->inspectorController()->didReceiveContentLength(identifier, length); 150 155 #endif 151 156 } … … 157 162 #if ENABLE(INSPECTOR) 158 163 if (Page* page = m_frame->page()) 159 page->inspectorController()->didFinishLoading( loader,identifier);164 page->inspectorController()->didFinishLoading(identifier); 160 165 #endif 161 166 } -
trunk/WebKit/chromium/ChangeLog
r51402 r51421 1 2009-11-26 Yury Semikhatsky <yurys@chromium.org> 2 3 Reviewed by Pavel Feldman. 4 5 WebCore part of the fix that allows to view plugin 6 resources loaded by plugins. Methods that for resource 7 loading notifications are exposed through WebDevToolsAgent 8 interface to the glue code to allow Chromium's plugin 9 implementation to notify InspectorController about resource 10 loading in plugins. 11 12 https://bugs.webkit.org/show_bug.cgi?id=31832 13 14 * public/WebDevToolsAgent.h: 15 * public/WebView.h: 16 * src/WebViewImpl.cpp: 17 (WebKit::WebViewImpl::createUniqueIdentifierForRequest): 18 * src/WebViewImpl.h: 19 1 20 2009-11-25 Dimitri Glazkov <dglazkov@chromium.org> 2 21 -
trunk/WebKit/chromium/public/WebDevToolsAgent.h
r50683 r51421 36 36 namespace WebKit { 37 37 class WebDevToolsAgentClient; 38 class WebFrame; 38 39 class WebString; 40 class WebURLRequest; 41 class WebURLResponse; 39 42 class WebView; 40 43 struct WebPoint; 44 struct WebURLError; 41 45 42 46 class WebDevToolsAgent { … … 71 75 // while on a breakpoint. 72 76 WEBKIT_API static void setMessageLoopDispatchHandler(MessageLoopDispatchHandler); 77 78 virtual void identifierForInitialRequest(unsigned long resourceId, WebFrame*, const WebURLRequest&) = 0; 79 virtual void willSendRequest(unsigned long resourceId, const WebURLRequest&) = 0; 80 virtual void didReceiveData(unsigned long resourceId, int length) = 0; 81 virtual void didReceiveResponse(unsigned long resourceId, const WebURLResponse&) = 0; 82 virtual void didFinishLoading(unsigned long resourceId) = 0; 83 virtual void didFailLoading(unsigned long resourceId, const WebURLError&) = 0; 73 84 }; 74 85 -
trunk/WebKit/chromium/public/WebView.h
r50814 r51421 192 192 193 193 194 // Support for resource loading initiated by plugins ------------------- 195 196 // Returns next unused request identifier which is unique within the 197 // parent Page. 198 virtual unsigned long createUniqueIdentifierForRequest() = 0; 199 200 194 201 // Developer tools ----------------------------------------------------- 195 202 -
trunk/WebKit/chromium/src/WebViewImpl.cpp
r51142 r51421 71 71 #include "PopupMenuChromium.h" 72 72 #include "PopupMenuClient.h" 73 #include "ProgressTracker.h" 73 74 #include "RenderView.h" 74 75 #include "ResourceHandle.h" … … 1476 1477 } 1477 1478 1479 unsigned long WebViewImpl::createUniqueIdentifierForRequest() { 1480 if (m_page) 1481 return m_page->progress()->createUniqueIdentifier(); 1482 return 0; 1483 } 1484 1478 1485 void WebViewImpl::inspectElementAt(const WebPoint& point) 1479 1486 { -
trunk/WebKit/chromium/src/WebViewImpl.h
r50814 r51421 144 144 virtual int dragIdentity(); 145 145 virtual bool setDropEffect(bool accept); 146 virtual unsigned long createUniqueIdentifierForRequest(); 146 147 virtual void inspectElementAt(const WebPoint& point); 147 148 virtual WebString inspectorSettings() const;
Note: See TracChangeset
for help on using the changeset viewer.