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

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

Issue 520213002: Make SecurityContext available in RemoteFrames. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 6 years, 1 month 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 | « Source/core/frame/LocalFrame.h ('k') | Source/core/frame/RemoteFrame.h » ('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 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 InspectorInstrumentation::frameDetachedFromParent(this); 274 InspectorInstrumentation::frameDetachedFromParent(this);
275 Frame::detach(); 275 Frame::detach();
276 #if ENABLE(OILPAN) 276 #if ENABLE(OILPAN)
277 // Clear the FrameLoader right here rather than during 277 // Clear the FrameLoader right here rather than during
278 // finalization. Too late to access various heap objects at that 278 // finalization. Too late to access various heap objects at that
279 // stage. 279 // stage.
280 loader().clear(); 280 loader().clear();
281 #endif 281 #endif
282 } 282 }
283 283
284 SecurityContext* LocalFrame::securityContext() const
285 {
286 return document();
287 }
288
284 void LocalFrame::disconnectOwnerElement() 289 void LocalFrame::disconnectOwnerElement()
285 { 290 {
286 if (owner()) { 291 if (owner()) {
287 if (Document* document = this->document()) 292 if (Document* document = this->document())
288 document->topDocument().clearAXObjectCache(); 293 document->topDocument().clearAXObjectCache();
289 #if ENABLE(OILPAN) 294 #if ENABLE(OILPAN)
290 // First give the plugin elements holding persisted, 295 // First give the plugin elements holding persisted,
291 // renderer-less plugins the opportunity to dispose of them. 296 // renderer-less plugins the opportunity to dispose of them.
292 for (const auto& pluginElement : m_pluginElements) 297 for (const auto& pluginElement : m_pluginElements)
293 pluginElement->disconnectContentFrame(); 298 pluginElement->disconnectContentFrame();
(...skipping 494 matching lines...) Expand 10 before | Expand all | Expand 10 after
788 // We detach the FrameView's custom scroll bars as early as 793 // We detach the FrameView's custom scroll bars as early as
789 // possible to prevent m_doc->detach() from messing with the view 794 // possible to prevent m_doc->detach() from messing with the view
790 // such that its scroll bars won't be torn down. 795 // such that its scroll bars won't be torn down.
791 // 796 //
792 // FIXME: We should revisit this. 797 // FIXME: We should revisit this.
793 if (m_view) 798 if (m_view)
794 m_view->prepareForDetach(); 799 m_view->prepareForDetach();
795 } 800 }
796 801
797 } // namespace blink 802 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/frame/LocalFrame.h ('k') | Source/core/frame/RemoteFrame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698