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

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

Issue 24009002: Move synchronously fetching to ResourceFetcher, as well as most of the logic (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 3 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 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 IconController* icon() const { return m_icon.get(); } 87 IconController* icon() const { return m_icon.get(); }
88 MixedContentChecker* mixedContentChecker() const { return &m_mixedContentChe cker; } 88 MixedContentChecker* mixedContentChecker() const { return &m_mixedContentChe cker; }
89 89
90 void prepareForHistoryNavigation(); 90 void prepareForHistoryNavigation();
91 91
92 // These functions start a load. All eventually call into loadWithNavigation Action() or loadInSameDocument(). 92 // These functions start a load. All eventually call into loadWithNavigation Action() or loadInSameDocument().
93 void load(const FrameLoadRequest&); // The entry point for non-reload, non-h istory loads. 93 void load(const FrameLoadRequest&); // The entry point for non-reload, non-h istory loads.
94 void reload(ReloadPolicy = NormalReload, const KURL& overrideURL = KURL(), c onst String& overrideEncoding = String()); 94 void reload(ReloadPolicy = NormalReload, const KURL& overrideURL = KURL(), c onst String& overrideEncoding = String());
95 void loadHistoryItem(HistoryItem*); // The entry point for all back/forward loads 95 void loadHistoryItem(HistoryItem*); // The entry point for all back/forward loads
96 96
97 // FIXME: This doesn't really belong here, since we don't load Frames synchr onously.
98 unsigned long loadResourceSynchronously(const ResourceRequest&, StoredCreden tials, ResourceError&, ResourceResponse&, Vector<char>& data);
99
100 HistoryItem* requestedHistoryItem() const { return m_requestedHistoryItem.ge t(); } 97 HistoryItem* requestedHistoryItem() const { return m_requestedHistoryItem.ge t(); }
101 98
102 static void reportLocalLoadFailed(Frame*, const String& url); 99 static void reportLocalLoadFailed(Frame*, const String& url);
103 100
104 // FIXME: These are all functions which stop loads. We have too many. 101 // FIXME: These are all functions which stop loads. We have too many.
105 // Warning: stopAllLoaders can and will detach the Frame out from under you. All callers need to either protect the Frame 102 // Warning: stopAllLoaders can and will detach the Frame out from under you. All callers need to either protect the Frame
106 // or guarantee they won't in any way access the Frame after stopAllLoaders returns. 103 // or guarantee they won't in any way access the Frame after stopAllLoaders returns.
107 void stopAllLoaders(ClearProvisionalItemPolicy = ShouldClearProvisionalItem) ; 104 void stopAllLoaders(ClearProvisionalItemPolicy = ShouldClearProvisionalItem) ;
108 void stopLoading(); 105 void stopLoading();
109 bool closeURL(); 106 bool closeURL();
(...skipping 19 matching lines...) Expand all
129 DocumentLoader* activeDocumentLoader() const; 126 DocumentLoader* activeDocumentLoader() const;
130 DocumentLoader* documentLoader() const { return m_documentLoader.get(); } 127 DocumentLoader* documentLoader() const { return m_documentLoader.get(); }
131 DocumentLoader* policyDocumentLoader() const { return m_policyDocumentLoader .get(); } 128 DocumentLoader* policyDocumentLoader() const { return m_policyDocumentLoader .get(); }
132 DocumentLoader* provisionalDocumentLoader() const { return m_provisionalDocu mentLoader.get(); } 129 DocumentLoader* provisionalDocumentLoader() const { return m_provisionalDocu mentLoader.get(); }
133 FrameState state() const { return m_state; } 130 FrameState state() const { return m_state; }
134 FetchContext& fetchContext() const { return *m_fetchContext; } 131 FetchContext& fetchContext() const { return *m_fetchContext; }
135 132
136 const ResourceRequest& originalRequest() const; 133 const ResourceRequest& originalRequest() const;
137 void receivedMainResourceError(const ResourceError&); 134 void receivedMainResourceError(const ResourceError&);
138 135
139 bool willLoadMediaElementURL(KURL&);
140
141 void handleFallbackContent(); 136 void handleFallbackContent();
142 137
143 bool isHostedByObjectElement() const; 138 bool isHostedByObjectElement() const;
144 bool isLoadingMainFrame() const; 139 bool isLoadingMainFrame() const;
145 140
146 bool subframeIsLoading() const; 141 bool subframeIsLoading() const;
147 142
148 bool shouldTreatURLAsSrcdocDocument(const KURL&) const; 143 bool shouldTreatURLAsSrcdocDocument(const KURL&) const;
149 144
150 FrameLoadType loadType() const; 145 FrameLoadType loadType() const;
151 void setLoadType(FrameLoadType loadType) { m_loadType = loadType; } 146 void setLoadType(FrameLoadType loadType) { m_loadType = loadType; }
152 147
153 CachePolicy subresourceCachePolicy() const; 148 CachePolicy subresourceCachePolicy() const;
154 149
155 void didLayout(LayoutMilestones); 150 void didLayout(LayoutMilestones);
156 void didFirstLayout(); 151 void didFirstLayout();
157 152
158 void loadedResourceFromMemoryCache(Resource*);
159
160 void checkLoadComplete(DocumentLoader*); 153 void checkLoadComplete(DocumentLoader*);
161 void checkLoadComplete(); 154 void checkLoadComplete();
162 void detachFromParent(); 155 void detachFromParent();
163 156
164 void addExtraFieldsToRequest(ResourceRequest&); 157 void addExtraFieldsToRequest(ResourceRequest&);
165 158
166 static void addHTTPOriginIfNeeded(ResourceRequest&, const String& origin); 159 static void addHTTPOriginIfNeeded(ResourceRequest&, const String& origin);
167 160
168 FrameLoaderClient* client() const { return m_client; } 161 FrameLoaderClient* client() const { return m_client; }
169 162
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 void scrollToFragmentWithParentBoundary(const KURL&); 243 void scrollToFragmentWithParentBoundary(const KURL&);
251 244
252 void checkLoadCompleteForThisFrame(); 245 void checkLoadCompleteForThisFrame();
253 246
254 void closeOldDataSources(); 247 void closeOldDataSources();
255 248
256 // Calls continueLoadAfterNavigationPolicy 249 // Calls continueLoadAfterNavigationPolicy
257 void loadWithNavigationAction(const ResourceRequest&, const NavigationAction &, 250 void loadWithNavigationAction(const ResourceRequest&, const NavigationAction &,
258 FrameLoadType, PassRefPtr<FormState>, const SubstituteData&, const Strin g& overrideEncoding = String()); 251 FrameLoadType, PassRefPtr<FormState>, const SubstituteData&, const Strin g& overrideEncoding = String());
259 252
260 void requestFromDelegate(ResourceRequest&, unsigned long& identifier, Resour ceError&);
261
262 void detachChildren(); 253 void detachChildren();
263 void closeAndRemoveChild(Frame*); 254 void closeAndRemoveChild(Frame*);
264 255
265 void loadInSameDocument(const KURL&, PassRefPtr<SerializedScriptValue> state Object, bool isNewNavigation); 256 void loadInSameDocument(const KURL&, PassRefPtr<SerializedScriptValue> state Object, bool isNewNavigation);
266 257
267 void scheduleCheckCompleted(); 258 void scheduleCheckCompleted();
268 void startCheckCompleteTimer(); 259 void startCheckCompleteTimer();
269 260
270 bool shouldTreatURLAsSameAsCurrent(const KURL&) const; 261 bool shouldTreatURLAsSameAsCurrent(const KURL&) const;
271 262
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 bool m_startingClientRedirect; 307 bool m_startingClientRedirect;
317 308
318 SandboxFlags m_forcedSandboxFlags; 309 SandboxFlags m_forcedSandboxFlags;
319 310
320 RefPtr<HistoryItem> m_requestedHistoryItem; 311 RefPtr<HistoryItem> m_requestedHistoryItem;
321 }; 312 };
322 313
323 } // namespace WebCore 314 } // namespace WebCore
324 315
325 #endif // FrameLoader_h 316 #endif // FrameLoader_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698