Index: third_party/WebKit/Source/modules/InitModules.cpp |
diff --git a/third_party/WebKit/Source/modules/InitModules.cpp b/third_party/WebKit/Source/modules/InitModules.cpp |
index e209ffd24e070482a3d4f5760bcf8effaeca9fc9..ac4736b2bf0567bfc0a090d5064d2b96a28b8a96 100644 |
--- a/third_party/WebKit/Source/modules/InitModules.cpp |
+++ b/third_party/WebKit/Source/modules/InitModules.cpp |
@@ -15,6 +15,7 @@ |
#include "modules/IndexedDBNames.h" |
#include "modules/accessibility/AXObjectCacheImpl.h" |
#include "modules/canvas2d/CanvasRenderingContext2D.h" |
+#include "modules/compositorworker/CompositorWorkerManager.h" |
#include "modules/filesystem/DraggedIsolatedFileSystemImpl.h" |
#include "modules/webdatabase/DatabaseManager.h" |
#include "modules/webgl/WebGL2RenderingContext.h" |
@@ -42,6 +43,9 @@ |
CoreInitializer::init(); |
+ if (RuntimeEnabledFeatures::compositorWorkerEnabled()) |
+ CompositorWorkerManager::initialize(); |
+ |
// Canvas context types must be registered with the HTMLCanvasElement. |
HTMLCanvasElement::registerRenderingContextFactory(adoptPtr(new CanvasRenderingContext2D::Factory())); |
HTMLCanvasElement::registerRenderingContextFactory(adoptPtr(new WebGLRenderingContext::Factory())); |
@@ -52,6 +56,8 @@ |
void ModulesInitializer::terminateThreads() |
{ |
+ if (RuntimeEnabledFeatures::compositorWorkerEnabled()) |
+ CompositorWorkerManager::shutdown(); |
DatabaseManager::terminateDatabaseThread(); |
} |