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

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

Issue 1161983005: FrameLoader: Prevent reentrancy on dispatchDidClearWindowObjectInMainWorld. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 6 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
« no previous file with comments | « no previous file | Source/core/loader/FrameLoader.cpp » ('j') | Source/core/loader/FrameLoader.cpp » ('J')
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 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 DeferredHistoryLoad m_deferredHistoryLoad; 248 DeferredHistoryLoad m_deferredHistoryLoad;
249 249
250 bool m_inStopAllLoaders; 250 bool m_inStopAllLoaders;
251 251
252 Timer<FrameLoader> m_checkTimer; 252 Timer<FrameLoader> m_checkTimer;
253 253
254 bool m_didAccessInitialDocument; 254 bool m_didAccessInitialDocument;
255 Timer<FrameLoader> m_didAccessInitialDocumentTimer; 255 Timer<FrameLoader> m_didAccessInitialDocumentTimer;
256 256
257 SandboxFlags m_forcedSandboxFlags; 257 SandboxFlags m_forcedSandboxFlags;
258
259 bool m_dispatchingDidClearWindowObjectInMainWorld;
chrishtr 2015/05/28 22:09:25 Initialize to false in the constructor.
tommycli 2015/05/28 22:19:36 Done.
258 }; 260 };
259 261
260 } // namespace blink 262 } // namespace blink
261 263
262 #endif // FrameLoader_h 264 #endif // FrameLoader_h
OLDNEW
« no previous file with comments | « no previous file | Source/core/loader/FrameLoader.cpp » ('j') | Source/core/loader/FrameLoader.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698