| 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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|    58 #include "core/frame/Navigator.h" |    58 #include "core/frame/Navigator.h" | 
|    59 #include "core/frame/Screen.h" |    59 #include "core/frame/Screen.h" | 
|    60 #include "core/frame/ScrollToOptions.h" |    60 #include "core/frame/ScrollToOptions.h" | 
|    61 #include "core/frame/Settings.h" |    61 #include "core/frame/Settings.h" | 
|    62 #include "core/frame/SuspendableTimer.h" |    62 #include "core/frame/SuspendableTimer.h" | 
|    63 #include "core/frame/VisualViewport.h" |    63 #include "core/frame/VisualViewport.h" | 
|    64 #include "core/html/HTMLFrameOwnerElement.h" |    64 #include "core/html/HTMLFrameOwnerElement.h" | 
|    65 #include "core/input/EventHandler.h" |    65 #include "core/input/EventHandler.h" | 
|    66 #include "core/inspector/ConsoleMessage.h" |    66 #include "core/inspector/ConsoleMessage.h" | 
|    67 #include "core/inspector/InspectorInstrumentation.h" |    67 #include "core/inspector/InspectorInstrumentation.h" | 
 |    68 #include "core/inspector/InspectorTraceEvents.h" | 
|    68 #include "core/loader/DocumentLoader.h" |    69 #include "core/loader/DocumentLoader.h" | 
|    69 #include "core/loader/FrameLoaderClient.h" |    70 #include "core/loader/FrameLoaderClient.h" | 
|    70 #include "core/loader/SinkDocument.h" |    71 #include "core/loader/SinkDocument.h" | 
|    71 #include "core/loader/appcache/ApplicationCache.h" |    72 #include "core/loader/appcache/ApplicationCache.h" | 
|    72 #include "core/page/ChromeClient.h" |    73 #include "core/page/ChromeClient.h" | 
|    73 #include "core/page/CreateWindow.h" |    74 #include "core/page/CreateWindow.h" | 
|    74 #include "core/page/Page.h" |    75 #include "core/page/Page.h" | 
|    75 #include "core/page/WindowFeatures.h" |    76 #include "core/page/WindowFeatures.h" | 
|    76 #include "core/page/scrolling/ScrollingCoordinator.h" |    77 #include "core/page/scrolling/ScrollingCoordinator.h" | 
|    77 #include "platform/EventDispatchForbiddenScope.h" |    78 #include "platform/EventDispatchForbiddenScope.h" | 
| (...skipping 1471 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  1549  |  1550  | 
|  1550 LocalFrame* LocalDOMWindow::frame() const { |  1551 LocalFrame* LocalDOMWindow::frame() const { | 
|  1551   // If the LocalDOMWindow still has a frame reference, that frame must point |  1552   // If the LocalDOMWindow still has a frame reference, that frame must point | 
|  1552   // back to this LocalDOMWindow: otherwise, it's easy to get into a situation |  1553   // back to this LocalDOMWindow: otherwise, it's easy to get into a situation | 
|  1553   // where script execution leaks between different LocalDOMWindows. |  1554   // where script execution leaks between different LocalDOMWindows. | 
|  1554   SECURITY_DCHECK(!m_frame || m_frame->domWindow() == this); |  1555   SECURITY_DCHECK(!m_frame || m_frame->domWindow() == this); | 
|  1555   return m_frame; |  1556   return m_frame; | 
|  1556 } |  1557 } | 
|  1557  |  1558  | 
|  1558 }  // namespace blink |  1559 }  // namespace blink | 
| OLD | NEW |