| OLD | NEW | 
|---|
| 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 163 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 174     m_destructionObservers.add(observer); | 174     m_destructionObservers.add(observer); | 
| 175 } | 175 } | 
| 176 | 176 | 
| 177 void Frame::removeDestructionObserver(FrameDestructionObserver* observer) | 177 void Frame::removeDestructionObserver(FrameDestructionObserver* observer) | 
| 178 { | 178 { | 
| 179     m_destructionObservers.remove(observer); | 179     m_destructionObservers.remove(observer); | 
| 180 } | 180 } | 
| 181 | 181 | 
| 182 void Frame::setView(PassRefPtr<FrameView> view) | 182 void Frame::setView(PassRefPtr<FrameView> view) | 
| 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->destroyR
     enderTree() | 
| 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()->attached()) { | 
| 194         // FIXME: We don't call willRemove here. Why is that OK? | 194         // FIXME: We don't call willRemove here. Why is that OK? | 
| (...skipping 516 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 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 | 
| OLD | NEW | 
|---|