| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) | 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 #include "core/editing/Editor.h" | 46 #include "core/editing/Editor.h" |
| 47 #include "core/events/DOMWindowEventQueue.h" | 47 #include "core/events/DOMWindowEventQueue.h" |
| 48 #include "core/events/HashChangeEvent.h" | 48 #include "core/events/HashChangeEvent.h" |
| 49 #include "core/events/MessageEvent.h" | 49 #include "core/events/MessageEvent.h" |
| 50 #include "core/events/PageTransitionEvent.h" | 50 #include "core/events/PageTransitionEvent.h" |
| 51 #include "core/events/PopStateEvent.h" | 51 #include "core/events/PopStateEvent.h" |
| 52 #include "core/events/ScopedEventQueue.h" | 52 #include "core/events/ScopedEventQueue.h" |
| 53 #include "core/fetch/ResourceFetcher.h" | 53 #include "core/fetch/ResourceFetcher.h" |
| 54 #include "core/frame/BarProp.h" | 54 #include "core/frame/BarProp.h" |
| 55 #include "core/frame/DOMVisualViewport.h" | 55 #include "core/frame/DOMVisualViewport.h" |
| 56 #include "core/frame/DOMWindowProperty.h" |
| 56 #include "core/frame/EventHandlerRegistry.h" | 57 #include "core/frame/EventHandlerRegistry.h" |
| 57 #include "core/frame/FrameConsole.h" | 58 #include "core/frame/FrameConsole.h" |
| 58 #include "core/frame/FrameView.h" | 59 #include "core/frame/FrameView.h" |
| 59 #include "core/frame/History.h" | 60 #include "core/frame/History.h" |
| 60 #include "core/frame/LocalFrame.h" | 61 #include "core/frame/LocalFrame.h" |
| 61 #include "core/frame/Navigator.h" | 62 #include "core/frame/Navigator.h" |
| 62 #include "core/frame/Screen.h" | 63 #include "core/frame/Screen.h" |
| 63 #include "core/frame/ScrollToOptions.h" | 64 #include "core/frame/ScrollToOptions.h" |
| 64 #include "core/frame/Settings.h" | 65 #include "core/frame/Settings.h" |
| 65 #include "core/frame/SuspendableTimer.h" | 66 #include "core/frame/SuspendableTimer.h" |
| (...skipping 1568 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1634 | 1635 |
| 1635 LocalFrame* LocalDOMWindow::frame() const { | 1636 LocalFrame* LocalDOMWindow::frame() const { |
| 1636 // If the LocalDOMWindow still has a frame reference, that frame must point | 1637 // If the LocalDOMWindow still has a frame reference, that frame must point |
| 1637 // back to this LocalDOMWindow: otherwise, it's easy to get into a situation | 1638 // back to this LocalDOMWindow: otherwise, it's easy to get into a situation |
| 1638 // where script execution leaks between different LocalDOMWindows. | 1639 // where script execution leaks between different LocalDOMWindows. |
| 1639 SECURITY_DCHECK(!m_frame || m_frame->domWindow() == this); | 1640 SECURITY_DCHECK(!m_frame || m_frame->domWindow() == this); |
| 1640 return m_frame; | 1641 return m_frame; |
| 1641 } | 1642 } |
| 1642 | 1643 |
| 1643 } // namespace blink | 1644 } // namespace blink |
| OLD | NEW |