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

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

Issue 14495011: Revert "Create errors (especially cancellation errors) internally to WebCore, rather" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/loader/EmptyClients.h ('k') | Source/core/loader/FrameLoader.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 FrameState state() const { return m_state; } 148 FrameState state() const { return m_state; }
149 149
150 const ResourceRequest& originalRequest() const; 150 const ResourceRequest& originalRequest() const;
151 const ResourceRequest& initialRequest() const; 151 const ResourceRequest& initialRequest() const;
152 void receivedMainResourceError(const ResourceError&); 152 void receivedMainResourceError(const ResourceError&);
153 153
154 bool willLoadMediaElementURL(KURL&); 154 bool willLoadMediaElementURL(KURL&);
155 155
156 void handleFallbackContent(); 156 void handleFallbackContent();
157 157
158 ResourceError cancelledError(const ResourceRequest&) const;
159
158 bool isHostedByObjectElement() const; 160 bool isHostedByObjectElement() const;
159 bool isLoadingMainFrame() const; 161 bool isLoadingMainFrame() const;
160 162
161 bool isReplacing() const; 163 bool isReplacing() const;
162 void setReplacing(); 164 void setReplacing();
163 bool subframeIsLoading() const; 165 bool subframeIsLoading() const;
164 void didChangeTitle(DocumentLoader*); 166 void didChangeTitle(DocumentLoader*);
165 void didChangeIcons(IconType); 167 void didChangeIcons(IconType);
166 168
167 bool shouldTreatURLAsSrcdocDocument(const KURL&) const; 169 bool shouldTreatURLAsSrcdocDocument(const KURL&) const;
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
425 // the frame name references a frame different from the openerFrame, e.g. when i t is 427 // the frame name references a frame different from the openerFrame, e.g. when i t is
426 // "_self" or "_parent". 428 // "_self" or "_parent".
427 // 429 //
428 // FIXME: Consider making this function part of an appropriate class (not FrameL oader) 430 // FIXME: Consider making this function part of an appropriate class (not FrameL oader)
429 // and moving it to a more appropriate location. 431 // and moving it to a more appropriate location.
430 Frame* createWindow(Frame* openerFrame, Frame* lookupFrame, const FrameLoadReque st&, const WindowFeatures&, bool& created); 432 Frame* createWindow(Frame* openerFrame, Frame* lookupFrame, const FrameLoadReque st&, const WindowFeatures&, bool& created);
431 433
432 } // namespace WebCore 434 } // namespace WebCore
433 435
434 #endif // FrameLoader_h 436 #endif // FrameLoader_h
OLDNEW
« no previous file with comments | « Source/core/loader/EmptyClients.h ('k') | Source/core/loader/FrameLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698