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

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

Issue 156943004: Remove minimum layout delay (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 10 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/FrameView.h » ('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 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 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 m_view->prepareForDetach(); 192 m_view->prepareForDetach();
193 193
194 // Prepare for destruction now, so any unload event handlers get run and the DOMWindow is 194 // Prepare for destruction now, so any unload event handlers get run and the DOMWindow is
195 // notified. If we wait until the view is destroyed, then things won't be ho oked up enough for 195 // notified. If we wait until the view is destroyed, then things won't be ho oked up enough for
196 // these calls to work. 196 // these calls to work.
197 if (!view && document() && document()->isActive()) { 197 if (!view && document() && document()->isActive()) {
198 // FIXME: We don't call willRemove here. Why is that OK? 198 // FIXME: We don't call willRemove here. Why is that OK?
199 document()->prepareForDestruction(); 199 document()->prepareForDestruction();
200 } 200 }
201 201
202 if (m_view)
203 m_view->unscheduleRelayout();
204
205 eventHandler().clear(); 202 eventHandler().clear();
206 203
207 m_view = view; 204 m_view = view;
208 205
209 if (m_view && isMainFrame()) 206 if (m_view && isMainFrame())
210 m_view->setVisibleContentScaleFactor(page()->pageScaleFactor()); 207 m_view->setVisibleContentScaleFactor(page()->pageScaleFactor());
211 } 208 }
212 209
213 void Frame::sendOrientationChangeEvent(int orientation) 210 void Frame::sendOrientationChangeEvent(int orientation)
214 { 211 {
(...skipping 523 matching lines...) Expand 10 before | Expand all | Expand 10 after
738 { 735 {
739 if (!m_host) 736 if (!m_host)
740 return 0; 737 return 0;
741 738
742 double ratio = m_host->deviceScaleFactor(); 739 double ratio = m_host->deviceScaleFactor();
743 ratio *= pageZoomFactor(); 740 ratio *= pageZoomFactor();
744 return ratio; 741 return ratio;
745 } 742 }
746 743
747 } // namespace WebCore 744 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/dom/Document.cpp ('k') | Source/core/frame/FrameView.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698