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

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

Issue 1483733002: Remove support for NPObjects. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 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
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 387 matching lines...) Expand 10 before | Expand all | Expand 10 after
398 398
399 void LocalFrame::willDetachFrameHost() 399 void LocalFrame::willDetachFrameHost()
400 { 400 {
401 LocalFrameLifecycleNotifier::notifyWillDetachFrameHost(); 401 LocalFrameLifecycleNotifier::notifyWillDetachFrameHost();
402 402
403 // FIXME: Page should take care of updating focus/scrolling instead of Frame . 403 // FIXME: Page should take care of updating focus/scrolling instead of Frame .
404 // FIXME: It's unclear as to why this is called more than once, but it is, 404 // FIXME: It's unclear as to why this is called more than once, but it is,
405 // so page() could be null. 405 // so page() could be null.
406 if (page() && page()->focusController().focusedFrame() == this) 406 if (page() && page()->focusController().focusedFrame() == this)
407 page()->focusController().setFocusedFrame(nullptr); 407 page()->focusController().setFocusedFrame(nullptr);
408 script().clearScriptObjects();
409 408
410 if (page() && page()->scrollingCoordinator() && m_view) 409 if (page() && page()->scrollingCoordinator() && m_view)
411 page()->scrollingCoordinator()->willDestroyScrollableArea(m_view.get()); 410 page()->scrollingCoordinator()->willDestroyScrollableArea(m_view.get());
412 } 411 }
413 412
414 void LocalFrame::setDOMWindow(PassRefPtrWillBeRawPtr<LocalDOMWindow> domWindow) 413 void LocalFrame::setDOMWindow(PassRefPtrWillBeRawPtr<LocalDOMWindow> domWindow)
415 { 414 {
416 // Oilpan: setDOMWindow() cannot be used when finalizing. Which 415 // Oilpan: setDOMWindow() cannot be used when finalizing. Which
417 // is acceptable as its actions are either not needed or handled 416 // is acceptable as its actions are either not needed or handled
418 // by other means -- 417 // by other means --
(...skipping 456 matching lines...) Expand 10 before | Expand all | Expand 10 after
875 { 874 {
876 m_frame->disableNavigation(); 875 m_frame->disableNavigation();
877 } 876 }
878 877
879 FrameNavigationDisabler::~FrameNavigationDisabler() 878 FrameNavigationDisabler::~FrameNavigationDisabler()
880 { 879 {
881 m_frame->enableNavigation(); 880 m_frame->enableNavigation();
882 } 881 }
883 882
884 } // namespace blink 883 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/bindings/core/v8/v8.gypi ('k') | third_party/WebKit/Source/core/html/HTMLPlugInElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698