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

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

Issue 221673003: Defer iframe JavaScript URL evaluation (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 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) 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 1081 matching lines...) Expand 10 before | Expand all | Expand 10 after
1092 willSendRequest(identifier, request, ResourceResponse(), resource->options() .initiatorInfo); 1092 willSendRequest(identifier, request, ResourceResponse(), resource->options() .initiatorInfo);
1093 InspectorInstrumentation::markResourceAsCached(frame()->page(), identifier); 1093 InspectorInstrumentation::markResourceAsCached(frame()->page(), identifier);
1094 context().sendRemainingDelegateMessages(m_documentLoader, identifier, resour ce->response(), resource->encodedSize()); 1094 context().sendRemainingDelegateMessages(m_documentLoader, identifier, resour ce->response(), resource->encodedSize());
1095 } 1095 }
1096 1096
1097 void ResourceFetcher::incrementRequestCount(const Resource* res) 1097 void ResourceFetcher::incrementRequestCount(const Resource* res)
1098 { 1098 {
1099 if (res->ignoreForRequestCount()) 1099 if (res->ignoreForRequestCount())
1100 return; 1100 return;
1101 1101
1102 ++m_requestCount; 1102 incrementRequestCount();
1103 } 1103 }
1104 1104
1105 void ResourceFetcher::decrementRequestCount(const Resource* res) 1105 void ResourceFetcher::decrementRequestCount(const Resource* res)
1106 { 1106 {
1107 if (res->ignoreForRequestCount()) 1107 if (res->ignoreForRequestCount())
1108 return; 1108 return;
1109 1109
1110 decrementRequestCount();
1111 }
1112
1113 void ResourceFetcher::incrementRequestCount()
1114 {
1115 ++m_requestCount;
1116 }
1117
1118 void ResourceFetcher::decrementRequestCount()
1119 {
1110 --m_requestCount; 1120 --m_requestCount;
1111 ASSERT(m_requestCount > -1); 1121 ASSERT(m_requestCount > -1);
1112 } 1122 }
1113 1123
1114 void ResourceFetcher::preload(Resource::Type type, FetchRequest& request, const String& charset) 1124 void ResourceFetcher::preload(Resource::Type type, FetchRequest& request, const String& charset)
1115 { 1125 {
1116 requestPreload(type, request, charset); 1126 requestPreload(type, request, charset);
1117 } 1127 }
1118 1128
1119 void ResourceFetcher::requestPreload(Resource::Type type, FetchRequest& request, const String& charset) 1129 void ResourceFetcher::requestPreload(Resource::Type type, FetchRequest& request, const String& charset)
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
1395 case Revalidate: 1405 case Revalidate:
1396 ++m_revalidateCount; 1406 ++m_revalidateCount;
1397 return; 1407 return;
1398 case Use: 1408 case Use:
1399 ++m_useCount; 1409 ++m_useCount;
1400 return; 1410 return;
1401 } 1411 }
1402 } 1412 }
1403 1413
1404 } 1414 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698