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

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

Issue 806183005: Remove FrameLoader's checkLoadComplete and checkLoadCompleteForThisFrame (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 11 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
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 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 void receivedMainResourceError(DocumentLoader*, const ResourceError&); 117 void receivedMainResourceError(DocumentLoader*, const ResourceError&);
118 118
119 bool isLoadingMainFrame() const; 119 bool isLoadingMainFrame() const;
120 120
121 bool shouldTreatURLAsSameAsCurrent(const KURL&) const; 121 bool shouldTreatURLAsSameAsCurrent(const KURL&) const;
122 bool shouldTreatURLAsSrcdocDocument(const KURL&) const; 122 bool shouldTreatURLAsSrcdocDocument(const KURL&) const;
123 123
124 FrameLoadType loadType() const; 124 FrameLoadType loadType() const;
125 void setLoadType(FrameLoadType loadType) { m_loadType = loadType; } 125 void setLoadType(FrameLoadType loadType) { m_loadType = loadType; }
126 126
127 void checkLoadComplete();
128
129 FrameLoaderClient* client() const; 127 FrameLoaderClient* client() const;
130 128
131 void setDefersLoading(bool); 129 void setDefersLoading(bool);
132 130
133 void didExplicitOpen(); 131 void didExplicitOpen();
134 132
135 // Callbacks from DocumentWriter 133 // Callbacks from DocumentWriter
136 void didBeginDocument(bool dispatchWindowObjectAvailable); 134 void didBeginDocument(bool dispatchWindowObjectAvailable);
137 135
138 void receivedFirstData(); 136 void receivedFirstData();
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 void updateForSameDocumentNavigation(const KURL&, SameDocumentNavigationSour ce, PassRefPtr<SerializedScriptValue>, FrameLoadType); 176 void updateForSameDocumentNavigation(const KURL&, SameDocumentNavigationSour ce, PassRefPtr<SerializedScriptValue>, FrameLoadType);
179 177
180 HistoryItem* currentItem() const { return m_currentItem.get(); } 178 HistoryItem* currentItem() const { return m_currentItem.get(); }
181 void saveScrollState(); 179 void saveScrollState();
182 void clearScrollPositionAndViewState(); 180 void clearScrollPositionAndViewState();
183 181
184 void restoreScrollPositionAndViewState(); 182 void restoreScrollPositionAndViewState();
185 183
186 void trace(Visitor*); 184 void trace(Visitor*);
187 185
188 bool checkLoadCompleteForThisFrame();
189
190 private: 186 private:
191 bool allChildrenAreComplete() const; // immediate children, not all descenda nts 187 bool allChildrenAreComplete() const;
192 188
193 void checkTimerFired(Timer<FrameLoader>*); 189 void checkTimerFired(Timer<FrameLoader>*);
194 void didAccessInitialDocumentTimerFired(Timer<FrameLoader>*); 190 void didAccessInitialDocumentTimerFired(Timer<FrameLoader>*);
195 191
196 bool prepareRequestForThisFrame(FrameLoadRequest&); 192 bool prepareRequestForThisFrame(FrameLoadRequest&);
197 static void setReferrerForFrameRequest(ResourceRequest&, ShouldSendReferrer, Document*); 193 static void setReferrerForFrameRequest(ResourceRequest&, ShouldSendReferrer, Document*);
198 FrameLoadType determineFrameLoadType(const FrameLoadRequest&); 194 FrameLoadType determineFrameLoadType(const FrameLoadRequest&);
199 bool isScriptTriggeredFormSubmissionInChildFrame(const FrameLoadRequest&) co nst; 195 bool isScriptTriggeredFormSubmissionInChildFrame(const FrameLoadRequest&) co nst;
200 196
201 SubstituteData defaultSubstituteDataForURL(const KURL&); 197 SubstituteData defaultSubstituteDataForURL(const KURL&);
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 266
271 bool m_didAccessInitialDocument; 267 bool m_didAccessInitialDocument;
272 Timer<FrameLoader> m_didAccessInitialDocumentTimer; 268 Timer<FrameLoader> m_didAccessInitialDocumentTimer;
273 269
274 SandboxFlags m_forcedSandboxFlags; 270 SandboxFlags m_forcedSandboxFlags;
275 }; 271 };
276 272
277 } // namespace blink 273 } // namespace blink
278 274
279 #endif // FrameLoader_h 275 #endif // FrameLoader_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698