| 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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 #include "core/loader/FrameLoaderClient.h" | 63 #include "core/loader/FrameLoaderClient.h" |
| 64 #include "core/loader/SinkDocument.h" | 64 #include "core/loader/SinkDocument.h" |
| 65 #include "core/loader/appcache/ApplicationCache.h" | 65 #include "core/loader/appcache/ApplicationCache.h" |
| 66 #include "core/page/ChromeClient.h" | 66 #include "core/page/ChromeClient.h" |
| 67 #include "core/page/CreateWindow.h" | 67 #include "core/page/CreateWindow.h" |
| 68 #include "core/page/Page.h" | 68 #include "core/page/Page.h" |
| 69 #include "core/page/WindowFeatures.h" | 69 #include "core/page/WindowFeatures.h" |
| 70 #include "core/page/scrolling/ScrollingCoordinator.h" | 70 #include "core/page/scrolling/ScrollingCoordinator.h" |
| 71 #include "platform/EventDispatchForbiddenScope.h" | 71 #include "platform/EventDispatchForbiddenScope.h" |
| 72 #include "public/platform/Platform.h" | 72 #include "public/platform/Platform.h" |
| 73 #include "public/platform/WebFrameScheduler.h" |
| 73 #include "public/platform/WebScreenInfo.h" | 74 #include "public/platform/WebScreenInfo.h" |
| 74 | 75 |
| 75 namespace blink { | 76 namespace blink { |
| 76 | 77 |
| 77 LocalDOMWindow::WindowFrameObserver::WindowFrameObserver(LocalDOMWindow* window,
LocalFrame& frame) | 78 LocalDOMWindow::WindowFrameObserver::WindowFrameObserver(LocalDOMWindow* window,
LocalFrame& frame) |
| 78 : LocalFrameLifecycleObserver(&frame) | 79 : LocalFrameLifecycleObserver(&frame) |
| 79 , m_window(window) | 80 , m_window(window) |
| 80 { | 81 { |
| 81 } | 82 } |
| 82 | 83 |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 141 // (see DOMTimer comment for more.) | 142 // (see DOMTimer comment for more.) |
| 142 EAGERLY_FINALIZE(); | 143 EAGERLY_FINALIZE(); |
| 143 DEFINE_INLINE_VIRTUAL_TRACE() | 144 DEFINE_INLINE_VIRTUAL_TRACE() |
| 144 { | 145 { |
| 145 visitor->trace(m_event); | 146 visitor->trace(m_event); |
| 146 visitor->trace(m_window); | 147 visitor->trace(m_window); |
| 147 visitor->trace(m_stackTrace); | 148 visitor->trace(m_stackTrace); |
| 148 SuspendableTimer::trace(visitor); | 149 SuspendableTimer::trace(visitor); |
| 149 } | 150 } |
| 150 | 151 |
| 152 WebTaskRunner* timerTaskRunner() override |
| 153 { |
| 154 return m_window->frame()->frameScheduler()->timerTaskRunner(); |
| 155 } |
| 156 |
| 151 private: | 157 private: |
| 152 void fired() override | 158 void fired() override |
| 153 { | 159 { |
| 154 InspectorInstrumentationCookie cookie = InspectorInstrumentation::traceA
syncOperationCompletedCallbackStarting(executionContext(), m_asyncOperationId); | 160 InspectorInstrumentationCookie cookie = InspectorInstrumentation::traceA
syncOperationCompletedCallbackStarting(executionContext(), m_asyncOperationId); |
| 155 // Prevent calls to stop triggered from the event handler to | 161 // Prevent calls to stop triggered from the event handler to |
| 156 // kill this object. | 162 // kill this object. |
| 157 m_preventDestruction = true; | 163 m_preventDestruction = true; |
| 158 m_window->postMessageTimerFired(this); | 164 m_window->postMessageTimerFired(this); |
| 159 // Will destroy this object | 165 // Will destroy this object |
| 160 m_window->removePostMessageTimer(this); | 166 m_window->removePostMessageTimer(this); |
| (...skipping 1348 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1509 DOMWindow::trace(visitor); | 1515 DOMWindow::trace(visitor); |
| 1510 DOMWindowLifecycleNotifier::trace(visitor); | 1516 DOMWindowLifecycleNotifier::trace(visitor); |
| 1511 } | 1517 } |
| 1512 | 1518 |
| 1513 LocalFrame* LocalDOMWindow::frame() const | 1519 LocalFrame* LocalDOMWindow::frame() const |
| 1514 { | 1520 { |
| 1515 return m_frameObserver->frame(); | 1521 return m_frameObserver->frame(); |
| 1516 } | 1522 } |
| 1517 | 1523 |
| 1518 } // namespace blink | 1524 } // namespace blink |
| OLD | NEW |