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

Side by Side Diff: third_party/WebKit/Source/core/fetch/ScriptResource.cpp

Issue 2391383002: Moving platform tracing things into platform/tracing. (Closed)
Patch Set: Created 4 years, 2 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
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 Apple Inc. All rights reserved. 6 Copyright (C) 2004, 2005, 2006, 2007, 2008 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 14 matching lines...) Expand all
25 */ 25 */
26 26
27 #include "core/fetch/ScriptResource.h" 27 #include "core/fetch/ScriptResource.h"
28 28
29 #include "core/fetch/FetchRequest.h" 29 #include "core/fetch/FetchRequest.h"
30 #include "core/fetch/IntegrityMetadata.h" 30 #include "core/fetch/IntegrityMetadata.h"
31 #include "core/fetch/ResourceClientWalker.h" 31 #include "core/fetch/ResourceClientWalker.h"
32 #include "core/fetch/ResourceFetcher.h" 32 #include "core/fetch/ResourceFetcher.h"
33 #include "platform/MIMETypeRegistry.h" 33 #include "platform/MIMETypeRegistry.h"
34 #include "platform/SharedBuffer.h" 34 #include "platform/SharedBuffer.h"
35 #include "platform/web_memory_allocator_dump.h" 35 #include "platform/tracing/web_memory_allocator_dump.h"
36 #include "platform/web_process_memory_dump.h" 36 #include "platform/tracing/web_process_memory_dump.h"
37 37
38 namespace blink { 38 namespace blink {
39 39
40 ScriptResource* ScriptResource::fetch(FetchRequest& request, 40 ScriptResource* ScriptResource::fetch(FetchRequest& request,
41 ResourceFetcher* fetcher) { 41 ResourceFetcher* fetcher) {
42 DCHECK_EQ(request.resourceRequest().frameType(), 42 DCHECK_EQ(request.resourceRequest().frameType(),
43 WebURLRequest::FrameTypeNone); 43 WebURLRequest::FrameTypeNone);
44 request.mutableResourceRequest().setRequestContext( 44 request.mutableResourceRequest().setRequestContext(
45 WebURLRequest::RequestContextScript); 45 WebURLRequest::RequestContextScript);
46 ScriptResource* resource = toScriptResource( 46 ScriptResource* resource = toScriptResource(
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 bool ScriptResource::mustRefetchDueToIntegrityMetadata( 120 bool ScriptResource::mustRefetchDueToIntegrityMetadata(
121 const FetchRequest& request) const { 121 const FetchRequest& request) const {
122 if (request.integrityMetadata().isEmpty()) 122 if (request.integrityMetadata().isEmpty())
123 return false; 123 return false;
124 124
125 return !IntegrityMetadata::setsEqual(m_integrityMetadata, 125 return !IntegrityMetadata::setsEqual(m_integrityMetadata,
126 request.integrityMetadata()); 126 request.integrityMetadata());
127 } 127 }
128 128
129 } // namespace blink 129 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp ('k') | third_party/WebKit/Source/core/frame/DOMTimer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698