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

Side by Side Diff: Source/core/loader/FrameLoader.h

Issue 995783002: Gracefully handle mixed content checking on detached resource fetches. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 9 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
« no previous file with comments | « Source/core/loader/FrameFetchContext.cpp ('k') | Source/core/loader/FrameLoader.cpp » ('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) 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights reserved.
3 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 3 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
4 * Copyright (C) Research In Motion Limited 2009. All rights reserved. 4 * Copyright (C) Research In Motion Limited 2009. All rights reserved.
5 * Copyright (C) 2011 Google Inc. All rights reserved. 5 * Copyright (C) 2011 Google Inc. All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 10 *
(...skipping 22 matching lines...) Expand all
33 #define FrameLoader_h 33 #define FrameLoader_h
34 34
35 #include "core/dom/IconURL.h" 35 #include "core/dom/IconURL.h"
36 #include "core/dom/SandboxFlags.h" 36 #include "core/dom/SandboxFlags.h"
37 #include "core/dom/SecurityContext.h" 37 #include "core/dom/SecurityContext.h"
38 #include "core/fetch/ResourceLoaderOptions.h" 38 #include "core/fetch/ResourceLoaderOptions.h"
39 #include "core/frame/FrameTypes.h" 39 #include "core/frame/FrameTypes.h"
40 #include "core/loader/FrameLoaderStateMachine.h" 40 #include "core/loader/FrameLoaderStateMachine.h"
41 #include "core/loader/FrameLoaderTypes.h" 41 #include "core/loader/FrameLoaderTypes.h"
42 #include "core/loader/HistoryItem.h" 42 #include "core/loader/HistoryItem.h"
43 #include "core/loader/MixedContentChecker.h"
44 #include "core/loader/NavigationPolicy.h" 43 #include "core/loader/NavigationPolicy.h"
45 #include "platform/Timer.h" 44 #include "platform/Timer.h"
46 #include "platform/heap/Handle.h" 45 #include "platform/heap/Handle.h"
47 #include "platform/network/ResourceRequest.h" 46 #include "platform/network/ResourceRequest.h"
48 #include "wtf/Forward.h" 47 #include "wtf/Forward.h"
49 #include "wtf/HashSet.h" 48 #include "wtf/HashSet.h"
50 #include "wtf/OwnPtr.h"
51 49
52 namespace blink { 50 namespace blink {
53 51
54 class DocumentLoader; 52 class DocumentLoader;
55 class Frame; 53 class Frame;
56 class FrameLoaderClient; 54 class FrameLoaderClient;
57 class ProgressTracker; 55 class ProgressTracker;
58 class ResourceError; 56 class ResourceError;
59 class SerializedScriptValue; 57 class SerializedScriptValue;
60 class SubstituteData; 58 class SubstituteData;
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 256
259 bool m_didAccessInitialDocument; 257 bool m_didAccessInitialDocument;
260 Timer<FrameLoader> m_didAccessInitialDocumentTimer; 258 Timer<FrameLoader> m_didAccessInitialDocumentTimer;
261 259
262 SandboxFlags m_forcedSandboxFlags; 260 SandboxFlags m_forcedSandboxFlags;
263 }; 261 };
264 262
265 } // namespace blink 263 } // namespace blink
266 264
267 #endif // FrameLoader_h 265 #endif // FrameLoader_h
OLDNEW
« no previous file with comments | « Source/core/loader/FrameFetchContext.cpp ('k') | Source/core/loader/FrameLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698