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

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

Issue 596653006: Have MixedContentChecker and ProgressTracker keep a LocalFrame Member. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 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
« no previous file with comments | « no previous file | 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 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 void scheduleCheckCompleted(); 219 void scheduleCheckCompleted();
220 220
221 RawPtrWillBeMember<LocalFrame> m_frame; 221 RawPtrWillBeMember<LocalFrame> m_frame;
222 222
223 // FIXME: These should be OwnPtr<T> to reduce build times and simplify 223 // FIXME: These should be OwnPtr<T> to reduce build times and simplify
224 // header dependencies unless performance testing proves otherwise. 224 // header dependencies unless performance testing proves otherwise.
225 // Some of these could be lazily created for memory savings on devices. 225 // Some of these could be lazily created for memory savings on devices.
226 mutable FrameLoaderStateMachine m_stateMachine; 226 mutable FrameLoaderStateMachine m_stateMachine;
227 mutable MixedContentChecker m_mixedContentChecker; 227 mutable MixedContentChecker m_mixedContentChecker;
228 228
229 OwnPtr<ProgressTracker> m_progressTracker; 229 OwnPtrWillBeMember<ProgressTracker> m_progressTracker;
230 230
231 FrameState m_state; 231 FrameState m_state;
232 FrameLoadType m_loadType; 232 FrameLoadType m_loadType;
233 233
234 // 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
235 // 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.
236 // 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
237 // 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.
238 RefPtr<DocumentLoader> m_documentLoader; 238 RefPtr<DocumentLoader> m_documentLoader;
239 RefPtr<DocumentLoader> m_provisionalDocumentLoader; 239 RefPtr<DocumentLoader> m_provisionalDocumentLoader;
(...skipping 26 matching lines...) Expand all
266 266
267 bool m_didAccessInitialDocument; 267 bool m_didAccessInitialDocument;
268 Timer<FrameLoader> m_didAccessInitialDocumentTimer; 268 Timer<FrameLoader> m_didAccessInitialDocumentTimer;
269 269
270 SandboxFlags m_forcedSandboxFlags; 270 SandboxFlags m_forcedSandboxFlags;
271 }; 271 };
272 272
273 } // namespace blink 273 } // namespace blink
274 274
275 #endif // FrameLoader_h 275 #endif // FrameLoader_h
OLDNEW
« no previous file with comments | « no previous file | Source/core/loader/FrameLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698