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

Side by Side Diff: Source/WebCore/loader/cache/CachedResource.cpp

Issue 13866038: Revert 148069 and 148060 to see if they were responsible for a perf regression (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 8 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
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) 2006 Samuel Weinig (sam.weinig@gmail.com) 5 Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
6 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 6 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
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 25 matching lines...) Expand all
36 #include "FrameLoader.h" 36 #include "FrameLoader.h"
37 #include "FrameLoaderClient.h" 37 #include "FrameLoaderClient.h"
38 #include "InspectorInstrumentation.h" 38 #include "InspectorInstrumentation.h"
39 #include "KURL.h" 39 #include "KURL.h"
40 #include "Logging.h" 40 #include "Logging.h"
41 #include "PurgeableBuffer.h" 41 #include "PurgeableBuffer.h"
42 #include "ResourceBuffer.h" 42 #include "ResourceBuffer.h"
43 #include "ResourceHandle.h" 43 #include "ResourceHandle.h"
44 #include "SecurityOrigin.h" 44 #include "SecurityOrigin.h"
45 #include "SecurityPolicy.h" 45 #include "SecurityPolicy.h"
46 #include "ResourceLoader.h" 46 #include "SubresourceLoader.h"
47 #include "WebCoreMemoryInstrumentation.h" 47 #include "WebCoreMemoryInstrumentation.h"
48 #include <wtf/CurrentTime.h> 48 #include <wtf/CurrentTime.h>
49 #include <wtf/MathExtras.h> 49 #include <wtf/MathExtras.h>
50 #include <wtf/MemoryInstrumentationHashCountedSet.h> 50 #include <wtf/MemoryInstrumentationHashCountedSet.h>
51 #include <wtf/MemoryInstrumentationHashSet.h> 51 #include <wtf/MemoryInstrumentationHashSet.h>
52 #include <wtf/MemoryObjectInfo.h> 52 #include <wtf/MemoryObjectInfo.h>
53 #include <wtf/RefCountedLeakCounter.h> 53 #include <wtf/RefCountedLeakCounter.h>
54 #include <wtf/StdLibExtras.h> 54 #include <wtf/StdLibExtras.h>
55 #include <wtf/text/CString.h> 55 #include <wtf/text/CString.h>
56 #include <wtf/Vector.h> 56 #include <wtf/Vector.h>
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after
331 // FIXME: It's unfortunate that the cache layer and below get to know anythi ng about fragment identifiers. 331 // FIXME: It's unfortunate that the cache layer and below get to know anythi ng about fragment identifiers.
332 // We should look into removing the expectation of that knowledge from the p latform network stacks. 332 // We should look into removing the expectation of that knowledge from the p latform network stacks.
333 ResourceRequest request(m_resourceRequest); 333 ResourceRequest request(m_resourceRequest);
334 if (!m_fragmentIdentifierForRequest.isNull()) { 334 if (!m_fragmentIdentifierForRequest.isNull()) {
335 KURL url = request.url(); 335 KURL url = request.url();
336 url.setFragmentIdentifier(m_fragmentIdentifierForRequest); 336 url.setFragmentIdentifier(m_fragmentIdentifierForRequest);
337 request.setURL(url); 337 request.setURL(url);
338 m_fragmentIdentifierForRequest = String(); 338 m_fragmentIdentifierForRequest = String();
339 } 339 }
340 340
341 m_loader = ResourceLoader::create(cachedResourceLoader->frame(), this, reque st, options); 341 m_loader = SubresourceLoader::create(cachedResourceLoader->frame(), this, re quest, options);
342 342
343 if (!m_loader) { 343 if (!m_loader) {
344 failBeforeStarting(); 344 failBeforeStarting();
345 return; 345 return;
346 } 346 }
347
348 m_loader->start();
347 m_status = Pending; 349 m_status = Pending;
348 } 350 }
349 351
350 void CachedResource::checkNotify() 352 void CachedResource::checkNotify()
351 { 353 {
352 if (isLoading()) 354 if (isLoading())
353 return; 355 return;
354 356
355 CachedResourceClientWalker<CachedResourceClient> w(m_clients); 357 CachedResourceClientWalker<CachedResourceClient> w(m_clients);
356 while (CachedResourceClient* c = w.next()) 358 while (CachedResourceClient* c = w.next())
(...skipping 583 matching lines...) Expand 10 before | Expand all | Expand 10 after
940 info.addMember(m_proxyResource, "proxyResource"); 942 info.addMember(m_proxyResource, "proxyResource");
941 info.addMember(m_handlesToRevalidate, "handlesToRevalidate"); 943 info.addMember(m_handlesToRevalidate, "handlesToRevalidate");
942 info.addMember(m_options, "options"); 944 info.addMember(m_options, "options");
943 info.addMember(m_decodedDataDeletionTimer, "decodedDataDeletionTimer"); 945 info.addMember(m_decodedDataDeletionTimer, "decodedDataDeletionTimer");
944 info.ignoreMember(m_clientsAwaitingCallback); 946 info.ignoreMember(m_clientsAwaitingCallback);
945 947
946 if (m_purgeableData && !m_purgeableData->wasPurged()) 948 if (m_purgeableData && !m_purgeableData->wasPurged())
947 info.addRawBuffer(m_purgeableData.get(), m_purgeableData->size(), "Purge ableData", "purgeableData"); 949 info.addRawBuffer(m_purgeableData.get(), m_purgeableData->size(), "Purge ableData", "purgeableData");
948 } 950 }
949 } 951 }
OLDNEW
« no previous file with comments | « Source/WebCore/loader/cache/CachedResource.h ('k') | Source/WebKit/chromium/src/AssociatedURLLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698