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

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

Issue 2809733003: Move most of FrameLoader::CheckCompleted() to Document (Closed)
Patch Set: Fix failing android test Created 3 years, 8 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 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 152
153 Frame* Opener(); 153 Frame* Opener();
154 void SetOpener(LocalFrame*); 154 void SetOpener(LocalFrame*);
155 155
156 const AtomicString& RequiredCSP() const { return required_csp_; } 156 const AtomicString& RequiredCSP() const { return required_csp_; }
157 void RecordLatestRequiredCSP(); 157 void RecordLatestRequiredCSP();
158 158
159 void Detach(); 159 void Detach();
160 160
161 void FinishedParsing(); 161 void FinishedParsing();
162 void CheckCompleted(); 162 void DidFinishNavigation();
163 163
164 // This prepares the FrameLoader for the next commit. It will dispatch unload 164 // This prepares the FrameLoader for the next commit. It will dispatch unload
165 // events, abort XHR requests and detach the document. Returns true if the 165 // events, abort XHR requests and detach the document. Returns true if the
166 // frame is ready to receive the next commit, or false otherwise. 166 // frame is ready to receive the next commit, or false otherwise.
167 bool PrepareForCommit(); 167 bool PrepareForCommit();
168 168
169 void CommitProvisionalLoad(); 169 void CommitProvisionalLoad();
170 170
171 FrameLoaderStateMachine* StateMachine() const { return &state_machine_; } 171 FrameLoaderStateMachine* StateMachine() const { return &state_machine_; }
172 172
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 SandboxFlags forced_sandbox_flags_; 315 SandboxFlags forced_sandbox_flags_;
316 316
317 bool dispatching_did_clear_window_object_in_main_world_; 317 bool dispatching_did_clear_window_object_in_main_world_;
318 bool protect_provisional_loader_; 318 bool protect_provisional_loader_;
319 bool detached_; 319 bool detached_;
320 }; 320 };
321 321
322 } // namespace blink 322 } // namespace blink
323 323
324 #endif // FrameLoader_h 324 #endif // FrameLoader_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/loader/FrameFetchContextTest.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