From 4e1c76f34b910c6e9a832cbac2e2bcce8acc9f52 Mon Sep 17 00:00:00 2001 From: "estade@chromium.org" Date: Fri, 13 Nov 2009 01:36:50 +0000 Subject: Use renderer spellchecker for windows. BUG=25677 Review URL: http://codereview.chromium.org/372075 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31875 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/profile.cc | 4 +- .../renderer_host/browser_render_process_host.cc | 16 ++++- chrome/browser/spellcheck_host.cc | 84 +++++++++++++++------- chrome/browser/spellcheck_host.h | 18 +++-- 4 files changed, 89 insertions(+), 33 deletions(-) (limited to 'chrome/browser') diff --git a/chrome/browser/profile.cc b/chrome/browser/profile.cc index dd2835e..943ef84 100644 --- a/chrome/browser/profile.cc +++ b/chrome/browser/profile.cc @@ -1339,8 +1339,8 @@ void ProfileImpl::ReinitializeSpellCheckHost(bool force) { } void ProfileImpl::SpellCheckHostInitialized() { - spellcheck_host_ready_ = - spellcheck_host_ && spellcheck_host_->bdict_fd().fd != -1; + spellcheck_host_ready_ = spellcheck_host_ && + spellcheck_host_->bdict_file() != base::kInvalidPlatformFileValue; NotificationService::current()->Notify( NotificationType::SPELLCHECK_HOST_REINITIALIZED, Source(this), NotificationService::NoDetails()); diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc index ca3b1f3..1a301ee 100644 --- a/chrome/browser/renderer_host/browser_render_process_host.cc +++ b/chrome/browser/renderer_host/browser_render_process_host.cc @@ -57,6 +57,7 @@ #include "grit/generated_resources.h" #include "ipc/ipc_logging.h" #include "ipc/ipc_message.h" +#include "ipc/ipc_platform_file.h" #include "ipc/ipc_switches.h" #if defined(OS_WIN) @@ -1125,13 +1126,24 @@ void BrowserRenderProcessHost::InitSpellChecker() { SpellCheckHost* spellcheck_host = profile()->GetSpellCheckHost(); if (spellcheck_host) { PrefService* prefs = profile()->GetPrefs(); + IPC::PlatformFileForTransit file; +#if defined(OS_POSIX) + file = base::FileDescriptor(spellcheck_host->bdict_file(), false); +#elif defined(OS_WIN) + ::DuplicateHandle(::GetCurrentProcess(), spellcheck_host->bdict_file(), + process().handle(), &file, + 0, false, DUPLICATE_SAME_ACCESS); +#endif Send(new ViewMsg_SpellChecker_Init( - spellcheck_host->bdict_fd(), spellcheck_host->custom_words(), + file, + spellcheck_host->custom_words(), spellcheck_host->language(), prefs->GetBoolean(prefs::kEnableAutoSpellCorrect))); } else { Send(new ViewMsg_SpellChecker_Init( - base::FileDescriptor(), std::vector(), std::string(), + IPC::PlatformFileForTransit(), + std::vector(), + std::string(), false)); } } diff --git a/chrome/browser/spellcheck_host.cc b/chrome/browser/spellcheck_host.cc index c9fea3ecf..05e328d 100644 --- a/chrome/browser/spellcheck_host.cc +++ b/chrome/browser/spellcheck_host.cc @@ -121,6 +121,18 @@ FilePath GetVersionedFileName(const std::string& input_language, return dict_dir.AppendASCII(versioned_bdict_file_name); } +FilePath GetFirstChoiceFilePath(const std::string& language) { + FilePath dict_dir; + PathService::Get(chrome::DIR_APP_DICTIONARIES, &dict_dir); + return GetVersionedFileName(language, dict_dir); +} + +FilePath GetFallbackFilePath(const FilePath& first_choice) { + FilePath dict_dir; + PathService::Get(chrome::DIR_USER_DATA, &dict_dir); + return dict_dir.Append(first_choice.BaseName()); +} + } // namespace // Constructed on UI thread. @@ -129,29 +141,26 @@ SpellCheckHost::SpellCheckHost(Observer* observer, URLRequestContextGetter* request_context_getter) : observer_(observer), language_(language), + file_(base::kInvalidPlatformFileValue), tried_to_download_(false), request_context_getter_(request_context_getter) { DCHECK(observer_); DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); - // TODO(estade): for Windows, we need to fall back to DIR_USER_DATA if - // DIR_APP_DICTIONARIES is not writeable. - FilePath dict_dir; - PathService::Get(chrome::DIR_APP_DICTIONARIES, &dict_dir); - bdict_file_ = GetVersionedFileName(language, dict_dir); - FilePath personal_file_directory; PathService::Get(chrome::DIR_USER_DATA, &personal_file_directory); custom_dictionary_file_ = personal_file_directory.Append(chrome::kCustomDictionaryFileName); + bdict_file_path_ = GetFirstChoiceFilePath(language); + ChromeThread::PostTask(ChromeThread::FILE, FROM_HERE, - NewRunnableMethod(this, &SpellCheckHost::Initialize)); + NewRunnableMethod(this, &SpellCheckHost::InitializeDictionaryLocation)); } SpellCheckHost::~SpellCheckHost() { - if (fd_.fd != -1) - close(fd_.fd); + if (file_ != base::kInvalidPlatformFileValue) + base::ClosePlatformFile(file_); } void SpellCheckHost::UnsetObserver() { @@ -172,24 +181,39 @@ void SpellCheckHost::AddWord(const std::string& word) { Source(this), NotificationService::NoDetails()); } +void SpellCheckHost::InitializeDictionaryLocation() { + DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE)); + +#if defined(OS_WIN) + // Check if the dictionary exists in the fallback location. If so, use it + // rather than downloading anew. + FilePath fallback = GetFallbackFilePath(bdict_file_path_); + if (!file_util::PathExists(bdict_file_path_) && + file_util::PathExists(fallback)) { + bdict_file_path_ = fallback; + } +#endif + + Initialize(); +} + void SpellCheckHost::Initialize() { DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE)); if (!observer_) return; - // We set |auto_close| to false because we don't want IPC to close the fd. - // We will close it manually in the destructor. - fd_ = base::FileDescriptor(open(bdict_file_.value().c_str(), O_RDONLY), - false); + file_ = base::CreatePlatformFile(bdict_file_path_, + base::PLATFORM_FILE_READ | base::PLATFORM_FILE_OPEN, + NULL); // File didn't exist. Download it. - if (fd_.fd == -1 && !tried_to_download_) { + if (file_ == base::kInvalidPlatformFileValue && !tried_to_download_) { DownloadDictionary(); return; } - if (fd_.fd != -1) { + if (file_ != base::kInvalidPlatformFileValue) { // Load custom dictionary. std::string contents; file_util::ReadFileToString(custom_dictionary_file_, &contents); @@ -218,7 +242,7 @@ void SpellCheckHost::DownloadDictionary() { static const char kDownloadServerUrl[] = "http://cache.pack.google.com/edgedl/chrome/dict/"; GURL url = GURL(std::string(kDownloadServerUrl) + WideToUTF8( - l10n_util::ToLower(bdict_file_.BaseName().ToWStringHack()))); + l10n_util::ToLower(bdict_file_path_.BaseName().ToWStringHack()))); fetcher_.reset(new URLFetcher(url, URLFetcher::GET, this)); fetcher_->set_request_context(request_context_getter_.get()); tried_to_download_ = true; @@ -263,15 +287,27 @@ void SpellCheckHost::OnURLFetchComplete(const URLFetcher* source, } size_t bytes_written = - file_util::WriteFile(bdict_file_, data.data(), data.length()); + file_util::WriteFile(bdict_file_path_, data.data(), data.length()); if (bytes_written != data.length()) { - LOG(ERROR) << "Failure to save dictionary."; - // To avoid trying to load a partially saved dictionary, shortcut the - // Initialize() call. - ChromeThread::PostTask(ChromeThread::UI, FROM_HERE, - NewRunnableMethod(this, - &SpellCheckHost::InformObserverOfInitialization)); - return; + bool success = false; +#if defined(OS_WIN) + bdict_file_path_ = GetFallbackFilePath(bdict_file_path_); + bytes_written = + file_util::WriteFile(GetFallbackFilePath(bdict_file_path_), + data.data(), data.length()); + if (bytes_written == data.length()) + success = true; +#endif + + if (!success) { + LOG(ERROR) << "Failure to save dictionary."; + // To avoid trying to load a partially saved dictionary, shortcut the + // Initialize() call. + ChromeThread::PostTask(ChromeThread::UI, FROM_HERE, + NewRunnableMethod(this, + &SpellCheckHost::InformObserverOfInitialization)); + return; + } } Initialize(); diff --git a/chrome/browser/spellcheck_host.h b/chrome/browser/spellcheck_host.h index 8c2ef55..437b982 100644 --- a/chrome/browser/spellcheck_host.h +++ b/chrome/browser/spellcheck_host.h @@ -8,8 +8,8 @@ #include #include -#include "base/file_descriptor_posix.h" #include "base/file_path.h" +#include "base/platform_file.h" #include "base/ref_counted.h" #include "chrome/browser/chrome_thread.h" #include "chrome/browser/net/url_fetcher.h" @@ -35,7 +35,7 @@ class SpellCheckHost : public base::RefCountedThreadSafe& custom_words() const { return custom_words_; } @@ -50,6 +50,14 @@ class SpellCheckHost : public base::RefCountedThreadSafe custom_words_; -- cgit v1.1