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

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

Issue 1823863002: Simplify parsing/loading state, attempt #2 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixes Created 4 years, 9 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. (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 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 void didAccessInitialDocument(); 103 void didAccessInitialDocument();
104 104
105 // If the initial empty document is showing and has been accessed, this 105 // If the initial empty document is showing and has been accessed, this
106 // cancels the timer and immediately notifies the client in cases that 106 // cancels the timer and immediately notifies the client in cases that
107 // waiting to notify would allow a URL spoof. 107 // waiting to notify would allow a URL spoof.
108 void notifyIfInitialDocumentAccessed(); 108 void notifyIfInitialDocumentAccessed();
109 109
110 DocumentLoader* documentLoader() const { return m_documentLoader.get(); } 110 DocumentLoader* documentLoader() const { return m_documentLoader.get(); }
111 DocumentLoader* provisionalDocumentLoader() const { return m_provisionalDocu mentLoader.get(); } 111 DocumentLoader* provisionalDocumentLoader() const { return m_provisionalDocu mentLoader.get(); }
112 112
113 void receivedMainResourceError(DocumentLoader*, const ResourceError&); 113 void loadFailed(DocumentLoader*, const ResourceError&);
114 114
115 bool isLoadingMainFrame() const; 115 bool isLoadingMainFrame() const;
116 116
117 bool shouldTreatURLAsSameAsCurrent(const KURL&) const; 117 bool shouldTreatURLAsSameAsCurrent(const KURL&) const;
118 bool shouldTreatURLAsSrcdocDocument(const KURL&) const; 118 bool shouldTreatURLAsSrcdocDocument(const KURL&) const;
119 119
120 FrameLoadType loadType() const; 120 FrameLoadType loadType() const;
121 void setLoadType(FrameLoadType loadType) { m_loadType = loadType; } 121 void setLoadType(FrameLoadType loadType) { m_loadType = loadType; }
122 122
123 FrameLoaderClient* client() const; 123 FrameLoaderClient* client() const;
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 278
279 SandboxFlags m_forcedSandboxFlags; 279 SandboxFlags m_forcedSandboxFlags;
280 280
281 bool m_dispatchingDidClearWindowObjectInMainWorld; 281 bool m_dispatchingDidClearWindowObjectInMainWorld;
282 bool m_protectProvisionalLoader; 282 bool m_protectProvisionalLoader;
283 }; 283 };
284 284
285 } // namespace blink 285 } // namespace blink
286 286
287 #endif // FrameLoader_h 287 #endif // FrameLoader_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698