| 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 30 matching lines...) Expand all Loading... |
| 41 #include "core/events/Event.h" | 41 #include "core/events/Event.h" |
| 42 #include "core/fetch/ResourceFetcher.h" | 42 #include "core/fetch/ResourceFetcher.h" |
| 43 #include "core/frame/EventHandlerRegistry.h" | 43 #include "core/frame/EventHandlerRegistry.h" |
| 44 #include "core/frame/FrameConsole.h" | 44 #include "core/frame/FrameConsole.h" |
| 45 #include "core/frame/FrameDestructionObserver.h" | 45 #include "core/frame/FrameDestructionObserver.h" |
| 46 #include "core/frame/FrameHost.h" | 46 #include "core/frame/FrameHost.h" |
| 47 #include "core/frame/FrameView.h" | 47 #include "core/frame/FrameView.h" |
| 48 #include "core/frame/LocalDOMWindow.h" | 48 #include "core/frame/LocalDOMWindow.h" |
| 49 #include "core/frame/Settings.h" | 49 #include "core/frame/Settings.h" |
| 50 #include "core/html/HTMLFrameElementBase.h" | 50 #include "core/html/HTMLFrameElementBase.h" |
| 51 #include "core/inspector/ConsoleMessageStorage.h" |
| 51 #include "core/inspector/InspectorInstrumentation.h" | 52 #include "core/inspector/InspectorInstrumentation.h" |
| 52 #include "core/loader/FrameLoaderClient.h" | 53 #include "core/loader/FrameLoaderClient.h" |
| 53 #include "core/page/Chrome.h" | 54 #include "core/page/Chrome.h" |
| 54 #include "core/page/EventHandler.h" | 55 #include "core/page/EventHandler.h" |
| 55 #include "core/page/FocusController.h" | 56 #include "core/page/FocusController.h" |
| 56 #include "core/page/Page.h" | 57 #include "core/page/Page.h" |
| 57 #include "core/page/scrolling/ScrollingCoordinator.h" | 58 #include "core/page/scrolling/ScrollingCoordinator.h" |
| 58 #include "core/rendering/HitTestResult.h" | 59 #include "core/rendering/HitTestResult.h" |
| 59 #include "core/rendering/RenderLayer.h" | 60 #include "core/rendering/RenderLayer.h" |
| 60 #include "core/rendering/RenderView.h" | 61 #include "core/rendering/RenderView.h" |
| (...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 226 ASSERT(fabs(originalSize.height()) > std::numeric_limits<float>::epsilon
()); | 227 ASSERT(fabs(originalSize.height()) > std::numeric_limits<float>::epsilon
()); |
| 227 float ratio = originalSize.width() / originalSize.height(); | 228 float ratio = originalSize.width() / originalSize.height(); |
| 228 resultSize.setHeight(floorf(expectedSize.height())); | 229 resultSize.setHeight(floorf(expectedSize.height())); |
| 229 resultSize.setWidth(floorf(resultSize.height() * ratio)); | 230 resultSize.setWidth(floorf(resultSize.height() * ratio)); |
| 230 } | 231 } |
| 231 return resultSize; | 232 return resultSize; |
| 232 } | 233 } |
| 233 | 234 |
| 234 void LocalFrame::setDOMWindow(PassRefPtrWillBeRawPtr<LocalDOMWindow> domWindow) | 235 void LocalFrame::setDOMWindow(PassRefPtrWillBeRawPtr<LocalDOMWindow> domWindow) |
| 235 { | 236 { |
| 236 InspectorInstrumentation::frameWindowDiscarded(this, m_domWindow.get()); | 237 if (m_domWindow) { |
| 238 console().messageStorage()->frameWindowDiscarded(m_domWindow.get()); |
| 239 InspectorInstrumentation::frameWindowDiscarded(this, m_domWindow.get()); |
| 240 } |
| 237 if (domWindow) | 241 if (domWindow) |
| 238 script().clearWindowProxy(); | 242 script().clearWindowProxy(); |
| 239 Frame::setDOMWindow(domWindow); | 243 Frame::setDOMWindow(domWindow); |
| 240 } | 244 } |
| 241 | 245 |
| 242 void LocalFrame::didChangeVisibilityState() | 246 void LocalFrame::didChangeVisibilityState() |
| 243 { | 247 { |
| 244 if (document()) | 248 if (document()) |
| 245 document()->didChangeVisibilityState(); | 249 document()->didChangeVisibilityState(); |
| 246 | 250 |
| (...skipping 428 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 675 | 679 |
| 676 return curFrame; | 680 return curFrame; |
| 677 } | 681 } |
| 678 | 682 |
| 679 void LocalFrame::setPagePopupOwner(Element& owner) | 683 void LocalFrame::setPagePopupOwner(Element& owner) |
| 680 { | 684 { |
| 681 m_pagePopupOwner = &owner; | 685 m_pagePopupOwner = &owner; |
| 682 } | 686 } |
| 683 | 687 |
| 684 } // namespace blink | 688 } // namespace blink |
| OLD | NEW |