Chromium Code Reviews| 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 17 matching lines...) Expand all Loading... | |
| 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/V8Initializer.h" | 36 #include "bindings/v8/V8Initializer.h" |
| 37 #include "core/Init.h" | 37 #include "core/Init.h" |
| 38 #include "core/animation/AnimationClock.h" | |
| 38 #include "core/dom/Microtask.h" | 39 #include "core/dom/Microtask.h" |
| 39 #include "core/frame/Settings.h" | 40 #include "core/frame/Settings.h" |
| 40 #include "core/page/Page.h" | 41 #include "core/page/Page.h" |
| 41 #include "core/workers/WorkerGlobalScopeProxy.h" | 42 #include "core/workers/WorkerGlobalScopeProxy.h" |
| 42 #include "gin/public/v8_platform.h" | 43 #include "gin/public/v8_platform.h" |
| 43 #include "platform/LayoutTestSupport.h" | 44 #include "platform/LayoutTestSupport.h" |
| 44 #include "platform/Logging.h" | 45 #include "platform/Logging.h" |
| 45 #include "platform/graphics/ImageDecodingStore.h" | 46 #include "platform/graphics/ImageDecodingStore.h" |
| 46 #include "platform/graphics/media/MediaPlayer.h" | 47 #include "platform/graphics/media/MediaPlayer.h" |
| 47 #include "platform/heap/Heap.h" | 48 #include "platform/heap/Heap.h" |
| (...skipping 11 matching lines...) Expand all Loading... | |
| 59 #include "wtf/text/AtomicString.h" | 60 #include "wtf/text/AtomicString.h" |
| 60 #include "wtf/text/TextEncoding.h" | 61 #include "wtf/text/TextEncoding.h" |
| 61 #include <v8.h> | 62 #include <v8.h> |
| 62 | 63 |
| 63 namespace blink { | 64 namespace blink { |
| 64 | 65 |
| 65 namespace { | 66 namespace { |
| 66 | 67 |
| 67 class EndOfTaskRunner : public WebThread::TaskObserver { | 68 class EndOfTaskRunner : public WebThread::TaskObserver { |
| 68 public: | 69 public: |
| 69 virtual void willProcessTask() { } | 70 virtual void willProcessTask() |
|
esprehn
2014/05/07 06:07:06
Can you add OVERRIDE to both of these?
dstockwell
2014/05/07 06:51:38
Done.
| |
| 71 { | |
| 72 WebCore::AnimationClock::notifyTaskStart(); | |
| 73 } | |
| 70 virtual void didProcessTask() | 74 virtual void didProcessTask() |
| 71 { | 75 { |
| 72 WebCore::Microtask::performCheckpoint(); | 76 WebCore::Microtask::performCheckpoint(); |
| 73 } | 77 } |
| 74 }; | 78 }; |
| 75 | 79 |
| 76 } // namespace | 80 } // namespace |
| 77 | 81 |
| 78 static WebThread::TaskObserver* s_endOfTaskRunner = 0; | 82 static WebThread::TaskObserver* s_endOfTaskRunner = 0; |
| 79 static WebThread::TaskObserver* s_pendingGCRunner = 0; | 83 static WebThread::TaskObserver* s_pendingGCRunner = 0; |
| (...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 260 channel->state = WTFLogChannelOn; | 264 channel->state = WTFLogChannelOn; |
| 261 #endif // !LOG_DISABLED | 265 #endif // !LOG_DISABLED |
| 262 } | 266 } |
| 263 | 267 |
| 264 void resetPluginCache(bool reloadPages) | 268 void resetPluginCache(bool reloadPages) |
| 265 { | 269 { |
| 266 WebCore::Page::refreshPlugins(reloadPages); | 270 WebCore::Page::refreshPlugins(reloadPages); |
| 267 } | 271 } |
| 268 | 272 |
| 269 } // namespace blink | 273 } // namespace blink |
| OLD | NEW |