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

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

Issue 1172613003: Oilpan: fix build after r196753. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 6 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 | « 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 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 // a new request is being loaded, the old document loader may still be refer enced. 221 // a new request is being loaded, the old document loader may still be refer enced.
222 // E.g. while a new request is in the "policy" state, the old document loade r may 222 // E.g. while a new request is in the "policy" state, the old document loade r may
223 // be consulted in particular as it makes sense to imply certain settings on the new loader. 223 // be consulted in particular as it makes sense to imply certain settings on the new loader.
224 RefPtr<DocumentLoader> m_documentLoader; 224 RefPtr<DocumentLoader> m_documentLoader;
225 RefPtr<DocumentLoader> m_provisionalDocumentLoader; 225 RefPtr<DocumentLoader> m_provisionalDocumentLoader;
226 RefPtr<DocumentLoader> m_policyDocumentLoader; 226 RefPtr<DocumentLoader> m_policyDocumentLoader;
227 227
228 RefPtrWillBeMember<HistoryItem> m_currentItem; 228 RefPtrWillBeMember<HistoryItem> m_currentItem;
229 RefPtrWillBeMember<HistoryItem> m_provisionalItem; 229 RefPtrWillBeMember<HistoryItem> m_provisionalItem;
230 230
231 struct DeferredHistoryLoad { 231 class DeferredHistoryLoad : public NoBaseWillBeGarbageCollectedFinalized<Def erredHistoryLoad> {
232 DISALLOW_COPY(DeferredHistoryLoad); 232 DISALLOW_COPY(DeferredHistoryLoad);
233 public: 233 public:
234 static PassOwnPtrWillBeRawPtr<DeferredHistoryLoad> create(ResourceReques t request, HistoryItem* item, FrameLoadType loadType, HistoryLoadType historyLoa dType)
235 {
236 return adoptPtrWillBeNoop(new DeferredHistoryLoad(request, item, loa dType, historyLoadType));
237 }
238
234 DeferredHistoryLoad(ResourceRequest request, HistoryItem* item, FrameLoa dType loadType, 239 DeferredHistoryLoad(ResourceRequest request, HistoryItem* item, FrameLoa dType loadType,
235 HistoryLoadType historyLoadType) 240 HistoryLoadType historyLoadType)
236 : m_request(request) 241 : m_request(request)
237 , m_item(item) 242 , m_item(item)
238 , m_loadType(loadType) 243 , m_loadType(loadType)
239 , m_historyLoadType(historyLoadType) 244 , m_historyLoadType(historyLoadType)
240 { 245 {
241 } 246 }
242 247
243 DeferredHistoryLoad() { }
244
245 DEFINE_INLINE_TRACE() 248 DEFINE_INLINE_TRACE()
246 { 249 {
247 visitor->trace(m_item); 250 visitor->trace(m_item);
248 } 251 }
249 252
250 ResourceRequest m_request; 253 ResourceRequest m_request;
251 RefPtrWillBeMember<HistoryItem> m_item; 254 RefPtrWillBeMember<HistoryItem> m_item;
252 FrameLoadType m_loadType; 255 FrameLoadType m_loadType;
253 HistoryLoadType m_historyLoadType; 256 HistoryLoadType m_historyLoadType;
254 }; 257 };
255 258
256 OwnPtr<DeferredHistoryLoad> m_deferredHistoryLoad; 259 OwnPtrWillBeMember<DeferredHistoryLoad> m_deferredHistoryLoad;
257 260
258 bool m_inStopAllLoaders; 261 bool m_inStopAllLoaders;
259 262
260 Timer<FrameLoader> m_checkTimer; 263 Timer<FrameLoader> m_checkTimer;
261 264
262 bool m_didAccessInitialDocument; 265 bool m_didAccessInitialDocument;
263 Timer<FrameLoader> m_didAccessInitialDocumentTimer; 266 Timer<FrameLoader> m_didAccessInitialDocumentTimer;
264 267
265 SandboxFlags m_forcedSandboxFlags; 268 SandboxFlags m_forcedSandboxFlags;
266 269
267 bool m_dispatchingDidClearWindowObjectInMainWorld; 270 bool m_dispatchingDidClearWindowObjectInMainWorld;
268 }; 271 };
269 272
270 } // namespace blink 273 } // namespace blink
271 274
272 #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