| 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 215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 226 ASSERT(fabs(originalSize.height()) > std::numeric_limits<float>::epsilon
()); | 226 ASSERT(fabs(originalSize.height()) > std::numeric_limits<float>::epsilon
()); |
| 227 float ratio = originalSize.width() / originalSize.height(); | 227 float ratio = originalSize.width() / originalSize.height(); |
| 228 resultSize.setHeight(floorf(expectedSize.height())); | 228 resultSize.setHeight(floorf(expectedSize.height())); |
| 229 resultSize.setWidth(floorf(resultSize.height() * ratio)); | 229 resultSize.setWidth(floorf(resultSize.height() * ratio)); |
| 230 } | 230 } |
| 231 return resultSize; | 231 return resultSize; |
| 232 } | 232 } |
| 233 | 233 |
| 234 void LocalFrame::setDOMWindow(PassRefPtrWillBeRawPtr<LocalDOMWindow> domWindow) | 234 void LocalFrame::setDOMWindow(PassRefPtrWillBeRawPtr<LocalDOMWindow> domWindow) |
| 235 { | 235 { |
| 236 InspectorInstrumentation::frameWindowDiscarded(this, m_domWindow.get()); | 236 if (m_domWindow) { |
| 237 console().messageStorage()->frameWindowDiscarded(m_domWindow.get()); |
| 238 InspectorInstrumentation::frameWindowDiscarded(this, m_domWindow.get()); |
| 239 } |
| 237 if (domWindow) | 240 if (domWindow) |
| 238 script().clearWindowProxy(); | 241 script().clearWindowProxy(); |
| 239 Frame::setDOMWindow(domWindow); | 242 Frame::setDOMWindow(domWindow); |
| 240 } | 243 } |
| 241 | 244 |
| 242 void LocalFrame::didChangeVisibilityState() | 245 void LocalFrame::didChangeVisibilityState() |
| 243 { | 246 { |
| 244 if (document()) | 247 if (document()) |
| 245 document()->didChangeVisibilityState(); | 248 document()->didChangeVisibilityState(); |
| 246 | 249 |
| (...skipping 428 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 675 | 678 |
| 676 return curFrame; | 679 return curFrame; |
| 677 } | 680 } |
| 678 | 681 |
| 679 void LocalFrame::setPagePopupOwner(Element& owner) | 682 void LocalFrame::setPagePopupOwner(Element& owner) |
| 680 { | 683 { |
| 681 m_pagePopupOwner = &owner; | 684 m_pagePopupOwner = &owner; |
| 682 } | 685 } |
| 683 | 686 |
| 684 } // namespace blink | 687 } // namespace blink |
| OLD | NEW |