diff options
| author | levin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-01 22:12:18 +0000 |
|---|---|---|
| committer | levin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-01 22:12:18 +0000 |
| commit | 0cef904cec62f1aa0191fd36980c6bd3e1e3e896 (patch) | |
| tree | 8d3ec26fc924c85c22ee2958b09c77c8a0a24cfe /content/utility/utility_thread.cc | |
| parent | 3c05547dc9fd08c0ca1089102b41e2d5254fd3e2 (diff) | |
| download | chromium_src-0cef904cec62f1aa0191fd36980c6bd3e1e3e896.zip chromium_src-0cef904cec62f1aa0191fd36980c6bd3e1e3e896.tar.gz chromium_src-0cef904cec62f1aa0191fd36980c6bd3e1e3e896.tar.bz2 | |
Make Index DB code that accesses WebKit initialize WebKit first.
BUG=None
TEST=InProcessBrowserTest,IDBKeyPathWithoutSandbox
after https://bugs.webkit.org/show_bug.cgi?id=64577 is landed.
Review URL: http://codereview.chromium.org/7483001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94991 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/utility/utility_thread.cc')
| -rw-r--r-- | content/utility/utility_thread.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/content/utility/utility_thread.cc b/content/utility/utility_thread.cc index 52ad52a..10d49cf 100644 --- a/content/utility/utility_thread.cc +++ b/content/utility/utility_thread.cc @@ -11,8 +11,10 @@ #include "content/common/utility_messages.h" #include "content/utility/content_utility_client.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBKey.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSerializedScriptValue.h" #include "webkit/glue/idb_bindings.h" +#include "webkit/glue/webkitclient_impl.h" namespace { @@ -25,14 +27,16 @@ void ConvertVector(const SRC& src, DEST* dest) { } // namespace - UtilityThread::UtilityThread() : batch_mode_(false) { ChildProcess::current()->AddRefProcess(); + webkit_client_.reset(new webkit_glue::WebKitClientImpl); + WebKit::initialize(webkit_client_.get()); content::GetContentClient()->utility()->UtilityThreadStarted(); } UtilityThread::~UtilityThread() { + WebKit::shutdown(); } bool UtilityThread::OnControlMessageReceived(const IPC::Message& msg) { |