diff options
| author | ericu@google.com <ericu@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-02 01:30:08 +0000 |
|---|---|---|
| committer | ericu@google.com <ericu@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-02 01:30:08 +0000 |
| commit | 2b437e23748d7444f1698ae9242fabf0bc0730a7 (patch) | |
| tree | 40a740c3f0a8032e30299d8724e54d9a269291af /chrome/renderer/render_thread.cc | |
| parent | e0976a77dcc9be00485086b5b0e112fe6d159ff2 (diff) | |
| download | chromium_src-2b437e23748d7444f1698ae9242fabf0bc0730a7.zip chromium_src-2b437e23748d7444f1698ae9242fabf0bc0730a7.tar.gz chromium_src-2b437e23748d7444f1698ae9242fabf0bc0730a7.tar.bz2 | |
Changes to the Browser to support Database access from Workers.
This changelist should have no visible effect until the V8
bindings for the Database get added to the Worker context in WebKit.
BUG=none
TEST=webkit layout tests
Review URL: http://codereview.chromium.org/1387001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43427 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/render_thread.cc')
| -rw-r--r-- | chrome/renderer/render_thread.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc index 19c453e..494af01e 100644 --- a/chrome/renderer/render_thread.cc +++ b/chrome/renderer/render_thread.cc @@ -34,6 +34,7 @@ #include "chrome/common/render_messages.h" #include "chrome/common/renderer_preferences.h" #include "chrome/common/url_constants.h" +#include "chrome/common/web_database_observer_impl.h" #include "chrome/plugin/npobject_util.h" // TODO(port) #if defined(OS_WIN) @@ -58,7 +59,6 @@ #include "chrome/renderer/render_view.h" #include "chrome/renderer/render_view_visitor.h" #include "chrome/renderer/renderer_webkitclient_impl.h" -#include "chrome/renderer/renderer_web_database_observer.h" #include "chrome/renderer/spellchecker/spellcheck.h" #include "chrome/renderer/user_script_slave.h" #include "ipc/ipc_message.h" @@ -251,13 +251,13 @@ void RenderThread::Init() { RenderThread::~RenderThread() { // Wait for all databases to be closed. - if (renderer_web_database_observer_.get()) - renderer_web_database_observer_->WaitForAllDatabasesToClose(); + if (web_database_observer_impl_.get()) + web_database_observer_impl_->WaitForAllDatabasesToClose(); // Shutdown in reverse of the initialization order. - RemoveFilter(devtools_agent_filter_.get()); RemoveFilter(db_message_filter_.get()); db_message_filter_ = NULL; + RemoveFilter(devtools_agent_filter_.get()); if (webkit_client_.get()) WebKit::shutdown(); @@ -825,8 +825,8 @@ void RenderThread::EnsureWebKitInitialized() { WebScriptController::registerExtension( ExtensionApiTestV8Extension::Get(), EXTENSION_GROUP_CONTENT_SCRIPTS); - renderer_web_database_observer_.reset(new RendererWebDatabaseObserver(this)); - WebKit::WebDatabase::setObserver(renderer_web_database_observer_.get()); + web_database_observer_impl_.reset(new WebDatabaseObserverImpl(this)); + WebKit::WebDatabase::setObserver(web_database_observer_impl_.get()); const CommandLine& command_line = *CommandLine::ForCurrentProcess(); |