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

Side by Side Diff: Source/core/platform/network/ResourceRequest.cpp

Issue 13973026: remove memoryinstrumentation Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: remove the rest part of MemoryInstrumentation 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) 2003, 2006 Apple Computer, Inc. All rights reserved. 2 * Copyright (C) 2003, 2006 Apple Computer, Inc. All rights reserved.
3 * Copyright (C) 2009, 2012 Google Inc. All rights reserved. 3 * Copyright (C) 2009, 2012 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the 11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution. 12 * documentation and/or other materials provided with the distribution.
13 * 13 *
14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */ 25 */
26 26
27 #include "config.h" 27 #include "config.h"
28 #include "ResourceRequest.h" 28 #include "ResourceRequest.h"
29 29
30 #include "PlatformMemoryInstrumentation.h"
31 #include "ResourceRequest.h" 30 #include "ResourceRequest.h"
32 #include <wtf/MemoryInstrumentationHashMap.h>
33 #include <wtf/MemoryInstrumentationVector.h>
34 31
35 namespace WebCore { 32 namespace WebCore {
36 33
37 double ResourceRequest::s_defaultTimeoutInterval = INT_MAX; 34 double ResourceRequest::s_defaultTimeoutInterval = INT_MAX;
38 35
39 PassOwnPtr<ResourceRequest> ResourceRequest::adopt(PassOwnPtr<CrossThreadResourc eRequestData> data) 36 PassOwnPtr<ResourceRequest> ResourceRequest::adopt(PassOwnPtr<CrossThreadResourc eRequestData> data)
40 { 37 {
41 OwnPtr<ResourceRequest> request = adoptPtr(new ResourceRequest()); 38 OwnPtr<ResourceRequest> request = adoptPtr(new ResourceRequest());
42 request->setURL(data->m_url); 39 request->setURL(data->m_url);
43 request->setCachePolicy(data->m_cachePolicy); 40 request->setCachePolicy(data->m_cachePolicy);
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
300 297
301 bool ResourceRequest::isConditional() const 298 bool ResourceRequest::isConditional() const
302 { 299 {
303 return (m_httpHeaderFields.contains("If-Match") || 300 return (m_httpHeaderFields.contains("If-Match") ||
304 m_httpHeaderFields.contains("If-Modified-Since") || 301 m_httpHeaderFields.contains("If-Modified-Since") ||
305 m_httpHeaderFields.contains("If-None-Match") || 302 m_httpHeaderFields.contains("If-None-Match") ||
306 m_httpHeaderFields.contains("If-Range") || 303 m_httpHeaderFields.contains("If-Range") ||
307 m_httpHeaderFields.contains("If-Unmodified-Since")); 304 m_httpHeaderFields.contains("If-Unmodified-Since"));
308 } 305 }
309 306
310 void ResourceRequest::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) cons t
311 {
312 MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Loader);
313 info.addMember(m_url, "url");
314 info.addMember(m_firstPartyForCookies, "firstPartyForCookies");
315 info.addMember(m_httpMethod, "httpMethod");
316 info.addMember(m_httpHeaderFields, "httpHeaderFields");
317 info.addMember(m_httpBody, "httpBody");
318 info.addMember(m_extraData, "extraData");
319 }
320
321 double ResourceRequest::defaultTimeoutInterval() 307 double ResourceRequest::defaultTimeoutInterval()
322 { 308 {
323 return s_defaultTimeoutInterval; 309 return s_defaultTimeoutInterval;
324 } 310 }
325 311
326 void ResourceRequest::setDefaultTimeoutInterval(double timeoutInterval) 312 void ResourceRequest::setDefaultTimeoutInterval(double timeoutInterval)
327 { 313 {
328 s_defaultTimeoutInterval = timeoutInterval; 314 s_defaultTimeoutInterval = timeoutInterval;
329 } 315 }
330 316
(...skipping 19 matching lines...) Expand all
350 // This is used by the loader to control the number of issued parallel load requ ests. 336 // This is used by the loader to control the number of issued parallel load requ ests.
351 unsigned initializeMaximumHTTPConnectionCountPerHost() 337 unsigned initializeMaximumHTTPConnectionCountPerHost()
352 { 338 {
353 // The chromium network stack already handles limiting the number of 339 // The chromium network stack already handles limiting the number of
354 // parallel requests per host, so there's no need to do it here. Therefore, 340 // parallel requests per host, so there's no need to do it here. Therefore,
355 // this is set to a high value that should never be hit in practice. 341 // this is set to a high value that should never be hit in practice.
356 return 10000; 342 return 10000;
357 } 343 }
358 344
359 } 345 }
OLDNEW
« no previous file with comments | « Source/core/platform/network/ResourceRequest.h ('k') | Source/core/platform/network/ResourceResponse.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698