diff options
| author | michaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-25 22:21:49 +0000 |
|---|---|---|
| committer | michaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-25 22:21:49 +0000 |
| commit | 259676acb89a03c81cab8bbd29325ff2e1fe2973 (patch) | |
| tree | ebcde50b7cc88fa4f016eccb7e5cbd97426ab10a | |
| parent | c3d4593fc32534ed96648b9d437eac88cd5dc33e (diff) | |
| download | chromium_src-259676acb89a03c81cab8bbd29325ff2e1fe2973.zip chromium_src-259676acb89a03c81cab8bbd29325ff2e1fe2973.tar.gz chromium_src-259676acb89a03c81cab8bbd29325ff2e1fe2973.tar.bz2 | |
Temporary fix until WebKit::initialize does this for us.
Review URL: http://codereview.chromium.org/7054002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86722 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/browser/in_process_webkit/webkit_thread.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/content/browser/in_process_webkit/webkit_thread.cc b/content/browser/in_process_webkit/webkit_thread.cc index d8db6ec..0613339 100644 --- a/content/browser/in_process_webkit/webkit_thread.cc +++ b/content/browser/in_process_webkit/webkit_thread.cc @@ -8,6 +8,7 @@ #include "content/browser/in_process_webkit/browser_webkitclient_impl.h" #include "content/common/content_switches.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" #include "webkit/glue/webkit_glue.h" WebKitThread::WebKitThread() { @@ -50,6 +51,10 @@ void WebKitThread::InternalWebKitThread::Init() { webkit_glue::EnableWebCoreLogChannels( CommandLine::ForCurrentProcess()->GetSwitchValueASCII( switches::kWebCoreLogChannels)); + // Exercise WebSecurityOrigin to get its underlying statics initialized. + // TODO(michaeln): remove this when the following is landed. + // https://bugs.webkit.org/show_bug.cgi?id=61145 + WebKit::WebSecurityOrigin::create(GURL("http://chromium.org")); // If possible, post initialization tasks to this thread (rather than doing // them now) so we don't block the UI thread any longer than we have to. |