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

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

Issue 476083002: Cleanup FrameLoader::opener() to return a Frame*. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 4 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/frame/LocalDOMWindow.cpp ('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 30 matching lines...) Expand all
41 #include "core/loader/HistoryItem.h" 41 #include "core/loader/HistoryItem.h"
42 #include "core/loader/MixedContentChecker.h" 42 #include "core/loader/MixedContentChecker.h"
43 #include "platform/Timer.h" 43 #include "platform/Timer.h"
44 #include "platform/network/ResourceRequest.h" 44 #include "platform/network/ResourceRequest.h"
45 #include "wtf/Forward.h" 45 #include "wtf/Forward.h"
46 #include "wtf/HashSet.h" 46 #include "wtf/HashSet.h"
47 #include "wtf/OwnPtr.h" 47 #include "wtf/OwnPtr.h"
48 48
49 namespace blink { 49 namespace blink {
50 50
51 class Resource;
52 class Chrome; 51 class Chrome;
53 class DOMWrapperWorld; 52 class DOMWrapperWorld;
54 class DocumentLoader; 53 class DocumentLoader;
55 class Event; 54 class Event;
56 class FetchContext; 55 class FetchContext;
57 class FormState; 56 class FormState;
58 class FormSubmission; 57 class FormSubmission;
58 class Frame;
59 class FrameLoaderClient; 59 class FrameLoaderClient;
60 class IconController; 60 class IconController;
61 class NavigationAction; 61 class NavigationAction;
62 class Page; 62 class Page;
63 class ProgressTracker; 63 class ProgressTracker;
64 class Resource;
Nate Chapin 2014/08/15 18:59:17 Not your fault, but is this forward declare actual
dcheng 2014/08/16 19:56:25 It does not appear to be needed. Removed.
64 class ResourceError; 65 class ResourceError;
65 class ResourceResponse; 66 class ResourceResponse;
66 class SecurityOrigin; 67 class SecurityOrigin;
67 class SerializedScriptValue; 68 class SerializedScriptValue;
68 class SubstituteData; 69 class SubstituteData;
69 70
70 struct FrameLoadRequest; 71 struct FrameLoadRequest;
71 struct WindowFeatures; 72 struct WindowFeatures;
72 73
73 bool isBackForwardLoadType(FrameLoadType); 74 bool isBackForwardLoadType(FrameLoadType);
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 149
149 void dispatchDidClearWindowObjectInMainWorld(); 150 void dispatchDidClearWindowObjectInMainWorld();
150 void dispatchDidClearDocumentOfWindowObject(); 151 void dispatchDidClearDocumentOfWindowObject();
151 void dispatchDocumentElementAvailable(); 152 void dispatchDocumentElementAvailable();
152 153
153 // The following sandbox flags will be forced, regardless of changes to 154 // The following sandbox flags will be forced, regardless of changes to
154 // the sandbox attribute of any parent frames. 155 // the sandbox attribute of any parent frames.
155 void forceSandboxFlags(SandboxFlags flags) { m_forcedSandboxFlags |= flags; } 156 void forceSandboxFlags(SandboxFlags flags) { m_forcedSandboxFlags |= flags; }
156 SandboxFlags effectiveSandboxFlags() const; 157 SandboxFlags effectiveSandboxFlags() const;
157 158
158 LocalFrame* opener(); 159 Frame* opener();
159 void setOpener(LocalFrame*); 160 void setOpener(LocalFrame*);
160 161
161 void detachFromParent(); 162 void detachFromParent();
162 163
163 void loadDone(); 164 void loadDone();
164 void finishedParsing(); 165 void finishedParsing();
165 void checkCompleted(); 166 void checkCompleted();
166 167
167 void commitProvisionalLoad(); 168 void commitProvisionalLoad();
168 169
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 Timer<FrameLoader> m_didAccessInitialDocumentTimer; 278 Timer<FrameLoader> m_didAccessInitialDocumentTimer;
278 279
279 SandboxFlags m_forcedSandboxFlags; 280 SandboxFlags m_forcedSandboxFlags;
280 281
281 bool m_willDetachClient; 282 bool m_willDetachClient;
282 }; 283 };
283 284
284 } // namespace blink 285 } // namespace blink
285 286
286 #endif // FrameLoader_h 287 #endif // FrameLoader_h
OLDNEW
« no previous file with comments | « Source/core/frame/LocalDOMWindow.cpp ('k') | Source/core/loader/FrameLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698