Chromium Code Reviews| Index: content/renderer/render_thread.cc |
| diff --git a/content/renderer/render_thread.cc b/content/renderer/render_thread.cc |
| index 53332b98e5919fcf17220ede39c4245435a97206..fdfa4e899e0a7614d544e1f267f69e848b06f2e3 100644 |
| --- a/content/renderer/render_thread.cc |
| +++ b/content/renderer/render_thread.cc |
| @@ -64,12 +64,17 @@ |
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptController.h" |
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageEventDispatcher.h" |
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" |
| +#include "third_party/WebKit/Source/WebKit/chromium/public/WebThread.h" |
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" |
| #include "ui/base/ui_base_switches.h" |
| #include "v8/include/v8.h" |
| #include "webkit/extensions/v8/playback_extension.h" |
| #include "webkit/glue/webkit_glue.h" |
| +#ifdef HAVE_WEBCOMPOSITOR |
| +#include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositor.h" |
| +#endif |
| + |
| // TODO(port) |
| #if defined(OS_WIN) |
| #include "content/common/child_process_messages.h" |
| @@ -438,6 +443,12 @@ void RenderThread::EnsureWebKitInitialized() { |
| webkit_platform_support_.reset(new RendererWebKitPlatformSupportImpl); |
| WebKit::initialize(webkit_platform_support_.get()); |
| +#ifdef HAVE_WEBCOMPOSITOR |
| + compositor_thread_.reset( |
| + webkit_platform_support_->createThread("Compositor")); |
|
jam
2011/09/30 02:50:58
nit: it's a little odd that the webkit embedder ca
|
| + WebKit::WebCompositor::setThread(compositor_thread_.get()); |
| +#endif |
| + |
| WebScriptController::enableV8SingleThreadMode(); |
| const CommandLine& command_line = *CommandLine::ForCurrentProcess(); |