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

Side by Side Diff: Source/core/frame/LocalFrame.cpp

Issue 1170413003: Add a scoping object to help block scripting during plugin destruction. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rename static counter 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/dom/Document.cpp ('k') | Source/core/frame/RemoteFrame.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) 1998, 1999 Torben Weis <weis@kde.org> 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
3 * 1999 Lars Knoll <knoll@kde.org> 3 * 1999 Lars Knoll <knoll@kde.org>
4 * 1999 Antti Koivisto <koivisto@kde.org> 4 * 1999 Antti Koivisto <koivisto@kde.org>
5 * 2000 Simon Hausmann <hausmann@kde.org> 5 * 2000 Simon Hausmann <hausmann@kde.org>
6 * 2000 Stefan Schimanski <1Stein@gmx.de> 6 * 2000 Stefan Schimanski <1Stein@gmx.de>
7 * 2001 George Staikos <staikos@kde.org> 7 * 2001 George Staikos <staikos@kde.org>
8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> 9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com>
10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 #include "core/layout/compositing/DeprecatedPaintLayerCompositor.h" 58 #include "core/layout/compositing/DeprecatedPaintLayerCompositor.h"
59 #include "core/loader/FrameLoadRequest.h" 59 #include "core/loader/FrameLoadRequest.h"
60 #include "core/loader/FrameLoaderClient.h" 60 #include "core/loader/FrameLoaderClient.h"
61 #include "core/page/FocusController.h" 61 #include "core/page/FocusController.h"
62 #include "core/page/Page.h" 62 #include "core/page/Page.h"
63 #include "core/page/scrolling/ScrollingCoordinator.h" 63 #include "core/page/scrolling/ScrollingCoordinator.h"
64 #include "core/paint/DeprecatedPaintLayer.h" 64 #include "core/paint/DeprecatedPaintLayer.h"
65 #include "core/paint/TransformRecorder.h" 65 #include "core/paint/TransformRecorder.h"
66 #include "core/svg/SVGDocumentExtensions.h" 66 #include "core/svg/SVGDocumentExtensions.h"
67 #include "platform/DragImage.h" 67 #include "platform/DragImage.h"
68 #include "platform/PluginScriptForbiddenScope.h"
68 #include "platform/RuntimeEnabledFeatures.h" 69 #include "platform/RuntimeEnabledFeatures.h"
69 #include "platform/ScriptForbiddenScope.h" 70 #include "platform/ScriptForbiddenScope.h"
70 #include "platform/graphics/GraphicsContext.h" 71 #include "platform/graphics/GraphicsContext.h"
71 #include "platform/graphics/ImageBuffer.h" 72 #include "platform/graphics/ImageBuffer.h"
72 #include "platform/graphics/paint/ClipRecorder.h" 73 #include "platform/graphics/paint/ClipRecorder.h"
73 #include "platform/graphics/paint/DisplayItemListContextRecorder.h" 74 #include "platform/graphics/paint/DisplayItemListContextRecorder.h"
74 #include "platform/text/TextStream.h" 75 #include "platform/text/TextStream.h"
75 #include "wtf/PassOwnPtr.h" 76 #include "wtf/PassOwnPtr.h"
76 #include "wtf/StdLibExtras.h" 77 #include "wtf/StdLibExtras.h"
77 78
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 nullptr, m_loader.resourceRequestForReload(loadType, KURL(), clientR edirectPolicy)); 268 nullptr, m_loader.resourceRequestForReload(loadType, KURL(), clientR edirectPolicy));
268 request.setClientRedirect(clientRedirectPolicy); 269 request.setClientRedirect(clientRedirectPolicy);
269 m_loader.load(request, loadType); 270 m_loader.load(request, loadType);
270 } else { 271 } else {
271 m_navigationScheduler.scheduleReload(); 272 m_navigationScheduler.scheduleReload();
272 } 273 }
273 } 274 }
274 275
275 void LocalFrame::detach() 276 void LocalFrame::detach()
276 { 277 {
278 PluginScriptForbiddenScope forbidPluginDestructorScripting;
277 // A lot of the following steps can result in the current frame being 279 // A lot of the following steps can result in the current frame being
278 // detached, so protect a reference to it. 280 // detached, so protect a reference to it.
279 RefPtrWillBeRawPtr<LocalFrame> protect(this); 281 RefPtrWillBeRawPtr<LocalFrame> protect(this);
280 m_loader.stopAllLoaders(); 282 m_loader.stopAllLoaders();
281 m_loader.dispatchUnloadEvent(); 283 m_loader.dispatchUnloadEvent();
282 detachChildren(); 284 detachChildren();
283 // stopAllLoaders() needs to be called after detachChildren(), because detac hChildren() 285 // stopAllLoaders() needs to be called after detachChildren(), because detac hChildren()
284 // will trigger the unload event handlers of any child frames, and those eve nt 286 // will trigger the unload event handlers of any child frames, and those eve nt
285 // handlers might start a new subresource load in this frame. 287 // handlers might start a new subresource load in this frame.
286 m_loader.stopAllLoaders(); 288 m_loader.stopAllLoaders();
(...skipping 536 matching lines...) Expand 10 before | Expand all | Expand 10 after
823 , m_textZoomFactor(parentTextZoomFactor(this)) 825 , m_textZoomFactor(parentTextZoomFactor(this))
824 , m_inViewSourceMode(false) 826 , m_inViewSourceMode(false)
825 { 827 {
826 if (isLocalRoot()) 828 if (isLocalRoot())
827 m_instrumentingAgents = InstrumentingAgents::create(); 829 m_instrumentingAgents = InstrumentingAgents::create();
828 else 830 else
829 m_instrumentingAgents = localFrameRoot()->m_instrumentingAgents; 831 m_instrumentingAgents = localFrameRoot()->m_instrumentingAgents;
830 } 832 }
831 833
832 } // namespace blink 834 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/dom/Document.cpp ('k') | Source/core/frame/RemoteFrame.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698