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

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

Issue 24773003: Rename Node::attached() to confusingAndOftenMisusedAttached() (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/page/DOMWindow.cpp ('k') | Source/core/rendering/RenderCounter.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 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 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 { 183 {
184 // We the custom scroll bars as early as possible to prevent m_doc->detach() 184 // We the custom scroll bars as early as possible to prevent m_doc->detach()
185 // from messing with the view such that its scroll bars won't be torn down. 185 // from messing with the view such that its scroll bars won't be torn down.
186 // FIXME: We should revisit this. 186 // FIXME: We should revisit this.
187 if (m_view) 187 if (m_view)
188 m_view->prepareForDetach(); 188 m_view->prepareForDetach();
189 189
190 // Prepare for destruction now, so any unload event handlers get run and the DOMWindow is 190 // Prepare for destruction now, so any unload event handlers get run and the DOMWindow is
191 // notified. If we wait until the view is destroyed, then things won't be ho oked up enough for 191 // notified. If we wait until the view is destroyed, then things won't be ho oked up enough for
192 // these calls to work. 192 // these calls to work.
193 if (!view && document() && document()->attached()) { 193 if (!view && document() && document()->confusingAndOftenMisusedAttached()) {
194 // FIXME: We don't call willRemove here. Why is that OK? 194 // FIXME: We don't call willRemove here. Why is that OK?
195 document()->prepareForDestruction(); 195 document()->prepareForDestruction();
196 } 196 }
197 197
198 if (m_view) 198 if (m_view)
199 m_view->unscheduleRelayout(); 199 m_view->unscheduleRelayout();
200 200
201 eventHandler()->clear(); 201 eventHandler()->clear();
202 202
203 m_view = view; 203 m_view = view;
(...skipping 507 matching lines...) Expand 10 before | Expand all | Expand 10 after
711 if (!m_page) 711 if (!m_page)
712 return 0; 712 return 0;
713 713
714 double ratio = m_page->deviceScaleFactor(); 714 double ratio = m_page->deviceScaleFactor();
715 if (RuntimeEnabledFeatures::devicePixelRatioIncludesZoomEnabled()) 715 if (RuntimeEnabledFeatures::devicePixelRatioIncludesZoomEnabled())
716 ratio *= pageZoomFactor(); 716 ratio *= pageZoomFactor();
717 return ratio; 717 return ratio;
718 } 718 }
719 719
720 } // namespace WebCore 720 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/page/DOMWindow.cpp ('k') | Source/core/rendering/RenderCounter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698