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

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

Issue 1176843006: Move window.close implementation to DOMWindow (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Remove resetting of the main view. 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/frame/LocalFrame.h ('k') | Source/core/frame/RemoteDOMWindow.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 332 matching lines...) Expand 10 before | Expand all | Expand 10 after
343 // First give the plugin elements holding persisted, 343 // First give the plugin elements holding persisted,
344 // renderer-less plugins the opportunity to dispose of them. 344 // renderer-less plugins the opportunity to dispose of them.
345 for (const auto& pluginElement : m_pluginElements) 345 for (const auto& pluginElement : m_pluginElements)
346 pluginElement->disconnectContentFrame(); 346 pluginElement->disconnectContentFrame();
347 m_pluginElements.clear(); 347 m_pluginElements.clear();
348 #endif 348 #endif
349 } 349 }
350 Frame::disconnectOwnerElement(); 350 Frame::disconnectOwnerElement();
351 } 351 }
352 352
353 bool LocalFrame::shouldClose()
354 {
355 // TODO(dcheng): This should be fixed to dispatch beforeunload events to
356 // both local and remote frames.
357 return m_loader.shouldClose();
358 }
359
353 void LocalFrame::willDetachFrameHost() 360 void LocalFrame::willDetachFrameHost()
354 { 361 {
355 LocalFrameLifecycleNotifier::notifyWillDetachFrameHost(); 362 LocalFrameLifecycleNotifier::notifyWillDetachFrameHost();
356 363
357 // FIXME: Page should take care of updating focus/scrolling instead of Frame . 364 // FIXME: Page should take care of updating focus/scrolling instead of Frame .
358 // FIXME: It's unclear as to why this is called more than once, but it is, 365 // FIXME: It's unclear as to why this is called more than once, but it is,
359 // so page() could be null. 366 // so page() could be null.
360 if (page() && page()->focusController().focusedFrame() == this) 367 if (page() && page()->focusController().focusedFrame() == this)
361 page()->focusController().setFocusedFrame(nullptr); 368 page()->focusController().setFocusedFrame(nullptr);
362 script().clearScriptObjects(); 369 script().clearScriptObjects();
(...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after
833 , m_textZoomFactor(parentTextZoomFactor(this)) 840 , m_textZoomFactor(parentTextZoomFactor(this))
834 , m_inViewSourceMode(false) 841 , m_inViewSourceMode(false)
835 { 842 {
836 if (isLocalRoot()) 843 if (isLocalRoot())
837 m_instrumentingAgents = InstrumentingAgents::create(); 844 m_instrumentingAgents = InstrumentingAgents::create();
838 else 845 else
839 m_instrumentingAgents = localFrameRoot()->m_instrumentingAgents; 846 m_instrumentingAgents = localFrameRoot()->m_instrumentingAgents;
840 } 847 }
841 848
842 } // namespace blink 849 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/frame/LocalFrame.h ('k') | Source/core/frame/RemoteDOMWindow.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698