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

Side by Side Diff: Source/core/inspector/NetworkResourcesData.cpp

Issue 800113002: Use C++11 range-based for loop in Source/core/inspector (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebase again and again! Created 6 years 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 10 *
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 if (!resourceData) 273 if (!resourceData)
274 return 0; 274 return 0;
275 return resourceData->xhrReplayData(); 275 return resourceData->xhrReplayData();
276 } 276 }
277 277
278 void NetworkResourcesData::setXHRReplayData(const String& requestId, XHRReplayDa ta* xhrReplayData) 278 void NetworkResourcesData::setXHRReplayData(const String& requestId, XHRReplayDa ta* xhrReplayData)
279 { 279 {
280 ResourceData* resourceData = resourceDataForRequestId(requestId); 280 ResourceData* resourceData = resourceDataForRequestId(requestId);
281 if (!resourceData) { 281 if (!resourceData) {
282 Vector<String> result; 282 Vector<String> result;
283 ReusedRequestIds::iterator it; 283 for (auto& request : m_reusedXHRReplayDataRequestIds) {
284 ReusedRequestIds::iterator end = m_reusedXHRReplayDataRequestIds.end(); 284 if (request.value == requestId)
285 for (it = m_reusedXHRReplayDataRequestIds.begin(); it != end; ++it) { 285 setXHRReplayData(request.key, xhrReplayData);
286 if (it->value == requestId)
287 setXHRReplayData(it->key, xhrReplayData);
288 } 286 }
289 return; 287 return;
290 } 288 }
291 289
292 resourceData->setXHRReplayData(xhrReplayData); 290 resourceData->setXHRReplayData(xhrReplayData);
293 } 291 }
294 292
295 Vector<NetworkResourcesData::ResourceData*> NetworkResourcesData::resources() 293 Vector<NetworkResourcesData::ResourceData*> NetworkResourcesData::resources()
296 { 294 {
297 Vector<ResourceData*> result; 295 Vector<ResourceData*> result;
298 for (ResourceDataMap::iterator it = m_requestIdToResourceDataMap.begin(); it != m_requestIdToResourceDataMap.end(); ++it) 296 for (auto& request : m_requestIdToResourceDataMap)
299 result.append(it->value); 297 result.append(request.value);
300 return result; 298 return result;
301 } 299 }
302 300
303 Vector<String> NetworkResourcesData::removeResource(Resource* cachedResource) 301 Vector<String> NetworkResourcesData::removeResource(Resource* cachedResource)
304 { 302 {
305 Vector<String> result; 303 Vector<String> result;
306 ResourceDataMap::iterator it; 304 for (auto& request : m_requestIdToResourceDataMap) {
307 ResourceDataMap::iterator end = m_requestIdToResourceDataMap.end(); 305 ResourceData* resourceData = request.value;
308 for (it = m_requestIdToResourceDataMap.begin(); it != end; ++it) {
309 ResourceData* resourceData = it->value;
310 if (resourceData->cachedResource() == cachedResource) { 306 if (resourceData->cachedResource() == cachedResource) {
311 resourceData->setResource(0); 307 resourceData->setResource(0);
312 result.append(it->key); 308 result.append(request.key);
313 } 309 }
314 } 310 }
315 311
316 return result; 312 return result;
317 } 313 }
318 314
319 void NetworkResourcesData::clear(const String& preservedLoaderId) 315 void NetworkResourcesData::clear(const String& preservedLoaderId)
320 { 316 {
321 m_requestIdsDeque.clear(); 317 m_requestIdsDeque.clear();
322 m_contentSize = 0; 318 m_contentSize = 0;
323 319
324 ResourceDataMap preservedMap; 320 ResourceDataMap preservedMap;
325 321
326 ResourceDataMap::iterator it; 322 for (auto& resource : m_requestIdToResourceDataMap) {
327 ResourceDataMap::iterator end = m_requestIdToResourceDataMap.end(); 323 ResourceData* resourceData = resource.value;
328 for (it = m_requestIdToResourceDataMap.begin(); it != end; ++it) {
329 ResourceData* resourceData = it->value;
330 if (!preservedLoaderId.isNull() && resourceData->loaderId() == preserved LoaderId) 324 if (!preservedLoaderId.isNull() && resourceData->loaderId() == preserved LoaderId)
331 preservedMap.set(it->key, it->value); 325 preservedMap.set(resource.key, resource.value);
332 else 326 else
333 delete resourceData; 327 delete resourceData;
334 } 328 }
335 m_requestIdToResourceDataMap.swap(preservedMap); 329 m_requestIdToResourceDataMap.swap(preservedMap);
336 330
337 m_reusedXHRReplayDataRequestIds.clear(); 331 m_reusedXHRReplayDataRequestIds.clear();
338 } 332 }
339 333
340 void NetworkResourcesData::setResourcesDataSizeLimits(size_t maximumResourcesCon tentSize, size_t maximumSingleResourceContentSize) 334 void NetworkResourcesData::setResourcesDataSizeLimits(size_t maximumResourcesCon tentSize, size_t maximumSingleResourceContentSize)
341 { 335 {
(...skipping 29 matching lines...) Expand all
371 String requestId = m_requestIdsDeque.takeFirst(); 365 String requestId = m_requestIdsDeque.takeFirst();
372 ResourceData* resourceData = resourceDataForRequestId(requestId); 366 ResourceData* resourceData = resourceDataForRequestId(requestId);
373 if (resourceData) 367 if (resourceData)
374 m_contentSize -= resourceData->evictContent(); 368 m_contentSize -= resourceData->evictContent();
375 } 369 }
376 return true; 370 return true;
377 } 371 }
378 372
379 } // namespace blink 373 } // namespace blink
380 374
OLDNEW
« no previous file with comments | « Source/core/inspector/InspectorWorkerAgent.cpp ('k') | Source/core/inspector/PromiseTracker.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698