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

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

Issue 566533003: Mixed Content: Make MixedContentChecker completely static. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixing tests. Created 6 years, 3 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
« no previous file with comments | « Source/core/html/parser/XSSAuditor.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 21 matching lines...) Expand all
32 #ifndef FrameLoader_h 32 #ifndef FrameLoader_h
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/loader/FrameLoaderStateMachine.h" 39 #include "core/loader/FrameLoaderStateMachine.h"
40 #include "core/loader/FrameLoaderTypes.h" 40 #include "core/loader/FrameLoaderTypes.h"
41 #include "core/loader/HistoryItem.h" 41 #include "core/loader/HistoryItem.h"
42 #include "core/loader/MixedContentChecker.h"
43 #include "platform/Timer.h" 42 #include "platform/Timer.h"
44 #include "platform/network/ResourceRequest.h" 43 #include "platform/network/ResourceRequest.h"
45 #include "wtf/Forward.h" 44 #include "wtf/Forward.h"
46 #include "wtf/HashSet.h" 45 #include "wtf/HashSet.h"
47 #include "wtf/OwnPtr.h" 46 #include "wtf/OwnPtr.h"
48 47
49 namespace blink { 48 namespace blink {
50 49
51 class Chrome; 50 class Chrome;
52 class DOMWrapperWorld; 51 class DOMWrapperWorld;
(...skipping 24 matching lines...) Expand all
77 public: 76 public:
78 static ResourceRequest requestFromHistoryItem(HistoryItem*, ResourceRequestC achePolicy); 77 static ResourceRequest requestFromHistoryItem(HistoryItem*, ResourceRequestC achePolicy);
79 78
80 FrameLoader(LocalFrame*); 79 FrameLoader(LocalFrame*);
81 ~FrameLoader(); 80 ~FrameLoader();
82 81
83 void init(); 82 void init();
84 83
85 LocalFrame* frame() const { return m_frame; } 84 LocalFrame* frame() const { return m_frame; }
86 85
87 MixedContentChecker* mixedContentChecker() const { return &m_mixedContentChe cker; }
88 ProgressTracker& progress() const { return *m_progressTracker; } 86 ProgressTracker& progress() const { return *m_progressTracker; }
89 87
90 // These functions start a load. All eventually call into loadWithNavigation Action() or loadInSameDocument(). 88 // These functions start a load. All eventually call into loadWithNavigation Action() or loadInSameDocument().
91 void load(const FrameLoadRequest&); // The entry point for non-reload, non-h istory loads. 89 void load(const FrameLoadRequest&); // The entry point for non-reload, non-h istory loads.
92 void reload(ReloadPolicy = NormalReload, const KURL& overrideURL = KURL(), c onst AtomicString& overrideEncoding = nullAtom, ClientRedirectPolicy = NotClient Redirect); 90 void reload(ReloadPolicy = NormalReload, const KURL& overrideURL = KURL(), c onst AtomicString& overrideEncoding = nullAtom, ClientRedirectPolicy = NotClient Redirect);
93 void loadHistoryItem(HistoryItem*, HistoryLoadType = HistoryDifferentDocumen tLoad, ResourceRequestCachePolicy = UseProtocolCachePolicy); // The entry point for all back/forward loads 91 void loadHistoryItem(HistoryItem*, HistoryLoadType = HistoryDifferentDocumen tLoad, ResourceRequestCachePolicy = UseProtocolCachePolicy); // The entry point for all back/forward loads
94 92
95 static void reportLocalLoadFailed(LocalFrame*, const String& url); 93 static void reportLocalLoadFailed(LocalFrame*, const String& url);
96 94
97 // FIXME: These are all functions which stop loads. We have too many. 95 // FIXME: These are all functions which stop loads. We have too many.
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 void loadInSameDocument(const KURL&, PassRefPtr<SerializedScriptValue> state Object, FrameLoadType, ClientRedirectPolicy); 218 void loadInSameDocument(const KURL&, PassRefPtr<SerializedScriptValue> state Object, FrameLoadType, ClientRedirectPolicy);
221 219
222 void scheduleCheckCompleted(); 220 void scheduleCheckCompleted();
223 221
224 LocalFrame* m_frame; 222 LocalFrame* m_frame;
225 223
226 // FIXME: These should be OwnPtr<T> to reduce build times and simplify 224 // FIXME: These should be OwnPtr<T> to reduce build times and simplify
227 // header dependencies unless performance testing proves otherwise. 225 // header dependencies unless performance testing proves otherwise.
228 // Some of these could be lazily created for memory savings on devices. 226 // Some of these could be lazily created for memory savings on devices.
229 mutable FrameLoaderStateMachine m_stateMachine; 227 mutable FrameLoaderStateMachine m_stateMachine;
230 mutable MixedContentChecker m_mixedContentChecker;
231 228
232 OwnPtr<ProgressTracker> m_progressTracker; 229 OwnPtr<ProgressTracker> m_progressTracker;
233 230
234 FrameState m_state; 231 FrameState m_state;
235 FrameLoadType m_loadType; 232 FrameLoadType m_loadType;
236 233
237 // Document loaders for the three phases of frame loading. Note that while 234 // Document loaders for the three phases of frame loading. Note that while
238 // a new request is being loaded, the old document loader may still be refer enced. 235 // a new request is being loaded, the old document loader may still be refer enced.
239 // E.g. while a new request is in the "policy" state, the old document loade r may 236 // E.g. while a new request is in the "policy" state, the old document loade r may
240 // be consulted in particular as it makes sense to imply certain settings on the new loader. 237 // be consulted in particular as it makes sense to imply certain settings on the new loader.
(...skipping 28 matching lines...) Expand all
269 266
270 bool m_didAccessInitialDocument; 267 bool m_didAccessInitialDocument;
271 Timer<FrameLoader> m_didAccessInitialDocumentTimer; 268 Timer<FrameLoader> m_didAccessInitialDocumentTimer;
272 269
273 SandboxFlags m_forcedSandboxFlags; 270 SandboxFlags m_forcedSandboxFlags;
274 }; 271 };
275 272
276 } // namespace blink 273 } // namespace blink
277 274
278 #endif // FrameLoader_h 275 #endif // FrameLoader_h
OLDNEW
« no previous file with comments | « Source/core/html/parser/XSSAuditor.cpp ('k') | Source/core/loader/FrameLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698