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

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

Issue 1052993006: Refactor frame navigation/detach state cleanup to be more sane. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Minor test cleanup Created 5 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/dom/Document.cpp ('k') | Source/core/frame/LocalDOMWindow.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) 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 Dirk Mueller <mueller@kde.org> 5 * 2000 Dirk Mueller <mueller@kde.org>
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com)
8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com)
9 * Copyright (C) 2009 Google Inc. All rights reserved. 9 * Copyright (C) 2009 Google Inc. All rights reserved.
10 * 10 *
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 // Destroy |m_autoSizeInfo| as early as possible, to avoid dereferencing 179 // Destroy |m_autoSizeInfo| as early as possible, to avoid dereferencing
180 // partially destroyed |this| via |m_autoSizeInfo->m_frameView|. 180 // partially destroyed |this| via |m_autoSizeInfo->m_frameView|.
181 m_autoSizeInfo.clear(); 181 m_autoSizeInfo.clear();
182 182
183 if (m_postLayoutTasksTimer.isActive()) 183 if (m_postLayoutTasksTimer.isActive())
184 m_postLayoutTasksTimer.stop(); 184 m_postLayoutTasksTimer.stop();
185 185
186 if (m_didScrollTimer.isActive()) 186 if (m_didScrollTimer.isActive())
187 m_didScrollTimer.stop(); 187 m_didScrollTimer.stop();
188 188
189 // TODO(dcheng): Figure out why the dispose() method is virtual, and why it needs to
190 // call removeFromAXObjectCache() again.
189 removeFromAXObjectCache(); 191 removeFromAXObjectCache();
190 192
191 // Custom scrollbars should already be destroyed at this point 193 // Custom scrollbars should already be destroyed at this point
192 ASSERT(!horizontalScrollbar() || !horizontalScrollbar()->isCustomScrollbar() ); 194 ASSERT(!horizontalScrollbar() || !horizontalScrollbar()->isCustomScrollbar() );
193 ASSERT(!verticalScrollbar() || !verticalScrollbar()->isCustomScrollbar()); 195 ASSERT(!verticalScrollbar() || !verticalScrollbar()->isCustomScrollbar());
194 196
195 setHasHorizontalScrollbar(false); // Remove native scrollbars now before we lose the connection to the HostWindow. 197 setHasHorizontalScrollbar(false); // Remove native scrollbars now before we lose the connection to the HostWindow.
196 setHasVerticalScrollbar(false); 198 setHasVerticalScrollbar(false);
197 199
198 ASSERT(!m_scrollCorner); 200 ASSERT(!m_scrollCorner);
(...skipping 3892 matching lines...) Expand 10 before | Expand all | Expand 10 after
4091 { 4093 {
4092 Settings* settings = frame().settings(); 4094 Settings* settings = frame().settings();
4093 if (!settings || !settings->rootLayerScrolls()) 4095 if (!settings || !settings->rootLayerScrolls())
4094 return this; 4096 return this;
4095 4097
4096 LayoutView* layoutView = this->layoutView(); 4098 LayoutView* layoutView = this->layoutView();
4097 return layoutView ? layoutView->scrollableArea() : nullptr; 4099 return layoutView ? layoutView->scrollableArea() : nullptr;
4098 } 4100 }
4099 4101
4100 } // namespace blink 4102 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/dom/Document.cpp ('k') | Source/core/frame/LocalDOMWindow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698