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

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

Issue 218813002: Revert 170357 "Revert of Make DOMWrapperWorld::current() return ..." (Closed) Base URL: svn://svn.chromium.org/blink/
Patch Set: Created 6 years, 8 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 | « trunk/Source/core/loader/EmptyClients.h ('k') | trunk/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 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 140
141 void didExplicitOpen(); 141 void didExplicitOpen();
142 142
143 // Callbacks from DocumentWriter 143 // Callbacks from DocumentWriter
144 void didBeginDocument(bool dispatchWindowObjectAvailable); 144 void didBeginDocument(bool dispatchWindowObjectAvailable);
145 145
146 void receivedFirstData(); 146 void receivedFirstData();
147 147
148 String userAgent(const KURL&) const; 148 String userAgent(const KURL&) const;
149 149
150 void dispatchDidClearWindowObjectInWorld(DOMWrapperWorld*); 150 void dispatchDidClearWindowObjectInWorld(DOMWrapperWorld&);
151 void dispatchDidClearWindowObjectsInAllWorlds(); 151 void dispatchDidClearWindowObjectsInAllWorlds();
152 void dispatchDocumentElementAvailable(); 152 void dispatchDocumentElementAvailable();
153 153
154 // The following sandbox flags will be forced, regardless of changes to 154 // The following sandbox flags will be forced, regardless of changes to
155 // the sandbox attribute of any parent frames. 155 // the sandbox attribute of any parent frames.
156 void forceSandboxFlags(SandboxFlags flags) { m_forcedSandboxFlags |= flags; } 156 void forceSandboxFlags(SandboxFlags flags) { m_forcedSandboxFlags |= flags; }
157 SandboxFlags effectiveSandboxFlags() const; 157 SandboxFlags effectiveSandboxFlags() const;
158 158
159 LocalFrame* opener(); 159 LocalFrame* opener();
160 void setOpener(LocalFrame*); 160 void setOpener(LocalFrame*);
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 282
283 bool m_didAccessInitialDocument; 283 bool m_didAccessInitialDocument;
284 Timer<FrameLoader> m_didAccessInitialDocumentTimer; 284 Timer<FrameLoader> m_didAccessInitialDocumentTimer;
285 285
286 SandboxFlags m_forcedSandboxFlags; 286 SandboxFlags m_forcedSandboxFlags;
287 }; 287 };
288 288
289 } // namespace WebCore 289 } // namespace WebCore
290 290
291 #endif // FrameLoader_h 291 #endif // FrameLoader_h
OLDNEW
« no previous file with comments | « trunk/Source/core/loader/EmptyClients.h ('k') | trunk/Source/core/loader/FrameLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698