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

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

Issue 2862293002: Finish removing FrameLoader::Clear() (Closed)
Patch Set: Rebase Created 3 years, 7 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
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. 3 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
4 * (http://www.torchmobile.com/) 4 * (http://www.torchmobile.com/)
5 * Copyright (C) Research In Motion Limited 2009. All rights reserved. 5 * Copyright (C) Research In Motion Limited 2009. All rights reserved.
6 * Copyright (C) 2011 Google Inc. All rights reserved. 6 * Copyright (C) 2011 Google Inc. All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 HistoryItem* = nullptr, 96 HistoryItem* = nullptr,
97 HistoryLoadType = kHistoryDifferentDocumentLoad); 97 HistoryLoadType = kHistoryDifferentDocumentLoad);
98 98
99 static void ReportLocalLoadFailed(LocalFrame*, const String& url); 99 static void ReportLocalLoadFailed(LocalFrame*, const String& url);
100 100
101 // Warning: stopAllLoaders can and will detach the LocalFrame out from under 101 // Warning: stopAllLoaders can and will detach the LocalFrame out from under
102 // you. All callers need to either protect the LocalFrame or guarantee they 102 // you. All callers need to either protect the LocalFrame or guarantee they
103 // won't in any way access the LocalFrame after stopAllLoaders returns. 103 // won't in any way access the LocalFrame after stopAllLoaders returns.
104 void StopAllLoaders(); 104 void StopAllLoaders();
105 105
106 // FIXME: clear() is trying to do too many things. We should break it down
107 // into smaller functions.
108 void Clear();
109
110 void ReplaceDocumentWhileExecutingJavaScriptURL(const String& source, 106 void ReplaceDocumentWhileExecutingJavaScriptURL(const String& source,
111 Document* owner_document); 107 Document* owner_document);
112 108
113 // Notifies the client that the initial empty document has been accessed, and 109 // Notifies the client that the initial empty document has been accessed, and
114 // thus it is no longer safe to show a provisional URL above the document 110 // thus it is no longer safe to show a provisional URL above the document
115 // without risking a URL spoof. The client must not call back into JavaScript. 111 // without risking a URL spoof. The client must not call back into JavaScript.
116 void DidAccessInitialDocument(); 112 void DidAccessInitialDocument();
117 113
118 DocumentLoader* GetDocumentLoader() const { return document_loader_.Get(); } 114 DocumentLoader* GetDocumentLoader() const { return document_loader_.Get(); }
119 DocumentLoader* ProvisionalDocumentLoader() const { 115 DocumentLoader* ProvisionalDocumentLoader() const {
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 SandboxFlags forced_sandbox_flags_; 287 SandboxFlags forced_sandbox_flags_;
292 288
293 bool dispatching_did_clear_window_object_in_main_world_; 289 bool dispatching_did_clear_window_object_in_main_world_;
294 bool protect_provisional_loader_; 290 bool protect_provisional_loader_;
295 bool detached_; 291 bool detached_;
296 }; 292 };
297 293
298 } // namespace blink 294 } // namespace blink
299 295
300 #endif // FrameLoader_h 296 #endif // FrameLoader_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/loader/DocumentLoader.cpp ('k') | third_party/WebKit/Source/core/loader/FrameLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698