| 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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 #include "core/frame/csp/ContentSecurityPolicy.h" | 68 #include "core/frame/csp/ContentSecurityPolicy.h" |
| 69 #include "core/html/HTMLFrameOwnerElement.h" | 69 #include "core/html/HTMLFrameOwnerElement.h" |
| 70 #include "core/input/EventHandler.h" | 70 #include "core/input/EventHandler.h" |
| 71 #include "core/inspector/ConsoleMessage.h" | 71 #include "core/inspector/ConsoleMessage.h" |
| 72 #include "core/inspector/InspectorTraceEvents.h" | 72 #include "core/inspector/InspectorTraceEvents.h" |
| 73 #include "core/loader/DocumentLoader.h" | 73 #include "core/loader/DocumentLoader.h" |
| 74 #include "core/loader/appcache/ApplicationCache.h" | 74 #include "core/loader/appcache/ApplicationCache.h" |
| 75 #include "core/page/ChromeClient.h" | 75 #include "core/page/ChromeClient.h" |
| 76 #include "core/page/CreateWindow.h" | 76 #include "core/page/CreateWindow.h" |
| 77 #include "core/page/Page.h" | 77 #include "core/page/Page.h" |
| 78 #include "core/page/WindowFeatures.h" | |
| 79 #include "core/page/scrolling/ScrollingCoordinator.h" | 78 #include "core/page/scrolling/ScrollingCoordinator.h" |
| 80 #include "core/probe/CoreProbes.h" | 79 #include "core/probe/CoreProbes.h" |
| 81 #include "core/timing/DOMWindowPerformance.h" | 80 #include "core/timing/DOMWindowPerformance.h" |
| 82 #include "core/timing/Performance.h" | 81 #include "core/timing/Performance.h" |
| 83 #include "platform/EventDispatchForbiddenScope.h" | 82 #include "platform/EventDispatchForbiddenScope.h" |
| 84 #include "platform/Histogram.h" | 83 #include "platform/Histogram.h" |
| 85 #include "platform/WebFrameScheduler.h" | 84 #include "platform/WebFrameScheduler.h" |
| 86 #include "platform/loader/fetch/ResourceFetcher.h" | 85 #include "platform/loader/fetch/ResourceFetcher.h" |
| 87 #include "platform/scroll/ScrollbarTheme.h" | 86 #include "platform/scroll/ScrollbarTheme.h" |
| 88 #include "platform/weborigin/SecurityOrigin.h" | 87 #include "platform/weborigin/SecurityOrigin.h" |
| (...skipping 1542 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1631 return target_frame->DomWindow(); | 1630 return target_frame->DomWindow(); |
| 1632 | 1631 |
| 1633 if (url_string.IsEmpty()) | 1632 if (url_string.IsEmpty()) |
| 1634 return target_frame->DomWindow(); | 1633 return target_frame->DomWindow(); |
| 1635 | 1634 |
| 1636 target_frame->Navigate(*active_document, completed_url, false, | 1635 target_frame->Navigate(*active_document, completed_url, false, |
| 1637 UserGestureStatus::kNone); | 1636 UserGestureStatus::kNone); |
| 1638 return target_frame->DomWindow(); | 1637 return target_frame->DomWindow(); |
| 1639 } | 1638 } |
| 1640 | 1639 |
| 1641 WindowFeatures features(window_features_string); | |
| 1642 DOMWindow* new_window = | 1640 DOMWindow* new_window = |
| 1643 CreateWindow(url_string, frame_name, features, *calling_window, | 1641 CreateWindow(url_string, frame_name, window_features_string, |
| 1644 *first_frame, *GetFrame(), exception_state); | 1642 *calling_window, *first_frame, *GetFrame(), exception_state); |
| 1645 return features.noopener ? nullptr : new_window; | 1643 return new_window; |
| 1646 } | 1644 } |
| 1647 | 1645 |
| 1648 DEFINE_TRACE(LocalDOMWindow) { | 1646 DEFINE_TRACE(LocalDOMWindow) { |
| 1649 visitor->Trace(document_); | 1647 visitor->Trace(document_); |
| 1650 visitor->Trace(screen_); | 1648 visitor->Trace(screen_); |
| 1651 visitor->Trace(history_); | 1649 visitor->Trace(history_); |
| 1652 visitor->Trace(locationbar_); | 1650 visitor->Trace(locationbar_); |
| 1653 visitor->Trace(menubar_); | 1651 visitor->Trace(menubar_); |
| 1654 visitor->Trace(personalbar_); | 1652 visitor->Trace(personalbar_); |
| 1655 visitor->Trace(scrollbars_); | 1653 visitor->Trace(scrollbars_); |
| (...skipping 11 matching lines...) Expand all Loading... |
| 1667 DOMWindow::Trace(visitor); | 1665 DOMWindow::Trace(visitor); |
| 1668 Supplementable<LocalDOMWindow>::Trace(visitor); | 1666 Supplementable<LocalDOMWindow>::Trace(visitor); |
| 1669 } | 1667 } |
| 1670 | 1668 |
| 1671 DEFINE_TRACE_WRAPPERS(LocalDOMWindow) { | 1669 DEFINE_TRACE_WRAPPERS(LocalDOMWindow) { |
| 1672 visitor->TraceWrappers(custom_elements_); | 1670 visitor->TraceWrappers(custom_elements_); |
| 1673 DOMWindow::TraceWrappers(visitor); | 1671 DOMWindow::TraceWrappers(visitor); |
| 1674 } | 1672 } |
| 1675 | 1673 |
| 1676 } // namespace blink | 1674 } // namespace blink |
| OLD | NEW |