Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(348)

Side by Side Diff: Source/core/fetch/ResourceFetcher.cpp

Issue 108103002: DevTools: Remove unneeded willReceiveResourceData instrumentation and reuse didReceiveData instead … (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebaselined Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | Source/core/inspector/InspectorInstrumentation.idl » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de) 2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
3 Copyright (C) 2001 Dirk Mueller (mueller@kde.org) 3 Copyright (C) 2001 Dirk Mueller (mueller@kde.org)
4 Copyright (C) 2002 Waldo Bastian (bastian@kde.org) 4 Copyright (C) 2002 Waldo Bastian (bastian@kde.org)
5 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 5 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
6 Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/ 6 Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/
7 7
8 This library is free software; you can redistribute it and/or 8 This library is free software; you can redistribute it and/or
9 modify it under the terms of the GNU Library General Public 9 modify it under the terms of the GNU Library General Public
10 License as published by the Free Software Foundation; either 10 License as published by the Free Software Foundation; either
(...skipping 1187 matching lines...) Expand 10 before | Expand all | Expand 10 after
1198 context().dispatchWillSendRequest(m_documentLoader, identifier, request, red irectResponse, initiatorInfo); 1198 context().dispatchWillSendRequest(m_documentLoader, identifier, request, red irectResponse, initiatorInfo);
1199 } 1199 }
1200 1200
1201 void ResourceFetcher::didReceiveResponse(const Resource* resource, const Resourc eResponse& response) 1201 void ResourceFetcher::didReceiveResponse(const Resource* resource, const Resourc eResponse& response)
1202 { 1202 {
1203 context().dispatchDidReceiveResponse(m_documentLoader, resource->identifier( ), response, resource->loader()); 1203 context().dispatchDidReceiveResponse(m_documentLoader, resource->identifier( ), response, resource->loader());
1204 } 1204 }
1205 1205
1206 void ResourceFetcher::didReceiveData(const Resource* resource, const char* data, int dataLength, int encodedDataLength) 1206 void ResourceFetcher::didReceiveData(const Resource* resource, const char* data, int dataLength, int encodedDataLength)
1207 { 1207 {
1208 // FIXME: use frame of master document for imported documents.
1209 InspectorInstrumentationCookie cookie = InspectorInstrumentation::willReceiv eResourceData(frame(), resource->identifier(), encodedDataLength);
1210 context().dispatchDidReceiveData(m_documentLoader, resource->identifier(), d ata, dataLength, encodedDataLength); 1208 context().dispatchDidReceiveData(m_documentLoader, resource->identifier(), d ata, dataLength, encodedDataLength);
1211 InspectorInstrumentation::didReceiveResourceData(cookie);
1212 } 1209 }
1213 1210
1214 void ResourceFetcher::didDownloadData(const Resource* resource, int dataLength, int encodedDataLength) 1211 void ResourceFetcher::didDownloadData(const Resource* resource, int dataLength, int encodedDataLength)
1215 { 1212 {
1216 InspectorInstrumentationCookie cookie = InspectorInstrumentation::willReceiv eResourceData(frame(), resource->identifier(), encodedDataLength);
1217 context().dispatchDidDownloadData(m_documentLoader, resource->identifier(), dataLength, encodedDataLength); 1213 context().dispatchDidDownloadData(m_documentLoader, resource->identifier(), dataLength, encodedDataLength);
1218 InspectorInstrumentation::didReceiveResourceData(cookie);
1219 } 1214 }
1220 1215
1221 void ResourceFetcher::subresourceLoaderFinishedLoadingOnePart(ResourceLoader* lo ader) 1216 void ResourceFetcher::subresourceLoaderFinishedLoadingOnePart(ResourceLoader* lo ader)
1222 { 1217 {
1223 if (m_multipartLoaders) 1218 if (m_multipartLoaders)
1224 m_multipartLoaders->add(loader); 1219 m_multipartLoaders->add(loader);
1225 if (m_loaders) 1220 if (m_loaders)
1226 m_loaders->remove(loader); 1221 m_loaders->remove(loader);
1227 if (LocalFrame* frame = this->frame()) 1222 if (LocalFrame* frame = this->frame())
1228 return frame->loader().checkLoadComplete(m_documentLoader); 1223 return frame->loader().checkLoadComplete(m_documentLoader);
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
1400 case Revalidate: 1395 case Revalidate:
1401 ++m_revalidateCount; 1396 ++m_revalidateCount;
1402 return; 1397 return;
1403 case Use: 1398 case Use:
1404 ++m_useCount; 1399 ++m_useCount;
1405 return; 1400 return;
1406 } 1401 }
1407 } 1402 }
1408 1403
1409 } 1404 }
OLDNEW
« no previous file with comments | « no previous file | Source/core/inspector/InspectorInstrumentation.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698