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

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

Issue 54053006: Move weborigin/ under platform/ so that it may someday call platform APIs (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Stale refernence to weboriginexport in .gpyi Created 7 years, 1 month 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
« no previous file with comments | « Source/core/fetch/Resource.cpp ('k') | Source/core/fetch/StyleSheetResourceClient.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 #include "core/loader/UniqueIdentifier.h" 54 #include "core/loader/UniqueIdentifier.h"
55 #include "core/loader/appcache/ApplicationCacheHost.h" 55 #include "core/loader/appcache/ApplicationCacheHost.h"
56 #include "core/frame/ContentSecurityPolicy.h" 56 #include "core/frame/ContentSecurityPolicy.h"
57 #include "core/frame/DOMWindow.h" 57 #include "core/frame/DOMWindow.h"
58 #include "core/frame/Frame.h" 58 #include "core/frame/Frame.h"
59 #include "core/timing/Performance.h" 59 #include "core/timing/Performance.h"
60 #include "core/timing/ResourceTimingInfo.h" 60 #include "core/timing/ResourceTimingInfo.h"
61 #include "core/page/Settings.h" 61 #include "core/page/Settings.h"
62 #include "platform/Logging.h" 62 #include "platform/Logging.h"
63 #include "platform/TraceEvent.h" 63 #include "platform/TraceEvent.h"
64 #include "platform/weborigin/SecurityOrigin.h"
65 #include "platform/weborigin/SecurityPolicy.h"
64 #include "public/platform/Platform.h" 66 #include "public/platform/Platform.h"
65 #include "public/platform/WebURL.h" 67 #include "public/platform/WebURL.h"
66 #include "weborigin/SecurityOrigin.h"
67 #include "weborigin/SecurityPolicy.h"
68 #include "wtf/text/CString.h" 68 #include "wtf/text/CString.h"
69 #include "wtf/text/WTFString.h" 69 #include "wtf/text/WTFString.h"
70 70
71 #define PRELOAD_DEBUG 0 71 #define PRELOAD_DEBUG 0
72 72
73 namespace WebCore { 73 namespace WebCore {
74 74
75 static Resource* createResource(Resource::Type type, const ResourceRequest& requ est, const String& charset) 75 static Resource* createResource(Resource::Type type, const ResourceRequest& requ est, const String& charset)
76 { 76 {
77 switch (type) { 77 switch (type) {
(...skipping 1243 matching lines...) Expand 10 before | Expand all | Expand 10 after
1321 } 1321 }
1322 #endif 1322 #endif
1323 1323
1324 const ResourceLoaderOptions& ResourceFetcher::defaultResourceOptions() 1324 const ResourceLoaderOptions& ResourceFetcher::defaultResourceOptions()
1325 { 1325 {
1326 DEFINE_STATIC_LOCAL(ResourceLoaderOptions, options, (SendCallbacks, SniffCon tent, BufferData, AllowStoredCredentials, ClientRequestedCredentials, AskClientF orCrossOriginCredentials, DoSecurityCheck, CheckContentSecurityPolicy, UseDefaul tOriginRestrictionsForType, DocumentContext)); 1326 DEFINE_STATIC_LOCAL(ResourceLoaderOptions, options, (SendCallbacks, SniffCon tent, BufferData, AllowStoredCredentials, ClientRequestedCredentials, AskClientF orCrossOriginCredentials, DoSecurityCheck, CheckContentSecurityPolicy, UseDefaul tOriginRestrictionsForType, DocumentContext));
1327 return options; 1327 return options;
1328 } 1328 }
1329 1329
1330 } 1330 }
OLDNEW
« no previous file with comments | « Source/core/fetch/Resource.cpp ('k') | Source/core/fetch/StyleSheetResourceClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698