| 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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 45 #include "core/events/HashChangeEvent.h" | 45 #include "core/events/HashChangeEvent.h" |
| 46 #include "core/events/MessageEvent.h" | 46 #include "core/events/MessageEvent.h" |
| 47 #include "core/events/PageTransitionEvent.h" | 47 #include "core/events/PageTransitionEvent.h" |
| 48 #include "core/events/PopStateEvent.h" | 48 #include "core/events/PopStateEvent.h" |
| 49 #include "core/events/ScopedEventQueue.h" | 49 #include "core/events/ScopedEventQueue.h" |
| 50 #include "core/frame/BarProp.h" | 50 #include "core/frame/BarProp.h" |
| 51 #include "core/frame/EventHandlerRegistry.h" | 51 #include "core/frame/EventHandlerRegistry.h" |
| 52 #include "core/frame/FrameConsole.h" | 52 #include "core/frame/FrameConsole.h" |
| 53 #include "core/frame/FrameView.h" | 53 #include "core/frame/FrameView.h" |
| 54 #include "core/frame/History.h" | 54 #include "core/frame/History.h" |
| 55 #include "core/frame/LocalFrame.h" |
| 55 #include "core/frame/Navigator.h" | 56 #include "core/frame/Navigator.h" |
| 56 #include "core/frame/Screen.h" | 57 #include "core/frame/Screen.h" |
| 57 #include "core/frame/ScrollToOptions.h" | 58 #include "core/frame/ScrollToOptions.h" |
| 58 #include "core/frame/Settings.h" | 59 #include "core/frame/Settings.h" |
| 59 #include "core/frame/SuspendableTimer.h" | 60 #include "core/frame/SuspendableTimer.h" |
| 61 #include "core/frame/VisualViewport.h" |
| 60 #include "core/html/HTMLFrameOwnerElement.h" | 62 #include "core/html/HTMLFrameOwnerElement.h" |
| 61 #include "core/input/EventHandler.h" | 63 #include "core/input/EventHandler.h" |
| 62 #include "core/inspector/ConsoleMessageStorage.h" | 64 #include "core/inspector/ConsoleMessageStorage.h" |
| 63 #include "core/inspector/InspectorInstrumentation.h" | 65 #include "core/inspector/InspectorInstrumentation.h" |
| 64 #include "core/loader/DocumentLoader.h" | 66 #include "core/loader/DocumentLoader.h" |
| 65 #include "core/loader/FrameLoaderClient.h" | 67 #include "core/loader/FrameLoaderClient.h" |
| 66 #include "core/loader/SinkDocument.h" | 68 #include "core/loader/SinkDocument.h" |
| 67 #include "core/loader/appcache/ApplicationCache.h" | 69 #include "core/loader/appcache/ApplicationCache.h" |
| 68 #include "core/page/ChromeClient.h" | 70 #include "core/page/ChromeClient.h" |
| 69 #include "core/page/CreateWindow.h" | 71 #include "core/page/CreateWindow.h" |
| (...skipping 1461 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1531 { | 1533 { |
| 1532 // If the LocalDOMWindow still has a frame reference, that frame must point | 1534 // If the LocalDOMWindow still has a frame reference, that frame must point |
| 1533 // back to this LocalDOMWindow: otherwise, it's easy to get into a situation | 1535 // back to this LocalDOMWindow: otherwise, it's easy to get into a situation |
| 1534 // where script execution leaks between different LocalDOMWindows. | 1536 // where script execution leaks between different LocalDOMWindows. |
| 1535 if (m_frameObserver->frame()) | 1537 if (m_frameObserver->frame()) |
| 1536 ASSERT_WITH_SECURITY_IMPLICATION(m_frameObserver->frame()->domWindow() =
= this); | 1538 ASSERT_WITH_SECURITY_IMPLICATION(m_frameObserver->frame()->domWindow() =
= this); |
| 1537 return m_frameObserver->frame(); | 1539 return m_frameObserver->frame(); |
| 1538 } | 1540 } |
| 1539 | 1541 |
| 1540 } // namespace blink | 1542 } // namespace blink |
| OLD | NEW |