diff options
| author | michaeln@chromium.org <michaeln@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-29 00:02:21 +0000 |
|---|---|---|
| committer | michaeln@chromium.org <michaeln@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-29 00:02:21 +0000 |
| commit | e5ae223bf03714dd1e53aa6bc0165d079915f5e7 (patch) | |
| tree | 7afa452fb4278e5b76bf349ab862bf3903d34504 /webkit/tools | |
| parent | d34f220fec876a81684331d4fdd02f8624dfc70a (diff) | |
| download | chromium_src-e5ae223bf03714dd1e53aa6bc0165d079915f5e7.zip chromium_src-e5ae223bf03714dd1e53aa6bc0165d079915f5e7.tar.gz chromium_src-e5ae223bf03714dd1e53aa6bc0165d079915f5e7.tar.bz2 | |
Add SimpleResourceLoaderBridge::GetIoThread(), so it's possible to run tasks in the IO thread when using SimpleResourceLoaderBridge.
This is a clone of http://codereview.chromium.org/3007015/show
Contributed by: bmcquade@google.com
BUG=none
TEST=none
TBR=rvargas
Review URL: http://codereview.chromium.org/2806084
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54077 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
| -rw-r--r-- | webkit/tools/test_shell/simple_resource_loader_bridge.cc | 11 | ||||
| -rw-r--r-- | webkit/tools/test_shell/simple_resource_loader_bridge.h | 5 |
2 files changed, 15 insertions, 1 deletions
diff --git a/webkit/tools/test_shell/simple_resource_loader_bridge.cc b/webkit/tools/test_shell/simple_resource_loader_bridge.cc index 0eb0b85..26af3d4 100644 --- a/webkit/tools/test_shell/simple_resource_loader_bridge.cc +++ b/webkit/tools/test_shell/simple_resource_loader_bridge.cc @@ -33,6 +33,7 @@ #include "webkit/tools/test_shell/simple_resource_loader_bridge.h" #include "base/file_path.h" +#include "base/logging.h" #include "base/message_loop.h" #if defined(OS_MACOSX) || defined(OS_WIN) #include "base/nss_util.h" @@ -825,3 +826,13 @@ scoped_refptr<base::MessageLoopProxy> SimpleResourceLoaderBridge::GetCacheThread() { return g_cache_thread->message_loop_proxy(); } + +// static +scoped_refptr<base::MessageLoopProxy> + SimpleResourceLoaderBridge::GetIoThread() { + if (!EnsureIOThread()) { + LOG(DFATAL) << "Failed to create IO thread."; + return NULL; + } + return g_io_thread->message_loop_proxy(); +} diff --git a/webkit/tools/test_shell/simple_resource_loader_bridge.h b/webkit/tools/test_shell/simple_resource_loader_bridge.h index cea8001..7bde640 100644 --- a/webkit/tools/test_shell/simple_resource_loader_bridge.h +++ b/webkit/tools/test_shell/simple_resource_loader_bridge.h @@ -37,8 +37,11 @@ class SimpleResourceLoaderBridge { static bool EnsureIOThread(); static void SetAcceptAllCookies(bool accept_all_cookies); - // This method should only be called after Init(), and before Shutdown(). + // These methods should only be called after Init(), and before + // Shutdown(). The MessageLoops get replaced upon each call to + // Init(), and destroyed upon a call to ShutDown(). static scoped_refptr<base::MessageLoopProxy> GetCacheThread(); + static scoped_refptr<base::MessageLoopProxy> GetIoThread(); }; #endif // WEBKIT_TOOLS_TEST_SHELL_SIMPLE_RESOURCE_LOADER_BRIDGE_H__ |