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

Side by Side Diff: Source/core/page/Page.cpp

Issue 419863004: Refactor frame detach to work for both local and remote frames. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix comment typo Created 6 years, 4 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/loader/FrameLoader.cpp ('k') | no next file » | 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) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All R ights Reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All R ights Reserved.
3 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 3 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 584 matching lines...) Expand 10 before | Expand all | Expand 10 after
595 visitor->trace(m_multisamplingChangedObservers); 595 visitor->trace(m_multisamplingChangedObservers);
596 visitor->trace(m_frameHost); 596 visitor->trace(m_frameHost);
597 #endif 597 #endif
598 WillBeHeapSupplementable<Page>::trace(visitor); 598 WillBeHeapSupplementable<Page>::trace(visitor);
599 } 599 }
600 600
601 void Page::willBeDestroyed() 601 void Page::willBeDestroyed()
602 { 602 {
603 RefPtr<Frame> mainFrame = m_mainFrame; 603 RefPtr<Frame> mainFrame = m_mainFrame;
604 604
605 if (mainFrame->isLocalFrame()) 605 mainFrame->detach();
606 toLocalFrame(mainFrame.get())->loader().frameDetached();
607 606
608 // Disable all agents prior to resetting the frame view. 607 // Disable all agents prior to resetting the frame view.
609 m_inspectorController->willBeDestroyed(); 608 m_inspectorController->willBeDestroyed();
610 609
611 if (mainFrame->isLocalFrame()) { 610 if (mainFrame->isLocalFrame()) {
612 toLocalFrame(mainFrame.get())->setView(nullptr); 611 toLocalFrame(mainFrame.get())->setView(nullptr);
613 } else { 612 } else {
614 ASSERT(m_mainFrame->isRemoteFrame()); 613 ASSERT(m_mainFrame->isRemoteFrame());
615 toRemoteFrame(mainFrame.get())->setView(nullptr); 614 toRemoteFrame(mainFrame.get())->setView(nullptr);
616 } 615 }
(...skipping 26 matching lines...) Expand all
643 , spellCheckerClient(0) 642 , spellCheckerClient(0)
644 , storageClient(0) 643 , storageClient(0)
645 { 644 {
646 } 645 }
647 646
648 Page::PageClients::~PageClients() 647 Page::PageClients::~PageClients()
649 { 648 {
650 } 649 }
651 650
652 } // namespace blink 651 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/loader/FrameLoader.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698