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

Side by Side Diff: Source/WebCore/page/Frame.cpp

Issue 8028048: Merge 95093 - 2011-09-13 Pavel Feldman <pfeldman@google.com> (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/835/
Patch Set: Created 9 years, 2 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
« no previous file with comments | « Source/WebCore/inspector/InspectorPageAgent.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) 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 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 #endif 232 #endif
233 233
234 HashSet<DOMWindow*>::iterator end = m_liveFormerWindows.end(); 234 HashSet<DOMWindow*>::iterator end = m_liveFormerWindows.end();
235 for (HashSet<DOMWindow*>::iterator it = m_liveFormerWindows.begin(); it != e nd; ++it) 235 for (HashSet<DOMWindow*>::iterator it = m_liveFormerWindows.begin(); it != e nd; ++it)
236 (*it)->disconnectFrame(); 236 (*it)->disconnectFrame();
237 237
238 HashSet<FrameDestructionObserver*>::iterator stop = m_destructionObservers.e nd(); 238 HashSet<FrameDestructionObserver*>::iterator stop = m_destructionObservers.e nd();
239 for (HashSet<FrameDestructionObserver*>::iterator it = m_destructionObserver s.begin(); it != stop; ++it) 239 for (HashSet<FrameDestructionObserver*>::iterator it = m_destructionObserver s.begin(); it != stop; ++it)
240 (*it)->frameDestroyed(); 240 (*it)->frameDestroyed();
241 241
242 InspectorInstrumentation::frameDestroyed(this);
243
244 if (m_view) { 242 if (m_view) {
245 m_view->hide(); 243 m_view->hide();
246 m_view->clearFrame(); 244 m_view->clearFrame();
247 } 245 }
248 246
249 ASSERT(!m_lifeSupportTimer.isActive()); 247 ASSERT(!m_lifeSupportTimer.isActive());
250 } 248 }
251 249
252 void Frame::addDestructionObserver(FrameDestructionObserver* observer) 250 void Frame::addDestructionObserver(FrameDestructionObserver* observer)
253 { 251 {
(...skipping 855 matching lines...) Expand 10 before | Expand all | Expand 10 after
1109 unsigned count = 0; 1107 unsigned count = 0;
1110 for (const Frame* frame = this; frame; frame = frame->tree()->traverseNext() ) { 1108 for (const Frame* frame = this; frame; frame = frame->tree()->traverseNext() ) {
1111 if (frame->document()) 1109 if (frame->document())
1112 count += frame->document()->wheelEventHandlerCount(); 1110 count += frame->document()->wheelEventHandlerCount();
1113 } 1111 }
1114 1112
1115 m_page->chrome()->client()->numWheelEventHandlersChanged(count); 1113 m_page->chrome()->client()->numWheelEventHandlersChanged(count);
1116 } 1114 }
1117 1115
1118 } // namespace WebCore 1116 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/WebCore/inspector/InspectorPageAgent.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698