OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * 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 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 15 matching lines...) Expand all Loading... |
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
29 */ | 29 */ |
30 | 30 |
31 #include "config.h" | 31 #include "config.h" |
32 #include "public/web/WebKit.h" | 32 #include "public/web/WebKit.h" |
33 | 33 |
34 #include "RuntimeEnabledFeatures.h" | 34 #include "RuntimeEnabledFeatures.h" |
35 #include "bindings/v8/V8Binding.h" | 35 #include "bindings/v8/V8Binding.h" |
| 36 #include "bindings/v8/V8GCController.h" |
36 #include "bindings/v8/V8Initializer.h" | 37 #include "bindings/v8/V8Initializer.h" |
37 #include "core/Init.h" | 38 #include "core/Init.h" |
38 #include "core/animation/AnimationClock.h" | 39 #include "core/animation/AnimationClock.h" |
39 #include "core/dom/Microtask.h" | 40 #include "core/dom/Microtask.h" |
40 #include "core/frame/Settings.h" | 41 #include "core/frame/Settings.h" |
41 #include "core/page/Page.h" | 42 #include "core/page/Page.h" |
42 #include "core/workers/WorkerGlobalScopeProxy.h" | 43 #include "core/workers/WorkerGlobalScopeProxy.h" |
43 #include "gin/public/v8_platform.h" | 44 #include "gin/public/v8_platform.h" |
44 #include "modules/InitModules.h" | 45 #include "modules/InitModules.h" |
45 #include "platform/LayoutTestSupport.h" | 46 #include "platform/LayoutTestSupport.h" |
(...skipping 22 matching lines...) Expand all Loading... |
68 | 69 |
69 class EndOfTaskRunner : public WebThread::TaskObserver { | 70 class EndOfTaskRunner : public WebThread::TaskObserver { |
70 public: | 71 public: |
71 virtual void willProcessTask() OVERRIDE | 72 virtual void willProcessTask() OVERRIDE |
72 { | 73 { |
73 WebCore::AnimationClock::notifyTaskStart(); | 74 WebCore::AnimationClock::notifyTaskStart(); |
74 } | 75 } |
75 virtual void didProcessTask() OVERRIDE | 76 virtual void didProcessTask() OVERRIDE |
76 { | 77 { |
77 WebCore::Microtask::performCheckpoint(); | 78 WebCore::Microtask::performCheckpoint(); |
| 79 WebCore::V8GCController::reportDOMMemoryUsageToV8(mainThreadIsolate()); |
78 } | 80 } |
79 }; | 81 }; |
80 | 82 |
81 } // namespace | 83 } // namespace |
82 | 84 |
83 static WebThread::TaskObserver* s_endOfTaskRunner = 0; | 85 static WebThread::TaskObserver* s_endOfTaskRunner = 0; |
84 static WebThread::TaskObserver* s_pendingGCRunner = 0; | 86 static WebThread::TaskObserver* s_pendingGCRunner = 0; |
85 static WebCore::ThreadState::Interruptor* s_messageLoopInterruptor = 0; | 87 static WebCore::ThreadState::Interruptor* s_messageLoopInterruptor = 0; |
86 static WebCore::ThreadState::Interruptor* s_isolateInterruptor = 0; | 88 static WebCore::ThreadState::Interruptor* s_isolateInterruptor = 0; |
87 | 89 |
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
264 channel->state = WTFLogChannelOn; | 266 channel->state = WTFLogChannelOn; |
265 #endif // !LOG_DISABLED | 267 #endif // !LOG_DISABLED |
266 } | 268 } |
267 | 269 |
268 void resetPluginCache(bool reloadPages) | 270 void resetPluginCache(bool reloadPages) |
269 { | 271 { |
270 WebCore::Page::refreshPlugins(reloadPages); | 272 WebCore::Page::refreshPlugins(reloadPages); |
271 } | 273 } |
272 | 274 |
273 } // namespace blink | 275 } // namespace blink |
OLD | NEW |