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

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

Issue 204543004: DevTools: reset inspector agents before frame view is reset, but after the rest of the frame intera… (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 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 | « no previous file | Source/web/WebViewImpl.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) 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 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 ASSERT(!allPages().contains(this)); 145 ASSERT(!allPages().contains(this));
146 allPages().add(this); 146 allPages().add(this);
147 147
148 #ifndef NDEBUG 148 #ifndef NDEBUG
149 pageCounter.increment(); 149 pageCounter.increment();
150 #endif 150 #endif
151 } 151 }
152 152
153 Page::~Page() 153 Page::~Page()
154 { 154 {
155 // Disable all agents prior to resetting the frame view.
156 m_inspectorController->inspectedPageDestroyed();
157
155 m_mainFrame->setView(nullptr); 158 m_mainFrame->setView(nullptr);
156 allPages().remove(this); 159 allPages().remove(this);
157 if (ordinaryPages().contains(this)) 160 if (ordinaryPages().contains(this))
158 ordinaryPages().remove(this); 161 ordinaryPages().remove(this);
159 162
160 for (LocalFrame* frame = mainFrame(); frame; frame = frame->tree().traverseN ext()) { 163 for (LocalFrame* frame = mainFrame(); frame; frame = frame->tree().traverseN ext()) {
161 frame->willDetachFrameHost(); 164 frame->willDetachFrameHost();
162 frame->detachFromFrameHost(); 165 frame->detachFromFrameHost();
163 } 166 }
164 167
(...skipping 376 matching lines...) Expand 10 before | Expand all | Expand 10 after
541 , spellCheckerClient(0) 544 , spellCheckerClient(0)
542 , storageClient(0) 545 , storageClient(0)
543 { 546 {
544 } 547 }
545 548
546 Page::PageClients::~PageClients() 549 Page::PageClients::~PageClients()
547 { 550 {
548 } 551 }
549 552
550 } // namespace WebCore 553 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | Source/web/WebViewImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698