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

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 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 void receivedMainResourceError(DocumentLoader*, const ResourceError&); 116 void receivedMainResourceError(DocumentLoader*, const ResourceError&);
117 117
118 bool isLoadingMainFrame() const; 118 bool isLoadingMainFrame() const;
119 119
120 bool shouldTreatURLAsSameAsCurrent(const KURL&) const; 120 bool shouldTreatURLAsSameAsCurrent(const KURL&) const;
121 bool shouldTreatURLAsSrcdocDocument(const KURL&) const; 121 bool shouldTreatURLAsSrcdocDocument(const KURL&) const;
122 122
123 FrameLoadType loadType() const; 123 FrameLoadType loadType() const;
124 void setLoadType(FrameLoadType loadType) { m_loadType = loadType; } 124 void setLoadType(FrameLoadType loadType) { m_loadType = loadType; }
125 125
126 void checkLoadComplete();
127
128 FrameLoaderClient* client() const; 126 FrameLoaderClient* client() const;
129 127
130 void setDefersLoading(bool); 128 void setDefersLoading(bool);
131 129
132 void didExplicitOpen(); 130 void didExplicitOpen();
133 131
134 // Callbacks from DocumentWriter 132 // Callbacks from DocumentWriter
135 void didBeginDocument(bool dispatchWindowObjectAvailable); 133 void didBeginDocument(bool dispatchWindowObjectAvailable);
136 134
137 void receivedFirstData(); 135 void receivedFirstData();
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 void updateForSameDocumentNavigation(const KURL&, SameDocumentNavigationSour ce, PassRefPtr<SerializedScriptValue>, FrameLoadType); 173 void updateForSameDocumentNavigation(const KURL&, SameDocumentNavigationSour ce, PassRefPtr<SerializedScriptValue>, FrameLoadType);
176 174
177 HistoryItem* currentItem() const { return m_currentItem.get(); } 175 HistoryItem* currentItem() const { return m_currentItem.get(); }
178 void saveScrollState(); 176 void saveScrollState();
179 void clearScrollPositionAndViewState(); 177 void clearScrollPositionAndViewState();
180 178
181 void restoreScrollPositionAndViewState(); 179 void restoreScrollPositionAndViewState();
182 180
183 void trace(Visitor*); 181 void trace(Visitor*);
184 182
185 bool checkLoadCompleteForThisFrame();
186
187 private: 183 private:
188 bool allChildrenAreComplete() const; // immediate children, not all descenda nts
189
190 void checkTimerFired(Timer<FrameLoader>*); 184 void checkTimerFired(Timer<FrameLoader>*);
191 void didAccessInitialDocumentTimerFired(Timer<FrameLoader>*); 185 void didAccessInitialDocumentTimerFired(Timer<FrameLoader>*);
192 186
193 bool prepareRequestForThisFrame(FrameLoadRequest&); 187 bool prepareRequestForThisFrame(FrameLoadRequest&);
194 static void setReferrerForFrameRequest(ResourceRequest&, ShouldSendReferrer, Document*); 188 static void setReferrerForFrameRequest(ResourceRequest&, ShouldSendReferrer, Document*);
195 FrameLoadType determineFrameLoadType(const FrameLoadRequest&); 189 FrameLoadType determineFrameLoadType(const FrameLoadRequest&);
196 bool isScriptTriggeredFormSubmissionInChildFrame(const FrameLoadRequest&) co nst; 190 bool isScriptTriggeredFormSubmissionInChildFrame(const FrameLoadRequest&) co nst;
197 191
198 SubstituteData defaultSubstituteDataForURL(const KURL&); 192 SubstituteData defaultSubstituteDataForURL(const KURL&);
199 193
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 260
267 bool m_didAccessInitialDocument; 261 bool m_didAccessInitialDocument;
268 Timer<FrameLoader> m_didAccessInitialDocumentTimer; 262 Timer<FrameLoader> m_didAccessInitialDocumentTimer;
269 263
270 SandboxFlags m_forcedSandboxFlags; 264 SandboxFlags m_forcedSandboxFlags;
271 }; 265 };
272 266
273 } // namespace blink 267 } // namespace blink
274 268
275 #endif // FrameLoader_h 269 #endif // FrameLoader_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698